refactor(docs): update multiple files - #24
Merged
Merged
Conversation
HelloWorldU
commented
May 28, 2026
HelloWorldU
left a comment
HelloWorldU
left a comment
Owner
Author
There was a problem hiding this comment.
[自审] 自动审阅通过（LGTM）
注：GitHub 不允许 PR 作者 approve 自己的 PR，此评论仅作为审阅记录。
HelloWorldU
added a commit
that referenced
this pull request
May 28, 2026
…nMerge 排除 failed 紧跟 PR #24 (Bug #8 初版实施) 的两个潜在问题修复，外加两个附带修复： 修问题 1：conflict prefix inline 注入污染 UI - 原版 syncBranchWithMain 把 conflict 文件内容 + 解决 prompt 拼到 instruction 前面返回，sendInstruction 末尾 log('input', ...) 把整段当用户消息显示， 污染「任务指令」区 + 聊天面板出现巨大「用户气泡」装冲突文件。 - 改成 syncBranchWithMain 内部独立调 runInstructionSilent 让 kimi 静默 解决冲突 → engine sanity check + commit → 然后 sendInstruction 才用 原 instruction 跑用户任务。UI 上只看到 system log「冲突自动解决中 / 已解决 / 失败」，干净。 - finalizeMergeCommit 改为接收参数的纯函数（不再用 pendingMergeCommit / conflictFiles / conflictFileOriginals 实例字段），删掉这些字段。 - 删 sendInstruction 末尾「kimi 退出后异步触发 finalize」机制，整个 sync 流程在 syncBranchWithMain 内同步完成。 修问题 2：触发条件改为不依赖 prStatus - 原版 if (prStatus === 'merged') 触发，用户在 GitHub web 手动 merge 时 prStatus 永远不变 merged → 后续 sendInstruction 不触发 sync → base 漂移问题没解决。 - 改成每次 sendInstruction 入口都触发 syncBranchWithMain，内部 5 分钟 throttle（lastSyncCheckAt 字段）防止每条用户消息都 fetch。 附带修复： - runInstructionSilent 默认 idle 120s → 600s。kimi 不是逐 token 流式 输出，是「长 think → 一批 tool call → 一段 text」分批，60-180s 间隙 正常；之前 runReview / fix loop 经常误判卡死，PR #23 之后看到的 「kimi 卡死/超时」3 次重试很多就是这个误判。 - generateCommitAndPrBody 调用 60s → 300s（大 diff 时 commit message 生成也可能 60+s）。 - canMerge 自审 + fallback 分支过滤 status === 'failed' 的 reviewer， 改成 activeReviews.every(approved)。reviewer 自动审阅 3 次跑不起来标 failed ≠ 内容被拒，不该阻塞合并。之前 PR #24 截图 1/2 通过但被 failed reviewer 卡住合并就是这个 bug。 backlog #8 同步：标 ✅ 已实施 + 列出本轮修复细节。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
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
1 participant
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.
变更内容
SKILL.md文档SKILL.md文档backlog.md文档agent.ts逻辑git.ts逻辑类型
检查项