From da93ffd91dea133963ffceaff24d41bc76b8ff93 Mon Sep 17 00:00:00 2001 From: Craig Jennings Date: Thu, 11 Jun 2026 17:05:03 -0500 Subject: feat(commands): /update-skills syncs forks with upstream via 3-way merge Upstream releases fixes worth pulling into the forks (arch-decide, playwright-js, playwright-py) without losing our local modifications. Each fork now has a manifest at upstreams// plus a committed baseline snapshot that is the 3-way merge base. scripts/update-skills.py classifies each file's drift and merges to stdout. The command owns per-file confirmation, per-hunk conflict prompts, and every target write. I centralized manifests under upstreams/ instead of per-skill dotfile dirs because arch-decide is now two flat files in commands/ and can't carry one. A "files" map in its manifest handles the upstream rename of SKILL.md to arch-decide.md. I seeded baselines from today's upstream HEADs, so pre-existing local modifications classify as local-only from here on. git merge-file signals hard errors as exit 255, which subprocess reports as positive. The guard treats anything 128 and up as an error so a binary-file failure isn't misread as a conflict. --- upstreams/playwright-py/manifest.json | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 upstreams/playwright-py/manifest.json (limited to 'upstreams/playwright-py/manifest.json') diff --git a/upstreams/playwright-py/manifest.json b/upstreams/playwright-py/manifest.json new file mode 100644 index 0000000..4b1f98d --- /dev/null +++ b/upstreams/playwright-py/manifest.json @@ -0,0 +1,9 @@ +{ + "name": "playwright-py", + "url": "https://github.com/anthropics/skills", + "ref": "main", + "subpath": "skills/webapp-testing", + "target": "playwright-py", + "license": "Apache-2.0", + "last_synced_commit": "57546260929473d4e0d1c1bb75297be2fdfa1949" +} -- cgit v1.2.3