working-tree-edits-stranded-on-squash-merge SKILL.md skillA

working-tree-edits-stranded-on-squash-merge from wan-huiyan/agent-traffic-control is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.

Install it, pinned
mdr add wan-huiyan/agent-traffic-control/working-tree-edits-stranded-on-squash-merge@v1.0.0

Pins v1.0.0 in mdr.lock. Pin the fingerprint instead.

Audit grade
A, 17 of 17 checks passed
Kind
SKILL.md skill
Repository
wan-huiyan/agent-traffic-control
Path
plugins/agent-traffic-control/skills/working-tree-edits-stranded-on-squash-merge/SKILL.md
Versions recorded
2
Latest version
v1.0.0, committed Jul 8, 2026
First version recorded
May 29, 2026
Size
7,327 bytes
Repository stars
3
License
MIT

Diagnose and prevent "I made the fix but it's not on main" cases where the fix was applied in the working tree via Edit / Write but never `git add`ed before the squash-merge. Use when: (1) you squash-merged a PR and the user reports the issue is back, (2) `git status` after the merge shows uncommitted changes for files you remember editing during the PR's acceptance pass, (3) a follow-up `git diff origin/<base>` against the merged branch surfaces edits that should have been in the PR. Root…

Collected from public GitHub. Every version is saved exactly as it was and never changes. Install it at an exact version with the mdr tool, and every file is checked before it reaches your agent. The main file is checked against the SHA-256 fingerprint recorded here, and the others against the fingerprints GitHub keeps for its source commit. The automatic checks below grade the latest version, and the same checks always give the same file the same grade.

What the file says

# Working-tree edits stranded by a squash-merge

## Problem

You're iterating on a PR through an acceptance pass. The user surfaces a
bug; you make an Edit() call; the bug is fixed locally; the user confirms;
you move on to the next bug. A few iterations later you squash-merge the
PR. The user reloads the page and says "the bug is back."

The fix is sitting in your working tree, never staged, never committed.
The squash captured everything *committed* on the branch — but Edit() and
Write() don't auto-stage. When you did `git add <other_file>` for the
follow-up bug, only that file went into the commit; the earlier Edit'd
file stayed in the working tree as a modified-but-uncommitted change.

After merge: `git status` shows `M <file_you_edited>`, the merged squash on
`<base_branch>` has the old content, and the user sees the bug return.

## Context / Trigger Conditions

All of these together strongly indicate this pattern:

1. You used Edit() or Write() on a file during an interactive PR-review pass
   (i.e. you applied the fix to "make the live server / preview reflect it"
   for the user to verify, but didn't think of it as a commit-worthy unit).
…

Read the whole file at its exact version.

How to install

The exact contents, by fingerprint
mdr add wan-huiyan/agent-traffic-control/working-tree-edits-stranded-on-squash-merge@sha256:9eda90a4cb0f9b27

The line at the top of this page pins the label v1.0.0, which is what most people want. This one pins the sha256 fingerprint of the contents instead, so it survives a label being moved. Either way the exact version is written to mdr.lock, and mdr install downloads and checks those contents again, so it installs them exactly or stops with an error.

Badge

mdr badge

[![mdr](https://markdownregistry.com/badge/art_bog5cqu27to35lws.svg)](https://markdownregistry.com/a/art_bog5cqu27to35lws)

3 badge image fetches in 30 days. What the badge shows.

Versions

The registry has recorded 2 versions of this file, between May 29, 2026 and Jul 8, 2026, about one every 40 days.

versioncommittedcommitsizeaudit
v1.0.0 latest2026-07-08 f1254dd 7,327 BA view · diff
v1.0.02026-05-29 059688a 7,296 BA view

Audit of the latest version

A  17 of 17 checks passed. Fixed automatic checks with no AI involved, so the same checks give the same answer every run.
  • pass: Frontmatter block present
  • pass: Frontmatter declares a name
  • pass: Frontmatter declares a description
  • pass: Size between 200 bytes and 200 KB (7327 bytes)
  • pass: No zero-width or bidi control characters
  • pass: No instruction hidden inside an HTML comment
  • pass: No link to an exfiltration or paste host
  • pass: No credential-shaped string
  • pass: No instruction to send local credentials anywhere
  • pass: No text hidden with inline styles
  • pass: No prompt-injection phrasing
  • pass: No curl or wget piped into a shell
  • pass: No recursive delete of root, home or parent
  • pass: No instruction to read or print local credentials
  • pass: No base64 blob over 200 characters
  • pass: No link to a raw IP address
  • pass: No script tag

Source

GitHub

wan-huiyan/agent-traffic-control · 3 stars · license MIT · pushed 2026-09-22 · branch main

API

GET https://markdownregistry.com/api/v1/artifacts/art_bog5cqu27to35lws
GET https://markdownregistry.com/api/v1/resolve?ref=wan-huiyan/agent-traffic-control/working-tree-edits-stranded-on-squash-merge
GET https://markdownregistry.com/api/v1/blob/9eda90a4cb0f9b27d4953842ba5aef43cc8162c2dc5189e6735a7250a3c81b60

Your AI assistant does the legwork. You hear about the deals worth your word. Hand yours the standing instructions at modelranch.com and it joins the network that reads files like this one.

Guides: the SKILL.md format and its required fields · what to check before you install a skill · how to pin a skill to an exact version · where to find agent skills · keeping a team on the same skills · which agent file does what.

More from wan-huiyan/agent-traffic-control

DESIGN.md@plugins/agent-traffic-control/hooks/resume-gate DESIGN.md file
wan-huiyan/agent-traffic-control · plugins/agent-traffic-control/hooks/resume-gate/DESIGN.md
git:20260812.d9a22d6 · audit A · 3 stars
agent-refusal-with-evidence-beats-literal-compliance SKILL.md skill
wan-huiyan/agent-traffic-control · plugins/agent-traffic-control/skills/agent-refusal-with-evidence-beats-literal-compliance/SKILL.md · A dispatched agent that does exactly what you asked can ship a defect you would have stopped yourself, because it can…
v1.0.0 · audit A · 3 stars
async-doc-hook-autodocs-worktree-locks-branch-checkout SKILL.md skill
wan-huiyan/agent-traffic-control · plugins/agent-traffic-control/skills/async-doc-hook-autodocs-worktree-locks-branch-checkout/SKILL.md · Fix for `git checkout <branch>` failing with `fatal: '<branch>' is already used by worktree at '.../autodocs-<name>'`…
v1.0.0 · audit A · 3 stars
async-post-commit-hook-commit-orphaned-by-squash-merge SKILL.md skill
wan-huiyan/agent-traffic-control · plugins/agent-traffic-control/skills/async-post-commit-hook-commit-orphaned-by-squash-merge/SKILL.md · In a repo with an ASYNC/background post-commit hook (one that fires after a commit and creates its OWN follow-up commit…
v1.0.0 · audit A · 3 stars
auto-merge-rearms-while-agent-live-kill-then-disarm-verify SKILL.md skill
wan-huiyan/agent-traffic-control · plugins/agent-traffic-control/skills/auto-merge-rearms-while-agent-live-kill-then-disarm-verify/SKILL.md · Disarming auto-merge on a PR whose agent is still running does not hold it — the agent re-arms within minutes and the…
v1.0.0 · audit A · 3 stars
batch-member-cites-a-path-only-a-non-member-adds SKILL.md skill
wan-huiyan/agent-traffic-control · plugins/agent-traffic-control/skills/batch-member-cites-a-path-only-a-non-member-adds/SKILL.md · You wrote something correct that the default reader cannot reach: a batch member citing a path only a NON-member adds…
v1.1.0 · audit A · 3 stars
batch-merge-subject-is-not-evidence-a-member-landed SKILL.md skill
wan-huiyan/agent-traffic-control · plugins/agent-traffic-control/skills/batch-merge-subject-is-not-evidence-a-member-landed/SKILL.md · You are about to close, delete the branch of, or mark as landed a pull request because a batch, roll-up or merge-train…
v1.0.0 · audit A · 3 stars
ci-leg-skipping-moves-minutes-it-does-not-remove-them SKILL.md skill
wan-huiyan/agent-traffic-control · plugins/agent-traffic-control/skills/ci-leg-skipping-moves-minutes-it-does-not-remove-them/SKILL.md · You are about to propose, price or approve a CI cost saving that works by making a job or matrix leg SKIP on pull…
v1.0.0 · audit A · 3 stars
cjk-structured-llm-output-truncates-json-needs-2x-tokens SKILL.md skill
wan-huiyan/agent-traffic-control · plugins/agent-traffic-control/skills/cjk-structured-llm-output-truncates-json-needs-2x-tokens/SKILL.md · When generating LONG Chinese/Japanese/Korean (CJK) STRUCTURED output (a big JSON report, a multi-section document) from…
v1.0.0 · audit A · 3 stars
claude-code-projects-jsonl-worktree-fanout SKILL.md skill
wan-huiyan/agent-traffic-control · plugins/agent-traffic-control/skills/claude-code-projects-jsonl-worktree-fanout/SKILL.md · Find a prior session's transcript that `~/.claude/projects/<project>/` does not hold: each git worktree gets its own…
v1.0.0 · audit A · 3 stars
clean-merge-lands-line-guard-on-a-value-neither-branch-predicted SKILL.md skill
wan-huiyan/agent-traffic-control · plugins/agent-traffic-control/skills/clean-merge-lands-line-guard-on-a-value-neither-branch-predicted/SKILL.md · Two branches each contain a guard, test or document that pins a line NUMBER in a third file, each side correctly…
v1.0.0 · audit A · 3 stars
code-review-subagent-fabricates-specifics-to-inflate-severity SKILL.md skill
wan-huiyan/agent-traffic-control · plugins/agent-traffic-control/skills/code-review-subagent-fabricates-specifics-to-inflate-severity/SKILL.md · When a code-review subagent (voltagent-qa-sec, opus-tier reviewer, code-reviewer, etc.) reports a HIGH or BLOCKING…
v1.0.0 · audit A · 3 stars

Every file in wan-huiyan/agent-traffic-control

Browse by kind, by grade A, or by owner.