fix: implement 5 bug fixes from upstream PRs

- Auto re-authenticate on 401 (PR ericc-ch#202)
- Set response object type for non-streaming (PR ericc-ch#185)
- Fix tool 400 error with missing properties (PR ericc-ch#192)
- Fix model name translation regex (PR ericc-ch#180)
- Filter Anthropic reserved keywords from system prompts (PR ericc-ch#175)

Co-authored-by: xuangong <xuangong@users.noreply.github.com>
Co-authored-by: Vincenthays <Vincenthays@users.noreply.github.com>
Co-authored-by: h4ai <h4ai@users.noreply.github.com>
Co-authored-by: wonderyl <wonderyl@users.noreply.github.com>
Co-authored-by: qihonggang <qihonggang@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: 7 people

src/lib/token.ts

@@ -15,6 +15,15 @@ const readGithubToken = () => fs.readFile(PATHS.GITHUB_TOKEN_PATH, "utf8")
 const writeGithubToken = (token: string) =>
   fs.writeFile(PATHS.GITHUB_TOKEN_PATH, token)
 
+const clearGithubToken = async () => {
+  state.githubToken = undefined
+  try {
+    await fs.unlink(PATHS.GITHUB_TOKEN_PATH)
+  } catch {
+    // Ignore if file doesn't exist
+  }
+}
+
 export const setupCopilotToken = async () => {
   const { token, refresh_in } = await getCopilotToken()
   state.copilotToken = token
@@ -51,33 +60,49 @@ export async function setupGitHubToken(
 ): Promise<void> {
   try {
     const githubToken = await readGithubToken()
+    let needsReAuth = false
 
     if (githubToken && !options?.force) {
       state.githubToken = githubToken
       if (state.showToken) {
         consola.info("GitHub token:", githubToken)
       }
-      await logUser()
 
-      return
+      // PR #202: Auto re-authenticate on 401 (@xuangong)
+      // If the stored token is invalid, clear it and fall through to re-auth
+      try {
+        await logUser()
+        return // Token is valid, we're done
+      } catch (error) {
+        if (error instanceof HTTPError && error.response.status === 401) {
+          consola.warn("Stored GitHub token is invalid, re-authenticating...")
+          await clearGithubToken()
+          needsReAuth = true
+        } else {
+          throw error
+        }
+      }
     }
 
-    consola.info("Not logged in, getting new access token")
-    const response = await getDeviceCode()
-    consola.debug("Device code response:", response)
+    if (!githubToken || options?.force || needsReAuth) {
+      consola.info("Not logged in, getting new access token")
+      const response = await getDeviceCode()
+      consola.debug("Device code response:", response)
 
-    consola.info(
-      `Please enter the code "${response.user_code}" in ${response.verification_uri}`,
-    )
+      consola.info(
+        `Please enter the code "${response.user_code}" in ${response.verification_uri}`,
+      )
 
-    const token = await pollAccessToken(response)
-    await writeGithubToken(token)
-    state.githubToken = token
+      const newToken = await pollAccessToken(response)
+      await writeGithubToken(newToken)
+      // eslint-disable-next-line require-atomic-updates -- function is not called concurrently
+      state.githubToken = newToken
 
-    if (state.showToken) {
-      consola.info("GitHub token:", token)
+      if (state.showToken) {
+        consola.info("GitHub token:", newToken)
+      }
+      await logUser()
     }
-    await logUser()
   } catch (error) {
     if (error instanceof HTTPError) {
       consola.error("Failed to get GitHub token:", await error.response.json())

src/routes/chat-completions/handler.ts

@@ -51,7 +51,8 @@ export async function handleCompletion(c: Context) {
 
   if (isNonStreaming(response)) {
     consola.debug("Non-streaming response:", JSON.stringify(response))
-    return c.json(response)
+    // Add object type for pydantic_ai compatibility (PR #185 by @Vincenthays)
+    return c.json({ ...response, object: "chat.completion" })
   }
 
   consola.debug("Streaming response")

src/routes/messages/non-stream-translation.ts

@@ -47,11 +47,16 @@ export function translateToOpenAI(
 }
 
 function translateModelName(model: string): string {
+  // PR #180: Fix model name translation (@wonderyl)
   // Subagent requests use a specific model number which Copilot doesn't support
-  if (model.startsWith("claude-sonnet-4-")) {
-    return model.replace(/^claude-sonnet-4-.*/, "claude-sonnet-4")
-  } else if (model.startsWith("claude-opus-")) {
-    return model.replace(/^claude-opus-4-.*/, "claude-opus-4")
+  // Match patterns like claude-sonnet-4-5-20250929 or claude-sonnet-4-20250929
+  if (model.startsWith("claude-sonnet-4")) {
+    return model.replace(
+      /^claude-sonnet-4(?:-\d+)?(?:-\d{8})?$/,
+      "claude-sonnet-4",
+    )
+  } else if (model.startsWith("claude-opus-4")) {
+    return model.replace(/^claude-opus-4(?:-\d+)?(?:-\d{8})?$/, "claude-opus-4")
   }
   return model
 }
@@ -71,6 +76,21 @@ function translateAnthropicMessagesToOpenAI(
   return [...systemMessages, ...otherMessages]
 }
 
+// PR #175: Filter Anthropic reserved keywords (@qihonggang)
+// Filter out Anthropic-specific billing headers from system prompts
+const ANTHROPIC_RESERVED_KEYWORDS = [
+  "x-anthropic-billing-header",
+  "x-anthropic-billing",
+]
+
+function filterAnthropicKeywords(text: string): string {
+  let filtered = text
+  for (const keyword of ANTHROPIC_RESERVED_KEYWORDS) {
+    filtered = filtered.replaceAll(new RegExp(keyword, "gi"), "")
+  }
+  return filtered
+}
+
 function handleSystemPrompt(
   system: string | Array<AnthropicTextBlock> | undefined,
 ): Array<Message> {
@@ -79,10 +99,10 @@ function handleSystemPrompt(
   }
 
   if (typeof system === "string") {
-    return [{ role: "system", content: system }]
+    return [{ role: "system", content: filterAnthropicKeywords(system) }]
   } else {
     const systemText = system.map((block) => block.text).join("\n\n")
-    return [{ role: "system", content: systemText }]
+    return [{ role: "system", content: filterAnthropicKeywords(systemText) }]
   }
 }
 
@@ -228,6 +248,17 @@ function mapContent(
   return contentParts
 }
 
+// PR #192: Fix tool 400 error (@h4ai)
+// Ensure object schemas always have a properties field to avoid Copilot API errors
+function normalizeToolSchema(
+  schema: Record<string, unknown>,
+): Record<string, unknown> {
+  if (schema.type === "object" && !schema.properties) {
+    return { ...schema, properties: {} }
+  }
+  return schema
+}
+
 function translateAnthropicToolsToOpenAI(
   anthropicTools: Array<AnthropicTool> | undefined,
 ): Array<Tool> | undefined {
@@ -239,7 +270,7 @@ function translateAnthropicToolsToOpenAI(
     function: {
       name: tool.name,
       description: tool.description,
-      parameters: tool.input_schema,
+      parameters: normalizeToolSchema(tool.input_schema),
     },
   }))
 }