refactor(cli): inline override predicates in tool registry#9900
Open
kilo-code-bot[bot] wants to merge 4 commits intomainfrom
Open
refactor(cli): inline override predicates in tool registry#9900kilo-code-bot[bot] wants to merge 4 commits intomainfrom
kilo-code-bot[bot] wants to merge 4 commits intomainfrom
Conversation
Inline question/plan/e2e gating expressions at call sites in the shared tool registry instead of routing them through KiloToolRegistry. These are overrides of upstream tool gating — hiding them behind extracted predicates accepts upstream textual merges cleanly but silently drops Kilo's intent when upstream restructures the gating. Inlining forces a textual conflict when upstream touches the same logic, which is the review step we want. Additive extractions (build/infos/extra) stay in KiloToolRegistry — those don't have an upstream peer to conflict with. Also tighten the kilocode_change markers around the Effect.all and return blocks to per-line markers so unrelated upstream edits don't land inside Kilo-owned scope.
Contributor
Author
Code Review SummaryStatus: No Issues Found | Recommendation: Merge Files Reviewed (1 file)
Reviewed by gpt-5.5-20260423 · 233,316 tokens |
Move the Kilo question-tool boolean adjacent to `const cfg = yield* config.get()` matching upstream's placement (commit 9d3c81a, right after `const config = await Config.get()`). When upstream's version eventually merges in, the two lines land next to each other and produce a localized textual conflict — instead of silently coexisting as dead upstream code plus our divergent gating. Rename `const question = yield* QuestionTool` to `questiontool` (matching our existing `lsptool`/`suggesttool` pattern) so the `question` identifier is free for the boolean, aligning exactly with upstream's naming.
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.
Summary
question(),plan(), ande2e()gating inpackages/opencode/src/tool/registry.tsinstead of calling them throughKiloToolRegistry. These are overrides of upstream tool gating; extracting them was quiet on textual merges but would silently discard Kilo's intent if upstream restructured the gating. Inlining forces a textual conflict at the exact site upstream is editing.build/infos/extra) stay inKiloToolRegistry— they have no upstream peer to conflict with.kilocode_change start/endblocks aroundEffect.alland thereturnto per-line markers so unrelated upstream edits don't land inside Kilo-owned scope.