From 68fe9a8c1c554b0208742ad26a80dec2cb33c954 Mon Sep 17 00:00:00 2001
From: vitya <vitya.kuznetsov@gmail.com>
Date: Thu, 30 Apr 2026 15:06:06 +0300
Subject: [PATCH] =?UTF-8?q?feat(project-bootstrap):=20v1.3.0=20=E2=80=94?=
 =?UTF-8?q?=20idempotent=20CLAUDE.md=20merge=20on=20upgrade?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Step 5 was binary on upgrade (append whole template / leave alone), so
projects bootstrapped before v1.2.0 silently missed new canonical triggers
(`check across all projects`, `we're on Windows`) on re-run. Now upgrade
reads existing CLAUDE.md, substring-diffs vs template, preserves a
deliberately-pinned platform line, and appends only missing lines after
explicit confirm. Re-runs are no-ops.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .tasks/STATUS.md                            |   8 +++
 .tasks/bootstrap-claude-md-merge.md         |  53 ++++++++++++++++++++
 .wiki/concepts/bootstrap-claude-md-merge.md |  49 ++++++++++++++++++
 .wiki/index.md                              |   1 +
 .wiki/log.md                                |   1 +
 README.md                                   |   5 +-
 README.ru.md                                |   6 ++-
 dist/project-bootstrap.skill                | Bin 7902 -> 8573 bytes
 skills/project-bootstrap/README.md          |   2 +-
 skills/project-bootstrap/SKILL.md           |  39 ++++++++++++--
 10 files changed, 156 insertions(+), 8 deletions(-)
 create mode 100644 .tasks/bootstrap-claude-md-merge.md
 create mode 100644 .wiki/concepts/bootstrap-claude-md-merge.md

diff --git a/.tasks/STATUS.md b/.tasks/STATUS.md
index b9e2339..9de365a 100644
--- a/.tasks/STATUS.md
+++ b/.tasks/STATUS.md
@@ -1,6 +1,14 @@
 # Task Board
 _Updated: 2026-04-30_
 
+## 🟢 [bootstrap-claude-md-merge] — project-bootstrap upgrade: idempotent merge of canonical CLAUDE.md triggers
+**Status:** done
+**Where I stopped:** Step 5 in `skills/project-bootstrap/SKILL.md` split into Init / Upgrade-merge — upgrade reads existing CLAUDE.md, substring-diffs vs template (case-insensitive trim), platform line preserved if user pinned a non-host platform, asks confirm with diff, appends only missing canonical lines; version bump 1.2.0 → 1.3.0; skill row in `skills/project-bootstrap/README.md` updated to note idempotent merge; root `README.md` + `README.ru.md` upgrade-mode paragraph extended; reinstalled to `~/.claude/skills/project-bootstrap/`, `dist/project-bootstrap.skill` rebuilt; concept page `.wiki/concepts/bootstrap-claude-md-merge.md` written; index + log entries added
+**Next action:** (none — kept until merged)
+**Branch:** master
+
+---
+
 <!--
   Canonical layout. One block per task. Per-task deep context lives in
   .tasks/<task-slug>.md (created by using-tasks when a task becomes active
diff --git a/.tasks/bootstrap-claude-md-merge.md b/.tasks/bootstrap-claude-md-merge.md
new file mode 100644
index 0000000..47ee96b
--- /dev/null
+++ b/.tasks/bootstrap-claude-md-merge.md
@@ -0,0 +1,53 @@
+# bootstrap-claude-md-merge
+
+## Goal
+project-bootstrap upgrade mode currently treats `CLAUDE.md` as binary: either append
+the entire template (causing duplicate trigger lines) or leave it untouched. Result:
+projects bootstrapped before v1.2.0 silently miss new canonical triggers like
+`check across all projects` (→ `using-projects-meta`) and `we're on Windows`
+(→ `active-platform`) when re-run on the upgrade path. Fix: turn Step 5 into an
+idempotent merge — read existing CLAUDE.md, diff against the template, append only
+missing canonical lines after user confirm. Re-runs become no-ops.
+
+## Key files
+- `skills/project-bootstrap/SKILL.md:220-249` — Step 5 (the broken binary choice)
+- `skills/project-bootstrap/assets/CLAUDE.md.template` — canonical trigger set
+- `skills/project-bootstrap/README.md` — public surface, mention idempotency
+- `dist/project-bootstrap.skill` — rebuild after install
+- `~/.claude/skills/project-bootstrap/` — reinstall target
+
+## Decisions log
+- 2026-04-30: Diff strategy — substring match per template line against existing file
+  (trim + lowercase). A trigger is "present" if any existing line contains the template
+  trigger text. Avoids false-positive duplicates when user has rephrased a trigger but
+  preserves canonical wording for missing ones. Rejected: full line-equality match
+  (too brittle — user comments / case differences would re-add).
+- 2026-04-30: Confirmation gate stays — show user the diff (N lines to append) before
+  touching the file. Idempotent run with no missing lines = silent no-op.
+- 2026-04-30: Version bump 1.2.0 → 1.3.0. Behavior change visible to users on every
+  upgrade — minor bump fits semver intent.
+
+## Open questions
+- [ ] Should the platform line (`we're on Windows`) be substituted to match the host
+  during merge, the same way init does it? Decision: yes — if existing file has no
+  `we're on (Windows|Linux|macOS)` line, append the host-appropriate one. If it has
+  any of the three, leave it (user may have intentionally pinned a different platform).
+
+## Completed steps
+- [x] open task
+- [x] patch Step 5 in SKILL.md (read → diff → confirm → append) — split Init / Upgrade-merge
+- [x] bump version 1.2.0 → 1.3.0 in SKILL.md frontmatter
+- [x] update `skills/project-bootstrap/README.md` `CLAUDE.md` row to note idempotent merge
+- [x] update root `README.md` + `README.ru.md` upgrade-mode paragraph
+- [x] reinstall + rebuild dist (`bash scripts/install.sh project-bootstrap && bash scripts/build.sh project-bootstrap`); verified `version: 1.3.0` on disk + Step 5 split
+- [x] wiki: concept page `.wiki/concepts/bootstrap-claude-md-merge.md`, index entry, log entry
+- [x] commit
+- [x] STATUS.md: 🔴 → 🟢
+- [x] decision on platform line — preserve if user pinned non-host one (case-insensitive `we're on (windows|linux|macos)` match)
+
+## Notes
+Existing related task `[bootstrap-recommend-projects-meta]` (Step 5.7) is **machine-level**
+detection (recommend `setup-projects-meta` if MCP server not registered). This task is
+**project-level** merge of the trigger line into the project's CLAUDE.md. They compose
+cleanly: 5.7 makes the trigger functional on the host, this task ensures the trigger
+is actually present in the file.
diff --git a/.wiki/concepts/bootstrap-claude-md-merge.md b/.wiki/concepts/bootstrap-claude-md-merge.md
new file mode 100644
index 0000000..4b68f13
--- /dev/null
+++ b/.wiki/concepts/bootstrap-claude-md-merge.md
@@ -0,0 +1,49 @@
+---
+title: "project-bootstrap@1.3.0 — idempotent CLAUDE.md merge on upgrade"
+type: concept
+updated: 2026-04-30
+---
+
+# project-bootstrap@1.3.0 — idempotent CLAUDE.md merge on upgrade
+
+_2026-04-30._
+
+## Problem
+
+Step 5 of `project-bootstrap` (≤1.2.0) treated `CLAUDE.md` as binary:
+
+- **File missing** → write template.
+- **File exists** → ask "append the whole template, or leave as is?"
+
+Both branches fail the upgrade case. Append-the-whole-template duplicates trigger lines; leave-as-is leaves the file behind whenever the canonical template gains new lines. Concretely: the v1.2.0 release added `check across all projects` (→ `using-projects-meta`) to the template — but every project bootstrapped before v1.2.0 silently kept its old CLAUDE.md and never got the new trigger when re-run on the upgrade path. Same gap for `we're on Windows` (→ `active-platform`).
+
+## Decision
+
+Step 5 in v1.3.0 splits along the existing fork:
+
+- **Init (file missing)** — unchanged. Write the template, substitute the platform line on non-Windows hosts.
+- **Upgrade (file exists)** — read existing → diff against template → confirm → append-only-missing.
+
+Diff rules:
+
+- Trigger lines (everything except the platform line): present iff any existing line, after `trim` + `tolower`, contains the template line's text. Substring match, not equality — tolerates user rewording or trailing punctuation. Avoids false-positive duplicates while preserving canonical wording for missing ones.
+- Platform line: present iff any existing line matches `we're on (windows|linux|macos)` case-insensitively. If the user pinned a different platform on purpose, leave it. Only append the host-appropriate platform line when none of the three is present.
+
+After diff: if zero missing lines → no-op. Otherwise show the diff to the user, wait for explicit confirm, then append (don't rewrite — file order preserved). Re-runs become no-ops once canon is reached.
+
+## Why merge, not overwrite
+
+User-edited CLAUDE.md often carries project-specific lines beyond the template (custom triggers, comments, ordering preferences). Overwrite would clobber them; equality-match would miss substring rephrasings. Substring + append-only is the minimum-violence reconcile that keeps canon current without trampling user intent. The confirmation gate stays — append is still a write.
+
+## Composition with `[bootstrap-recommend-projects-meta]`
+
+`[bootstrap-recommend-projects-meta]` (⚪ Ready, Step 5.7 future work) covers the **machine-level** dependency: detect missing `projects-meta-mcp` MCP server and recommend `setup-projects-meta`. This task covers the **project-level** trigger merge. They compose cleanly:
+
+- 5.7 makes the trigger functional on the host.
+- 1.3.0 ensures the trigger is actually present in the project's CLAUDE.md.
+
+Either alone is partial; together they close the loop for the `check across all projects` line specifically and for any future canonical trigger generally.
+
+## Pattern: idempotent reconcile of canonical config
+
+Same pattern other setup-skills can borrow when they own a canonical file shape on disk: read existing → diff against canon → confirm → append-only-missing. Avoids the binary "create from template / leave alone" trap that's good for greenfield and bad for upgrade.
diff --git a/.wiki/index.md b/.wiki/index.md
index d5b27a5..ee84463 100644
--- a/.wiki/index.md
+++ b/.wiki/index.md
@@ -13,6 +13,7 @@ Catalog of all wiki pages. One line per page, organized by type. Updated on ever
 ## Concepts
 
 - [active-platform-decision.md](concepts/active-platform-decision.md) — why `active-platform` is a skill (not a memory entry); why default = Windows; how it's wired into `project-bootstrap`
+- [bootstrap-claude-md-merge.md](concepts/bootstrap-claude-md-merge.md) — project-bootstrap@1.3.0 — Step 5 upgrade path becomes idempotent merge (read → diff vs template → confirm → append missing); fixes silent gap where pre-1.2.0 projects never picked up new canonical triggers (`check across all projects`, `we're on Windows`)
 - [bootstrap-manifest.md](concepts/bootstrap-manifest.md) — record of which `project-bootstrap` / `setup-wiki` / `setup-tasks` versions initialized this project's `.wiki/` and `.tasks/` layout (overwritten on re-bootstrap; history in git)
 - [build-notes.md](concepts/build-notes.md) — why `build.ps1` exists alongside `build.sh`; PS 5.1 backslash-in-zip gotcha; how to extract a `.skill`
 - [install-portability.md](concepts/install-portability.md) — `install.sh` / `build.sh` rewritten to drop `mapfile` (bash 4+) and `find -printf` (GNU only) so stock macOS (bash 3.2 + BSD find) works
diff --git a/.wiki/log.md b/.wiki/log.md
index 1edbc3d..6c8eb1b 100644
--- a/.wiki/log.md
+++ b/.wiki/log.md
@@ -36,3 +36,4 @@ Parseable: `grep "^## \[" .wiki/log.md | tail -20`.
 ## [2026-04-30] refactor | project-bootstrap re-run on this repo (upgrade mode) — setup-wiki noop, setup-tasks noop, CLAUDE.md unchanged (matches template), bootstrap-manifest.md written: project-bootstrap@1.1.0 / setup-wiki@1.0.0 / setup-tasks@1.0.0
 ## [2026-04-30] decision | project-bootstrap@1.2.0 — CLAUDE.md template gains `check across all projects` (verbatim trigger from using-projects-meta description); installs auto-load cross-project tasks + shared-wiki access in every bootstrapped repo; no Step 5.7 dependency-check mirror — Prerequisites pointer in using-projects-meta is self-correcting; local CLAUDE.md, both READMEs, dist/.skill, projects-meta-skills concept page synced
 ## [2026-04-30] decision | Step 5.7 mirror of Step 5.6 (projects-meta-mcp dependency detector / `setup-projects-meta` recommendation) accepted as future work; tracked as ⚪ Ready task `[bootstrap-recommend-projects-meta]`; deferred until first observed fresh-machine miss so detector signal is informed by real failure mode; concept page `projects-meta-skills.md` updated to reflect new stance
+## [2026-04-30] decision | project-bootstrap@1.3.0 — Step 5 upgrade path turned idempotent: read existing CLAUDE.md → substring-diff vs template → confirm → append-only-missing; closes silent gap where pre-1.2.0 projects never picked up new canonical triggers (`check across all projects`, `we're on Windows`); platform line preserved if user pinned a non-host one; concept page `bootstrap-claude-md-merge.md` written; README CLAUDE.md row updated to note idempotent merge
diff --git a/README.md b/README.md
index b5cbcc5..ab5bf5b 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,10 @@ project's folder and it will, in one pass:
 
 Two modes, picked automatically: **init** for an empty folder, **upgrade**
 for an existing project (the skill only fills the gaps and never overwrites
-without explicit confirmation).
+without explicit confirmation). On upgrade, `CLAUDE.md` is merged
+idempotently — only canonical trigger lines that aren't already present are
+appended after explicit confirm, so re-running `project-bootstrap` after a
+template change picks up the new triggers without duplicating the old ones.
 
 ### Edit a skill
 
diff --git a/README.ru.md b/README.ru.md
index e6b22d5..feaca38 100644
--- a/README.ru.md
+++ b/README.ru.md
@@ -44,7 +44,11 @@ bash scripts/install.sh caveman wiki-maintainer
 
 Два режима, выбирается автоматически: **init** для пустой папки и **upgrade**
 для существующего проекта (скилл только дозаполняет пробелы и ничего не
-перезаписывает без явного подтверждения).
+перезаписывает без явного подтверждения). В режиме upgrade `CLAUDE.md`
+сливается идемпотентно — только канонические триггер-строки, которых ещё
+нет в файле, дописываются после явного подтверждения, поэтому повторный
+запуск `project-bootstrap` после обновления шаблона подтягивает новые
+триггеры, не дублируя старые.
 
 ### Отредактировать скилл
 
diff --git a/dist/project-bootstrap.skill b/dist/project-bootstrap.skill
index 6f47436c9ed1ece4ced43cc0e58d10dcb9c021e0..e62b2869aa347ec3a3875ca3440d3f1a84ec6f6a 100644
GIT binary patch
delta 7853
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
L5C$V400000Ibt=C

delta 7187
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
V;2;~5dLI&#XCV*<gdG3?007Gx_w@h(

diff --git a/skills/project-bootstrap/README.md b/skills/project-bootstrap/README.md
index a6018ba..c75caeb 100644
--- a/skills/project-bootstrap/README.md
+++ b/skills/project-bootstrap/README.md
@@ -44,7 +44,7 @@ projects bootstrapped at different times debuggable.
 | `README.md` | minimal stub | Skipped if file exists. |
 | `.wiki/` | delegated to `setup-wiki` | Karpathy LLM Wiki layout — `CLAUDE.md`, `index.md`, `log.md`, `overview.md`, `raw/`, `entities/`, `concepts/`, `packages/`, `sources/`. |
 | `.tasks/` | delegated to `setup-tasks` | Canonical board — `STATUS.md` plus per-task `<task-slug>.md` files. |
-| `CLAUDE.md` | `assets/CLAUDE.md.template` | Skill triggers (`use superpowers`, `use project wiki`, etc.). On non-Windows hosts, swap the `we're on Windows` line for `we're on Linux` / `we're on macOS`. |
+| `CLAUDE.md` | `assets/CLAUDE.md.template` | Skill triggers (`use superpowers`, `use project wiki`, etc.). On non-Windows hosts, swap the `we're on Windows` line for `we're on Linux` / `we're on macOS`. On upgrade, the template is treated as a canonical set and merged idempotently — only missing trigger lines are appended after user confirm. Re-runs are no-ops. |
 | `.wiki/concepts/bootstrap-manifest.md` | generated | Records which skill versions initialized the project, so cross-project layout drift is debuggable. |
 
 ## Workflow
diff --git a/skills/project-bootstrap/SKILL.md b/skills/project-bootstrap/SKILL.md
index 5556bd9..55ec161 100644
--- a/skills/project-bootstrap/SKILL.md
+++ b/skills/project-bootstrap/SKILL.md
@@ -1,6 +1,6 @@
 ---
 name: project-bootstrap
-version: 1.2.0
+version: 1.3.0
 description: >
   Initializes or upgrades a project in the current folder: git, .gitignore, README.md,
   .wiki/ using Karpathy's method, .tasks/ for task tracking, CLAUDE.md with skill triggers.
@@ -219,12 +219,41 @@ If `setup-tasks` is not installed, **stop** and tell the user — same rule as S
 
 ## Step 5 — CLAUDE.md
 
-If `CLAUDE.md` already exists — show its contents and ask:
-"CLAUDE.md already exists. Append skill triggers to the end, or leave as is?"
+Two paths, picked by file presence:
 
-If it does not exist — create from template `assets/CLAUDE.md.template`.
+### Init (file does not exist)
+
+Create `CLAUDE.md` from `assets/CLAUDE.md.template`. Substitute the platform line
+on non-Windows hosts (`we're on Linux` / `we're on macOS` instead of
+`we're on Windows`).
+
+### Upgrade (file exists) — idempotent merge
+
+Treat the template as the canonical trigger set and reconcile the existing file
+against it. Re-runs are no-ops once the file is in canon.
+
+1. Read the existing `CLAUDE.md`.
+2. For each non-empty, non-comment line in the template, decide whether it's
+   already present:
+   - **Trigger lines** (everything except the platform line) — present iff any
+     existing line, after `trim` + `tolower`, contains the template line's
+     trigger text. Substring match, not equality — tolerates user rewording or
+     trailing punctuation.
+   - **Platform line** (`we're on Windows`) — present iff any existing line
+     matches `we're on (windows|linux|macos)` case-insensitively. If the user
+     pinned a different platform on purpose, **leave it alone**. Only append
+     the host-appropriate platform line when none of the three is present.
+3. Collect missing lines. If none → print `CLAUDE.md already canon — no changes`
+   and skip to Step 5.5.
+4. Show the user the diff (N lines, exact text to append) and ask one question:
+   "Append these N missing canonical triggers to the end of CLAUDE.md?" Wait
+   for explicit confirmation before writing.
+5. On confirm: append a single newline (if the file doesn't end with one) and
+   then the missing lines, one per line. Don't rewrite the file — only append.
+   Don't reorder existing lines. Don't dedupe within the existing file.
+
+Template contents (`assets/CLAUDE.md.template` — source of truth):
 
-Template contents:
 ```markdown
 # CLAUDE.md
 # Agent instructions. Each line is a trigger for an installed skill.