[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M72YV61RJSCRW2K4N9ABWH2D":3,"skill-same:01M72YV61RJSCRW2K4N9ABWH2D":45},{"skillNo":4,"name":5,"nameZh":6,"description":7,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":9,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":15,"categories":16,"keywords":17,"publishedAt":18,"linkOnly":19,"markdownContent":20,"markdownBody":21,"frontMatter":22,"refName":23,"commitSha":24,"skillDirectory":25,"forksCount":13,"repositoryHtmlUrl":26,"repositoryHomepageUrl":6,"ownerHtmlUrl":27,"ownerBlogUrl":28,"ownerDescription":29,"updatedAt":30,"install":31,"resources":44},"01M72YV61RJSCRW2K4N9ABWH2D","merge-update-pr",null,"Rebase PR branch on main: merge --no-ff, resolve conflicts intelligently, lint-after-rebase gate, push only if merge commit created. Triggers: update pr, merge main into, \u002Fupdate-pr.","cedricfarinazzo\u002Fagile-skills","cedricfarinazzo","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F34288081?v=4","01M72YSXQAMF9679DT1EGZV51E","01M72YSXRG377986J64G71PJZE",0,"MIT","https:\u002F\u002Fgithub.com\u002Fcedricfarinazzo\u002Fagile-skills\u002Fblob\u002Fmaster\u002Fagile-merge-review\u002Fskills\u002Fmerge-update-pr\u002FSKILL.md",[],[],"2026-11-11 15:11:14",false,"---\nname: merge-update-pr\ndescription: \"Rebase PR branch on main: merge --no-ff, resolve conflicts intelligently, lint-after-rebase gate, push only if merge commit created. Triggers: update pr, merge main into, \u002Fupdate-pr.\"\n---\n\n# merge-update-pr\n\n## Host execution\n\n**Claude Code:** retain the agent-dispatch and concurrency behavior defined below. **Codex:** use only the inline behavior stated here.\n\nOn Codex this sub-skill runs inline under `agile-11-merge-train` with `concurrency=0`; never spawn or assume a named agent. Perform its full gate and return its normal receipt to the caller.\n\n## Purpose\n\nBring a PR branch up to date with main and push. Resolve conflicts by understanding both sides — never blindly take one.\n\n**Input:** PR number or branch name from args; ask if neither is given.\n\n## Steps\n\n1. `git fetch origin main` — **refresh the base without checking it out** (step 3 merges `origin\u002Fmain`). A `git checkout main` here mutates the shared checkout under whatever sibling work is in flight, and fails outright when a worktree already holds the base.\n2. Get on the branch: with a PR number prefer `gh pr checkout \u003CN>` (handles fetch + tracking); with a branch name, `git fetch origin && git checkout \u003Cbranch> && git pull origin \u003Cbranch>`.\n   - **A worktree may already hold this branch.** `agile-10-implement` leaves one per unmerged ticket, so in a drain the branch you are about to check out is often checked out elsewhere and the command fails with `fatal: '\u003Cbranch>' is already used by worktree at \u003Cpath>`. Do not work around that with `--force` or a detached HEAD: `git worktree list` names the path, so **work there instead, by absolute path** (`cd \u003Cpath>`, `git -C \u003Cpath>`) and run the remaining steps in it. Rebasing the branch where it actually lives also means a later rework by the build agent sees your merge commit instead of diverging from it.\n3. `git merge --no-ff origin\u002Fmain -m \"chore: merge main into \u003Cbranch>\"` — the `-m` is consumed only if a merge commit is actually created. **Detect the outcome from stdout, not the exit code** (an auto-resolved merge also exits 0): `Already up to date.` vs `Merge made by the 'ort' strategy.` vs conflict markers.\n4. **On conflicts:** `git diff --name-only --diff-filter=U`, then for each file read it, understand both sides, and write the semantically correct merge. **Never `git checkout --ours` \u002F `--theirs` without reading both sides** — taking one side wholesale to make the conflict go away silently drops the other side's change.\n   - Documentation tables (coverage tables, run-command sections) and append-only structures (dict\u002Flist literals, include lists, beat schedules, route tables): **keep every entry from both sides**, chronological order — earlier ticket first, matching merge order on `main`.\n   - Genuinely ambiguous conflict → explain both sides and ask before resolving.\n   - Then `git add \u003Cfile>` and **`GIT_EDITOR=true git merge --continue`** — `git merge --continue` does not accept `--no-edit` and will hang on the editor in a non-interactive environment without it.\n5. **Lint-after-rebase gate — mandatory whenever a merge commit was created**, including when conflicts auto-resolved cleanly: a textual merge leaves artifacts linters reject (a formatter collapsing a multi-line ternary, a duplicated import block). Run the linters\u002Fformatters covering the touched paths; the commands live in the consumer repo's `CLAUDE.md\u002FAGENTS.md`.\n   - **A hand-resolved conflict needs the tests too, not just the linters.** Lint cannot see a resolution that dropped one side's contribution from an expression — the result is clean and silently wrong. Run the touched tiers' tests on the MERGED tree before pushing. Where both sides edited one expression in OPPOSITE directions (one adding a term, one removing another), the correct result matches neither side's version: it carries both contributions.\n   - **Run any lint the PR itself introduces, against the rebased tree.** Find it with `git diff main HEAD -- scripts\u002Flint_*.py .github\u002Fworkflows\u002F*.yml`. Without this, a PR introducing a new lint passes its own pre-push CI on the original tree and then fails the first commit to `main` after merge — the rebase pulls in sibling-PR files the original sweep never touched.\n   - If a formatter modified files, `git add` them and `GIT_EDITOR=true git commit --amend --no-edit` (the merge commit is unpushed, so amending is safe), then re-run to confirm clean.\n6. `git push origin \u003Cbranch>` — **skipped entirely on a no-op merge.**\n\n## No-op merge (branch already on top of main)\n\nWhen step 3 prints `Already up to date.`:\n\n- **Do not push** — there is nothing new, and a push may falsely trigger CI re-runs.\n- **Do not force an empty merge commit to \"trigger CI\".** The branch tree already matches what will land, so the existing run on branch HEAD is the canonical result. If the caller needs fresh CI on the exact tree, check `git merge-base --is-ancestor origin\u002Fmain \u003Cexisting-CI-run-sha>`: exit 0 → branch HEAD contains all of main, the existing run covers the landable tree, proceed; exit 1 → contradicts the no-op signal and indicates a state-tracking bug, so investigate before proceeding.\n- **Report the existing run's conclusion** (`gh pr view \u003CN> --json statusCheckRollup,mergeStateStatus`) so the caller acts without another `gh run view`. A no-op rebase does **not** imply CI is green — the existing run may be `FAILURE`\u002F`UNSTABLE`, and routing that into the fix loop instead of merging is the caller's job (`agile-11-merge-train` 3a).\n\n## Report exactly one outcome\n\nThese status lines are what `agile-11-merge-train` 3a routes on, so write them as full sentences in normal English:\n\n- **Pushed merge commit** — conflicts resolved (if any), new HEAD sha, fresh CI run expected.\n- **No-op (already up to date)** — no commit, no push; name the existing CI run id, its conclusion, and its sha.\n- **Conflict still open** — the unresolved files; halt, the caller must intervene.\n","# merge-update-pr\n\n## Host execution\n\n**Claude Code:** retain the agent-dispatch and concurrency behavior defined below. **Codex:** use only the inline behavior stated here.\n\nOn Codex this sub-skill runs inline under `agile-11-merge-train` with `concurrency=0`; never spawn or assume a named agent. Perform its full gate and return its normal receipt to the caller.\n\n## Purpose\n\nBring a PR branch up to date with main and push. Resolve conflicts by understanding both sides — never blindly take one.\n\n**Input:** PR number or branch name from args; ask if neither is given.\n\n## Steps\n\n1. `git fetch origin main` — **refresh the base without checking it out** (step 3 merges `origin\u002Fmain`). A `git checkout main` here mutates the shared checkout under whatever sibling work is in flight, and fails outright when a worktree already holds the base.\n2. Get on the branch: with a PR number prefer `gh pr checkout \u003CN>` (handles fetch + tracking); with a branch name, `git fetch origin && git checkout \u003Cbranch> && git pull origin \u003Cbranch>`.\n   - **A worktree may already hold this branch.** `agile-10-implement` leaves one per unmerged ticket, so in a drain the branch you are about to check out is often checked out elsewhere and the command fails with `fatal: '\u003Cbranch>' is already used by worktree at \u003Cpath>`. Do not work around that with `--force` or a detached HEAD: `git worktree list` names the path, so **work there instead, by absolute path** (`cd \u003Cpath>`, `git -C \u003Cpath>`) and run the remaining steps in it. Rebasing the branch where it actually lives also means a later rework by the build agent sees your merge commit instead of diverging from it.\n3. `git merge --no-ff origin\u002Fmain -m \"chore: merge main into \u003Cbranch>\"` — the `-m` is consumed only if a merge commit is actually created. **Detect the outcome from stdout, not the exit code** (an auto-resolved merge also exits 0): `Already up to date.` vs `Merge made by the 'ort' strategy.` vs conflict markers.\n4. **On conflicts:** `git diff --name-only --diff-filter=U`, then for each file read it, understand both sides, and write the semantically correct merge. **Never `git checkout --ours` \u002F `--theirs` without reading both sides** — taking one side wholesale to make the conflict go away silently drops the other side's change.\n   - Documentation tables (coverage tables, run-command sections) and append-only structures (dict\u002Flist literals, include lists, beat schedules, route tables): **keep every entry from both sides**, chronological order — earlier ticket first, matching merge order on `main`.\n   - Genuinely ambiguous conflict → explain both sides and ask before resolving.\n   - Then `git add \u003Cfile>` and **`GIT_EDITOR=true git merge --continue`** — `git merge --continue` does not accept `--no-edit` and will hang on the editor in a non-interactive environment without it.\n5. **Lint-after-rebase gate — mandatory whenever a merge commit was created**, including when conflicts auto-resolved cleanly: a textual merge leaves artifacts linters reject (a formatter collapsing a multi-line ternary, a duplicated import block). Run the linters\u002Fformatters covering the touched paths; the commands live in the consumer repo's `CLAUDE.md\u002FAGENTS.md`.\n   - **A hand-resolved conflict needs the tests too, not just the linters.** Lint cannot see a resolution that dropped one side's contribution from an expression — the result is clean and silently wrong. Run the touched tiers' tests on the MERGED tree before pushing. Where both sides edited one expression in OPPOSITE directions (one adding a term, one removing another), the correct result matches neither side's version: it carries both contributions.\n   - **Run any lint the PR itself introduces, against the rebased tree.** Find it with `git diff main HEAD -- scripts\u002Flint_*.py .github\u002Fworkflows\u002F*.yml`. Without this, a PR introducing a new lint passes its own pre-push CI on the original tree and then fails the first commit to `main` after merge — the rebase pulls in sibling-PR files the original sweep never touched.\n   - If a formatter modified files, `git add` them and `GIT_EDITOR=true git commit --amend --no-edit` (the merge commit is unpushed, so amending is safe), then re-run to confirm clean.\n6. `git push origin \u003Cbranch>` — **skipped entirely on a no-op merge.**\n\n## No-op merge (branch already on top of main)\n\nWhen step 3 prints `Already up to date.`:\n\n- **Do not push** — there is nothing new, and a push may falsely trigger CI re-runs.\n- **Do not force an empty merge commit to \"trigger CI\".** The branch tree already matches what will land, so the existing run on branch HEAD is the canonical result. If the caller needs fresh CI on the exact tree, check `git merge-base --is-ancestor origin\u002Fmain \u003Cexisting-CI-run-sha>`: exit 0 → branch HEAD contains all of main, the existing run covers the landable tree, proceed; exit 1 → contradicts the no-op signal and indicates a state-tracking bug, so investigate before proceeding.\n- **Report the existing run's conclusion** (`gh pr view \u003CN> --json statusCheckRollup,mergeStateStatus`) so the caller acts without another `gh run view`. A no-op rebase does **not** imply CI is green — the existing run may be `FAILURE`\u002F`UNSTABLE`, and routing that into the fix loop instead of merging is the caller's job (`agile-11-merge-train` 3a).\n\n## Report exactly one outcome\n\nThese status lines are what `agile-11-merge-train` 3a routes on, so write them as full sentences in normal English:\n\n- **Pushed merge commit** — conflicts resolved (if any), new HEAD sha, fresh CI run expected.\n- **No-op (already up to date)** — no commit, no push; name the existing CI run id, its conclusion, and its sha.\n- **Conflict still open** — the unresolved files; halt, the caller must intervene.\n",{"name":5,"description":7},"master","5f163e1c0720bcc8f5c9caf4e675c301585b3b29","agile-merge-review\u002Fskills\u002Fmerge-update-pr","https:\u002F\u002Fgithub.com\u002Fcedricfarinazzo\u002Fagile-skills","https:\u002F\u002Fgithub.com\u002Fcedricfarinazzo","https:\u002F\u002Fcedricfarinazzo.fr\u002F","IT engineer specialized in Cybersecurity and SRE\u002FDevOps","2026-11-13 03:28:11",{"source":8,"skillName":5,"commands":32,"prompt":42,"zipAvailable":43},[33,36,39],{"tool":34,"command":35},"npx","npx skills add cedricfarinazzo\u002Fagile-skills --skill merge-update-pr",{"tool":37,"command":38},"bunx","bunx skills add cedricfarinazzo\u002Fagile-skills --skill merge-update-pr",{"tool":40,"command":41},"pnpm","pnpm dlx skills add cedricfarinazzo\u002Fagile-skills --skill merge-update-pr","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002Fcedricfarinazzo\u002Fagile-skills\u002Fblob\u002Fmaster\u002Fagile-merge-review\u002Fskills\u002Fmerge-update-pr\u002FSKILL.md",true,[],[46,53,60,67,74,81],{"skillNo":47,"name":48,"nameZh":6,"description":49,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":9,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":50,"categories":51,"keywords":52,"publishedAt":18},"01M72YXMSVD28QYHJ70AVJ9SBP","session-audit","Audit the cost and efficiency of Claude Code sessions that ran agile-skills: per-skill and per-subagent spend, a before\u002Fafter delta normalised by work shipped, and ranked skill improvements. Triggers: audit this session's cost, analyze the session transcripts, compare before and after sessions, is the new version more efficient, where do the tokens go, subagent cost breakdown, find efficiency improvements.","https:\u002F\u002Fgithub.com\u002Fcedricfarinazzo\u002Fagile-skills\u002Fblob\u002Fmaster\u002Fsession-audit\u002Fskills\u002Fsession-audit\u002FSKILL.md",[],[],{"skillNo":54,"name":55,"nameZh":6,"description":56,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":9,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":57,"categories":58,"keywords":59,"publishedAt":18},"01M72YXG2E8CAD3YHTHFESKF2B","deep-it-project-review","Autonomously perform a deep, evidence-backed technical review of a software or IT project across applicable architecture, code, security, delivery, operations, and lifecycle domains without modifying project files. Triggers: deep IT project review, technical project review, architecture audit, repository assessment, assess this codebase, review this project.","https:\u002F\u002Fgithub.com\u002Fcedricfarinazzo\u002Fagile-skills\u002Fblob\u002Fmaster\u002Fproject-review\u002Fskills\u002Fdeep-it-project-review\u002FSKILL.md",[],[],{"skillNo":61,"name":62,"nameZh":6,"description":63,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":9,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":64,"categories":65,"keywords":66,"publishedAt":18},"01M72YXBQJCSDC60PVKA6H9SJ3","test-refactor","Audit one test suite at a time for dead weight, duplication, parallel-unsafety and runtime cost, or characterize behavior before a risky refactor — with production code frozen and good coverage kept, proven per module rather than assumed. Triggers: test refactor, characterize before refactor, characterization tests, clean the tests, refactor the tests, test suite audit, DRY the tests, parallelize the test suite, speed up the tests.","https:\u002F\u002Fgithub.com\u002Fcedricfarinazzo\u002Fagile-skills\u002Fblob\u002Fmaster\u002Fdeep-refactor\u002Fskills\u002Ftest-refactor\u002FSKILL.md",[],[],{"skillNo":68,"name":69,"nameZh":6,"description":70,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":9,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":71,"categories":72,"keywords":73,"publishedAt":18},"01M72YX7QCP7MA1H2DSWVG6Y4C","doc-refactor","Audit every markdown file in a repo — READMEs, docs\u002F, and agent-instruction files — for lies, drift, duplication and bloat, then ticket and ship the cleanup as a sequenced PR train, with source code frozen and every surviving claim verified against the repo rather than read. Triggers: doc refactor, refactor the docs, clean the docs, documentation audit, README audit, docs are stale, DRY the docs, audit every markdown file.","https:\u002F\u002Fgithub.com\u002Fcedricfarinazzo\u002Fagile-skills\u002Fblob\u002Fmaster\u002Fdeep-refactor\u002Fskills\u002Fdoc-refactor\u002FSKILL.md",[],[],{"skillNo":75,"name":76,"nameZh":6,"description":77,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":9,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":78,"categories":79,"keywords":80,"publishedAt":18},"01M72YX36Z9MSECJH7FJ4JM09Z","deep-refactor","Audit an entire codebase for defects, waste and debt, then ticket and ship the findings as a sequenced PR train — without breaking the test contract. Triggers: deep refactor, refactor audit, clean the codebase, DRY pass, audit and fix everything.","https:\u002F\u002Fgithub.com\u002Fcedricfarinazzo\u002Fagile-skills\u002Fblob\u002Fmaster\u002Fdeep-refactor\u002Fskills\u002Fdeep-refactor\u002FSKILL.md",[],[],{"skillNo":82,"name":83,"nameZh":6,"description":84,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":9,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":85,"categories":86,"keywords":87,"publishedAt":18},"01M72YWZ1HEXSKQ7JCSVR2HPT0","agile-sprint-drain","Drain the active sprint to a fixed point: auto-alternate agile-10-implement (build) and agile-11-merge-train (merge) until both empty (DRAINED) or blocked (STUCK). Optional concurrency=N, dispatch=session, max-merges=N. Triggers: drain the sprint, run the sprint to completion, implement and merge until done, clear the whole board, ship the sprint.","https:\u002F\u002Fgithub.com\u002Fcedricfarinazzo\u002Fagile-skills\u002Fblob\u002Fmaster\u002Fagile-sprint-drain\u002Fskills\u002Fagile-sprint-drain\u002FSKILL.md",[],[]]