opencodekit 0.15.11 → 0.15.12

package/dist/index.js

@@ -750,7 +750,7 @@ var cac = (name = "") => new CAC(name);
 // package.json
 var package_default = {
   name: "opencodekit",
-  version: "0.15.11",
+  version: "0.15.12",
   description: "CLI tool for bootstrapping and managing OpenCodeKit projects",
   keywords: ["agents", "cli", "mcp", "opencode", "opencodekit", "template"],
   license: "MIT",

package/dist/template/.opencode/package.json

@@ -11,7 +11,7 @@
     "type-check": "tsc --noEmit"
   },
   "dependencies": {
-    "@opencode-ai/plugin": "1.1.36"
+    "@opencode-ai/plugin": "1.1.39"
   },
   "devDependencies": {
     "@types/node": "^25.0.3",

package/dist/template/.opencode/plugin/copilot-auth.ts

@@ -5,7 +5,11 @@
 
 import type { Plugin } from "@opencode-ai/plugin";
 
-const CLIENT_ID = "Iv1.b507a08c87ecfe98";
+const CLIENT_ID = "Ov23li8tweQw6odWQebz";
+
+// Add a small safety buffer when polling to avoid hitting the server
+// slightly too early due to clock skew / timer drift.
+const OAUTH_POLLING_SAFETY_MARGIN_MS = 3000; // 3 seconds
 
 const HEADERS = {
 	"User-Agent": "GitHubCopilotChat/0.35.0",
@@ -40,11 +44,12 @@ function getUrls(domain: string) {
 	return {
 		DEVICE_CODE_URL: `https://${domain}/login/device/code`,
 		ACCESS_TOKEN_URL: `https://${domain}/login/oauth/access_token`,
-		COPILOT_API_KEY_URL: `https://api.github.com/copilot_internal/v2/token`,
 	};
 }
 
-export const CopilotAuthPlugin: Plugin = async ({ client }) => {
+const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
+
+export const CopilotAuthPlugin: Plugin = async ({ client: _client }) => {
 	return {
 		auth: {
 			provider: "github-copilot",
@@ -52,6 +57,11 @@ export const CopilotAuthPlugin: Plugin = async ({ client }) => {
 				const info = await getAuth();
 				if (!info || info.type !== "oauth") return {};
 
+				const enterpriseUrl = info.enterpriseUrl;
+				const baseURL = enterpriseUrl
+					? `https://copilot-api.${normalizeDomain(enterpriseUrl)}`
+					: undefined;
+
 				if (provider && provider.models) {
 					for (const model of Object.values(provider.models)) {
 						model.cost = {
@@ -62,71 +72,47 @@ export const CopilotAuthPlugin: Plugin = async ({ client }) => {
 								write: 0,
 							},
 						};
+
+						// Sync with official: Handle Claude routing and SDK mapping
+						const base =
+							baseURL ?? model.api.url ?? "https://api.githubcopilot.com";
+						const isClaude = model.id.includes("claude");
+
+						let url = base;
+						if (isClaude) {
+							if (!url.endsWith("/v1")) {
+								url = url.endsWith("/") ? `${url}v1` : `${url}/v1`;
+							}
+						}
+
+						model.api.url = url;
+						model.api.npm = isClaude
+							? "@ai-sdk/anthropic"
+							: "@ai-sdk/github-copilot";
 					}
 				}
 
-				const enterpriseUrl = info.enterpriseUrl;
-				const baseURL = enterpriseUrl
-					? `https://copilot-api.${normalizeDomain(enterpriseUrl)}`
-					: "https://api.githubcopilot.com";
-
 				return {
-					baseURL,
 					apiKey: "",
 					async fetch(input, init) {
 						const info = await getAuth();
-						if (info.type !== "oauth") return {};
-						if (!info.access) {
-							const domain = info.enterpriseUrl
-								? normalizeDomain(info.enterpriseUrl)
-								: "github.com";
-							const urls = getUrls(domain);
-
-							const response = await fetch(urls.COPILOT_API_KEY_URL, {
-								headers: {
-									Accept: "application/json",
-									Authorization: `Bearer ${info.refresh}`,
-									...HEADERS,
-								},
-							});
-
-							if (!response.ok) {
-								throw new Error(`Token refresh failed: ${response.status}`);
-							}
-
-							const tokenData = await response.json();
-
-							const saveProviderID = info.enterpriseUrl
-								? "github-copilot-enterprise"
-								: "github-copilot";
-							await client.auth.set({
-								path: {
-									id: saveProviderID,
-								},
-								body: {
-									type: "oauth",
-									refresh: info.refresh,
-									access: tokenData.token,
-									expires: tokenData.expires_at * 1000 - 5 * 60 * 1000,
-									...(info.enterpriseUrl && {
-										enterpriseUrl: info.enterpriseUrl,
-									}),
-								},
-							});
-							info.access = tokenData.token;
-						}
+						if (info.type !== "oauth") return fetch(input, init);
 
 						let isAgentCall = false;
 						let isVisionRequest = false;
 						try {
 							const body =
-								typeof init.body === "string"
+								typeof init?.body === "string"
 									? JSON.parse(init.body)
-									: init.body;
-							if (body?.messages) {
-								isAgentCall = body.messages.some(
-									(msg: any) =>
-										msg.role && ["tool", "assistant"].includes(msg.role),
+									: init?.body;
+
+							const url = input.toString();
+
+							// Completions API
+							if (body?.messages && url.includes("completions")) {
+								// Keep local logic: detect if any message is assistant/tool
+								isAgentCall = body.messages.some((msg: any) =>
+									["tool", "assistant"].includes(msg.role),
 								);
 								isVisionRequest = body.messages.some(
 									(msg: any) =>
@@ -135,34 +121,58 @@ export const CopilotAuthPlugin: Plugin = async ({ client }) => {
 								);
 							}
 
+							// Responses API
 							if (body?.input) {
-								const lastInput = body.input[body.input.length - 1];
-
-								const isAssistant = lastInput?.role === "assistant";
-								const hasAgentType = lastInput?.type
-									? RESPONSES_API_ALTERNATE_INPUT_TYPES.includes(lastInput.type)
-									: false;
-								isAgentCall = isAssistant || hasAgentType;
-
-								isVisionRequest =
-									Array.isArray(lastInput?.content) &&
-									lastInput.content.some(
-										(part: any) => part.type === "input_image",
-									);
+								isAgentCall = body.input.some(
+									(item: any) =>
+										item?.role === "assistant" ||
+										(item?.type &&
+											RESPONSES_API_ALTERNATE_INPUT_TYPES.includes(item.type)),
+								);
+
+								isVisionRequest = body.input.some(
+									(item: any) =>
+										Array.isArray(item?.content) &&
+										item.content.some(
+											(part: any) => part.type === "input_image",
+										),
+								);
+							}
+
+							// Messages API (Anthropic style)
+							if (body?.messages && !url.includes("completions")) {
+								isAgentCall = body.messages.some((msg: any) =>
+									["tool", "assistant"].includes(msg.role),
+								);
+								isVisionRequest = body.messages.some(
+									(item: any) =>
+										Array.isArray(item?.content) &&
+										item.content.some(
+											(part: any) =>
+												part?.type === "image" ||
+												(part?.type === "tool_result" &&
+													Array.isArray(part?.content) &&
+													part.content.some(
+														(nested: any) => nested?.type === "image",
+													)),
+										),
+								);
 							}
 						} catch {}
 
-						const headers = {
-							...init.headers,
+						const headers: Record<string, string> = {
+							"x-initiator": isAgentCall ? "agent" : "user",
+							...(init?.headers as Record<string, string>),
 							...HEADERS,
-							Authorization: `Bearer ${info.access}`,
+							Authorization: `Bearer ${info.refresh}`,
 							"Openai-Intent": "conversation-edits",
-							"X-Initiator": isAgentCall ? "agent" : "user",
 						};
+
 						if (isVisionRequest) {
 							headers["Copilot-Vision-Request"] = "true";
 						}
 
+						// Official only deletes lowercase "authorization"
 						delete headers["x-api-key"];
 						delete headers["authorization"];
 
@@ -286,7 +296,7 @@ export const CopilotAuthPlugin: Plugin = async ({ client }) => {
 										} = {
 											type: "success",
 											refresh: data.access_token,
-											access: "",
+											access: data.access_token,
 											expires: 0,
 										};
 
@@ -299,16 +309,33 @@ export const CopilotAuthPlugin: Plugin = async ({ client }) => {
 									}
 
 									if (data.error === "authorization_pending") {
-										await new Promise((resolve) =>
-											setTimeout(resolve, deviceData.interval * 1000),
+										await sleep(
+											deviceData.interval * 1000 +
+												OAUTH_POLLING_SAFETY_MARGIN_MS,
 										);
 										continue;
 									}
 
+									if (data.error === "slow_down") {
+										// Based on the RFC spec, we must add 5 seconds to our current polling interval.
+										let newInterval = (deviceData.interval + 5) * 1000;
+
+										if (
+											data.interval &&
+											typeof data.interval === "number" &&
+											data.interval > 0
+										) {
+											newInterval = data.interval * 1000;
+										}
+
+										await sleep(newInterval + OAUTH_POLLING_SAFETY_MARGIN_MS);
+										continue;
+									}
+
 									if (data.error) return { type: "failed" };
 
-									await new Promise((resolve) =>
-										setTimeout(resolve, deviceData.interval * 1000),
+									await sleep(
+										deviceData.interval * 1000 + OAUTH_POLLING_SAFETY_MARGIN_MS,
 									);
 									continue;
 								}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "opencodekit",
-	"version": "0.15.11",
+	"version": "0.15.12",
 	"description": "CLI tool for bootstrapping and managing OpenCodeKit projects",
 	"keywords": ["agents", "cli", "mcp", "opencode", "opencodekit", "template"],
 	"license": "MIT",