@friedbotstudio/create-baseline 0.6.0 → 0.8.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/README.md +14 -10
- package/bin/cli.js +19 -13
- package/obj/template/.claude/commands/init-project-doctor.md +74 -0
- package/obj/template/.claude/hooks/lib/resume_writer.py +14 -1
- package/obj/template/.claude/hooks/memory_session_start.sh +24 -0
- package/obj/template/.claude/hooks/track_guard.sh +11 -1
- package/obj/template/.claude/manifest.json +31 -99
- package/obj/template/.claude/schemas/workflow-track.v1.json +64 -0
- package/obj/template/.claude/skills/audit-baseline/audit.sh +2 -2
- package/obj/template/.claude/skills/chore/SKILL.md +2 -2
- package/obj/template/.claude/skills/harness/SKILL.md +15 -6
- package/obj/template/.claude/skills/intake/SKILL.md +1 -1
- package/obj/template/.claude/skills/swarm-plan/SKILL.md +2 -0
- package/obj/template/.claude/skills/tdd/SKILL.md +2 -2
- package/obj/template/.claude/skills/triage/SKILL.md +29 -6
- package/obj/template/.claude/skills/triage/seed-tasklist.mjs +107 -0
- package/obj/template/.claude/skills/upgrade-project/SKILL.md +18 -7
- package/obj/template/.claude/workflows.jsonl +6 -0
- package/obj/template/CLAUDE.md +8 -14
- package/obj/template/docs/init/seed.md +148 -3
- package/package.json +1 -1
- package/src/.claude/workflows.template.jsonl +6 -0
- package/src/CLAUDE.template.md +8 -14
- package/src/cli/install.js +5 -1
- package/src/cli/merge.js +42 -5
- package/src/cli/track-tasklist-materializer.js +223 -0
- package/src/cli/tui/upgrade.js +30 -41
- package/src/cli/upgrade-tiers.js +42 -4
- package/src/cli/workflow-migrator.js +40 -0
- package/src/cli/workflows-validator-invariants.js +417 -0
- package/src/cli/workflows-validator-predicates.js +19 -0
- package/src/cli/workflows-validator.js +156 -0
- package/src/seed.template.md +148 -3
- package/obj/template/.claude/skills/google-analytics/SKILL.md +0 -129
- package/obj/template/.claude/skills/google-analytics/references/audiences.md +0 -389
- package/obj/template/.claude/skills/google-analytics/references/bigquery.md +0 -470
- package/obj/template/.claude/skills/google-analytics/references/custom-dimensions.md +0 -355
- package/obj/template/.claude/skills/google-analytics/references/custom-events.md +0 -383
- package/obj/template/.claude/skills/google-analytics/references/data-management.md +0 -416
- package/obj/template/.claude/skills/google-analytics/references/debugview.md +0 -364
- package/obj/template/.claude/skills/google-analytics/references/events-fundamentals.md +0 -398
- package/obj/template/.claude/skills/google-analytics/references/gtag.md +0 -502
- package/obj/template/.claude/skills/google-analytics/references/gtm-integration.md +0 -483
- package/obj/template/.claude/skills/google-analytics/references/measurement-protocol.md +0 -519
- package/obj/template/.claude/skills/google-analytics/references/privacy.md +0 -441
- package/obj/template/.claude/skills/google-analytics/references/recommended-events.md +0 -464
- package/obj/template/.claude/skills/google-analytics/references/reporting.md +0 -397
- package/obj/template/.claude/skills/google-analytics/references/setup.md +0 -344
- package/obj/template/.claude/skills/google-analytics/references/user-tracking.md +0 -417
- package/obj/template/.claude/skills/optimize-seo/SKILL.md +0 -313
- package/obj/template/.claude/skills/optimize-seo/scripts/pagespeed.mjs +0 -197
- package/obj/template/.claude/skills/pagespeed-insights/LICENSE.md +0 -37
- package/obj/template/.claude/skills/pagespeed-insights/SKILL.md +0 -446
- package/obj/template/.claude/skills/pagespeed-insights/reference.md +0 -50
- package/src/cli/diff-render.js +0 -54
|
@@ -247,7 +247,7 @@ Each vendored shared global ships with its own `LICENSE` + `NOTICE` alongside th
|
|
|
247
247
|
|
|
248
248
|
- `chore` — for tasks with no failing-test-driven code change (documentation, governance counts, vendored-skill content updates, configuration, formatting, typo fixes, dependency bumps, skill consolidations). Skips `/scenario` and `/implement` — there is nothing to drive with a failing test. Runs the edits directly, then conditionally invokes `simplify` / `integrate` / `document` based on what the diff touches (each has explicit triggers in the chore skill body). `verify`, `archive`, and `/grant-commit` + `/commit` always run. Chore is a stripped-down pipeline, **not** a bypass — silent skips of triggered conditional phases are forbidden; the end-of-chore summary documents every skip rationale. Tasks that need a real failing test route to `/tdd` or higher instead.
|
|
249
249
|
|
|
250
|
-
### §4.4 Commands (
|
|
250
|
+
### §4.4 Commands (6) — structurally user-only
|
|
251
251
|
|
|
252
252
|
Files at `.claude/commands/<name>.md`. Commands differ from skills in exactly one way: **Claude cannot invoke them via the Skill tool.** A command is a button only a human can press.
|
|
253
253
|
|
|
@@ -258,8 +258,9 @@ Files at `.claude/commands/<name>.md`. Commands differ from skills in exactly on
|
|
|
258
258
|
| `grant-commit` | Opens a 5-minute consent window for `git commit` on a protected branch. Writes `.claude/state/commit_consent`. Enforced by `git_commit_guard`. |
|
|
259
259
|
| `grant-push` | Opens a 5-minute consent window for `git push` on a protected branch. Writes `.claude/state/push_consent`. Enforced by `git_commit_guard`. Not a workflow-phase gate — a runtime consent for the branch-aware policy (§11). |
|
|
260
260
|
| `init-project` | One-time bootstrap. Detects stack, proposes `.claude/project.json` (test cmd, lint cmd, TDD globs, destructive patterns, artifact required sections, swarm config). Flips `configured: true`. |
|
|
261
|
+
| `init-project-doctor` | Detects baseline drift — missing/invalid `.claude/workflows.jsonl`, schema/invariant violations, four-way Article IV / §18 mirror drift, and (advisory) shipped-tooling files placed outside `.claude/`. Interactive: presents each violation via `AskUserQuestion` and applies the named fix on confirmation. |
|
|
261
262
|
|
|
262
|
-
**Adding a
|
|
263
|
+
**Adding a seventh command requires answering yes to both:** "does a human need to press this?" and "is 'user-only via frontmatter flag' too weak a guarantee?" Otherwise make it a skill.
|
|
263
264
|
|
|
264
265
|
### §4.5 MCP servers (3)
|
|
265
266
|
|
|
@@ -338,7 +339,7 @@ Phases are fixed ordering; `/triage` picks the entry and may mark phases as exce
|
|
|
338
339
|
|
|
339
340
|
## §6 — Consent model
|
|
340
341
|
|
|
341
|
-
**Four consent gates + one bootstrap
|
|
342
|
+
**Four consent gates + one bootstrap + one doctor.** All are slash commands, not skills. Commands live in `.claude/commands/`; Claude cannot invoke them via the Skill tool. The guarantee is structural (file location), not flag-based. Three of the four gates are workflow-phase gates (A: `/approve-spec`, B: `/approve-swarm`, C: `/grant-commit`); the fourth (`/grant-push`) is a Bash-time consent for the branch-aware push policy in §11. The bootstrap is `/init-project`; the doctor is `/init-project doctor` (drift detector + repairer for `.claude/workflows.jsonl` + the §18 / Article IV four-way mirror; see §18.7).
|
|
342
343
|
|
|
343
344
|
| Gate | When it fires | Unlocks |
|
|
344
345
|
|---|---|---|
|
|
@@ -598,3 +599,147 @@ The audit at `.claude/skills/audit-baseline/audit.sh` consumes `manifest.owners.
|
|
|
598
599
|
The audit also verifies constitutional citation: CLAUDE.md SHALL contain the literal string "Article XI" and a reference to the manifest, and `docs/init/seed.md` SHALL contain "§17" and a manifest reference. Missing citations trigger FAIL with `CLAUDE.md missing Article XI citation` or `seed.md missing §17 citation`.
|
|
599
600
|
|
|
600
601
|
This provenance system is intentionally minimal: the manifest tracks shipped-file hashes; the frontmatter declares per-skill ownership; the audit reconciles the two against on-disk reality. Cryptographic supply-chain attestation, signed lock files, and per-skill aggregate merkle hashes are non-goals; the per-file `manifest.files` map already covers every file in every skill directory. A future `npx @friedbotstudio/create-baseline upgrade` subcommand will consume `manifest.owners.skills` + `manifest.files` to safely re-overlay baseline-owned files while leaving user-added skills and locally-customized baseline skills untouched — that subcommand is out of scope here.
|
|
602
|
+
|
|
603
|
+
---
|
|
604
|
+
|
|
605
|
+
## §18 — Workflow definitions and Article IV invariants
|
|
606
|
+
|
|
607
|
+
### 18.1 Source of truth
|
|
608
|
+
|
|
609
|
+
`.claude/workflows.jsonl` is the canonical source for every workflow this baseline can execute. The file holds one Track record per line (JSONL). It is project-owned and `NEVER_TOUCH` (declared in `src/cli/install.js:NEVER_TOUCH` and `scripts/build-manifest.mjs:NEVER_TOUCH_PATHS`); baseline upgrades preserve user customizations verbatim via `NEVER_TOUCH_PRESERVE`. The shipped baseline overlays the pristine 6-track set from `src/.claude/workflows.template.jsonl` onto fresh installs via `scripts/build-template.sh` Stage 2; existing installs are not touched. The JSON Schema document at `.claude/schemas/workflow-track.v1.json` is referenced by `Track.$schema` and is itself `NEVER_TOUCH`.
|
|
610
|
+
|
|
611
|
+
`workflows.jsonl` supersedes the hardcoded triage templates (intake-full / spec-entry / tdd-quickfix / chore). Triage reads `workflows.jsonl` at seed time, validates each Track, classifies the user's request, and materializes the chosen Track's DAG into the TaskList. The canonical four tracks shipped in the pristine template are byte-equivalent to the pre-§18 hardcoded templates per spec AC-016 (`tests/byte-equivalent-migration.test.mjs`).
|
|
612
|
+
|
|
613
|
+
### 18.2 Track schema
|
|
614
|
+
|
|
615
|
+
A **Track** record has this shape (full definition in `.claude/schemas/workflow-track.v1.json`):
|
|
616
|
+
|
|
617
|
+
```jsonc
|
|
618
|
+
{
|
|
619
|
+
"$schema": "./schemas/workflow-track.v1.json",
|
|
620
|
+
"track_id": "<unique-across-file>",
|
|
621
|
+
"name": "<short label>",
|
|
622
|
+
"description": "<paragraph; read by the LLM classifier>",
|
|
623
|
+
"selectable": true, // false = sub-track only (referenced via sub_track)
|
|
624
|
+
"selector_hints": ["<descriptive phrase>", ...],
|
|
625
|
+
"preconditions": [{"name": "<predicate>", "argument": "<opt>"}, ...],
|
|
626
|
+
"invariants": ["commits", "requires_spec", ...],
|
|
627
|
+
"nodes": [Node, ...]
|
|
628
|
+
}
|
|
629
|
+
```
|
|
630
|
+
|
|
631
|
+
A **Node** is either a `task` (skill invocation or sub-track expansion) or a `selector` (picks one of multiple alternates at runtime):
|
|
632
|
+
|
|
633
|
+
```jsonc
|
|
634
|
+
{
|
|
635
|
+
"id": "<unique-within-track>",
|
|
636
|
+
"type": "task" | "selector",
|
|
637
|
+
// type=task → exactly one of:
|
|
638
|
+
"skill": "<skill-or-command-name>",
|
|
639
|
+
"sub_track": "<another-track_id>",
|
|
640
|
+
// type=selector → required:
|
|
641
|
+
"alternates": [Alternate, ...],
|
|
642
|
+
// shared:
|
|
643
|
+
"input": "<opt; passed to the skill at invocation>",
|
|
644
|
+
"invocation_prompt": "<opt; declared-now/used-later — v2 Handlebars+LLM>",
|
|
645
|
+
"output": "<opt; informational artifact path>",
|
|
646
|
+
"output_formatter_prompt": "<opt; declared-now/used-later>",
|
|
647
|
+
"depends_on": ["<predecessor node id>", ...],
|
|
648
|
+
"blocks": ["<successor node id>", ...],
|
|
649
|
+
"can_parallel": false, // true: peers at same dep level dispatch concurrently
|
|
650
|
+
"needs_user": false, // true: consent gate; harness yields
|
|
651
|
+
"activeForm": "<TaskList spinner text>",
|
|
652
|
+
"metadata": {"phase": "<...>"}
|
|
653
|
+
}
|
|
654
|
+
```
|
|
655
|
+
|
|
656
|
+
An **Alternate** (inside a selector node):
|
|
657
|
+
|
|
658
|
+
```jsonc
|
|
659
|
+
{
|
|
660
|
+
"skill": "<skill-name>", // XOR with sub_track
|
|
661
|
+
"sub_track": "<track_id>", // XOR with skill
|
|
662
|
+
"preconditions": [Predicate, ...],
|
|
663
|
+
"description": "<rationale>"
|
|
664
|
+
}
|
|
665
|
+
```
|
|
666
|
+
|
|
667
|
+
A **Predicate** (track-level and alternate-level):
|
|
668
|
+
|
|
669
|
+
```jsonc
|
|
670
|
+
{
|
|
671
|
+
"name": "<v1-vocabulary>",
|
|
672
|
+
"argument": "<opt; e.g., '3' for min_components>"
|
|
673
|
+
}
|
|
674
|
+
```
|
|
675
|
+
|
|
676
|
+
### 18.3 Article IV invariants (I1..I11)
|
|
677
|
+
|
|
678
|
+
Every Track in `workflows.jsonl` SHALL satisfy these invariants. Validation runs at three points: install/upgrade time (audit-baseline), triage time (LLM-driven selector), and harness time (per-node before dispatch).
|
|
679
|
+
|
|
680
|
+
- **I1.** Unique `track_id` across the file.
|
|
681
|
+
- **I2.** Unique `node.id` within a track.
|
|
682
|
+
- **I3.** `type=task` nodes carry exactly one of `{skill, sub_track}`. `type=selector` nodes carry non-empty `alternates[]`.
|
|
683
|
+
- **I4.** Every `depends_on` and `blocks` reference resolves to a `node.id` in the same track.
|
|
684
|
+
- **I5.** The dependency DAG is acyclic.
|
|
685
|
+
- **I6.** Tracks declaring the `commits` invariant SHALL include a `needs_user: true` `grant-commit` node ordered before the node with `skill: "commit"`.
|
|
686
|
+
- **I7.** Every `sub_track` reference resolves to a Track with `selectable: false`.
|
|
687
|
+
- **I8.** Every `skill:` reference resolves to a known invokable — skill in `EXPECTED_SKILLS ∪ project.json additions.skills`, OR consent-gate command in `.claude/commands/` (e.g., `approve-spec`, `grant-commit`, `approve-swarm`).
|
|
688
|
+
- **I9.** `needs_user: true` nodes appear in dependency order before any node that depends on their consent.
|
|
689
|
+
- **I10.** A selector node's alternates SHALL share the same shape (all skill, or all sub_track) — they're interchangeable in the DAG.
|
|
690
|
+
- **I11.** Every `Predicate.name` resolves to a known v1 predicate (see §18.4).
|
|
691
|
+
|
|
692
|
+
### 18.4 Predicate vocabulary (v1)
|
|
693
|
+
|
|
694
|
+
The closed set of declarative predicates that may appear in Track or Alternate `preconditions[]`:
|
|
695
|
+
|
|
696
|
+
| Predicate | Argument | Evaluates true when |
|
|
697
|
+
|---|---|---|
|
|
698
|
+
| `requires_git` | — | `git rev-parse --is-inside-work-tree` exits 0 at the project root. |
|
|
699
|
+
| `requires_user_override` | `<value>` | The user explicitly named this alternate in conversation (e.g., "use solo"). |
|
|
700
|
+
| `requires_min_components` | `<int>` | The approved spec has at least N C4 Components. |
|
|
701
|
+
| `requires_phase_completed` | `<phase>` | The named phase appears in `workflow.json → completed`. |
|
|
702
|
+
| `requires_skill_present` | `<skill_id>` | The named skill exists in `EXPECTED_SKILLS ∪ additions.skills`. |
|
|
703
|
+
|
|
704
|
+
Adding a new predicate is a constitutional change: update this section, update `src/cli/workflows-validator-predicates.js`, and update the corresponding seed.template.md mirror.
|
|
705
|
+
|
|
706
|
+
### 18.5 `invocation_prompt` / `output_formatter_prompt` — declared, deferred
|
|
707
|
+
|
|
708
|
+
Both fields are part of the v1 Node schema and validated at parse time. They are **not actuated in v1** — the harness ignores them. They are declared now to lock the schema shape so future Track records can carry them without a schema bump. The v2 actuation plan: Handlebars-style templates with LLM interpolation, allowing per-track UX customization of the invocation phrasing and the post-skill output formatting. Until v2 ships, populating these fields is allowed but inert.
|
|
709
|
+
|
|
710
|
+
### 18.6 Migration from pre-§18 workflow.json
|
|
711
|
+
|
|
712
|
+
An in-flight `.claude/state/workflow.json` written by a pre-§18 baseline (carries `entry_phase` field, no `track_id`) is one-shot-migrated by the harness preflight before the workflow loads. The canonical map:
|
|
713
|
+
|
|
714
|
+
| `entry_phase` (pre-§18) | `track_id` (post-§18) |
|
|
715
|
+
|---|---|
|
|
716
|
+
| `intake` | `intake-full` |
|
|
717
|
+
| `spec` | `spec-entry` |
|
|
718
|
+
| `tdd` | `tdd-quickfix` |
|
|
719
|
+
| `chore` | `chore` |
|
|
720
|
+
|
|
721
|
+
`completed[]` is remapped from phase names to node ids; the canonical tracks are designed so most phase names equal the corresponding node id (identity remap), with the exception of selector wrappers (e.g., `implementation` in intake-full wraps the swarm-vs-tdd selection). The migrator initializes `skipped_alternates: []` and refreshes `updated_at`. Idempotent: re-running on an already-migrated workflow.json is a no-op. Unmapped `entry_phase` halts with a named error; the user restarts via `/triage`.
|
|
722
|
+
|
|
723
|
+
Migrator implementation: `src/cli/workflow-migrator.js` exports `migrateWorkflowJsonInPlace(filePath)`.
|
|
724
|
+
|
|
725
|
+
### 18.7 Lifecycle: install, upgrade, doctor
|
|
726
|
+
|
|
727
|
+
- **Fresh install.** `scripts/build-template.sh` overlays `src/.claude/workflows.template.jsonl` → `obj/template/.claude/workflows.jsonl` at Stage 2, and the pristine schemas/ directory bulk-rsyncs at Stage 1. The CLI install copies both into the consumer target. Result: every fresh install has `<target>/.claude/workflows.jsonl` with the canonical 4 selectable + 2 sub-track set.
|
|
728
|
+
|
|
729
|
+
- **Upgrade.** Both `.claude/workflows.jsonl` and `.claude/schemas/workflow-track.v1.json` are `NEVER_TOUCH`. The merge flow returns `NEVER_TOUCH_PRESERVE` for them on every upgrade; user customizations (added tracks, modified nodes, per-project additions like `cli-copy-review`) survive verbatim.
|
|
730
|
+
|
|
731
|
+
- **Doctor.** `/init-project doctor` (new sub-command) detects drift: missing `workflows.jsonl`, schema/invariant violations, four-way mirror drift between seed.md §18 / src/seed.template.md §18 / CLAUDE.md Article IV / src/CLAUDE.template.md Article IV, and (advisory) shipped-tooling files placed outside `.claude/` per the convention codified at §3.
|
|
732
|
+
|
|
733
|
+
### 18.8 Cross-references
|
|
734
|
+
|
|
735
|
+
- `CLAUDE.md Article IV` — phase-ordering rules; binding on every commit-producing track.
|
|
736
|
+
- `CLAUDE.md Article VII` — git rules; relevant to the `requires_git` precondition.
|
|
737
|
+
- `seed.md §3` — directory structure convention (tooling lives under `.claude/`).
|
|
738
|
+
- `seed.md §17` — skill provenance (separate concern; workflows.jsonl is project-owned, not baseline-owned).
|
|
739
|
+
- `.claude/workflows.jsonl` — this project's live tracks.
|
|
740
|
+
- `.claude/schemas/workflow-track.v1.json` — JSON Schema referenced by `Track.$schema`.
|
|
741
|
+
- `src/cli/workflows-validator.js` — validator orchestration.
|
|
742
|
+
- `src/cli/workflows-validator-invariants.js` — invariant checks I1–I11.
|
|
743
|
+
- `src/cli/workflows-validator-predicates.js` — predicate vocabulary.
|
|
744
|
+
- `src/cli/workflow-migrator.js` — pre-§18 → post-§18 migrator.
|
|
745
|
+
- `src/cli/track-tasklist-materializer.js` — Track → TaskList shape.
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@friedbotstudio/create-baseline",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.8.0",
|
|
4
4
|
"description": "Node CLI scaffolder that materializes the Claude Code baseline (hooks, skills, commands, MCP servers, governance docs) into a target project, with branded interactive install / upgrade / doctor flows. Run via `npx @friedbotstudio/create-baseline <target>`.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"bin": {
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
{"$schema":"./schemas/workflow-track.v1.json","track_id":"intake-full","name":"Intake-entry full pipeline","description":"Canonical 11-phase pipeline for new features that need full design upfront (intake → scout → research → spec → approval → tdd/swarm → simplify → security → integrate → document → archive → memory-flush → grant-commit → changelog → commit).","selectable":true,"selector_hints":["build a new feature with full design upfront","add new functionality requiring a written spec","constitutional change or architectural refactor"],"preconditions":[],"invariants":["commits","requires_spec"],"nodes":[{"id":"intake","type":"task","skill":"intake","depends_on":[],"blocks":["scout"],"can_parallel":false,"needs_user":false,"activeForm":"Running intake","metadata":{"phase":"intake"}},{"id":"scout","type":"task","skill":"scout","depends_on":["intake"],"blocks":["research"],"can_parallel":false,"needs_user":false,"activeForm":"Running scout","metadata":{"phase":"scout"}},{"id":"research","type":"task","skill":"research","depends_on":["scout"],"blocks":["spec"],"can_parallel":false,"needs_user":false,"activeForm":"Running research","metadata":{"phase":"research"}},{"id":"spec","type":"task","skill":"spec","depends_on":["research"],"blocks":["approve-spec"],"can_parallel":false,"needs_user":false,"activeForm":"Running spec","metadata":{"phase":"spec"}},{"id":"approve-spec","type":"task","skill":"approve-spec","depends_on":["spec"],"blocks":["implementation"],"can_parallel":false,"needs_user":true,"activeForm":"Awaiting spec approval","metadata":{"phase":"approve-spec","needs_user":true}},{"id":"implementation","type":"selector","alternates":[{"sub_track":"swarm-implementation","preconditions":[{"name":"requires_git"},{"name":"requires_min_components","argument":"3"}],"description":"Swarm path for git projects with 3+ independent components"},{"sub_track":"tdd-worker-chain","preconditions":[],"description":"Solo TDD fallback (default)"}],"depends_on":["approve-spec"],"blocks":["simplify"],"can_parallel":false,"needs_user":false},{"id":"simplify","type":"task","skill":"simplify","depends_on":["implementation"],"blocks":["security"],"can_parallel":false,"needs_user":false,"activeForm":"Running simplify","metadata":{"phase":"simplify"}},{"id":"security","type":"task","skill":"security","depends_on":["simplify"],"blocks":["integrate"],"can_parallel":false,"needs_user":false,"activeForm":"Running security","metadata":{"phase":"security"}},{"id":"integrate","type":"task","skill":"integrate","depends_on":["security"],"blocks":["document"],"can_parallel":false,"needs_user":false,"activeForm":"Running integrate","metadata":{"phase":"integrate"}},{"id":"document","type":"task","skill":"document","depends_on":["integrate"],"blocks":["archive"],"can_parallel":false,"needs_user":false,"activeForm":"Running document","metadata":{"phase":"document"}},{"id":"archive","type":"task","skill":"archive","depends_on":["document"],"blocks":["memory-flush"],"can_parallel":false,"needs_user":false,"activeForm":"Running archive","metadata":{"phase":"archive"}},{"id":"memory-flush","type":"task","skill":"memory-flush","depends_on":["archive"],"blocks":["grant-commit"],"can_parallel":false,"needs_user":false,"activeForm":"Running memory-flush","metadata":{"phase":"memory-flush"}},{"id":"grant-commit","type":"task","skill":"grant-commit","depends_on":["memory-flush"],"blocks":["changelog"],"can_parallel":false,"needs_user":true,"activeForm":"Awaiting commit consent","metadata":{"phase":"grant-commit","needs_user":true}},{"id":"changelog","type":"task","skill":"changelog","depends_on":["grant-commit"],"blocks":["commit"],"can_parallel":false,"needs_user":false,"activeForm":"Running changelog","metadata":{"phase":"changelog"}},{"id":"commit","type":"task","skill":"commit","depends_on":["changelog"],"blocks":[],"can_parallel":false,"needs_user":false,"activeForm":"Running commit","metadata":{"phase":"commit"}}]}
|
|
2
|
+
{"$schema":"./schemas/workflow-track.v1.json","track_id":"spec-entry","name":"Spec-entry bugfix pipeline","description":"Bugfix workflow that starts at /spec; skips intake/scout/research. For known-behavior bugs needing a contract-level fix.","selectable":true,"selector_hints":["bug needs a spec","contract-level bugfix","behaviour change requires written design"],"preconditions":[],"invariants":["commits","requires_spec"],"nodes":[{"id":"spec","type":"task","skill":"spec","depends_on":[],"blocks":["approve-spec"],"can_parallel":false,"needs_user":false,"activeForm":"Running spec","metadata":{"phase":"spec"}},{"id":"approve-spec","type":"task","skill":"approve-spec","depends_on":["spec"],"blocks":["tdd"],"can_parallel":false,"needs_user":true,"activeForm":"Awaiting spec approval","metadata":{"phase":"approve-spec","needs_user":true}},{"id":"tdd","type":"task","skill":"tdd","depends_on":["approve-spec"],"blocks":["simplify"],"can_parallel":false,"needs_user":false,"activeForm":"Running TDD","metadata":{"phase":"tdd"}},{"id":"simplify","type":"task","skill":"simplify","depends_on":["tdd"],"blocks":["security"],"can_parallel":false,"needs_user":false,"activeForm":"Running simplify","metadata":{"phase":"simplify"}},{"id":"security","type":"task","skill":"security","depends_on":["simplify"],"blocks":["integrate"],"can_parallel":false,"needs_user":false,"activeForm":"Running security","metadata":{"phase":"security"}},{"id":"integrate","type":"task","skill":"integrate","depends_on":["security"],"blocks":["document"],"can_parallel":false,"needs_user":false,"activeForm":"Running integrate","metadata":{"phase":"integrate"}},{"id":"document","type":"task","skill":"document","depends_on":["integrate"],"blocks":["archive"],"can_parallel":false,"needs_user":false,"activeForm":"Running document","metadata":{"phase":"document"}},{"id":"archive","type":"task","skill":"archive","depends_on":["document"],"blocks":["memory-flush"],"can_parallel":false,"needs_user":false,"activeForm":"Running archive","metadata":{"phase":"archive"}},{"id":"memory-flush","type":"task","skill":"memory-flush","depends_on":["archive"],"blocks":["grant-commit"],"can_parallel":false,"needs_user":false,"activeForm":"Running memory-flush","metadata":{"phase":"memory-flush"}},{"id":"grant-commit","type":"task","skill":"grant-commit","depends_on":["memory-flush"],"blocks":["changelog"],"can_parallel":false,"needs_user":true,"activeForm":"Awaiting commit consent","metadata":{"phase":"grant-commit","needs_user":true}},{"id":"changelog","type":"task","skill":"changelog","depends_on":["grant-commit"],"blocks":["commit"],"can_parallel":false,"needs_user":false,"activeForm":"Running changelog","metadata":{"phase":"changelog"}},{"id":"commit","type":"task","skill":"commit","depends_on":["changelog"],"blocks":[],"can_parallel":false,"needs_user":false,"activeForm":"Running commit","metadata":{"phase":"commit"}}]}
|
|
3
|
+
{"$schema":"./schemas/workflow-track.v1.json","track_id":"tdd-quickfix","name":"TDD-entry quickfix pipeline","description":"Quickfix workflow that starts directly at /tdd. For localized misbehaviour with a known failing case; no spec needed.","selectable":true,"selector_hints":["quickfix with known failing test","localized bug; no spec needed","small bundled patch with a clear failing case"],"preconditions":[],"invariants":["commits"],"nodes":[{"id":"tdd","type":"task","skill":"tdd","depends_on":[],"blocks":["simplify"],"can_parallel":false,"needs_user":false,"activeForm":"Running TDD","metadata":{"phase":"tdd"}},{"id":"simplify","type":"task","skill":"simplify","depends_on":["tdd"],"blocks":["security"],"can_parallel":false,"needs_user":false,"activeForm":"Running simplify","metadata":{"phase":"simplify"}},{"id":"security","type":"task","skill":"security","depends_on":["simplify"],"blocks":["integrate"],"can_parallel":false,"needs_user":false,"activeForm":"Running security","metadata":{"phase":"security"}},{"id":"integrate","type":"task","skill":"integrate","depends_on":["security"],"blocks":["document"],"can_parallel":false,"needs_user":false,"activeForm":"Running integrate","metadata":{"phase":"integrate"}},{"id":"document","type":"task","skill":"document","depends_on":["integrate"],"blocks":["archive"],"can_parallel":false,"needs_user":false,"activeForm":"Running document","metadata":{"phase":"document"}},{"id":"archive","type":"task","skill":"archive","depends_on":["document"],"blocks":["memory-flush"],"can_parallel":false,"needs_user":false,"activeForm":"Running archive","metadata":{"phase":"archive"}},{"id":"memory-flush","type":"task","skill":"memory-flush","depends_on":["archive"],"blocks":["grant-commit"],"can_parallel":false,"needs_user":false,"activeForm":"Running memory-flush","metadata":{"phase":"memory-flush"}},{"id":"grant-commit","type":"task","skill":"grant-commit","depends_on":["memory-flush"],"blocks":["changelog"],"can_parallel":false,"needs_user":true,"activeForm":"Awaiting commit consent","metadata":{"phase":"grant-commit","needs_user":true}},{"id":"changelog","type":"task","skill":"changelog","depends_on":["grant-commit"],"blocks":["commit"],"can_parallel":false,"needs_user":false,"activeForm":"Running changelog","metadata":{"phase":"changelog"}},{"id":"commit","type":"task","skill":"commit","depends_on":["changelog"],"blocks":[],"can_parallel":false,"needs_user":false,"activeForm":"Running commit","metadata":{"phase":"commit"}}]}
|
|
4
|
+
{"$schema":"./schemas/workflow-track.v1.json","track_id":"chore","name":"Chore track","description":"Stripped-down pipeline for changes that need no failing-test-driven code change: documentation edits, configuration tweaks, formatting, dependency bumps with no project code change.","selectable":true,"selector_hints":["documentation edit","governance count refresh","configuration tweak","formatting or typo fix","skill consolidation move"],"preconditions":[],"invariants":["commits","chore"],"nodes":[{"id":"chore","type":"task","skill":"chore","depends_on":[],"blocks":["memory-flush"],"can_parallel":false,"needs_user":false,"activeForm":"Running chore","metadata":{"phase":"chore"}},{"id":"memory-flush","type":"task","skill":"memory-flush","depends_on":["chore"],"blocks":["grant-commit"],"can_parallel":false,"needs_user":false,"activeForm":"Running memory-flush","metadata":{"phase":"memory-flush"}},{"id":"grant-commit","type":"task","skill":"grant-commit","depends_on":["memory-flush"],"blocks":["changelog"],"can_parallel":false,"needs_user":true,"activeForm":"Awaiting commit consent","metadata":{"phase":"grant-commit","needs_user":true}},{"id":"changelog","type":"task","skill":"changelog","depends_on":["grant-commit"],"blocks":["commit"],"can_parallel":false,"needs_user":false,"activeForm":"Running changelog","metadata":{"phase":"changelog"}},{"id":"commit","type":"task","skill":"commit","depends_on":["changelog"],"blocks":[],"can_parallel":false,"needs_user":false,"activeForm":"Running commit","metadata":{"phase":"commit"}}]}
|
|
5
|
+
{"$schema":"./schemas/workflow-track.v1.json","track_id":"swarm-implementation","name":"Swarm implementation sub-track","description":"Parallel implementation via swarm-plan + approve-swarm + swarm-dispatch. Selected by intake-full's selector node when requires_git and requires_min_components:3 preconditions pass.","selectable":false,"selector_hints":[],"preconditions":[{"name":"requires_git"}],"invariants":["requires_swarm","git_only"],"nodes":[{"id":"swarm-plan","type":"task","skill":"swarm-plan","depends_on":[],"blocks":["approve-swarm"],"can_parallel":false,"needs_user":false,"activeForm":"Running swarm-plan","metadata":{"phase":"swarm-plan"}},{"id":"approve-swarm","type":"task","skill":"approve-swarm","depends_on":["swarm-plan"],"blocks":["swarm-dispatch"],"can_parallel":false,"needs_user":true,"activeForm":"Awaiting swarm approval","metadata":{"phase":"approve-swarm","needs_user":true}},{"id":"swarm-dispatch","type":"task","skill":"swarm-dispatch","depends_on":["approve-swarm"],"blocks":[],"can_parallel":false,"needs_user":false,"activeForm":"Running swarm-dispatch","metadata":{"phase":"swarm-dispatch"}}]}
|
|
6
|
+
{"$schema":"./schemas/workflow-track.v1.json","track_id":"tdd-worker-chain","name":"TDD worker-chain sub-track","description":"Solo TDD path. Fallback alternate for intake-full when swarm preconditions fail or the user picks solo explicitly.","selectable":false,"selector_hints":[],"preconditions":[],"invariants":[],"nodes":[{"id":"tdd","type":"task","skill":"tdd","depends_on":[],"blocks":[],"can_parallel":false,"needs_user":false,"activeForm":"Running TDD","metadata":{"phase":"tdd"}}]}
|
package/src/CLAUDE.template.md
CHANGED
|
@@ -91,25 +91,19 @@ The 11-phase workflow is the only sanctioned path from request to commit. Phase
|
|
|
91
91
|
|
|
92
92
|
**Swarm vs solo at Phase 6.** When the approved spec has fewer than `project.json → swarm.min_tasks_worth_swarming` (default 3) independent components **OR** the project is not a git repository, run `/tdd` solo. Otherwise route through `/swarm-plan` → `/approve-swarm` → `/swarm-dispatch`. In non-git projects the swarm phases are excepted at triage time (see the "Phase 6c and Phase 11 are git-conditional" bullet above), so this decision always resolves to solo — the rule's first clause never fires on a non-git tree, and a user "use swarm" override SHALL be refused with the reason `swarm requires git`.
|
|
93
93
|
|
|
94
|
+
**Post-§18 amendment (2026-05-21).** Workflow track definitions live in `.claude/workflows.jsonl` per `docs/init/seed.md §18`. The phase-ordering rules and entry-point classifications above remain binding; every Track declared in `workflows.jsonl` SHALL satisfy them plus the additional invariants in seed.md §18.3 (I1..I11). `/triage` reads `workflows.jsonl`, validates each Track against §18, classifies the user's request via LLM reasoning over `name + description + selector_hints`, confirms via `AskUserQuestion`, and materializes the chosen Track's DAG into the TaskList (via `src/cli/track-tasklist-materializer.js`). The 4 canonical tracks shipped in the pristine template are byte-equivalent to this Article's hardcoded templates per spec AC-016. The harness migrates pre-§18 `workflow.json` files (carrying `entry_phase` + no `track_id`) one-shot at preflight via `src/cli/workflow-migrator.js`. `/init-project doctor` (sub-command) detects schema / invariant / mirror drift and offers interactive fixes.
|
|
95
|
+
|
|
94
96
|
## Article V — Harness orchestration (MANDATORY SOP)
|
|
95
97
|
|
|
96
98
|
`/harness` is invokable by both the user (via the slash command) and the model (via `Skill(harness)`). A single `Skill(harness)` invocation **loops internally through every non-gated phase boundary** until the loop hits one of four exit conditions: consent gate, phase-skill failure, integrate-failure-needs-spec-change, or workflow done. The user invokes `/harness` to start a fresh workflow or to resume after a yield. You SHALL suggest `/harness` when a concrete engineering ask crystallizes in conversation; the user decides when to invoke it.
|
|
97
99
|
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
1. **Preflight (once per invocation).** Read `.claude/state/workflow.json` and `.claude/state/harness_state` (if present); read `.claude/state/spec_approvals/`, `swarm_approvals/`, and `commit_consent` to reconcile state.
|
|
101
|
-
2. **Arm the safety net.** Marker FIRST: `echo "<slug>" > .claude/state/.harness_active`. Then write `harness_state` with `{state: "continue", slug, reason: "loop armed; preflight passed"}`. This pair stays in place for the entire loop.
|
|
102
|
-
3. **Enter the loop body.** Each iteration: pick the lowest-id `pending` task whose `blockedBy` list is empty. If no task remains → **EXIT LOOP with DONE**. If the task carries `metadata.needs_user: true` → **EXIT LOOP with YIELD** (surface the gate; do NOT self-approve, simulate approval, or write approval tokens directly). Otherwise invoke the matching phase skill via the Skill tool, mark `completed` on success, append to `workflow.json → completed`, refresh marker+state, and **continue to the next iteration**.
|
|
103
|
-
4. **Exit the loop** on yield/failure/done. Write the matching `harness_state` (`yielded` or `done`) with marker-first ordering, then emit a single terminal message naming what just happened.
|
|
104
|
-
5. **Log every transition** to `.claude/state/harness/<slug>.log`.
|
|
105
|
-
|
|
106
|
-
**Internal loop atomicity.** Inside the loop, every iteration is one Skill(`<phase>`) invocation plus one marker refresh plus one `harness_state` refresh — all happening within the same `Skill(harness)` call, **without emitting an intermediate terminal message**. Intermediate terminal messages would invite the model to stop and trigger the safety net unnecessarily. The marker op is FIRST (`echo "<slug>" > .claude/state/.harness_active` on `continue`-refresh, `rm -f .claude/state/.harness_active` on exit with `yielded`/`done`), then `harness_state` is written, then (only on loop exit) the terminal message is emitted.
|
|
107
|
-
|
|
108
|
-
**The safety net.** The `harness_continuation` Stop hook (Article VIII) re-fires `Skill(harness)` only when the loop exited mid-flow — i.e., on-disk state is `{state: "continue"}` with the marker present, and `stop_hook_active` is absent on the Stop payload. In normal operation (loop runs to gate/failure/done), the hook sees `state != continue` or marker absent and stays silent. The hook is a defense-in-depth signal, not the primary driver: a healthy `Skill(harness)` invocation never depends on it. The hook is also bounded to one block per turn by Claude Code's `stop_hook_active` semantics, so it cannot itself drive multi-phase chaining.
|
|
109
|
-
|
|
110
|
-
**Resume after yield (auto).** After yielding at a consent gate, the harness skill writes `state: yielded` and removes `.harness_active`. The user runs the consent slash command in their next prompt; `consent_gate_grant` writes the gate marker (outside Claude's tool boundary), the command body writes the consent token, and the `harness_continuation` Stop hook detects fresh consent (rung 4: `workflow.json` present + `state=yielded` + a consent-token mtime newer than `harness_state`). The hook emits `{decision:"block"}`, and `Skill(harness)` is re-invoked in the same turn. The next invocation re-enters preflight, finds the gate token on disk, marks the gate task `completed`, and re-enters the loop. The user does not type `/harness` to resume.
|
|
100
|
+
**Operational SOP lives in `.claude/skills/harness/SKILL.md`** — preflight, marker-first state writes, loop body iteration, safety-net interaction with `harness_continuation`, resume-after-yield mechanics, and task discipline. This Article declares the constitutional invariants the SOP must satisfy:
|
|
111
101
|
|
|
112
|
-
|
|
102
|
+
- The loop SHALL exit on one of four conditions: consent gate (yield), phase-skill failure (yield), integrate-failure-needs-spec-change (yield), or workflow done.
|
|
103
|
+
- You SHALL NOT self-approve at any consent gate. You SHALL NOT simulate approval. You SHALL NOT write approval tokens directly.
|
|
104
|
+
- Every successful phase invocation SHALL `TaskUpdate` to `completed`, append the phase name to `workflow.json → completed`, and refresh marker + `harness_state` (marker FIRST) before continuing.
|
|
105
|
+
- `workflow.json → completed` is the durable truth across sessions; the TaskList is session-bound. When they disagree, trust `workflow.json` and re-seed.
|
|
106
|
+
- The `harness_continuation` Stop hook is a safety net, not the primary driver. A healthy `Skill(harness)` invocation runs to a clean exit on its own; the hook re-fires only when the loop was interrupted mid-flow with `state: "continue"` + marker present.
|
|
113
107
|
|
|
114
108
|
**Integrate-failure decision tree.** When `/integrate` fails inside the loop, you SHALL classify:
|
|
115
109
|
|
package/src/cli/install.js
CHANGED
|
@@ -10,7 +10,11 @@ const __dirname = dirname(fileURLToPath(import.meta.url));
|
|
|
10
10
|
const PACKAGE_ROOT = resolve(__dirname, '../..');
|
|
11
11
|
const NPMRC_TEMPLATE_PATH = join(PACKAGE_ROOT, 'src/.npmrc.template');
|
|
12
12
|
|
|
13
|
-
export const NEVER_TOUCH = Object.freeze([
|
|
13
|
+
export const NEVER_TOUCH = Object.freeze([
|
|
14
|
+
'.claude/project.json',
|
|
15
|
+
'.claude/workflows.jsonl',
|
|
16
|
+
'.claude/schemas/workflow-track.v1.json',
|
|
17
|
+
]);
|
|
14
18
|
export const SPECIAL_MERGE = Object.freeze(['.mcp.json']);
|
|
15
19
|
// The shipped manifest now lives at `.claude/manifest.json` (inside the
|
|
16
20
|
// template's .claude/ subtree), so the recursive cp drops it at the correct
|
package/src/cli/merge.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { cp, mkdir, unlink } from 'node:fs/promises';
|
|
1
|
+
import { cp, mkdir, readFile, unlink } from 'node:fs/promises';
|
|
2
2
|
import { join, dirname } from 'node:path';
|
|
3
3
|
import { hashFile, saveManifest } from './manifest.js';
|
|
4
4
|
import { deepMergeMcpServers } from './mcp.js';
|
|
5
5
|
import { NEVER_TOUCH, SPECIAL_MERGE } from './install.js';
|
|
6
6
|
import { pathExists } from './util.js';
|
|
7
|
-
import { dispatchByTier, NoBaseError } from './upgrade-tiers.js';
|
|
7
|
+
import { dispatchByTier, NoBaseError, canRecoverBase, writeStageBaseless } from './upgrade-tiers.js';
|
|
8
8
|
|
|
9
9
|
export const ACTION_KINDS = Object.freeze({
|
|
10
10
|
ADD: 'ADD',
|
|
@@ -21,6 +21,26 @@ export const ACTION_KINDS = Object.freeze({
|
|
|
21
21
|
SEMANTIC_MERGE_STAGED: 'SEMANTIC_MERGE_STAGED',
|
|
22
22
|
});
|
|
23
23
|
|
|
24
|
+
// User-facing labels for each ACTION_KIND. Surfaced in the per-file upgrade
|
|
25
|
+
// report (TTY via `tui/upgrade.js`, non-TTY via `bin/cli.js dispatchUpgrade`).
|
|
26
|
+
// Kept centralized so both paths render identically.
|
|
27
|
+
export const ACTION_LABELS = Object.freeze({
|
|
28
|
+
ADD: 'add',
|
|
29
|
+
OVERWRITE: 'update',
|
|
30
|
+
NOOP: 'unchanged',
|
|
31
|
+
SKIP_CUSTOMIZED: 'kept yours',
|
|
32
|
+
PRUNE: 'removed (upstream)',
|
|
33
|
+
PRUNE_SKIPPED_CUSTOMIZED: 'kept yours (upstream removed)',
|
|
34
|
+
NEVER_TOUCH_PRESERVE: 'kept yours (never-touch)',
|
|
35
|
+
NEVER_TOUCH_ADD: 'add (never-touch)',
|
|
36
|
+
SPECIAL_MERGE: 'merged (.mcp.json deep-merge)',
|
|
37
|
+
MECHANICAL_MERGE_CLEAN: 'merged cleanly',
|
|
38
|
+
MECHANICAL_MERGE_CONFLICTED: 'merged with conflicts — resolve manually',
|
|
39
|
+
SEMANTIC_MERGE_STAGED: 'staged for /upgrade-project',
|
|
40
|
+
});
|
|
41
|
+
|
|
42
|
+
export const ACTION_LABEL_WIDTH = Math.max(...Object.values(ACTION_LABELS).map((s) => s.length));
|
|
43
|
+
|
|
24
44
|
async function copyFile(src, dst) {
|
|
25
45
|
await mkdir(dirname(dst), { recursive: true });
|
|
26
46
|
await cp(src, dst, { force: true });
|
|
@@ -143,29 +163,46 @@ async function dispatchCustomized({ rel, newEntry, tierCtx, dryRun, onSkipCustom
|
|
|
143
163
|
const tier = readTierFromEntry(newEntry);
|
|
144
164
|
if (tier === 'MECHANICAL' || tier === 'SEMANTIC') {
|
|
145
165
|
if (dryRun) {
|
|
166
|
+
// When BASE recovery would fail (legacy manifest with no cache hit, no
|
|
167
|
+
// npm fallback), the real run will fall through to the binary prompt.
|
|
168
|
+
// Surface this file as SKIP_CUSTOMIZED at dry-run time so the TUI
|
|
169
|
+
// collects a user choice up front instead of silently keep-mine'ing it.
|
|
170
|
+
if (!canRecoverBase(rel, tierCtx.baseline_version, tierCtx.target)) {
|
|
171
|
+
return { kind: ACTION_KINDS.SKIP_CUSTOMIZED, path: rel, reason: 'BASE unrecoverable; will prompt user' };
|
|
172
|
+
}
|
|
146
173
|
return { kind: tier === 'MECHANICAL' ? ACTION_KINDS.MECHANICAL_MERGE_CLEAN : ACTION_KINDS.SEMANTIC_MERGE_STAGED, path: rel, reason: 'dry-run: tier dispatch deferred' };
|
|
147
174
|
}
|
|
148
175
|
try {
|
|
149
176
|
return await dispatchByTier(rel, tier, tierCtx);
|
|
150
177
|
} catch (err) {
|
|
151
178
|
if (err instanceof NoBaseError) {
|
|
152
|
-
return fallbackToBinaryPrompt({ rel, onSkipCustomized, dryRun, tplPath, tgtPath, err });
|
|
179
|
+
return fallbackToBinaryPrompt({ rel, onSkipCustomized, dryRun, tplPath, tgtPath, tierCtx, err });
|
|
153
180
|
}
|
|
154
181
|
throw err;
|
|
155
182
|
}
|
|
156
183
|
}
|
|
157
|
-
return fallbackToBinaryPrompt({ rel, onSkipCustomized, dryRun, tplPath, tgtPath });
|
|
184
|
+
return fallbackToBinaryPrompt({ rel, onSkipCustomized, dryRun, tplPath, tgtPath, tierCtx });
|
|
158
185
|
}
|
|
159
186
|
|
|
160
|
-
async function fallbackToBinaryPrompt({ rel, onSkipCustomized, dryRun, tplPath, tgtPath, err = null }) {
|
|
187
|
+
async function fallbackToBinaryPrompt({ rel, onSkipCustomized, dryRun, tplPath, tgtPath, tierCtx, err = null }) {
|
|
161
188
|
const choice = onSkipCustomized ? await onSkipCustomized(rel) : 'keep-mine';
|
|
162
189
|
if (choice === 'take-theirs') {
|
|
163
190
|
if (!dryRun) await copyFile(tplPath, tgtPath);
|
|
164
191
|
return { kind: ACTION_KINDS.OVERWRITE, path: rel, reason: err ? `BASE recovery failed (${err.kind}); user chose take-theirs` : 'customized file; user chose take-theirs' };
|
|
165
192
|
}
|
|
193
|
+
if (choice === 'merge') {
|
|
194
|
+
if (!dryRun) await stageBaselessMerge({ rel, tplPath, tgtPath, tierCtx });
|
|
195
|
+
return { kind: ACTION_KINDS.SEMANTIC_MERGE_STAGED, path: rel, reason: err ? `BASE recovery failed (${err.kind}); staged for two-way merge` : 'tier-1 customized; staged for two-way merge' };
|
|
196
|
+
}
|
|
166
197
|
return { kind: ACTION_KINDS.SKIP_CUSTOMIZED, path: rel, reason: err ? `BASE recovery failed (${err.kind}); preserved` : 'target customized since last install' };
|
|
167
198
|
}
|
|
168
199
|
|
|
200
|
+
async function stageBaselessMerge({ rel, tplPath, tgtPath, tierCtx }) {
|
|
201
|
+
const incomingBuf = await readFile(tplPath);
|
|
202
|
+
const localBuf = await readFile(tgtPath);
|
|
203
|
+
await writeStageBaseless(tierCtx, rel, incomingBuf, localBuf);
|
|
204
|
+
}
|
|
205
|
+
|
|
169
206
|
function computeExitCode(actions) {
|
|
170
207
|
let code = 0;
|
|
171
208
|
for (const a of actions) {
|
|
@@ -0,0 +1,223 @@
|
|
|
1
|
+
// Foundation — translate a workflows.jsonl Track record into a canonical
|
|
2
|
+
// TaskList shape. Used by triage at workflow-seed time AND by the
|
|
3
|
+
// byte-equivalent-migration tests (compared to golden fixtures).
|
|
4
|
+
//
|
|
5
|
+
// The returned shape is ordinal-positioned (1-indexed `ord`); `blockedBy`
|
|
6
|
+
// references predecessor ordinals (NOT session task_ids). The runtime
|
|
7
|
+
// caller (triage skill body, harness re-seed) translates ordinals to
|
|
8
|
+
// TaskCreate-assigned task_ids at materialization time.
|
|
9
|
+
//
|
|
10
|
+
// Selector nodes resolve to their default alternate (the first alternate
|
|
11
|
+
// with empty preconditions). Sub-track refs read the originating track's
|
|
12
|
+
// `_allTracks` Map (attached by the validator) to find the target track.
|
|
13
|
+
|
|
14
|
+
export function materializeTaskList(track, { slug, ctx } = {}) {
|
|
15
|
+
if (!slug) {
|
|
16
|
+
throw new Error('materializeTaskList requires a slug option (used for <slug> substitution in subjects/activeForms).');
|
|
17
|
+
}
|
|
18
|
+
const emitter = createEmitter(slug, track._allTracks ?? new Map(), ctx);
|
|
19
|
+
emitNodes(track.nodes, emitter);
|
|
20
|
+
return finalize(emitter);
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
function createEmitter(slug, allTracks, ctx) {
|
|
24
|
+
return {
|
|
25
|
+
slug,
|
|
26
|
+
allTracks,
|
|
27
|
+
ctx: ctx ?? null,
|
|
28
|
+
tasks: [],
|
|
29
|
+
idToOrd: new Map(),
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
function emitNodes(nodes, emitter) {
|
|
34
|
+
for (const node of nodes) {
|
|
35
|
+
emitNode(node, emitter);
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
function emitNode(node, emitter) {
|
|
40
|
+
if (node.type === 'selector') {
|
|
41
|
+
const chosen = evaluateAlternates(node, emitter.ctx);
|
|
42
|
+
if (!chosen) {
|
|
43
|
+
throw new Error(
|
|
44
|
+
`Selector node '${node.id}' has no alternate whose preconditions pass against the provided context. ` +
|
|
45
|
+
`Either provide a ctx that satisfies one alternate's preconditions, or declare an alternate with empty preconditions (unconditional default).`
|
|
46
|
+
);
|
|
47
|
+
}
|
|
48
|
+
emitAlternate(chosen, node, emitter);
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
51
|
+
if (node.sub_track) {
|
|
52
|
+
expandSubTrack(node.sub_track, node, emitter);
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
recordTask(node, emitter, []);
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
function emitAlternate(alternate, parentNode, emitter) {
|
|
59
|
+
if (alternate.sub_track) {
|
|
60
|
+
expandSubTrack(alternate.sub_track, parentNode, emitter);
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
if (alternate.skill) {
|
|
64
|
+
const synthetic = {
|
|
65
|
+
id: parentNode.id,
|
|
66
|
+
type: 'task',
|
|
67
|
+
skill: alternate.skill,
|
|
68
|
+
depends_on: parentNode.depends_on || [],
|
|
69
|
+
blocks: parentNode.blocks || [],
|
|
70
|
+
can_parallel: false,
|
|
71
|
+
needs_user: false,
|
|
72
|
+
};
|
|
73
|
+
recordTask(synthetic, emitter, []);
|
|
74
|
+
return;
|
|
75
|
+
}
|
|
76
|
+
throw new Error(`Alternate on selector '${parentNode.id}' has neither skill nor sub_track.`);
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
function expandSubTrack(subTrackId, parentNode, emitter) {
|
|
80
|
+
const sub = emitter.allTracks.get(subTrackId);
|
|
81
|
+
if (!sub) {
|
|
82
|
+
throw new Error(`sub_track '${subTrackId}' referenced by node '${parentNode.id}' not found in _allTracks.`);
|
|
83
|
+
}
|
|
84
|
+
const parentDepends = parentNode.depends_on || [];
|
|
85
|
+
const beforeOrd = emitter.tasks.length;
|
|
86
|
+
for (const subNode of sub.nodes) {
|
|
87
|
+
const isEntry = !subNode.depends_on || subNode.depends_on.length === 0;
|
|
88
|
+
const effectiveDepends = isEntry ? parentDepends : subNode.depends_on;
|
|
89
|
+
recordTask(subNode, emitter, effectiveDepends);
|
|
90
|
+
if (emitter.tasks.length === beforeOrd + 1) {
|
|
91
|
+
emitter.idToOrd.set(parentNode.id, emitter.tasks[beforeOrd].ord);
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
function recordTask(node, emitter, effectiveDepends) {
|
|
97
|
+
const ord = emitter.tasks.length + 1;
|
|
98
|
+
emitter.idToOrd.set(node.id, ord);
|
|
99
|
+
emitter.tasks.push({
|
|
100
|
+
ord,
|
|
101
|
+
subject: deriveSubject(node, emitter.slug),
|
|
102
|
+
activeForm: deriveActiveForm(node),
|
|
103
|
+
metadata: deriveMetadata(node),
|
|
104
|
+
needs_user: !!node.needs_user,
|
|
105
|
+
can_parallel: !!node.can_parallel,
|
|
106
|
+
_dependsOnIds: effectiveDepends.length > 0 ? effectiveDepends : (node.depends_on || []),
|
|
107
|
+
});
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
function finalize(emitter) {
|
|
111
|
+
const out = [];
|
|
112
|
+
for (const task of emitter.tasks) {
|
|
113
|
+
const blockedBy = task._dependsOnIds
|
|
114
|
+
.map((id) => emitter.idToOrd.get(id))
|
|
115
|
+
.filter((ord) => typeof ord === 'number');
|
|
116
|
+
out.push({
|
|
117
|
+
ord: task.ord,
|
|
118
|
+
subject: task.subject,
|
|
119
|
+
activeForm: task.activeForm,
|
|
120
|
+
metadata: task.metadata,
|
|
121
|
+
needs_user: task.needs_user,
|
|
122
|
+
can_parallel: task.can_parallel,
|
|
123
|
+
blockedBy,
|
|
124
|
+
});
|
|
125
|
+
}
|
|
126
|
+
return out;
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
// evaluateAlternates walks the selector node's alternates in declaration order
|
|
130
|
+
// and returns the first one whose preconditions all pass against ctx. When ctx
|
|
131
|
+
// is null/undefined, only alternates with empty preconditions are eligible
|
|
132
|
+
// (preserves the materialize-time-only default-fallback behavior used by tests
|
|
133
|
+
// that don't pass a ctx — e.g., the byte-equivalent fixture comparison). When
|
|
134
|
+
// ctx is provided, predicates evaluate against its fields:
|
|
135
|
+
// { isGit: bool, componentCount: int, userOverride: string|null,
|
|
136
|
+
// completed: string[], knownSkills: Set<string> }
|
|
137
|
+
// Any predicate whose required field is absent in ctx evaluates false.
|
|
138
|
+
function evaluateAlternates(selectorNode, ctx) {
|
|
139
|
+
const alts = selectorNode.alternates || [];
|
|
140
|
+
for (const alt of alts) {
|
|
141
|
+
const preconditions = Array.isArray(alt.preconditions) ? alt.preconditions : [];
|
|
142
|
+
if (preconditions.every((p) => evaluatePredicate(p, ctx))) {
|
|
143
|
+
return alt;
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
return null;
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
function evaluatePredicate(pred, ctx) {
|
|
150
|
+
if (!ctx) return false;
|
|
151
|
+
switch (pred.name) {
|
|
152
|
+
case 'requires_git':
|
|
153
|
+
return ctx.isGit === true;
|
|
154
|
+
case 'requires_user_override':
|
|
155
|
+
return typeof ctx.userOverride === 'string' && ctx.userOverride === pred.argument;
|
|
156
|
+
case 'requires_min_components': {
|
|
157
|
+
const n = parseInt(pred.argument, 10);
|
|
158
|
+
return Number.isFinite(n) && typeof ctx.componentCount === 'number' && ctx.componentCount >= n;
|
|
159
|
+
}
|
|
160
|
+
case 'requires_phase_completed':
|
|
161
|
+
return Array.isArray(ctx.completed) && ctx.completed.includes(pred.argument);
|
|
162
|
+
case 'requires_skill_present':
|
|
163
|
+
return ctx.knownSkills instanceof Set && ctx.knownSkills.has(pred.argument);
|
|
164
|
+
default:
|
|
165
|
+
return false;
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
const ACTIVE_FORM_OVERRIDES = Object.freeze({
|
|
170
|
+
tdd: 'Running TDD',
|
|
171
|
+
intake: 'Running intake',
|
|
172
|
+
scout: 'Running scout',
|
|
173
|
+
research: 'Running research',
|
|
174
|
+
spec: 'Running spec',
|
|
175
|
+
simplify: 'Running simplify',
|
|
176
|
+
security: 'Running security',
|
|
177
|
+
integrate: 'Running integrate',
|
|
178
|
+
document: 'Running document',
|
|
179
|
+
archive: 'Running archive',
|
|
180
|
+
'memory-flush': 'Running memory-flush',
|
|
181
|
+
changelog: 'Running changelog',
|
|
182
|
+
commit: 'Running commit',
|
|
183
|
+
chore: 'Running chore',
|
|
184
|
+
'swarm-plan': 'Running swarm-plan',
|
|
185
|
+
'swarm-dispatch': 'Running swarm-dispatch',
|
|
186
|
+
});
|
|
187
|
+
|
|
188
|
+
const CONSENT_GATE_SUBJECTS = Object.freeze({
|
|
189
|
+
'approve-spec': 'Wait for /approve-spec <path>',
|
|
190
|
+
'grant-commit': 'Wait for /grant-commit',
|
|
191
|
+
'approve-swarm': 'Wait for /approve-swarm <slug>',
|
|
192
|
+
});
|
|
193
|
+
|
|
194
|
+
const CONSENT_GATE_ACTIVE_FORMS = Object.freeze({
|
|
195
|
+
'approve-spec': 'Awaiting spec approval',
|
|
196
|
+
'grant-commit': 'Awaiting commit consent',
|
|
197
|
+
'approve-swarm': 'Awaiting swarm approval',
|
|
198
|
+
});
|
|
199
|
+
|
|
200
|
+
function deriveSubject(node, slug) {
|
|
201
|
+
if (node.needs_user) {
|
|
202
|
+
return CONSENT_GATE_SUBJECTS[node.id] ?? `Wait for /${node.id}`;
|
|
203
|
+
}
|
|
204
|
+
const skill = node.skill || node.id;
|
|
205
|
+
return `Run /${skill} for ${slug}`;
|
|
206
|
+
}
|
|
207
|
+
|
|
208
|
+
function deriveActiveForm(node) {
|
|
209
|
+
if (node.activeForm) return node.activeForm;
|
|
210
|
+
if (node.needs_user) {
|
|
211
|
+
return CONSENT_GATE_ACTIVE_FORMS[node.id] ?? `Awaiting /${node.id}`;
|
|
212
|
+
}
|
|
213
|
+
const skill = node.skill || node.id;
|
|
214
|
+
return ACTIVE_FORM_OVERRIDES[skill] ?? `Running ${skill}`;
|
|
215
|
+
}
|
|
216
|
+
|
|
217
|
+
function deriveMetadata(node) {
|
|
218
|
+
const phase = node.metadata?.phase ?? node.skill ?? node.id;
|
|
219
|
+
if (node.needs_user) {
|
|
220
|
+
return { phase, needs_user: true };
|
|
221
|
+
}
|
|
222
|
+
return { phase };
|
|
223
|
+
}
|