mandrel 2.0.0 → 2.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/.agents/README.md +59 -28
- package/.agents/agents/acceptance-critic.md +20 -9
- package/.agents/agents/story-worker.md +45 -48
- package/.agents/audit-checklists/performance.md +1 -1
- package/.agents/docs/SDLC.md +60 -46
- package/.agents/docs/agentrc-reference.json +8 -13
- package/.agents/docs/configuration.md +33 -57
- package/.agents/docs/execution-reference.md +39 -10
- package/.agents/docs/quality-gates.md +17 -19
- package/.agents/docs/workflows.md +6 -6
- package/.agents/instructions.md +64 -79
- package/.agents/rules/ci-remediation.md +3 -3
- package/.agents/rules/gherkin-standards.md +10 -0
- package/.agents/rules/git-conventions-reference.md +42 -51
- package/.agents/schemas/acceptance-eval-verdict.schema.json +2 -2
- package/.agents/schemas/agentrc.schema.json +35 -46
- package/.agents/schemas/audit-rules.json +59 -1
- package/.agents/schemas/audit-rules.schema.json +33 -1
- package/.agents/schemas/lifecycle/README.md +1 -2
- package/.agents/schemas/lifecycle/ledger-record.schema.json +1 -1
- package/.agents/schemas/lifecycle/merge.flip-failed.schema.json +33 -0
- package/.agents/schemas/lifecycle/merge.unlanded.schema.json +1 -0
- package/.agents/schemas/lifecycle/story.merged.schema.json +1 -1
- package/.agents/schemas/signal-event.schema.json +3 -3
- package/.agents/schemas/story-deliver-terminal.schema.json +152 -0
- package/.agents/schemas/validation-evidence.schema.json +1 -1
- package/.agents/scripts/acceptance-eval.js +24 -68
- package/.agents/scripts/agents-bootstrap-github.js +1 -1
- package/.agents/scripts/bootstrap.js +3 -3
- package/.agents/scripts/check-dead-exports.js +43 -104
- package/.agents/scripts/check-doc-links.js +2 -2
- package/.agents/scripts/check-lifecycle-lint.js +1 -1
- package/.agents/scripts/check-workflow-cli-lint.js +91 -0
- package/.agents/scripts/deliver-recover.js +122 -0
- package/.agents/scripts/drain-pending-cleanup.js +1 -1
- package/.agents/scripts/evidence-gate.js +20 -50
- package/.agents/scripts/generate-skills-index.js +17 -1
- package/.agents/scripts/generate-workflows-doc.js +4 -4
- package/.agents/scripts/lib/ITicketingProvider.js +1 -19
- package/.agents/scripts/lib/audit-suite/selector.js +323 -23
- package/.agents/scripts/lib/baselines/kinds/maintainability.js +0 -11
- package/.agents/scripts/lib/bootstrap/ci-workflow-template.js +28 -33
- package/.agents/scripts/lib/bootstrap/manifest.js +8 -11
- package/.agents/scripts/lib/bootstrap/project-bootstrap.js +30 -53
- package/.agents/scripts/lib/bootstrap/quality-bootstrap.js +0 -2
- package/.agents/scripts/lib/checks/core-bare-clean.js +4 -1
- package/.agents/scripts/lib/checks/index.js +1 -1
- package/.agents/scripts/lib/checks/loop-health.js +12 -11
- package/.agents/scripts/lib/checks/state.js +17 -248
- package/.agents/scripts/lib/checks/story-init-not-backgrounded.js +3 -3
- package/.agents/scripts/lib/checks/subagent-agent-tool-required.js +3 -4
- package/.agents/scripts/lib/checks/worktree-bootstrap-env.js +2 -2
- package/.agents/scripts/lib/checks/worktree-residue-biome.js +3 -3
- package/.agents/scripts/lib/cli-args.js +23 -2
- package/.agents/scripts/lib/close-validation/gates.js +13 -13
- package/.agents/scripts/lib/close-validation/projections/inputs.js +7 -7
- package/.agents/scripts/lib/close-validation/projections/maintainability.js +12 -12
- package/.agents/scripts/lib/close-validation/runner.js +13 -21
- package/.agents/scripts/lib/close-validation/telemetry.js +17 -8
- package/.agents/scripts/lib/config/acceptance-eval.js +2 -2
- package/.agents/scripts/lib/config/delivery-routing.js +7 -6
- package/.agents/scripts/lib/config/explain.js +10 -16
- package/.agents/scripts/lib/config/github.js +7 -5
- package/.agents/scripts/lib/config/limits.js +15 -25
- package/.agents/scripts/lib/config/quality.js +11 -14
- package/.agents/scripts/lib/config/runners.js +8 -21
- package/.agents/scripts/lib/config/temp-paths.js +18 -56
- package/.agents/scripts/lib/config-settings-schema-delivery.js +34 -16
- package/.agents/scripts/lib/config-settings-schema-quality.js +9 -2
- package/.agents/scripts/lib/config-settings-schema.js +48 -22
- package/.agents/scripts/lib/dead-exports-knip.js +105 -0
- package/.agents/scripts/lib/dead-exports-mode.js +51 -0
- package/.agents/scripts/lib/duplicate-search.js +38 -7
- package/.agents/scripts/lib/findings/promote-finding.js +23 -14
- package/.agents/scripts/lib/format-generated-json.js +97 -0
- package/.agents/scripts/lib/framework-version.js +19 -189
- package/.agents/scripts/lib/gh-exec.js +8 -0
- package/.agents/scripts/lib/git-branch-lifecycle.js +0 -158
- package/.agents/scripts/lib/git-utils.js +0 -14
- package/.agents/scripts/lib/json-utils.js +1 -2
- package/.agents/scripts/lib/label-constants.js +0 -15
- package/.agents/scripts/lib/label-taxonomy.js +1 -12
- package/.agents/scripts/lib/observability/active-story-env.js +42 -163
- package/.agents/scripts/lib/observability/runtime-friction.js +243 -0
- package/.agents/scripts/lib/observability/signal-validator.js +4 -4
- package/.agents/scripts/lib/observability/signals-writer.js +6 -82
- package/.agents/scripts/lib/observability/source-classifier.js +2 -2
- package/.agents/scripts/lib/observability/tool-trace-hook.js +2 -12
- package/.agents/scripts/lib/orchestration/acceptance-clusters.js +1 -1
- package/.agents/scripts/lib/orchestration/acceptance-eval-decision.js +2 -2
- package/.agents/scripts/lib/orchestration/ceremony-routing.js +43 -45
- package/.agents/scripts/lib/orchestration/change-set.js +103 -0
- package/.agents/scripts/lib/orchestration/code-review.js +70 -191
- package/.agents/scripts/lib/orchestration/consolidation-precondition.js +3 -3
- package/.agents/scripts/lib/orchestration/deliver-recover.js +328 -0
- package/.agents/scripts/lib/orchestration/detectors-phase.js +12 -6
- package/.agents/scripts/lib/orchestration/git-cleanup/phases/fast-forward.js +34 -0
- package/.agents/scripts/lib/orchestration/lease-guard-shared.js +3 -2
- package/.agents/scripts/lib/orchestration/lifecycle/emit-ledger-event.js +142 -0
- package/.agents/scripts/lib/orchestration/lifecycle/emit-loop-tick.js +9 -11
- package/.agents/scripts/lib/orchestration/lifecycle/emit-merge-flip-failed.js +86 -0
- package/.agents/scripts/lib/orchestration/lifecycle/emit-merge-unlanded.js +37 -103
- package/.agents/scripts/lib/orchestration/lifecycle/listeners/README.md +7 -3
- package/.agents/scripts/lib/orchestration/lifecycle/listeners/watcher.js +50 -85
- package/.agents/scripts/lib/orchestration/lifecycle/trace-logger.js +3 -14
- package/.agents/scripts/lib/orchestration/merge-block-class.js +76 -20
- package/.agents/scripts/lib/orchestration/merge-poll.js +104 -0
- package/.agents/scripts/lib/orchestration/plan-context.js +116 -33
- package/.agents/scripts/lib/orchestration/plan-critic-conditions.js +26 -36
- package/.agents/scripts/lib/orchestration/plan-critics-evaluate.js +31 -22
- package/.agents/scripts/lib/orchestration/plan-metrics.js +38 -6
- package/.agents/scripts/lib/orchestration/plan-persist/fan-out-gate.js +16 -6
- package/.agents/scripts/lib/orchestration/plan-persist/persist-helpers.js +173 -25
- package/.agents/scripts/lib/orchestration/plan-persist/plan-context-source.js +116 -0
- package/.agents/scripts/lib/orchestration/plan-persist/run-plan-persist.js +280 -100
- package/.agents/scripts/lib/orchestration/plan-persist/story-ops.js +472 -55
- package/.agents/scripts/lib/orchestration/plan-persist/summary.js +21 -16
- package/.agents/scripts/lib/orchestration/plan-persist/supersede-ops.js +509 -0
- package/.agents/scripts/lib/orchestration/plan-text-hygiene.js +230 -0
- package/.agents/scripts/lib/orchestration/planning/authoring-context.js +41 -40
- package/.agents/scripts/lib/orchestration/planning/decomposer-context.js +1 -2
- package/.agents/scripts/lib/orchestration/planning/spec-authoring-grounding.js +1 -1
- package/.agents/scripts/lib/orchestration/resolve-stories.js +344 -0
- package/.agents/scripts/lib/orchestration/retro-proposals.js +7 -7
- package/.agents/scripts/lib/orchestration/review-depth.js +105 -40
- package/.agents/scripts/lib/orchestration/review-providers/findings-renderer.js +3 -13
- package/.agents/scripts/lib/orchestration/review-providers/native.js +1 -154
- package/.agents/scripts/lib/orchestration/review-providers/review-depth.js +3 -2
- package/.agents/scripts/lib/orchestration/review-providers/security-review.js +1 -1
- package/.agents/scripts/lib/orchestration/review-providers/types.js +5 -4
- package/.agents/scripts/lib/orchestration/review-providers/ultrareview.js +1 -1
- package/.agents/scripts/lib/orchestration/run-epilogue.js +374 -16
- package/.agents/scripts/lib/orchestration/single-story-close/phases/auto-merge.js +24 -0
- package/.agents/scripts/lib/orchestration/single-story-close/phases/base-sync.js +11 -9
- package/.agents/scripts/lib/orchestration/single-story-close/phases/close-validation.js +4 -4
- package/.agents/scripts/lib/orchestration/single-story-close/phases/code-review.js +4 -13
- package/.agents/scripts/lib/orchestration/single-story-close/phases/confirm-merge.js +608 -152
- package/.agents/scripts/lib/orchestration/single-story-close/phases/options.js +72 -30
- package/.agents/scripts/lib/orchestration/single-story-close/phases/post-land.js +305 -0
- package/.agents/scripts/lib/orchestration/single-story-close/phases/pull-request.js +1 -1
- package/.agents/scripts/lib/orchestration/single-story-close/phases/review-block.js +12 -8
- package/.agents/scripts/lib/orchestration/single-story-close/phases/worktree-reap.js +37 -4
- package/.agents/scripts/lib/orchestration/single-story-close/phases/wrong-tree-guard.js +2 -2
- package/.agents/scripts/lib/orchestration/single-story-close/runner.js +264 -43
- package/.agents/scripts/lib/orchestration/single-story-lease-guard.js +1 -1
- package/.agents/scripts/lib/orchestration/story-close/format-autofix.js +10 -10
- package/.agents/scripts/lib/orchestration/story-close/phases/code-review.js +104 -279
- package/.agents/scripts/lib/orchestration/story-close/phases/local-lens-review.js +191 -0
- package/.agents/scripts/lib/orchestration/story-close/phases/review-core.js +120 -0
- package/.agents/scripts/lib/orchestration/story-deliver-terminal.js +360 -0
- package/.agents/scripts/lib/orchestration/story-follow-ups.js +75 -14
- package/.agents/scripts/lib/orchestration/story-init-remote.js +12 -8
- package/.agents/scripts/lib/orchestration/story-plan-state.js +14 -29
- package/.agents/scripts/lib/orchestration/task-body-validator.js +52 -7
- package/.agents/scripts/lib/orchestration/ticket-lease.js +27 -74
- package/.agents/scripts/lib/orchestration/ticket-validator-conflicts.js +119 -14
- package/.agents/scripts/lib/orchestration/ticket-validator-sizing.js +3 -4
- package/.agents/scripts/lib/orchestration/ticket-validator.js +121 -18
- package/.agents/scripts/lib/orchestration/ticketing/bulk.js +14 -47
- package/.agents/scripts/lib/orchestration/ticketing/reads.js +19 -32
- package/.agents/scripts/lib/orchestration/ticketing/transition.js +61 -1
- package/.agents/scripts/lib/orchestration/ticketing.js +0 -1
- package/.agents/scripts/lib/plan-phase-cleanup.js +12 -14
- package/.agents/scripts/lib/planning-corpus.js +12 -286
- package/.agents/scripts/lib/preflight-runner.js +2 -2
- package/.agents/scripts/lib/qa/qa-context-hydrator.js +5 -5
- package/.agents/scripts/lib/signals/index.js +4 -17
- package/.agents/scripts/lib/signals/read.js +35 -35
- package/.agents/scripts/lib/signals/schema.js +8 -11
- package/.agents/scripts/lib/signals/span-tree.js +7 -7
- package/.agents/scripts/lib/signals/write.js +0 -1
- package/.agents/scripts/lib/single-story/story-merged-notify.js +13 -2
- package/.agents/scripts/lib/skills/parse-skill.js +16 -3
- package/.agents/scripts/lib/story-adjacency.js +8 -7
- package/.agents/scripts/lib/story-body/story-body.js +81 -13
- package/.agents/scripts/lib/templates/decomposer-prompts.js +15 -16
- package/.agents/scripts/lib/test-env.js +14 -1
- package/.agents/scripts/lib/test-tiers.js +0 -3
- package/.agents/scripts/lib/ticket-body-sections.js +0 -14
- package/.agents/scripts/lib/validation-evidence.js +31 -59
- package/.agents/scripts/lib/wave-runner/live-probe.js +315 -0
- package/.agents/scripts/lib/wave-runner/ready-set.js +32 -6
- package/.agents/scripts/lib/worktree/lifecycle/pending-cleanup.js +1 -1
- package/.agents/scripts/lib/worktree/lifecycle/reap.js +68 -19
- package/.agents/scripts/lib/worktree/lifecycle-manager.js +1 -2
- package/.agents/scripts/plan-context.js +38 -7
- package/.agents/scripts/plan-critics.js +203 -0
- package/.agents/scripts/plan-persist.js +145 -35
- package/.agents/scripts/plan-run-epilogue.js +83 -38
- package/.agents/scripts/post-structured-comment.js +0 -38
- package/.agents/scripts/pr-watch-with-update.js +43 -22
- package/.agents/scripts/providers/github/compose.js +0 -1
- package/.agents/scripts/providers/github/errors.js +0 -19
- package/.agents/scripts/providers/github/issues.js +1 -11
- package/.agents/scripts/providers/github/mappers.js +5 -0
- package/.agents/scripts/providers/github/sub-issues.js +0 -47
- package/.agents/scripts/providers/github/tickets.js +33 -153
- package/.agents/scripts/providers/github.js +17 -6
- package/.agents/scripts/quality-preview.js +13 -6
- package/.agents/scripts/resolve-stories.js +236 -0
- package/.agents/scripts/run-coverage.js +4 -1
- package/.agents/scripts/run-lint.js +2 -2
- package/.agents/scripts/run-verify.js +31 -2
- package/.agents/scripts/signals-view.js +9 -10
- package/.agents/scripts/single-story-close.js +173 -18
- package/.agents/scripts/single-story-confirm-merge.js +288 -15
- package/.agents/scripts/single-story-init.js +6 -10
- package/.agents/scripts/stories-wave-tick.js +380 -53
- package/.agents/scripts/story-plan.js +3 -3
- package/.agents/scripts/update-ticket-state.js +8 -50
- package/.agents/skills/core/code-review-and-quality/SKILL.md +28 -450
- package/.agents/skills/core/code-review-and-quality/reference.md +458 -0
- package/.agents/skills/core/debugging-and-error-recovery/SKILL.md +22 -315
- package/.agents/skills/core/debugging-and-error-recovery/reference.md +323 -0
- package/.agents/skills/core/diagnose-friction/SKILL.md +14 -18
- package/.agents/skills/core/documentation-and-adrs/SKILL.md +25 -397
- package/.agents/skills/core/documentation-and-adrs/reference.md +403 -0
- package/.agents/skills/core/gates-and-baselines/SKILL.md +12 -12
- package/.agents/skills/core/idea-refinement/SKILL.md +3 -3
- package/.agents/skills/core/scope-triage/SKILL.md +3 -0
- package/.agents/skills/core/security-and-hardening/SKILL.md +22 -367
- package/.agents/skills/core/security-and-hardening/reference.md +375 -0
- package/.agents/skills/skills.index.json +2 -12
- package/.agents/skills/stack/qa/playwright-bdd/SKILL.md +2 -4
- package/.agents/skills/stack/qa/qa-explore-driving/SKILL.md +1 -1
- package/.agents/skills/stack/qa/qa-harness/SKILL.md +1 -3
- package/.agents/workflows/audit-architecture.md +3 -4
- package/.agents/workflows/audit-clean-code.md +4 -4
- package/.agents/workflows/audit-documentation.md +4 -5
- package/.agents/workflows/audit-lighthouse.md +8 -0
- package/.agents/workflows/audit-navigability.md +10 -0
- package/.agents/workflows/audit-performance.md +2 -3
- package/.agents/workflows/audit-quality.md +8 -9
- package/.agents/workflows/audit-security.md +1 -2
- package/.agents/workflows/audit-seo.md +10 -0
- package/.agents/workflows/audit-ux-ui.md +7 -0
- package/.agents/workflows/deliver.md +133 -45
- package/.agents/workflows/git-cleanup.md +2 -2
- package/.agents/workflows/git-deliver.md +1 -1
- package/.agents/workflows/helpers/acceptance-self-eval.md +34 -17
- package/.agents/workflows/helpers/code-quality-guardrails.md +15 -12
- package/.agents/workflows/helpers/code-review.md +14 -12
- package/.agents/workflows/helpers/deliver-story-reference.md +73 -32
- package/.agents/workflows/helpers/deliver-story.md +209 -118
- package/.agents/workflows/helpers/parallel-tooling.md +2 -2
- package/.agents/workflows/helpers/worktree-lifecycle.md +28 -32
- package/.agents/workflows/plan.md +239 -19
- package/.agents/workflows/qa-assist.md +6 -6
- package/.agents/workflows/qa-explore.md +3 -3
- package/.agents/workflows/qa-run.md +1 -5
- package/bin/mandrel.js +12 -1
- package/docs/CHANGELOG.md +62 -0
- package/lib/cli/registry.js +262 -19
- package/lib/cli/sync-agents.js +157 -0
- package/lib/cli/sync-commands.js +115 -6
- package/lib/cli/sync.js +168 -6
- package/lib/cli/update.js +105 -8
- package/lib/cli/version-helpers.js +131 -0
- package/lib/migrations/README.md +7 -5
- package/lib/migrations/index.js +17 -9
- package/lib/migrations/steps/2.1.0-retire-mi-drop-knobs.js +100 -0
- package/lib/migrations/steps/2.1.0-retire-verify-concurrency-cap.js +101 -0
- package/lib/migrations/steps/2.2.0-retire-epic-ac-tags.js +154 -0
- package/package.json +2 -2
- package/.agents/schemas/epic-perf-report.schema.json +0 -89
- package/.agents/schemas/lifecycle/acceptance.reconcile.failed.schema.json +0 -13
- package/.agents/schemas/lifecycle/acceptance.reconcile.ok.schema.json +0 -13
- package/.agents/schemas/lifecycle/acceptance.reconcile.skipped.schema.json +0 -13
- package/.agents/schemas/lifecycle/acceptance.reconcile.start.schema.json +0 -12
- package/.agents/schemas/lifecycle/acceptance.reconcile.waived.schema.json +0 -13
- package/.agents/schemas/lifecycle/epic.automerge.end.schema.json +0 -15
- package/.agents/schemas/lifecycle/epic.automerge.start.schema.json +0 -13
- package/.agents/schemas/lifecycle/epic.blocked.schema.json +0 -13
- package/.agents/schemas/lifecycle/epic.cleanup.end.schema.json +0 -12
- package/.agents/schemas/lifecycle/epic.cleanup.start.schema.json +0 -12
- package/.agents/schemas/lifecycle/epic.close.end.schema.json +0 -12
- package/.agents/schemas/lifecycle/epic.complete.schema.json +0 -13
- package/.agents/schemas/lifecycle/epic.finalize.end.schema.json +0 -13
- package/.agents/schemas/lifecycle/epic.finalize.start.schema.json +0 -12
- package/.agents/schemas/lifecycle/epic.merge.armed.schema.json +0 -13
- package/.agents/schemas/lifecycle/epic.merge.blocked.schema.json +0 -14
- package/.agents/schemas/lifecycle/epic.merge.confirmed.schema.json +0 -17
- package/.agents/schemas/lifecycle/epic.merge.ready.schema.json +0 -15
- package/.agents/schemas/lifecycle/epic.plan.end.schema.json +0 -18
- package/.agents/schemas/lifecycle/epic.plan.start.schema.json +0 -12
- package/.agents/schemas/lifecycle/epic.snapshot.end.schema.json +0 -16
- package/.agents/schemas/lifecycle/epic.snapshot.start.schema.json +0 -12
- package/.agents/schemas/lifecycle/epic.watch.end.schema.json +0 -29
- package/.agents/schemas/lifecycle/epic.watch.start.schema.json +0 -16
- package/.agents/schemas/lifecycle/story.heartbeat.schema.json +0 -20
- package/.agents/schemas/risk-verdict.schema.json +0 -53
- package/.agents/schemas/story-perf-summary.schema.json +0 -73
- package/.agents/scripts/analyze-execution.js +0 -444
- package/.agents/scripts/check-prepush-recovery.js +0 -90
- package/.agents/scripts/lib/git-merge-orchestrator.js +0 -261
- package/.agents/scripts/lib/observability/baseline-refresh-rate.js +0 -221
- package/.agents/scripts/lib/observability/hook-heartbeat.js +0 -187
- package/.agents/scripts/lib/observability/perf-aggregator.js +0 -813
- package/.agents/scripts/lib/observability/perf-report-readers.js +0 -328
- package/.agents/scripts/lib/observability/perf-report-render.js +0 -182
- package/.agents/scripts/lib/orchestration/audit-lens-routing.js +0 -128
- package/.agents/scripts/lib/orchestration/bookkeeping-outbox.js +0 -273
- package/.agents/scripts/lib/orchestration/error-journal.js +0 -139
- package/.agents/scripts/lib/orchestration/lifecycle/emit-story-heartbeat.js +0 -155
- package/.agents/scripts/lib/orchestration/lifecycle/ledger-diff.js +0 -140
- package/.agents/scripts/lib/orchestration/lifecycle/listeners/merge-watcher.js +0 -665
- package/.agents/scripts/lib/orchestration/plan-review-routing.js +0 -63
- package/.agents/scripts/lib/orchestration/planning/risk-verdict.js +0 -104
- package/.agents/scripts/lib/orchestration/planning-context-budget.js +0 -213
- package/.agents/scripts/lib/orchestration/planning-risk.js +0 -194
- package/.agents/scripts/lib/orchestration/post-merge/phases/branch-cleanup.js +0 -56
- package/.agents/scripts/lib/orchestration/post-merge/phases/dashboard-refresh.js +0 -21
- package/.agents/scripts/lib/orchestration/post-merge/phases/notification.js +0 -78
- package/.agents/scripts/lib/orchestration/post-merge/phases/temp-cleanup.js +0 -68
- package/.agents/scripts/lib/orchestration/post-merge/phases/ticket-closure.js +0 -118
- package/.agents/scripts/lib/orchestration/post-merge/phases/worktree-reap.js +0 -397
- package/.agents/scripts/lib/orchestration/preflight-cache.js +0 -187
- package/.agents/scripts/lib/orchestration/resolve-plan-run.js +0 -155
- package/.agents/scripts/lib/orchestration/retro-perf-heuristics.js +0 -275
- package/.agents/scripts/lib/orchestration/story-progress/story-run-progress-writer.js +0 -400
- package/.agents/scripts/lib/single-story/confirm-merge-follow-ups.js +0 -36
- package/.agents/scripts/resolve-plan-run.js +0 -117
- package/.agents/skills/core/analyze-execution/SKILL.md +0 -101
|
@@ -1,261 +0,0 @@
|
|
|
1
|
-
/* node:coverage ignore file -- ephemeral merge orchestrator over live git state; conflict triage tested via integration. Unit-mocking requires asserting only the mock structure */
|
|
2
|
-
|
|
3
|
-
/**
|
|
4
|
-
* git-merge-orchestrator.js — Ephemeral Candidate Branch Merge Logic
|
|
5
|
-
*
|
|
6
|
-
* Encapsulates the complete merge-and-conflict-resolution lifecycle for
|
|
7
|
-
* a single Task integration candidate. Extracted from the legacy
|
|
8
|
-
* integration script to satisfy SRP: the orchestrator owns only Git
|
|
9
|
-
* state transitions.
|
|
10
|
-
*
|
|
11
|
-
* Responsibilities:
|
|
12
|
-
* - Create and tear down the ephemeral candidate branch.
|
|
13
|
-
* - Detect and triage merge conflicts (major vs minor threshold).
|
|
14
|
-
* - Auto-resolve minor conflicts (accept theirs) with audit logging.
|
|
15
|
-
*/
|
|
16
|
-
|
|
17
|
-
import { resolveConfig } from './config-resolver.js';
|
|
18
|
-
import { gitSpawn } from './git-utils.js';
|
|
19
|
-
|
|
20
|
-
/**
|
|
21
|
-
* Analyse conflict severity using git's binary-safe diff --check.
|
|
22
|
-
*
|
|
23
|
-
* @param {string} cwd - Project root.
|
|
24
|
-
* @returns {{ files: number, lines: number, fileList: string[] }}
|
|
25
|
-
*/
|
|
26
|
-
function analyzeConflicts(cwd) {
|
|
27
|
-
const unmerged = gitSpawn(cwd, 'diff', '--name-only', '--diff-filter=U');
|
|
28
|
-
if (!unmerged.stdout) return { files: 0, lines: 0, fileList: [] };
|
|
29
|
-
|
|
30
|
-
const fileList = unmerged.stdout.split('\n').filter(Boolean);
|
|
31
|
-
const check = gitSpawn(cwd, 'diff', '--check');
|
|
32
|
-
const markerMatches = check.stdout.match(/leftover conflict marker/g);
|
|
33
|
-
|
|
34
|
-
return {
|
|
35
|
-
files: fileList.length,
|
|
36
|
-
lines: markerMatches ? markerMatches.length : 0,
|
|
37
|
-
fileList,
|
|
38
|
-
};
|
|
39
|
-
}
|
|
40
|
-
|
|
41
|
-
/**
|
|
42
|
-
* Merge the feature branch into the current (candidate) branch.
|
|
43
|
-
* Handles conflict triage and auto-resolution.
|
|
44
|
-
*
|
|
45
|
-
* @param {string} cwd - Project root.
|
|
46
|
-
* @param {string} featureBranch - Branch name to merge in.
|
|
47
|
-
* @param {Function} vlog - `(level, context, message, meta)` warn helper for conflict triage output.
|
|
48
|
-
* @param {object} [opts]
|
|
49
|
-
* @param {string} [opts.message] - Explicit merge commit message (passed as `-m`).
|
|
50
|
-
* @returns {{ merged: true } | { merged: false, major: true } | never}
|
|
51
|
-
* Returns `{ merged: true }` on clean merge or resolved minor conflicts.
|
|
52
|
-
* Returns `{ merged: false, major: true }` on major conflict (caller should exit 2).
|
|
53
|
-
* Throws on internal git errors.
|
|
54
|
-
*/
|
|
55
|
-
/**
|
|
56
|
-
* Pure: classify a conflict snapshot as `'major'` (caller aborts) or
|
|
57
|
-
* `'minor'` (caller auto-resolves). Thresholds default to the values in
|
|
58
|
-
* `delivery.mergeThresholds` and fall back to file=3, line=20.
|
|
59
|
-
*
|
|
60
|
-
* @param {{ files: number, lines: number }} conflicts
|
|
61
|
-
* @param {{ files?: number, lines?: number } | undefined} thresholds
|
|
62
|
-
* @returns {'major' | 'minor'}
|
|
63
|
-
*/
|
|
64
|
-
export function classifyConflictSeverity(conflicts, thresholds = {}) {
|
|
65
|
-
const fileCap = thresholds.files ?? 3;
|
|
66
|
-
const lineCap = thresholds.lines ?? 20;
|
|
67
|
-
if (conflicts.files >= fileCap || conflicts.lines >= lineCap) return 'major';
|
|
68
|
-
return 'minor';
|
|
69
|
-
}
|
|
70
|
-
|
|
71
|
-
/**
|
|
72
|
-
* Auto-resolve a minor merge conflict by accepting the feature-branch version
|
|
73
|
-
* for each file in `conflicts.fileList`, capturing the discarded line counts
|
|
74
|
-
* for the audit trailer. Side effects: shells out to git checkout/add.
|
|
75
|
-
*
|
|
76
|
-
* @returns {Array<{ file: string, discardedLines: number }>}
|
|
77
|
-
*/
|
|
78
|
-
function autoResolveAcceptingTheirs(cwd, conflicts, vlog) {
|
|
79
|
-
const autoResolvedFiles = [];
|
|
80
|
-
for (const file of conflicts.fileList) {
|
|
81
|
-
const ourVersion = gitSpawn(cwd, 'show', `:2:${file}`);
|
|
82
|
-
const discardedLines = ourVersion.stdout
|
|
83
|
-
? ourVersion.stdout.split('\n').length
|
|
84
|
-
: 0;
|
|
85
|
-
autoResolvedFiles.push({ file, discardedLines });
|
|
86
|
-
if (ourVersion.stdout) {
|
|
87
|
-
vlog(
|
|
88
|
-
'warn',
|
|
89
|
-
'integration',
|
|
90
|
-
`Auto-resolving "${file}" to theirs — discarding base version (${discardedLines} lines)`,
|
|
91
|
-
{
|
|
92
|
-
file,
|
|
93
|
-
discardedLines,
|
|
94
|
-
discardedPreview: ourVersion.stdout.substring(0, 500),
|
|
95
|
-
},
|
|
96
|
-
);
|
|
97
|
-
}
|
|
98
|
-
gitSpawn(cwd, 'checkout', '--theirs', file);
|
|
99
|
-
gitSpawn(cwd, 'add', file);
|
|
100
|
-
}
|
|
101
|
-
return autoResolvedFiles;
|
|
102
|
-
}
|
|
103
|
-
|
|
104
|
-
/**
|
|
105
|
-
* Commit the auto-resolved working tree. When the caller supplied an explicit
|
|
106
|
-
* merge message, append the audit trailer; otherwise use git's default
|
|
107
|
-
* `--no-edit` message.
|
|
108
|
-
*/
|
|
109
|
-
function commitAutoResolution(cwd, opts, autoResolvedFiles) {
|
|
110
|
-
const trailer = buildAutoResolveTrailer(autoResolvedFiles);
|
|
111
|
-
const finalMessage = opts.message ? `${opts.message}\n\n${trailer}` : null;
|
|
112
|
-
const commitArgs = finalMessage
|
|
113
|
-
? ['commit', '-m', finalMessage]
|
|
114
|
-
: ['commit', '--no-edit'];
|
|
115
|
-
const commitResult = gitSpawn(cwd, ...commitArgs);
|
|
116
|
-
if (commitResult.status !== 0) {
|
|
117
|
-
throw new Error(`Auto-resolution commit failed: ${commitResult.stderr}`);
|
|
118
|
-
}
|
|
119
|
-
}
|
|
120
|
-
|
|
121
|
-
// Epic #3078: pre-commit hooks (notably lint-staged's stash/restore dance)
|
|
122
|
-
// can leave `git merge --no-ff` exiting 0 without recording the commit.
|
|
123
|
-
// Verify HEAD advanced; distinguish silent failure from "Already up to date".
|
|
124
|
-
function classifyZeroExitMerge({
|
|
125
|
-
headBefore,
|
|
126
|
-
headAfter,
|
|
127
|
-
mergeStdout,
|
|
128
|
-
featureBranch,
|
|
129
|
-
}) {
|
|
130
|
-
if (headAfter !== headBefore) return { merged: true };
|
|
131
|
-
if (/Already up to date/i.test(mergeStdout)) {
|
|
132
|
-
return { merged: true, alreadyMerged: true };
|
|
133
|
-
}
|
|
134
|
-
throw new Error(
|
|
135
|
-
`git merge --no-ff ${featureBranch} exited 0 but HEAD did not advance ` +
|
|
136
|
-
`(was ${headBefore || '<unknown>'}). Most likely a pre-commit hook ` +
|
|
137
|
-
`(commonly lint-staged) accepted the merge content into the index ` +
|
|
138
|
-
`without recording the commit. Inspect the index and any active ` +
|
|
139
|
-
`stash, commit the merge content manually if appropriate, then ` +
|
|
140
|
-
`re-run story-close with --resume. See Epic #3078 for incident notes.`,
|
|
141
|
-
);
|
|
142
|
-
}
|
|
143
|
-
|
|
144
|
-
export function mergeFeatureBranch(cwd, featureBranch, vlog, opts = {}) {
|
|
145
|
-
const headBefore = gitSpawn(cwd, 'rev-parse', 'HEAD').stdout;
|
|
146
|
-
const mergeArgs = ['merge', '--no-ff', featureBranch];
|
|
147
|
-
if (opts.message) mergeArgs.push('-m', opts.message);
|
|
148
|
-
const merge = gitSpawn(cwd, ...mergeArgs);
|
|
149
|
-
if (merge.status === 0) {
|
|
150
|
-
return classifyZeroExitMerge({
|
|
151
|
-
headBefore,
|
|
152
|
-
headAfter: gitSpawn(cwd, 'rev-parse', 'HEAD').stdout,
|
|
153
|
-
mergeStdout: merge.stdout,
|
|
154
|
-
featureBranch,
|
|
155
|
-
});
|
|
156
|
-
}
|
|
157
|
-
|
|
158
|
-
const conflicts = analyzeConflicts(cwd);
|
|
159
|
-
|
|
160
|
-
// `git merge` exited non-zero but the index has no unmerged entries and
|
|
161
|
-
// no leftover conflict markers. The merge either already landed (a hook
|
|
162
|
-
// emitted a non-zero exit after the merge commit was created) or was a
|
|
163
|
-
// no-op (feature branch is already an ancestor / does not exist). In
|
|
164
|
-
// both cases there is nothing to auto-resolve and nothing to commit —
|
|
165
|
-
// attempting `git commit` here fails with "nothing to commit", which
|
|
166
|
-
// turns a successful merge into a fatal and strands story-close work.
|
|
167
|
-
if (conflicts.files === 0 && conflicts.lines === 0) {
|
|
168
|
-
return { merged: true, alreadyMerged: true };
|
|
169
|
-
}
|
|
170
|
-
|
|
171
|
-
vlog('warn', 'integration', 'Merge conflict detected', {
|
|
172
|
-
files: conflicts.files,
|
|
173
|
-
lines: conflicts.lines,
|
|
174
|
-
fileList: conflicts.fileList,
|
|
175
|
-
});
|
|
176
|
-
|
|
177
|
-
// Epic #2880 / F14B: read mergeThresholds from the canonical resolved
|
|
178
|
-
// config (`delivery.mergeThresholds`). The legacy `agentSettings`
|
|
179
|
-
// pointer is gone — destructuring it throws `Cannot read properties of
|
|
180
|
-
// undefined`. The threshold block remains optional; `classifyConflict
|
|
181
|
-
// Severity` falls back to file=3/line=20 when undefined.
|
|
182
|
-
const config = resolveConfig();
|
|
183
|
-
const severity = classifyConflictSeverity(
|
|
184
|
-
conflicts,
|
|
185
|
-
config?.delivery?.mergeThresholds,
|
|
186
|
-
);
|
|
187
|
-
if (severity === 'major') {
|
|
188
|
-
gitSpawn(cwd, 'merge', '--abort');
|
|
189
|
-
return { merged: false, major: true, conflicts };
|
|
190
|
-
}
|
|
191
|
-
|
|
192
|
-
const autoResolvedFiles = autoResolveAcceptingTheirs(cwd, conflicts, vlog);
|
|
193
|
-
commitAutoResolution(cwd, opts, autoResolvedFiles);
|
|
194
|
-
return { merged: true, autoResolved: true, conflicts, autoResolvedFiles };
|
|
195
|
-
}
|
|
196
|
-
|
|
197
|
-
/**
|
|
198
|
-
* Build a merge-commit message body + trailer documenting which files were
|
|
199
|
-
* auto-resolved by accepting the feature-branch version and how many lines
|
|
200
|
-
* of the base version were discarded.
|
|
201
|
-
*
|
|
202
|
-
* The output is split into three blocks separated by blank lines so
|
|
203
|
-
* commitlint's per-line caps (`body-max-line-length` and
|
|
204
|
-
* `footer-max-line-length`, both default 100) all pass:
|
|
205
|
-
*
|
|
206
|
-
* 1. Header sentence.
|
|
207
|
-
* 2. Body prose listing each file and its discarded line count.
|
|
208
|
-
* 3. `Auto-resolved-file:` trailers — one per file, path only, so the
|
|
209
|
-
* verbose line count never appears on the footer line.
|
|
210
|
-
*
|
|
211
|
-
* Paths that would still bust the per-line cap are middle-truncated with
|
|
212
|
-
* an ellipsis. This is a last-resort safety net for pathological repo
|
|
213
|
-
* layouts; the common case (short relative paths) emits the full path.
|
|
214
|
-
*
|
|
215
|
-
* Exported for contract testing of the cap behaviour.
|
|
216
|
-
*
|
|
217
|
-
* @param {Array<{ file: string, discardedLines: number }>} resolved
|
|
218
|
-
* @param {{ maxLineLength?: number }} [opts]
|
|
219
|
-
* @returns {string}
|
|
220
|
-
*/
|
|
221
|
-
export function buildAutoResolveTrailer(resolved, opts = {}) {
|
|
222
|
-
const maxLineLength = opts.maxLineLength ?? 100;
|
|
223
|
-
const header =
|
|
224
|
-
'Auto-resolved-conflicts: accepted feature branch for the following file(s).';
|
|
225
|
-
|
|
226
|
-
const bodyLines = resolved.map((r) => {
|
|
227
|
-
const suffix = `: discarded ${r.discardedLines} base line(s)`;
|
|
228
|
-
const prefix = '- ';
|
|
229
|
-
const available = maxLineLength - prefix.length - suffix.length;
|
|
230
|
-
return `${prefix}${truncatePathForLine(r.file, available)}${suffix}`;
|
|
231
|
-
});
|
|
232
|
-
|
|
233
|
-
const trailerKey = 'Auto-resolved-file: ';
|
|
234
|
-
const trailerLines = resolved.map((r) => {
|
|
235
|
-
const available = maxLineLength - trailerKey.length;
|
|
236
|
-
return `${trailerKey}${truncatePathForLine(r.file, available)}`;
|
|
237
|
-
});
|
|
238
|
-
|
|
239
|
-
return `${header}\n\n${bodyLines.join('\n')}\n\n${trailerLines.join('\n')}`;
|
|
240
|
-
}
|
|
241
|
-
|
|
242
|
-
/**
|
|
243
|
-
* Middle-truncate a path with an ellipsis so it fits within `max`
|
|
244
|
-
* characters. When `max` is too small to keep any meaningful slice
|
|
245
|
-
* (≤ 4 chars after the ellipsis), the leading characters win — the
|
|
246
|
-
* tail is dropped and an ellipsis is appended. Pure helper, no I/O.
|
|
247
|
-
*
|
|
248
|
-
* @param {string} p
|
|
249
|
-
* @param {number} max
|
|
250
|
-
* @returns {string}
|
|
251
|
-
*/
|
|
252
|
-
function truncatePathForLine(p, max) {
|
|
253
|
-
if (max <= 0) return '…';
|
|
254
|
-
if (p.length <= max) return p;
|
|
255
|
-
const ellipsis = '…';
|
|
256
|
-
const keep = max - ellipsis.length;
|
|
257
|
-
if (keep <= 4) return `${p.slice(0, max - 1)}${ellipsis}`;
|
|
258
|
-
const head = Math.ceil(keep / 2);
|
|
259
|
-
const tail = Math.floor(keep / 2);
|
|
260
|
-
return `${p.slice(0, head)}${ellipsis}${p.slice(p.length - tail)}`;
|
|
261
|
-
}
|
|
@@ -1,221 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* baseline-refresh-rate.js — pure reporter for the per-Epic baseline-refresh
|
|
3
|
-
* commit rate (Epic #1386, Story #1400).
|
|
4
|
-
*
|
|
5
|
-
* The "baseline-refresh discipline" (Story #1124, Tech Spec #902) requires
|
|
6
|
-
* that every Story whose merge introduces baseline drift land an explicit
|
|
7
|
-
* `baseline-refresh:` commit in the same close PR (or, post Story #1398,
|
|
8
|
-
* fold the refresh into the close commit itself). The 90% target — that
|
|
9
|
-
* at least 90% of merged Stories per Epic land without leaving baseline
|
|
10
|
-
* drift behind — needs a measurable signal so retros can spot regressions
|
|
11
|
-
* before they leak into `main`.
|
|
12
|
-
*
|
|
13
|
-
* This module exports a single pure function that takes a fixture of
|
|
14
|
-
* commit records (one per Story-attributable commit on `epic/<id>` over
|
|
15
|
-
* the trailing window) and returns:
|
|
16
|
-
*
|
|
17
|
-
* - per-Epic counts of `baseline-refresh:` commits
|
|
18
|
-
* - per-Epic counts of merged Stories
|
|
19
|
-
* - per-Epic percentage of merged Stories that did NOT land a
|
|
20
|
-
* baseline-refresh commit (the "clean-merge" rate)
|
|
21
|
-
*
|
|
22
|
-
* The caller (analyze-execution.js) is responsible for shelling out to
|
|
23
|
-
* `git log` and resolving each commit to its parent Epic ID — this
|
|
24
|
-
* module touches no I/O so the test fixture can pin behavior without a
|
|
25
|
-
* temp git repo or stubbed spawn.
|
|
26
|
-
*
|
|
27
|
-
* Default window is 4 weeks (28 days). Pass `windowDays` to override
|
|
28
|
-
* (e.g., `windowDays: 14` for a fortnightly retro).
|
|
29
|
-
*
|
|
30
|
-
* Aligned with `perf-aggregator.js`: empty input yields a well-formed
|
|
31
|
-
* empty payload, malformed records are silently skipped, the function
|
|
32
|
-
* never throws on bad data.
|
|
33
|
-
*/
|
|
34
|
-
|
|
35
|
-
import { isObject } from '../json-utils.js';
|
|
36
|
-
import { RESOLVES_TRAILER_RE } from '../orchestration/resolves-token.js';
|
|
37
|
-
|
|
38
|
-
const BASELINE_REFRESH_PREFIX = 'baseline-refresh:';
|
|
39
|
-
const DEFAULT_WINDOW_DAYS = 28;
|
|
40
|
-
|
|
41
|
-
/**
|
|
42
|
-
* Coerce an ISO-8601 date string to epoch ms. Returns NaN for malformed
|
|
43
|
-
* input so the caller's window filter drops the record.
|
|
44
|
-
*/
|
|
45
|
-
function toEpochMs(iso) {
|
|
46
|
-
if (typeof iso !== 'string' || iso.length === 0) return Number.NaN;
|
|
47
|
-
const ms = Date.parse(iso);
|
|
48
|
-
return Number.isFinite(ms) ? ms : Number.NaN;
|
|
49
|
-
}
|
|
50
|
-
|
|
51
|
-
/**
|
|
52
|
-
* Classify a commit by its subject line.
|
|
53
|
-
*
|
|
54
|
-
* - `baseline-refresh:` prefix → refresh commit
|
|
55
|
-
* - subject containing `(resolves #N)` → Story-merge commit
|
|
56
|
-
* - everything else → ignored (chore commits, baseline-only fixes, etc.)
|
|
57
|
-
*
|
|
58
|
-
* The classification is deliberately disjoint: a `baseline-refresh:`
|
|
59
|
-
* commit is never counted as a Story merge, and a Story merge is never
|
|
60
|
-
* counted as a baseline-refresh — even if the subject happens to mention
|
|
61
|
-
* both keywords. This matches the on-the-ground convention: refreshes
|
|
62
|
-
* land as their own commit (or amended into the close), Stories land as
|
|
63
|
-
* `feat: ... (resolves #N)`.
|
|
64
|
-
*/
|
|
65
|
-
function classifySubject(subject) {
|
|
66
|
-
if (typeof subject !== 'string' || subject.length === 0) return 'other';
|
|
67
|
-
if (subject.startsWith(BASELINE_REFRESH_PREFIX)) return 'refresh';
|
|
68
|
-
if (RESOLVES_TRAILER_RE.test(subject)) return 'story';
|
|
69
|
-
return 'other';
|
|
70
|
-
}
|
|
71
|
-
|
|
72
|
-
/**
|
|
73
|
-
* Compute the trailing-window cutoff in epoch ms. Exported on the
|
|
74
|
-
* exported function via the `now` option so tests can pin the clock.
|
|
75
|
-
*/
|
|
76
|
-
function computeCutoffMs(nowMs, windowDays) {
|
|
77
|
-
const days =
|
|
78
|
-
Number.isFinite(windowDays) && windowDays > 0
|
|
79
|
-
? windowDays
|
|
80
|
-
: DEFAULT_WINDOW_DAYS;
|
|
81
|
-
return nowMs - days * 24 * 60 * 60 * 1000;
|
|
82
|
-
}
|
|
83
|
-
|
|
84
|
-
/**
|
|
85
|
-
* Pure reporter for the per-Epic baseline-refresh commit rate.
|
|
86
|
-
*
|
|
87
|
-
* @param {Iterable<{
|
|
88
|
-
* sha?: string,
|
|
89
|
-
* isoDate: string,
|
|
90
|
-
* subject: string,
|
|
91
|
-
* epicId: number | string | null,
|
|
92
|
-
* }>} commits
|
|
93
|
-
* Commit records from the caller. Records missing `epicId` (the commit
|
|
94
|
-
* isn't on any Epic branch) are dropped. Records older than the window
|
|
95
|
-
* are also dropped. Order does not matter — the function aggregates by
|
|
96
|
-
* Epic regardless of input ordering.
|
|
97
|
-
*
|
|
98
|
-
* @param {object} [opts]
|
|
99
|
-
* @param {number} [opts.windowDays] — trailing window in days (default 28).
|
|
100
|
-
* @param {() => Date | number} [opts.now] — clock injector for tests.
|
|
101
|
-
* Accepts either a Date or epoch-ms; defaults to `() => Date.now()`.
|
|
102
|
-
*
|
|
103
|
-
* @returns {{
|
|
104
|
-
* kind: 'baseline-refresh-rate',
|
|
105
|
-
* windowDays: number,
|
|
106
|
-
* generatedAt: string,
|
|
107
|
-
* cutoffAt: string,
|
|
108
|
-
* perEpic: Array<{
|
|
109
|
-
* epicId: number | string,
|
|
110
|
-
* storyMerges: number,
|
|
111
|
-
* baselineRefreshes: number,
|
|
112
|
-
* cleanMergeRate: number,
|
|
113
|
-
* }>,
|
|
114
|
-
* totals: {
|
|
115
|
-
* storyMerges: number,
|
|
116
|
-
* baselineRefreshes: number,
|
|
117
|
-
* cleanMergeRate: number,
|
|
118
|
-
* },
|
|
119
|
-
* }}
|
|
120
|
-
*
|
|
121
|
-
* `cleanMergeRate` is the fraction of merged Stories that did NOT need a
|
|
122
|
-
* baseline-refresh commit follow-up (or amend), in `[0, 1]` rounded to
|
|
123
|
-
* 4 decimal places. The 90% target is `cleanMergeRate >= 0.9`. When
|
|
124
|
-
* `storyMerges === 0`, the rate is `1` (vacuously clean — no Stories,
|
|
125
|
-
* no drift) so a quiet Epic doesn't show up as red.
|
|
126
|
-
*/
|
|
127
|
-
export function computeBaselineRefreshRate(commits, opts = {}) {
|
|
128
|
-
const nowFn = opts.now ?? (() => Date.now());
|
|
129
|
-
const nowVal = nowFn();
|
|
130
|
-
const nowMs = nowVal instanceof Date ? nowVal.getTime() : Number(nowVal);
|
|
131
|
-
const windowDays =
|
|
132
|
-
Number.isFinite(opts.windowDays) && opts.windowDays > 0
|
|
133
|
-
? Math.floor(opts.windowDays)
|
|
134
|
-
: DEFAULT_WINDOW_DAYS;
|
|
135
|
-
const cutoffMs = computeCutoffMs(nowMs, windowDays);
|
|
136
|
-
|
|
137
|
-
// Map<epicId, { storyMerges, baselineRefreshes }>. Insertion order is
|
|
138
|
-
// preserved so the output array is stable for snapshot-style assertions.
|
|
139
|
-
const perEpic = new Map();
|
|
140
|
-
const ensureBucket = (epicId) => {
|
|
141
|
-
if (!perEpic.has(epicId)) {
|
|
142
|
-
perEpic.set(epicId, { storyMerges: 0, baselineRefreshes: 0 });
|
|
143
|
-
}
|
|
144
|
-
return perEpic.get(epicId);
|
|
145
|
-
};
|
|
146
|
-
|
|
147
|
-
for (const raw of commits ?? []) {
|
|
148
|
-
if (!isObject(raw)) continue;
|
|
149
|
-
const epicId = raw.epicId;
|
|
150
|
-
if (epicId == null || epicId === '') continue;
|
|
151
|
-
const ts = toEpochMs(raw.isoDate);
|
|
152
|
-
if (!Number.isFinite(ts)) continue;
|
|
153
|
-
if (ts < cutoffMs) continue;
|
|
154
|
-
|
|
155
|
-
const klass = classifySubject(raw.subject);
|
|
156
|
-
if (klass === 'other') continue;
|
|
157
|
-
|
|
158
|
-
const bucket = ensureBucket(epicId);
|
|
159
|
-
if (klass === 'refresh') bucket.baselineRefreshes += 1;
|
|
160
|
-
else if (klass === 'story') bucket.storyMerges += 1;
|
|
161
|
-
}
|
|
162
|
-
|
|
163
|
-
const perEpicRows = [];
|
|
164
|
-
let totalStories = 0;
|
|
165
|
-
let totalRefreshes = 0;
|
|
166
|
-
for (const [epicId, counts] of perEpic) {
|
|
167
|
-
const cleanMergeRate =
|
|
168
|
-
counts.storyMerges === 0
|
|
169
|
-
? 1
|
|
170
|
-
: Math.max(
|
|
171
|
-
0,
|
|
172
|
-
Math.min(
|
|
173
|
-
1,
|
|
174
|
-
(counts.storyMerges - counts.baselineRefreshes) /
|
|
175
|
-
counts.storyMerges,
|
|
176
|
-
),
|
|
177
|
-
);
|
|
178
|
-
perEpicRows.push({
|
|
179
|
-
epicId,
|
|
180
|
-
storyMerges: counts.storyMerges,
|
|
181
|
-
baselineRefreshes: counts.baselineRefreshes,
|
|
182
|
-
cleanMergeRate: roundRate(cleanMergeRate),
|
|
183
|
-
});
|
|
184
|
-
totalStories += counts.storyMerges;
|
|
185
|
-
totalRefreshes += counts.baselineRefreshes;
|
|
186
|
-
}
|
|
187
|
-
|
|
188
|
-
const totalsClean =
|
|
189
|
-
totalStories === 0
|
|
190
|
-
? 1
|
|
191
|
-
: Math.max(
|
|
192
|
-
0,
|
|
193
|
-
Math.min(1, (totalStories - totalRefreshes) / totalStories),
|
|
194
|
-
);
|
|
195
|
-
|
|
196
|
-
return {
|
|
197
|
-
kind: 'baseline-refresh-rate',
|
|
198
|
-
windowDays,
|
|
199
|
-
generatedAt: new Date(nowMs).toISOString(),
|
|
200
|
-
cutoffAt: new Date(cutoffMs).toISOString(),
|
|
201
|
-
perEpic: perEpicRows,
|
|
202
|
-
totals: {
|
|
203
|
-
storyMerges: totalStories,
|
|
204
|
-
baselineRefreshes: totalRefreshes,
|
|
205
|
-
cleanMergeRate: roundRate(totalsClean),
|
|
206
|
-
},
|
|
207
|
-
};
|
|
208
|
-
}
|
|
209
|
-
|
|
210
|
-
function roundRate(rate) {
|
|
211
|
-
if (!Number.isFinite(rate)) return 0;
|
|
212
|
-
return Math.round(rate * 10000) / 10000;
|
|
213
|
-
}
|
|
214
|
-
|
|
215
|
-
// Exported for unit tests that want to assert the classifier directly
|
|
216
|
-
// without round-tripping through the aggregator.
|
|
217
|
-
export const __test__ = {
|
|
218
|
-
classifySubject,
|
|
219
|
-
computeCutoffMs,
|
|
220
|
-
DEFAULT_WINDOW_DAYS,
|
|
221
|
-
};
|
|
@@ -1,187 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* hook-heartbeat.js — Epic #4476 (M5): heartbeats OFF the token stream.
|
|
3
|
-
*
|
|
4
|
-
* Before M5, the `story.heartbeat` / `slice.heartbeat` forward-progress
|
|
5
|
-
* signal that idle-watchdog consumers read from the lifecycle ledger was an
|
|
6
|
-
* **LLM obligation**: the delivery workflow instructed the agent to run
|
|
7
|
-
* `story-phase.js` / `slice-phase.js --event heartbeat` at least once per
|
|
8
|
-
* meaningful step, and every such call was a full-priced LLM turn re-reading
|
|
9
|
-
* ~100k of cached context just to append one NDJSON line.
|
|
10
|
-
*
|
|
11
|
-
* This module makes that liveness signal a **free byproduct of the agent
|
|
12
|
-
* doing any work**. It is invoked from the existing PostToolUse trace hook
|
|
13
|
-
* (`tool-trace-hook.js`), so every tool call the agent makes refreshes the
|
|
14
|
-
* heartbeat — no dedicated bookkeeping turn required. The record it appends is
|
|
15
|
-
* byte-for-byte the same `story.heartbeat` / `slice.heartbeat` shape the
|
|
16
|
-
* watchdog already consumes (emitted through the same
|
|
17
|
-
* `emit-story-heartbeat.js` / `emit-slice-lifecycle.js` emitters), so the
|
|
18
|
-
* watchdog needs no change: the signal is preserved, only its emission
|
|
19
|
-
* mechanism moves off the token stream.
|
|
20
|
-
*
|
|
21
|
-
* ## Robustness contract (mirrors `tool-trace-hook.js`)
|
|
22
|
-
* - **No-op outside an active Story with an Epic-scoped ledger.** When a
|
|
23
|
-
* valid `{ CC_EPIC_ID, CC_STORY_ID }` pair is not present in the
|
|
24
|
-
* environment (v2 standalone Stories omit `CC_EPIC_ID`), `emitHeartbeatFromHook`
|
|
25
|
-
* returns without touching the filesystem.
|
|
26
|
-
* - **Best-effort.** Every failure is swallowed. A heartbeat is
|
|
27
|
-
* observability, not state; a hook must never block tool execution.
|
|
28
|
-
* - **Throttled across processes.** Command hooks are spawned as fresh
|
|
29
|
-
* `node` processes per tool call, so in-process state cannot throttle. The
|
|
30
|
-
* throttle is anchored to the **mtime of a sidecar marker file** under the
|
|
31
|
-
* Epic temp dir: at most one heartbeat per `HEARTBEAT_MIN_INTERVAL_MS`
|
|
32
|
-
* lands, regardless of how many tool calls fire in that window. This keeps
|
|
33
|
-
* the ledger from ballooning while still refreshing liveness faster than
|
|
34
|
-
* the watchdog's threshold.
|
|
35
|
-
*/
|
|
36
|
-
|
|
37
|
-
import { statSync, utimesSync, writeFileSync } from 'node:fs';
|
|
38
|
-
import path from 'node:path';
|
|
39
|
-
|
|
40
|
-
import { epicTempDir } from '../config/temp-paths.js';
|
|
41
|
-
import { emitStoryHeartbeat } from '../orchestration/lifecycle/emit-story-heartbeat.js';
|
|
42
|
-
|
|
43
|
-
/**
|
|
44
|
-
* Default minimum wall-clock gap between two hook-emitted heartbeats for the
|
|
45
|
-
* same target. Comfortably below the watchdog's default 30-minute staleness
|
|
46
|
-
* threshold, so an actively-working agent never trips a false stall, while
|
|
47
|
-
* still bounding ledger growth to ~1 line/minute of activity.
|
|
48
|
-
*/
|
|
49
|
-
const HEARTBEAT_MIN_INTERVAL_MS = 60_000;
|
|
50
|
-
|
|
51
|
-
/**
|
|
52
|
-
* Resolve the heartbeat target from the active-Story / active-slice env vars.
|
|
53
|
-
*
|
|
54
|
-
* A `story.heartbeat` requires a parent `epicId` (its schema pins
|
|
55
|
-
* `epicId >= 1`), so a **standalone** Story (`CC_STORY_ID` set, `CC_EPIC_ID`
|
|
56
|
-
* absent) yields `null` — there is no Epic-scoped ledger to write to and the
|
|
57
|
-
* standalone path is not watched by the Epic idle watchdog. The trace hook
|
|
58
|
-
* still records that context's traces; only the heartbeat is skipped.
|
|
59
|
-
*
|
|
60
|
-
* Inert `slice.*` lifecycle (and `CC_SLICE_ID` heartbeats) were removed in
|
|
61
|
-
* the v2 ceremony lock-in — `## Slicing` is prose-only.
|
|
62
|
-
*
|
|
63
|
-
* @param {NodeJS.ProcessEnv} [env]
|
|
64
|
-
* @returns {{ kind: 'story', epicId: number, storyId: number, operator?: string }
|
|
65
|
-
* | null}
|
|
66
|
-
*/
|
|
67
|
-
export function resolveHeartbeatTarget(env = process.env) {
|
|
68
|
-
const epicRaw = env.CC_EPIC_ID;
|
|
69
|
-
const storyRaw = env.CC_STORY_ID;
|
|
70
|
-
const operator =
|
|
71
|
-
typeof env.CC_OPERATOR === 'string' && env.CC_OPERATOR.length > 0
|
|
72
|
-
? env.CC_OPERATOR
|
|
73
|
-
: undefined;
|
|
74
|
-
|
|
75
|
-
const epicId = epicRaw ? Number.parseInt(epicRaw, 10) : Number.NaN;
|
|
76
|
-
const epicOk = Number.isInteger(epicId) && epicId > 0;
|
|
77
|
-
|
|
78
|
-
if (storyRaw) {
|
|
79
|
-
const storyId = Number.parseInt(storyRaw, 10);
|
|
80
|
-
if (!Number.isInteger(storyId) || storyId <= 0) return null;
|
|
81
|
-
// story.heartbeat has no meaning without a parent Epic ledger.
|
|
82
|
-
if (!epicOk) return null;
|
|
83
|
-
return {
|
|
84
|
-
kind: 'story',
|
|
85
|
-
epicId,
|
|
86
|
-
storyId,
|
|
87
|
-
...(operator ? { operator } : {}),
|
|
88
|
-
};
|
|
89
|
-
}
|
|
90
|
-
|
|
91
|
-
return null;
|
|
92
|
-
}
|
|
93
|
-
|
|
94
|
-
/**
|
|
95
|
-
* Stable, filesystem-safe marker basename for a target. The marker's mtime is
|
|
96
|
-
* the throttle anchor; its contents are irrelevant.
|
|
97
|
-
*
|
|
98
|
-
* @param {{ kind: string, storyId?: number, sliceId?: string }} target
|
|
99
|
-
* @returns {string}
|
|
100
|
-
*/
|
|
101
|
-
export function heartbeatMarkerName(target) {
|
|
102
|
-
return `.heartbeat-story-${target.storyId}`;
|
|
103
|
-
}
|
|
104
|
-
|
|
105
|
-
/**
|
|
106
|
-
* Throttle predicate. Returns `true` when no marker exists yet, or the marker
|
|
107
|
-
* is older than `intervalMs`. Any stat error (missing file / unreadable) is
|
|
108
|
-
* treated as "emit" — the safe direction for a liveness signal.
|
|
109
|
-
*
|
|
110
|
-
* @param {{ markerPath: string, now: Date, intervalMs: number, statFn?: typeof statSync }} args
|
|
111
|
-
* @returns {boolean}
|
|
112
|
-
*/
|
|
113
|
-
export function shouldEmitHeartbeat({
|
|
114
|
-
markerPath,
|
|
115
|
-
now,
|
|
116
|
-
intervalMs,
|
|
117
|
-
statFn = statSync,
|
|
118
|
-
}) {
|
|
119
|
-
try {
|
|
120
|
-
const st = statFn(markerPath);
|
|
121
|
-
return now.getTime() - st.mtimeMs >= intervalMs;
|
|
122
|
-
} catch {
|
|
123
|
-
return true;
|
|
124
|
-
}
|
|
125
|
-
}
|
|
126
|
-
|
|
127
|
-
/**
|
|
128
|
-
* Update (or create) the throttle marker so its mtime is `now`. Best-effort:
|
|
129
|
-
* a failure here at worst lets the next tool call emit a second heartbeat.
|
|
130
|
-
*
|
|
131
|
-
* @param {string} markerPath
|
|
132
|
-
* @param {Date} now
|
|
133
|
-
*/
|
|
134
|
-
function touchMarker(markerPath, now) {
|
|
135
|
-
try {
|
|
136
|
-
writeFileSync(markerPath, '', { flag: 'a' });
|
|
137
|
-
utimesSync(markerPath, now, now);
|
|
138
|
-
} catch {
|
|
139
|
-
// swallow — throttle degrades to "emit again next call", never fatal.
|
|
140
|
-
}
|
|
141
|
-
}
|
|
142
|
-
|
|
143
|
-
/**
|
|
144
|
-
* Emit one throttled heartbeat for the active target, if any. The whole body
|
|
145
|
-
* is best-effort: any failure returns a `{ emitted: false }` envelope rather
|
|
146
|
-
* than throwing, so the calling PostToolUse hook never blocks the tool.
|
|
147
|
-
*
|
|
148
|
-
* @param {object} [opts]
|
|
149
|
-
* @param {NodeJS.ProcessEnv} [opts.env] Defaults to `process.env`.
|
|
150
|
-
* @param {Date} [opts.now] Injected clock (tests).
|
|
151
|
-
* @param {number} [opts.intervalMs] Throttle window.
|
|
152
|
-
* @param {object} [opts.config] Resolved config (tempRoot).
|
|
153
|
-
* @returns {{ emitted: boolean, reason?: string, kind?: string, ledgerPath?: string }}
|
|
154
|
-
*/
|
|
155
|
-
export function emitHeartbeatFromHook({
|
|
156
|
-
env = process.env,
|
|
157
|
-
now = new Date(),
|
|
158
|
-
intervalMs = HEARTBEAT_MIN_INTERVAL_MS,
|
|
159
|
-
config,
|
|
160
|
-
} = {}) {
|
|
161
|
-
try {
|
|
162
|
-
const target = resolveHeartbeatTarget(env);
|
|
163
|
-
if (!target) return { emitted: false, reason: 'no-target' };
|
|
164
|
-
|
|
165
|
-
const markerPath = path.join(
|
|
166
|
-
epicTempDir(target.epicId, config),
|
|
167
|
-
heartbeatMarkerName(target),
|
|
168
|
-
);
|
|
169
|
-
if (!shouldEmitHeartbeat({ markerPath, now, intervalMs })) {
|
|
170
|
-
return { emitted: false, reason: 'throttled', kind: target.kind };
|
|
171
|
-
}
|
|
172
|
-
|
|
173
|
-
const timestamp = now.toISOString();
|
|
174
|
-
const res = emitStoryHeartbeat({
|
|
175
|
-
epicId: target.epicId,
|
|
176
|
-
storyId: target.storyId,
|
|
177
|
-
phase: 'implementing',
|
|
178
|
-
timestamp,
|
|
179
|
-
...(target.operator ? { operator: target.operator } : {}),
|
|
180
|
-
config: config ?? undefined,
|
|
181
|
-
});
|
|
182
|
-
touchMarker(markerPath, now);
|
|
183
|
-
return { emitted: true, kind: target.kind, ledgerPath: res?.ledgerPath };
|
|
184
|
-
} catch {
|
|
185
|
-
return { emitted: false, reason: 'error' };
|
|
186
|
-
}
|
|
187
|
-
}
|