From f083bc44aace9444250ca6e93ae4458f925d3db5 Mon Sep 17 00:00:00 2001 From: Mark IJbema Date: Tue, 5 May 2026 17:16:39 +0200 Subject: [PATCH] chore(upstream): drop stale kilocode_change markers + minor cosmetic drift MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- packages/opencode/src/acp/session.ts | 2 +- packages/opencode/src/cli/cmd/tui/ui/dialog.tsx | 4 +++- packages/opencode/src/mcp/oauth-provider.ts | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/opencode/src/acp/session.ts b/packages/opencode/src/acp/session.ts index 0551b170f07..a20397c597e 100644 --- a/packages/opencode/src/acp/session.ts +++ b/packages/opencode/src/acp/session.ts @@ -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" }) diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog.tsx index acbd5226d88..08740a1bf51 100644 --- a/packages/opencode/src/cli/cmd/tui/ui/dialog.tsx +++ b/packages/opencode/src/cli/cmd/tui/ui/dialog.tsx @@ -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 + } > value.clear()} size={value.size}> diff --git a/packages/opencode/src/mcp/oauth-provider.ts b/packages/opencode/src/mcp/oauth-provider.ts index 24abeea04ec..24282a3a742 100644 --- a/packages/opencode/src/mcp/oauth-provider.ts +++ b/packages/opencode/src/mcp/oauth-provider.ts @@ -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", + 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",