sync(v6): 移除旧全局 worktree 目录引用,对齐上游 v6.0.0#57
Merged
Conversation
上游 v6.0.0 废弃了 ~/.config/superpowers/worktrees/ 全局目录,worktree 统一落到项目内 .worktrees/。本提交同步该行为变更: - using-git-worktrees: 删除目录选择中的全局目录分支、安全验证豁免说明、 创建代码块里的全局路径分支及快速参考表行;目录优先级表述改为 「明确 instructions > 现有项目本地目录 > 默认」。顺带修复既有的步骤 编号缺口(0,1,3,4 → 0,1,2,3)并校正 3 处步骤交叉引用,使其与上游 v6.0.3 标题结构逐行对齐。 - finishing-a-development-branch: 两处 worktree 清理判定移除全局目录。 验证:scripts/audit.sh 78 PASS / 0 FAIL;与上游 v6.0.3 原文标题结构 对齐;两文件无 ~/.config/superpowers 残留。description 未改,skill 触发行为不变。 关联 #19(v6 同步追踪)
Owner
Author
|
ℹ️ 关于 CI:「全量审计」红是 既有问题,与本 PR 无关。
本 PR 只动两个 worktree SKILL.md(+11/-26)。brainstorm/hooks 的 v6 同步是另一块独立欠账,会单独提 PR。 |
This was referenced Jun 19, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
你要解决什么问题?
using-git-worktrees和finishing-a-development-branch两个 skill 仍在引用~/.config/superpowers/worktrees/这个全局 worktree 目录。上游 obra/superpowers 在 v6.0.0 已废弃该目录,worktree 统一落到项目内.worktrees/。本 fork 落后于此:agent 按现有中文 skill 行事时,仍会把这个上游已不再创建的路径当作合法的目录选择项和清理目标,造成与上游实际行为不一致的指引。此外
using-git-worktrees存在既有的步骤编号缺口(步骤 0,1,3,4,缺 2),阅读和交叉引用易混。本改动属于 issue #19(v6 同步追踪)范围内的 worktree 部分。
这个 PR 做了什么改变?
从两个 skill 中移除所有
~/.config/superpowers/worktrees/全局目录引用(目录选择分支、安全验证豁免说明、创建代码块、快速参考表行、优先级表述、清理判定);并把using-git-worktrees的步骤重新编号为连续的0,1,2,3、校正 3 处步骤交叉引用,使其与上游 v6.0.3 标题结构逐行对齐。这个改变适合放在核心库中吗?
适合。这是对所有用户通用的核心 worktree skill 的上游行为同步,与具体项目/领域/第三方工具无关,不引入任何依赖。
你考虑了哪些替代方案?
这个 PR 是否包含多个不相关的改变?
否。两文件的改动是同一件事——同步上游 v6.0.0 的「移除旧全局 worktree 目录」这一行为变更。步骤重编号是该文件对齐 v6.0.3 结构的附带必要项。
已有的 PR
GIT_DIR/GIT_COMMON检测,但保留了 v5.1.0 仍存在的全局目录;本 PR 是其 v6.0.0 续集,删除该目录。三个 open PR(feat: 新增 data-warehouse-modeling 数仓建模 skill #47/feat: 添加 Atlas Cloud 作为 AI 编程的 LLM API 后端 #46/feat: add non-blocking auto-update to OpenCode plugin #38)均不涉及 worktree。测试环境
评估
本改动是对上游已发布、已由上游 eval 验证的行为变更的忠实结构同步,非新增/重塑 agent 行为,因此未单独跑 writing-skills 对抗式 eval。验证手段:
scripts/audit.sh(仓库自带质量审计:frontmatter / 结构层级 / 交叉引用)→ 78 PASS / 0 FAIL~/.config/superpowers残留;所有"跳到步骤 N"引用均指向存在的步骤description字段未改 → skill 触发行为不变严格性
人工审核