resolve

resolve is a skill for Claude Code, Codex from Borda/AI-Rig. It costs 272 tokens per session (17,496 once invoked), scanned C, original, Apache-2.0.

A workflow for finishing GitHub pull requests, which are proposed code changes awaiting review. It reads the discussion, resolves merge conflicts, and applies requested changes.

In plain words
What is it for?
It helps maintainers review pull-request discussions, merge the base branch, resolve conflicts, implement review comments, and push a merge-ready branch to a contributor’s fork.
Why use it?
It gathers scattered review feedback into clear action items and keeps each fix easy to inspect or undo. It also preserves contributor intent when combining the main branch with the pull request.

Skill for Claude CodeCodex

Installs and runs on its own, but its text points at files inside its plugin — anything it tells you to read at a ${CLAUDE_PLUGIN_ROOT} path is only there once the plugin is installed. Installing the plugin gets both.

Part of the oss plugin — 3 skills, 4 agents shipped together

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/borda/ai-rig/resolve
Any agent
npx skills add Borda/AI-Rig --skill resolve
Clone the repo
git clone --depth 1 https://github.com/Borda/AI-Rig

Made for: Claude Code, Codex.

Or install oss, the plugin that ships this one along with the rest of its 3 skills, 4 agents.

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.

agentmods badge for resolve

README.md
[![agentmods](https://agentmods.dev/badge/skills/borda/ai-rig/resolve.svg)](https://agentmods.dev/skills/borda/ai-rig/resolve)
Your own site
<a href="https://agentmods.dev/skills/borda/ai-rig/resolve"><img src="https://agentmods.dev/badge/skills/borda/ai-rig/resolve.svg" alt="Measured on agentmods" height="20"></a>
Per session 272 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 17,496 The whole file, excluding the scripts and references it only reads on demand.
Security scan C 1 finding. 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.00272 $0.17496
Opus 5 $0.00136 $0.08748
Sonnet 5 $0.00054 $0.03499
Haiku 4.5 $0.00027 $0.01750

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

Security

Grade C, and why

resolve scanned grade C with 1 finding 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 4d 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.

Hidden instructionshighPrompt injection

Directives inside HTML comments, invisible characters or bidirectional overrides are read by the model and not by the person reviewing the file.

<!-- branch: main-path — post-pr (call 4 of 4 normal / 5 of 5 with codex-cap) -->
plugins/cc_oss/skills/resolve/SKILL.md · 884 lines

How it starts

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

OSS maintainer fast-close workflow. PR number → three phases fire automatically:

  1. PR intelligence — synthesize motivation from PR body, linked issues, thread; classify comments into action items
  2. Conflict resolution — checkout PR branch (fork-aware), merge BASE_REF, resolve conflicts with contributor intent as priority lens
  3. Action item implementation — implement each item as separate commit attributed to review comment, push to contributor's fork

Result: conflict-free PR branch pushed to fork, ready to merge — no GitHub UI.

Core invariant — transparent, reversible: every action = visible named git object. Use git merge (new commit, two parents), never git rebase (rewrites SHA, kills revert/cherry-pick). Each action item = own commit — granular revert always possible.

Bare comment text → skip to Codex dispatch (Step 12).

  • $ARGUMENTS: one of:
    • Omitted → review-handoff mode: auto-detect PR from most recent .reports/review/*/review-report.md (oss lineage) or .reports/codex/review/*/review-notes.md (codex lineage, detected but not parsed — see Step 0 lineage guard)
    • PR number (e.g. 42 or #42) or GitHub PR URL → pr mode
    • report (bare word) → report mode: latest review findings as action items; no GitHub re-fetch
    • 42 report or <URL> reportpr + report mode: aggregate live GitHub comments + review report, deduplicated in one pass
    • Bare review comment text → comment dispatch mode (jumps to Step 12)
  • --no-challenge: optional — skip challenge gate per item; all selected items treated as VALID
  • --no-codemap: optional — disable codemap structural context (on by default when codemap installed + index present)
  • --codemap: optional — strict mode: stop and report if codemap not installed or index missing
  • --agent <name>: optional — use <name> agent for implementation instead of Codex; must be an implementation agent; bare name auto-prefixed with foundry: if no plugin prefix detected (e.g. --agent sw-engineerfoundry:sw-engineer; --agent linting-expertfoundry:linting-expert; --agent doc-scribefoundry:doc-scribe); explicit prefix also accepted (--agent foundry:sw-engineer); see routing table in action-item-dispatch.md. --agent also applies to INTEL_AGENT (Step 3b thread intelligence) — explicit --agent overrides label/title routing for the thread-intelligence subagent as well, so a docs-focused PR routed via --agent foundry:doc-scribe uses doc-scribe for both classification and implementation.

NOT-for additions (scope guards):

  • NOT for non-Python source PRs (TypeScript, Go, Rust, Java) unless action items are limited to documentation or CI/CD changes — Step 9's lint-qa gate runs Python-specific tools (ruff/mypy); non-Python PRs will receive partial or no static-analysis review. For non-Python repos, run /oss:resolve in report mode with manually-curated findings.
  • NOT for branches with uncommitted local edits — the report-mode no-PR# path operates on the current branch as-is; uncommitted changes will be committed alongside the action items. Stash (git stash) or commit local edits before invoking; the workflow does not auto-stash.

loads: compaction-contract.md

  • Key boundary: end of Step 8 — per-item implementation loop complete, before Step 9 lint gate. Contract overwrites on each iteration (latest state wins).
  • Second boundary: start of Step 11 — before final report write, after push.
  • Preserve at boundary 1: PR#, implemented/remaining item state.
  • Preserve at boundary 2: final report path, PR#.

Read the full file on GitHub · 884 lines

Files

What ships with it

7 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. 4d ago First seen · 884 lines · 272 tokens per session scan C 935aba382c55

Subscribe to this mod's changes

resolve is a skill published in the GitHub repository Borda/AI-Rig (25 stars, last pushed today), licensed Apache-2.0. It adds 272 tokens to every session and 17,496 once invoked, about $0.0014 per session on Opus 5. A static security scan graded it C with 1 finding (hidden instructions). 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

ao-desktop-dev

Launch, restart, or troubleshoot the real AO Electron desktop app from this repository; run a checkout against isolated or real local AO data; combine PR branches for local UI review; and diagnose stale Electron processes, port conflicts, or preload bridge mismatches. Use whenever asked to run, open, show, or visually…

Untrivial-ai/agent-orchestrator · 88 tokens

intuitive-port-worktree

Port changes from one git worktree or checkout into the default repository folder's current branch, then by default sync the result to the remote default branch when everything is clean. Use when the user asks to move, copy, transfer, transplant, cherry-pick, apply a patch, or port worktree changes into the…

MiaoDX/intuitive-flow · 79 tokens

testing-mcp-with-cli-agents

Test an MCP server by driving real CLI agents (Claude, Codex, Cursor, Gemini, Grok, agy, opencode) against it, using isolated tmux sockets and send-keys instead of trusting unit tests alone. Use this whenever verifying MCP-server behavior end-to-end, checking that a local branch or checkout works across installed…

tmux-python/libtmux-mcp · 181 tokens

store-submission-checklist

Use when preparing a game for Steam, console, mobile, or other storefront submission with platform metadata, compliance, ratings, privacy, package, entitlement, and approval requirements.

hoatv2211/GameStudio-CodexKIT · 40 tokens

platform-device-compatibility-matrix

Use when a game needs a platform and device compatibility matrix across OS, hardware, GPU, memory, resolution, input, network, storefront, certification, test evidence, and support policy; not for store metadata preparation.

hoatv2211/GameStudio-CodexKIT · 51 tokens

vinyl-dig

Use when asked to run a vinyl-shop dig — crawl a set of local record shops' online catalogs in parallel, benchmark prices against Discogs, and produce a tiered buy list. Originated for Johnny's Chicago digs; portable to any city/shop-list as long as the calling project provides the companion files below.

jdpalumbo2/workbench · 68 tokens