@cbartens/bkit 6.0.0 → 6.1.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 +154 -151
- package/.bkit/core/.agents/context.md +95 -29
- package/.bkit/core/.agents/docs.md +17 -15
- package/.bkit/core/.agents/plugins/bkit/hooks/bkit-gateguard.cjs +1 -0
- package/.bkit/core/.agents/plugins/bkit/hooks/bkit-guardrails.cjs +6 -5
- package/.bkit/core/.agents/plugins/bkit/hooks/bkit-readguard.cjs +1 -0
- package/.bkit/core/.agents/plugins/bkit/hooks/bkit-rules.cjs +65 -0
- package/.bkit/core/.agents/rules.md +108 -107
- package/.bkit/core/.agents/skills.md +63 -15
- package/.bkit/core/.bkit/README.md +154 -151
- package/.bkit/core/.bkit/authoring.md +714 -84
- package/.bkit/core/.bkit/cli.md +407 -0
- package/.bkit/core/.bkit/cloud.md +281 -193
- package/.bkit/core/.bkit/comparison.md +43 -41
- package/.bkit/core/.bkit/install.md +154 -84
- package/.bkit/core/.bkit/jsonl.md +193 -130
- package/.bkit/core/.bkit/pipeline.md +114 -114
- package/.bkit/core/.bkit/prompts.md +272 -165
- package/.bkit/core/.bkit/providers.md +457 -271
- package/.bkit/core/.bkit/router.md +69 -0
- package/.bkit/core/.bkit/templates.md +529 -256
- package/.bkit/core/.bkit/trackers.md +80 -52
- package/.bkit/core/.bkit/workflows.md +589 -504
- package/.bkit/core/.claude/hooks/bkit-gateguard.cjs +2 -2
- package/.bkit/core/.claude/hooks/bkit-guardrails.cjs +3 -3
- package/.bkit/core/.claude/hooks/bkit-preflight.sh +45 -14
- package/.bkit/core/.codex/hooks/bkit-guardrails.cjs +3 -3
- package/.bkit/core/.codex/hooks/bkit-rules.cjs +57 -0
- package/.bkit/core/.cursor/hooks/bkit-guardrails.cjs +7 -7
- package/.bkit/core/.cursor/hooks/bkit-preflight.sh +47 -12
- package/.bkit/core/.opencode/plugin/bkit-rules.js +89 -0
- package/.bkit/core/AGENTS.md +5 -73
- package/.bkit/core/docs/templates/bkit-audit-accessibility.md +127 -105
- package/.bkit/core/docs/templates/bkit-audit-adoption.md +104 -70
- package/.bkit/core/docs/templates/bkit-audit-agents.md +94 -72
- package/.bkit/core/docs/templates/bkit-audit-aio-seo.md +99 -78
- package/.bkit/core/docs/templates/bkit-audit-analytics.md +140 -82
- package/.bkit/core/docs/templates/bkit-audit-annotations.md +98 -72
- package/.bkit/core/docs/templates/bkit-audit-app-performance.md +121 -96
- package/.bkit/core/docs/templates/bkit-audit-app-store.md +157 -76
- package/.bkit/core/docs/templates/bkit-audit-architecture.md +113 -71
- package/.bkit/core/docs/templates/bkit-audit-ci-performance.md +75 -72
- package/.bkit/core/docs/templates/bkit-audit-config.md +122 -76
- package/.bkit/core/docs/templates/bkit-audit-cost.md +85 -74
- package/.bkit/core/docs/templates/bkit-audit-coverage.md +75 -68
- package/.bkit/core/docs/templates/bkit-audit-database.md +101 -70
- package/.bkit/core/docs/templates/bkit-audit-dead-code.md +164 -83
- package/.bkit/core/docs/templates/bkit-audit-deferrals.md +115 -86
- package/.bkit/core/docs/templates/bkit-audit-dependencies.md +264 -88
- package/.bkit/core/docs/templates/bkit-audit-documentation.md +118 -93
- package/.bkit/core/docs/templates/bkit-audit-duplication.md +139 -86
- package/.bkit/core/docs/templates/bkit-audit-failures.md +110 -81
- package/.bkit/core/docs/templates/bkit-audit-flakes.md +99 -74
- package/.bkit/core/docs/templates/bkit-audit-gates.md +105 -77
- package/.bkit/core/docs/templates/bkit-audit-issues.md +104 -80
- package/.bkit/core/docs/templates/bkit-audit-llm.md +131 -58
- package/.bkit/core/docs/templates/bkit-audit-logs.md +123 -100
- package/.bkit/core/docs/templates/bkit-audit-models.md +98 -53
- package/.bkit/core/docs/templates/bkit-audit-privacy.md +56 -52
- package/.bkit/core/docs/templates/bkit-audit-prompts.md +63 -54
- package/.bkit/core/docs/templates/bkit-audit-red-team.md +124 -68
- package/.bkit/core/docs/templates/bkit-audit-reliability.md +95 -70
- package/.bkit/core/docs/templates/bkit-audit-repo.md +169 -73
- package/.bkit/core/docs/templates/bkit-audit-security.md +206 -96
- package/.bkit/core/docs/templates/bkit-audit-slop.md +77 -70
- package/.bkit/core/docs/templates/bkit-audit-testing.md +162 -114
- package/.bkit/core/docs/templates/bkit-audit-usability.md +113 -71
- package/.bkit/core/docs/templates/bkit-plan.md +138 -132
- package/.bkit/core/engine/checks/after/auth.ts +40 -37
- package/.bkit/core/engine/checks/after/ci-yml.ts +65 -2
- package/.bkit/core/engine/checks/after/index.ts +12 -2
- package/.bkit/core/engine/checks/after/tools.ts +80 -33
- package/.bkit/core/engine/checks/before/context-fetch.ts +227 -33
- package/.bkit/core/engine/checks/before/env.ts +1 -1
- package/.bkit/core/engine/checks/before/index.ts +7 -0
- package/.bkit/core/engine/checks/before/repo.ts +40 -0
- package/.bkit/core/engine/checks/status-holes.ts +916 -123
- package/.bkit/core/engine/checks/tips/catalogue.ts +68 -17
- package/.bkit/core/engine/checks/tips/detect.ts +32 -0
- package/.bkit/core/engine/checks/tips/index.ts +47 -6
- package/.bkit/core/engine/cli.ts +238 -84
- package/.bkit/core/engine/commands/analysis.ts +128 -76
- package/.bkit/core/engine/commands/ci/ci.ts +363 -29
- package/.bkit/core/engine/commands/ci/pins.ts +172 -0
- package/.bkit/core/engine/commands/ci/push-gate.ts +223 -0
- package/.bkit/core/engine/commands/install/uninstall.ts +21 -27
- package/.bkit/core/engine/commands/install/upgrade.ts +32 -15
- package/.bkit/core/engine/commands/land.ts +126 -11
- package/.bkit/core/engine/commands/lib.ts +303 -6
- package/.bkit/core/engine/commands/registry.ts +6 -2
- package/.bkit/core/engine/commands/setup/setup.ts +1 -0
- package/.bkit/core/engine/commands/stats.ts +91 -35
- package/.bkit/core/engine/commands/workflow/branches.ts +1477 -117
- package/.bkit/core/engine/commands/workflow/challenge.ts +114 -39
- package/.bkit/core/engine/commands/workflow/completeness.ts +109 -0
- package/.bkit/core/engine/commands/workflow/context.ts +433 -55
- package/.bkit/core/engine/commands/workflow/counters.ts +244 -39
- package/.bkit/core/engine/commands/workflow/decisions.ts +61 -17
- package/.bkit/core/engine/commands/workflow/disk.ts +237 -55
- package/.bkit/core/engine/commands/workflow/fids.ts +19 -1
- package/.bkit/core/engine/commands/workflow/issues.ts +6 -0
- package/.bkit/core/engine/commands/workflow/ledgers.ts +458 -18
- package/.bkit/core/engine/commands/workflow/locks.ts +2 -0
- package/.bkit/core/engine/commands/workflow/plan-blocks.ts +124 -15
- package/.bkit/core/engine/commands/workflow/plans.ts +257 -0
- package/.bkit/core/engine/commands/workflow/prs.ts +12 -3
- package/.bkit/core/engine/commands/workflow/repo.ts +8 -0
- package/.bkit/core/engine/commands/workflow/roadmap.ts +56 -15
- package/.bkit/core/engine/commands/workflow/run-facts.ts +22 -31
- package/.bkit/core/engine/commands/workflow/runs.ts +652 -34
- package/.bkit/core/engine/commands/workflow/runtime.ts +3 -0
- package/.bkit/core/engine/commands/workflow/skills.ts +1 -0
- package/.bkit/core/engine/commands/workflow/status.ts +200 -17
- package/.bkit/core/engine/commands/workflow/step-table.ts +75 -33
- package/.bkit/core/engine/commands/workflow/steps.ts +635 -24
- package/.bkit/core/engine/commands/workflow/summary-findings.ts +177 -0
- package/.bkit/core/engine/commands/workflow/summary.ts +192 -46
- package/.bkit/core/engine/commands/workflow/tasks.ts +409 -0
- package/.bkit/core/engine/commands/workflow/test-blocks.ts +254 -0
- package/.bkit/core/engine/commands/workflow/tests-changed.ts +201 -0
- package/.bkit/core/engine/commands/workflow/tests.ts +1285 -356
- package/.bkit/core/engine/commands/workflow/workflows.ts +228 -43
- package/.bkit/core/engine/commands/workflow/worktrees.ts +389 -47
- package/.bkit/core/engine/install/cloud-env.ts +251 -121
- package/.bkit/core/engine/install/context-ci-workflow.ts +102 -0
- package/.bkit/core/engine/install/manifest.ts +60 -12
- package/.bkit/core/engine/install/modules/antigravity.ts +3 -2
- package/.bkit/core/engine/install/modules/cloud.ts +3 -3
- package/.bkit/core/engine/install/modules/codex.ts +15 -2
- package/.bkit/core/engine/install/modules/core.ts +956 -52
- package/.bkit/core/engine/install/modules/cursor.ts +6 -6
- package/.bkit/core/engine/install/modules/opencode.ts +16 -4
- package/.bkit/core/engine/install/template-notes.ts +130 -0
- package/.bkit/core/engine/install/version-file.ts +3 -2
- package/.bkit/core/engine/install/write.ts +5 -0
- package/.bkit/core/engine/ledgers/compact.ts +124 -0
- package/.bkit/core/engine/ledgers/journal.ts +291 -0
- package/.bkit/core/engine/ledgers/status.ts +160 -9
- package/.bkit/core/engine/ledgers/telemetry.ts +158 -21
- package/.bkit/core/engine/render/hosts.ts +114 -14
- package/.bkit/core/engine/shared/bkit-latest.ts +26 -4
- package/.bkit/core/engine/shared/dep-updater.ts +60 -0
- package/.bkit/core/engine/shared/egress.ts +1 -1
- package/.bkit/core/engine/shared/package-manager.ts +9 -0
- package/.bkit/core/engine/shared/settings.ts +92 -17
- package/.bkit/core/engine/shared/timeouts.ts +2 -0
- package/.bkit/core/engine/tools/cli-doc.ts +111 -0
- package/.bkit/core/engine/tools/grammar-density.ts +1 -1
- package/.bkit/core/engine/tools/instructions-sources.ts +15 -17
- package/.bkit/core/engine/tools/instructions.ts +94 -43
- package/.bkit/core/hooks/antigravity-hook.js +25 -10
- package/.bkit/core/hooks/gateguard-engine.js +53 -29
- package/.bkit/core/hooks/guardrails-shell.js +4 -4
- package/.bkit/core/hooks/guardrails-tiers.js +3 -3
- package/.bkit/core/hooks/preflight-linear.sh +9 -9
- package/.bkit/core/hooks/preflight-rules.sh +8 -0
- package/.bkit/core/hooks/readguard-engine.js +29 -10
- package/.bkit/core/hooks/session-rules-advisory.js +61 -0
- package/.bkit/core/prompts/bkit-audit-generate.md +187 -116
- package/.bkit/core/prompts/bkit-build-challenge-1.md +56 -37
- package/.bkit/core/prompts/bkit-build-challenge-2.md +65 -45
- package/.bkit/core/prompts/bkit-build-install-skills.md +38 -29
- package/.bkit/core/prompts/bkit-build-plan-convert.md +43 -32
- package/.bkit/core/prompts/bkit-build-plan-current.md +49 -39
- package/.bkit/core/prompts/bkit-build-plan-gaps-remediate.md +79 -55
- package/.bkit/core/prompts/bkit-build-plan-tasks.md +149 -0
- package/.bkit/core/prompts/bkit-build-plan-tests.md +120 -0
- package/.bkit/core/prompts/bkit-build-plan-verify.md +87 -50
- package/.bkit/core/prompts/bkit-debug-abort-handover.md +36 -35
- package/.bkit/core/prompts/bkit-debug-failure-diagnose.md +96 -64
- package/.bkit/core/prompts/bkit-debug-failure-remediate.md +54 -45
- package/.bkit/core/prompts/bkit-debug-failure-reproduce.md +42 -33
- package/.bkit/core/prompts/bkit-debug-failure-soak.md +53 -37
- package/.bkit/core/prompts/bkit-design-brainstorm-ideate-1.md +35 -30
- package/.bkit/core/prompts/bkit-design-brainstorm-ideate-2.md +34 -29
- package/.bkit/core/prompts/bkit-design-brainstorm-ideate-3.md +32 -28
- package/.bkit/core/prompts/bkit-design-generate.md +68 -52
- package/.bkit/core/prompts/bkit-design-organise.md +73 -35
- package/.bkit/core/prompts/bkit-design-review-1.md +58 -54
- package/.bkit/core/prompts/bkit-design-review-2.md +54 -50
- package/.bkit/core/prompts/bkit-design-spike.md +54 -47
- package/.bkit/core/prompts/bkit-design-update.md +42 -31
- package/.bkit/core/prompts/bkit-plan-generate.md +76 -58
- package/.bkit/core/prompts/bkit-plan-review-1.md +63 -49
- package/.bkit/core/prompts/bkit-plan-review-2.md +60 -48
- package/.bkit/core/prompts/bkit-plan-scope-check.md +53 -46
- package/.bkit/core/prompts/bkit-plan-update.md +70 -52
- package/.bkit/core/prompts/bkit-ship-conflict-resolve.md +82 -50
- package/.bkit/core/prompts/bkit-ship-deferred-sweep.md +80 -45
- package/.bkit/core/prompts/bkit-ship-update-docs.md +35 -29
- package/.bkit/core/prompts/bkit-utility-compress-markdown.md +55 -49
- package/.bkit/core/prompts/bkit-utility-update-decisions.md +76 -49
- package/.bkit/core/prompts/bkit-utility-update-deferrals.md +70 -41
- package/.bkit/core/prompts/bkit-utility-update-documentation.md +33 -30
- package/.bkit/core/prompts/bkit-utility-update-failures.md +73 -43
- package/.bkit/core/prompts/bkit-utility-update-knowledge.md +77 -50
- package/.bkit/core/prompts/bkit-utility-update-roadmap.md +77 -45
- package/.bkit/core/prompts/bkit-utility-update-tracker.md +144 -68
- package/.bkit/core/workflows/bkit-auto.md +53 -30
- package/.bkit/core/workflows/bkit-build.md +635 -304
- package/.bkit/core/workflows/bkit-debug.md +301 -148
- package/.bkit/core/workflows/bkit-design.md +167 -95
- package/.bkit/core/workflows/bkit-plan.md +172 -84
- package/.bkit/core/workflows/bkit-ship.md +299 -152
- package/.bkit/shared/.agents/plugins/bkit/hooks.json +10 -0
- package/.bkit/shared/.claude/bkit-cloud.md +12 -10
- package/.bkit/shared/.claude/settings.json +3 -0
- package/.bkit/shared/.codex/bkit-cloud.md +98 -0
- package/.bkit/shared/.codex/hooks.json +20 -0
- package/.bkit/shared/.cursor/bkit-cloud.md +3 -3
- package/.bkit/shared/.opencode/opencode.json +1 -1
- package/.bkit/shared/CLAUDE.md +5 -1
- package/.bkit/shared/GEMINI.md +4 -1
- package/.bkit/shared/docs/architecture.md +4 -7
- package/.bkit/shared/docs/data-schema.md +4 -7
- package/.bkit/shared/docs/deployments.md +239 -166
- package/.bkit/shared/docs/design.md +11 -12
- package/.bkit/shared/docs/noise.md +8 -7
- package/.bkit/shared/docs/observability.md +5 -8
- package/.bkit/shared/docs/security.md +35 -17
- package/.bkit/shared/docs/setup.md +29 -18
- package/.bkit/shared/docs/technology.md +3 -6
- package/.bkit/shared/docs/testing.md +282 -176
- package/.bkit/shared/gitignore +6 -2
- package/.bkit/templates/.claude/hooks/bkit-cloud-bootstrap.sh +15 -16
- package/.bkit/templates/.cursor/Dockerfile +12 -8
- package/.bkit/templates/.cursor/environment.json +1 -1
- package/.bkit/templates/.github/ISSUE_TEMPLATE/bkit-bug.yml +10 -8
- package/.bkit/templates/.github/ISSUE_TEMPLATE/bkit-change.yml +24 -12
- package/.bkit/templates/.github/ISSUE_TEMPLATE/bkit-idea.yml +3 -3
- package/.bkit/templates/.github/renovate.json5 +34 -6
- package/.bkit/templates/.github/workflows/bkit-ci.yml +53 -50
- package/.bkit/templates/.github/workflows/bkit-cloud.yml +13 -14
- package/.bkit/templates/.github/workflows/bkit-health.yml +97 -0
- package/.bkit/templates/.github/workflows/bkit-renovate.yml +5 -4
- package/.bkit/templates/.github/workflows/bkit-trivy.yml +5 -4
- package/.bkit/templates/.husky/pre-commit +2 -2
- package/.bkit/templates/.husky/pre-push +95 -35
- package/.bkit/templates/.prettierignore +6 -7
- package/.bkit/templates/.vale.ini +27 -27
- package/.bkit/templates/context/bkit-cloudrun.md +23 -15
- package/.bkit/templates/context/bkit-expo.md +70 -52
- package/.bkit/templates/context/bkit-github.md +93 -56
- package/.bkit/templates/context/bkit-inngest.md +21 -15
- package/.bkit/templates/context/bkit-maestro.md +22 -16
- package/.bkit/templates/context/bkit-playwright.md +23 -17
- package/.bkit/templates/context/bkit-resend.md +12 -10
- package/.bkit/templates/context/bkit-sentry.md +30 -20
- package/.bkit/templates/context/bkit-serena.md +8 -7
- package/.bkit/templates/context/bkit-stripe.md +14 -13
- package/.bkit/templates/context/bkit-supabase.md +16 -13
- package/.bkit/templates/context/bkit-tavily.md +14 -11
- package/.bkit/templates/context/bkit-vercel.md +27 -18
- package/.bkit/templates/docs/capabilities.md +15 -14
- package/.bkit/templates/scripts/ci/{check-accepted-divergences.mjs → bkit-check-accepted-divergences.mjs} +6 -3
- package/.bkit/templates/scripts/ci/{check-accepted-divergences.test.mjs → bkit-check-accepted-divergences.test.mjs} +3 -3
- package/.bkit/templates/scripts/ci/{check-capstone.mjs → bkit-check-capstone.mjs} +2 -2
- package/.bkit/templates/scripts/ci/{check-capstone.test.mjs → bkit-check-capstone.test.mjs} +4 -4
- package/.bkit/templates/scripts/ci/{check-dependency-audit.mjs → bkit-check-dependency-audit.mjs} +103 -18
- package/.bkit/templates/scripts/ci/{check-dependency-audit.test.mjs → bkit-check-dependency-audit.test.mjs} +31 -3
- package/.bkit/templates/scripts/ci/bkit-machine-lock.sh +387 -0
- package/.bkit/templates/scripts/ci/bkit-test-awake.mjs +75 -0
- package/.bkit/templates/scripts/ci/bkit-test-awake.test.mjs +160 -0
- package/.bkit/templates/scripts/ci/lanes/{resolve-push-base.mjs → bkit-resolve-push-base.mjs} +3 -3
- package/.bkit/templates/scripts/ci/lanes/{resolve-push-base.test.mjs → bkit-resolve-push-base.test.mjs} +4 -4
- package/.bkit/templates/scripts/cleanup/bkit-disk-prune.mjs +9 -1
- package/.bkit/templates/scripts/graphify/bkit-graph-drift.py +1 -1
- package/.bkit/templates/scripts/graphify/bkit-graph-eager.py +3 -3
- package/.bkit/templates/scripts/graphify/bkit-graph-embed.py +63 -0
- package/.bkit/templates/scripts/graphify/bkit-graph-imports.py +2 -2
- package/.bkit/templates/scripts/graphify/bkit-graph-pre-push.sh +69 -18
- package/.bkit/templates/scripts/graphify/bkit-graph-repair.py +3 -3
- package/.bkit/templates/scripts/graphify/bkit-graph-surface.py +1 -1
- package/.bkit/templates/scripts/graphify/bkit-graphify-graphml.py +1 -1
- package/.bkit/templates/scripts/graphify/bkit-graphify-rollup.py +197 -126
- package/.bkit/templates/scripts/graphify/bkit-graphify.sh +64 -41
- package/.bkit/templates/scripts/slop/bkit-slop-type-suppression.mjs +23 -7
- package/.bkit/templates/slop-scan.config.json +9 -2
- package/CHANGELOG.md +119 -0
- package/README.md +250 -76
- package/dist/checks/after/auth.js +36 -33
- package/dist/checks/after/ci-yml.js +52 -2
- package/dist/checks/after/index.js +12 -4
- package/dist/checks/after/tools.js +73 -33
- package/dist/checks/before/context-fetch.js +218 -33
- package/dist/checks/before/env.js +1 -1
- package/dist/checks/before/index.js +6 -2
- package/dist/checks/before/repo.js +35 -1
- package/dist/checks/status-holes.js +739 -114
- package/dist/checks/tips/catalogue.js +59 -17
- package/dist/checks/tips/detect.js +30 -0
- package/dist/checks/tips/index.js +48 -6
- package/dist/cli.js +222 -84
- package/dist/commands/analysis.js +77 -53
- package/dist/commands/ci/ci.js +302 -25
- package/dist/commands/ci/pins.js +142 -0
- package/dist/commands/ci/push-gate.js +194 -0
- package/dist/commands/install/uninstall.js +23 -27
- package/dist/commands/install/upgrade.js +21 -11
- package/dist/commands/land.js +126 -10
- package/dist/commands/lib.js +244 -5
- package/dist/commands/registry.js +6 -2
- package/dist/commands/setup/setup.js +1 -0
- package/dist/commands/stats.js +69 -30
- package/dist/commands/workflow/branches.js +1232 -111
- package/dist/commands/workflow/challenge.js +90 -37
- package/dist/commands/workflow/completeness.js +97 -0
- package/dist/commands/workflow/context.js +371 -51
- package/dist/commands/workflow/counters.js +206 -40
- package/dist/commands/workflow/decisions.js +60 -17
- package/dist/commands/workflow/disk.js +213 -55
- package/dist/commands/workflow/fids.js +18 -1
- package/dist/commands/workflow/issues.js +6 -0
- package/dist/commands/workflow/ledgers.js +372 -21
- package/dist/commands/workflow/locks.js +2 -0
- package/dist/commands/workflow/plan-blocks.js +78 -14
- package/dist/commands/workflow/plans.js +205 -0
- package/dist/commands/workflow/prs.js +12 -3
- package/dist/commands/workflow/repo.js +6 -0
- package/dist/commands/workflow/roadmap.js +50 -17
- package/dist/commands/workflow/run-facts.js +23 -28
- package/dist/commands/workflow/runs.js +530 -33
- package/dist/commands/workflow/runtime.js +3 -0
- package/dist/commands/workflow/skills.js +1 -0
- package/dist/commands/workflow/status.js +166 -19
- package/dist/commands/workflow/step-table.js +61 -29
- package/dist/commands/workflow/steps.js +542 -26
- package/dist/commands/workflow/summary-findings.js +117 -0
- package/dist/commands/workflow/summary.js +154 -41
- package/dist/commands/workflow/tasks.js +378 -0
- package/dist/commands/workflow/test-blocks.js +231 -0
- package/dist/commands/workflow/tests-changed.js +172 -0
- package/dist/commands/workflow/tests.js +1013 -321
- package/dist/commands/workflow/workflows.js +191 -38
- package/dist/commands/workflow/worktrees.js +310 -42
- package/dist/install/cloud-env.js +233 -99
- package/dist/install/context-ci-workflow.js +85 -0
- package/dist/install/manifest.js +57 -12
- package/dist/install/modules/antigravity.js +3 -2
- package/dist/install/modules/cloud.js +3 -3
- package/dist/install/modules/codex.js +12 -2
- package/dist/install/modules/core.js +851 -53
- package/dist/install/modules/cursor.js +6 -6
- package/dist/install/modules/opencode.js +11 -5
- package/dist/install/template-notes.js +116 -0
- package/dist/install/version-file.js +3 -2
- package/dist/ledgers/compact.js +87 -0
- package/dist/ledgers/journal.js +233 -0
- package/dist/ledgers/status.js +115 -5
- package/dist/ledgers/telemetry.js +121 -17
- package/dist/render/hosts.js +100 -14
- package/dist/shared/bkit-latest.js +26 -4
- package/dist/shared/dep-updater.js +49 -0
- package/dist/shared/egress.js +1 -1
- package/dist/shared/package-manager.js +6 -0
- package/dist/shared/settings.js +59 -10
- package/dist/shared/timeouts.js +2 -0
- package/dist/tools/cli-doc.js +97 -0
- package/dist/tools/grammar-density.js +1 -1
- package/dist/tools/instructions-sources.js +15 -16
- package/dist/tools/instructions.js +83 -39
- package/package.json +58 -42
- package/.bkit/core/.bkit/lite.md +0 -73
- package/.bkit/core/engine/commands/workflow/workstreams.ts +0 -172
- package/.bkit/core/prompts/bkit-build-plan-execute.md +0 -124
- package/.bkit/templates/scripts/ci/bkit-local-stack-lock.sh +0 -194
- package/dist/commands/workflow/workstreams.js +0 -149
- /package/.bkit/templates/.vale/styles/{House → Bkit}/Filler.yml +0 -0
- /package/.bkit/templates/.vale/styles/{House → Bkit}/Hedging.yml +0 -0
- /package/.bkit/templates/.vale/styles/{House → Bkit}/LLMSlop.yml +0 -0
- /package/.bkit/templates/.vale/styles/{House → Bkit}/Verbose.yml +0 -0
- /package/.bkit/templates/scripts/ci/{accepted-advisories.json → bkit-accepted-advisories.json} +0 -0
- /package/.bkit/templates/scripts/ci/{accepted-divergences.json → bkit-accepted-divergences.json} +0 -0
- /package/.bkit/templates/scripts/launchd/{launchd.env.example → bkit-launchd.env.example} +0 -0
- /package/.bkit/templates/scripts/launchd/{ai.bkit.launchd.plist → bkit-launchd.plist} +0 -0
|
@@ -14,11 +14,13 @@
|
|
|
14
14
|
// builds against superseded work.
|
|
15
15
|
|
|
16
16
|
import { spawnSync } from "node:child_process";
|
|
17
|
+
import { createHash } from "node:crypto";
|
|
17
18
|
import * as fs from "node:fs";
|
|
18
19
|
import * as path from "node:path";
|
|
19
20
|
|
|
20
|
-
import { lastRun } from "../../ledgers/status.js";
|
|
21
|
-
import { gitEnv } from "../../ledgers/telemetry.js";
|
|
21
|
+
import { actionHash, actionKey, lastRun, recordAction } from "../../ledgers/status.js";
|
|
22
|
+
import { APPEND_LEDGERS, gitEnv } from "../../ledgers/telemetry.js";
|
|
23
|
+
import { parseJson } from "../../shared/json.js";
|
|
22
24
|
import { readBkitConfig } from "../../shared/settings.js";
|
|
23
25
|
import { COULD_NOT_RUN_EXIT_CODES, installCommand } from "../../shared/package-manager.js";
|
|
24
26
|
import {
|
|
@@ -26,8 +28,10 @@ import {
|
|
|
26
28
|
DEV,
|
|
27
29
|
EXIT,
|
|
28
30
|
git,
|
|
31
|
+
isIgnoredPath,
|
|
29
32
|
isSharedBranch,
|
|
30
33
|
MAIN,
|
|
34
|
+
mainCheckoutRoot,
|
|
31
35
|
repoRoot,
|
|
32
36
|
runGit,
|
|
33
37
|
type CommandSpec,
|
|
@@ -190,9 +194,64 @@ export function devBase(cwd: string, log?: (m: string) => void): string {
|
|
|
190
194
|
return ORIGIN_DEV;
|
|
191
195
|
}
|
|
192
196
|
|
|
197
|
+
/** Workflows whose close lands docs and ledgers only: their branch may carry no unpushed dev work. */
|
|
198
|
+
const DOCS_ONLY_WORKFLOWS: readonly string[] = ["design", "plan"];
|
|
199
|
+
|
|
200
|
+
/**
|
|
201
|
+
* The ref a feature branch starts from and rebases onto. A docs-only workflow
|
|
202
|
+
* (design, plan) always starts from `origin/dev`: its close lands docs and
|
|
203
|
+
* ledgers on `origin/dev` and may carry nothing else, so a branch holding
|
|
204
|
+
* unpushed `dev` commits could never land (issue #639). Every other workflow
|
|
205
|
+
* keeps `devBase`'s choice — local `dev` while it is a fast-forward of `origin/dev`.
|
|
206
|
+
*/
|
|
207
|
+
export function worktreeBase(cwd: string, workflow: string, log?: (m: string) => void): string {
|
|
208
|
+
if (!DOCS_ONLY_WORKFLOWS.includes(workflow)) return devBase(cwd, log);
|
|
209
|
+
const local = git(cwd, ["rev-parse", "-q", "--verify", `refs/heads/${DEV}`]);
|
|
210
|
+
const remote = git(cwd, ["rev-parse", "-q", "--verify", `refs/remotes/${ORIGIN_DEV}`]);
|
|
211
|
+
if (
|
|
212
|
+
local !== null &&
|
|
213
|
+
remote !== null &&
|
|
214
|
+
local !== remote &&
|
|
215
|
+
runGit(cwd, ["merge-base", "--is-ancestor", remote, local]).ok
|
|
216
|
+
) {
|
|
217
|
+
const count = git(cwd, ["rev-list", "--count", `${remote}..${local}`]) ?? "?";
|
|
218
|
+
log?.(
|
|
219
|
+
`local ${DEV} is ${count} commit(s) ahead of ${ORIGIN_DEV} — basing this ${workflow} branch on ${ORIGIN_DEV}: its close lands docs and ledgers only`,
|
|
220
|
+
);
|
|
221
|
+
}
|
|
222
|
+
return ORIGIN_DEV;
|
|
223
|
+
}
|
|
224
|
+
|
|
225
|
+
/**
|
|
226
|
+
* The commits `branch` carries that local `dev` holds and `origin/dev` does not:
|
|
227
|
+
* work inherited from unpushed `dev`. A docs-only close lands on `origin/dev` and
|
|
228
|
+
* may bring docs and ledgers only, so such a branch can never land.
|
|
229
|
+
*/
|
|
230
|
+
function inheritedDevCommits(root: string, branch: string): string[] {
|
|
231
|
+
const unpushed = new Set(
|
|
232
|
+
(git(root, ["rev-list", `${ORIGIN_DEV}..${DEV}`]) ?? "").split("\n").filter(Boolean),
|
|
233
|
+
);
|
|
234
|
+
if (unpushed.size === 0) return [];
|
|
235
|
+
return (git(root, ["rev-list", branch, "--not", ORIGIN_DEV]) ?? "")
|
|
236
|
+
.split("\n")
|
|
237
|
+
.filter((c) => unpushed.has(c));
|
|
238
|
+
}
|
|
239
|
+
|
|
240
|
+
/** Why a docs-only branch carrying unpushed `dev` cannot land, and what unblocks it. */
|
|
241
|
+
function inheritedDevRefusal(
|
|
242
|
+
root: string,
|
|
243
|
+
target: string,
|
|
244
|
+
workflow: string,
|
|
245
|
+
count: number,
|
|
246
|
+
): string {
|
|
247
|
+
const ahead = git(root, ["rev-list", "--count", `${ORIGIN_DEV}..${DEV}`]) ?? "?";
|
|
248
|
+
const tip = git(root, ["rev-parse", "--short", DEV]) ?? DEV;
|
|
249
|
+
return `${target} carries ${count} commit(s) of unpushed ${DEV} (tip ${tip}, ${ahead} commit(s) ahead of ${ORIGIN_DEV}), and a ${workflow} close lands docs and ledgers only — this branch cannot land. Publish ${DEV} (git push origin ${DEV}), then re-run.`;
|
|
250
|
+
}
|
|
251
|
+
|
|
193
252
|
/**
|
|
194
253
|
* `git worktree add` for `branch`: the local branch, else a tracking branch off
|
|
195
|
-
* `origin`, else (when `mayCreate`) a new branch off `
|
|
254
|
+
* `origin`, else (when `mayCreate`) a new branch off `worktreeBase` after a fresh
|
|
196
255
|
* fetch. Returns false when there was nothing to add and `mayCreate` is off.
|
|
197
256
|
*/
|
|
198
257
|
function addWorktree(
|
|
@@ -200,6 +259,7 @@ function addWorktree(
|
|
|
200
259
|
wt: string,
|
|
201
260
|
branch: string,
|
|
202
261
|
mayCreate: boolean,
|
|
262
|
+
workflow: string,
|
|
203
263
|
log: (m: string) => void,
|
|
204
264
|
): boolean {
|
|
205
265
|
let args: string[];
|
|
@@ -215,7 +275,7 @@ function addWorktree(
|
|
|
215
275
|
args = [wt, "--track", "-b", branch, `origin/${branch}`];
|
|
216
276
|
} else if (mayCreate) {
|
|
217
277
|
fetchBranch(root, DEV);
|
|
218
|
-
args = [wt, "-b", branch,
|
|
278
|
+
args = [wt, "-b", branch, worktreeBase(root, workflow, log)];
|
|
219
279
|
} else {
|
|
220
280
|
return false;
|
|
221
281
|
}
|
|
@@ -225,6 +285,24 @@ function addWorktree(
|
|
|
225
285
|
return true;
|
|
226
286
|
}
|
|
227
287
|
|
|
288
|
+
/**
|
|
289
|
+
* An engine-action row for a rebase that rewrote the branch, keyed on the tip it
|
|
290
|
+
* replaced, so the run's record shows the rewrite. Nothing when HEAD did not move.
|
|
291
|
+
*/
|
|
292
|
+
export function recordRebase(
|
|
293
|
+
statusFile: string,
|
|
294
|
+
before: string | null,
|
|
295
|
+
after: string | null,
|
|
296
|
+
): void {
|
|
297
|
+
if (before === null || after === null || before === after) return;
|
|
298
|
+
recordAction(statusFile, {
|
|
299
|
+
action: "rebase",
|
|
300
|
+
key: actionKey("rebase", before),
|
|
301
|
+
hash: actionHash(`${before}..${after}`),
|
|
302
|
+
ref: after,
|
|
303
|
+
});
|
|
304
|
+
}
|
|
305
|
+
|
|
228
306
|
function rebaseInProgress(wt: string): boolean {
|
|
229
307
|
return ["rebase-merge", "rebase-apply"].some((p) => {
|
|
230
308
|
const dir = git(wt, ["rev-parse", "--path-format=absolute", "--git-path", p]);
|
|
@@ -233,16 +311,136 @@ function rebaseInProgress(wt: string): boolean {
|
|
|
233
311
|
}
|
|
234
312
|
|
|
235
313
|
/**
|
|
236
|
-
*
|
|
237
|
-
*
|
|
238
|
-
*
|
|
314
|
+
* bkit's own worktree copy entry, excluded from every bkit commit beside
|
|
315
|
+
* `bkit.workflows.worktree.copy`: it holds the sign-in tokens, and a consumer whose
|
|
316
|
+
* `.gitignore` lost bkit's `.bkit/.env` line would otherwise commit a link to them.
|
|
239
317
|
*/
|
|
240
|
-
export
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
318
|
+
export const BKIT_OWN_COPY: readonly string[] = [".bkit/.env"];
|
|
319
|
+
|
|
320
|
+
/** A normalized copy entry inside the checkout: neither absolute nor climbing out with `..`. */
|
|
321
|
+
const insideCheckout = (rel: string) =>
|
|
322
|
+
!path.isAbsolute(rel) && rel !== ".." && !rel.startsWith(`..${path.sep}`);
|
|
323
|
+
|
|
324
|
+
/**
|
|
325
|
+
* Every `bkit.workflows.worktree.copy` entry setup may have copied into `tree`: the
|
|
326
|
+
* tree's own `package.json` list and the main checkout's, which setup copies by and
|
|
327
|
+
* which an uncommitted edit or the feature branch can make differ.
|
|
328
|
+
*/
|
|
329
|
+
function worktreeCopyLists(tree: string): string[] {
|
|
330
|
+
const main = mainCheckoutRoot(tree) ?? tree;
|
|
331
|
+
return [...new Set([...readBkitConfig(tree).worktreeCopy, ...readBkitConfig(main).worktreeCopy])];
|
|
332
|
+
}
|
|
333
|
+
|
|
334
|
+
/**
|
|
335
|
+
* `:(exclude)` pathspecs for the entries setup copies into `tree` (`copied`, default
|
|
336
|
+
* every list that may name one) and `BKIT_OWN_COPY`. An entry outside the tree is left
|
|
337
|
+
* out: git refuses it as a pathspec (exit 128) and setup never copies it. So is one git
|
|
338
|
+
* already ignores: naming it in a `:(exclude)` pathspec trips git's ignored-paths guard
|
|
339
|
+
* and fails the whole `add`, and `git add -A` skips an ignored file anyway.
|
|
340
|
+
*/
|
|
341
|
+
export function copyExcludes(tree: string, copied: string[] = worktreeCopyLists(tree)): string[] {
|
|
342
|
+
return [...copied, ...BKIT_OWN_COPY]
|
|
343
|
+
.map((e) => path.normalize(e))
|
|
344
|
+
.filter((e) => insideCheckout(e) && !isIgnoredPath(tree, e))
|
|
345
|
+
.map((e) => `:(exclude)${e}`);
|
|
346
|
+
}
|
|
347
|
+
|
|
348
|
+
/**
|
|
349
|
+
* `git add -A` in `tree`, leaving out the entries setup copies in from the main
|
|
350
|
+
* checkout (`.env` and the like) and `BKIT_OWN_COPY` (`copyExcludes`): no bkit commit
|
|
351
|
+
* may carry them, gitignored or not.
|
|
352
|
+
*/
|
|
353
|
+
export function addAllButCopied(tree: string, copied?: string[]): ReturnType<typeof runGit> {
|
|
354
|
+
return runGit(tree, ["add", "-A", "--", ".", ...copyExcludes(tree, copied)]);
|
|
355
|
+
}
|
|
356
|
+
|
|
357
|
+
/** Whether `wt` holds changes beyond the entries setup copies in (`copyExcludes`). */
|
|
358
|
+
export const hasLeftovers = (wt: string) =>
|
|
359
|
+
(git(wt, ["status", "--porcelain", "--untracked-files=all", "--", ".", ...copyExcludes(wt)]) ??
|
|
360
|
+
"") !== "";
|
|
361
|
+
|
|
362
|
+
/** A tracked file split into its committed text and the rows appended after it. */
|
|
363
|
+
type Appended = { committed: string; rows: string };
|
|
364
|
+
|
|
365
|
+
/**
|
|
366
|
+
* The rows the dispatch seam appended after the last commit, by tracked path, when they
|
|
367
|
+
* are the only changes in `wt`: `engine-call` rows at the end of `statusFile`, and
|
|
368
|
+
* `friction` rows at the end of `.bkit/friction.jsonl` (a hook-launched command's
|
|
369
|
+
* unexpected exit). Null when anything else changed.
|
|
370
|
+
*/
|
|
371
|
+
function journalRowsAppended(wt: string, statusFile: string): Map<string, Appended> | null {
|
|
372
|
+
const allowed = new Map<string, (row: Record<string, unknown>) => boolean>([
|
|
373
|
+
[path.relative(wt, statusFile), (row) => row["type"] === "engine-call"],
|
|
374
|
+
[APPEND_LEDGERS.friction.file, (row) => row["kind"] === "friction"],
|
|
375
|
+
]);
|
|
376
|
+
const changed = (
|
|
377
|
+
git(wt, ["status", "--porcelain", "--untracked-files=all", "--", ".", ...copyExcludes(wt)]) ??
|
|
378
|
+
""
|
|
379
|
+
)
|
|
380
|
+
.split("\n")
|
|
381
|
+
.filter((l) => l !== "");
|
|
382
|
+
if (changed.length === 0) return null;
|
|
383
|
+
const out = new Map<string, Appended>();
|
|
384
|
+
for (const line of changed) {
|
|
385
|
+
const rel = [...allowed.keys()].find((r) => line.endsWith(` ${r}`));
|
|
386
|
+
const appended = rel === undefined ? null : appendedRows(wt, rel, allowed.get(rel)!);
|
|
387
|
+
if (rel === undefined || appended === null) return null;
|
|
388
|
+
out.set(rel, appended);
|
|
389
|
+
}
|
|
390
|
+
return out;
|
|
391
|
+
}
|
|
392
|
+
|
|
393
|
+
/** `rel` as its committed text plus one or more appended rows `accepts` takes; null otherwise. */
|
|
394
|
+
function appendedRows(
|
|
395
|
+
wt: string,
|
|
396
|
+
rel: string,
|
|
397
|
+
accepts: (row: Record<string, unknown>) => boolean,
|
|
398
|
+
): Appended | null {
|
|
399
|
+
const committed = git(wt, ["cat-file", "blob", `HEAD:${rel}`]);
|
|
400
|
+
const file = path.join(wt, rel);
|
|
401
|
+
if (committed === null || !fs.existsSync(file)) return null;
|
|
402
|
+
const text = fs.readFileSync(file, "utf-8");
|
|
403
|
+
if (!text.startsWith(committed)) return null;
|
|
404
|
+
// `git` trims its output: the committed text's own last newline comes back with it.
|
|
405
|
+
const rest = text.slice(committed.length);
|
|
406
|
+
const lead = rest.startsWith("\n") ? "\n" : "";
|
|
407
|
+
const rows = rest.slice(lead.length);
|
|
408
|
+
const added = rows.split("\n").filter((l) => l.trim() !== "");
|
|
409
|
+
const ok =
|
|
410
|
+
added.length > 0 &&
|
|
411
|
+
added.every((l) => {
|
|
412
|
+
const parsed = parseJson(l);
|
|
413
|
+
return (
|
|
414
|
+
parsed.ok &&
|
|
415
|
+
parsed.value !== null &&
|
|
416
|
+
typeof parsed.value === "object" &&
|
|
417
|
+
!Array.isArray(parsed.value) &&
|
|
418
|
+
accepts(parsed.value as Record<string, unknown>)
|
|
419
|
+
);
|
|
420
|
+
});
|
|
421
|
+
return ok ? { committed: text.slice(0, committed.length) + lead, rows } : null;
|
|
422
|
+
}
|
|
423
|
+
|
|
424
|
+
/**
|
|
425
|
+
* Appends the rows `journalRowsAppended` set aside back onto their files and returns "".
|
|
426
|
+
* A rebase that stopped part-way cannot continue past unstaged rows, so then nothing is
|
|
427
|
+
* appended and the rows come back as text for the rebase log.
|
|
428
|
+
*/
|
|
429
|
+
function putJournalRowsBack(wt: string, journal: Map<string, Appended>): string {
|
|
430
|
+
if (rebaseInProgress(wt)) {
|
|
431
|
+
return [...journal]
|
|
432
|
+
.map(
|
|
433
|
+
([rel, a]) =>
|
|
434
|
+
`rows set aside from ${rel}; append them once the rebase finishes:\n${a.rows}`,
|
|
435
|
+
)
|
|
436
|
+
.join("");
|
|
437
|
+
}
|
|
438
|
+
for (const [rel, a] of journal) {
|
|
439
|
+
const file = path.join(wt, rel);
|
|
440
|
+
const text = fs.existsSync(file) ? fs.readFileSync(file, "utf-8") : "";
|
|
441
|
+
fs.appendFileSync(file, `${text !== "" && !text.endsWith("\n") ? "\n" : ""}${a.rows}`);
|
|
442
|
+
}
|
|
443
|
+
return "";
|
|
246
444
|
}
|
|
247
445
|
|
|
248
446
|
/**
|
|
@@ -250,34 +448,49 @@ export function addAllButCopied(
|
|
|
250
448
|
* resume rebase can start: a failed ship's flush lands its record on dev and
|
|
251
449
|
* leaves the worktree as it was, for whatever runs next. An untracked file in a
|
|
252
450
|
* log folder of this feature that `onto` already holds is dropped first: dev's
|
|
253
|
-
* copy, landed by that flush, wins, and a second copy would stop the rebase.
|
|
254
|
-
*
|
|
255
|
-
*
|
|
451
|
+
* copy, landed by that flush, wins, and a second copy would stop the rebase. One
|
|
452
|
+
* whose content differs from `onto`'s is moved to the feature's outbox folder
|
|
453
|
+
* (`dropped-logs/{time}/`), never deleted. The entries setup copies in are never
|
|
454
|
+
* committed and alone do not count as leftovers. No leftovers → null; a failed
|
|
455
|
+
* commit is narrated and leaves the tree for the rebase to refuse.
|
|
256
456
|
*/
|
|
257
457
|
function carryLeftovers(
|
|
258
458
|
wt: string,
|
|
259
|
-
o: { fid: string; onto: string; statusFile: string
|
|
459
|
+
o: { fid: string; onto: string; statusFile: string },
|
|
260
460
|
log: (m: string) => void,
|
|
261
461
|
): { sha: string | null; dropped: string[] } | null {
|
|
262
|
-
|
|
263
|
-
if (!dirty()) return null;
|
|
462
|
+
if (!hasLeftovers(wt)) return null;
|
|
264
463
|
const logs = new RegExp(`^docs/plans/[^/]+/logs/${o.fid.replace(/\./g, "\\.")}/`);
|
|
265
464
|
const dropped = (git(wt, ["ls-files", "--others", "--exclude-standard"]) ?? "")
|
|
266
465
|
.split("\n")
|
|
267
466
|
.filter((f) => logs.test(f) && runGit(wt, ["cat-file", "-e", `${o.onto}:${f}`]).ok);
|
|
268
|
-
|
|
467
|
+
const keepDir = path.join(
|
|
468
|
+
path.dirname(ownershipMarker(wt, o.fid)),
|
|
469
|
+
"dropped-logs",
|
|
470
|
+
new Date().toISOString().replace(/[:.]/g, "-"),
|
|
471
|
+
);
|
|
472
|
+
for (const f of dropped) {
|
|
473
|
+
const file = path.join(wt, f);
|
|
474
|
+
if (git(wt, ["hash-object", "--", f]) !== git(wt, ["rev-parse", `${o.onto}:${f}`])) {
|
|
475
|
+
const kept = path.join(keepDir, f);
|
|
476
|
+
fs.mkdirSync(path.dirname(kept), { recursive: true });
|
|
477
|
+
fs.cpSync(file, kept);
|
|
478
|
+
log(`moved ${f} to ${kept}: it differs from ${o.onto}'s copy, which wins in the worktree`);
|
|
479
|
+
}
|
|
480
|
+
fs.rmSync(file);
|
|
481
|
+
}
|
|
269
482
|
if (dropped.length > 0)
|
|
270
483
|
log(
|
|
271
484
|
`dropped ${dropped.length} untracked log(s) ${o.onto} already holds: ${dropped.join(", ")}`,
|
|
272
485
|
);
|
|
273
|
-
if (!
|
|
486
|
+
if (!hasLeftovers(wt)) return { sha: null, dropped };
|
|
274
487
|
|
|
275
488
|
const prior = fs.existsSync(o.statusFile) ? readRuns(o.statusFile).at(-1) : undefined;
|
|
276
489
|
const what =
|
|
277
490
|
prior === undefined
|
|
278
491
|
? "uncommitted work left in the worktree"
|
|
279
492
|
: `the ${prior.status === "FAILED" ? "failed " : ""}${prior.workflow} record left uncommitted`;
|
|
280
|
-
addAllButCopied(wt
|
|
493
|
+
addAllButCopied(wt);
|
|
281
494
|
const made = runGit(wt, ["commit", "-m", `chore(${o.fid}): carry ${what} bkit`]);
|
|
282
495
|
if (!made.ok) {
|
|
283
496
|
log(`could not commit what an earlier run left in ${wt}: ${made.stderr || made.stdout}`);
|
|
@@ -297,7 +510,7 @@ function copyListed(root: string, wt: string, entries: string[], log: (m: string
|
|
|
297
510
|
const copyMissing: string[] = [];
|
|
298
511
|
for (const entry of entries) {
|
|
299
512
|
const rel = path.normalize(entry);
|
|
300
|
-
if (
|
|
513
|
+
if (!insideCheckout(rel)) {
|
|
301
514
|
log(`worktree copy: ${entry} is outside the main checkout — skipped`);
|
|
302
515
|
continue;
|
|
303
516
|
}
|
|
@@ -315,6 +528,73 @@ function copyListed(root: string, wt: string, entries: string[], log: (m: string
|
|
|
315
528
|
return { copied, copyMissing };
|
|
316
529
|
}
|
|
317
530
|
|
|
531
|
+
/** What `linkBkitEnv` did with a worktree's `.bkit/.env` (the `bkitEnv` output key). */
|
|
532
|
+
export type BkitEnvState = "linked" | "unchanged" | "copied" | "differs" | "none" | "failed";
|
|
533
|
+
|
|
534
|
+
const sha256 = (content: Buffer) => createHash("sha256").update(content).digest("hex");
|
|
535
|
+
|
|
536
|
+
/**
|
|
537
|
+
* bkit's own token file, `.bkit/.env`, in a worktree. `copyListed` covers the app env
|
|
538
|
+
* files a repo configures; this one is bkit's, and it is gitignored — so a fresh
|
|
539
|
+
* checkout has none, `.envrc`'s `dotenv_if_exists .bkit/.env` loads nothing and says
|
|
540
|
+
* nothing, and every sign-in here fails with nothing looking wrong.
|
|
541
|
+
*
|
|
542
|
+
* Link to the main checkout's copy: one source of truth, so rotating a token needs no
|
|
543
|
+
* second edit and no copy goes stale. Fall back to a copy where the filesystem refuses
|
|
544
|
+
* a symlink, recording its hash in the feature's outbox folder (`.bkit-env-copy`): a
|
|
545
|
+
* copy bkit made is replaced on the next setup, so a rotated token reaches it too. Any
|
|
546
|
+
* other regular file that differs from the main checkout's is left for a human to read,
|
|
547
|
+
* like a differing `.envrc`; `none` means the main checkout holds no `.bkit/.env` to
|
|
548
|
+
* bring in, which the tip and the advisory then report; `failed` means neither the link
|
|
549
|
+
* nor the copy could be written, narrated.
|
|
550
|
+
*/
|
|
551
|
+
function linkBkitEnv(
|
|
552
|
+
root: string,
|
|
553
|
+
wt: string,
|
|
554
|
+
fid: string,
|
|
555
|
+
log: (m: string) => void,
|
|
556
|
+
): BkitEnvState {
|
|
557
|
+
const main = path.join(root, ".bkit", ".env");
|
|
558
|
+
if (!fs.existsSync(main)) return "none";
|
|
559
|
+
const dest = path.join(wt, ".bkit", ".env");
|
|
560
|
+
const record = path.join(path.dirname(ownershipMarker(root, fid)), ".bkit-env-copy");
|
|
561
|
+
// lstat, so a dangling link is seen (and replaced) rather than followed and missed.
|
|
562
|
+
const stat = fs.lstatSync(dest, { throwIfNoEntry: false });
|
|
563
|
+
if (stat?.isSymbolicLink() && fs.existsSync(dest)) return "unchanged";
|
|
564
|
+
if (stat?.isFile()) {
|
|
565
|
+
const here = fs.readFileSync(dest);
|
|
566
|
+
const bkitMade = fs.existsSync(record) && fs.readFileSync(record, "utf-8") === sha256(here);
|
|
567
|
+
if (!bkitMade && !here.equals(fs.readFileSync(main))) {
|
|
568
|
+
log(
|
|
569
|
+
`bkit-env: ${dest} differs from the main checkout's — left as it is; delete it to link the main checkout's copy`,
|
|
570
|
+
);
|
|
571
|
+
return "differs";
|
|
572
|
+
}
|
|
573
|
+
}
|
|
574
|
+
fs.mkdirSync(path.dirname(dest), { recursive: true });
|
|
575
|
+
fs.rmSync(dest, { recursive: true, force: true });
|
|
576
|
+
try {
|
|
577
|
+
fs.symlinkSync(main, dest);
|
|
578
|
+
fs.rmSync(record, { force: true });
|
|
579
|
+
return "linked";
|
|
580
|
+
} catch (err) {
|
|
581
|
+
try {
|
|
582
|
+
fs.cpSync(main, dest);
|
|
583
|
+
} catch (copyErr) {
|
|
584
|
+
log(
|
|
585
|
+
`bkit-env: could not link or copy the main checkout's .bkit/.env to ${dest} (${(err as Error).message}; ${(copyErr as Error).message}) — sign-ins in this worktree fail until it is there`,
|
|
586
|
+
);
|
|
587
|
+
return "failed";
|
|
588
|
+
}
|
|
589
|
+
fs.mkdirSync(path.dirname(record), { recursive: true });
|
|
590
|
+
fs.writeFileSync(record, sha256(fs.readFileSync(dest)));
|
|
591
|
+
log(
|
|
592
|
+
`bkit-env: symlink failed (${(err as Error).message}) — copied the main checkout's .bkit/.env`,
|
|
593
|
+
);
|
|
594
|
+
return "copied";
|
|
595
|
+
}
|
|
596
|
+
}
|
|
597
|
+
|
|
318
598
|
/**
|
|
319
599
|
* `direnv allow` the worktree's `.envrc` when it matches the main checkout's
|
|
320
600
|
* byte for byte, so the worktree inherits the trust given there and nothing
|
|
@@ -478,6 +758,7 @@ export const worktreesCommand: CommandSpec = {
|
|
|
478
758
|
verbs: {
|
|
479
759
|
setup: {
|
|
480
760
|
summary: "Create, resume or adopt the feature's worktree (Step 2 — Worktree Setup).",
|
|
761
|
+
use: "workflow",
|
|
481
762
|
flags: [
|
|
482
763
|
WORKFLOW_FLAG,
|
|
483
764
|
FID_FLAG,
|
|
@@ -495,7 +776,7 @@ export const worktreesCommand: CommandSpec = {
|
|
|
495
776
|
{
|
|
496
777
|
name: "branch",
|
|
497
778
|
type: "string",
|
|
498
|
-
help: "ship
|
|
779
|
+
help: "ship or debug: an existing branch the session prompt names; debug refuses a conflicting checkout",
|
|
499
780
|
},
|
|
500
781
|
{
|
|
501
782
|
name: "issue",
|
|
@@ -521,9 +802,11 @@ export const worktreesCommand: CommandSpec = {
|
|
|
521
802
|
carriedSha:
|
|
522
803
|
"resume: the commit holding what an earlier run left uncommitted (a failed ship's record), made before the rebase; else null",
|
|
523
804
|
carriedDropped:
|
|
524
|
-
"resume: untracked logs of this feature dropped because baseRef already holds them (dev's copy wins)",
|
|
805
|
+
"resume: untracked logs of this feature dropped because baseRef already holds them (dev's copy wins); one whose content differs is first moved to the feature's outbox folder (dropped-logs/), named in the log",
|
|
525
806
|
copied: "worktree copy entries copied from the main checkout",
|
|
526
807
|
copyMissing: "worktree copy entries absent from the main checkout",
|
|
808
|
+
bkitEnv:
|
|
809
|
+
"bkit's own .bkit/.env: linked to the main checkout's copy, or copied where a symlink is refused (a copy bkit made is refreshed on the next setup); unchanged when already linked, differs when a differing file was left to read, none when the main checkout holds none, failed when neither the link nor the copy could be written, null in adopt mode",
|
|
527
810
|
direnvAllowed:
|
|
528
811
|
"direnv allow ran on the worktree's .envrc (present and identical to the main checkout's)",
|
|
529
812
|
installed: "dependencies were installed",
|
|
@@ -539,7 +822,7 @@ export const worktreesCommand: CommandSpec = {
|
|
|
539
822
|
[EXIT_INSTALL]: "dependency install failed",
|
|
540
823
|
[EXIT_INSTALL_COULD_NOT_RUN]: "the package manager could not run (exit 126 / 127)",
|
|
541
824
|
[EXIT_REFUSED]:
|
|
542
|
-
"refused: main as the working branch (dev too, except debug in place), ship of dev / main, detached HEAD,
|
|
825
|
+
"refused: main as the working branch (dev too, except debug in place), ship of dev / main, detached HEAD, ship could not switch to its branch (a missing feat/{fid} is named), or a design / plan branch carrying unpushed dev commits (publish dev, then re-run)",
|
|
543
826
|
[EXIT_WORKTREE_ADD]: "git worktree add failed",
|
|
544
827
|
[EXIT_REBASE_NOT_STARTED]:
|
|
545
828
|
"resume rebase could not start, even after committing what an earlier run left (e.g. a commit hook refused that commit)",
|
|
@@ -559,8 +842,8 @@ export const worktreesCommand: CommandSpec = {
|
|
|
559
842
|
const month = String(f.month);
|
|
560
843
|
if (!/^[0-9]{6}$/.test(month)) throw new CommandError(EXIT.USAGE, "--month must be YYYYMM");
|
|
561
844
|
const named = f.branch === undefined ? undefined : String(f.branch);
|
|
562
|
-
if (named !== undefined && workflow !== "ship") {
|
|
563
|
-
throw new CommandError(EXIT.USAGE, "--branch is ship only");
|
|
845
|
+
if (named !== undefined && workflow !== "ship" && workflow !== "debug") {
|
|
846
|
+
throw new CommandError(EXIT.USAGE, "--branch is ship or debug only");
|
|
564
847
|
}
|
|
565
848
|
if (f.issue !== undefined && workflow !== "ship") {
|
|
566
849
|
throw new CommandError(EXIT.USAGE, "--issue is ship only");
|
|
@@ -578,8 +861,13 @@ export const worktreesCommand: CommandSpec = {
|
|
|
578
861
|
"detached HEAD — check out a branch before debugging",
|
|
579
862
|
);
|
|
580
863
|
}
|
|
581
|
-
const target =
|
|
582
|
-
|
|
864
|
+
const target =
|
|
865
|
+
workflow === "ship"
|
|
866
|
+
? shipBranch(root, fid, named, session)
|
|
867
|
+
: workflow === "debug" && named
|
|
868
|
+
? named
|
|
869
|
+
: `feat/${fid}`;
|
|
870
|
+
if (isSharedBranch(target) && !(workflow === "debug" && target === DEV)) {
|
|
583
871
|
throw new CommandError(
|
|
584
872
|
EXIT_REFUSED,
|
|
585
873
|
workflow === "ship"
|
|
@@ -587,6 +875,17 @@ export const worktreesCommand: CommandSpec = {
|
|
|
587
875
|
: `refusing to ship ${target} as a feature branch`,
|
|
588
876
|
);
|
|
589
877
|
}
|
|
878
|
+
if (
|
|
879
|
+
workflow === "debug" &&
|
|
880
|
+
named &&
|
|
881
|
+
!hasLocal(root, target) &&
|
|
882
|
+
!runGit(root, ["show-ref", "--verify", "--quiet", `refs/remotes/origin/${target}`]).ok
|
|
883
|
+
) {
|
|
884
|
+
throw new CommandError(
|
|
885
|
+
EXIT_REFUSED,
|
|
886
|
+
`${target} does not exist — debug adopts an existing branch`,
|
|
887
|
+
);
|
|
888
|
+
}
|
|
590
889
|
|
|
591
890
|
// Ship mints only when the session is not already on the branch it ships:
|
|
592
891
|
// that branch cannot be checked out in two places.
|
|
@@ -616,10 +915,21 @@ export const worktreesCommand: CommandSpec = {
|
|
|
616
915
|
`${wtDir} is not a registered git worktree`,
|
|
617
916
|
);
|
|
618
917
|
}
|
|
918
|
+
if (
|
|
919
|
+
workflow === "debug" &&
|
|
920
|
+
named &&
|
|
921
|
+
git(wtDir, ["branch", "--show-current"]) !== target
|
|
922
|
+
) {
|
|
923
|
+
throw new CommandError(
|
|
924
|
+
EXIT_REFUSED,
|
|
925
|
+
`${wtDir} is on another branch; requested ${target} — leave its work intact and use the matching checkout`,
|
|
926
|
+
);
|
|
927
|
+
}
|
|
619
928
|
mode = "resumed";
|
|
620
929
|
} else if (workflow !== "debug" || session !== target) {
|
|
621
930
|
// Debug adopts an existing feat/{fid}; it never mints a branch of its own.
|
|
622
|
-
if (addWorktree(root, wtDir, target, workflow !== "debug", ctx.log))
|
|
931
|
+
if (addWorktree(root, wtDir, target, workflow !== "debug", workflow, ctx.log))
|
|
932
|
+
mode = "created";
|
|
623
933
|
}
|
|
624
934
|
}
|
|
625
935
|
const wt = mode === "adopted" ? root : wtDir;
|
|
@@ -627,6 +937,12 @@ export const worktreesCommand: CommandSpec = {
|
|
|
627
937
|
const marker = ownershipMarker(root, fid);
|
|
628
938
|
|
|
629
939
|
if (mode === "adopted") {
|
|
940
|
+
if (workflow === "debug" && named && git(root, ["branch", "--show-current"]) !== target) {
|
|
941
|
+
throw new CommandError(
|
|
942
|
+
EXIT_REFUSED,
|
|
943
|
+
`adopt mode: checkout does not hold requested ${target}; use its existing checkout or enable worktrees`,
|
|
944
|
+
);
|
|
945
|
+
}
|
|
630
946
|
if (workflow === "ship" && git(root, ["branch", "--show-current"]) !== target) {
|
|
631
947
|
const sw = runGit(root, ["switch", target]);
|
|
632
948
|
if (!sw.ok) {
|
|
@@ -665,6 +981,19 @@ export const worktreesCommand: CommandSpec = {
|
|
|
665
981
|
let sentinel: string | null = null;
|
|
666
982
|
let carried: ReturnType<typeof carryLeftovers> = null;
|
|
667
983
|
const sentinelPath = path.join(logDir, ".rebase-failed");
|
|
984
|
+
// A docs-only branch cannot land while it carries unpushed dev work: refuse
|
|
985
|
+
// now, not after the whole phase. Checked before the resume rebase, which
|
|
986
|
+
// replays such commits under new SHAs this commit-by-commit check no longer
|
|
987
|
+
// knows; the close itself names them then.
|
|
988
|
+
if (DOCS_ONLY_WORKFLOWS.includes(workflow) && mode !== "adopted") {
|
|
989
|
+
const inherited = inheritedDevCommits(root, target);
|
|
990
|
+
if (inherited.length > 0) {
|
|
991
|
+
throw new CommandError(
|
|
992
|
+
EXIT_REFUSED,
|
|
993
|
+
inheritedDevRefusal(root, target, workflow, inherited.length),
|
|
994
|
+
);
|
|
995
|
+
}
|
|
996
|
+
}
|
|
668
997
|
if (mode === "resumed" && workflow !== "ship") {
|
|
669
998
|
// Cleared before every attempt: a sentinel left by an earlier run would
|
|
670
999
|
// send this one to the Failure Path after a clean rebase.
|
|
@@ -674,28 +1003,37 @@ export const worktreesCommand: CommandSpec = {
|
|
|
674
1003
|
failure = {
|
|
675
1004
|
conflict: true,
|
|
676
1005
|
detail: "a rebase is already in progress",
|
|
677
|
-
onto:
|
|
1006
|
+
onto: worktreeBase(wt, workflow),
|
|
678
1007
|
};
|
|
679
1008
|
} else {
|
|
680
1009
|
fetchBranch(wt, DEV);
|
|
681
|
-
const onto =
|
|
682
|
-
|
|
683
|
-
|
|
684
|
-
|
|
685
|
-
|
|
686
|
-
|
|
687
|
-
|
|
688
|
-
|
|
689
|
-
|
|
690
|
-
|
|
691
|
-
|
|
692
|
-
const
|
|
1010
|
+
const onto = worktreeBase(wt, workflow, ctx.log);
|
|
1011
|
+
const statusFile = path.join(logDir, "status.jsonl");
|
|
1012
|
+
carried = carryLeftovers(wt, { fid, onto, statusFile }, ctx.log);
|
|
1013
|
+
// Journal rows a hook appended after the carry commit go aside by hand and
|
|
1014
|
+
// back after the rebase, never through `--autostash`: a dev that appended to
|
|
1015
|
+
// the same file makes the autostash pop conflict, and git still exits 0.
|
|
1016
|
+
const journal = hasLeftovers(wt) ? journalRowsAppended(wt, statusFile) : null;
|
|
1017
|
+
for (const [rel, a] of journal ?? []) fs.writeFileSync(path.join(wt, rel), a.committed);
|
|
1018
|
+
// A tracked copy entry setup copied over (a committed placeholder `.env`) is
|
|
1019
|
+
// never committed, so the rebase sets it aside and puts it back. Only when
|
|
1020
|
+
// nothing else is left: a refused carry commit still stops the rebase.
|
|
1021
|
+
const aside = hasLeftovers(wt) ? [] : ["--autostash"];
|
|
1022
|
+
const before = git(wt, ["rev-parse", "HEAD"]);
|
|
1023
|
+
const rb = runGit(wt, ["rebase", "--rebase-merges", ...aside, onto]);
|
|
1024
|
+
const unput = journal === null ? "" : putJournalRowsBack(wt, journal);
|
|
693
1025
|
// The rebase replays the carry commit on top: report the replayed one.
|
|
694
1026
|
if (rb.ok && carried?.sha) carried.sha = git(wt, ["rev-parse", "HEAD"]);
|
|
1027
|
+
if (rb.ok)
|
|
1028
|
+
recordRebase(
|
|
1029
|
+
path.join(logDir, "status.jsonl"),
|
|
1030
|
+
before,
|
|
1031
|
+
git(wt, ["rev-parse", "HEAD"]),
|
|
1032
|
+
);
|
|
695
1033
|
if (!rb.ok) {
|
|
696
1034
|
failure = {
|
|
697
1035
|
conflict: rebaseInProgress(wt),
|
|
698
|
-
detail: [rb.stdout, rb.stderr].filter(Boolean).join("\n"),
|
|
1036
|
+
detail: [rb.stdout, rb.stderr, unput].filter(Boolean).join("\n"),
|
|
699
1037
|
onto,
|
|
700
1038
|
};
|
|
701
1039
|
}
|
|
@@ -724,11 +1062,13 @@ export const worktreesCommand: CommandSpec = {
|
|
|
724
1062
|
const { copied, copyMissing } = done
|
|
725
1063
|
? copyListed(root, wt, config.worktreeCopy, ctx.log)
|
|
726
1064
|
: { copied: [], copyMissing: [] };
|
|
1065
|
+
const bkitEnv = done ? linkBkitEnv(root, wt, fid, ctx.log) : null;
|
|
727
1066
|
const direnvAllowed = done && allowDirenv(root, wt, ctx.log);
|
|
728
|
-
const wantInstall =
|
|
1067
|
+
const wantInstall =
|
|
1068
|
+
done && config.worktreeInstall && fs.existsSync(path.join(wt, "package.json"));
|
|
729
1069
|
const installStatus = wantInstall ? install(wt, ctx.log) : 0;
|
|
730
1070
|
|
|
731
|
-
const baseRef =
|
|
1071
|
+
const baseRef = worktreeBase(wt, workflow);
|
|
732
1072
|
const branch = git(wt, ["branch", "--show-current"]) ?? "";
|
|
733
1073
|
const branchWarning =
|
|
734
1074
|
workflow === "ship"
|
|
@@ -751,6 +1091,7 @@ export const worktreesCommand: CommandSpec = {
|
|
|
751
1091
|
carriedDropped: carried?.dropped ?? [],
|
|
752
1092
|
copied,
|
|
753
1093
|
copyMissing,
|
|
1094
|
+
bkitEnv,
|
|
754
1095
|
direnvAllowed,
|
|
755
1096
|
installed: wantInstall && installStatus === 0,
|
|
756
1097
|
...(shared === undefined
|
|
@@ -775,6 +1116,7 @@ export const worktreesCommand: CommandSpec = {
|
|
|
775
1116
|
remove: {
|
|
776
1117
|
summary:
|
|
777
1118
|
"Remove .worktrees/{fid} when a workflow created it, prune stale entries, and delete the feature branch.",
|
|
1119
|
+
use: "workflow",
|
|
778
1120
|
flags: [
|
|
779
1121
|
FID_FLAG,
|
|
780
1122
|
{
|