aida-resolve

aida-resolve is a skill for Claude Code, Codex from LWTlong/aida. It costs 51 tokens per session (464 once invoked), scanned A, original, MIT.

A guided process for resolving Git merge conflicts in AI-related project files. A merge conflict happens when Git cannot combine competing edits automatically.

In plain words
What is it for?
Use it to inspect conflicts in Claude, Cursor, or AIDA files, choose whether to merge or keep either version, and apply or undo the decision.
Why use it?
It explains the meaning of each side’s changes and waits for confirmation, reducing the risk of silently losing rules or configuration.

Skill for Claude CodeCodex

Part of the aida plugin — 13 skills, 1 command, 1 MCP server 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/lwtlong/aida/aida-resolve
Any agent
npx skills add LWTlong/aida --skill aida-resolve
Clone the repo
git clone --depth 1 https://github.com/LWTlong/aida

Made for: Claude Code, Codex.

Or install aida, the plugin that ships this one along with the rest of its 13 skills, 1 command, 1 MCP server.

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 aida-resolve

README.md
[![agentmods](https://agentmods.dev/badge/skills/lwtlong/aida/aida-resolve.svg)](https://agentmods.dev/skills/lwtlong/aida/aida-resolve)
Your own site
<a href="https://agentmods.dev/skills/lwtlong/aida/aida-resolve"><img src="https://agentmods.dev/badge/skills/lwtlong/aida/aida-resolve.svg" alt="Measured on agentmods" height="20"></a>
Per session 51 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 464 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.00051 $0.00464
Opus 5 $0.00026 $0.00232
Sonnet 5 $0.00010 $0.00093
Haiku 4.5 $0.00005 $0.00046

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

Security

Grade A, and why

aida-resolve 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.

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.

src/assets/skills/aida-resolve/SKILL.md · 57 lines

What it actually says

AIDA Resolve

Goal

解释关键冲突,让用户明白 ours vs theirs 各自的含义后再落盘。

Safety Rules

  • 绝不静默选边。
  • 每个冲突都要短说明。
  • 所有写操作走 aida_apply_governance(可用 aida_undo 回滚)。

Plan

  1. 扫描 .claude/, .cursor/, .aida/ 下带冲突标记(<<<<<<<=======>>>>>>>)的文件。
  2. 只详细读最重要的冲突。
  3. 对每个冲突决定:合并 / 保留 ours / 保留 theirs / 拆分。
  4. 输出方案清单。
  5. 调用 AskUserQuestion 请求确认
  6. 用户确认后调 aida_apply_governance 落盘(每个冲突文件一个 modify-file op)。

Response Style

  • 先说冲突严重度。
  • 数字进表格。
  • 至多 3 个优先冲突。
  • 每条解释短且面向决策。

Output Format

结论

一句话。

关键数据

指标 数量
冲突文件 ...
优先冲突 ...

优先冲突

至多 3 条:

  • 文件路径
  • ours / theirs 一句话对比
  • 建议方案

确认

调用 AskUserQuestion:

  • header: "解决冲突"
  • question: "确认后我会按建议方案落盘(可用 aida_undo 回滚)"
  • 选项:"按建议解决" / "只看分析"

下一步

如需回滚,运行 /aida-undo
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. 5d ago First seen · 57 lines · 51 tokens per session scan A 31f7e79cad9b

Subscribe to this mod's changes

aida-resolve is a skill published in the GitHub repository LWTlong/aida (8 stars, last pushed 1mo ago), licensed MIT. It adds 51 tokens to every session and 464 once invoked, about $0.0003 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

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

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

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

insight-error-page

Write or audit an insight-kind error page for the Next.js dev overlay. Use when creating a new errors/ .mdx page, auditing an existing one, or checking that a page matches the framework fix cards. Covers page structure, title alignment, FixCard cards with Copy prompt button, code snippets, terminology verification…

vercel/next.js · 83 tokens