f2s-kb-merge

f2s-kb-merge is a skill for Claude Code, Codex from double-coding-lab/Flow2Spec. It costs 56 tokens per session (1,720 once invoked), scanned A, original, MIT.

A workflow for resolving Git merge or rebase conflicts in an agent's rules, skills, indexes, and documentation. Git conflicts happen when changes from two branches overlap and cannot be combined automatically.

In plain words
What is it for?
Use it to scan conflict markers, compare both versions by file category, automatically merge suitable documentation conflicts, and list implementation conflicts with recommendations for review.
Why use it?
It keeps related agent instructions aligned while leaving implementation, deployment, and dependency conflicts for the developer to decide.

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/double-coding-lab/flow2spec/f2s-kb-merge
Any agent
npx skills add double-coding-lab/Flow2Spec --skill f2s-kb-merge
Clone the repo
git clone --depth 1 https://github.com/double-coding-lab/Flow2Spec

Made for: Claude Code, Codex.

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 f2s-kb-merge

README.md
[![agentmods](https://agentmods.dev/badge/skills/double-coding-lab/flow2spec/f2s-kb-merge.svg)](https://agentmods.dev/skills/double-coding-lab/flow2spec/f2s-kb-merge)
Your own site
<a href="https://agentmods.dev/skills/double-coding-lab/flow2spec/f2s-kb-merge"><img src="https://agentmods.dev/badge/skills/double-coding-lab/flow2spec/f2s-kb-merge.svg" alt="Measured on agentmods" height="20"></a>
Per session 56 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 1,720 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.00056 $0.01720
Opus 5 $0.00028 $0.00860
Sonnet 5 $0.00011 $0.00344
Haiku 4.5 $0.00006 $0.00172

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

Security

Grade A, and why

f2s-kb-merge 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 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.

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.

.claude/skills/f2s-kb-merge/SKILL.md · 81 lines

How it starts

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

编排(主 / 子 agent)

  • 两字段(subAgent / switchAgentVerification)语义以统一入口为唯一事实源:Cursor/Claude 读配置根 rules/f2s-flow2spec-unified-entry.*Codex.codex/topics/f2s-flow2spec-unified-entry.md(与上同源,flow2spec init 镜像)。本技能不复述。
  • 子 agent 职责(仅当 subAgent=true):只做冲突扫描 + 按类别对照表,每条包含五字段 —— file / category(文档索引 / 总览规则 / 模块规则 / 技能 / 说明文档 / 实现类 / 依赖元数据)/ ours_summary / theirs_summary / recommendation(并集 / 保留某侧 / 并入必须项 / 待用户选)。
  • 子 agent 不出成品合并稿,避免主 agent 二次重写。
  • 主 agent 职责:按策略落盘 + 实现类决策 + 验收。
  • 默认落盘侧自验,本技能不绑定交叉校验。

/合并上下文冲突(f2s-kb-merge)

rebase / merge 后出现 <<<<<<< / ======= / >>>>>>> 时,优先自动合并「AI 与开发者上下文」相关文件,保证索引、规则、技能与说明文档互相对齐;涉及可执行实现、部署或依赖声明的冲突不擅自合并,需向用户展示双方差异并等待确认后再改。

传参(可选)

  • 不传参:在工作区内自行检索仍存在冲突标记的文件,再按本技能分类与策略处理(含全量扫描后的摘要)。
  • 传参:用户可指定一个或多个仍含冲突的文件(随消息 @ 文件或列出路径均可)。助手优先只处理这些文件中的冲突;若其中含「禁止自动合并」类别,仍只罗列差异与建议,不擅自写入。指定文件处理完毕后,可询问用户是否需要对工作区做补充扫描

适用范围(可自动合并)

以下类别内的冲突,按本技能合并策略处理,无需逐行征求确认(除非两侧表述互斥且无法判断应以何为准):

类别 说明
文档索引 承载「文档 ↔ 规则 / 技能」映射的索引表文件
项目总览规则 规则目录中的总入口文件
模块规则 同套规则目录下的其余规则片段
技能 技能目录下的 SKILL 说明文件
上下文说明文档 与规则、技能配套的说明类 Markdown
索引联动的纯说明文档 由项目约定存放、仅被索引或规则引用、不含可执行实现语义的说明文档

禁止自动合并(须用户确认)

以下冲突不得在未获用户明确选择前合并:

  • 应用或服务实现源码(业务逻辑、接口实现、数据访问等)
  • 会改变对外暴露行为的配置(路由、函数注册、中间件链、运行入口等)
  • 依赖与构建元数据(依赖声明、锁文件、构建与部署脚本等)
  • 集中维护外部资源清单的实现模块:若两侧条目集合或注册内容不同,属运行行为差异,须用户确认保留范围(助手可建议「并集 + 去重」,待用户同意后再写入)

处理方式:列出冲突文件、简述两侧意图,给出推荐方案,请用户选定后再改上述范围中的文件。

合并策略(上下文类)

  1. 删除所有 Git 冲突标记(<<<<<<< / ======= / >>>>>>>),不得残留。
  2. 索引表
    • 同一索引行的 Rules / Skills / 链接列:做并集,路径去重、空格分隔。
    • 仅在一侧出现的独立索引行:合并后保留,避免丢失条目。
  3. 总览规则
    • 同一主题下多条 bullet:合并为信息完整的单条或并列多条不丢弃任一侧独有的约束或引用。
  4. 长文档中的表格
    • 描述不同维度能力的行:并集保留
    • 描述同一主题的重复行:合并为一条连贯表述,涵盖两侧要点。
  5. rules / skills
    • 优先保留更具体、约束更清晰的表述;另一侧独有的必须 / 禁止条款并入,避免规则回退。
  6. 链接与路径
    • 统一为仓库内可解析的相对路径,并与总览规则中的索引入口一致。

Read the full file on GitHub · 81 lines

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 · 81 lines · 56 tokens per session scan A 1bfa96edafb0

Subscribe to this mod's changes

f2s-kb-merge is a skill published in the GitHub repository double-coding-lab/Flow2Spec (47 stars, last pushed today), licensed MIT. It adds 56 tokens to every session and 1,720 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-30.

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

brainstorming

You MUST use this before any creative work - creating features, building components, adding functionality, or modifying behavior. Explores user intent, requirements and design before implementation.

obra/superpowers · 37 tokens

auto-perf-optimize

Run agent-driven VS Code performance or memory investigations. Use when asked to launch Code OSS, automate a VS Code scenario, run the Chat memory smoke runner, capture renderer heap snapshots, take workflow screenshots, compare run summaries, or drive a repeatable scenario before heap-snapshot analysis.

microsoft/vscode · 62 tokens

chat-perf

Run chat perf benchmarks and memory leak checks against the local dev build or any published VS Code version. Use when investigating chat rendering regressions, validating perf-sensitive changes to chat UI, or checking for memory leaks in the chat response pipeline.

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