@cbartens/bkit 5.2.4 → 5.4.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/.bkit/README.md +27 -11
- package/.bkit/core/.agents/context.md +1 -1
- package/.bkit/core/.agents/docs.md +1 -1
- package/.bkit/core/.agents/plugins/bkit/hooks/bkit-guardrails.cjs +1 -1
- package/.bkit/core/.agents/rules.md +18 -1
- package/.bkit/core/.bkit/README.md +26 -10
- package/.bkit/core/.bkit/cloud.md +40 -39
- package/.bkit/core/.bkit/comparison.md +68 -345
- package/.bkit/core/.bkit/install.md +16 -9
- package/.bkit/core/.bkit/lite.md +73 -0
- package/.bkit/core/.bkit/pipeline.md +346 -0
- package/.bkit/core/.bkit/prompts.md +90 -74
- package/.bkit/core/.bkit/providers.md +42 -23
- package/.bkit/core/.bkit/templates.md +138 -19
- package/.bkit/core/.bkit/trackers.md +49 -4
- package/.bkit/core/.bkit/workflows.md +144 -123
- package/.bkit/core/.claude/hooks/bkit-guardrails.cjs +1 -1
- package/.bkit/core/.codex/hooks/bkit-guardrails.cjs +7 -4
- package/.bkit/core/.cursor/hooks/bkit-guardrails.cjs +8 -5
- package/.bkit/core/docs/templates/bkit-audit-accessibility.md +3 -2
- package/.bkit/core/docs/templates/bkit-audit-adoption.md +2 -2
- package/.bkit/core/docs/templates/bkit-audit-agents.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-aio-seo.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-analytics.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-annotations.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-app-performance.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-app-store.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-architecture.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-ci-performance.md +4 -2
- package/.bkit/core/docs/templates/bkit-audit-config.md +3 -2
- package/.bkit/core/docs/templates/bkit-audit-cost.md +3 -2
- package/.bkit/core/docs/templates/bkit-audit-coverage.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-database.md +3 -2
- package/.bkit/core/docs/templates/bkit-audit-dead-code.md +5 -5
- package/.bkit/core/docs/templates/bkit-audit-deferrals.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-dependencies.md +26 -21
- package/.bkit/core/docs/templates/bkit-audit-documentation.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-duplication.md +2 -2
- package/.bkit/core/docs/templates/bkit-audit-failures.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-flakes.md +3 -2
- package/.bkit/core/docs/templates/bkit-audit-gates.md +5 -2
- package/.bkit/core/docs/templates/bkit-audit-issues.md +3 -2
- package/.bkit/core/docs/templates/bkit-audit-llm.md +22 -15
- package/.bkit/core/docs/templates/bkit-audit-logs.md +10 -6
- package/.bkit/core/docs/templates/bkit-audit-models.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-privacy.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-prompts.md +7 -7
- package/.bkit/core/docs/templates/bkit-audit-red-team.md +12 -9
- package/.bkit/core/docs/templates/bkit-audit-reliability.md +3 -2
- package/.bkit/core/docs/templates/bkit-audit-repo.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-security.md +14 -12
- package/.bkit/core/docs/templates/bkit-audit-slop.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-testing.md +10 -8
- package/.bkit/core/docs/templates/bkit-audit-usability.md +1 -1
- package/.bkit/core/docs/templates/bkit-plan.md +8 -6
- package/.bkit/core/engine/checks/after/auth.ts +9 -9
- package/.bkit/core/engine/checks/after/ci-yml.ts +14 -12
- package/.bkit/core/engine/checks/after/github.ts +29 -120
- package/.bkit/core/engine/checks/after/index.ts +2 -2
- package/.bkit/core/engine/checks/after/managed.ts +8 -28
- package/.bkit/core/engine/checks/after/tools.ts +3 -15
- package/.bkit/core/engine/checks/before/context-fetch.ts +1 -21
- package/.bkit/core/engine/checks/before/index.ts +7 -43
- package/.bkit/core/engine/checks/before/mcp.ts +17 -8
- package/.bkit/core/engine/checks/before/repo.ts +9 -12
- package/.bkit/core/engine/checks/status-holes.ts +4 -6
- package/.bkit/core/engine/checks/tips/catalogue.ts +76 -24
- package/.bkit/core/engine/checks/tips/detect.ts +45 -2
- package/.bkit/core/engine/checks/tips/index.ts +77 -26
- package/.bkit/core/engine/cli.ts +57 -27
- package/.bkit/core/engine/commands/analysis.ts +36 -26
- package/.bkit/core/engine/commands/comply.ts +42 -32
- package/.bkit/core/engine/commands/harvest.ts +12 -12
- package/.bkit/core/engine/commands/install/doctor.ts +57 -28
- package/.bkit/core/engine/commands/install/install.ts +73 -130
- package/.bkit/core/engine/commands/install/uninstall.ts +191 -33
- package/.bkit/core/engine/commands/install/upgrade.ts +49 -43
- package/.bkit/core/engine/commands/land.ts +156 -0
- package/.bkit/core/engine/commands/lib.ts +45 -18
- package/.bkit/core/engine/commands/registry.ts +2 -0
- package/.bkit/core/engine/commands/tips.ts +12 -5
- package/.bkit/core/engine/commands/workflow/branches.ts +386 -286
- package/.bkit/core/engine/commands/workflow/counters.ts +21 -12
- package/.bkit/core/engine/commands/workflow/disk.ts +556 -0
- package/.bkit/core/engine/commands/workflow/fids.ts +46 -0
- package/.bkit/core/engine/commands/workflow/issues.ts +73 -28
- package/.bkit/core/engine/commands/workflow/ledgers.ts +3 -1
- package/.bkit/core/engine/commands/workflow/locks.ts +38 -152
- package/.bkit/core/engine/commands/workflow/prs.ts +15 -4
- package/.bkit/core/engine/commands/workflow/repo.ts +2 -2
- package/.bkit/core/engine/commands/workflow/roadmap.ts +49 -53
- package/.bkit/core/engine/commands/workflow/runs.ts +8 -7
- package/.bkit/core/engine/commands/workflow/runtime.ts +3 -2
- package/.bkit/core/engine/commands/workflow/status.ts +33 -11
- package/.bkit/core/engine/commands/workflow/steps.ts +25 -15
- package/.bkit/core/engine/commands/workflow/tests.ts +17 -5
- package/.bkit/core/engine/commands/workflow/workflows.ts +436 -267
- package/.bkit/core/engine/commands/workflow/workstreams.ts +4 -2
- package/.bkit/core/engine/commands/workflow/worktrees.ts +24 -6
- package/.bkit/core/engine/install/cloud-env.ts +10 -31
- package/.bkit/core/engine/install/manifest.ts +14 -7
- package/.bkit/core/engine/install/modules/antigravity.ts +15 -26
- package/.bkit/core/engine/install/modules/claude.ts +20 -28
- package/.bkit/core/engine/install/modules/cloud.ts +5 -2
- package/.bkit/core/engine/install/modules/codex.ts +15 -29
- package/.bkit/core/engine/install/modules/core.ts +106 -70
- package/.bkit/core/engine/install/modules/cursor.ts +6 -20
- package/.bkit/core/engine/install/modules/index.ts +7 -1
- package/.bkit/core/engine/install/modules/opencode.ts +48 -70
- package/.bkit/core/engine/install/network-allowlist.ts +73 -0
- package/.bkit/core/engine/install/placeholders.ts +16 -35
- package/.bkit/core/engine/install/write.ts +59 -12
- package/.bkit/core/engine/ledgers/telemetry.ts +6 -4
- package/.bkit/core/engine/render/hosts.ts +47 -67
- package/.bkit/core/engine/render/models.ts +29 -11
- package/.bkit/core/engine/shared/branches.ts +13 -0
- package/.bkit/core/engine/shared/egress.ts +3 -3
- package/.bkit/core/engine/shared/json.ts +18 -1
- package/.bkit/core/engine/shared/package-json.ts +63 -0
- package/.bkit/core/engine/shared/package-roots.ts +0 -10
- package/.bkit/core/engine/shared/protected-paths.ts +5 -130
- package/.bkit/core/engine/shared/settings.ts +44 -0
- package/.bkit/core/engine/shared/timeouts.ts +8 -7
- package/.bkit/core/hooks/antigravity-hook.js +1 -0
- package/.bkit/core/hooks/guardrails-shell.js +186 -40
- package/.bkit/core/hooks/guardrails-tiers.js +5 -78
- package/.bkit/core/prompts/bkit-audit-generate.md +103 -7
- package/.bkit/core/prompts/bkit-build-challenge-1.md +1 -1
- package/.bkit/core/prompts/bkit-build-challenge-2.md +1 -1
- package/.bkit/core/prompts/bkit-build-challenge-reconcile.md +1 -1
- package/.bkit/core/prompts/bkit-build-challenge-remediate.md +1 -1
- package/.bkit/core/prompts/bkit-build-challenge-tests.md +1 -1
- package/.bkit/core/prompts/bkit-build-install-skills.md +1 -1
- package/.bkit/core/prompts/bkit-build-plan-current.md +1 -1
- package/.bkit/core/prompts/bkit-build-plan-execute.md +4 -4
- package/.bkit/core/prompts/bkit-build-plan-gaps-remediate.md +1 -1
- package/.bkit/core/prompts/bkit-build-plan-verify.md +2 -2
- package/.bkit/core/prompts/bkit-debug-abort-handover.md +1 -1
- package/.bkit/core/prompts/bkit-debug-failure-diagnose.md +1 -1
- package/.bkit/core/prompts/bkit-debug-failure-remediate.md +1 -1
- package/.bkit/core/prompts/bkit-debug-failure-reproduce.md +78 -0
- package/.bkit/core/prompts/bkit-debug-failure-soak.md +1 -1
- package/.bkit/core/prompts/bkit-debug-summary.md +3 -3
- package/.bkit/core/prompts/bkit-design-spike.md +1 -1
- package/.bkit/core/prompts/bkit-design-summary.md +2 -2
- package/.bkit/core/prompts/bkit-design-update.md +1 -1
- package/.bkit/core/prompts/bkit-plan-complexity-check.md +1 -1
- package/.bkit/core/prompts/bkit-plan-generate.md +1 -1
- package/.bkit/core/prompts/bkit-plan-scope-check-1.md +1 -1
- package/.bkit/core/prompts/bkit-plan-scope-check-2.md +1 -1
- package/.bkit/core/prompts/bkit-plan-summary.md +1 -1
- package/.bkit/core/prompts/bkit-plan-update.md +1 -1
- package/.bkit/core/prompts/bkit-ship-conflict-resolve.md +1 -1
- package/.bkit/core/prompts/bkit-ship-deferred-sweep.md +1 -1
- package/.bkit/core/prompts/bkit-ship-update-docs.md +1 -1
- package/.bkit/core/prompts/bkit-utility-update-decisions.md +9 -2
- package/.bkit/core/prompts/bkit-utility-update-deferrals.md +9 -2
- package/.bkit/core/prompts/bkit-utility-update-documentation.md +2 -1
- package/.bkit/core/prompts/bkit-utility-update-failures.md +9 -2
- package/.bkit/core/prompts/bkit-utility-update-knowledge.md +9 -2
- package/.bkit/core/prompts/bkit-utility-update-roadmap.md +11 -4
- package/.bkit/core/workflows/bkit-auto.md +2 -2
- package/.bkit/core/workflows/bkit-build.md +10 -10
- package/.bkit/core/workflows/bkit-debug.md +80 -44
- package/.bkit/core/workflows/bkit-design.md +22 -13
- package/.bkit/core/workflows/bkit-plan.md +33 -16
- package/.bkit/core/workflows/bkit-ship.md +87 -98
- package/.bkit/shared/.claude/bkit-cloud.md +58 -25
- package/.bkit/shared/.claude/settings.json +19 -0
- package/.bkit/shared/.cursor/mcp.json +2 -1
- package/.bkit/shared/.opencode/opencode.json +19 -1
- package/.bkit/shared/docs/deployments.md +49 -29
- package/.bkit/shared/docs/security.md +8 -6
- package/.bkit/shared/docs/testing.md +9 -5
- package/.bkit/shared/gitignore +1 -2
- package/.bkit/templates/.cursor/Dockerfile +30 -16
- package/.bkit/templates/.github/ISSUE_TEMPLATE/bkit-bug.yml +78 -0
- package/.bkit/templates/.github/ISSUE_TEMPLATE/bkit-change.yml +91 -0
- package/.bkit/templates/.github/ISSUE_TEMPLATE/bkit-idea.yml +56 -0
- package/.bkit/templates/.github/renovate.json5 +91 -12
- package/.bkit/templates/.github/workflows/bkit-ci.yml +73 -55
- package/.bkit/templates/.github/workflows/bkit-cloud.yml +3 -1
- package/.bkit/templates/.github/workflows/bkit-renovate.yml +8 -1
- package/.bkit/templates/.github/workflows/bkit-trivy.yml +67 -0
- package/.bkit/templates/.husky/pre-commit +6 -0
- package/.bkit/templates/.husky/pre-push +15 -3
- package/.bkit/templates/.lintstagedrc.json +5 -1
- package/.bkit/templates/.oxlintrc.json +21 -0
- package/.bkit/templates/docs/capabilities.md +1 -1
- package/.bkit/templates/scripts/ci/check-capstone.mjs +176 -0
- package/.bkit/templates/scripts/ci/check-capstone.test.mjs +311 -0
- package/.bkit/templates/scripts/cleanup/bkit-disk-prune.machine.mjs +197 -0
- package/.bkit/templates/scripts/cleanup/bkit-disk-prune.mjs +164 -0
- package/.bkit/templates/scripts/graphify/bkit-graph-eager.py +2 -2
- package/.bkit/templates/scripts/graphify/bkit-graph-imports.py +43 -20
- package/.bkit/templates/scripts/graphify/bkit-graph-pre-push.sh +33 -11
- package/.bkit/templates/scripts/graphify/bkit-graph-repair.py +3 -2
- package/.bkit/templates/scripts/graphify/bkit-graphify-rollup.py +5 -5
- package/.bkit/templates/scripts/graphify/bkit-graphify.sh +79 -19
- package/CHANGELOG.md +98 -3
- package/README.md +252 -122
- package/dist/checks/after/auth.js +10 -11
- package/dist/checks/after/ci-yml.js +11 -14
- package/dist/checks/after/github.js +32 -125
- package/dist/checks/after/index.js +3 -2
- package/dist/checks/after/managed.js +8 -24
- package/dist/checks/after/tools.js +3 -16
- package/dist/checks/before/context-fetch.js +1 -21
- package/dist/checks/before/index.js +6 -42
- package/dist/checks/before/mcp.js +14 -9
- package/dist/checks/before/repo.js +8 -11
- package/dist/checks/status-holes.js +5 -7
- package/dist/checks/tips/catalogue.js +65 -18
- package/dist/checks/tips/detect.js +41 -2
- package/dist/checks/tips/index.js +61 -25
- package/dist/cli.js +52 -26
- package/dist/commands/analysis.js +21 -5
- package/dist/commands/comply.js +40 -31
- package/dist/commands/harvest.js +12 -13
- package/dist/commands/install/doctor.js +55 -23
- package/dist/commands/install/install.js +72 -122
- package/dist/commands/install/uninstall.js +165 -31
- package/dist/commands/install/upgrade.js +46 -39
- package/dist/commands/land.js +129 -0
- package/dist/commands/lib.js +41 -16
- package/dist/commands/registry.js +2 -0
- package/dist/commands/tips.js +10 -3
- package/dist/commands/workflow/branches.js +303 -248
- package/dist/commands/workflow/counters.js +17 -7
- package/dist/commands/workflow/disk.js +452 -0
- package/dist/commands/workflow/fids.js +39 -0
- package/dist/commands/workflow/issues.js +63 -27
- package/dist/commands/workflow/ledgers.js +3 -1
- package/dist/commands/workflow/locks.js +35 -130
- package/dist/commands/workflow/prs.js +8 -5
- package/dist/commands/workflow/repo.js +2 -2
- package/dist/commands/workflow/roadmap.js +50 -57
- package/dist/commands/workflow/runs.js +5 -5
- package/dist/commands/workflow/runtime.js +3 -2
- package/dist/commands/workflow/status.js +32 -12
- package/dist/commands/workflow/steps.js +19 -11
- package/dist/commands/workflow/tests.js +16 -3
- package/dist/commands/workflow/workflows.js +390 -249
- package/dist/commands/workflow/workstreams.js +4 -2
- package/dist/commands/workflow/worktrees.js +15 -6
- package/dist/install/cloud-env.js +10 -23
- package/dist/install/manifest.js +14 -7
- package/dist/install/modules/antigravity.js +15 -26
- package/dist/install/modules/claude.js +17 -21
- package/dist/install/modules/cloud.js +6 -2
- package/dist/install/modules/codex.js +15 -29
- package/dist/install/modules/core.js +95 -63
- package/dist/install/modules/cursor.js +6 -9
- package/dist/install/modules/index.js +6 -1
- package/dist/install/modules/opencode.js +41 -72
- package/dist/install/network-allowlist.js +62 -0
- package/dist/install/placeholders.js +16 -35
- package/dist/install/write.js +55 -15
- package/dist/ledgers/telemetry.js +5 -4
- package/dist/render/hosts.js +30 -55
- package/dist/render/models.js +20 -9
- package/dist/shared/branches.js +11 -0
- package/dist/shared/egress.js +0 -2
- package/dist/shared/json.js +14 -0
- package/dist/shared/package-json.js +61 -0
- package/dist/shared/package-roots.js +0 -8
- package/dist/shared/protected-paths.js +5 -122
- package/dist/shared/settings.js +23 -1
- package/dist/shared/timeouts.js +8 -7
- package/package.json +21 -17
- package/.bkit/core/.agents/shortcuts.md +0 -73
|
@@ -5,7 +5,8 @@
|
|
|
5
5
|
// 2. Size↔outcome regression (logistic approximation: error ~ log(linesAdded)
|
|
6
6
|
// + filesChanged) over `kind:"outcome"` rows.
|
|
7
7
|
// 3. Dispatch-size threshold computation for plan-complexity-check / plan-split.
|
|
8
|
-
// 4. `counterSource` trust labelling
|
|
8
|
+
// 4. `counterSource` trust labelling: each outcome row is joined to its `counter` row
|
|
9
|
+
// (model-self-report pre-P3, shell-bus post-P3).
|
|
9
10
|
// 5. Per-rule compliance rate over `kind:"compliance"` rows.
|
|
10
11
|
// 6. Per-`bkitVersion`→CHANGELOG release-attributed regression.
|
|
11
12
|
//
|
|
@@ -17,7 +18,7 @@
|
|
|
17
18
|
// See DE-34 for the shared-entrypoint + crash-isolation contract.
|
|
18
19
|
import * as fs from "node:fs";
|
|
19
20
|
import * as path from "node:path";
|
|
20
|
-
import { UNJUSTIFIED_REASON, foldFrom } from "../ledgers/telemetry.js";
|
|
21
|
+
import { UNJUSTIFIED_REASON, foldFrom, } from "../ledgers/telemetry.js";
|
|
21
22
|
import { HARVEST_DEST_DIR } from "./harvest.js";
|
|
22
23
|
export function computeCounts(events) {
|
|
23
24
|
const byKind = {};
|
|
@@ -84,7 +85,17 @@ function isErrorRun(row, allRows) {
|
|
|
84
85
|
(row.reviewIterations !== undefined && row.reviewIterations > 1) ||
|
|
85
86
|
newFailuresThisRun(row, allRows) > 0);
|
|
86
87
|
}
|
|
87
|
-
|
|
88
|
+
/** Identity of one workflow run: the key the close writes on both its counter and outcome rows. */
|
|
89
|
+
function runKey(row) {
|
|
90
|
+
return row.parentSha ? JSON.stringify([row.repo, row.workflow, row.parentSha]) : undefined;
|
|
91
|
+
}
|
|
92
|
+
export function computeRegression(rows, counterRows) {
|
|
93
|
+
const shellBusRuns = new Set();
|
|
94
|
+
for (const c of counterRows) {
|
|
95
|
+
const key = runKey(c);
|
|
96
|
+
if (c.counterSource === "shell-bus" && key !== undefined)
|
|
97
|
+
shellBusRuns.add(key);
|
|
98
|
+
}
|
|
88
99
|
const buckets = SIZE_BUCKETS.map((b) => ({
|
|
89
100
|
label: b.label,
|
|
90
101
|
minLines: b.min,
|
|
@@ -97,7 +108,8 @@ export function computeRegression(rows) {
|
|
|
97
108
|
let modelSelfReportCount = 0;
|
|
98
109
|
for (const row of rows) {
|
|
99
110
|
// Trust tier labelling
|
|
100
|
-
|
|
111
|
+
const key = runKey(row);
|
|
112
|
+
if (key !== undefined && shellBusRuns.has(key)) {
|
|
101
113
|
shellBusCount++;
|
|
102
114
|
}
|
|
103
115
|
else {
|
|
@@ -214,12 +226,16 @@ export function runAnalysis(paths) {
|
|
|
214
226
|
const { state, rowCount, malformedLineCount } = foldFrom(paths);
|
|
215
227
|
const events = [...state.values()];
|
|
216
228
|
const outcomeRows = [];
|
|
229
|
+
const counterRows = [];
|
|
217
230
|
const complianceRows = [];
|
|
218
231
|
const deferralRows = [];
|
|
219
232
|
for (const ev of events) {
|
|
220
233
|
if (ev.kind === "outcome") {
|
|
221
234
|
outcomeRows.push(ev);
|
|
222
235
|
}
|
|
236
|
+
else if (ev.kind === "counter") {
|
|
237
|
+
counterRows.push(ev);
|
|
238
|
+
}
|
|
223
239
|
else if (ev.kind === "compliance") {
|
|
224
240
|
complianceRows.push(ev);
|
|
225
241
|
}
|
|
@@ -229,7 +245,7 @@ export function runAnalysis(paths) {
|
|
|
229
245
|
}
|
|
230
246
|
const counts = computeCounts(events);
|
|
231
247
|
const elapsed = computeElapsedStats(outcomeRows);
|
|
232
|
-
const regression = computeRegression(outcomeRows);
|
|
248
|
+
const regression = computeRegression(outcomeRows, counterRows);
|
|
233
249
|
const complianceRates = computeComplianceRates(complianceRows);
|
|
234
250
|
const versionCompliance = computeVersionCompliance(complianceRows);
|
|
235
251
|
const deferralDiscipline = computeDeferralDiscipline(deferralRows);
|
package/dist/commands/comply.js
CHANGED
|
@@ -16,20 +16,22 @@
|
|
|
16
16
|
import { execFileSync } from "node:child_process";
|
|
17
17
|
import * as fs from "node:fs";
|
|
18
18
|
import * as path from "node:path";
|
|
19
|
+
import { readJsonFile } from "../shared/json.js";
|
|
19
20
|
import { getPkgRoot } from "../shared/package-roots.js";
|
|
20
21
|
import { isMirrorPath } from "../shared/protected-paths.js";
|
|
21
|
-
import { resolveGitSha, resolveRepoSlug, } from "../ledgers/telemetry.js";
|
|
22
|
+
import { gitEnv, resolveGitSha, resolveRepoSlug, } from "../ledgers/telemetry.js";
|
|
22
23
|
/** SHA charset guard — only raw hex SHAs from the ledger are accepted. */
|
|
23
24
|
const SHA_RE = /^[0-9a-f]{7,40}$/;
|
|
24
25
|
export const realGitAdapter = {
|
|
25
|
-
diffPaths(parentSha, cwd) {
|
|
26
|
-
if (!SHA_RE.test(parentSha)) {
|
|
27
|
-
console.error(`[bkit-comply] diffPaths:
|
|
26
|
+
diffPaths(parentSha, cwd, head = "HEAD") {
|
|
27
|
+
if (!SHA_RE.test(parentSha) || (head !== "HEAD" && !SHA_RE.test(head))) {
|
|
28
|
+
console.error(`[bkit-comply] diffPaths: "${parentSha}..${head}" is not a sha range — skipping diff`);
|
|
28
29
|
return [];
|
|
29
30
|
}
|
|
30
31
|
try {
|
|
31
|
-
const output = execFileSync("git", ["diff", "--name-only", `${parentSha}
|
|
32
|
+
const output = execFileSync("git", ["diff", "--name-only", `${parentSha}..${head}`], {
|
|
32
33
|
cwd,
|
|
34
|
+
env: gitEnv(),
|
|
33
35
|
encoding: "utf8",
|
|
34
36
|
stdio: ["ignore", "pipe", "ignore"],
|
|
35
37
|
});
|
|
@@ -43,10 +45,13 @@ export const realGitAdapter = {
|
|
|
43
45
|
return [];
|
|
44
46
|
}
|
|
45
47
|
},
|
|
46
|
-
headSubject(cwd) {
|
|
48
|
+
headSubject(cwd, head = "HEAD") {
|
|
49
|
+
if (head !== "HEAD" && !SHA_RE.test(head))
|
|
50
|
+
return "";
|
|
47
51
|
try {
|
|
48
|
-
return execFileSync("git", ["log", "-1", "--format=%s"], {
|
|
52
|
+
return execFileSync("git", ["log", "-1", "--format=%s", head], {
|
|
49
53
|
cwd,
|
|
54
|
+
env: gitEnv(),
|
|
50
55
|
encoding: "utf8",
|
|
51
56
|
stdio: ["ignore", "pipe", "ignore"],
|
|
52
57
|
}).trim();
|
|
@@ -110,8 +115,8 @@ export function runGrader(input) {
|
|
|
110
115
|
try {
|
|
111
116
|
const cwd = input.cwd ?? process.cwd();
|
|
112
117
|
const adapter = input.gitAdapter ?? realGitAdapter;
|
|
113
|
-
const diffPaths = adapter.diffPaths(input.parentSha, cwd);
|
|
114
|
-
const headSubject = adapter.headSubject(cwd);
|
|
118
|
+
const diffPaths = adapter.diffPaths(input.parentSha, cwd, input.headSha);
|
|
119
|
+
const headSubject = adapter.headSubject(cwd, input.headSha);
|
|
115
120
|
const violations = [];
|
|
116
121
|
const noMirrorViolation = ruleNoMirrorEdit(diffPaths);
|
|
117
122
|
if (noMirrorViolation)
|
|
@@ -188,17 +193,22 @@ export function appendComplianceRows(rows, statsPath) {
|
|
|
188
193
|
// ---------------------------------------------------------------------------
|
|
189
194
|
/**
|
|
190
195
|
* Grade `phase` over HEAD~1..HEAD (HEAD alone in a one-commit repo) and append
|
|
191
|
-
* its compliance rows to `<cwd>/.bkit/stats.jsonl`.
|
|
192
|
-
*
|
|
196
|
+
* its compliance rows to `<cwd>/.bkit/stats.jsonl`. With `squashSha` (ship's
|
|
197
|
+
* close, run in the feature worktree) the squash commit is graded instead —
|
|
198
|
+
* its subject and `squash~1..squash` — so the grade covers the whole feature
|
|
199
|
+
* as it reaches main, not the worktree's last commit. Fail-open: any
|
|
200
|
+
* error is logged and returns null, so a close never stops on the grader.
|
|
193
201
|
*/
|
|
194
|
-
export function gradeCompliance(cwd, phase, log) {
|
|
202
|
+
export function gradeCompliance(cwd, phase, log, squashSha) {
|
|
195
203
|
try {
|
|
196
|
-
const
|
|
204
|
+
const squashParent = squashSha === undefined ? "" : resolveGitSha(`${squashSha}~1`, cwd);
|
|
205
|
+
const parentSha = squashParent || resolveGitSha("HEAD~1", cwd) || resolveGitSha("HEAD", cwd);
|
|
197
206
|
if (!parentSha) {
|
|
198
207
|
log("[bkit-comply] cannot resolve a parent SHA (no commits?) — skipping grade");
|
|
199
208
|
return null;
|
|
200
209
|
}
|
|
201
|
-
const
|
|
210
|
+
const headSha = squashParent ? squashSha : undefined;
|
|
211
|
+
const violations = runGrader({ parentSha, phase, cwd, ...(headSha ? { headSha } : {}) });
|
|
202
212
|
const rows = buildComplianceRows({
|
|
203
213
|
violations,
|
|
204
214
|
phase,
|
|
@@ -245,24 +255,23 @@ export function formatComplianceSummary(violations) {
|
|
|
245
255
|
* running bkit package's root). Returns "0.0.0" on any read/parse error (fail-open).
|
|
246
256
|
*/
|
|
247
257
|
export function readBkitVersion(searchFrom) {
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
break;
|
|
261
|
-
dir = parent;
|
|
258
|
+
// Walk up looking for a package.json with a `version` field; stop at the filesystem root.
|
|
259
|
+
let dir = path.resolve(searchFrom ?? getPkgRoot());
|
|
260
|
+
for (let i = 0; i < 8; i++) {
|
|
261
|
+
const candidate = path.join(dir, "package.json");
|
|
262
|
+
if (fs.existsSync(candidate)) {
|
|
263
|
+
const read = readJsonFile(candidate);
|
|
264
|
+
// Fail-open: a package.json that cannot be read ends the search with the default.
|
|
265
|
+
if (!read.ok || read.value === null)
|
|
266
|
+
return "0.0.0";
|
|
267
|
+
const pkg = read.value;
|
|
268
|
+
if (typeof pkg.version === "string")
|
|
269
|
+
return pkg.version;
|
|
262
270
|
}
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
271
|
+
const parent = path.dirname(dir);
|
|
272
|
+
if (parent === dir)
|
|
273
|
+
break;
|
|
274
|
+
dir = parent;
|
|
266
275
|
}
|
|
267
276
|
return "0.0.0";
|
|
268
277
|
}
|
package/dist/commands/harvest.js
CHANGED
|
@@ -14,8 +14,8 @@
|
|
|
14
14
|
// - The prune gate is byte-for-byte CONTENT, never identity.
|
|
15
15
|
// - The central store ACCUMULATES across runs (never cleared) and holds every
|
|
16
16
|
// DISTINCT row, deduped by content only. It is never rewritten from the fold. It is
|
|
17
|
-
//
|
|
18
|
-
// fold it.
|
|
17
|
+
// gitignored (private consumer content), so it is the only record of pruned consumer
|
|
18
|
+
// friction; readers fold it.
|
|
19
19
|
// - Malformed consumer lines are NEVER pruned (not ours to delete).
|
|
20
20
|
// - Grep-able [bkit-harvest] log lines.
|
|
21
21
|
// - Relies on the tolerant `parse` for half-written tails.
|
|
@@ -24,11 +24,12 @@
|
|
|
24
24
|
// copy -> fsync -> verify -> prune; a crash at any point re-copies idempotently on the
|
|
25
25
|
// next run.
|
|
26
26
|
//
|
|
27
|
-
// Consumers are listed in `
|
|
27
|
+
// Consumers are listed in `harvest/consumers.md` (one absolute path per line).
|
|
28
28
|
// See DE-34 for the shared-entrypoint + crash-isolation contract.
|
|
29
29
|
import * as fs from "node:fs";
|
|
30
30
|
import * as path from "node:path";
|
|
31
31
|
import { fold, parse, resolveRepoSlug, } from "../ledgers/telemetry.js";
|
|
32
|
+
import { parseJson } from "../shared/json.js";
|
|
32
33
|
// ---------------------------------------------------------------------------
|
|
33
34
|
// Constants
|
|
34
35
|
// ---------------------------------------------------------------------------
|
|
@@ -43,17 +44,17 @@ export const HARVEST_PRUNE_FILES = ["friction.jsonl"];
|
|
|
43
44
|
/** Files to COUNT-ONLY from each consumer's `docs/` directory (metadata only). */
|
|
44
45
|
export const HARVEST_COUNT_FILES = ["deferrals.jsonl", "failures.jsonl"];
|
|
45
46
|
/** Path (relative to bkit repo root) for the consumers list. */
|
|
46
|
-
export const CONSUMERS_FILE = "
|
|
47
|
+
export const CONSUMERS_FILE = "harvest/consumers.md";
|
|
47
48
|
/**
|
|
48
49
|
* Destination directory in bkit for harvested data. Repo root, NOT under `.bkit/`
|
|
49
50
|
* (bkit's managed/installed surface).
|
|
50
51
|
*/
|
|
51
52
|
export const HARVEST_DEST_DIR = "harvest";
|
|
52
53
|
// ---------------------------------------------------------------------------
|
|
53
|
-
// Read consumer list from `
|
|
54
|
+
// Read consumer list from `harvest/consumers.md`
|
|
54
55
|
// ---------------------------------------------------------------------------
|
|
55
56
|
/**
|
|
56
|
-
* Read the list of consumer repo root paths from `
|
|
57
|
+
* Read the list of consumer repo root paths from `harvest/consumers.md`.
|
|
57
58
|
* Returns an array of absolute paths (non-empty lines, comments stripped).
|
|
58
59
|
*/
|
|
59
60
|
export function readConsumerPaths(bkitRoot) {
|
|
@@ -176,14 +177,12 @@ export function pruneConsumerFile(srcPath, consumerSlug, durable) {
|
|
|
176
177
|
for (const line of raw.split("\n")) {
|
|
177
178
|
if (line.trim() === "")
|
|
178
179
|
continue;
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
event = JSON.parse(line.trim());
|
|
182
|
-
}
|
|
183
|
-
catch {
|
|
180
|
+
const parsed = parseJson(line.trim());
|
|
181
|
+
if (!parsed.ok) {
|
|
184
182
|
kept.push(line); // malformed — never ours to delete
|
|
185
183
|
continue;
|
|
186
184
|
}
|
|
185
|
+
const event = parsed.value;
|
|
187
186
|
if (durable.rows.has(canonicalRow(stampRepo(event, consumerSlug)))) {
|
|
188
187
|
removed++;
|
|
189
188
|
continue;
|
|
@@ -221,7 +220,7 @@ function fsyncFile(filePath) {
|
|
|
221
220
|
// Run harvest across all consumers
|
|
222
221
|
// ---------------------------------------------------------------------------
|
|
223
222
|
/**
|
|
224
|
-
* Run harvest across all consumers listed in `
|
|
223
|
+
* Run harvest across all consumers listed in `harvest/consumers.md`.
|
|
225
224
|
* Deduplicates the store by row content after collecting all rows.
|
|
226
225
|
*/
|
|
227
226
|
export function runHarvest(bkitRoot) {
|
|
@@ -296,7 +295,7 @@ export function runHarvest(bkitRoot) {
|
|
|
296
295
|
}
|
|
297
296
|
console.error(`[bkit-harvest] Done — total rows collected: ${totalCopied}, entities after fold: ${dedupedRows}, pruned from consumers: ${totalPruned}, kept in consumers: ${totalKept}`);
|
|
298
297
|
if (totalPruned > 0) {
|
|
299
|
-
console.error(`[bkit-harvest] ${totalPruned} row(s) now exist ONLY in ${HARVEST_DEST_DIR}/ —
|
|
298
|
+
console.error(`[bkit-harvest] ${totalPruned} row(s) now exist ONLY in ${HARVEST_DEST_DIR}/ (gitignored) — back it up to make them durable.`);
|
|
300
299
|
}
|
|
301
300
|
return {
|
|
302
301
|
consumers: consumerResults,
|
|
@@ -2,19 +2,54 @@
|
|
|
2
2
|
// `bkit status` (read-only host/provider status).
|
|
3
3
|
import * as fs from "node:fs";
|
|
4
4
|
import * as path from "node:path";
|
|
5
|
-
import { detectOpencodeProvider, detectOpencodeProviders
|
|
5
|
+
import { detectOpencodeProvider, detectOpencodeProviders } from "./install.js";
|
|
6
6
|
import { OPENCODE_PROVIDERS } from "../../shared/egress.js";
|
|
7
|
+
import { readJsonFile } from "../../shared/json.js";
|
|
7
8
|
import { LOG_PREFIX, setLogPrefix } from "../../shared/log-prefix.js";
|
|
9
|
+
import { readInstallingVersion } from "../../shared/package-json.js";
|
|
8
10
|
import { getCoreRoot, getSharedRoot, getTemplatesRoot } from "../../shared/package-roots.js";
|
|
9
11
|
import { runPreflight } from "../../checks/before/index.js";
|
|
10
12
|
import { runPostInstallCheck, formatChecklist, writeAdvisoriesArtifact, } from "../../checks/after/index.js";
|
|
11
13
|
import { collectTips } from "../../checks/tips/index.js";
|
|
12
14
|
import { parseDotenv } from "../../install/cloud-env.js";
|
|
13
15
|
import { detectInstalledHostModules } from "../../install/hosts.js";
|
|
16
|
+
import { parseFrontmatter } from "../../render/hosts.js";
|
|
17
|
+
/**
|
|
18
|
+
* The `model:` pins in the frontmatter of `.opencode/agents/*.md` — where bkit renders the
|
|
19
|
+
* opencode per-agent pins — grouped by model, most-used first (ties by model id). `[]` when
|
|
20
|
+
* the directory is absent or no agent carries a pin.
|
|
21
|
+
*/
|
|
22
|
+
export function readOpencodeModelPins(cwd) {
|
|
23
|
+
const agentsDir = path.join(cwd, ".opencode", "agents");
|
|
24
|
+
if (!fs.existsSync(agentsDir))
|
|
25
|
+
return [];
|
|
26
|
+
const counts = new Map();
|
|
27
|
+
for (const name of fs.readdirSync(agentsDir)) {
|
|
28
|
+
if (!name.endsWith(".md"))
|
|
29
|
+
continue;
|
|
30
|
+
const content = fs.readFileSync(path.join(agentsDir, name), "utf-8");
|
|
31
|
+
const fm = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
|
|
32
|
+
const model = fm ? parseFrontmatter(fm[1]).get("model")?.trim() : undefined;
|
|
33
|
+
if (model)
|
|
34
|
+
counts.set(model, (counts.get(model) ?? 0) + 1);
|
|
35
|
+
}
|
|
36
|
+
return [...counts]
|
|
37
|
+
.map(([model, agents]) => ({ model, agents }))
|
|
38
|
+
.sort((a, b) => b.agents - a.agents || a.model.localeCompare(b.model));
|
|
39
|
+
}
|
|
40
|
+
/** `model: <id>` for one distinct pin, else `models: <id> (N agents), …`. */
|
|
41
|
+
export function formatOpencodeModelPins(pins) {
|
|
42
|
+
if (pins.length === 0)
|
|
43
|
+
return "model: none pinned in .opencode/agents/";
|
|
44
|
+
if (pins.length === 1)
|
|
45
|
+
return `model: ${pins[0].model}`;
|
|
46
|
+
const list = pins.map((p) => `${p.model} (${p.agents} agent${p.agents === 1 ? "" : "s"})`);
|
|
47
|
+
return `models: ${list.join(", ")}`;
|
|
48
|
+
}
|
|
14
49
|
/**
|
|
15
50
|
* `bkit status` — read-only host/provider status.
|
|
16
|
-
* Reports current host+provider sampled from .
|
|
17
|
-
*
|
|
51
|
+
* Reports current host+provider sampled from .claude/, .cursor/, package.json and the
|
|
52
|
+
* opencode agent model pins in .opencode/agents/. Writes nothing.
|
|
18
53
|
*/
|
|
19
54
|
export function runStatus(cwd, logPrefix) {
|
|
20
55
|
console.log(`${logPrefix} Host/provider status (read-only — no writes)`);
|
|
@@ -25,14 +60,13 @@ export function runStatus(cwd, logPrefix) {
|
|
|
25
60
|
const claudeSettingsPath = path.join(claudeDir, "settings.json");
|
|
26
61
|
let claudeModel = "claude (default)";
|
|
27
62
|
if (claudePresent && fs.existsSync(claudeSettingsPath)) {
|
|
28
|
-
|
|
29
|
-
|
|
63
|
+
// Best-effort: an unreadable settings file keeps the default label.
|
|
64
|
+
const read = readJsonFile(claudeSettingsPath);
|
|
65
|
+
if (read.ok && typeof read.value === "object" && read.value !== null) {
|
|
66
|
+
const settings = read.value;
|
|
30
67
|
if (settings.model)
|
|
31
68
|
claudeModel = settings.model;
|
|
32
69
|
}
|
|
33
|
-
catch {
|
|
34
|
-
// best-effort
|
|
35
|
-
}
|
|
36
70
|
}
|
|
37
71
|
console.log(`${logPrefix} claude: ${claudePresent ? "INSTALLED" : "absent"} (provider: anthropic / ${claudeModel})`);
|
|
38
72
|
// --- cursor host ---
|
|
@@ -46,22 +80,20 @@ export function runStatus(cwd, logPrefix) {
|
|
|
46
80
|
const activeOpencodeProvider = detectOpencodeProvider(cwd);
|
|
47
81
|
// All installed providers.
|
|
48
82
|
const allOpencodeProviders = detectOpencodeProviders(cwd);
|
|
49
|
-
|
|
83
|
+
// bkit pins models per agent in .opencode/agents/*.md frontmatter; opencode.json carries
|
|
84
|
+
// only the consumer's optional top-level default `model`.
|
|
85
|
+
let opencodeModel = formatOpencodeModelPins(readOpencodeModelPins(cwd));
|
|
50
86
|
const opencodeJsonPath = path.join(opencodeDir, "opencode.json");
|
|
51
87
|
if (opencodePresent && fs.existsSync(opencodeJsonPath)) {
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
opencodeModel = cfg.model;
|
|
56
|
-
// Fallback: look for non-empty models map
|
|
57
|
-
if (opencodeModel === "unknown" && cfg.models) {
|
|
58
|
-
const modelKeys = Object.keys(cfg.models);
|
|
59
|
-
if (modelKeys.length > 0)
|
|
60
|
-
opencodeModel = `${modelKeys.length} model(s) configured`;
|
|
61
|
-
}
|
|
88
|
+
const read = readJsonFile(opencodeJsonPath);
|
|
89
|
+
if (!read.ok || read.value === null || typeof read.value !== "object") {
|
|
90
|
+
opencodeModel += "; opencode.json: parse-error";
|
|
62
91
|
}
|
|
63
|
-
|
|
64
|
-
|
|
92
|
+
else {
|
|
93
|
+
const cfg = read.value;
|
|
94
|
+
if (typeof cfg.model === "string" && cfg.model) {
|
|
95
|
+
opencodeModel += `; default model: ${cfg.model}`;
|
|
96
|
+
}
|
|
65
97
|
}
|
|
66
98
|
}
|
|
67
99
|
let opencodeProviderDisplay;
|
|
@@ -85,7 +117,7 @@ export function runStatus(cwd, logPrefix) {
|
|
|
85
117
|
// --- antigravity host ---
|
|
86
118
|
const antigravityPresent = detectInstalledHostModules(cwd).has("antigravity");
|
|
87
119
|
const opencodeStatus = opencodePresent
|
|
88
|
-
? `INSTALLED (${providerLabel}: ${opencodeProviderDisplay} /
|
|
120
|
+
? `INSTALLED (${providerLabel}: ${opencodeProviderDisplay} / ${opencodeModel})`
|
|
89
121
|
: "absent (run: bkit install --opencode=<provider>)";
|
|
90
122
|
console.log(`${logPrefix} opencode: ${opencodeStatus}`);
|
|
91
123
|
console.log(`${logPrefix} codex: ${codexPresent ? "INSTALLED (provider: openai)" : "absent (run: bkit install --codex)"}`);
|
|
@@ -132,7 +164,7 @@ export async function runDoctor(modules, opencodeProvider) {
|
|
|
132
164
|
writeAdvisoriesArtifact(allFindings, {
|
|
133
165
|
cwd: process.cwd(),
|
|
134
166
|
mode: "doctor",
|
|
135
|
-
version:
|
|
167
|
+
version: readInstallingVersion(),
|
|
136
168
|
logPrefix: LOG_PREFIX,
|
|
137
169
|
suppressed,
|
|
138
170
|
tips,
|