@matteeh/osq 0.2.1 → 0.2.2
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/README.md +234 -15
- package/dist/cli/approve.d.ts +7 -0
- package/dist/cli/approve.d.ts.map +1 -1
- package/dist/cli/approve.js +34 -0
- package/dist/cli/approve.js.map +1 -1
- package/dist/cli/bin.js +2 -3
- package/dist/cli/bin.js.map +1 -1
- package/dist/cli/check.d.ts +15 -0
- package/dist/cli/check.d.ts.map +1 -0
- package/dist/cli/check.js +65 -0
- package/dist/cli/check.js.map +1 -0
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +10 -10
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/init.d.ts.map +1 -1
- package/dist/cli/init.js +6 -1
- package/dist/cli/init.js.map +1 -1
- package/dist/cli/lint.d.ts +3 -0
- package/dist/cli/lint.d.ts.map +1 -1
- package/dist/cli/lint.js +33 -14
- package/dist/cli/lint.js.map +1 -1
- package/dist/cli/plan-queue.d.ts +10 -4
- package/dist/cli/plan-queue.d.ts.map +1 -1
- package/dist/cli/plan-queue.js +20 -19
- package/dist/cli/plan-queue.js.map +1 -1
- package/dist/cli/plan-sections.d.ts +15 -0
- package/dist/cli/plan-sections.d.ts.map +1 -0
- package/dist/cli/plan-sections.js +47 -0
- package/dist/cli/plan-sections.js.map +1 -0
- package/dist/cli/plan.d.ts +1 -0
- package/dist/cli/plan.d.ts.map +1 -1
- package/dist/cli/plan.js +14 -4
- package/dist/cli/plan.js.map +1 -1
- package/dist/cli/report.d.ts.map +1 -1
- package/dist/cli/report.js +73 -1
- package/dist/cli/report.js.map +1 -1
- package/dist/cli/run.d.ts +7 -0
- package/dist/cli/run.d.ts.map +1 -0
- package/dist/cli/run.js +22 -0
- package/dist/cli/run.js.map +1 -0
- package/dist/cli/verified.d.ts +15 -0
- package/dist/cli/verified.d.ts.map +1 -0
- package/dist/cli/verified.js +34 -0
- package/dist/cli/verified.js.map +1 -0
- package/dist/core/foundation/config-agents.d.ts +16 -0
- package/dist/core/foundation/config-agents.d.ts.map +1 -0
- package/dist/core/foundation/config-agents.js +2 -0
- package/dist/core/foundation/config-agents.js.map +1 -0
- package/dist/core/foundation/config-claude.d.ts +48 -0
- package/dist/core/foundation/config-claude.d.ts.map +1 -0
- package/dist/core/foundation/config-claude.js +106 -0
- package/dist/core/foundation/config-claude.js.map +1 -0
- package/dist/core/foundation/config-codex-resolve.d.ts +10 -0
- package/dist/core/foundation/config-codex-resolve.d.ts.map +1 -0
- package/dist/core/foundation/config-codex-resolve.js +24 -0
- package/dist/core/foundation/config-codex-resolve.js.map +1 -0
- package/dist/core/foundation/config-file.d.ts +18 -0
- package/dist/core/foundation/config-file.d.ts.map +1 -0
- package/dist/core/foundation/config-file.js +46 -0
- package/dist/core/foundation/config-file.js.map +1 -0
- package/dist/core/foundation/config-gates.d.ts +2 -0
- package/dist/core/foundation/config-gates.d.ts.map +1 -1
- package/dist/core/foundation/config-gates.js +8 -0
- package/dist/core/foundation/config-gates.js.map +1 -1
- package/dist/core/foundation/config-opencode.d.ts +25 -0
- package/dist/core/foundation/config-opencode.d.ts.map +1 -0
- package/dist/core/foundation/config-opencode.js +55 -0
- package/dist/core/foundation/config-opencode.js.map +1 -0
- package/dist/core/foundation/config-pi.d.ts +10 -0
- package/dist/core/foundation/config-pi.d.ts.map +1 -1
- package/dist/core/foundation/config-pi.js +13 -0
- package/dist/core/foundation/config-pi.js.map +1 -1
- package/dist/core/foundation/config-planning.d.ts +12 -1
- package/dist/core/foundation/config-planning.d.ts.map +1 -1
- package/dist/core/foundation/config-planning.js +29 -1
- package/dist/core/foundation/config-planning.js.map +1 -1
- package/dist/core/foundation/config-traceability.d.ts +28 -0
- package/dist/core/foundation/config-traceability.d.ts.map +1 -0
- package/dist/core/foundation/config-traceability.js +63 -0
- package/dist/core/foundation/config-traceability.js.map +1 -0
- package/dist/core/foundation/config-user.d.ts +32 -0
- package/dist/core/foundation/config-user.d.ts.map +1 -0
- package/dist/core/foundation/config-user.js +2 -0
- package/dist/core/foundation/config-user.js.map +1 -0
- package/dist/core/foundation/config-vcs.d.ts +29 -0
- package/dist/core/foundation/config-vcs.d.ts.map +1 -0
- package/dist/core/foundation/config-vcs.js +57 -0
- package/dist/core/foundation/config-vcs.js.map +1 -0
- package/dist/core/foundation/config.d.ts +23 -24
- package/dist/core/foundation/config.d.ts.map +1 -1
- package/dist/core/foundation/config.js +29 -36
- package/dist/core/foundation/config.js.map +1 -1
- package/dist/core/foundation/decisions-validate.d.ts +16 -0
- package/dist/core/foundation/decisions-validate.d.ts.map +1 -0
- package/dist/core/foundation/decisions-validate.js +74 -0
- package/dist/core/foundation/decisions-validate.js.map +1 -0
- package/dist/core/foundation/decisions.d.ts +34 -0
- package/dist/core/foundation/decisions.d.ts.map +1 -0
- package/dist/core/foundation/decisions.js +152 -0
- package/dist/core/foundation/decisions.js.map +1 -0
- package/dist/core/foundation/doctor-decisions.d.ts +9 -0
- package/dist/core/foundation/doctor-decisions.d.ts.map +1 -0
- package/dist/core/foundation/doctor-decisions.js +49 -0
- package/dist/core/foundation/doctor-decisions.js.map +1 -0
- package/dist/core/foundation/doctor-managed.d.ts.map +1 -1
- package/dist/core/foundation/doctor-managed.js +3 -0
- package/dist/core/foundation/doctor-managed.js.map +1 -1
- package/dist/core/foundation/doctor-prices.d.ts +8 -0
- package/dist/core/foundation/doctor-prices.d.ts.map +1 -0
- package/dist/core/foundation/doctor-prices.js +25 -0
- package/dist/core/foundation/doctor-prices.js.map +1 -0
- package/dist/core/foundation/doctor.d.ts.map +1 -1
- package/dist/core/foundation/doctor.js +20 -30
- package/dist/core/foundation/doctor.js.map +1 -1
- package/dist/core/foundation/harness-catalog.d.ts +7 -8
- package/dist/core/foundation/harness-catalog.d.ts.map +1 -1
- package/dist/core/foundation/harness-catalog.js +26 -41
- package/dist/core/foundation/harness-catalog.js.map +1 -1
- package/dist/core/foundation/init-blocks.d.ts +1 -1
- package/dist/core/foundation/init-blocks.d.ts.map +1 -1
- package/dist/core/foundation/init-blocks.js +51 -14
- package/dist/core/foundation/init-blocks.js.map +1 -1
- package/dist/core/foundation/init.d.ts +4 -0
- package/dist/core/foundation/init.d.ts.map +1 -1
- package/dist/core/foundation/init.js +7 -0
- package/dist/core/foundation/init.js.map +1 -1
- package/dist/core/foundation/new.d.ts +4 -1
- package/dist/core/foundation/new.d.ts.map +1 -1
- package/dist/core/foundation/new.js +18 -8
- package/dist/core/foundation/new.js.map +1 -1
- package/dist/core/foundation/package-root.d.ts +6 -0
- package/dist/core/foundation/package-root.d.ts.map +1 -1
- package/dist/core/foundation/package-root.js +6 -0
- package/dist/core/foundation/package-root.js.map +1 -1
- package/dist/core/foundation/rules-block.d.ts +11 -0
- package/dist/core/foundation/rules-block.d.ts.map +1 -0
- package/dist/core/foundation/rules-block.js +90 -0
- package/dist/core/foundation/rules-block.js.map +1 -0
- package/dist/core/foundation/traceability-block.d.ts +13 -0
- package/dist/core/foundation/traceability-block.d.ts.map +1 -0
- package/dist/core/foundation/traceability-block.js +124 -0
- package/dist/core/foundation/traceability-block.js.map +1 -0
- package/dist/core/lifecycle/done.d.ts.map +1 -1
- package/dist/core/lifecycle/done.js +2 -4
- package/dist/core/lifecycle/done.js.map +1 -1
- package/dist/core/lifecycle/recertify.d.ts +9 -0
- package/dist/core/lifecycle/recertify.d.ts.map +1 -0
- package/dist/core/lifecycle/recertify.js +27 -0
- package/dist/core/lifecycle/recertify.js.map +1 -0
- package/dist/core/lifecycle/reject.d.ts.map +1 -1
- package/dist/core/lifecycle/reject.js +3 -4
- package/dist/core/lifecycle/reject.js.map +1 -1
- package/dist/core/lifecycle/retry.d.ts.map +1 -1
- package/dist/core/lifecycle/retry.js +6 -20
- package/dist/core/lifecycle/retry.js.map +1 -1
- package/dist/core/lifecycle/verification-record.d.ts +42 -0
- package/dist/core/lifecycle/verification-record.d.ts.map +1 -0
- package/dist/core/lifecycle/verification-record.js +76 -0
- package/dist/core/lifecycle/verification-record.js.map +1 -0
- package/dist/core/report/approval-flags.d.ts +16 -3
- package/dist/core/report/approval-flags.d.ts.map +1 -1
- package/dist/core/report/approval-flags.js +59 -22
- package/dist/core/report/approval-flags.js.map +1 -1
- package/dist/core/report/brief-to-approval.d.ts +7 -0
- package/dist/core/report/brief-to-approval.d.ts.map +1 -0
- package/dist/core/report/brief-to-approval.js +43 -0
- package/dist/core/report/brief-to-approval.js.map +1 -0
- package/dist/core/report/planning-price-gaps.d.ts +10 -0
- package/dist/core/report/planning-price-gaps.d.ts.map +1 -0
- package/dist/core/report/planning-price-gaps.js +37 -0
- package/dist/core/report/planning-price-gaps.js.map +1 -0
- package/dist/core/report/planning-slice-lookup.d.ts.map +1 -1
- package/dist/core/report/planning-slice-lookup.js +3 -9
- package/dist/core/report/planning-slice-lookup.js.map +1 -1
- package/dist/core/report/recent-disclosures.d.ts +18 -0
- package/dist/core/report/recent-disclosures.d.ts.map +1 -0
- package/dist/core/report/recent-disclosures.js +105 -0
- package/dist/core/report/recent-disclosures.js.map +1 -0
- package/dist/core/report/record-disclosures.d.ts +14 -0
- package/dist/core/report/record-disclosures.d.ts.map +1 -0
- package/dist/core/report/record-disclosures.js +30 -0
- package/dist/core/report/record-disclosures.js.map +1 -0
- package/dist/core/report/record-estimates.d.ts +25 -0
- package/dist/core/report/record-estimates.d.ts.map +1 -0
- package/dist/core/report/record-estimates.js +83 -0
- package/dist/core/report/record-estimates.js.map +1 -0
- package/dist/core/report/record-rework.d.ts +19 -0
- package/dist/core/report/record-rework.d.ts.map +1 -0
- package/dist/core/report/record-rework.js +50 -0
- package/dist/core/report/record-rework.js.map +1 -0
- package/dist/core/report/record-verification.d.ts +16 -0
- package/dist/core/report/record-verification.d.ts.map +1 -0
- package/dist/core/report/record-verification.js +33 -0
- package/dist/core/report/record-verification.js.map +1 -0
- package/dist/core/report/report-dependencies.d.ts +29 -0
- package/dist/core/report/report-dependencies.d.ts.map +1 -0
- package/dist/core/report/report-dependencies.js +92 -0
- package/dist/core/report/report-dependencies.js.map +1 -0
- package/dist/core/report/report-events.d.ts +1 -0
- package/dist/core/report/report-events.d.ts.map +1 -1
- package/dist/core/report/report-events.js +8 -26
- package/dist/core/report/report-events.js.map +1 -1
- package/dist/core/report/report-mutation.d.ts +34 -0
- package/dist/core/report/report-mutation.d.ts.map +1 -0
- package/dist/core/report/report-mutation.js +191 -0
- package/dist/core/report/report-mutation.js.map +1 -0
- package/dist/core/report/report-scope.d.ts +21 -0
- package/dist/core/report/report-scope.d.ts.map +1 -0
- package/dist/core/report/report-scope.js +61 -0
- package/dist/core/report/report-scope.js.map +1 -0
- package/dist/core/report/report-traceability.d.ts +29 -0
- package/dist/core/report/report-traceability.d.ts.map +1 -0
- package/dist/core/report/report-traceability.js +94 -0
- package/dist/core/report/report-traceability.js.map +1 -0
- package/dist/core/report/report.d.ts +35 -1
- package/dist/core/report/report.d.ts.map +1 -1
- package/dist/core/report/report.js +130 -111
- package/dist/core/report/report.js.map +1 -1
- package/dist/core/report/result-sections.d.ts +30 -0
- package/dist/core/report/result-sections.d.ts.map +1 -0
- package/dist/core/report/result-sections.js +125 -0
- package/dist/core/report/result-sections.js.map +1 -0
- package/dist/core/report/scope-size.d.ts +7 -0
- package/dist/core/report/scope-size.d.ts.map +1 -0
- package/dist/core/report/scope-size.js +22 -0
- package/dist/core/report/scope-size.js.map +1 -0
- package/dist/core/run/commit-message.d.ts +24 -0
- package/dist/core/run/commit-message.d.ts.map +1 -0
- package/dist/core/run/commit-message.js +76 -0
- package/dist/core/run/commit-message.js.map +1 -0
- package/dist/core/run/dead-commit.d.ts +10 -0
- package/dist/core/run/dead-commit.d.ts.map +1 -0
- package/dist/core/run/dead-commit.js +70 -0
- package/dist/core/run/dead-commit.js.map +1 -0
- package/dist/core/run/focused-tests.d.ts +43 -0
- package/dist/core/run/focused-tests.d.ts.map +1 -0
- package/dist/core/run/focused-tests.js +116 -0
- package/dist/core/run/focused-tests.js.map +1 -0
- package/dist/core/run/manifest-approval.d.ts +7 -0
- package/dist/core/run/manifest-approval.d.ts.map +1 -0
- package/dist/core/run/manifest-approval.js +30 -0
- package/dist/core/run/manifest-approval.js.map +1 -0
- package/dist/core/run/manifest.d.ts +11 -1
- package/dist/core/run/manifest.d.ts.map +1 -1
- package/dist/core/run/manifest.js +52 -11
- package/dist/core/run/manifest.js.map +1 -1
- package/dist/core/run/mutation-report.d.ts +29 -0
- package/dist/core/run/mutation-report.d.ts.map +1 -0
- package/dist/core/run/mutation-report.js +107 -0
- package/dist/core/run/mutation-report.js.map +1 -0
- package/dist/core/run/mutation-run.d.ts +32 -0
- package/dist/core/run/mutation-run.d.ts.map +1 -0
- package/dist/core/run/mutation-run.js +80 -0
- package/dist/core/run/mutation-run.js.map +1 -0
- package/dist/core/run/verification.d.ts +12 -1
- package/dist/core/run/verification.d.ts.map +1 -1
- package/dist/core/run/verification.js +24 -2
- package/dist/core/run/verification.js.map +1 -1
- package/dist/core/spec/approve-worktree-shared.d.ts +33 -0
- package/dist/core/spec/approve-worktree-shared.d.ts.map +1 -0
- package/dist/core/spec/approve-worktree-shared.js +59 -0
- package/dist/core/spec/approve-worktree-shared.js.map +1 -0
- package/dist/core/spec/approve-worktree.d.ts +21 -0
- package/dist/core/spec/approve-worktree.d.ts.map +1 -0
- package/dist/core/spec/approve-worktree.js +153 -0
- package/dist/core/spec/approve-worktree.js.map +1 -0
- package/dist/core/spec/approve.d.ts +20 -10
- package/dist/core/spec/approve.d.ts.map +1 -1
- package/dist/core/spec/approve.js +57 -54
- package/dist/core/spec/approve.js.map +1 -1
- package/dist/core/spec/capability-impact.d.ts +43 -0
- package/dist/core/spec/capability-impact.d.ts.map +1 -0
- package/dist/core/spec/capability-impact.js +85 -0
- package/dist/core/spec/capability-impact.js.map +1 -0
- package/dist/core/spec/decisions-lint.d.ts +18 -0
- package/dist/core/spec/decisions-lint.d.ts.map +1 -0
- package/dist/core/spec/decisions-lint.js +127 -0
- package/dist/core/spec/decisions-lint.js.map +1 -0
- package/dist/core/spec/delta.d.ts +6 -0
- package/dist/core/spec/delta.d.ts.map +1 -1
- package/dist/core/spec/delta.js +73 -5
- package/dist/core/spec/delta.js.map +1 -1
- package/dist/core/spec/digest-decisions.d.ts +27 -0
- package/dist/core/spec/digest-decisions.d.ts.map +1 -0
- package/dist/core/spec/digest-decisions.js +86 -0
- package/dist/core/spec/digest-decisions.js.map +1 -0
- package/dist/core/spec/digest-format.d.ts +4 -0
- package/dist/core/spec/digest-format.d.ts.map +1 -0
- package/dist/core/spec/digest-format.js +44 -0
- package/dist/core/spec/digest-format.js.map +1 -0
- package/dist/core/spec/digest.d.ts +5 -3
- package/dist/core/spec/digest.d.ts.map +1 -1
- package/dist/core/spec/digest.js +14 -33
- package/dist/core/spec/digest.js.map +1 -1
- package/dist/core/spec/human-steps.d.ts +20 -0
- package/dist/core/spec/human-steps.d.ts.map +1 -0
- package/dist/core/spec/human-steps.js +52 -0
- package/dist/core/spec/human-steps.js.map +1 -0
- package/dist/core/spec/impact-lint.d.ts +24 -0
- package/dist/core/spec/impact-lint.d.ts.map +1 -0
- package/dist/core/spec/impact-lint.js +39 -0
- package/dist/core/spec/impact-lint.js.map +1 -0
- package/dist/core/spec/import-graph.d.ts +35 -0
- package/dist/core/spec/import-graph.d.ts.map +1 -0
- package/dist/core/spec/import-graph.js +155 -0
- package/dist/core/spec/import-graph.js.map +1 -0
- package/dist/core/spec/lint-findings.d.ts +44 -0
- package/dist/core/spec/lint-findings.d.ts.map +1 -0
- package/dist/core/spec/lint-findings.js +56 -0
- package/dist/core/spec/lint-findings.js.map +1 -0
- package/dist/core/spec/lint-output.d.ts +53 -0
- package/dist/core/spec/lint-output.d.ts.map +1 -0
- package/dist/core/spec/lint-output.js +87 -0
- package/dist/core/spec/lint-output.js.map +1 -0
- package/dist/core/spec/linter.d.ts +14 -4
- package/dist/core/spec/linter.d.ts.map +1 -1
- package/dist/core/spec/linter.js +271 -111
- package/dist/core/spec/linter.js.map +1 -1
- package/dist/core/spec/merged-spec-check.d.ts +24 -0
- package/dist/core/spec/merged-spec-check.d.ts.map +1 -0
- package/dist/core/spec/merged-spec-check.js +95 -0
- package/dist/core/spec/merged-spec-check.js.map +1 -0
- package/dist/core/spec/openspec-issues.d.ts +58 -0
- package/dist/core/spec/openspec-issues.d.ts.map +1 -0
- package/dist/core/spec/openspec-issues.js +166 -0
- package/dist/core/spec/openspec-issues.js.map +1 -0
- package/dist/core/spec/parser.d.ts +1 -0
- package/dist/core/spec/parser.d.ts.map +1 -1
- package/dist/core/spec/parser.js +16 -6
- package/dist/core/spec/parser.js.map +1 -1
- package/dist/core/spec/scenario-impact.d.ts +47 -0
- package/dist/core/spec/scenario-impact.d.ts.map +1 -0
- package/dist/core/spec/scenario-impact.js +130 -0
- package/dist/core/spec/scenario-impact.js.map +1 -0
- package/dist/core/spec/test-impact.d.ts +28 -0
- package/dist/core/spec/test-impact.d.ts.map +1 -0
- package/dist/core/spec/test-impact.js +119 -0
- package/dist/core/spec/test-impact.js.map +1 -0
- package/dist/core/spec/traceability-links.d.ts +50 -0
- package/dist/core/spec/traceability-links.d.ts.map +1 -0
- package/dist/core/spec/traceability-links.js +120 -0
- package/dist/core/spec/traceability-links.js.map +1 -0
- package/dist/core/spec/traceability-lint.d.ts +29 -0
- package/dist/core/spec/traceability-lint.d.ts.map +1 -0
- package/dist/core/spec/traceability-lint.js +143 -0
- package/dist/core/spec/traceability-lint.js.map +1 -0
- package/dist/core/status/blocked-item.d.ts +8 -0
- package/dist/core/status/blocked-item.d.ts.map +1 -0
- package/dist/core/status/blocked-item.js +45 -0
- package/dist/core/status/blocked-item.js.map +1 -0
- package/dist/core/status/change-locations.d.ts +44 -0
- package/dist/core/status/change-locations.d.ts.map +1 -0
- package/dist/core/status/change-locations.js +138 -0
- package/dist/core/status/change-locations.js.map +1 -0
- package/dist/core/status/dependency-readiness.d.ts +11 -0
- package/dist/core/status/dependency-readiness.d.ts.map +1 -0
- package/dist/core/status/dependency-readiness.js +39 -0
- package/dist/core/status/dependency-readiness.js.map +1 -0
- package/dist/core/status/inbox-projection.d.ts.map +1 -1
- package/dist/core/status/inbox-projection.js +23 -4
- package/dist/core/status/inbox-projection.js.map +1 -1
- package/dist/core/status/inbox-text.d.ts.map +1 -1
- package/dist/core/status/inbox-text.js +34 -3
- package/dist/core/status/inbox-text.js.map +1 -1
- package/dist/core/status/inbox.d.ts +10 -1
- package/dist/core/status/inbox.d.ts.map +1 -1
- package/dist/core/status/inbox.js +19 -1
- package/dist/core/status/inbox.js.map +1 -1
- package/dist/core/status/layout.d.ts +6 -0
- package/dist/core/status/layout.d.ts.map +1 -1
- package/dist/core/status/layout.js +8 -0
- package/dist/core/status/layout.js.map +1 -1
- package/dist/core/status/next-step.d.ts +17 -0
- package/dist/core/status/next-step.d.ts.map +1 -0
- package/dist/core/status/next-step.js +85 -0
- package/dist/core/status/next-step.js.map +1 -0
- package/dist/core/status/pre-spawn-words.d.ts +13 -0
- package/dist/core/status/pre-spawn-words.d.ts.map +1 -0
- package/dist/core/status/pre-spawn-words.js +26 -0
- package/dist/core/status/pre-spawn-words.js.map +1 -0
- package/dist/core/status/queue-parser.d.ts +1 -0
- package/dist/core/status/queue-parser.d.ts.map +1 -1
- package/dist/core/status/queue-parser.js +41 -2
- package/dist/core/status/queue-parser.js.map +1 -1
- package/dist/core/status/queue-planning.d.ts +1 -0
- package/dist/core/status/queue-planning.d.ts.map +1 -1
- package/dist/core/status/queue-planning.js +24 -12
- package/dist/core/status/queue-planning.js.map +1 -1
- package/dist/core/status/queue-report-detail.d.ts.map +1 -1
- package/dist/core/status/queue-report-detail.js +5 -3
- package/dist/core/status/queue-report-detail.js.map +1 -1
- package/dist/core/status/queue-state.d.ts +1 -1
- package/dist/core/status/queue-state.d.ts.map +1 -1
- package/dist/core/status/queue-state.js +27 -41
- package/dist/core/status/queue-state.js.map +1 -1
- package/dist/core/status/show.d.ts +25 -0
- package/dist/core/status/show.d.ts.map +1 -1
- package/dist/core/status/show.js +354 -91
- package/dist/core/status/show.js.map +1 -1
- package/dist/core/status/state.d.ts.map +1 -1
- package/dist/core/status/state.js +1 -23
- package/dist/core/status/state.js.map +1 -1
- package/dist/core/status/status.d.ts +18 -0
- package/dist/core/status/status.d.ts.map +1 -1
- package/dist/core/status/status.js +59 -80
- package/dist/core/status/status.js.map +1 -1
- package/dist/core/status/verification.d.ts +27 -0
- package/dist/core/status/verification.d.ts.map +1 -0
- package/dist/core/status/verification.js +111 -0
- package/dist/core/status/verification.js.map +1 -0
- package/dist/core/trace/function-ranges.d.ts +30 -0
- package/dist/core/trace/function-ranges.d.ts.map +1 -0
- package/dist/core/trace/function-ranges.js +250 -0
- package/dist/core/trace/function-ranges.js.map +1 -0
- package/dist/core/trace/mutation-pick.d.ts +55 -0
- package/dist/core/trace/mutation-pick.d.ts.map +1 -0
- package/dist/core/trace/mutation-pick.js +96 -0
- package/dist/core/trace/mutation-pick.js.map +1 -0
- package/dist/core/trace/scenario-index.d.ts +27 -0
- package/dist/core/trace/scenario-index.d.ts.map +1 -0
- package/dist/core/trace/scenario-index.js +76 -0
- package/dist/core/trace/scenario-index.js.map +1 -0
- package/dist/core/trace/scenario-lookup.d.ts +14 -0
- package/dist/core/trace/scenario-lookup.d.ts.map +1 -0
- package/dist/core/trace/scenario-lookup.js +179 -0
- package/dist/core/trace/scenario-lookup.js.map +1 -0
- package/dist/core/trace/tag-scan.d.ts +44 -0
- package/dist/core/trace/tag-scan.d.ts.map +1 -0
- package/dist/core/trace/tag-scan.js +200 -0
- package/dist/core/trace/tag-scan.js.map +1 -0
- package/dist/core/vcs/doctor-git.d.ts +13 -0
- package/dist/core/vcs/doctor-git.d.ts.map +1 -0
- package/dist/core/vcs/doctor-git.js +114 -0
- package/dist/core/vcs/doctor-git.js.map +1 -0
- package/dist/core/vcs/git-vcs-write.d.ts +47 -0
- package/dist/core/vcs/git-vcs-write.d.ts.map +1 -0
- package/dist/core/vcs/git-vcs-write.js +210 -0
- package/dist/core/vcs/git-vcs-write.js.map +1 -0
- package/dist/core/vcs/git-vcs.d.ts +40 -0
- package/dist/core/vcs/git-vcs.d.ts.map +1 -0
- package/dist/core/vcs/git-vcs.js +170 -0
- package/dist/core/vcs/git-vcs.js.map +1 -0
- package/dist/core/vcs/no-vcs.d.ts +26 -0
- package/dist/core/vcs/no-vcs.d.ts.map +1 -0
- package/dist/core/vcs/no-vcs.js +62 -0
- package/dist/core/vcs/no-vcs.js.map +1 -0
- package/dist/core/vcs/select.d.ts +11 -0
- package/dist/core/vcs/select.d.ts.map +1 -0
- package/dist/core/vcs/select.js +33 -0
- package/dist/core/vcs/select.js.map +1 -0
- package/dist/core/vcs/snapshot.d.ts +34 -0
- package/dist/core/vcs/snapshot.d.ts.map +1 -0
- package/dist/core/vcs/snapshot.js +71 -0
- package/dist/core/vcs/snapshot.js.map +1 -0
- package/dist/core/vcs/vcs.d.ts +55 -0
- package/dist/core/vcs/vcs.d.ts.map +1 -0
- package/dist/core/vcs/vcs.js +2 -0
- package/dist/core/vcs/vcs.js.map +1 -0
- package/dist/core/vcs/worktree.d.ts +10 -0
- package/dist/core/vcs/worktree.d.ts.map +1 -0
- package/dist/core/vcs/worktree.js +25 -0
- package/dist/core/vcs/worktree.js.map +1 -0
- package/dist/core/web/web-data-folders.d.ts.map +1 -1
- package/dist/core/web/web-data-folders.js +18 -33
- package/dist/core/web/web-data-folders.js.map +1 -1
- package/dist/core/web/web-data-lifecycle.d.ts.map +1 -1
- package/dist/core/web/web-data-lifecycle.js +2 -1
- package/dist/core/web/web-data-lifecycle.js.map +1 -1
- package/dist/core/web/web-events.d.ts +8 -6
- package/dist/core/web/web-events.d.ts.map +1 -1
- package/dist/core/web/web-events.js +7 -31
- package/dist/core/web/web-events.js.map +1 -1
- package/dist/core/web/web-server.d.ts.map +1 -1
- package/dist/core/web/web-server.js +3 -0
- package/dist/core/web/web-server.js.map +1 -1
- package/dist/core/web/web-trees.d.ts +27 -0
- package/dist/core/web/web-trees.d.ts.map +1 -0
- package/dist/core/web/web-trees.js +82 -0
- package/dist/core/web/web-trees.js.map +1 -0
- package/dist/harness/claude/claude-exec-args.d.ts +13 -0
- package/dist/harness/claude/claude-exec-args.d.ts.map +1 -0
- package/dist/harness/claude/claude-exec-args.js +61 -0
- package/dist/harness/claude/claude-exec-args.js.map +1 -0
- package/dist/harness/claude/claude-exec.d.ts +12 -0
- package/dist/harness/claude/claude-exec.d.ts.map +1 -0
- package/dist/harness/claude/claude-exec.js +79 -0
- package/dist/harness/claude/claude-exec.js.map +1 -0
- package/dist/harness/claude/claude-stream.d.ts +31 -0
- package/dist/harness/claude/claude-stream.d.ts.map +1 -0
- package/dist/harness/claude/claude-stream.js +150 -0
- package/dist/harness/claude/claude-stream.js.map +1 -0
- package/dist/harness/claude/claude-tools.d.ts +5 -0
- package/dist/harness/claude/claude-tools.d.ts.map +1 -0
- package/dist/harness/claude/claude-tools.js +30 -0
- package/dist/harness/claude/claude-tools.js.map +1 -0
- package/dist/harness/index.d.ts +1 -0
- package/dist/harness/index.d.ts.map +1 -1
- package/dist/harness/index.js +3 -0
- package/dist/harness/index.js.map +1 -1
- package/dist/harness/opencode/opencode-session.d.ts +42 -0
- package/dist/harness/opencode/opencode-session.d.ts.map +1 -0
- package/dist/harness/opencode/opencode-session.js +123 -0
- package/dist/harness/opencode/opencode-session.js.map +1 -0
- package/dist/harness/opencode/opencode.d.ts +2 -1
- package/dist/harness/opencode/opencode.d.ts.map +1 -1
- package/dist/harness/opencode/opencode.js +52 -28
- package/dist/harness/opencode/opencode.js.map +1 -1
- package/dist/harness/prompt.js +1 -1
- package/dist/harness/prompt.js.map +1 -1
- package/dist/harness/types.d.ts +112 -1
- package/dist/harness/types.d.ts.map +1 -1
- package/dist/harness/types.js.map +1 -1
- package/dist/index.d.ts +3 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/testing/index.d.ts +3 -0
- package/dist/testing/index.d.ts.map +1 -0
- package/dist/testing/index.js +2 -0
- package/dist/testing/index.js.map +1 -0
- package/dist/testing/scenario.d.ts +29 -0
- package/dist/testing/scenario.d.ts.map +1 -0
- package/dist/testing/scenario.js +157 -0
- package/dist/testing/scenario.js.map +1 -0
- package/dist/watcher/archiver.d.ts +2 -1
- package/dist/watcher/archiver.d.ts.map +1 -1
- package/dist/watcher/archiver.js +27 -2
- package/dist/watcher/archiver.js.map +1 -1
- package/dist/watcher/auto-recertify.d.ts +27 -0
- package/dist/watcher/auto-recertify.d.ts.map +1 -0
- package/dist/watcher/auto-recertify.js +113 -0
- package/dist/watcher/auto-recertify.js.map +1 -0
- package/dist/watcher/auto-retry.d.ts +1 -1
- package/dist/watcher/auto-retry.d.ts.map +1 -1
- package/dist/watcher/auto-retry.js +3 -11
- package/dist/watcher/auto-retry.js.map +1 -1
- package/dist/watcher/baseline-key.d.ts +17 -0
- package/dist/watcher/baseline-key.d.ts.map +1 -0
- package/dist/watcher/baseline-key.js +31 -0
- package/dist/watcher/baseline-key.js.map +1 -0
- package/dist/watcher/baseline.d.ts +32 -0
- package/dist/watcher/baseline.d.ts.map +1 -0
- package/dist/watcher/baseline.js +166 -0
- package/dist/watcher/baseline.js.map +1 -0
- package/dist/watcher/blocked.d.ts +12 -0
- package/dist/watcher/blocked.d.ts.map +1 -0
- package/dist/watcher/blocked.js +24 -0
- package/dist/watcher/blocked.js.map +1 -0
- package/dist/watcher/dependencies.d.ts +28 -0
- package/dist/watcher/dependencies.d.ts.map +1 -0
- package/dist/watcher/dependencies.js +152 -0
- package/dist/watcher/dependencies.js.map +1 -0
- package/dist/watcher/done-metadata.d.ts +4 -0
- package/dist/watcher/done-metadata.d.ts.map +1 -0
- package/dist/watcher/done-metadata.js +20 -0
- package/dist/watcher/done-metadata.js.map +1 -0
- package/dist/watcher/failure-reason.d.ts +1 -1
- package/dist/watcher/failure-reason.d.ts.map +1 -1
- package/dist/watcher/focused-verify.d.ts +17 -0
- package/dist/watcher/focused-verify.d.ts.map +1 -0
- package/dist/watcher/focused-verify.js +54 -0
- package/dist/watcher/focused-verify.js.map +1 -0
- package/dist/watcher/git-guard.d.ts +24 -0
- package/dist/watcher/git-guard.d.ts.map +1 -0
- package/dist/watcher/git-guard.js +95 -0
- package/dist/watcher/git-guard.js.map +1 -0
- package/dist/watcher/instructions-drift.d.ts +21 -0
- package/dist/watcher/instructions-drift.d.ts.map +1 -0
- package/dist/watcher/instructions-drift.js +115 -0
- package/dist/watcher/instructions-drift.js.map +1 -0
- package/dist/watcher/loop.d.ts.map +1 -1
- package/dist/watcher/loop.js +36 -50
- package/dist/watcher/loop.js.map +1 -1
- package/dist/watcher/measures.d.ts.map +1 -1
- package/dist/watcher/measures.js +22 -39
- package/dist/watcher/measures.js.map +1 -1
- package/dist/watcher/mutation-check.d.ts +42 -0
- package/dist/watcher/mutation-check.d.ts.map +1 -0
- package/dist/watcher/mutation-check.js +147 -0
- package/dist/watcher/mutation-check.js.map +1 -0
- package/dist/watcher/regression.d.ts +10 -5
- package/dist/watcher/regression.d.ts.map +1 -1
- package/dist/watcher/regression.js +29 -22
- package/dist/watcher/regression.js.map +1 -1
- package/dist/watcher/runner.d.ts.map +1 -1
- package/dist/watcher/runner.js +12 -14
- package/dist/watcher/runner.js.map +1 -1
- package/dist/watcher/spawn.d.ts.map +1 -1
- package/dist/watcher/spawn.js +5 -0
- package/dist/watcher/spawn.js.map +1 -1
- package/dist/watcher/task-verify.d.ts +7 -2
- package/dist/watcher/task-verify.d.ts.map +1 -1
- package/dist/watcher/task-verify.js +33 -8
- package/dist/watcher/task-verify.js.map +1 -1
- package/dist/watcher/verify.d.ts +1 -5
- package/dist/watcher/verify.d.ts.map +1 -1
- package/dist/watcher/verify.js +2 -6
- package/dist/watcher/verify.js.map +1 -1
- package/package.json +5 -1
- package/templates/PLANNER.md +35 -9
- package/templates/openspec/config.yaml +1 -1
- package/templates/openspec/schemas/osq/schema.yaml +4 -2
- package/templates/openspec/schemas/osq/templates/proposal.md +9 -2
- package/templates/proposal.md +9 -2
- package/ui/dist/assets/{index-CZYeQ8la.js → index-D39uYbbL.js} +1 -1
- package/ui/dist/index.html +1 -1
|
@@ -0,0 +1,147 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The mutation check the watcher runs right after a passing task: pick the
|
|
3
|
+
* covered functions the task changed or newly tested, run the project's
|
|
4
|
+
* mutation command for each pick under one shared budget, and append one
|
|
5
|
+
* `mutation_ran` event per pick. Observe only: it never fails the task,
|
|
6
|
+
* changes a marker, or requests a retry.
|
|
7
|
+
*/
|
|
8
|
+
import fs from 'node:fs/promises';
|
|
9
|
+
import path from 'node:path';
|
|
10
|
+
import { DEFAULT_TRACEABILITY_CONFIG, } from '../core/foundation/config-traceability.js';
|
|
11
|
+
import { runMutationPick } from '../core/run/mutation-run.js';
|
|
12
|
+
import { buildImportGraph } from '../core/spec/import-graph.js';
|
|
13
|
+
import { parseTaskMd } from '../core/spec/parser.js';
|
|
14
|
+
import { pickMutations, } from '../core/trace/mutation-pick.js';
|
|
15
|
+
import { buildScenarioIndex } from '../core/trace/scenario-index.js';
|
|
16
|
+
import { appendHarnessEvent, } from '../harness/types.js';
|
|
17
|
+
/** A pick the spent budget never let run. */
|
|
18
|
+
const BUDGET_RESULT = {
|
|
19
|
+
outcome: 'not_measured',
|
|
20
|
+
reason: 'budget',
|
|
21
|
+
killed: 0,
|
|
22
|
+
survived: 0,
|
|
23
|
+
invalid: 0,
|
|
24
|
+
survivors: [],
|
|
25
|
+
duration: 0,
|
|
26
|
+
exitCode: null,
|
|
27
|
+
output: '',
|
|
28
|
+
};
|
|
29
|
+
function isRecord(value) {
|
|
30
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
31
|
+
}
|
|
32
|
+
/** True when the configuration opts at least one capability in. */
|
|
33
|
+
function hasOptedInCapability(traceability) {
|
|
34
|
+
return traceability.capabilities === 'all' || traceability.capabilities.length > 0;
|
|
35
|
+
}
|
|
36
|
+
/** The two `MeasuresView` fields a pick reads, extracted from one event. */
|
|
37
|
+
function measuresView(data) {
|
|
38
|
+
return {
|
|
39
|
+
...(isRecord(data.functionHashes)
|
|
40
|
+
? { functionHashes: data.functionHashes }
|
|
41
|
+
: {}),
|
|
42
|
+
...(isRecord(data.scopeHashes)
|
|
43
|
+
? {
|
|
44
|
+
scopeHashes: data.scopeHashes,
|
|
45
|
+
}
|
|
46
|
+
: {}),
|
|
47
|
+
};
|
|
48
|
+
}
|
|
49
|
+
/** The task's latest start and end `measures` views; either may be absent. */
|
|
50
|
+
export async function latestMeasures(specFolderPath, taskNumber) {
|
|
51
|
+
const raw = await fs
|
|
52
|
+
.readFile(path.join(specFolderPath, '.run', 'events', `${taskNumber}.jsonl`), 'utf8')
|
|
53
|
+
.catch(() => '');
|
|
54
|
+
let start = null;
|
|
55
|
+
let end = null;
|
|
56
|
+
for (const line of raw.split('\n')) {
|
|
57
|
+
if (!line.trim())
|
|
58
|
+
continue;
|
|
59
|
+
let event;
|
|
60
|
+
try {
|
|
61
|
+
event = JSON.parse(line);
|
|
62
|
+
}
|
|
63
|
+
catch {
|
|
64
|
+
continue;
|
|
65
|
+
}
|
|
66
|
+
if (event.type !== 'measures' || !isRecord(event.data))
|
|
67
|
+
continue;
|
|
68
|
+
const view = measuresView(event.data);
|
|
69
|
+
if (event.data.phase === 'start')
|
|
70
|
+
start = view;
|
|
71
|
+
else if (event.data.phase === 'end')
|
|
72
|
+
end = view;
|
|
73
|
+
}
|
|
74
|
+
return { start, end };
|
|
75
|
+
}
|
|
76
|
+
/** Fold one pick's result into the `mutation_ran` payload. */
|
|
77
|
+
export function mutationEvent(pick, result) {
|
|
78
|
+
const carriesOutput = result.reason === 'command_failed' || result.reason === 'timed_out';
|
|
79
|
+
return {
|
|
80
|
+
file: pick.file,
|
|
81
|
+
function: pick.function,
|
|
82
|
+
ranges: [...(pick.ranges ?? [])],
|
|
83
|
+
scenarios: [...pick.scenarios],
|
|
84
|
+
tests: [...pick.tests],
|
|
85
|
+
outcome: result.outcome,
|
|
86
|
+
killed: result.killed,
|
|
87
|
+
survived: result.survived,
|
|
88
|
+
invalid: result.invalid,
|
|
89
|
+
survivors: [...result.survivors],
|
|
90
|
+
duration: result.duration,
|
|
91
|
+
exitCode: result.exitCode,
|
|
92
|
+
...(result.reason !== undefined ? { reason: result.reason } : {}),
|
|
93
|
+
...(carriesOutput ? { output: result.output } : {}),
|
|
94
|
+
};
|
|
95
|
+
}
|
|
96
|
+
/** Run the picks in order, each under the budget left, and record each one. */
|
|
97
|
+
async function runPicks(projectRoot, specFolderPath, taskNumber, picks, command, budgetSeconds) {
|
|
98
|
+
const deadline = Date.now() + budgetSeconds * 1000;
|
|
99
|
+
for (const pick of picks) {
|
|
100
|
+
const remaining = (deadline - Date.now()) / 1000;
|
|
101
|
+
const result = remaining <= 0
|
|
102
|
+
? BUDGET_RESULT
|
|
103
|
+
: await runMutationPick(pick, projectRoot, specFolderPath, command, remaining);
|
|
104
|
+
await appendHarnessEvent(specFolderPath, taskNumber, {
|
|
105
|
+
type: 'mutation_ran',
|
|
106
|
+
timestamp: new Date().toISOString(),
|
|
107
|
+
data: mutationEvent(pick, result),
|
|
108
|
+
});
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
/**
|
|
112
|
+
* Run the mutation check for one passing task. Nothing happens unless
|
|
113
|
+
* `traceability.mutation` is set and a capability is opted in. Every error is
|
|
114
|
+
* caught, logged, and swallowed: the task's done state, markers, and retries
|
|
115
|
+
* are never touched.
|
|
116
|
+
*/
|
|
117
|
+
export async function runMutationCheck(projectRoot, specFolderPath, taskNumber, config, logger) {
|
|
118
|
+
const traceability = config.traceability ?? DEFAULT_TRACEABILITY_CONFIG;
|
|
119
|
+
const mutation = traceability.mutation;
|
|
120
|
+
if (mutation === undefined || !hasOptedInCapability(traceability))
|
|
121
|
+
return;
|
|
122
|
+
try {
|
|
123
|
+
const taskContent = await fs
|
|
124
|
+
.readFile(path.join(specFolderPath, 'tasks', `${taskNumber}.md`), 'utf8')
|
|
125
|
+
.catch(() => null);
|
|
126
|
+
if (taskContent === null)
|
|
127
|
+
return;
|
|
128
|
+
const taskData = parseTaskMd(taskContent);
|
|
129
|
+
const graph = await buildImportGraph(projectRoot, { skip: [config.paths.openspecRoot] });
|
|
130
|
+
const index = buildScenarioIndex(projectRoot, graph);
|
|
131
|
+
const { start, end } = await latestMeasures(specFolderPath, taskNumber);
|
|
132
|
+
const picks = await pickMutations({
|
|
133
|
+
projectRoot,
|
|
134
|
+
index,
|
|
135
|
+
traceability,
|
|
136
|
+
scope: taskData.scope,
|
|
137
|
+
start,
|
|
138
|
+
end,
|
|
139
|
+
});
|
|
140
|
+
await runPicks(projectRoot, specFolderPath, taskNumber, picks, mutation.command, mutation.budgetSeconds);
|
|
141
|
+
}
|
|
142
|
+
catch (err) {
|
|
143
|
+
const message = err instanceof Error ? err.message : String(err);
|
|
144
|
+
logger?.warn(`mutation check failed: ${message}`);
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
//# sourceMappingURL=mutation-check.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mutation-check.js","sourceRoot":"","sources":["../../src/watcher/mutation-check.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { OsqConfig } from '../core/foundation/config.js';
|
|
2
2
|
import { type StaleTaskAudit } from '../core/run/scope-hash.js';
|
|
3
|
-
import { type
|
|
3
|
+
import { type RunTaskResult } from './outcome.js';
|
|
4
|
+
export { buildDoneMetadata } from './done-metadata.js';
|
|
4
5
|
export { computeTaskScopeHash } from '../core/run/scope-hash.js';
|
|
5
6
|
export type { ScopeHashResult } from '../core/run/scope-hash.js';
|
|
6
7
|
/** Outcome of comparing a previously completed task's scope to the tree. */
|
|
@@ -21,19 +22,23 @@ export interface ScopeAuditOptions {
|
|
|
21
22
|
}
|
|
22
23
|
export interface ScopeAuditResult {
|
|
23
24
|
stale: StaleTaskAudit[];
|
|
25
|
+
/** Task numbers automatically recertified in this audit, numerically ordered. */
|
|
26
|
+
recertified: string[];
|
|
27
|
+
/** Differing display paths per recertified task number, for logging. */
|
|
28
|
+
recertifiedPaths: Record<string, string[]>;
|
|
24
29
|
}
|
|
25
30
|
/**
|
|
26
31
|
* Pre-lock scope recertification audit. Compares every eligible automated done
|
|
27
32
|
* marker's recorded resolver-aware scope hash and version against the current
|
|
28
33
|
* tree in one pass, verifies each stale task under the configured timeout, and
|
|
29
|
-
* records one regression marker and typed event per stale task.
|
|
30
|
-
*
|
|
34
|
+
* records one regression marker and typed event per stale task. A stale task a
|
|
35
|
+
* later in-scope task alone carried is recertified automatically instead.
|
|
36
|
+
* Already-active regressions are reported without re-verification or duplicate
|
|
37
|
+
* writes.
|
|
31
38
|
*/
|
|
32
39
|
export declare function auditScopeRegressions(options: ScopeAuditOptions): Promise<ScopeAuditResult>;
|
|
33
40
|
/** Legacy first-match detection export: detection only, never writes artifacts. */
|
|
34
41
|
export declare function checkDoneTasksScopeHashes(projectRoot: string, specFolderPath: string, currentTaskNumber: string): Promise<ScopeRegressionResult | null>;
|
|
35
|
-
/** Resolve the metadata written to the done marker after a passing task. */
|
|
36
|
-
export declare function buildDoneMetadata(projectRoot: string, scope: string[]): Promise<DoneMarkerMetadata>;
|
|
37
42
|
/**
|
|
38
43
|
* Defensive pre-spawn guard for direct `runTask` callers: record and report
|
|
39
44
|
* every stale earlier task without spawning. The watcher cycle audits before
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"regression.d.ts","sourceRoot":"","sources":["../../src/watcher/regression.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAEL,KAAK,cAAc,EASpB,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"regression.d.ts","sourceRoot":"","sources":["../../src/watcher/regression.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAEL,KAAK,cAAc,EASpB,MAAM,2BAA2B,CAAC;AAInC,OAAO,EAAE,KAAK,aAAa,EAA8C,MAAM,cAAc,CAAC;AAG9F,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,YAAY,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAEjE,4EAA4E;AAC5E,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,IAAI,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,mBAAmB,EAAE,SAAS,MAAM,EAAE,CAAC;IACvC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,8EAA8E;IAC9E,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,iFAAiF;IACjF,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,wEAAwE;IACxE,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CAC5C;AAED;;;;;;;;GAQG;AACH,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA2HjG;AAQD,mFAAmF;AACnF,wBAAsB,yBAAyB,CAC7C,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,iBAAiB,EAAE,MAAM,GACxB,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC,CAqBvC;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CACxC,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,iBAAiB,EAAE,MAAM,EACzB,MAAM,EAAE,SAAS,GAChB,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAkB/B"}
|
|
@@ -3,17 +3,19 @@ import path from 'node:path';
|
|
|
3
3
|
import { SCOPE_RESOLVER_VERSION, attributeScopePaths, buildScopeRegressionMarker, computeTaskScopeHash, findDifferingPaths, listCanonicalDoneNumbers, parseActiveStaleTask, readDoneMarker, readFileChangedPaths, } from '../core/run/scope-hash.js';
|
|
4
4
|
import { parseTaskMd } from '../core/spec/parser.js';
|
|
5
5
|
import { compareNumericPrefix } from '../core/status/state.js';
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
8
|
-
import { recordRegressedEvent, writeRegressedMarker, } from './outcome.js';
|
|
6
|
+
import { autoRecertify } from './auto-recertify.js';
|
|
7
|
+
import { recordRegressedEvent, writeRegressedMarker } from './outcome.js';
|
|
9
8
|
import { runVerificationGateResult } from './verify.js';
|
|
9
|
+
export { buildDoneMetadata } from './done-metadata.js';
|
|
10
10
|
export { computeTaskScopeHash } from '../core/run/scope-hash.js';
|
|
11
11
|
/**
|
|
12
12
|
* Pre-lock scope recertification audit. Compares every eligible automated done
|
|
13
13
|
* marker's recorded resolver-aware scope hash and version against the current
|
|
14
14
|
* tree in one pass, verifies each stale task under the configured timeout, and
|
|
15
|
-
* records one regression marker and typed event per stale task.
|
|
16
|
-
*
|
|
15
|
+
* records one regression marker and typed event per stale task. A stale task a
|
|
16
|
+
* later in-scope task alone carried is recertified automatically instead.
|
|
17
|
+
* Already-active regressions are reported without re-verification or duplicate
|
|
18
|
+
* writes.
|
|
17
19
|
*/
|
|
18
20
|
export async function auditScopeRegressions(options) {
|
|
19
21
|
const { projectRoot, specFolderPath, eligibleTaskNumbers, verifyTimeoutSeconds } = options;
|
|
@@ -35,6 +37,8 @@ export async function auditScopeRegressions(options) {
|
|
|
35
37
|
}
|
|
36
38
|
}
|
|
37
39
|
const stale = [];
|
|
40
|
+
const recertified = [];
|
|
41
|
+
const recertifiedPaths = {};
|
|
38
42
|
for (const taskNumber of [...new Set(eligibleTaskNumbers)].sort(compareNumericPrefix)) {
|
|
39
43
|
const recorded = doneInfo.get(taskNumber);
|
|
40
44
|
if (!recorded)
|
|
@@ -84,6 +88,25 @@ export async function auditScopeRegressions(options) {
|
|
|
84
88
|
verificationPassed: gate?.passed ?? false,
|
|
85
89
|
alreadyActive: false,
|
|
86
90
|
};
|
|
91
|
+
if (gate?.passed === true) {
|
|
92
|
+
const qualified = await autoRecertify({
|
|
93
|
+
projectRoot,
|
|
94
|
+
specFolderPath,
|
|
95
|
+
runDir,
|
|
96
|
+
taskNumber,
|
|
97
|
+
differing,
|
|
98
|
+
recorded,
|
|
99
|
+
current,
|
|
100
|
+
verifyCommand: taskData.verify,
|
|
101
|
+
verify: gate,
|
|
102
|
+
attribution: base.attribution,
|
|
103
|
+
});
|
|
104
|
+
if (qualified) {
|
|
105
|
+
recertified.push(taskNumber);
|
|
106
|
+
recertifiedPaths[taskNumber] = base.differingPaths;
|
|
107
|
+
continue;
|
|
108
|
+
}
|
|
109
|
+
}
|
|
87
110
|
if (gate) {
|
|
88
111
|
const marker = buildScopeRegressionMarker(audit).replace('\n---\n', `\nrecorded_resolver: ${JSON.stringify(recorded.scopeResolver)}\ncurrent_resolver: ${SCOPE_RESOLVER_VERSION}\n---\n`);
|
|
89
112
|
await writeRegressedMarker(runDir, taskNumber, marker);
|
|
@@ -105,7 +128,7 @@ export async function auditScopeRegressions(options) {
|
|
|
105
128
|
}
|
|
106
129
|
stale.push(audit);
|
|
107
130
|
}
|
|
108
|
-
return { stale };
|
|
131
|
+
return { stale, recertified, recertifiedPaths };
|
|
109
132
|
}
|
|
110
133
|
async function eligibleEarlierTasks(runDir, currentTask) {
|
|
111
134
|
return (await listCanonicalDoneNumbers(runDir)).filter((number) => Number.parseInt(number, 10) < currentTask);
|
|
@@ -134,22 +157,6 @@ export async function checkDoneTasksScopeHashes(projectRoot, specFolderPath, cur
|
|
|
134
157
|
}
|
|
135
158
|
: null;
|
|
136
159
|
}
|
|
137
|
-
/** Resolve the metadata written to the done marker after a passing task. */
|
|
138
|
-
export async function buildDoneMetadata(projectRoot, scope) {
|
|
139
|
-
const [scopeHash, buildInfo, projectCommit] = await Promise.all([
|
|
140
|
-
computeTaskScopeHash(projectRoot, scope),
|
|
141
|
-
resolveBuildInfo(),
|
|
142
|
-
resolveProjectCommit(projectRoot),
|
|
143
|
-
]);
|
|
144
|
-
return {
|
|
145
|
-
scopeHash: scopeHash.hash,
|
|
146
|
-
buildStamp: buildInfo.commit,
|
|
147
|
-
projectCommit,
|
|
148
|
-
exitCode: 0,
|
|
149
|
-
fileHashes: scopeHash.fileHashes,
|
|
150
|
-
scopeResolver: SCOPE_RESOLVER_VERSION,
|
|
151
|
-
};
|
|
152
|
-
}
|
|
153
160
|
/**
|
|
154
161
|
* Defensive pre-spawn guard for direct `runTask` callers: record and report
|
|
155
162
|
* every stale earlier task without spawning. The watcher cycle audits before
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"regression.js","sourceRoot":"","sources":["../../src/watcher/regression.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EACL,sBAAsB,EAEtB,mBAAmB,EACnB,0BAA0B,EAC1B,oBAAoB,EACpB,kBAAkB,EAClB,wBAAwB,EACxB,oBAAoB,EACpB,cAAc,EACd,oBAAoB,GACrB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"regression.js","sourceRoot":"","sources":["../../src/watcher/regression.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/watcher/runner.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAG3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/watcher/runner.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAG3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAY1D,OAAO,EAEL,KAAK,aAAa,EAOnB,MAAM,cAAc,CAAC;AAMtB,YAAY,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAExE,wFAAwF;AACxF,wBAAsB,OAAO,CAC3B,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,cAAc,EACvB,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,aAAa,CAAC,CAwJxB"}
|
package/dist/watcher/runner.js
CHANGED
|
@@ -2,14 +2,16 @@ import fs from 'node:fs/promises';
|
|
|
2
2
|
import path from 'node:path';
|
|
3
3
|
import { hashChangeFolder } from '../core/spec/hasher.js';
|
|
4
4
|
import { parseTaskMd } from '../core/spec/parser.js';
|
|
5
|
+
import { settleBaseline } from './baseline.js';
|
|
5
6
|
import { runChangeVerifyGate } from './change-verify.js';
|
|
7
|
+
import { beginGitGuard } from './git-guard.js';
|
|
6
8
|
import { clearTaskHeartbeatStats, computeTaskHeartbeatStats, formatTaskHeartbeatLine, formatTaskStatusRow, } from './heartbeat.js';
|
|
7
9
|
import { acquireTaskLock, releaseTaskLock } from './lock.js';
|
|
8
10
|
import { createTaskMeasures } from './measures.js';
|
|
9
11
|
import { formatTaskOutcomeLine, recordDeadEvent, recordDoneEvent, tickTaskCheckbox, writeDeadMarker, writeDoneMarker, } from './outcome.js';
|
|
10
12
|
import { buildDoneMetadata, guardScopeRegression } from './regression.js';
|
|
11
13
|
import { ensureTaskResult, spawnTaskAgent } from './spawn.js';
|
|
12
|
-
import {
|
|
14
|
+
import { checkBlockedFirst, runPreSpawnVerify, verifyRedFailure } from './task-verify.js';
|
|
13
15
|
import { captureTestGate, findUndeclaredTestChanges, runVerificationGate } from './verify.js';
|
|
14
16
|
/** Top-level sequential task pipeline; each phase delegates to its lifecycle module. */
|
|
15
17
|
export async function runTask(projectRoot, specFolderPath, taskNumber, config, adapter, logger) {
|
|
@@ -103,21 +105,17 @@ export async function runTask(projectRoot, specFolderPath, taskNumber, config, a
|
|
|
103
105
|
try {
|
|
104
106
|
const testGate = await captureTestGate(projectRoot, taskData.scope, taskData.testsModify);
|
|
105
107
|
const verifyCtx = { projectRoot, specFolderPath, taskNumber, taskData, config, logger };
|
|
108
|
+
const baseline = await settleBaseline(verifyCtx);
|
|
109
|
+
if (!baseline.ok)
|
|
110
|
+
return fail('baseline_red', baseline.marker, baseline.error, baseline.extra);
|
|
106
111
|
const preSpawn = await runPreSpawnVerify(verifyCtx);
|
|
107
112
|
if (!preSpawn.ok)
|
|
108
113
|
return fail('verify_precondition', preSpawn.marker, preSpawn.error);
|
|
109
114
|
measures = createTaskMeasures(projectRoot, specFolderPath, taskNumber, taskData);
|
|
110
115
|
await measures.emitStart();
|
|
111
|
-
const
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
taskNumber,
|
|
115
|
-
taskData,
|
|
116
|
-
config,
|
|
117
|
-
adapter,
|
|
118
|
-
logger,
|
|
119
|
-
logOutcome,
|
|
120
|
-
});
|
|
116
|
+
const gitGuard = await beginGitGuard({ ...verifyCtx, scope: taskData.scope });
|
|
117
|
+
const spawnOutcome = await spawnTaskAgent({ ...verifyCtx, adapter, logOutcome });
|
|
118
|
+
await gitGuard?.check();
|
|
121
119
|
if (!spawnOutcome.ok)
|
|
122
120
|
return finish(spawnOutcome.result);
|
|
123
121
|
const undeclared = await findUndeclaredTestChanges(projectRoot, testGate.snapshot, testGate);
|
|
@@ -129,9 +127,9 @@ export async function runTask(projectRoot, specFolderPath, taskNumber, config, a
|
|
|
129
127
|
const ensured = await ensureTaskResult({ specFolderPath, taskNumber, logger, logOutcome });
|
|
130
128
|
if (!ensured.ok)
|
|
131
129
|
return finish(ensured.result);
|
|
132
|
-
const
|
|
133
|
-
if (
|
|
134
|
-
return
|
|
130
|
+
const stop = await checkBlockedFirst(verifyCtx, fail);
|
|
131
|
+
if (stop)
|
|
132
|
+
return stop;
|
|
135
133
|
const verifyResult = await runVerificationGate(projectRoot, taskData.verify, config.timeouts.verifyTimeoutSeconds ?? 600, { specFolderPath, taskNumber });
|
|
136
134
|
if (!verifyResult.passed) {
|
|
137
135
|
return verifyRedFailure(taskData.verify, verifyResult, fail);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/watcher/runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAErD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EACL,uBAAuB,EACvB,yBAAyB,EACzB,uBAAuB,EACvB,mBAAmB,GACpB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAGL,qBAAqB,EACrB,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,eAAe,EACf,eAAe,GAChB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC9D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/watcher/runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spawn.d.ts","sourceRoot":"","sources":["../../src/watcher/spawn.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAE9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,KAAK,cAAc,EAAyC,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"spawn.d.ts","sourceRoot":"","sources":["../../src/watcher/spawn.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAE9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,KAAK,cAAc,EAAyC,MAAM,qBAAqB,CAAC;AAKjG,OAAO,EACL,KAAK,oBAAoB,EACzB,KAAK,aAAa,EAInB,MAAM,cAAc,CAAC;AAGtB,MAAM,WAAW,qBAAqB;IACpC,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,SAAS,CAAC;IAClB,OAAO,EAAE,cAAc,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,oBAAoB,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;CACvF;AAED,MAAM,MAAM,qBAAqB,GAC7B;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAC/B;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,aAAa,CAAA;CAAE,CAAC;AAEzC;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,qBAAqB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CA0GhG;AAED,MAAM,WAAW,uBAAuB;IACtC,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,oBAAoB,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;CACvF;AAED,MAAM,MAAM,uBAAuB,GAAG;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,aAAa,CAAA;CAAE,CAAC;AAE1F;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,uBAAuB,GAC5B,OAAO,CAAC,uBAAuB,CAAC,CA+BlC"}
|
package/dist/watcher/spawn.js
CHANGED
|
@@ -5,6 +5,7 @@ import { appendHarnessEvent } from '../harness/types.js';
|
|
|
5
5
|
import { formatTaskStartedLine, readRetryContext } from './attempt.js';
|
|
6
6
|
import { resolveProjectCommit } from './build-project.js';
|
|
7
7
|
import { resolveBuildInfo } from './build.js';
|
|
8
|
+
import { checkInstructionsDrift } from './instructions-drift.js';
|
|
8
9
|
import { recordDeadEvent, recordLifecycleEvent, writeDeadMarker, } from './outcome.js';
|
|
9
10
|
import { extractFinalTextFromStream, synthesizeResultFile } from './verify.js';
|
|
10
11
|
/**
|
|
@@ -22,6 +23,9 @@ export async function spawnTaskAgent(opts) {
|
|
|
22
23
|
// Reconstruct retry context from append-only state before any spawn so a
|
|
23
24
|
// watcher restart still carries the attempt and prior failure reason.
|
|
24
25
|
const retryContext = await readRetryContext(specFolderPath, taskNumber);
|
|
26
|
+
if (retryContext.attempt === 1) {
|
|
27
|
+
await checkInstructionsDrift({ ...opts, attempt: 1 });
|
|
28
|
+
}
|
|
25
29
|
let startedRecorded = false;
|
|
26
30
|
let startedPromise = null;
|
|
27
31
|
const recordStarted = (pid, details) => {
|
|
@@ -46,6 +50,7 @@ export async function spawnTaskAgent(opts) {
|
|
|
46
50
|
pid,
|
|
47
51
|
timeoutSeconds,
|
|
48
52
|
...(details?.harnessVersion ? { harnessVersion: details.harnessVersion } : {}),
|
|
53
|
+
...(details?.harnessAuth ? { harnessAuth: details.harnessAuth } : {}),
|
|
49
54
|
...buildInfo,
|
|
50
55
|
},
|
|
51
56
|
}, formatTaskStartedLine(taskNumber, taskData.title, pid, timeoutSeconds, useSymbols), logger);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spawn.js","sourceRoot":"","sources":["../../src/watcher/spawn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAGhF,OAAO,EAA0C,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACjG,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAGL,eAAe,EACf,oBAAoB,EACpB,eAAe,GAChB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,0BAA0B,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAiB/E;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,IAA2B;IAC9D,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;IACnE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;IACrD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;IACjD,MAAM,cAAc,GAAG,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC;IAC1D,MAAM,UAAU,GAAG,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IAC5C,yEAAyE;IACzE,sEAAsE;IACtE,MAAM,YAAY,GAAG,MAAM,gBAAgB,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"spawn.js","sourceRoot":"","sources":["../../src/watcher/spawn.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,8 +11,6 @@ export type FailFn = (reason: RunTaskFailureReason, marker: string, error: strin
|
|
|
11
11
|
* a mismatch: the honest red start has not been observed yet.
|
|
12
12
|
*/
|
|
13
13
|
export declare function isPreSpawnMismatch(expected: VerifyStarts, result: VerificationResult, missingPaths?: readonly string[]): boolean;
|
|
14
|
-
/** One warning line naming the task, its expected start state, and exit code. */
|
|
15
|
-
export declare function formatPreSpawnWarning(taskNumber: string, expected: VerifyStarts, exitCode: number): string;
|
|
16
14
|
/** Dead marker for a pre-spawn mismatch: reason, command, expected state, exit, output. */
|
|
17
15
|
export declare function formatPreSpawnDeadMarker(verifyCommand: string, expected: VerifyStarts, result: VerificationResult): string;
|
|
18
16
|
export interface TaskVerifyOptions {
|
|
@@ -48,6 +46,13 @@ export declare function formatMissingPathDeadMarker(verifyCommand: string, missi
|
|
|
48
46
|
* that names none always proceeds.
|
|
49
47
|
*/
|
|
50
48
|
export declare function checkMissingVerifyPaths(projectRoot: string, taskData: TaskData, fail: FailFn): Promise<RunTaskResult | null>;
|
|
49
|
+
/**
|
|
50
|
+
* The checks that run after the agent exits and its result is ensured, before
|
|
51
|
+
* any verify: a stated `## Blocked` need fails the task first, then an added
|
|
52
|
+
* denied package, then a verify naming a missing path is refused, and last a
|
|
53
|
+
* failing focused scenario test ends the attempt. Each keeps its own dead marker.
|
|
54
|
+
*/
|
|
55
|
+
export declare function checkBlockedFirst(options: TaskVerifyOptions, fail: FailFn): Promise<RunTaskResult | null>;
|
|
51
56
|
/**
|
|
52
57
|
* The `verify_red` dead marker and failure result for a failing task verify.
|
|
53
58
|
* The marker text moved here unchanged from `runTask`.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-verify.d.ts","sourceRoot":"","sources":["../../src/watcher/task-verify.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"task-verify.d.ts","sourceRoot":"","sources":["../../src/watcher/task-verify.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAOrE,OAAO,KAAK,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAGxE,gFAAgF;AAChF,MAAM,MAAM,MAAM,GAAG,CACnB,MAAM,EAAE,oBAAoB,EAC5B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM,KACX,OAAO,CAAC,aAAa,CAAC,CAAC;AAE5B;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,YAAY,EACtB,MAAM,EAAE,kBAAkB,EAC1B,YAAY,GAAE,SAAS,MAAM,EAAO,GACnC,OAAO,CAIT;AAED,2FAA2F;AAC3F,wBAAgB,wBAAwB,CACtC,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,YAAY,EACtB,MAAM,EAAE,kBAAkB,GACzB,MAAM,CAYR;AAED,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,SAAS,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,qBAAqB,GAAG;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEhG;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,qBAAqB,CAAC,CAsChC;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CACzC,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,SAAS,MAAM,EAAE,GAC9B,MAAM,CAUR;AAED;;;;GAIG;AACH,wBAAsB,uBAAuB,CAC3C,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAQ/B;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,iBAAiB,EAC1B,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAS/B;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE;IAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAA;CAAE,EAC/D,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,aAAa,CAAC,CAMxB"}
|
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import { missingNamedPaths } from '../core/spec/verify-paths.js';
|
|
2
|
+
import { formatPreSpawnStart } from '../core/status/pre-spawn-words.js';
|
|
2
3
|
import { readRetryContext } from './attempt.js';
|
|
4
|
+
import { checkBlocked } from './blocked.js';
|
|
5
|
+
import { checkDependencies } from './dependencies.js';
|
|
6
|
+
import { checkFocusedTests } from './focused-verify.js';
|
|
3
7
|
import { runVerificationGateResult } from './verify.js';
|
|
4
8
|
/**
|
|
5
9
|
* True when a first-attempt declared start state disagrees with the observed
|
|
@@ -12,10 +16,6 @@ export function isPreSpawnMismatch(expected, result, missingPaths = []) {
|
|
|
12
16
|
const passed = result.exitCode === 0 && !result.error && !result.timedOut;
|
|
13
17
|
return expected === 'red' ? passed && missingPaths.length === 0 : !passed;
|
|
14
18
|
}
|
|
15
|
-
/** One warning line naming the task, its expected start state, and exit code. */
|
|
16
|
-
export function formatPreSpawnWarning(taskNumber, expected, exitCode) {
|
|
17
|
-
return `task ${taskNumber} pre-spawn verify mismatch: expected ${expected}, exit code ${exitCode}`;
|
|
18
|
-
}
|
|
19
19
|
/** Dead marker for a pre-spawn mismatch: reason, command, expected state, exit, output. */
|
|
20
20
|
export function formatPreSpawnDeadMarker(verifyCommand, expected, result) {
|
|
21
21
|
return [
|
|
@@ -56,12 +56,18 @@ export async function runPreSpawnVerify(options) {
|
|
|
56
56
|
mismatch: isPreSpawnMismatch(expected, value, missingPaths),
|
|
57
57
|
}),
|
|
58
58
|
});
|
|
59
|
-
|
|
59
|
+
const mismatch = isPreSpawnMismatch(expected, result, missingPaths);
|
|
60
|
+
const line = `task ${taskNumber} ${formatPreSpawnStart(expected, result.exitCode, missingPaths)}`;
|
|
61
|
+
if (mismatch) {
|
|
62
|
+
logger?.warn(line);
|
|
63
|
+
}
|
|
64
|
+
else {
|
|
65
|
+
logger?.info(line);
|
|
66
|
+
}
|
|
67
|
+
if (!mismatch)
|
|
60
68
|
return { ok: true };
|
|
61
|
-
if (mode === 'warn')
|
|
62
|
-
logger?.warn(formatPreSpawnWarning(taskNumber, expected, result.exitCode));
|
|
69
|
+
if (mode === 'warn')
|
|
63
70
|
return { ok: true };
|
|
64
|
-
}
|
|
65
71
|
return {
|
|
66
72
|
ok: false,
|
|
67
73
|
marker: formatPreSpawnDeadMarker(taskData.verify, expected, result),
|
|
@@ -94,6 +100,25 @@ export async function checkMissingVerifyPaths(projectRoot, taskData, fail) {
|
|
|
94
100
|
return null;
|
|
95
101
|
return fail('verify_path_missing', formatMissingPathDeadMarker(taskData.verify, missing), `Verify names missing paths: ${missing.join(', ')}`);
|
|
96
102
|
}
|
|
103
|
+
/**
|
|
104
|
+
* The checks that run after the agent exits and its result is ensured, before
|
|
105
|
+
* any verify: a stated `## Blocked` need fails the task first, then an added
|
|
106
|
+
* denied package, then a verify naming a missing path is refused, and last a
|
|
107
|
+
* failing focused scenario test ends the attempt. Each keeps its own dead marker.
|
|
108
|
+
*/
|
|
109
|
+
export async function checkBlockedFirst(options, fail) {
|
|
110
|
+
const { projectRoot, specFolderPath, taskNumber, taskData } = options;
|
|
111
|
+
const blocked = await checkBlocked(specFolderPath, taskNumber, fail);
|
|
112
|
+
if (blocked)
|
|
113
|
+
return blocked;
|
|
114
|
+
const denied = await checkDependencies(options, fail);
|
|
115
|
+
if (denied)
|
|
116
|
+
return denied;
|
|
117
|
+
const missing = await checkMissingVerifyPaths(projectRoot, taskData, fail);
|
|
118
|
+
if (missing)
|
|
119
|
+
return missing;
|
|
120
|
+
return checkFocusedTests(options, fail);
|
|
121
|
+
}
|
|
97
122
|
/**
|
|
98
123
|
* The `verify_red` dead marker and failure result for a failing task verify.
|
|
99
124
|
* The marker text moved here unchanged from `runTask`.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-verify.js","sourceRoot":"","sources":["../../src/watcher/task-verify.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"task-verify.js","sourceRoot":"","sources":["../../src/watcher/task-verify.ts"],"names":[],"mappings":"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"}
|