@cbartens/bkit 6.1.0 → 6.2.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 +14 -12
- package/.bkit/core/.agents/docs.md +1 -11
- package/.bkit/core/.agents/plugins/bkit/hooks/bkit-gateguard.cjs +30 -9
- package/.bkit/core/.agents/plugins/bkit/hooks/bkit-guardrails.cjs +25 -27
- package/.bkit/core/.agents/rules.md +22 -9
- package/.bkit/core/.bkit/README.md +13 -11
- package/.bkit/core/.bkit/authoring.md +58 -13
- package/.bkit/core/.bkit/cli.md +43 -33
- package/.bkit/core/.bkit/cloud.md +93 -30
- package/.bkit/core/.bkit/install.md +55 -16
- package/.bkit/core/.bkit/jsonl.md +24 -7
- package/.bkit/core/.bkit/pipeline.md +8 -8
- package/.bkit/core/.bkit/prompts.md +160 -43
- package/.bkit/core/.bkit/providers.md +99 -36
- package/.bkit/core/.bkit/templates.md +167 -37
- package/.bkit/core/.bkit/trackers.md +39 -6
- package/.bkit/core/.bkit/workflows.md +344 -136
- package/.bkit/core/.claude/hooks/bkit-guardrails.cjs +50 -27
- package/.bkit/core/.claude/hooks/bkit-preflight.sh +11 -11
- package/.bkit/core/.codex/hooks/bkit-gateguard.cjs +13 -8
- package/.bkit/core/.codex/hooks/bkit-guardrails.cjs +14 -25
- package/.bkit/core/.cursor/hooks/bkit-guardrails.cjs +20 -9
- package/.bkit/core/.cursor/hooks/bkit-preflight.sh +8 -8
- package/.bkit/core/.opencode/plugin/bkit-gateguard.js +14 -4
- package/.bkit/core/.opencode/plugin/bkit-guardrails.js +114 -0
- package/.bkit/core/docs/templates/bkit-audit-accessibility.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-adoption.md +30 -6
- 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 +2 -2
- package/.bkit/core/docs/templates/bkit-audit-config.md +3 -2
- package/.bkit/core/docs/templates/bkit-audit-cost.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-coverage.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-database.md +3 -3
- package/.bkit/core/docs/templates/bkit-audit-dead-code.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-deferrals.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-dependencies.md +3 -3
- package/.bkit/core/docs/templates/bkit-audit-documentation.md +32 -2
- package/.bkit/core/docs/templates/bkit-audit-duplication.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-failures.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-flakes.md +2 -2
- package/.bkit/core/docs/templates/bkit-audit-gates.md +5 -3
- package/.bkit/core/docs/templates/bkit-audit-issues.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-llm.md +2 -2
- package/.bkit/core/docs/templates/bkit-audit-logs.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-models.md +2 -2
- package/.bkit/core/docs/templates/bkit-audit-privacy.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-prompts.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-red-team.md +2 -2
- 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 +1 -1
- package/.bkit/core/docs/templates/bkit-audit-slop.md +1 -1
- package/.bkit/core/docs/templates/bkit-audit-testing.md +3 -2
- package/.bkit/core/docs/templates/bkit-audit-usability.md +1 -1
- package/.bkit/core/docs/templates/bkit-plan.md +38 -8
- package/.bkit/core/engine/checks/after/auth.ts +118 -47
- package/.bkit/core/engine/checks/after/github.ts +161 -37
- package/.bkit/core/engine/checks/after/index.ts +18 -3
- package/.bkit/core/engine/checks/after/tools.ts +245 -1
- package/.bkit/core/engine/checks/before/files.ts +59 -1
- package/.bkit/core/engine/checks/before/index.ts +8 -0
- package/.bkit/core/engine/checks/status-holes.ts +20 -26
- package/.bkit/core/engine/checks/tips/catalogue.ts +107 -10
- package/.bkit/core/engine/checks/tips/detect.ts +36 -3
- package/.bkit/core/engine/checks/tips/index.ts +1 -1
- package/.bkit/core/engine/cli.ts +13 -13
- package/.bkit/core/engine/commands/ci/ci.ts +124 -19
- package/.bkit/core/engine/commands/ci/push-gate.ts +101 -43
- package/.bkit/core/engine/commands/install/doctor.ts +5 -5
- package/.bkit/core/engine/commands/install/install.ts +28 -25
- package/.bkit/core/engine/commands/install/uninstall.ts +42 -30
- package/.bkit/core/engine/commands/install/upgrade.ts +14 -2
- package/.bkit/core/engine/commands/land.ts +2 -3
- package/.bkit/core/engine/commands/lib.ts +394 -39
- package/.bkit/core/engine/commands/registry.ts +1 -1
- package/.bkit/core/engine/commands/workflow/branches.ts +351 -78
- package/.bkit/core/engine/commands/workflow/challenge.ts +63 -14
- package/.bkit/core/engine/commands/workflow/context.ts +71 -10
- package/.bkit/core/engine/commands/workflow/counters.ts +298 -23
- package/.bkit/core/engine/commands/workflow/decisions.ts +260 -125
- package/.bkit/core/engine/commands/workflow/disk.ts +2 -1
- package/.bkit/core/engine/commands/workflow/feature-base.ts +66 -0
- package/.bkit/core/engine/commands/workflow/issues.ts +312 -17
- package/.bkit/core/engine/commands/workflow/junit.ts +204 -0
- package/.bkit/core/engine/commands/workflow/ledgers.ts +904 -99
- package/.bkit/core/engine/commands/workflow/locks.ts +186 -29
- package/.bkit/core/engine/commands/workflow/loops.ts +87 -0
- package/.bkit/core/engine/commands/workflow/open-decision.ts +251 -0
- package/.bkit/core/engine/commands/workflow/plan-blocks.ts +8 -0
- package/.bkit/core/engine/commands/workflow/plans.ts +1 -1
- package/.bkit/core/engine/commands/workflow/prs.ts +311 -16
- package/.bkit/core/engine/commands/workflow/repo.ts +1 -1
- package/.bkit/core/engine/commands/workflow/run-facts.ts +6 -0
- package/.bkit/core/engine/commands/workflow/runs.ts +877 -174
- package/.bkit/core/engine/commands/workflow/runtime.ts +12 -4
- package/.bkit/core/engine/commands/workflow/status.ts +324 -11
- package/.bkit/core/engine/commands/workflow/step-table.ts +41 -15
- package/.bkit/core/engine/commands/workflow/steps.ts +604 -29
- package/.bkit/core/engine/commands/workflow/summary-findings.ts +1 -1
- package/.bkit/core/engine/commands/workflow/summary.ts +314 -8
- package/.bkit/core/engine/commands/workflow/tasks.ts +400 -27
- package/.bkit/core/engine/commands/workflow/tests-base.ts +319 -0
- package/.bkit/core/engine/commands/workflow/tests-changed.ts +138 -74
- package/.bkit/core/engine/commands/workflow/tests-jump.ts +93 -0
- package/.bkit/core/engine/commands/workflow/tests.ts +815 -182
- package/.bkit/core/engine/commands/workflow/tracker.ts +1134 -137
- package/.bkit/core/engine/commands/workflow/workflows.ts +100 -72
- package/.bkit/core/engine/commands/workflow/worktrees.ts +421 -57
- package/.bkit/core/engine/install/cloud-env.ts +38 -10
- package/.bkit/core/engine/install/managed-block.ts +105 -0
- package/.bkit/core/engine/install/manifest.ts +7 -1
- package/.bkit/core/engine/install/modules/claude.ts +6 -2
- package/.bkit/core/engine/install/modules/cloud.ts +84 -95
- package/.bkit/core/engine/install/modules/codex.ts +10 -2
- package/.bkit/core/engine/install/modules/core.ts +202 -26
- package/.bkit/core/engine/install/modules/opencode.ts +18 -23
- package/.bkit/core/engine/install/network-allowlist.ts +8 -3
- package/.bkit/core/engine/install/project-docs.ts +650 -0
- package/.bkit/core/engine/install/template-copies.ts +58 -5
- package/.bkit/core/engine/install/write.ts +128 -7
- package/.bkit/core/engine/ledgers/journal.ts +18 -10
- package/.bkit/core/engine/ledgers/migrate.ts +20 -8
- package/.bkit/core/engine/ledgers/status.ts +604 -8
- package/.bkit/core/engine/ledgers/telemetry.ts +115 -13
- package/.bkit/core/engine/render/trackers.ts +46 -11
- package/.bkit/core/engine/shared/package-manager.ts +7 -3
- package/.bkit/core/engine/shared/settings.ts +12 -1
- package/.bkit/core/engine/shared/text.ts +14 -0
- package/.bkit/core/engine/tools/instructions-sources.ts +1 -0
- package/.bkit/core/engine/tools/instructions.ts +116 -20
- package/.bkit/core/hooks/antigravity-hook.js +20 -4
- package/.bkit/core/hooks/gateguard-edit-payload.js +8 -5
- package/.bkit/core/hooks/gateguard-engine.js +249 -23
- package/.bkit/core/hooks/guardrails-deny.js +167 -0
- package/.bkit/core/hooks/guardrails-read.js +3 -3
- package/.bkit/core/hooks/guardrails-shell.js +1122 -167
- package/.bkit/core/hooks/guardrails-tiers.js +247 -176
- package/.bkit/core/hooks/preflight-tracker.sh +219 -0
- package/.bkit/core/prompts/bkit-audit-generate.md +23 -6
- package/.bkit/core/prompts/bkit-build-challenge-1.md +5 -4
- package/.bkit/core/prompts/bkit-build-challenge-2.md +6 -5
- package/.bkit/core/prompts/bkit-build-install-skills.md +2 -2
- package/.bkit/core/prompts/bkit-build-plan-convert.md +21 -7
- package/.bkit/core/prompts/bkit-build-plan-current.md +5 -4
- package/.bkit/core/prompts/bkit-build-plan-gaps-remediate.md +22 -17
- package/.bkit/core/prompts/bkit-build-plan-tasks.md +16 -12
- package/.bkit/core/prompts/bkit-build-plan-tests.md +14 -10
- package/.bkit/core/prompts/bkit-build-plan-verify.md +21 -8
- package/.bkit/core/prompts/bkit-debug-abort-handover.md +10 -5
- package/.bkit/core/prompts/bkit-debug-failure-diagnose.md +22 -6
- package/.bkit/core/prompts/bkit-debug-failure-remediate.md +19 -3
- package/.bkit/core/prompts/bkit-debug-failure-reproduce.md +22 -6
- package/.bkit/core/prompts/bkit-debug-failure-soak.md +10 -7
- package/.bkit/core/prompts/bkit-design-brainstorm-ideate-1.md +3 -3
- package/.bkit/core/prompts/bkit-design-brainstorm-ideate-2.md +4 -4
- package/.bkit/core/prompts/bkit-design-brainstorm-ideate-3.md +3 -3
- package/.bkit/core/prompts/bkit-design-generate.md +6 -4
- package/.bkit/core/prompts/bkit-design-organise.md +4 -3
- package/.bkit/core/prompts/bkit-design-review-1.md +5 -4
- package/.bkit/core/prompts/bkit-design-review-2.md +6 -5
- package/.bkit/core/prompts/bkit-design-spike.md +4 -3
- package/.bkit/core/prompts/bkit-design-update.md +6 -4
- package/.bkit/core/prompts/bkit-plan-generate.md +35 -14
- package/.bkit/core/prompts/bkit-plan-review-1.md +9 -7
- package/.bkit/core/prompts/bkit-plan-review-2.md +9 -7
- package/.bkit/core/prompts/bkit-plan-scope-check.md +8 -6
- package/.bkit/core/prompts/bkit-plan-update.md +22 -8
- package/.bkit/core/prompts/bkit-ship-conflict-resolve.md +11 -8
- package/.bkit/core/prompts/bkit-ship-deferred-sweep.md +9 -5
- package/.bkit/core/prompts/bkit-ship-update-docs.md +26 -4
- package/.bkit/core/prompts/bkit-utility-compress-markdown.md +3 -3
- package/.bkit/core/prompts/bkit-utility-update-decisions.md +10 -7
- package/.bkit/core/prompts/bkit-utility-update-deferrals.md +8 -5
- package/.bkit/core/prompts/bkit-utility-update-documentation.md +31 -7
- package/.bkit/core/prompts/bkit-utility-update-failures.md +8 -5
- package/.bkit/core/prompts/bkit-utility-update-knowledge.md +10 -7
- package/.bkit/core/prompts/bkit-utility-update-roadmap.md +4 -4
- package/.bkit/core/prompts/bkit-utility-update-tracker.md +4 -4
- package/.bkit/core/workflows/bkit-auto.md +23 -11
- package/.bkit/core/workflows/bkit-build.md +331 -100
- package/.bkit/core/workflows/bkit-debug.md +135 -64
- package/.bkit/core/workflows/bkit-design.md +58 -32
- package/.bkit/core/workflows/bkit-plan.md +73 -45
- package/.bkit/core/workflows/bkit-ship.md +233 -167
- package/.bkit/shared/.agents/plugins/bkit/hooks.json +1 -1
- package/.bkit/shared/.bkit/.env.example +5 -0
- package/.bkit/shared/.claude/bkit-cloud.md +7 -7
- package/.bkit/shared/.claude/settings.json +5 -1
- package/.bkit/shared/.cursor/bkit-cloud.md +1 -1
- package/.bkit/shared/.cursor/hooks.json +1 -1
- package/.bkit/shared/.opencode/opencode.json +11 -2
- package/.bkit/templates/.claude/hooks/bkit-cloud-bootstrap.sh +27 -0
- package/.bkit/templates/.cursor/Dockerfile +7 -7
- package/.bkit/templates/.github/ISSUE_TEMPLATE/bkit-idea.yml +1 -1
- package/.bkit/templates/.github/dependabot.yml +5 -0
- package/.bkit/templates/.github/renovate.json5 +5 -3
- package/.bkit/templates/.github/workflows/bkit-ci.yml +11 -11
- package/.bkit/templates/.github/workflows/bkit-cloud.yml +525 -161
- package/.bkit/templates/.github/workflows/bkit-renovate.yml +2 -2
- package/.bkit/templates/.husky/pre-push +123 -6
- package/.bkit/templates/context/bkit-serena.md +1 -1
- package/.bkit/templates/context/bkit-vercel.md +103 -59
- package/.bkit/templates/docs/architecture.md +98 -0
- package/.bkit/templates/docs/capabilities.md +33 -37
- package/.bkit/templates/docs/components.md +142 -0
- package/.bkit/templates/docs/data-schema.md +87 -0
- package/.bkit/{shared → templates}/docs/deployments.md +128 -142
- package/.bkit/templates/docs/design.md +117 -0
- package/.bkit/templates/docs/noise.md +54 -0
- package/.bkit/templates/docs/observability.md +99 -0
- package/.bkit/templates/docs/security.md +137 -0
- package/.bkit/templates/docs/setup.md +93 -0
- package/.bkit/templates/docs/technology.md +70 -0
- package/.bkit/{shared → templates}/docs/testing.md +200 -87
- package/.bkit/templates/scripts/ci/bkit-check-accepted-divergences.mjs +1 -6
- package/.bkit/templates/scripts/ci/bkit-machine-lock.sh +511 -103
- package/.bkit/templates/scripts/ci/bkit-test-awake.mjs +314 -28
- package/.bkit/templates/scripts/ci/bkit-test-awake.test.mjs +500 -1
- package/.bkit/templates/scripts/graphify/bkit-graphify-graphml.py +1 -1
- package/.bkit/templates/scripts/graphify/bkit-graphify-rollup.py +91 -62
- package/.bkit/templates/scripts/graphify/bkit-graphify.sh +59 -11
- package/.bkit/templates/slop-scan.config.json +2 -0
- package/CHANGELOG.md +79 -0
- package/DETAILS.md +661 -0
- package/README.md +73 -604
- package/dist/checks/after/auth.js +114 -46
- package/dist/checks/after/github.js +138 -35
- package/dist/checks/after/index.js +16 -4
- package/dist/checks/after/tools.js +224 -1
- package/dist/checks/before/files.js +59 -1
- package/dist/checks/before/index.js +7 -1
- package/dist/checks/status-holes.js +20 -21
- package/dist/checks/tips/catalogue.js +99 -10
- package/dist/checks/tips/detect.js +35 -3
- package/dist/checks/tips/index.js +1 -1
- package/dist/cli.js +13 -13
- package/dist/commands/ci/ci.js +113 -20
- package/dist/commands/ci/push-gate.js +79 -44
- package/dist/commands/install/doctor.js +5 -5
- package/dist/commands/install/install.js +23 -22
- package/dist/commands/install/uninstall.js +36 -30
- package/dist/commands/install/upgrade.js +10 -2
- package/dist/commands/land.js +2 -3
- package/dist/commands/lib.js +323 -25
- package/dist/commands/workflow/branches.js +312 -72
- package/dist/commands/workflow/challenge.js +66 -13
- package/dist/commands/workflow/context.js +46 -10
- package/dist/commands/workflow/counters.js +231 -23
- package/dist/commands/workflow/decisions.js +221 -106
- package/dist/commands/workflow/disk.js +2 -1
- package/dist/commands/workflow/feature-base.js +60 -0
- package/dist/commands/workflow/issues.js +243 -15
- package/dist/commands/workflow/junit.js +137 -0
- package/dist/commands/workflow/ledgers.js +726 -112
- package/dist/commands/workflow/locks.js +150 -29
- package/dist/commands/workflow/loops.js +67 -0
- package/dist/commands/workflow/open-decision.js +199 -0
- package/dist/commands/workflow/plan-blocks.js +6 -0
- package/dist/commands/workflow/plans.js +1 -1
- package/dist/commands/workflow/prs.js +272 -16
- package/dist/commands/workflow/repo.js +1 -1
- package/dist/commands/workflow/run-facts.js +6 -0
- package/dist/commands/workflow/runs.js +747 -155
- package/dist/commands/workflow/runtime.js +8 -4
- package/dist/commands/workflow/status.js +259 -13
- package/dist/commands/workflow/step-table.js +41 -15
- package/dist/commands/workflow/steps.js +530 -26
- package/dist/commands/workflow/summary-findings.js +1 -1
- package/dist/commands/workflow/summary.js +289 -8
- package/dist/commands/workflow/tasks.js +294 -27
- package/dist/commands/workflow/tests-base.js +266 -0
- package/dist/commands/workflow/tests-changed.js +130 -56
- package/dist/commands/workflow/tests-jump.js +77 -0
- package/dist/commands/workflow/tests.js +608 -131
- package/dist/commands/workflow/tracker.js +920 -112
- package/dist/commands/workflow/workflows.js +80 -59
- package/dist/commands/workflow/worktrees.js +387 -58
- package/dist/install/cloud-env.js +32 -10
- package/dist/install/managed-block.js +101 -0
- package/dist/install/manifest.js +7 -1
- package/dist/install/modules/claude.js +6 -2
- package/dist/install/modules/cloud.js +73 -86
- package/dist/install/modules/codex.js +9 -2
- package/dist/install/modules/core.js +190 -27
- package/dist/install/modules/opencode.js +18 -23
- package/dist/install/network-allowlist.js +8 -3
- package/dist/install/project-docs.js +551 -0
- package/dist/install/template-copies.js +55 -5
- package/dist/install/write.js +117 -5
- package/dist/ledgers/journal.js +10 -8
- package/dist/ledgers/migrate.js +20 -9
- package/dist/ledgers/status.js +461 -8
- package/dist/ledgers/telemetry.js +71 -13
- package/dist/render/trackers.js +21 -12
- package/dist/shared/package-manager.js +7 -2
- package/dist/shared/settings.js +8 -0
- package/dist/shared/text.js +13 -0
- package/dist/tools/instructions-sources.js +1 -0
- package/dist/tools/instructions.js +97 -24
- package/package.json +23 -15
- package/.bkit/core/hooks/preflight-linear.sh +0 -73
- package/.bkit/shared/docs/architecture.md +0 -16
- package/.bkit/shared/docs/data-schema.md +0 -16
- package/.bkit/shared/docs/design.md +0 -38
- package/.bkit/shared/docs/noise.md +0 -20
- package/.bkit/shared/docs/observability.md +0 -22
- package/.bkit/shared/docs/security.md +0 -62
- package/.bkit/shared/docs/setup.md +0 -52
- package/.bkit/shared/docs/technology.md +0 -15
- /package/.bkit/templates/{.lintstagedrc.json → lintstagedrc.example.json} +0 -0
- /package/.bkit/templates/{.prettierignore → prettierignore.example} +0 -0
package/dist/install/write.js
CHANGED
|
@@ -136,6 +136,99 @@ export function deepMergeJson(base, override) {
|
|
|
136
136
|
return result;
|
|
137
137
|
}
|
|
138
138
|
// ---------------------------------------------------------------------------
|
|
139
|
+
// mergeManagedJson — list-aware merge for managed Tier-2 JSON files
|
|
140
|
+
//
|
|
141
|
+
// - Objects: merge like deepMergeJson (template keys first, consumer-only keys appended)
|
|
142
|
+
// - Lists of plain values: template entries in template order, then consumer-only entries
|
|
143
|
+
// - Lists of objects (hook groups): a consumer group sharing a hook `command`, or the same
|
|
144
|
+
// bkit hook file (`bkit-*.cjs`), with a template group is replaced by it; other consumer groups follow the template's groups
|
|
145
|
+
// - Anything else: the template wins
|
|
146
|
+
// ---------------------------------------------------------------------------
|
|
147
|
+
function isPlainObject(v) {
|
|
148
|
+
return v !== null && typeof v === "object" && !Array.isArray(v);
|
|
149
|
+
}
|
|
150
|
+
function groupCommands(group) {
|
|
151
|
+
const out = [];
|
|
152
|
+
if (typeof group.command === "string")
|
|
153
|
+
out.push(group.command);
|
|
154
|
+
const hooks = group.hooks;
|
|
155
|
+
if (!Array.isArray(hooks))
|
|
156
|
+
return out;
|
|
157
|
+
for (const h of hooks) {
|
|
158
|
+
if (isPlainObject(h) && typeof h.command === "string")
|
|
159
|
+
out.push(h.command);
|
|
160
|
+
}
|
|
161
|
+
return out;
|
|
162
|
+
}
|
|
163
|
+
// The bkit hook file a command runs (`bkit-gateguard.cjs`, `bkit-preflight.sh`, ...), so an
|
|
164
|
+
// older spelling of the same bkit hook is still recognised as bkit's own.
|
|
165
|
+
function bkitHookFile(command) {
|
|
166
|
+
return /\bbkit-[a-z0-9-]+\.(?:cjs|js|sh)\b/.exec(command)?.[0];
|
|
167
|
+
}
|
|
168
|
+
function mergeManagedList(base, override) {
|
|
169
|
+
const objectLists = [...base, ...override].every((e) => isPlainObject(e));
|
|
170
|
+
if (objectLists) {
|
|
171
|
+
const templateCommands = new Set();
|
|
172
|
+
for (const g of override) {
|
|
173
|
+
for (const c of groupCommands(g)) {
|
|
174
|
+
templateCommands.add(c);
|
|
175
|
+
const file = bkitHookFile(c);
|
|
176
|
+
if (file)
|
|
177
|
+
templateCommands.add(`bkit-file:${file}`);
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
const isTemplateCommand = (c) => {
|
|
181
|
+
const file = bkitHookFile(c);
|
|
182
|
+
return (templateCommands.has(c) || (file !== undefined && templateCommands.has(`bkit-file:${file}`)));
|
|
183
|
+
};
|
|
184
|
+
const templateKeys = new Set(override.map((g) => JSON.stringify(g)));
|
|
185
|
+
const merged = override.map((g) => ({ ...g }));
|
|
186
|
+
const kept = [];
|
|
187
|
+
for (const g of base) {
|
|
188
|
+
if (templateKeys.has(JSON.stringify(g)))
|
|
189
|
+
continue;
|
|
190
|
+
const group = g;
|
|
191
|
+
const cmds = groupCommands(group);
|
|
192
|
+
if (!cmds.some(isTemplateCommand)) {
|
|
193
|
+
kept.push(g);
|
|
194
|
+
continue;
|
|
195
|
+
}
|
|
196
|
+
// A replaced bkit group: its consumer-added hooks move into the matching template group.
|
|
197
|
+
if (!Array.isArray(group.hooks))
|
|
198
|
+
continue;
|
|
199
|
+
const extras = group.hooks.filter((h) => isPlainObject(h) && typeof h.command === "string" && !isTemplateCommand(h.command));
|
|
200
|
+
if (extras.length === 0)
|
|
201
|
+
continue;
|
|
202
|
+
const target = merged.find((t) => groupCommands(t).some((c) => cmds.some((bc) => bc === c || (bkitHookFile(c) !== undefined && bkitHookFile(c) === bkitHookFile(bc)))));
|
|
203
|
+
if (!target || !Array.isArray(target.hooks))
|
|
204
|
+
continue;
|
|
205
|
+
const have = new Set(target.hooks.map((h) => JSON.stringify(h)));
|
|
206
|
+
const add = extras.filter((h) => !have.has(JSON.stringify(h)));
|
|
207
|
+
target.hooks = [...target.hooks, ...add];
|
|
208
|
+
}
|
|
209
|
+
return [...merged, ...kept];
|
|
210
|
+
}
|
|
211
|
+
const seen = new Set(override.map((e) => JSON.stringify(e)));
|
|
212
|
+
const extras = base.filter((e) => !seen.has(JSON.stringify(e)));
|
|
213
|
+
return [...override, ...extras];
|
|
214
|
+
}
|
|
215
|
+
export function mergeManagedJson(base, override) {
|
|
216
|
+
if (Array.isArray(override)) {
|
|
217
|
+
return Array.isArray(base) ? mergeManagedList(base, override) : override;
|
|
218
|
+
}
|
|
219
|
+
if (!isPlainObject(override) || !isPlainObject(base))
|
|
220
|
+
return override;
|
|
221
|
+
const result = {};
|
|
222
|
+
for (const [key, val] of Object.entries(override)) {
|
|
223
|
+
result[key] = key in base ? mergeManagedJson(base[key], val) : val;
|
|
224
|
+
}
|
|
225
|
+
for (const [key, val] of Object.entries(base)) {
|
|
226
|
+
if (!(key in result))
|
|
227
|
+
result[key] = val;
|
|
228
|
+
}
|
|
229
|
+
return result;
|
|
230
|
+
}
|
|
231
|
+
// ---------------------------------------------------------------------------
|
|
139
232
|
// MCP tracker entry — bkit owns the template's parts of the entry, not the whole entry (#613)
|
|
140
233
|
//
|
|
141
234
|
// - every key the template sets is reset to the template's value
|
|
@@ -223,7 +316,7 @@ export function writeTier2JsonContained(srcPath, dstPath, dryRun, ws) {
|
|
|
223
316
|
return; // idempotent — no change needed
|
|
224
317
|
}
|
|
225
318
|
// Deep-merge: existing base, template override (template wins on conflicts)
|
|
226
|
-
const merged =
|
|
319
|
+
const merged = mergeManagedJson(existing, template);
|
|
227
320
|
const mergedStr = JSON.stringify(merged, null, 2) + "\n";
|
|
228
321
|
if (mergedStr === dstRaw)
|
|
229
322
|
return; // idempotent guard
|
|
@@ -296,8 +389,8 @@ export function writeTier1(srcPath, dstPath, tokens, dryRun, ws) {
|
|
|
296
389
|
// ---------------------------------------------------------------------------
|
|
297
390
|
/**
|
|
298
391
|
* sha256 of the driver (everything outside the managed block) of hook files a bkit
|
|
299
|
-
* release shipped with
|
|
300
|
-
* Register: docs/migrations.md.
|
|
392
|
+
* release shipped with an output the current managed block cannot work through, keyed by
|
|
393
|
+
* consumer path. Register: docs/migrations.md.
|
|
301
394
|
*/
|
|
302
395
|
export const RETIRED_DRIVER_HASHES = {
|
|
303
396
|
// 5.1.0: Claude-shaped `hookSpecificOutput`; Antigravity reads `{ decision, reason }`.
|
|
@@ -307,6 +400,24 @@ export const RETIRED_DRIVER_HASHES = {
|
|
|
307
400
|
".agents/plugins/bkit/hooks/bkit-guardrails.cjs": [
|
|
308
401
|
"8e5d75f7e1a4527889dafa6a250ae370e2acf1b5fc7d58929dfc759489746e14",
|
|
309
402
|
],
|
|
403
|
+
// 5.0.0-6.1.1: emits `additionalContext` only, so the block's `{ verdict: "deny" }` is dropped.
|
|
404
|
+
".claude/hooks/bkit-guardrails.cjs": [
|
|
405
|
+
"dae41b58e61b055c816ef50f35a763949ec99d1c532dccab980c88d21f4c84f3",
|
|
406
|
+
],
|
|
407
|
+
};
|
|
408
|
+
const ANTIGRAVITY_DRIVER_FIX = {
|
|
409
|
+
isStale: (driver) => driver.includes("hookSpecificOutput"),
|
|
410
|
+
fix: 'writes Claude-shaped `hookSpecificOutput`, which Antigravity ignores — the hook never takes effect. Emit the managed block\'s result as Antigravity\'s `{ "decision": "allow" | "deny" | "ask", "reason": "…" }` (only a deny\'s reason reaches the model), or delete the file and re-run `bkit install --antigravity` to get bkit\'s driver.',
|
|
411
|
+
};
|
|
412
|
+
/** Per retired-driver path: what marks an edited driver as stale, and the printed fix. */
|
|
413
|
+
const EDITED_DRIVER_FIXES = {
|
|
414
|
+
".agents/plugins/bkit/hooks/bkit-gateguard.cjs": ANTIGRAVITY_DRIVER_FIX,
|
|
415
|
+
".agents/plugins/bkit/hooks/bkit-guardrails.cjs": ANTIGRAVITY_DRIVER_FIX,
|
|
416
|
+
".claude/hooks/bkit-guardrails.cjs": {
|
|
417
|
+
// An object key, not the 5.0.0-6.1.1 header's "no `permissionDecision` is ever emitted".
|
|
418
|
+
isStale: (driver) => !/permissionDecision["']?\s*:/.test(driver),
|
|
419
|
+
fix: 'never emits a `permissionDecision`, so Claude Code runs every command the managed block refuses. When `bkitGuardrails()` returns `{ verdict: "deny", reason }`, emit `{ hookSpecificOutput: { hookEventName: "PreToolUse", permissionDecision: "deny", permissionDecisionReason: result.reason } }`, or delete the file and re-run `bkit install` to get bkit\'s driver.',
|
|
420
|
+
},
|
|
310
421
|
};
|
|
311
422
|
/** The text outside a file's single managed block, or null without exactly one block. */
|
|
312
423
|
export function driverText(content, markerStyle) {
|
|
@@ -331,8 +442,9 @@ function hasRetiredDriver(dstPath, content, markerStyle) {
|
|
|
331
442
|
return false;
|
|
332
443
|
if (RETIRED_DRIVER_HASHES[key].includes(sha256(driver)))
|
|
333
444
|
return true;
|
|
334
|
-
|
|
335
|
-
|
|
445
|
+
const edited = EDITED_DRIVER_FIXES[key];
|
|
446
|
+
if (edited?.isStale(driver)) {
|
|
447
|
+
console.warn(`[bkit] ${dstPath}: your driver below \`// bkit:end\` ${edited.fix}`);
|
|
336
448
|
}
|
|
337
449
|
return false;
|
|
338
450
|
}
|
package/dist/ledgers/journal.js
CHANGED
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
import * as fs from "node:fs";
|
|
16
16
|
import * as path from "node:path";
|
|
17
17
|
import { parseJson } from "../shared/json.js";
|
|
18
|
-
import { appendLine, statusTimestamp } from "./status.js";
|
|
18
|
+
import { appendLine, appendLocked, statusTimestamp } from "./status.js";
|
|
19
19
|
import { APPEND_LEDGERS, SCHEMA, compareTs, mintTs, resolveRepoSlug, validate, writerProblem, } from "./telemetry.js";
|
|
20
20
|
/** The kill switch: `BKIT_ENGINE_JOURNAL=off` keeps the seam from writing any row. */
|
|
21
21
|
export function journalEnabled(env = process.env) {
|
|
@@ -171,7 +171,7 @@ export function appendJournalRow(file, row) {
|
|
|
171
171
|
* `recurrenceCount` raised by one and `lastConfirmed` = that `ts`. No line is
|
|
172
172
|
* ever rewritten, so a row another writer appends meanwhile is kept.
|
|
173
173
|
*/
|
|
174
|
-
export function appendFrictionRow(bookRoot, row) {
|
|
174
|
+
export function appendFrictionRow(bookRoot, row, options = {}) {
|
|
175
175
|
const checked = validate(row);
|
|
176
176
|
if (!checked.ok)
|
|
177
177
|
return { ok: false, error: checked.reason ?? "invalid friction row" };
|
|
@@ -180,12 +180,14 @@ export function appendFrictionRow(bookRoot, row) {
|
|
|
180
180
|
return { ok: false, error: who };
|
|
181
181
|
const file = path.join(bookRoot, APPEND_LEDGERS.friction.file);
|
|
182
182
|
try {
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
const
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
183
|
+
// The recurrence is computed from the text read under the target lock, so a
|
|
184
|
+
// competing writer can never invalidate the prepared offset or count.
|
|
185
|
+
const landed = appendLocked(file, (text) => {
|
|
186
|
+
const prior = latestSameKey(text, row["key"]);
|
|
187
|
+
const next = prior === undefined ? { ...row, recurrenceCount: 1 } : recurrence(prior, row);
|
|
188
|
+
return `${JSON.stringify(next)}\n`;
|
|
189
|
+
}, { checkpoint: options.checkpoint });
|
|
190
|
+
return { ok: true, receipt: { offset: landed.offset, bytes: landed.bytes } };
|
|
189
191
|
}
|
|
190
192
|
catch (err) {
|
|
191
193
|
return { ok: false, error: err.message };
|
package/dist/ledgers/migrate.js
CHANGED
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
import * as fs from "node:fs";
|
|
8
8
|
import * as path from "node:path";
|
|
9
9
|
import { parseJson } from "../shared/json.js";
|
|
10
|
+
import { pendingLedgerIntentsFor, withTargetLock } from "./status.js";
|
|
10
11
|
import { normalize } from "./telemetry.js";
|
|
11
12
|
/** Every repo ledger whose rows carry the shared top section (`.bkit/jsonl.md`). */
|
|
12
13
|
export const SCHEMA_LEDGERS = [
|
|
@@ -67,15 +68,25 @@ export function migrateLedgers(root, dryRun) {
|
|
|
67
68
|
const abs = path.join(root, file);
|
|
68
69
|
if (!fs.lstatSync(abs, { throwIfNoEntry: false })?.isFile())
|
|
69
70
|
continue;
|
|
70
|
-
const
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
71
|
+
const migrate = () => {
|
|
72
|
+
const { text, rewritten, dropped } = migrateLedgerText(fs.readFileSync(abs, "utf-8"));
|
|
73
|
+
if (rewritten + dropped === 0)
|
|
74
|
+
return undefined;
|
|
75
|
+
if (!dryRun) {
|
|
76
|
+
// A pending ledger operation holds an offset into the current bytes: refuse to move them.
|
|
77
|
+
const pending = pendingLedgerIntentsFor(root, file);
|
|
78
|
+
if (pending.length > 0)
|
|
79
|
+
throw new Error(`${file} has ledger operation(s) with bytes but no receipt (${pending.map((p) => p.operation).join(", ")}); replay them before migrating`);
|
|
80
|
+
const tmp = `${abs}.bkit-migrate.tmp`;
|
|
81
|
+
fs.writeFileSync(tmp, text, "utf-8");
|
|
82
|
+
fs.renameSync(tmp, abs);
|
|
83
|
+
}
|
|
84
|
+
return { file, rewritten, dropped };
|
|
85
|
+
};
|
|
86
|
+
// Read and rewrite under the target lock, so a row appended meanwhile is never dropped.
|
|
87
|
+
const done = dryRun ? migrate() : withTargetLock(abs, migrate);
|
|
88
|
+
if (done !== undefined)
|
|
89
|
+
out.push(done);
|
|
79
90
|
}
|
|
80
91
|
return out;
|
|
81
92
|
}
|