Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markijbema merged 1 commit into from
May 5, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/opencode/src/acp/session.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { RequestError, type McpServer } from "@agentclientprotocol/sdk"
import type { ACPSessionState } from "./types"
import type { KiloClient } from "@kilocode/sdk/v2"
import * as Log from "@opencode-ai/core/util/log"
import type { KiloClient } from "@kilocode/sdk/v2"

const log = Log.create({ service: "acp-session-manager" })

Expand Down
4 changes: 3 additions & 1 deletion packages/opencode/src/cli/cmd/tui/ui/dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,9 @@ export function DialogProvider(props: ParentProps) {
evt.preventDefault()
evt.stopPropagation()
}}
onMouseUp={!Flag.KILO_EXPERIMENTAL_DISABLE_COPY_ON_SELECT ? () => Selection.copy(renderer, toast) : undefined}
onMouseUp={
!Flag.KILO_EXPERIMENTAL_DISABLE_COPY_ON_SELECT ? () => Selection.copy(renderer, toast) : undefined
}
>
<Show when={value.stack.length}>
<Dialog onClose={() => value.clear()} size={value.size}>
Expand Down
4 changes: 2 additions & 2 deletions packages/opencode/src/mcp/oauth-provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ export class McpOAuthProvider implements OAuthClientProvider {
get clientMetadata(): OAuthClientMetadata {
return {
redirect_uris: [this.redirectUrl],
client_name: "Kilo", // kilocode_change
client_uri: "https://kilo.ai", // kilocode_change
client_name: "Kilo",

@kilo-code-bot kilo-code-bot Bot May 5, 2026

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.

@markijbema markijbema May 5, 2026

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

client_uri: "https://kilo.ai",
grant_types: ["authorization_code", "refresh_token"],
response_types: ["code"],
token_endpoint_auth_method: this.config.clientSecret ? "client_secret_post" : "none",
Expand Down
Loading