From 3703c9decb52ec6be289e3b72155353a63d751e5 Mon Sep 17 00:00:00 2001 From: gavrielc Date: Sun, 5 Apr 2026 00:28:14 +0300 Subject: [PATCH] feat: suggest /migrate-nanoclaw when user is far behind upstream Co-Authored-By: Claude Opus 4.6 (1M context) --- .claude/skills/update-nanoclaw/SKILL.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.claude/skills/update-nanoclaw/SKILL.md b/.claude/skills/update-nanoclaw/SKILL.md index 496d409..76bfcba 100644 --- a/.claude/skills/update-nanoclaw/SKILL.md +++ b/.claude/skills/update-nanoclaw/SKILL.md @@ -112,6 +112,8 @@ Bucket the upstream changed files: - **Build/config** (`package.json`, `package-lock.json`, `tsconfig*.json`, `container/`, `launchd/`): review needed - **Other**: docs, tests, misc +**Large drift check:** If the upstream commit count and age suggest the user has a lot of catching up to do, mention that `/migrate-nanoclaw` might be a better fit — it extracts customizations and reapplies them on clean upstream instead of merging. Offer it as an option but don't push. + 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