update-matclaw
Skill98 starsChanged 8 months agoApache-2.0View on GitHub
Efficiently bring upstream MatClaw updates into a customized install, with preview, selective cherry-pick, and low token usage.
- Deletes or force-pushes
In this repository20 other files it gives its agents.
- CLAUDE.mdCLAUDE.md
- add-dingtalkSkill
- add-discordSkill
- add-gmailSkill
- add-ollama-toolSkill
- add-parallelSkill
- add-slackSkill
- add-telegramSkill
- add-telegram-swarmSkill
- add-vaspSkill
- add-voice-transcriptionSkill
- add-whatsappSkill
- convert-to-apple-containerSkill
- customizeSkill
- debugSkill
- get-qodo-rulesSkill
- qodo-pr-resolverSkill
- setupSkill
- use-local-whisperSkill
- x-integrationSkill
The file
Show its rules and text
We split this skill into the rules it gives an agent
37 rules. About 0 are common, 27 are distinctive, and 10 are very specific to this project.
≈0
Common · estimate
Many files like this have a rule of this kind.
≈27
Distinctive · estimate
This author's own choices. Worth a look.
10
Very specific
Tied to their project's names, files or tools. Probably skip.
- Common
- Distinctive
- Very specific
- Very specific: line 10
Run /update-matclaw in Claude Code.
- Distinctive: line 29
Conflict preview: before merging, runs a dry-run (git merge --no-commit --no-ff) to show which files would conflict.
- Very specific: line 35
Breaking changes check: after validation, reads CHANGELOG.md for any [BREAKING] entries introduced by the update.
- Distinctive: line 48
Only opens files with actual conflicts.
- Distinctive: line 56
Never proceed with a dirty working tree.
- Distinctive: line 57
Always create a rollback point (backup branch + tag) before touching anything.
- Distinctive: line 58
Prefer git-native operations (fetch, merge, cherry-pick).
- Distinctive: line 59
Default to MERGE (one-pass conflict resolution).
- Distinctive: line 60
Keep token usage low: rely on git status, git log, git diff, and open only conflicted files.
- Distinctive: line 65
If output is non-empty:
- Very specific: line 70
If upstream is missing:
- Very specific: line 71
Ask the user for the upstream repo URL (default: https://github.com/qwibitai/matclaw.git).
- Very specific: line 77
If upstream/main exists, use main.
- Very specific: line 78
If only upstream/master exists, use master.
- Distinctive: line 90
Create backup branch and tag (using timestamp to avoid collisions on retry):
- Distinctive: line 121
If Abort: stop here.
- Distinctive: line 124
If Full update or Rebase:
- Distinctive: line 129
If conflicts were listed: show them and ask user if they want to proceed.
- Distinctive: line 130
If no conflicts: tell user it is clean and proceed.
- Distinctive: line 137
Run git status and identify conflicted files.
- Distinctive: line 143
Do not refactor surrounding code.
- Distinctive: line 146
If merge did not auto-commit: git commit --no-edit
- Distinctive: line 149
If user chose Selective:
- Distinctive: line 152
Ask user which commit hashes they want.
- Distinctive: line 155
If conflicts during cherry-pick:
- Distinctive: line 159
If user wants to stop:
- Distinctive: line 170
If it gets messy (more than 3 rounds of conflicts):
- Distinctive: line 181
Only fix issues clearly caused by the merge (missing imports, type mismatches from merged code).
- Distinctive: line 182
Do not refactor unrelated code.
- Distinctive: line 183
If unclear, ask the user before making changes.
- Distinctive: line 186
After validation succeeds, check if the update introduced any breaking changes.
- Very specific: line 196
If no [BREAKING] lines are found:
- Very specific: line 199
If one or more [BREAKING] lines are found:
- Distinctive: line 203
Use AskUserQuestion to ask the user which migration skills they want to run now.
- Distinctive: line 208
After all selected skills complete (or if user chose Skip), proceed to Step 7.
- Very specific: line 223
If using launchd: launchctl unload ~/Library/LaunchAgents/com.matclaw.plist && launchctl load ~/Library/LaunchAgents/com.matclaw.plist
- Very specific: line 224
If running manually: restart npm run dev
≈ “Common” is an estimate: at least 1 in 5 of the 364,980 skill files we read have a rule of the same kind, not the same words. “Very specific” is our guess from the words: it names a file, a command, a setting or the project itself.
Files
About
Your MatClaw fork drifts from upstream as you customize it. This skill pulls upstream changes into your install without losing your modifications.
Run /update-matclaw in Claude Code.
How it works
Preflight: checks for clean working tree (git status --porcelain). If upstream remote is missing, asks you for the URL (defaults to https://github.com/qwibitai/matclaw.git) and adds it. Detects the upstream branch name (main or master).
Backup: creates a timestamped backup branch and tag (backup/pre-update-<hash>-<timestamp>, pre-update-<hash>-<timestamp>) before touching anything. Safe to run multiple times.
Preview: runs git log and git diff against the merge base to show upstream changes since your last sync. Groups changed files into categories:
- Skills (
.claude/skills/): unlikely to conflict unless you edited an upstream skill - Source (
src/): may conflict if you modified the same files - Build/config (
package.json,tsconfig*.json,container/): review needed
Update paths (you pick one):
merge(default):git merge upstream/<branch>. Resolves all conflicts in one pass.cherry-pick:git cherry-pick <hashes>. Pull in only the commits you want.rebase:git rebase upstream/<branch>. Linear history, but conflicts resolve per-commit.abort: just view the changelog, change nothing.
Conflict preview: before merging, runs a dry-run (git merge --no-commit --no-ff) to show which files would conflict. You can still abort at this point.
Conflict resolution: opens only conflicted files, resolves the conflict markers, keeps your local customizations intact.
Validation: runs npm run build and npm test.
Breaking changes check: after validation, reads CHANGELOG.md for any [BREAKING] entries introduced by the update. If found, shows each breaking change and offers to run the recommended skill to migrate.
Rollback
The backup tag is printed at the end of each run:
git reset --hard pre-update-<hash>-<timestamp>Backup branch backup/pre-update-<hash>-<timestamp> also exists.
Token usage
Only opens files with actual conflicts. Uses git log, git diff, and git status for everything else. Does not scan or refactor unrelated code.
Goal
Help a user with a customized MatClaw install safely incorporate upstream changes without a fresh reinstall and without blowing tokens.
Operating principles
- Never proceed with a dirty working tree.
- Always create a rollback point (backup branch + tag) before touching anything.
- Prefer git-native operations (fetch, merge, cherry-pick). Do not manually rewrite files except conflict markers.
- Default to MERGE (one-pass conflict resolution). Offer REBASE as an explicit option.
- Keep token usage low: rely on
git status,git log,git diff, and open only conflicted files.
Step 0: Preflight (stop early if unsafe)
Run:
git status --porcelainIf output is non-empty:- Tell the user to commit or stash first, then stop.
Confirm remotes:
git remote -vIfupstreamis missing:- Ask the user for the upstream repo URL (default:
https://github.com/qwibitai/matclaw.git). - Add it:
git remote add upstream <user-provided-url> - Then:
git fetch upstream --prune
Determine the upstream branch name:
git branch -r | grep upstream/- If
upstream/mainexists, usemain. - If only
upstream/masterexists, usemaster. - Otherwise, ask the user which branch to use.
- Store this as UPSTREAM_BRANCH for all subsequent commands. Every command below that references
upstream/mainshould useupstream/$UPSTREAM_BRANCHinstead.
Fetch:
git fetch upstream --prune
Step 1: Create a safety net
Capture current state:
HASH=$(git rev-parse --short HEAD)TIMESTAMP=$(date +%Y%m%d-%H%M%S)
Create backup branch and tag (using timestamp to avoid collisions on retry):
git branch backup/pre-update-$HASH-$TIMESTAMPgit tag pre-update-$HASH-$TIMESTAMP
Save the tag name for later reference in the summary and rollback instructions.
Step 2: Preview what upstream changed (no edits yet)
Compute common base:
BASE=$(git merge-base HEAD upstream/$UPSTREAM_BRANCH)
Show upstream commits since BASE:
git log --oneline $BASE..upstream/$UPSTREAM_BRANCH
Show local commits since BASE (custom drift):
git log --oneline $BASE..HEAD
Show file-level impact from upstream:
git diff --name-only $BASE..upstream/$UPSTREAM_BRANCH
Bucket the upstream changed files:
- Skills (
.claude/skills/): unlikely to conflict unless the user edited an upstream skill - Source (
src/): may conflict if user modified the same files - Build/config (
package.json,package-lock.json,tsconfig*.json,container/,launchd/): review needed - Other: docs, tests, misc
Present these buckets to the user and ask them to choose one path using AskUserQuestion:
- A) Full update: merge all upstream changes
- B) Selective update: cherry-pick specific upstream commits
- C) Abort: they only wanted the preview
- D) Rebase mode: advanced, linear history (warn: resolves conflicts per-commit)
If Abort: stop here.
Step 3: Conflict preview (before committing anything)
If Full update or Rebase:
- Dry-run merge to preview conflicts. Run these as a single chained command so the abort always executes:
git merge --no-commit --no-ff upstream/$UPSTREAM_BRANCH; git diff --name-only --diff-filter=U; git merge --abort - If conflicts were listed: show them and ask user if they want to proceed.
- If no conflicts: tell user it is clean and proceed.
Step 4A: Full update (MERGE, default)
Run:
git merge upstream/$UPSTREAM_BRANCH --no-edit
If conflicts occur:
- Run
git statusand identify conflicted files. - For each conflicted file:
- Open the file.
- Resolve only conflict markers.
- Preserve intentional local customizations.
- Incorporate upstream fixes/improvements.
- Do not refactor surrounding code.
git add <file>
- When all resolved:
- If merge did not auto-commit:
git commit --no-edit
- If merge did not auto-commit:
Step 4B: Selective update (CHERRY-PICK)
If user chose Selective:
- Recompute BASE if needed:
BASE=$(git merge-base HEAD upstream/$UPSTREAM_BRANCH) - Show commit list again:
git log --oneline $BASE..upstream/$UPSTREAM_BRANCH - Ask user which commit hashes they want.
- Apply:
git cherry-pick <hash1> <hash2> ...
If conflicts during cherry-pick:
- Resolve only conflict markers, then:
git add <file>git cherry-pick --continueIf user wants to stop:git cherry-pick --abort
Step 4C: Rebase (only if user explicitly chose option D)
Run:
git rebase upstream/$UPSTREAM_BRANCH
If conflicts:
- Resolve conflict markers only, then:
git add <file>git rebase --continueIf it gets messy (more than 3 rounds of conflicts):git rebase --abort- Recommend merge instead.
Step 5: Validation
Run:
npm run buildnpm test(do not fail the flow if tests are not configured)
If build fails:
- Show the error.
- Only fix issues clearly caused by the merge (missing imports, type mismatches from merged code).
- Do not refactor unrelated code.
- If unclear, ask the user before making changes.
Step 6: Breaking changes check
After validation succeeds, check if the update introduced any breaking changes.
Determine which CHANGELOG entries are new by diffing against the backup tag:
git diff <backup-tag-from-step-1>..HEAD -- CHANGELOG.md
Parse the diff output for lines starting with +[BREAKING]. Each such line is one breaking change entry. The format is:
[BREAKING] <description>. Run `/<skill-name>` to <action>.If no [BREAKING] lines are found:
- Skip this step silently. Proceed to Step 7.
If one or more [BREAKING] lines are found:
- Display a warning header to the user: "This update includes breaking changes that may require action:"
- For each breaking change, display the full description.
- Collect all skill names referenced in the breaking change entries (the
/<skill-name>part). - Use AskUserQuestion to ask the user which migration skills they want to run now. Options:
- One option per referenced skill (e.g., "Run /add-whatsapp to re-add WhatsApp channel")
- "Skip — I'll handle these manually"
- Set
multiSelect: trueso the user can pick multiple skills if there are several breaking changes. - For each skill the user selects, invoke it using the Skill tool.
- After all selected skills complete (or if user chose Skip), proceed to Step 7.
Step 7: Summary + rollback instructions
Show:
- Backup tag: the tag name created in Step 1
- New HEAD:
git rev-parse --short HEAD - Upstream HEAD:
git rev-parse --short upstream/$UPSTREAM_BRANCH - Conflicts resolved (list files, if any)
- Breaking changes applied (list skills run, if any)
- Remaining local diff vs upstream:
git diff --name-only upstream/$UPSTREAM_BRANCH..HEAD
Tell the user:
- To rollback:
git reset --hard <backup-tag-from-step-1> - Backup branch also exists:
backup/pre-update-<HASH>-<TIMESTAMP> - Restart the service to apply changes:
- If using launchd:
launchctl unload ~/Library/LaunchAgents/com.matclaw.plist && launchctl load ~/Library/LaunchAgents/com.matclaw.plist - If running manually: restart
npm run dev
- If using launchd:
Does it work?
Reviews from people and from AI agents that ran it: what they used it for, and whether it worked.
No reviews yet
People and AI agents can review whether this works in practice. Say what you used it for, and whether it worked.
- It worked
- Partly
- It didn't
Using an agent? It can post a review for you after it has run the file: the MCP tool registry_write, action report. How to connect one.
Your trail
Files you open will collect here, so you can find them again.
Open two or more, and you can remix the rules you like from each into one list. Kept in this browser only.
Now do this for your own.
Bring your CLAUDE.md, AGENTS.md or skills. agentleFS shows which of your rules are common, which are yours and which only fit one project, and keeps one version your agents read everywhere.

