Skip to content

chore(upstream): drop stale kilocode_change markers + minor cosmetic drift#9927

Merged
markijbema merged 1 commit into
mainfrom
mark/reset-to-upstream-round1
May 5, 2026
Merged

chore(upstream): drop stale kilocode_change markers + minor cosmetic drift#9927
markijbema merged 1 commit into
mainfrom
mark/reset-to-upstream-round1

Conversation

@markijbema
Copy link
Copy Markdown
Contributor

Round-1 harvest from find-reset-candidates.ts across the whole repo. Started from 128 classifier suggestions, kept only the three where the reset is genuinely zero-impact — stale kilocode_change markers 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.).

…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.
@markijbema markijbema marked this pull request as ready for review May 5, 2026 15:22
@markijbema markijbema enabled auto-merge May 5, 2026 15:22
redirect_uris: [this.redirectUrl],
client_name: "Kilo", // kilocode_change
client_uri: "https://kilo.ai", // kilocode_change
client_name: "Kilo",
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wrong

@kilo-code-bot
Copy link
Copy Markdown
Contributor

kilo-code-bot Bot commented May 5, 2026

Code Review Summary

Status: 1 Issues Found | Recommendation: Address before merge

Overview

Severity Count
CRITICAL 0
WARNING 1
SUGGESTION 0
Issue Details (click to expand)

WARNING

File Line Issue
packages/opencode/src/mcp/oauth-provider.ts 47 Kilo-specific OAuth metadata branding in shared opencode code is no longer annotated with kilocode_change coverage.
Other Observations (not in diff)

Issues found in unchanged code that cannot receive inline comments:

File Line Issue
None
Files Reviewed (3 files)
  • packages/opencode/src/acp/session.ts - 0 issues
  • packages/opencode/src/cli/cmd/tui/ui/dialog.tsx - 0 issues
  • packages/opencode/src/mcp/oauth-provider.ts - 1 issue

Fix these issues in Kilo Cloud


Reviewed by gpt-5.5-20260423 · 186,856 tokens

@markijbema markijbema merged commit 91ee8ea into main May 5, 2026
17 of 18 checks passed
@markijbema markijbema deleted the mark/reset-to-upstream-round1 branch May 5, 2026 15:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants