Repository navigation
fix: sync 解除 brief 硬依赖,基线取 --base-branch > brief > 当前分支 - #70
Merged
Merged
Conversation
This was referenced Oct 13, 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.
变更
lib/domains/sync.mjs:基线解析改为--base-branch>brief.baseBranch> 当前分支origin/<base>不可解析时以SYNC_UPSTREAM_NOT_FOUND响亮拒绝lib/commands.mjs:sync 两键的--name由必填降为可选,新增--base-branchsync plan的 nextStep 改为无 brief 形态sync execute --plan-hash {planHash} --confirmREADME.md:sync 行同步新调用形态与基线解析序影响
git merge --ff-onlysync plan+sync execute --plan-hash <hash> --confirm即可闭合--base-branch,原先由 brief 代答cli.mjsharness 与凭证模型零改动--name且 brief 在盘的旧调用形态行为不变;--name降为可选是放宽,旧写法不会失败验证
planHash 96c5f0a6…;execute 后head与远端 tip 逐字相等--base-branch release/9压过 brief 的baseBranch: mainDIRTY_WORKTREE;INV-6 未知 base →SYNC_UPSTREAM_NOT_FOUNDSYNC_NOT_FAST_FORWARDequal: truenode --test --test-name-pattern "sync (plan|fetches|blocks)"6/6 绿npm test本机约 270s,超 60s 阈值未在本机跑,由test.yml的 PR 触发补verifiedCommit漂移那一半不放宽,属设计内的门,归档前在 main 重跑 review关联