upmerge

A workflow for carrying a fixed bug from one maintained PHP source-code branch into every newer branch, with a NEWS entry for each branch.

In plain words
What is it for?
Use it to plan or execute branch-by-branch merges in php-src, creating one merge commit for each step.
Why use it?
It helps keep the same fix available across supported PHP versions and shows the planned changes before applying them.

Skill for Claude CodeCodex

Install

Getting it into your agent

One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.

agentmods
npx agentmods add skills/pronskiy/php-src-developer/upmerge
Any agent
npx skills add pronskiy/php-src-developer --skill upmerge
Clone the repo
git clone --depth 1 https://github.com/pronskiy/php-src-developer

Made for: Claude Code, Codex.

Per session 117 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 3,485 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. Scan, not verified.
Origin original No closer match found in the catalogue.
Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

ModelPer sessionOnce invoked
Fable 5 $0.00117 $0.03485
Opus 5 $0.00059 $0.01742
Sonnet 5 $0.00023 $0.00697
Haiku 4.5 $0.00012 $0.00348

Measured 2d ago against content hash f5090a7c71ed, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, from the pricing page.

Security

Grade A, and why

upmerge scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 2d ago.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

plugins/php-core-developer/skills/upmerge/SKILL.md · 285 lines

How it starts

The opening of the file, as written. The whole thing — 285 lines — stays where its author put it; the contents beside it link to each section on GitHub.

upmerge

Final, optional step of the bug-fix flow. Owns no SPEC.md phase; produces its own one-shot living doc UPMERGE.md. Reads the fix commit and target_branch from SPEC.md (or accepts explicit args), computes the merge chain dynamically, plans NEWS edits per branch, and — only on --execute — applies the merges locally.

Inputs

  1. SPEC.md in the task directory resolved per _shared/task-dir.md. From it:
    • type: bug, status: done (Verification phase done — guardrail).
    • target_branch: PHP-x.y (the source branch — the "from" of the chain).
    • linked: → GH issue number for the NEWS entry.
    • Fix commit SHA recovered from the Progress Log's bug-fix entry, or via git -C $PHP_SRC_DIR log --grep "Closes GH-<N>" -1 --pretty=%H on target_branch.
  2. Or explicit flags when SPEC.md is absent: --from PHP-x.y --commit <sha> --issue <N>.
  3. $PHP_SRC_DIR resolved per _shared/php-src-detection.md.
  4. Mode flag: default dry-run; --execute to perform merges.

What it produces

  • UPMERGE.md in the same task dir as SPEC.md. Schema below.
  • On --execute: one merge commit per branch hop in $PHP_SRC_DIR, with NEWS spliced on each upper branch. Tree left checked out on the topmost branch in the chain.

No git push. Ever.

Workflow

1. Pre-guardrails

Refuse on any of:

  • Working tree + index not clean:
    git -C "$PHP_SRC_DIR" diff --quiet && git -C "$PHP_SRC_DIR" diff --cached --quiet
    
  • --from branch missing locally: git -C "$PHP_SRC_DIR" rev-parse --verify <from>.
  • --from == master: nothing above master. Refuse with: master is the top of the chain; nothing to upmerge.
  • Fix commit not reachable from --from: git merge-base --is-ancestor <sha> <from> must succeed.
  • Fix commit ALREADY in the next-higher branch (already upmerged): the negative form ! git merge-base --is-ancestor <sha> <next> must succeed. Otherwise refuse with: Fix already present in <next>; nothing to do.
  • Fix commit didn't touch NEWS on --from:
    git -C "$PHP_SRC_DIR" show --stat <sha> | grep -q '^ NEWS '
    
    If empty: refuse with: Fix commit <sha> did not touch NEWS on <from>. Add the NEWS entry on <from> first, then re-run.
  • SPEC.md (if present) Verification phase not done. Refuse with: Run /bug-verify before /upmerge.

Read the full file on GitHub · 285 lines

Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

  1. 2d ago First seen · 285 lines · 117 tokens per session scan A f5090a7c71ed

Subscribe to this mod's changes

upmerge is a skill published in the GitHub repository pronskiy/php-src-developer (8 stars, last pushed 3mo ago), licensed MIT. It adds 117 tokens to every session and 3,485 once invoked, about $0.0006 per session on Opus 5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-31.

Related

Other skills, from other repositories

systematic-debugging

Use when encountering any bug, test failure, or unexpected behavior, before proposing fixes.

obra/superpowers · 21 tokens

brainstorming

You MUST use this before any creative work - creating features, building components, adding functionality, or modifying behavior. Explores user intent, requirements and design before implementation.

obra/superpowers · 37 tokens

auto-perf-optimize

Run agent-driven VS Code performance or memory investigations. Use when asked to launch Code OSS, automate a VS Code scenario, run the Chat memory smoke runner, capture renderer heap snapshots, take workflow screenshots, compare run summaries, or drive a repeatable scenario before heap-snapshot analysis.

microsoft/vscode · 62 tokens

chat-perf

Run chat perf benchmarks and memory leak checks against the local dev build or any published VS Code version. Use when investigating chat rendering regressions, validating perf-sensitive changes to chat UI, or checking for memory leaks in the chat response pipeline.

microsoft/vscode · 51 tokens

chat-pet-sprite-creation

Use when creating or changing VS Code chat pet sprite art, sprite sheets, state animations, eye treatments, Stable/Insiders variants, or pet transitions under src/vs/workbench/contrib/chat/browser/widget/media/chatPet.

microsoft/vscode · 53 tokens

cpu-profile-analysis

Analyze V8/Chrome CPU profiles (.cpuprofile) and DevTools trace files (Trace-.json). Use when: profiling performance, investigating slow functions, comparing code paths, finding bottlenecks, analyzing timeToRequest, understanding call trees from sampling profiler data, analyzing layout/paint/rendering, investigating…

microsoft/vscode · 71 tokens