aevatarai/experimental/novel/agent_skills/rewrite-branch-merge
experimental/novel/agent_skills/rewrite-branch-merge/SKILL.md
--- name: rewrite-branch-merge description: Manage rewrite branches: when to branch, how to compare, and how to merge back with minimal chaos. --- ## When to use - A change is risky (canon/timeline/payoff) and might break the mainline. - Author wants to explore multiple routes in parallel. ## Branching rules (simple, strict) - Branch if: - canon changes would require editing many existing chapters - timeline constraints are violated and fix is non-local - payoff plan changes the story’s
$ install --global
skillsauthnpx skillsauth add aevatarai/aevatar-agent-framework experimental/novel/agent_skills/rewrite-branch-mergeInstall this skill globally with one command. Works with Claude Code, Cursor, and Windsurf.
Security Scan Results
3 of 9 scanners reported clean
Some scanners were skipped, did not run, or reported a non-clean status. Review each row below.
3
Scanners Passed
9
Scanners in report
Clean
TrivyContainer and dependency vulnerability scanner
95%
Clean
SemgrepStatic code analysis for vulnerabilities
95%
Clean
mcp-scan (Snyk)Model Context Protocol security validation
95%
Skipped
Snyk (dep)Open source security scanning
50%
Skipped
Socket.devSupply chain security analysis
50%
Skipped
VirusTotalMulti-engine malware detection
50%
Skipped
CrowdStrikeAdvanced threat intelligence
50%
Skipped
OSV-ScannerOpen Source Vulnerability database check
50%
Skipped
OWASP Dep-Check
50%
Last scanned: Mar 30, 2026, 5:36 PM55.6s1 file scanned
SKILL.md
- name:
- rewrite-branch-merge
- description:
- Manage rewrite branches: when to branch, how to compare, and how to merge back with minimal chaos.
When to use
- A change is risky (canon/timeline/payoff) and might break the mainline.
- Author wants to explore multiple routes in parallel.
Branching rules (simple, strict)
- Branch if:
- canon changes would require editing many existing chapters
- timeline constraints are violated and fix is non-local
- payoff plan changes the story’s core promise
Comparison checklist
- Narrative Tests: pass/fail delta
- Setup/Payoff ledger: debt ratio, broken setups
- Reader personas: confusion / payoff strength delta
- Author intent: does this branch align better with the deviation intent?
Merge strategies
- Pick winner: choose one branch entirely (fast)
- Selective merge: pick best chapters/sections (requires strong diff discipline)
- Dual timeline: keep both as alternate route (rare; only if author wants)
Output
branch_compare.md(diff summary + test/persona/ledger comparison)merge_plan.md(chosen strategy + concrete steps)
Related Skills
aevatarai/writing-journal
data-ai
VerifiedTrustedCommunity
Aggregate a writing session into a readable log + a reusable author-intent prompt.
11SKILL.mdUpdated Mar 27, 2026
aevatarai/story-control-panel
tools
VerifiedTrustedCommunity
Define what the Story Control Panel shows, how to compute signals, and how the author should act on alerts.
11SKILL.mdUpdated Mar 27, 2026
aevatarai/setup-payoff-ledger
data-ai
VerifiedTrustedCommunity
Maintain a structured Setup/Payoff ledger (promises, debts, payoffs) and generate a payoff roadmap.
11SKILL.mdUpdated Mar 27, 2026
aevatarai/reader-personas
tools
VerifiedTrustedCommunity
Simulate multiple reader personas to score a chapter (爽点/困惑/信息负荷) and propose actionable alternatives.
11SKILL.mdUpdated Mar 27, 2026