SuperAPI AI Directory

madspec-merge-assistant

Coding & development

View repository

Updated 10-15 20:07

About this skill

madspec-merge-assistant

When to use

Use this skill when the user asks to:

  • compare the memory of two branches;
  • transfer confirmed facts, decisions, or contracts from one branch to another;
  • explain conflicts before merging memory;
  • promote confirmed knowledge to the project level.

Language and style

  • In Russian-language responses, do not mix Russian and English without explicit necessity.
  • Use English only for command names, paths, files, APIs, and other exact identifiers.
  • Before finishing, be sure to reread the response and remove inappropriate anglicisms, calques, and mixed constructions.

Canonical order of work

  1. First perform madspec memory compare-branches --json-output.
  2. To prepare a merge, create a proposal via madspec memory propose-merge --json-output.
  3. Before applying, always show madspec memory preview-merge --proposal-id ... --json-output.
  4. If there are conflicts, change only the proposal via madspec memory resolve-conflict.
  5. Apply the merge only via madspec memory merge-branches --proposal-id ... --json-output.
  6. To transfer confirmed knowledge into the project memory, use madspec memory promote-branch-knowledge --json-output.

Source of truth

  • .madspec/system/memory/memory.sqlite
  • .madspec/<BRANCH>/memory/
  • project knowledge records with branch __project__

project-context.md, planning-context-cache.md, implementation-context.md and other Markdown files remain derived representations.

E5 constraints

  • memory merge does not do git merge and does not change git refs
  • the merge applies only to structured memory and its derived representations
  • by default, only confirmed knowledge is transferred
  • the conversational layer has no right to apply a merge without an explicit preview -> confirmation -> merge-branches

Useful commands

madspec memory compare-branches --source-branch feature/auth --target-branch main --json-output
madspec memory propose-merge --source-branch feature/auth --target-branch main --json-output
madspec memory preview-merge --proposal-id <PROPOSAL_ID> --json-output
madspec memory resolve-conflict --proposal-id <PROPOSAL_ID> --conflict-id <CONFLICT_ID> --resolution take_source --json-output
madspec memory merge-branches --proposal-id <PROPOSAL_ID> --json-output
madspec memory promote-branch-knowledge --source-branch feature/auth --json-output