refactor(init): idempotent upsert_rtk_block for CLAUDE.md management#123
Merged
pszymkowiak merged 1 commit intortk-ai:masterfrom Feb 15, 2026
Merged
Conversation
Replace naive append-or-skip logic in run_claude_md_mode with upsert_rtk_block() that handles all 4 cases: - Added: no existing block → append - Updated: stale block → replace in-place - Unchanged: current block → no-op - Malformed: opening marker without closing → warn safely Includes 4 unit tests covering each case.
This was referenced Feb 14, 2026
pszymkowiak
approved these changes
Feb 15, 2026
Collaborator
pszymkowiak
left a comment
pszymkowiak
left a comment
There was a problem hiding this comment.
Clean refactor. Pure function with 4 well-tested cases, defensive malformed handling. LGTM.
ahundt
added a commit
to ahundt/rtk
that referenced
this pull request
Feb 16, 2026
Merged from upstream/master: - feat(gain): colored dashboard with efficiency meter and impact bars (rtk-ai#129) - refactor(init): add upsert_rtk_block for idempotent CLAUDE.md management (rtk-ai#123) - feat(cargo): add cargo nextest support with failures-only output (rtk-ai#107) - docs: version references to 0.16.0/0.18.0 in README, ARCHITECTURE, CHANGELOG - ci: add validate-docs workflow Conflict resolution in src/init.rs: - Kept RtkBlockUpsert enum and upsert_rtk_block() from upstream - Kept patch_instruction_file() from current branch (for @RTK.md references) - Both features coexist: upsert_rtk_block for legacy --claude-md mode, patch_instruction_file for default @RTK.md reference mode All 688 tests pass.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Extracted from #118 per reviewer feedback (split into focused PRs).
Replaces the naive append-or-skip logic in
run_claude_md_mode()withupsert_rtk_block()— a pure function that handles all 4 CLAUDE.md states:Changes
src/init.rs:RtkBlockUpsertenum,upsert_rtk_block()function, refactoredrun_claude_md_mode()Why this is safe
&strcontent + desired block, returns(String, Action)— caller decides whether to writeTest plan
cargo test init::— 26 tests passcargo fmt --all --check— cleancargo clippy --all-targets— no new warnings