chore(upstream): drop stale kilocode_change markers + minor cosmetic drift#9927
Merged
Conversation
…drift Result of running find-reset-candidates.ts across the repo and hand- reviewing each candidate. - mcp/oauth-provider.ts: kilocode_change markers were stale — the branding (Kilo, kilo.ai) already lives in the translate transforms, so the marker annotations no longer point at any Kilo-specific code. - acp/session.ts: matches upstream's import order. - tui/ui/dialog.tsx: matches upstream's prettier line-wrap on a long onMouseUp prop. No behavior change.
imanolmzd-svg
approved these changes
May 5, 2026
| redirect_uris: [this.redirectUrl], | ||
| client_name: "Kilo", // kilocode_change | ||
| client_uri: "https://kilo.ai", // kilocode_change | ||
| client_name: "Kilo", |
Contributor
There was a problem hiding this comment.
WARNING: Shared opencode branding change is no longer annotated
This file is in packages/opencode, so Kilo-specific changes still need kilocode_change coverage unless the path is exempt. Removing the marker from these OAuth metadata branding lines leaves the added lines unannotated and will be reported by the opencode annotation guard, as well as making this Kilo-specific delta harder to preserve during upstream merges.
Contributor
Code Review SummaryStatus: 1 Issues Found | Recommendation: Address before merge Overview
Issue Details (click to expand)WARNING
Other Observations (not in diff)Issues found in unchanged code that cannot receive inline comments:
Files Reviewed (3 files)
Fix these issues in Kilo Cloud Reviewed by gpt-5.5-20260423 · 186,856 tokens |
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.
Round-1 harvest from
find-reset-candidates.tsacross the whole repo. Started from 128 classifier suggestions, kept only the three where the reset is genuinely zero-impact — stalekilocode_changemarkers on branding the translate transforms already emit, and two cosmetic drifts that match upstream's formatting/import order.Every other candidate was reverted because it touched real behavior (branding strings, DB paths, Discord URLs, disabled workflows, agent name renames in tests, security-hardened containment checks, etc.).