upstream-sync

upstream-sync is a skill for Claude Code, Codex from microsoft/intelligent-terminal. It costs 139 tokens per session (2,969 once invoked), scanned A, original, MIT.

A workflow for bringing new commits from Microsoft's Terminal project into a manually maintained fork, one commit at a time.

In plain words
What is it for?
Use it to sync upstream changes, skip commits that cancel each other out, apply known file resolutions, and manage genuine conflicts.
Why use it?
It keeps the fork up to date while preserving commit details and stopping when a conflict needs a person's decision.

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/microsoft/intelligent-terminal/upstream-sync
Any agent
npx skills add microsoft/intelligent-terminal --skill upstream-sync
Clone the repo
git clone --depth 1 https://github.com/microsoft/intelligent-terminal

Made for: Claude Code, Codex.

Per session 139 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 2,969 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.00139 $0.02969
Opus 5 $0.00069 $0.01484
Sonnet 5 $0.00028 $0.00594
Haiku 4.5 $0.00014 $0.00297

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

Security

Grade A, and why

upstream-sync 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 3d ago.

The scan reads SKILL.md. This mod also ships 3 executable files (scripts/02-compute-pending.ps1, scripts/03-cherry-pick-one.ps1, scripts/04-try-build.ps1), 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.

.github/skills/upstream-sync/SKILL.md · 164 lines

How it starts

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

Upstream Sync (microsoft/terminal → intelligent-terminal)

Cherry-pick commit-by-commit from https://github.com/microsoft/terminal into this fork, preserving per-commit attribution, auto-skipping picks that cancel each other out, and stopping cleanly the moment a human-judgment conflict appears.

You — the agent reading this file — are the orchestrator. Each step in the run is a single atomic call into one of the scripts/*.ps1 files. There is intentionally no PowerShell driver, because every interesting decision (build-fix vs. open stuck issue, retry vs. bail, finalize vs. dry-run) wants LLM judgment the operator can audit in your transcript.

When to Use This Skill

  • User asks to "sync upstream", "pull from microsoft/terminal", "catch up to upstream", or "run upstream sync".
  • A scheduler invokes the agent on a weekly/daily cadence.
  • The previous run left an upstream-sync-stuck labeled issue open and the human has finished resolving the conflict — close the issue (that IS the lock-clear signal) and re-run.

When NOT to Use This Skill

  • User wants a one-shot rebase of a single feature branch onto upstream — that's a normal git rebase, not this skill.
  • An upstream-sync-stuck labeled issue is open on microsoft/intelligent-terminal — do not re-run; resolve the conflict on the stuck branch first, then close the issue.

Prerequisites

  • git 2.38+ (for cherry-pick --keep-redundant-commits), gh CLI authenticated against microsoft/intelligent-terminal (needs push to upstream-sync/* topic branches + issue/label create), PowerShell 7+ (pwsh) on PATH.
  • origin MUST point at microsoft/intelligent-terminal. All scripts push to origin and pass -R microsoft/intelligent-terminal explicitly. Verify with git remote -v before running.
  • Full git history on origin/main (no shallow clone). Watermark discovery walks up to 5000 commits scanning for cherry picked from commit <sha> trailers. In CI, use actions/checkout@v4 with fetch-depth: 0.
  • Windows build host with Visual Studio 2022, Windows SDK, vswhere, and tools\razzle.cmd / bz. Build is a hard gate before finalize.
  • No state.json to bootstrap. Watermark = newest (cherry picked from commit <sha>) trailer on origin/main. If the fork has never used cherry-pick -x, run the one-time First-time sync.

Read the full file on GitHub · 164 lines

Files

What ships with it

8 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.

  1. 3d ago First seen · 164 lines · 139 tokens per session scan A a17151f49602

Subscribe to this mod's changes

upstream-sync is a skill published in the GitHub repository microsoft/intelligent-terminal (1,908 stars, last pushed yesterday), licensed MIT. It adds 139 tokens to every session and 2,969 once invoked, about $0.0007 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-30.

Related

Other skills, from other repositories

configure-coddy

Change Coddy's own configuration when the user asks for it: edit settings, providers, models, logging, permissions, or find, install, update, and remove MCP servers and skills. Stages UCI-style commands and commits only after the user confirms saving. Load when the user explicitly asks to change a Coddy setting, or…

coddy-project/coddy-agent · 106 tokens

generate-rules

Scan the codebase and generate or refresh focused project rules under .coddy/rules/.

coddy-project/coddy-agent · 22 tokens

coddy_slash_demo

Examples-only slash skill (Coddy skillsfixture).

coddy-project/coddy-agent · 16 tokens

a2ui-renderer

Render A2UI (Agent-to-UI declarative surfaces) in CopilotKit v2. Enable the runtime via CopilotRuntime({ a2ui: {...} }), then enable the provider via . Auto-activates via /info — do NOT manually pass renderActivityMessages. createA2UIMessageRenderer ships from @copilotkit/react-core/v2; low-level primitives…

CopilotKit/CopilotKit · 175 tokens

copilotkit-develop

Use when building AI-powered features with CopilotKit v2 -- adding chat interfaces, registering frontend tools, sharing application context with agents, handling agent interrupts, and working with the CopilotKit runtime.

CopilotKit/CopilotKit · 46 tokens

copilotkit-upgrade

Use when migrating a CopilotKit v1 application to v2 -- updating package imports, replacing deprecated hooks and components, switching from GraphQL runtime to AG-UI protocol runtime, and resolving breaking API changes.

CopilotKit/CopilotKit · 48 tokens