@oh-my-pi/pi-ai 14.0.4 → 14.0.5

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 ## [Unreleased]
 
+## [14.0.5] - 2026-04-11
+
+### Changed
+- Replaced GitHub Copilot authentication from VSCode extension impersonation to the opencode OAuth flow, eliminating TOS concerns. Existing users will need to re-authenticate once with `/login github-copilot`.
+- Simplified Copilot token handling: GitHub OAuth token is used directly for all API requests (no JWT exchange or refresh cycle).
+- Changed GitHub Copilot API base URL from `api.individual.githubcopilot.com` to `api.githubcopilot.com`.
+- Updated default OpenAI stream idle timeout to 120,000 milliseconds to keep stream generation alive longer
+
+### Fixed
+
+- Fixed duplicate synthetic tool results being generated when a real tool result appears later in message history
+- Fixed GitHub Copilot `/models` discovery to unwrap structured OAuth credentials before sending the bearer token, preserving dynamic catalog refresh for OAuth-backed callers.
+
+### Removed
+- Removed Copilot JWT proxy-ep base URL resolution (no longer needed with opencode auth).
 ## [14.0.3] - 2026-04-09
 
 ### Fixed
@@ -1994,4 +2009,4 @@ _Dedicated to Peter's shoulder ([@steipete](https://twitter.com/steipete))_
 
 ## [0.9.4] - 2025-11-26
 
-Initial release with multi-provider LLM support.
+Initial release with multi-provider LLM support.

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-ai",
-	"version": "14.0.4",
+	"version": "14.0.5",
 	"description": "Unified LLM API with automatic model discovery and provider configuration",
 	"homepage": "https://github.com/can1357/oh-my-pi",
 	"author": "Can Boluk",
@@ -45,7 +45,7 @@
 		"@aws-sdk/client-bedrock-runtime": "^3",
 		"@bufbuild/protobuf": "^2.11",
 		"@google/genai": "^1.43",
-		"@oh-my-pi/pi-utils": "14.0.4",
+		"@oh-my-pi/pi-utils": "14.0.5",
 		"@sinclair/typebox": "^0.34",
 		"@smithy/node-http-handler": "^4.4",
 		"ajv": "^8.18",

package/src/auth-storage.ts

@@ -1882,8 +1882,8 @@ export class AuthStorage {
 	/**
 	 * Peek at API key for a provider without refreshing OAuth tokens.
 	 * Used for model discovery where we only need to know if credentials exist
-	 * and get a best-effort token. The actual refresh happens lazily when the
-	 * provider is used for an API call.
+	 * and get a best-effort token. For GitHub Copilot we preserve enterprise
+	 * routing metadata so discovery can hit the correct host.
 	 */
 	async peekApiKey(provider: string): Promise<string | undefined> {
 		const runtimeKey = this.#runtimeOverrides.get(provider);
@@ -1901,6 +1901,12 @@ export class AuthStorage {
 		if (oauthSelection) {
 			const expiresAt = oauthSelection.credential.expires;
 			if (Number.isFinite(expiresAt) && expiresAt > Date.now()) {
+				if (provider === "github-copilot") {
+					return JSON.stringify({
+						token: oauthSelection.credential.access,
+						enterpriseUrl: oauthSelection.credential.enterpriseUrl,
+					});
+				}
 				return oauthSelection.credential.access;
 			}
 		}

package/src/models.json

@@ -4582,7 +4582,7 @@
 			"name": "Claude Haiku 4.5",
 			"api": "anthropic-messages",
 			"provider": "github-copilot",
-			"baseUrl": "https://api.individual.githubcopilot.com",
+			"baseUrl": "https://api.githubcopilot.com",
 			"reasoning": true,
 			"input": [
 				"text",
@@ -4597,10 +4597,7 @@
 			"contextWindow": 144000,
 			"maxTokens": 32000,
 			"headers": {
-				"User-Agent": "GitHubCopilotChat/0.35.0",
-				"Editor-Version": "vscode/1.107.0",
-				"Editor-Plugin-Version": "copilot-chat/0.35.0",
-				"Copilot-Integration-Id": "vscode-chat"
+				"User-Agent": "opencode/1.3.15"
 			},
 			"premiumMultiplier": 0.33,
 			"thinking": {
@@ -4614,7 +4611,7 @@
 			"name": "Claude Opus 4.5",
 			"api": "anthropic-messages",
 			"provider": "github-copilot",
-			"baseUrl": "https://api.individual.githubcopilot.com",
+			"baseUrl": "https://api.githubcopilot.com",
 			"reasoning": true,
 			"input": [
 				"text",
@@ -4629,10 +4626,7 @@
 			"contextWindow": 160000,
 			"maxTokens": 32000,
 			"headers": {
-				"User-Agent": "GitHubCopilotChat/0.35.0",
-				"Editor-Version": "vscode/1.107.0",
-				"Editor-Plugin-Version": "copilot-chat/0.35.0",
-				"Copilot-Integration-Id": "vscode-chat"
+				"User-Agent": "opencode/1.3.15"
 			},
 			"thinking": {
 				"mode": "anthropic-budget-effort",
@@ -4645,7 +4639,7 @@
 			"name": "Claude Opus 4.6",
 			"api": "anthropic-messages",
 			"provider": "github-copilot",
-			"baseUrl": "https://api.individual.githubcopilot.com",
+			"baseUrl": "https://api.githubcopilot.com",
 			"reasoning": true,
 			"input": [
 				"text",
@@ -4660,10 +4654,7 @@
 			"contextWindow": 1000000,
 			"maxTokens": 64000,
 			"headers": {
-				"User-Agent": "GitHubCopilotChat/0.35.0",
-				"Editor-Version": "vscode/1.107.0",
-				"Editor-Plugin-Version": "copilot-chat/0.35.0",
-				"Copilot-Integration-Id": "vscode-chat"
+				"User-Agent": "opencode/1.3.15"
 			},
 			"premiumMultiplier": 3,
 			"thinking": {
@@ -4677,7 +4668,7 @@
 			"name": "Claude Sonnet 4",
 			"api": "anthropic-messages",
 			"provider": "github-copilot",
-			"baseUrl": "https://api.individual.githubcopilot.com",
+			"baseUrl": "https://api.githubcopilot.com",
 			"reasoning": true,
 			"input": [
 				"text",
@@ -4692,10 +4683,7 @@
 			"contextWindow": 216000,
 			"maxTokens": 16000,
 			"headers": {
-				"User-Agent": "GitHubCopilotChat/0.35.0",
-				"Editor-Version": "vscode/1.107.0",
-				"Editor-Plugin-Version": "copilot-chat/0.35.0",
-				"Copilot-Integration-Id": "vscode-chat"
+				"User-Agent": "opencode/1.3.15"
 			},
 			"thinking": {
 				"mode": "budget",
@@ -4708,7 +4696,7 @@
 			"name": "Claude Sonnet 4.5",
 			"api": "anthropic-messages",
 			"provider": "github-copilot",
-			"baseUrl": "https://api.individual.githubcopilot.com",
+			"baseUrl": "https://api.githubcopilot.com",
 			"reasoning": true,
 			"input": [
 				"text",
@@ -4723,10 +4711,7 @@
 			"contextWindow": 144000,
 			"maxTokens": 32000,
 			"headers": {
-				"User-Agent": "GitHubCopilotChat/0.35.0",
-				"Editor-Version": "vscode/1.107.0",
-				"Editor-Plugin-Version": "copilot-chat/0.35.0",
-				"Copilot-Integration-Id": "vscode-chat"
+				"User-Agent": "opencode/1.3.15"
 			},
 			"thinking": {
 				"mode": "anthropic-budget-effort",
@@ -4739,7 +4724,7 @@
 			"name": "Claude Sonnet 4.6",
 			"api": "anthropic-messages",
 			"provider": "github-copilot",
-			"baseUrl": "https://api.individual.githubcopilot.com",
+			"baseUrl": "https://api.githubcopilot.com",
 			"reasoning": true,
 			"input": [
 				"text",
@@ -4754,10 +4739,7 @@
 			"contextWindow": 200000,
 			"maxTokens": 32000,
 			"headers": {
-				"User-Agent": "GitHubCopilotChat/0.35.0",
-				"Editor-Version": "vscode/1.107.0",
-				"Editor-Plugin-Version": "copilot-chat/0.35.0",
-				"Copilot-Integration-Id": "vscode-chat"
+				"User-Agent": "opencode/1.3.15"
 			},
 			"thinking": {
 				"mode": "anthropic-adaptive",
@@ -4770,7 +4752,7 @@
 			"name": "Gemini 2.5 Pro",
 			"api": "openai-completions",
 			"provider": "github-copilot",
-			"baseUrl": "https://api.individual.githubcopilot.com",
+			"baseUrl": "https://api.githubcopilot.com",
 			"reasoning": false,
 			"input": [
 				"text",
@@ -4785,10 +4767,7 @@
 			"contextWindow": 128000,
 			"maxTokens": 64000,
 			"headers": {
-				"User-Agent": "GitHubCopilotChat/0.35.0",
-				"Editor-Version": "vscode/1.107.0",
-				"Editor-Plugin-Version": "copilot-chat/0.35.0",
-				"Copilot-Integration-Id": "vscode-chat"
+				"User-Agent": "opencode/1.3.15"
 			},
 			"compat": {
 				"supportsStore": false,
@@ -4801,7 +4780,7 @@
 			"name": "Gemini 3 Flash",
 			"api": "openai-completions",
 			"provider": "github-copilot",
-			"baseUrl": "https://api.individual.githubcopilot.com",
+			"baseUrl": "https://api.githubcopilot.com",
 			"reasoning": true,
 			"input": [
 				"text",
@@ -4816,10 +4795,7 @@
 			"contextWindow": 128000,
 			"maxTokens": 64000,
 			"headers": {
-				"User-Agent": "GitHubCopilotChat/0.35.0",
-				"Editor-Version": "vscode/1.107.0",
-				"Editor-Plugin-Version": "copilot-chat/0.35.0",
-				"Copilot-Integration-Id": "vscode-chat"
+				"User-Agent": "opencode/1.3.15"
 			},
 			"compat": {
 				"supportsStore": false,
@@ -4837,7 +4813,7 @@
 			"name": "Gemini 3 Pro Preview",
 			"api": "openai-completions",
 			"provider": "github-copilot",
-			"baseUrl": "https://api.individual.githubcopilot.com",
+			"baseUrl": "https://api.githubcopilot.com",
 			"reasoning": true,
 			"input": [
 				"text",
@@ -4852,10 +4828,7 @@
 			"contextWindow": 128000,
 			"maxTokens": 64000,
 			"headers": {
-				"User-Agent": "GitHubCopilotChat/0.35.0",
-				"Editor-Version": "vscode/1.107.0",
-				"Editor-Plugin-Version": "copilot-chat/0.35.0",
-				"Copilot-Integration-Id": "vscode-chat"
+				"User-Agent": "opencode/1.3.15"
 			},
 			"compat": {
 				"supportsStore": false,
@@ -4873,7 +4846,7 @@
 			"name": "Gemini 3.1 Pro Preview",
 			"api": "openai-completions",
 			"provider": "github-copilot",
-			"baseUrl": "https://api.individual.githubcopilot.com",
+			"baseUrl": "https://api.githubcopilot.com",
 			"reasoning": true,
 			"input": [
 				"text",
@@ -4888,10 +4861,7 @@
 			"contextWindow": 128000,
 			"maxTokens": 64000,
 			"headers": {
-				"User-Agent": "GitHubCopilotChat/0.35.0",
-				"Editor-Version": "vscode/1.107.0",
-				"Editor-Plugin-Version": "copilot-chat/0.35.0",
-				"Copilot-Integration-Id": "vscode-chat"
+				"User-Agent": "opencode/1.3.15"
 			},
 			"compat": {
 				"supportsStore": false,
@@ -4909,7 +4879,7 @@
 			"name": "GPT-4.1",
 			"api": "openai-completions",
 			"provider": "github-copilot",
-			"baseUrl": "https://api.individual.githubcopilot.com",
+			"baseUrl": "https://api.githubcopilot.com",
 			"reasoning": false,
 			"input": [
 				"text",
@@ -4924,10 +4894,7 @@
 			"contextWindow": 128000,
 			"maxTokens": 16384,
 			"headers": {
-				"User-Agent": "GitHubCopilotChat/0.35.0",
-				"Editor-Version": "vscode/1.107.0",
-				"Editor-Plugin-Version": "copilot-chat/0.35.0",
-				"Copilot-Integration-Id": "vscode-chat"
+				"User-Agent": "opencode/1.3.15"
 			},
 			"compat": {
 				"supportsStore": false,
@@ -4940,7 +4907,7 @@
 			"name": "GPT-4o",
 			"api": "openai-completions",
 			"provider": "github-copilot",
-			"baseUrl": "https://api.individual.githubcopilot.com",
+			"baseUrl": "https://api.githubcopilot.com",
 			"reasoning": false,
 			"input": [
 				"text",
@@ -4955,10 +4922,7 @@
 			"contextWindow": 128000,
 			"maxTokens": 4096,
 			"headers": {
-				"User-Agent": "GitHubCopilotChat/0.35.0",
-				"Editor-Version": "vscode/1.107.0",
-				"Editor-Plugin-Version": "copilot-chat/0.35.0",
-				"Copilot-Integration-Id": "vscode-chat"
+				"User-Agent": "opencode/1.3.15"
 			},
 			"compat": {
 				"supportsStore": false,
@@ -4972,7 +4936,7 @@
 			"name": "GPT-5",
 			"api": "openai-responses",
 			"provider": "github-copilot",
-			"baseUrl": "https://api.individual.githubcopilot.com",
+			"baseUrl": "https://api.githubcopilot.com",
 			"reasoning": true,
 			"input": [
 				"text",
@@ -4987,10 +4951,7 @@
 			"contextWindow": 128000,
 			"maxTokens": 128000,
 			"headers": {
-				"User-Agent": "GitHubCopilotChat/0.35.0",
-				"Editor-Version": "vscode/1.107.0",
-				"Editor-Plugin-Version": "copilot-chat/0.35.0",
-				"Copilot-Integration-Id": "vscode-chat"
+				"User-Agent": "opencode/1.3.15"
 			},
 			"thinking": {
 				"mode": "effort",
@@ -5003,7 +4964,7 @@
 			"name": "GPT-5-mini",
 			"api": "openai-responses",
 			"provider": "github-copilot",
-			"baseUrl": "https://api.individual.githubcopilot.com",
+			"baseUrl": "https://api.githubcopilot.com",
 			"reasoning": true,
 			"input": [
 				"text",
@@ -5018,10 +4979,7 @@
 			"contextWindow": 264000,
 			"maxTokens": 64000,
 			"headers": {
-				"User-Agent": "GitHubCopilotChat/0.35.0",
-				"Editor-Version": "vscode/1.107.0",
-				"Editor-Plugin-Version": "copilot-chat/0.35.0",
-				"Copilot-Integration-Id": "vscode-chat"
+				"User-Agent": "opencode/1.3.15"
 			},
 			"thinking": {
 				"mode": "effort",
@@ -5034,7 +4992,7 @@
 			"name": "GPT-5.1",
 			"api": "openai-responses",
 			"provider": "github-copilot",
-			"baseUrl": "https://api.individual.githubcopilot.com",
+			"baseUrl": "https://api.githubcopilot.com",
 			"reasoning": true,
 			"input": [
 				"text",
@@ -5049,10 +5007,7 @@
 			"contextWindow": 264000,
 			"maxTokens": 64000,
 			"headers": {
-				"User-Agent": "GitHubCopilotChat/0.35.0",
-				"Editor-Version": "vscode/1.107.0",
-				"Editor-Plugin-Version": "copilot-chat/0.35.0",
-				"Copilot-Integration-Id": "vscode-chat"
+				"User-Agent": "opencode/1.3.15"
 			},
 			"thinking": {
 				"mode": "effort",
@@ -5065,7 +5020,7 @@
 			"name": "GPT-5.1-Codex",
 			"api": "openai-responses",
 			"provider": "github-copilot",
-			"baseUrl": "https://api.individual.githubcopilot.com",
+			"baseUrl": "https://api.githubcopilot.com",
 			"reasoning": true,
 			"input": [
 				"text",
@@ -5080,10 +5035,7 @@
 			"contextWindow": 272000,
 			"maxTokens": 128000,
 			"headers": {
-				"User-Agent": "GitHubCopilotChat/0.35.0",
-				"Editor-Version": "vscode/1.107.0",
-				"Editor-Plugin-Version": "copilot-chat/0.35.0",
-				"Copilot-Integration-Id": "vscode-chat"
+				"User-Agent": "opencode/1.3.15"
 			},
 			"thinking": {
 				"mode": "effort",
@@ -5096,7 +5048,7 @@
 			"name": "GPT-5.1-Codex-max",
 			"api": "openai-responses",
 			"provider": "github-copilot",
-			"baseUrl": "https://api.individual.githubcopilot.com",
+			"baseUrl": "https://api.githubcopilot.com",
 			"reasoning": true,
 			"input": [
 				"text",
@@ -5111,10 +5063,7 @@
 			"contextWindow": 272000,
 			"maxTokens": 128000,
 			"headers": {
-				"User-Agent": "GitHubCopilotChat/0.35.0",
-				"Editor-Version": "vscode/1.107.0",
-				"Editor-Plugin-Version": "copilot-chat/0.35.0",
-				"Copilot-Integration-Id": "vscode-chat"
+				"User-Agent": "opencode/1.3.15"
 			},
 			"thinking": {
 				"mode": "effort",
@@ -5127,7 +5076,7 @@
 			"name": "GPT-5.1-Codex-mini",
 			"api": "openai-responses",
 			"provider": "github-copilot",
-			"baseUrl": "https://api.individual.githubcopilot.com",
+			"baseUrl": "https://api.githubcopilot.com",
 			"reasoning": true,
 			"input": [
 				"text",
@@ -5142,10 +5091,7 @@
 			"contextWindow": 272000,
 			"maxTokens": 128000,
 			"headers": {
-				"User-Agent": "GitHubCopilotChat/0.35.0",
-				"Editor-Version": "vscode/1.107.0",
-				"Editor-Plugin-Version": "copilot-chat/0.35.0",
-				"Copilot-Integration-Id": "vscode-chat"
+				"User-Agent": "opencode/1.3.15"
 			},
 			"thinking": {
 				"mode": "effort",
@@ -5158,7 +5104,7 @@
 			"name": "GPT-5.2",
 			"api": "openai-responses",
 			"provider": "github-copilot",
-			"baseUrl": "https://api.individual.githubcopilot.com",
+			"baseUrl": "https://api.githubcopilot.com",
 			"reasoning": true,
 			"input": [
 				"text",
@@ -5173,10 +5119,7 @@
 			"contextWindow": 264000,
 			"maxTokens": 64000,
 			"headers": {
-				"User-Agent": "GitHubCopilotChat/0.35.0",
-				"Editor-Version": "vscode/1.107.0",
-				"Editor-Plugin-Version": "copilot-chat/0.35.0",
-				"Copilot-Integration-Id": "vscode-chat"
+				"User-Agent": "opencode/1.3.15"
 			},
 			"thinking": {
 				"mode": "effort",
@@ -5189,7 +5132,7 @@
 			"name": "GPT-5.2-Codex",
 			"api": "openai-responses",
 			"provider": "github-copilot",
-			"baseUrl": "https://api.individual.githubcopilot.com",
+			"baseUrl": "https://api.githubcopilot.com",
 			"reasoning": true,
 			"input": [
 				"text",
@@ -5204,10 +5147,7 @@
 			"contextWindow": 272000,
 			"maxTokens": 128000,
 			"headers": {
-				"User-Agent": "GitHubCopilotChat/0.35.0",
-				"Editor-Version": "vscode/1.107.0",
-				"Editor-Plugin-Version": "copilot-chat/0.35.0",
-				"Copilot-Integration-Id": "vscode-chat"
+				"User-Agent": "opencode/1.3.15"
 			},
 			"thinking": {
 				"mode": "effort",
@@ -5220,7 +5160,7 @@
 			"name": "GPT-5.3-Codex",
 			"api": "openai-responses",
 			"provider": "github-copilot",
-			"baseUrl": "https://api.individual.githubcopilot.com",
+			"baseUrl": "https://api.githubcopilot.com",
 			"reasoning": true,
 			"input": [
 				"text",
@@ -5235,10 +5175,7 @@
 			"contextWindow": 272000,
 			"maxTokens": 128000,
 			"headers": {
-				"User-Agent": "GitHubCopilotChat/0.35.0",
-				"Editor-Version": "vscode/1.107.0",
-				"Editor-Plugin-Version": "copilot-chat/0.35.0",
-				"Copilot-Integration-Id": "vscode-chat"
+				"User-Agent": "opencode/1.3.15"
 			},
 			"thinking": {
 				"mode": "effort",
@@ -5251,7 +5188,7 @@
 			"name": "GPT-5.4",
 			"api": "openai-responses",
 			"provider": "github-copilot",
-			"baseUrl": "https://api.individual.githubcopilot.com",
+			"baseUrl": "https://api.githubcopilot.com",
 			"reasoning": true,
 			"input": [
 				"text",
@@ -5266,10 +5203,7 @@
 			"contextWindow": 400000,
 			"maxTokens": 128000,
 			"headers": {
-				"User-Agent": "GitHubCopilotChat/0.35.0",
-				"Editor-Version": "vscode/1.107.0",
-				"Editor-Plugin-Version": "copilot-chat/0.35.0",
-				"Copilot-Integration-Id": "vscode-chat"
+				"User-Agent": "opencode/1.3.15"
 			},
 			"thinking": {
 				"mode": "effort",
@@ -5282,7 +5216,7 @@
 			"name": "GPT-5.4 Mini",
 			"api": "openai-responses",
 			"provider": "github-copilot",
-			"baseUrl": "https://api.individual.githubcopilot.com",
+			"baseUrl": "https://api.githubcopilot.com",
 			"reasoning": true,
 			"input": [
 				"text",
@@ -5297,10 +5231,7 @@
 			"contextWindow": 400000,
 			"maxTokens": 128000,
 			"headers": {
-				"User-Agent": "GitHubCopilotChat/0.35.0",
-				"Editor-Version": "vscode/1.107.0",
-				"Editor-Plugin-Version": "copilot-chat/0.35.0",
-				"Copilot-Integration-Id": "vscode-chat"
+				"User-Agent": "opencode/1.3.15"
 			},
 			"premiumMultiplier": 0.33,
 			"thinking": {
@@ -5314,7 +5245,7 @@
 			"name": "Grok Code Fast 1",
 			"api": "openai-completions",
 			"provider": "github-copilot",
-			"baseUrl": "https://api.individual.githubcopilot.com",
+			"baseUrl": "https://api.githubcopilot.com",
 			"reasoning": true,
 			"input": [
 				"text"
@@ -5328,10 +5259,7 @@
 			"contextWindow": 128000,
 			"maxTokens": 64000,
 			"headers": {
-				"User-Agent": "GitHubCopilotChat/0.35.0",
-				"Editor-Version": "vscode/1.107.0",
-				"Editor-Plugin-Version": "copilot-chat/0.35.0",
-				"Copilot-Integration-Id": "vscode-chat"
+				"User-Agent": "opencode/1.3.15"
 			},
 			"compat": {
 				"supportsStore": false,
@@ -21292,10 +21220,7 @@
 			"contextWindow": 1048576,
 			"maxTokens": 65536,
 			"headers": {
-				"User-Agent": "GitHubCopilotChat/0.35.0",
-				"Editor-Version": "vscode/1.107.0",
-				"Editor-Plugin-Version": "copilot-chat/0.35.0",
-				"Copilot-Integration-Id": "vscode-chat"
+				"User-Agent": "opencode/1.3.15"
 			},
 			"compat": {
 				"supportsStore": false,

package/src/provider-models/openai-compat.ts

@@ -7,7 +7,7 @@ import {
 	type OpenAICompatibleModelMapperContext,
 	type OpenAICompatibleModelRecord,
 } from "../utils/discovery/openai-compatible";
-import { getGitHubCopilotBaseUrl } from "../utils/oauth/github-copilot";
+import { getGitHubCopilotBaseUrl, OPENCODE_HEADERS, parseGitHubCopilotApiKey } from "../utils/oauth/github-copilot";
 
 const MODELS_DEV_URL = "https://models.dev/api.json";
 const ANTHROPIC_BASE_URL = "https://api.anthropic.com/v1";
@@ -661,6 +661,9 @@ export function openrouterModelManagerOptions(
 				provider: "openrouter",
 				baseUrl,
 				apiKey,
+				headers: {
+					"X-Title": "Oh-My-Pi",
+				},
 				filterModel: (entry: OpenAICompatibleModelRecord) => {
 					const params = entry.supported_parameters;
 					return Array.isArray(params) && params.includes("tools");
@@ -1438,12 +1441,6 @@ export interface GithubCopilotModelManagerConfig {
 	apiKey?: string;
 	baseUrl?: string;
 }
-const GITHUB_COPILOT_HEADERS: Record<string, string> = {
-	"User-Agent": "GitHubCopilotChat/0.35.0",
-	"Editor-Version": "vscode/1.107.0",
-	"Editor-Plugin-Version": "copilot-chat/0.35.0",
-	"Copilot-Integration-Id": "vscode-chat",
-};
 
 function inferCopilotApi(modelId: string): Api {
 	if (/^claude-(haiku|sonnet|opus)-4([.-]|$)/.test(modelId)) {
@@ -1477,12 +1474,14 @@ function extractCopilotLimits(entry: OpenAICompatibleModelRecord): {
 }
 
 export function githubCopilotModelManagerOptions(config?: GithubCopilotModelManagerConfig): ModelManagerOptions<Api> {
-	const apiKey = config?.apiKey;
-	const configuredBaseUrl = config?.baseUrl ?? "https://api.individual.githubcopilot.com";
-	const baseUrl =
-		apiKey?.includes("proxy-ep=") && configuredBaseUrl.includes("githubcopilot.com")
-			? getGitHubCopilotBaseUrl(apiKey)
-			: configuredBaseUrl;
+	const rawApiKey = config?.apiKey;
+	const baseUrl = config?.baseUrl ?? "https://api.githubcopilot.com";
+	const parsedApiKey = rawApiKey ? parseGitHubCopilotApiKey(rawApiKey) : undefined;
+	const apiKey = parsedApiKey?.accessToken;
+	const resolvedBaseUrl =
+		parsedApiKey?.enterpriseUrl && baseUrl.includes("githubcopilot.com")
+			? getGitHubCopilotBaseUrl(parsedApiKey.enterpriseUrl)
+			: baseUrl;
 	const references = createBundledReferenceMap<Api>("github-copilot");
 	const globalReferences = createGlobalReferenceMap();
 	return {
@@ -1492,9 +1491,9 @@ export function githubCopilotModelManagerOptions(config?: GithubCopilotModelMana
 				fetchOpenAICompatibleModels<Api>({
 					api: "openai-completions",
 					provider: "github-copilot",
-					baseUrl,
+					baseUrl: resolvedBaseUrl,
 					apiKey,
-					headers: GITHUB_COPILOT_HEADERS,
+					headers: OPENCODE_HEADERS,
 					mapModel: (
 						entry: OpenAICompatibleModelRecord,
 						defaults: Model<Api>,
@@ -1546,7 +1545,7 @@ export function githubCopilotModelManagerOptions(config?: GithubCopilotModelMana
 								name,
 								contextWindow,
 								maxTokens,
-								headers: { ...GITHUB_COPILOT_HEADERS, ...(providerReference?.headers ?? {}) },
+								headers: { ...OPENCODE_HEADERS, ...(providerReference?.headers ?? {}) },
 								...(api === "openai-completions"
 									? {
 											compat: {
@@ -1565,7 +1564,7 @@ export function githubCopilotModelManagerOptions(config?: GithubCopilotModelMana
 							name,
 							contextWindow,
 							maxTokens,
-							headers: { ...GITHUB_COPILOT_HEADERS },
+							headers: { ...OPENCODE_HEADERS },
 							...(api === "openai-completions"
 								? {
 										compat: {
@@ -1778,12 +1777,6 @@ function bedrockCrossRegionId(id: string): string {
 	return id;
 }
 
-const COPILOT_HEADERS = {
-	"User-Agent": "GitHubCopilotChat/0.35.0",
-	"Editor-Version": "vscode/1.107.0",
-	"Editor-Plugin-Version": "copilot-chat/0.35.0",
-	"Copilot-Integration-Id": "vscode-chat",
-} as const;
 interface ApiResolutionRule {
 	matches: (modelId: string, raw: ModelsDevModel) => boolean;
 	resolved: { api: Api; baseUrl: string };
@@ -1828,7 +1821,7 @@ function createOpenCodeApiResolution(basePath: string): {
 const OPENCODE_ZEN_API_RESOLUTION = createOpenCodeApiResolution("https://opencode.ai/zen");
 const OPENCODE_GO_API_RESOLUTION = createOpenCodeApiResolution("https://opencode.ai/zen/go");
 
-const COPILOT_BASE_URL = "https://api.individual.githubcopilot.com";
+const COPILOT_BASE_URL = "https://api.githubcopilot.com";
 
 const COPILOT_DEFAULT_RESOLUTION = {
 	api: "openai-completions",
@@ -2036,7 +2029,7 @@ const MODELS_DEV_PROVIDER_DESCRIPTORS_SPECIALIZED: readonly ModelsDevProviderDes
 	openAiCompletionsDescriptor("github-copilot", "github-copilot", COPILOT_BASE_URL, {
 		defaultContextWindow: 128000,
 		defaultMaxTokens: 8192,
-		headers: { ...COPILOT_HEADERS },
+		headers: { ...OPENCODE_HEADERS },
 		filterModel: (_id, m) => {
 			if (m.tool_call !== true) return false;
 			if (m.status === "deprecated") return false;

package/src/providers/anthropic.ts

@@ -34,9 +34,10 @@ import type {
 import { isAnthropicOAuthToken, normalizeToolCallId, resolveCacheRetention } from "../utils";
 import { createAbortSourceTracker } from "../utils/abort";
 import { AssistantMessageEventStream } from "../utils/event-stream";
-import { finalizeErrorMessage, type RawHttpRequestDump } from "../utils/http-inspector";
+import { finalizeErrorMessage, type RawHttpRequestDump, rewriteCopilotAuthError } from "../utils/http-inspector";
 import { createFirstEventWatchdog, getStreamFirstEventTimeoutMs, markFirstStreamEvent } from "../utils/idle-iterator";
 import { parseStreamingJson } from "../utils/json-parse";
+import { parseGitHubCopilotApiKey } from "../utils/oauth/github-copilot";
 import {
 	buildCopilotDynamicHeaders,
 	hasCopilotVisionInput,
@@ -978,6 +979,7 @@ export const streamAnthropic: StreamFunction<"anthropic-messages"> = (
 			const firstEventTimeoutError = activeAbortTracker.getLocalAbortReason();
 			output.stopReason = activeAbortTracker.wasCallerAbort() ? "aborted" : "error";
 			output.errorMessage = firstEventTimeoutError?.message ?? (await finalizeErrorMessage(error, rawRequestDump));
+			output.errorMessage = rewriteCopilotAuthError(output.errorMessage, error, model.provider);
 			output.duration = Date.now() - startTime;
 			if (firstTokenTime) output.ttft = firstTokenTime - startTime;
 			stream.push({ type: "error", reason: output.stopReason, error: output });
@@ -1065,6 +1067,7 @@ export function buildAnthropicClientOptions(args: AnthropicClientOptionsArgs): A
 	const foundryCustomHeaders = resolveAnthropicCustomHeaders(model);
 	const tlsFetchOptions = buildClaudeCodeTlsFetchOptions(model, baseUrl);
 	if (model.provider === "github-copilot") {
+		const copilotApiKey = parseGitHubCopilotApiKey(apiKey).accessToken;
 		const betaFeatures = [...extraBetas];
 		if (interleavedThinking) {
 			betaFeatures.push("interleaved-thinking-2025-05-14");
@@ -1073,7 +1076,7 @@ export function buildAnthropicClientOptions(args: AnthropicClientOptionsArgs): A
 			{
 				Accept: stream ? "text/event-stream" : "application/json",
 				"Anthropic-Dangerous-Direct-Browser-Access": "true",
-				Authorization: `Bearer ${apiKey}`,
+				Authorization: `Bearer ${copilotApiKey}`,
 				...(betaFeatures.length > 0 ? { "anthropic-beta": buildBetaHeader([], betaFeatures) } : {}),
 			},
 			model.headers,
@@ -1084,7 +1087,7 @@ export function buildAnthropicClientOptions(args: AnthropicClientOptionsArgs): A
 		return {
 			isOAuthToken: false,
 			apiKey: null,
-			authToken: apiKey,
+			authToken: copilotApiKey,
 			baseURL: baseUrl,
 			maxRetries: 5,
 			dangerouslyAllowBrowser: true,

package/src/providers/github-copilot-headers.ts

@@ -1,5 +1,5 @@
 import type { Message } from "../types";
-import { getGitHubCopilotBaseUrl } from "../utils/oauth/github-copilot";
+import { getGitHubCopilotBaseUrl, parseGitHubCopilotApiKey } from "../utils/oauth/github-copilot";
 /**
  * Infer whether the current request to Copilot is user-initiated or agent-initiated.
  * Accepts `unknown[]` because providers may pass pre-converted message shapes.
@@ -15,9 +15,11 @@ export function resolveGitHubCopilotBaseUrl(
 	baseUrl: string | undefined,
 	apiKey: string | undefined,
 ): string | undefined {
-	if (!apiKey?.includes("proxy-ep=")) return baseUrl;
+	if (!apiKey) return baseUrl;
+	const { enterpriseUrl } = parseGitHubCopilotApiKey(apiKey);
+	if (!enterpriseUrl) return baseUrl;
 	if (baseUrl && !baseUrl.includes("githubcopilot.com")) return baseUrl;
-	return getGitHubCopilotBaseUrl(apiKey);
+	return getGitHubCopilotBaseUrl(enterpriseUrl);
 }
 export function inferCopilotInitiator(messages: unknown[]): CopilotInitiator {
 	if (messages.length === 0) return "user";

package/src/providers/openai-codex-responses.ts

@@ -2134,7 +2134,7 @@ function convertMessages(model: Model<"openai-codex-responses">, context: Contex
 					if (!msgId) {
 						msgId = `msg_${msgIndex}`;
 					} else if (msgId.length > 64) {
-						msgId = `msg_${Bun.hash.xxHash64(msgId).toString(36)}`;
+						msgId = `msg_${Bun.hash(msgId).toString(36)}`;
 					}
 					outputItems.push({
 						type: "message",

package/src/providers/openai-completions.ts

@@ -31,7 +31,7 @@ import {
 } from "../types";
 import { createAbortSourceTracker } from "../utils/abort";
 import { AssistantMessageEventStream } from "../utils/event-stream";
-import { finalizeErrorMessage, type RawHttpRequestDump } from "../utils/http-inspector";
+import { finalizeErrorMessage, type RawHttpRequestDump, rewriteCopilotAuthError } from "../utils/http-inspector";
 import {
 	createFirstEventWatchdog,
 	getOpenAIStreamIdleTimeoutMs,
@@ -40,6 +40,7 @@ import {
 	markFirstStreamEvent,
 } from "../utils/idle-iterator";
 import { parseStreamingJson } from "../utils/json-parse";
+import { parseGitHubCopilotApiKey } from "../utils/oauth/github-copilot";
 import { getKimiCommonHeaders } from "../utils/oauth/kimi";
 import { adaptSchemaForStrict, NO_STRICT } from "../utils/schema";
 import { mapToOpenAICompletionsToolChoice } from "../utils/tool-choice";
@@ -516,6 +517,7 @@ export const streamOpenAICompletions: StreamFunction<"openai-completions"> = (
 			// Some providers via OpenRouter include extra details here.
 			const rawMetadata = (error as { error?: { metadata?: { raw?: string } } })?.error?.metadata?.raw;
 			if (rawMetadata) output.errorMessage += `\n${rawMetadata}`;
+			output.errorMessage = rewriteCopilotAuthError(output.errorMessage, error, model.provider);
 			output.duration = Date.now() - startTime;
 			if (firstTokenTime) output.ttft = firstTokenTime - startTime;
 			stream.push({ type: "error", reason: output.stopReason, error: output });
@@ -545,8 +547,12 @@ async function createClient(
 		}
 		apiKey = $env.OPENAI_API_KEY;
 	}
+	const rawApiKey = apiKey;
 
 	let headers = { ...(model.headers ?? {}), ...(extraHeaders ?? {}) };
+	if (model.provider === "openrouter") {
+		headers["X-Title"] = "Oh-My-Pi";
+	}
 	if (model.provider === "kimi-code") {
 		headers = { ...(await getKimiCommonHeaders()), ...headers };
 	}
@@ -554,6 +560,7 @@ async function createClient(
 
 	let baseUrl = model.baseUrl;
 	if (model.provider === "github-copilot") {
+		apiKey = parseGitHubCopilotApiKey(rawApiKey).accessToken;
 		const hasImages = hasCopilotVisionInput(context.messages);
 		const copilot = buildCopilotDynamicHeaders({
 			messages: context.messages,
@@ -564,7 +571,7 @@ async function createClient(
 		});
 		Object.assign(headers, copilot.headers);
 		copilotPremiumRequests = copilot.premiumRequests;
-		baseUrl = resolveGitHubCopilotBaseUrl(model.baseUrl, apiKey) ?? model.baseUrl;
+		baseUrl = resolveGitHubCopilotBaseUrl(model.baseUrl, rawApiKey) ?? model.baseUrl;
 	}
 	return {
 		client: new OpenAI({
@@ -805,9 +812,7 @@ export function convertMessages(
 
 	const generateFallbackToolCallId = (seed: string): string => {
 		generatedToolCallIdCounter += 1;
-		const hash = Bun.hash
-			.xxHash64(`${model.provider}:${model.id}:${seed}:${generatedToolCallIdCounter}`)
-			.toString(36);
+		const hash = Bun.hash(`${model.provider}:${model.id}:${seed}:${generatedToolCallIdCounter}`).toString(36);
 		return `call_${hash}`;
 	};
 

package/src/providers/openai-responses-shared.ts

@@ -144,7 +144,7 @@ export function convertResponsesAssistantMessage<TApi extends Api>(
 			if (!msgId) {
 				msgId = `msg_${msgIndex}`;
 			} else if (msgId.length > 64) {
-				msgId = `msg_${Bun.hash.xxHash64(msgId).toString(36)}`;
+				msgId = `msg_${Bun.hash(msgId).toString(36)}`;
 			}
 			outputItems.push({
 				type: "message",

package/src/providers/openai-responses.ts

@@ -30,7 +30,7 @@ import {
 } from "../utils";
 import { createAbortSourceTracker } from "../utils/abort";
 import { AssistantMessageEventStream } from "../utils/event-stream";
-import { finalizeErrorMessage, type RawHttpRequestDump } from "../utils/http-inspector";
+import { finalizeErrorMessage, type RawHttpRequestDump, rewriteCopilotAuthError } from "../utils/http-inspector";
 import {
 	createFirstEventWatchdog,
 	getOpenAIStreamIdleTimeoutMs,
@@ -38,6 +38,7 @@ import {
 	iterateWithIdleTimeout,
 	markFirstStreamEvent,
 } from "../utils/idle-iterator";
+import { parseGitHubCopilotApiKey } from "../utils/oauth/github-copilot";
 import { adaptSchemaForStrict, NO_STRICT } from "../utils/schema";
 import { mapToOpenAIResponsesToolChoice } from "../utils/tool-choice";
 import {
@@ -243,6 +244,7 @@ export const streamOpenAIResponses: StreamFunction<"openai-responses"> = (
 			const firstEventTimeoutError = abortTracker.getLocalAbortReason();
 			output.stopReason = abortTracker.wasCallerAbort() ? "aborted" : "error";
 			output.errorMessage = firstEventTimeoutError?.message ?? (await finalizeErrorMessage(error, rawRequestDump));
+			output.errorMessage = rewriteCopilotAuthError(output.errorMessage, error, model.provider);
 			output.duration = Date.now() - startTime;
 			if (firstTokenTime) output.ttft = firstTokenTime - startTime;
 			stream.push({ type: "error", reason: output.stopReason, error: output });
@@ -272,12 +274,14 @@ function createClient(
 		}
 		apiKey = $env.OPENAI_API_KEY;
 	}
+	const rawApiKey = apiKey;
 
 	const headers = { ...(model.headers ?? {}), ...(extraHeaders ?? {}) };
 	let copilotPremiumRequests: number | undefined;
 
 	let baseUrl = model.baseUrl;
 	if (model.provider === "github-copilot") {
+		apiKey = parseGitHubCopilotApiKey(rawApiKey).accessToken;
 		const hasImages = hasCopilotVisionInput(context.messages);
 		const copilot = buildCopilotDynamicHeaders({
 			messages: context.messages,
@@ -288,7 +292,7 @@ function createClient(
 		});
 		Object.assign(headers, copilot.headers);
 		copilotPremiumRequests = copilot.premiumRequests;
-		baseUrl = resolveGitHubCopilotBaseUrl(model.baseUrl, apiKey) ?? model.baseUrl;
+		baseUrl = resolveGitHubCopilotBaseUrl(model.baseUrl, rawApiKey) ?? model.baseUrl;
 	}
 	return {
 		client: new OpenAI({

package/src/providers/transform-messages.ts

@@ -122,6 +122,9 @@ export function transformMessages<TApi extends Api>(
 		}
 		return msg;
 	});
+	const realToolResultIds = new Set(
+		transformed.filter((msg): msg is ToolResultMessage => msg.role === "toolResult").map(msg => msg.toolCallId),
+	);
 
 	// Second pass: insert synthetic empty tool results for orphaned tool calls
 	// and preserve aborted/errored tool results when they were already persisted.
@@ -135,7 +138,7 @@ export function transformMessages<TApi extends Api>(
 	const flushPendingToolCalls = (timestamp: number): void => {
 		if (pendingToolCalls.length === 0) return;
 		for (const tc of pendingToolCalls) {
-			if (!toolCallStatus.has(tc.id)) {
+			if (!toolCallStatus.has(tc.id) && !realToolResultIds.has(tc.id)) {
 				result.push({
 					role: "toolResult",
 					toolCallId: tc.id,

package/src/usage/github-copilot.ts

@@ -14,13 +14,7 @@ import type {
 	UsageWindow,
 } from "../usage";
 import { isRecord, toBoolean, toNumber } from "../utils";
-
-const COPILOT_HEADERS = {
-	"User-Agent": "GitHubCopilotChat/0.35.0",
-	"Editor-Version": "vscode/1.107.0",
-	"Editor-Plugin-Version": "copilot-chat/0.35.0",
-	"Copilot-Integration-Id": "vscode-chat",
-} as const;
+import { OPENCODE_HEADERS } from "../utils/oauth/github-copilot";
 
 type CopilotQuotaDetail = {
 	entitlement: number;
@@ -183,7 +177,7 @@ async function fetchInternalUsage(
 		"Content-Type": "application/json",
 		Accept: "application/json",
 		Authorization: `Bearer ${token}`,
-		...COPILOT_HEADERS,
+		...OPENCODE_HEADERS,
 	};
 	const data = await fetchJson(ctx, `${githubApiBaseUrl}/copilot_internal/user`, { headers, signal });
 	if (!isRecord(data)) throw new Error("Invalid Copilot usage response");

package/src/utils/http-inspector.ts

@@ -54,6 +54,26 @@ export function withHttpStatus(error: unknown, status: number): Error {
 	return wrapped;
 }
 
+/**
+ * Rewrite error message for GitHub Copilot request failures.
+ * Must run AFTER finalizeErrorMessage since it replaces the message entirely.
+ *
+ * 401 = token invalid/expired → credential removal is safe, prompt re-login.
+ * 403 = token valid but access denied (plan, model policy, org restriction) →
+ *       do NOT reuse the auth-failed string (which triggers credential removal).
+ */
+export function rewriteCopilotAuthError(errorMessage: string, error: unknown, provider: string): string {
+	if (provider !== "github-copilot") return errorMessage;
+	const status = extractHttpStatusFromError(error);
+	if (status === 401) {
+		return `GitHub Copilot authentication failed (HTTP 401). Your token may have been revoked. Please re-login with /login github-copilot`;
+	}
+	if (status === 403) {
+		return `GitHub Copilot access denied (HTTP 403). Your account may not have access to this model or feature. Check your Copilot plan or model policy settings.`;
+	}
+	return errorMessage;
+}
+
 function sanitizeDump(dump: RawHttpRequestDump): RawHttpRequestDump {
 	return {
 		...dump,

package/src/utils/idle-iterator.ts

@@ -1,6 +1,6 @@
 import { $env } from "@oh-my-pi/pi-utils";
 
-const DEFAULT_OPENAI_STREAM_IDLE_TIMEOUT_MS = 60_000;
+const DEFAULT_OPENAI_STREAM_IDLE_TIMEOUT_MS = 120_000;
 const DEFAULT_STREAM_FIRST_EVENT_TIMEOUT_MS = 60_000;
 
 function normalizeIdleTimeoutMs(value: string | undefined, fallback: number): number | undefined {

package/src/utils/oauth/github-copilot.ts

@@ -1,18 +1,16 @@
 /**
- * GitHub Copilot OAuth flow
+ * GitHub Copilot OAuth flow (opencode OAuth app)
  */
 import { abortableSleep } from "@oh-my-pi/pi-utils";
 import { getBundledModels } from "../../models";
 import type { OAuthCredentials } from "./types";
 
-const decode = (s: string) => atob(s);
-const CLIENT_ID = decode("SXYxLmI1MDdhMDhjODdlY2ZlOTg=");
+const CLIENT_ID = "Ov23li8tweQw6odWQebz";
 
-const COPILOT_HEADERS = {
-	"User-Agent": "GitHubCopilotChat/0.35.0",
-	"Editor-Version": "vscode/1.107.0",
-	"Editor-Plugin-Version": "copilot-chat/0.35.0",
-	"Copilot-Integration-Id": "vscode-chat",
+export const COPILOT_USER_AGENT = "opencode/1.3.15" as const;
+
+export const OPENCODE_HEADERS = {
+	"User-Agent": COPILOT_USER_AGENT,
 } as const;
 
 const INITIAL_POLL_INTERVAL_MULTIPLIER = 1.2;
@@ -37,6 +35,47 @@ type DeviceTokenErrorResponse = {
 	interval?: number;
 };
 
+type GitHubCopilotApiKeyPayload = {
+	token?: unknown;
+	enterpriseUrl?: unknown;
+};
+
+export type ParsedGitHubCopilotApiKey = {
+	accessToken: string;
+	enterpriseUrl?: string;
+};
+
+const PUBLIC_GITHUB_HOSTS = new Set(["api.github.com", "github.com", "www.github.com"]);
+
+function isPublicGitHubHost(host: string): boolean {
+	return PUBLIC_GITHUB_HOSTS.has(host.trim().toLowerCase());
+}
+
+export function normalizeGitHubCopilotEnterpriseDomain(input: string | undefined): string | undefined {
+	const trimmed = input?.trim();
+	if (!trimmed) return undefined;
+	const normalized = normalizeDomain(trimmed) ?? trimmed.toLowerCase();
+	if (!normalized || isPublicGitHubHost(normalized)) return undefined;
+	return normalized;
+}
+
+export function parseGitHubCopilotApiKey(apiKeyRaw: string): ParsedGitHubCopilotApiKey {
+	try {
+		const parsed = JSON.parse(apiKeyRaw) as GitHubCopilotApiKeyPayload;
+		if (typeof parsed.token === "string") {
+			return {
+				accessToken: parsed.token,
+				enterpriseUrl:
+					typeof parsed.enterpriseUrl === "string"
+						? normalizeGitHubCopilotEnterpriseDomain(parsed.enterpriseUrl)
+						: undefined,
+			};
+		}
+	} catch {}
+
+	return { accessToken: apiKeyRaw };
+}
+
 export function normalizeDomain(input: string): string | null {
 	const trimmed = input.trim();
 	if (!trimmed) return null;
@@ -51,38 +90,20 @@ export function normalizeDomain(input: string): string | null {
 function getUrls(domain: string): {
 	deviceCodeUrl: string;
 	accessTokenUrl: string;
-	copilotTokenUrl: string;
 } {
 	return {
 		deviceCodeUrl: `https://${domain}/login/device/code`,
 		accessTokenUrl: `https://${domain}/login/oauth/access_token`,
-		copilotTokenUrl: `https://api.${domain}/copilot_internal/v2/token`,
 	};
 }
 
-/**
- * Parse the proxy-ep from a Copilot token and convert to API base URL.
- * Token format: tid=...;exp=...;proxy-ep=proxy.individual.githubcopilot.com;...
- * Returns API URL like https://api.individual.githubcopilot.com
- */
-function getBaseUrlFromToken(token: string): string | null {
-	const match = token.match(/proxy-ep=([^;]+)/);
-	if (!match) return null;
-	const proxyHost = match[1];
-	// Convert proxy.xxx to api.xxx
-	const apiHost = proxyHost.replace(/^proxy\./, "api.");
-	return `https://${apiHost}`;
-}
-
-export function getGitHubCopilotBaseUrl(token?: string, enterpriseDomain?: string): string {
-	// If we have a token, extract the base URL from proxy-ep
-	if (token) {
-		const urlFromToken = getBaseUrlFromToken(token);
-		if (urlFromToken) return urlFromToken;
-	}
-	// Fallback for enterprise or if token parsing fails
-	if (enterpriseDomain) return `https://copilot-api.${enterpriseDomain}`;
-	return "https://api.individual.githubcopilot.com";
+export function getGitHubCopilotBaseUrl(enterpriseDomain?: string): string {
+	const normalizedEnterpriseDomain = normalizeGitHubCopilotEnterpriseDomain(enterpriseDomain);
+	if (!normalizedEnterpriseDomain) return "https://api.githubcopilot.com";
+	const host = normalizedEnterpriseDomain.startsWith("copilot-api.")
+		? normalizedEnterpriseDomain
+		: `copilot-api.${normalizedEnterpriseDomain}`;
+	return `https://${host}`;
 }
 
 async function fetchJson(url: string, init: RequestInit): Promise<unknown> {
@@ -100,10 +121,10 @@ async function startDeviceFlow(domain: string): Promise<DeviceCodeResponse> {
 		method: "POST",
 		headers: {
 			Accept: "application/json",
-			"Content-Type": "application/x-www-form-urlencoded",
-			"User-Agent": "GitHubCopilotChat/0.35.0",
+			"Content-Type": "application/json",
+			...OPENCODE_HEADERS,
 		},
-		body: new URLSearchParams({
+		body: JSON.stringify({
 			client_id: CLIENT_ID,
 			scope: "read:user",
 		}),
@@ -172,10 +193,10 @@ async function pollForGitHubAccessToken(
 			method: "POST",
 			headers: {
 				Accept: "application/json",
-				"Content-Type": "application/x-www-form-urlencoded",
-				"User-Agent": "GitHubCopilotChat/0.35.0",
+				"Content-Type": "application/json",
+				...OPENCODE_HEADERS,
 			},
-			body: new URLSearchParams({
+			body: JSON.stringify({
 				client_id: CLIENT_ID,
 				device_code: deviceCode,
 				grant_type: "urn:ietf:params:oauth:grant-type:device_code",
@@ -214,39 +235,18 @@ async function pollForGitHubAccessToken(
 	throw new Error("Device flow timed out");
 }
 
+/** Far-future expiry (10 years). GitHub OAuth tokens are long-lived; no JWT exchange needed. */
+const FAR_FUTURE_MS = Date.now() + 10 * 365.25 * 24 * 60 * 60 * 1000;
+
 /**
- * Refresh GitHub Copilot token
+ * Refresh GitHub Copilot token.
+ * With the opencode OAuth flow, the GitHub token is used directly — no JWT exchange needed.
  */
-export async function refreshGitHubCopilotToken(
-	refreshToken: string,
-	enterpriseDomain?: string,
-): Promise<OAuthCredentials> {
-	const domain = enterpriseDomain || "github.com";
-	const urls = getUrls(domain);
-
-	const raw = await fetchJson(urls.copilotTokenUrl, {
-		headers: {
-			Accept: "application/json",
-			Authorization: `Bearer ${refreshToken}`,
-			...COPILOT_HEADERS,
-		},
-	});
-
-	if (!raw || typeof raw !== "object") {
-		throw new Error("Invalid Copilot token response");
-	}
-
-	const token = (raw as Record<string, unknown>).token;
-	const expiresAt = (raw as Record<string, unknown>).expires_at;
-
-	if (typeof token !== "string" || typeof expiresAt !== "number") {
-		throw new Error("Invalid Copilot token response fields");
-	}
-
+export function refreshGitHubCopilotToken(refreshToken: string, enterpriseDomain?: string): OAuthCredentials {
 	return {
 		refresh: refreshToken,
-		access: token,
-		expires: expiresAt * 1000 - 5 * 60 * 1000,
+		access: refreshToken,
+		expires: FAR_FUTURE_MS,
 		enterpriseUrl: enterpriseDomain,
 	};
 }
@@ -256,7 +256,7 @@ export async function refreshGitHubCopilotToken(
  * This is required for some models (like Claude, Grok) before they can be used.
  */
 async function enableGitHubCopilotModel(token: string, modelId: string, enterpriseDomain?: string): Promise<boolean> {
-	const baseUrl = getGitHubCopilotBaseUrl(token, enterpriseDomain);
+	const baseUrl = getGitHubCopilotBaseUrl(enterpriseDomain);
 	const url = `${baseUrl}/models/${modelId}/policy`;
 
 	try {
@@ -265,7 +265,7 @@ async function enableGitHubCopilotModel(token: string, modelId: string, enterpri
 			headers: {
 				"Content-Type": "application/json",
 				Authorization: `Bearer ${token}`,
-				...COPILOT_HEADERS,
+				...OPENCODE_HEADERS,
 				"openai-intent": "chat-policy",
 				"x-interaction-type": "chat-policy",
 			},
@@ -287,12 +287,16 @@ async function enableAllGitHubCopilotModels(
 	onProgress?: (model: string, success: boolean) => void,
 ): Promise<void> {
 	const models = getBundledModels("github-copilot");
-	await Promise.all(
-		models.map(async model => {
-			const success = await enableGitHubCopilotModel(token, model.id, enterpriseDomain);
-			onProgress?.(model.id, success);
-		}),
-	);
+	const BATCH_SIZE = 5;
+	for (let i = 0; i < models.length; i += BATCH_SIZE) {
+		const batch = models.slice(i, i + BATCH_SIZE);
+		await Promise.all(
+			batch.map(async model => {
+				const success = await enableGitHubCopilotModel(token, model.id, enterpriseDomain);
+				onProgress?.(model.id, success);
+			}),
+		);
+	}
 }
 
 /**
@@ -320,11 +324,13 @@ export async function loginGitHubCopilot(options: {
 	}
 
 	const trimmed = input.trim();
-	const enterpriseDomain = normalizeDomain(input);
-	if (trimmed && !enterpriseDomain) {
+	const normalizedDomain = normalizeDomain(input);
+	if (trimmed && !normalizedDomain) {
 		throw new Error("Invalid GitHub Enterprise URL/domain");
 	}
-	const domain = enterpriseDomain || "github.com";
+	const enterpriseDomain = normalizeGitHubCopilotEnterpriseDomain(normalizedDomain ?? undefined);
+	const domain =
+		normalizedDomain && isPublicGitHubHost(normalizedDomain) ? "github.com" : (normalizedDomain ?? "github.com");
 
 	const device = await startDeviceFlow(domain);
 	options.onAuth(device.verification_uri, `Enter code: ${device.user_code}`);
@@ -336,10 +342,17 @@ export async function loginGitHubCopilot(options: {
 		device.expires_in,
 		options.signal,
 	);
-	const credentials = await refreshGitHubCopilotToken(githubAccessToken, enterpriseDomain ?? undefined);
+
+	// With opencode OAuth, the GitHub token is used directly for all API requests
+	const credentials: OAuthCredentials = {
+		refresh: githubAccessToken,
+		access: githubAccessToken,
+		expires: FAR_FUTURE_MS,
+		enterpriseUrl: enterpriseDomain ?? undefined,
+	};
 
 	// Enable all models after successful login
 	options.onProgress?.("Enabling models...");
-	await enableAllGitHubCopilotModels(credentials.access, enterpriseDomain ?? undefined);
+	await enableAllGitHubCopilotModels(githubAccessToken, enterpriseDomain ?? undefined);
 	return credentials;
 }

package/src/utils/oauth/index.ts

@@ -437,7 +437,7 @@ function getPerplexityJwtExpiryMs(token: string): number | undefined {
  * Get API key for a provider from OAuth credentials.
  * Automatically refreshes expired tokens.
  *
- * For google-gemini-cli and antigravity, returns JSON-encoded credentials including token/projectId
+ * For providers that need credential metadata at request time, returns JSON-encoded credentials
  * plus refresh/expiry metadata for proactive refresh support.
  * @returns API key string, or null if no credentials
  * @throws Error if refresh fails
@@ -476,11 +476,13 @@ export async function getOAuthApiKey(
 			throw new Error(`Failed to refresh OAuth token for ${provider}: ${reason}`);
 		}
 	}
-	// For providers that need projectId, return JSON
-	const needsProjectId = provider === "google-gemini-cli" || provider === "google-antigravity";
-	const apiKey = needsProjectId
+	// For providers that need request-time credential metadata, return JSON.
+	const needsStructuredApiKey =
+		provider === "github-copilot" || provider === "google-gemini-cli" || provider === "google-antigravity";
+	const apiKey = needsStructuredApiKey
 		? JSON.stringify({
 				token: creds.access,
+				enterpriseUrl: creds.enterpriseUrl,
 				projectId: creds.projectId,
 				refreshToken: creds.refresh,
 				expiresAt: creds.expires,

package/src/utils.ts

@@ -38,7 +38,7 @@ export function normalizeResponsesToolCallId(id: string): { callId: string; item
 		const normalizedItemId = normalizeResponsesItemId(itemId);
 		return { callId: normalizedCallId, itemId: normalizedItemId };
 	}
-	const hash = Bun.hash.xxHash64(id).toString(36);
+	const hash = Bun.hash(id).toString(36);
 	const normalizedCallId = id.startsWith("call_") ? truncateResponseItemId(id, "call") : `call_${hash}`;
 	return { callId: normalizedCallId, itemId: `fc_${hash}` };
 }
@@ -51,7 +51,7 @@ function getIdPrefix(id: string, fallback: string): string {
 function normalizeResponsesItemId(itemId: string): string {
 	const prefix = getIdPrefix(itemId, "fc");
 	if (prefix !== "fc" && prefix !== "fcr") {
-		return `fc_${Bun.hash.xxHash64(itemId).toString(36)}`;
+		return `fc_${Bun.hash(itemId).toString(36)}`;
 	}
 	return truncateResponseItemId(itemId, prefix);
 }
@@ -62,7 +62,7 @@ function normalizeResponsesItemId(itemId: string): string {
  */
 export function truncateResponseItemId(id: string, prefix: string): string {
 	if (id.length <= 64) return id;
-	return `${prefix}_${Bun.hash.xxHash64(id).toString(36)}`;
+	return `${prefix}_${Bun.hash(id).toString(36)}`;
 }
 
 export function sanitizeOpenAIResponsesHistoryItemsForReplay(items: Array<Record<string, unknown>>): ResponseInput {