A guided Git workflow for comparing a local branch with its remote branch before bringing changes together. Git is the version-control system used to track code changes.

Use it to inspect branch status, refresh remote information, and decide whether to fast-forward, merge, or stop for review.

It helps reveal local edits, unfinished operations, branch differences, and overlapping files before a pull or merge can risk losing work.

sync-well — Skill for Claude Code and Codex by ohong: A guided Git workflow for comparing a local branch…

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/ohong/agent-skills/sync-well

Any agent

npx skills add ohong/agent-skills --skill sync-well

Clone the repo

git clone --depth 1 https://github.com/ohong/agent-skills

Made for: Claude Code, Codex.

Or install sync-well, the plugin that ships this one along with the rest of its 1 skill.

Wrote this? Show the measurements

A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.

README.md

[![agentmods](https://agentmods.dev/badge/skills/ohong/agent-skills/sync-well.svg)](https://agentmods.dev/skills/ohong/agent-skills/sync-well)

Your own site

<a href="https://agentmods.dev/skills/ohong/agent-skills/sync-well"><img src="https://agentmods.dev/badge/skills/ohong/agent-skills/sync-well.svg" alt="Measured on agentmods" height="20"></a>

Per session 85 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.

When invoked 749 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.

Model	Per session	Once invoked
Fable 5.1	$0.00085	$0.00749
Opus 5	$0.00043	$0.00375
Sonnet 5	$0.00017	$0.00150
Haiku 4.5	$0.00009	$0.00075

Measured 5d ago against content hash 255ab11b6027, method: parsed. Prices are Anthropic first-party input rates as of 2026-09-06, from the pricing page.

Security

Grade A, and why

sync-well 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 5d ago.

The scan reads SKILL.md. This mod also ships 1 executable file (scripts/inspect_sync.sh), listed below but not scanned — reading those needs a real analyzer, not pattern matching.

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.

sync-well/skills/sync-well/SKILL.md · 52 lines

How it starts

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

Sync Well

Preserve both committed and uncommitted work while establishing what Git can safely do. Treat inspection, network refresh, reconciliation, commit, and push as separate authorization boundaries.

Inspect

Run scripts/inspect_sync.sh [repository]. It is read-only and uses only current local refs.
If it reports an in-progress merge, rebase, cherry-pick, or revert, stop and use the merge-conflict workflow.
Confirm the intended branch and worktree. A branch checked out in another worktree must be handled there.
Show the user the branch/upstream, staged and unstaged state, untracked files, ahead/behind counts, merge base, and all reported path overlaps.

Refresh Remote State

Fetching changes remote-tracking refs, so keep it visible:

/usr/bin/git remote -v
/usr/bin/git fetch --prune <remote>
scripts/inspect_sync.sh .

Fetch only when network access is allowed. Derive <remote> from the configured upstream; do not assume origin. Never claim the comparison is current if fetch failed or was skipped.

Fast-forward only: Recommend /usr/bin/git merge --ff-only <upstream> when behind-only, on the intended worktree, and clean. Do not use a plain git pull, because configured pull behavior is ambiguous.
Merge: Recommend /usr/bin/git merge <upstream> when histories diverge, the tree is clean, and both histories must be preserved. Explain overlapping committed paths and the conflict risk. A normal merge may create a commit, so obtain explicit authorization first.
Stop for choice: Stop when the branch or upstream is unclear, histories are unrelated, the tree is dirty, another operation is active, the wrong worktree is open, or uncommitted work overlaps remote-only paths. Review the actual diffs before asking whether work should be kept.
Ahead only: Report that syncing needs no inbound reconciliation. Ask separately before pushing; do not infer publication permission.
Up to date: Report that no reconciliation is needed.

Read the full file on GitHub · 52 lines

Files

What ships with it

2 files beside SKILL.md in the same directory: the scripts, references and assets a skill reads on demand. Not counted in the per-session cost; read them before you install if any of them is executable.

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.

5d ago First seen · 52 lines · 85 tokens per session scan A 255ab11b6027

Subscribe to this mod's changes

sync-well is a skill published in the GitHub repository ohong/agent-skills (3 stars, last pushed 5d ago), licensed MIT. It adds 85 tokens to every session and 749 once invoked, about $0.0004 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.

Git and workflow

systematic-debugging

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

obra/superpowers · 21 tokens

local-ai-agents

Build local-first AI agents that run entirely on a developer workstation with Microsoft Foundry Local and Qwen function-calling models. Covers Small Language Models (SLMs), the OpenAI-compatible local endpoint, sandboxed local tools, local RAG with Chroma, local MCP servers, hybrid cloud/local routing, and the…

microsoft/ai-agents-for-beginners · 200 tokens

chronicle

Analyze Copilot session history for standup reports, usage tips, session search, and session reindexing. Use when the user asks for a standup, daily summary, usage tips, workflow recommendations, wants to search or find past sessions by keyword/file/PR, wants to reindex their session store, or asks about deleting…

microsoft/vscode · 72 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

next-cache-components-adoption

Turn on Cache Components in a Next.js app and resolve the blocking routes it surfaces. Use when the user wants to enable, adopt, or migrate to Cache Components, flip the cacheComponents flag, work through a flood of blocking-prerender / instant validation errors, run the cache-components-instant-false codemod, or…

vercel/next.js · 95 tokens