bingocode 1.1.200-beta.16 → 1.1.200-beta.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bingocode",
-  "version": "1.1.200-beta.16",
+  "version": "1.1.200-beta.18",
   "type": "module",
   "bin": {
     "claude": "bin/claude-win.cjs",

package/src/server/api/providers.ts

@@ -24,7 +24,7 @@ import {
 } from '../types/provider.js'
 import type { SlotName } from '../types/provider.js'
 import { ApiError, errorResponse } from '../middleware/errorHandler.js'
-import { requireAuth } from '../middleware/auth.js'
+
 
 const providerService = new ProviderService()
 providerService.init().catch((err) =>
@@ -105,11 +105,6 @@ export async function handleProvidersApi(
           { status: 403 },
         )
       }
-      // Also enforce Bearer-token auth (mirrors the global /api/ guard,
-      // but active even when the server is bound to localhost)
-      const authError = requireAuth(req)
-      if (authError) return authError
-
       if (req.method === 'GET') {
         const status = await providerService.getVscodeStatus()
         return Response.json(status)

package/src/server/config/providers.yaml

@@ -1,208 +1,229 @@
-version: 2
-
-# Provider Preset Configuration
-# fields array declares fields to be filled when adding
-# key: 'name' | 'apiKey' | 'baseUrl' mapped directly to top-level fields, others saved in extra.<key>
-# secret: true uses mask display in frontend
-#
-# modelsUrl: model list path relative to baseUrl, empty string means dynamic pulling not supported
-# modelsAuthStyle: bearer → Authorization: Bearer <apiKey>
-#                  x-api-key → x-api-key: <apiKey> + anthropic-version header
-# modelsDataPath: record field name for models array in JSON response (almost always 'data')
-
-presets:
-  - id: official
-    name: Claude Official
-    baseUrl: ''
-    apiFormat: anthropic
-    needsApiKey: false
-    websiteUrl: https://www.anthropic.com/claude-code
-    modelsUrl: /v1/models
-    modelsAuthStyle: x-api-key
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider Nickname
-        required: true
-        secret: false
-        placeholder: 'e.g. Claude Official'
-
-  - id: openai
-    name: OpenAI
-    baseUrl: https://api.openai.com/v1
-    apiFormat: openai_chat
-    needsApiKey: true
-    websiteUrl: https://platform.openai.com
-    modelsUrl: /v1/models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider Nickname
-        required: true
-        secret: false
-        placeholder: 'e.g. My OpenAI'
-      - key: apiKey
-        label: API Key
-        required: true
-        secret: true
-        placeholder: 'sk-...'
-      - key: baseUrl
-        label: Base URL (Optional)
-        required: false
-        secret: false
-        default: https://api.openai.com/v1
-        placeholder: 'https://api.openai.com/v1'
-
-  - id: gemini
-    name: Google Gemini
-    baseUrl: https://generativelanguage.googleapis.com/v1beta/openai
-    apiFormat: openai_chat
-    needsApiKey: true
-    websiteUrl: https://aistudio.google.com
-    modelsUrl: /v1/models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider Nickname
-        required: true
-        secret: false
-        placeholder: 'e.g. My Gemini'
-      - key: apiKey
-        label: API Key
-        required: true
-        secret: true
-        placeholder: 'Gemini API Key'
-
-  - id: mistral
-    name: Mistral AI
-    baseUrl: https://api.mistral.ai/v1
-    apiFormat: openai_chat
-    needsApiKey: true
-    websiteUrl: https://console.mistral.ai
-    modelsUrl: /v1/models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider Nickname
-        required: true
-        secret: false
-        placeholder: 'e.g. My Mistral'
-      - key: apiKey
-        label: API Key
-        required: true
-        secret: true
-        placeholder: 'Mistral API Key'
-
-  - id: deepseek
-    name: DeepSeek
-    baseUrl: https://api.deepseek.com/anthropic
-    apiFormat: anthropic
-    needsApiKey: true
-    websiteUrl: https://platform.deepseek.com
-    # Models list follows OpenAI endpoint (no /v1/models under /anthropic)
-    modelsUrl: https://api.deepseek.com/v1/models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider Nickname
-        required: true
-        secret: false
-        placeholder: 'e.g. My DeepSeek'
-      - key: apiKey
-        label: API Key
-        required: true
-        secret: true
-        placeholder: 'sk-...'
-
-  - id: zhipuglm
-    name: Zhipu GLM
-    baseUrl: https://open.bigmodel.cn/api/paas/v4
-    apiFormat: openai_chat
-    needsApiKey: true
-    websiteUrl: https://open.bigmodel.cn
-    modelsUrl: /v4/models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider Nickname
-        required: true
-        secret: false
-        placeholder: 'e.g. My GLM'
-      - key: apiKey
-        label: API Key
-        required: true
-        secret: true
-        placeholder: 'Zhipu API Key (glm-5.1)'
-
-  - id: kimi
-    name: Kimi
-    baseUrl: https://api.moonshot.ai/v1
-    apiFormat: openai_chat
-    needsApiKey: true
-    websiteUrl: https://platform.moonshot.cn
-    modelsUrl: /models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider Nickname
-        required: true
-        secret: false
-        placeholder: 'e.g. My Kimi'
-      - key: apiKey
-        label: API Key
-        required: true
-        secret: true
-        placeholder: 'Moonshot API Key (kimi-k2.6)'
-
-  - id: minimax
-    name: MiniMax
-    baseUrl: https://api.minimax.io/v1
-    apiFormat: openai_chat
-    needsApiKey: true
-    websiteUrl: https://platform.minimaxi.com
-    modelsUrl: /models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider Nickname
-        required: true
-        secret: false
-        placeholder: 'e.g. My MiniMax'
-      - key: apiKey
-        label: API Key
-        required: true
-        secret: true
-        placeholder: 'MiniMax API Key (MiniMax-M2.7)'
-
-  - id: custom
-    name: Custom
-    baseUrl: ''
-    apiFormat: openai_chat
-    needsApiKey: true
-    websiteUrl: ''
-    modelsUrl: /v1/models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider Nickname
-        required: true
-        secret: false
-        placeholder: 'e.g. My Custom Provider'
-      - key: baseUrl
-        label: Base URL
-        required: true
-        secret: false
-        placeholder: 'https://your-api-endpoint.com/v1'
-      - key: apiKey
-        label: API Key
-        required: false
-        secret: true
-        placeholder: '(Optional) API Key'
+version: 2
+
+# Provider Preset Configuration
+# fields array declares fields to be filled when adding
+# key: 'name' | 'apiKey' | 'baseUrl' mapped directly to top-level fields, others saved in extra.<key>
+# secret: true uses mask display in frontend
+#
+# modelsUrl: model list path relative to baseUrl, empty string means dynamic pulling not supported
+# modelsAuthStyle: bearer → Authorization: Bearer <apiKey>
+#                  x-api-key → x-api-key: <apiKey> + anthropic-version header
+# modelsDataPath: record field name for models array in JSON response (almost always 'data')
+
+presets:
+  - id: official
+    name: Claude Official
+    baseUrl: ''
+    apiFormat: anthropic
+    needsApiKey: false
+    websiteUrl: https://www.anthropic.com/claude-code
+    modelsUrl: /v1/models
+    modelsAuthStyle: x-api-key
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider Nickname
+        required: true
+        secret: false
+        placeholder: 'e.g. Claude Official'
+
+  - id: openai
+    name: OpenAI
+    baseUrl: https://api.openai.com/v1
+    apiFormat: openai_chat
+    needsApiKey: true
+    websiteUrl: https://platform.openai.com
+    modelsUrl: /v1/models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider Nickname
+        required: true
+        secret: false
+        placeholder: 'e.g. My OpenAI'
+      - key: apiKey
+        label: API Key
+        required: true
+        secret: true
+        placeholder: 'sk-...'
+      - key: baseUrl
+        label: Base URL (Optional)
+        required: false
+        secret: false
+        default: https://api.openai.com/v1
+        placeholder: 'https://api.openai.com/v1'
+
+  - id: gemini
+    name: Google Gemini
+    baseUrl: https://generativelanguage.googleapis.com/v1beta/openai
+    apiFormat: openai_chat
+    needsApiKey: true
+    websiteUrl: https://aistudio.google.com
+    modelsUrl: /v1/models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider Nickname
+        required: true
+        secret: false
+        placeholder: 'e.g. My Gemini'
+      - key: apiKey
+        label: API Key
+        required: true
+        secret: true
+        placeholder: 'Gemini API Key'
+
+  - id: mistral
+    name: Mistral AI
+    baseUrl: https://api.mistral.ai/v1
+    apiFormat: openai_chat
+    needsApiKey: true
+    websiteUrl: https://console.mistral.ai
+    modelsUrl: /v1/models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider Nickname
+        required: true
+        secret: false
+        placeholder: 'e.g. My Mistral'
+      - key: apiKey
+        label: API Key
+        required: true
+        secret: true
+        placeholder: 'Mistral API Key'
+
+  - id: deepseek
+    name: DeepSeek
+    baseUrl: https://api.deepseek.com/anthropic
+    apiFormat: anthropic
+    needsApiKey: true
+    websiteUrl: https://platform.deepseek.com
+    # Models list follows OpenAI endpoint (no /v1/models under /anthropic)
+    modelsUrl: https://api.deepseek.com/v1/models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider Nickname
+        required: true
+        secret: false
+        placeholder: 'e.g. My DeepSeek'
+      - key: apiKey
+        label: API Key
+        required: true
+        secret: true
+        placeholder: 'sk-...'
+
+  - id: nvidia
+    name: NVIDIA API
+    baseUrl: https://integrate.api.nvidia.com/v1
+    apiFormat: openai_chat
+    needsApiKey: true
+    websiteUrl: https://build.nvidia.com/explore/discover
+    modelsUrl: /models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider Nickname
+        required: true
+        secret: false
+        placeholder: 'e.g. My NVIDIA'
+      - key: apiKey
+        label: API Key
+        required: true
+        secret: true
+        placeholder: 'nvapi-...'
+
+  - id: zhipuglm
+    name: Zhipu GLM
+    baseUrl: https://open.bigmodel.cn/api/paas/v4
+    apiFormat: openai_chat
+    needsApiKey: true
+    websiteUrl: https://open.bigmodel.cn
+    modelsUrl: /v4/models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider Nickname
+        required: true
+        secret: false
+        placeholder: 'e.g. My GLM'
+      - key: apiKey
+        label: API Key
+        required: true
+        secret: true
+        placeholder: 'Zhipu API Key (glm-5.1)'
+
+  - id: kimi
+    name: Kimi
+    baseUrl: https://api.moonshot.ai/v1
+    apiFormat: openai_chat
+    needsApiKey: true
+    websiteUrl: https://platform.moonshot.cn
+    modelsUrl: /models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider Nickname
+        required: true
+        secret: false
+        placeholder: 'e.g. My Kimi'
+      - key: apiKey
+        label: API Key
+        required: true
+        secret: true
+        placeholder: 'Moonshot API Key (kimi-k2.6)'
+
+  - id: minimax
+    name: MiniMax
+    baseUrl: https://api.minimax.io/v1
+    apiFormat: openai_chat
+    needsApiKey: true
+    websiteUrl: https://platform.minimaxi.com
+    modelsUrl: /models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider Nickname
+        required: true
+        secret: false
+        placeholder: 'e.g. My MiniMax'
+      - key: apiKey
+        label: API Key
+        required: true
+        secret: true
+        placeholder: 'MiniMax API Key (MiniMax-M2.7)'
+
+  - id: custom
+    name: Custom
+    baseUrl: ''
+    apiFormat: openai_chat
+    needsApiKey: true
+    websiteUrl: ''
+    modelsUrl: /v1/models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider Nickname
+        required: true
+        secret: false
+        placeholder: 'e.g. My Custom Provider'
+      - key: baseUrl
+        label: Base URL
+        required: true
+        secret: false
+        placeholder: 'https://your-api-endpoint.com/v1'
+      - key: apiKey
+        label: API Key
+        required: false
+        secret: true
+        placeholder: '(Optional) API Key'

package/src/server/proxy/handler.ts

@@ -35,6 +35,19 @@ async function logToFile(message: string) {
   // Disabled log output for production
 }
 
+/**
+ * Normalize a base URL that may already contain a /v1 suffix,
+ * then append /v1/<path> so that double /v1 segments are avoided.
+ *
+ * Example:
+ *   "https://integrate.api.nvidia.com/v1" + "chat/completions"
+ *   => "https://integrate.api.nvidia.com/v1/chat/completions"   (not /v1/v1/...)
+ */
+function v1Url(baseUrl: string, path: string): string {
+  const normalized = baseUrl.replace(/\/v1\/?$/, '')
+  return `${normalized}/v1/${path.replace(/^\//, '')}`
+}
+
 function sendAnthropicError(message: string, _model: string | undefined, status = 502): Response {
   const fullMessage = `[Bingo Proxy] ${message}`
   void logToFile(`ERROR: ${fullMessage} (status: ${status})`)
@@ -176,7 +189,7 @@ async function handleAnthropicPassthrough(
   uiLabel: string | null = null,
   betaHeader: string | null = null,
 ): Promise<Response> {
-  const url = `${baseUrl}/v1/messages`
+  const url = v1Url(baseUrl, 'messages')
   const upstreamHeaders: Record<string, string> = {
     'Content-Type': 'application/json',
     'x-api-key': apiKey,
@@ -226,7 +239,7 @@ async function handleOpenaiChat(
   uiLabel: string | null = null,
 ): Promise<Response> {
   const transformed = anthropicToOpenaiChat(body)
-  const url = `${baseUrl}/v1/chat/completions`
+  const url = v1Url(baseUrl, 'chat/completions')
 
   const upstream = await fetch(url, {
     method: 'POST',
@@ -277,7 +290,7 @@ async function handleOpenaiResponses(
   uiLabel: string | null = null,
 ): Promise<Response> {
   const transformed = anthropicToOpenaiResponses(body)
-  const url = `${baseUrl}/v1/responses`
+  const url = v1Url(baseUrl, 'responses')
 
   const upstream = await fetch(url, {
     method: 'POST',

package/src/server/services/providerService.ts

@@ -1010,10 +1010,10 @@ export class ProviderService {
       let transformedBody: unknown
       if (format === 'openai_chat') {
         transformedBody = anthropicToOpenaiChat(anthropicReq)
-        upstreamUrl = `${base}/v1/chat/completions`
+        upstreamUrl = v1Url(base, 'chat/completions')
       } else {
         transformedBody = anthropicToOpenaiResponses(anthropicReq)
-        upstreamUrl = `${base}/v1/responses`
+        upstreamUrl = v1Url(base, 'responses')
       }
 
       // Call upstream with transformed request
@@ -1060,6 +1060,15 @@ export class ProviderService {
 
 // ─── Helpers ───────────────────────────────────────────────
 
+/**
+ * Normalize a base URL that may already contain a /v1 suffix,
+ * then append /v1/<path> so that double /v1 segments are avoided.
+ */
+function v1Url(base: string, path: string): string {
+  const normalized = base.replace(/\/v1\/?$/, '')
+  return `${normalized}/v1/${path.replace(/^\//, '')}`
+}
+
 function buildDirectTestRequest(
   base: string,
   apiKey: string,
@@ -1070,21 +1079,21 @@ function buildDirectTestRequest(
 
   if (format === 'openai_chat') {
     return {
-      url: `${base}/v1/chat/completions`,
+      url: v1Url(base, 'chat/completions'),
       headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${apiKey}` },
       body: { model: modelId, max_tokens: 16, messages: [{ role: 'user', content: prompt }] },
     }
   }
   if (format === 'openai_responses') {
     return {
-      url: `${base}/v1/responses`,
+      url: v1Url(base, 'responses'),
       headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${apiKey}` },
       body: { model: modelId, max_output_tokens: 16, input: [{ type: 'message', role: 'user', content: prompt }] },
     }
   }
   // anthropic
   return {
-    url: `${base}/v1/messages`,
+    url: v1Url(base, 'messages'),
     headers: { 'Content-Type': 'application/json', 'x-api-key': apiKey, 'anthropic-version': '2023-06-01' },
     body: { model: modelId, max_tokens: 16, messages: [{ role: 'user', content: prompt }] },
   }

package/src/tools/AgentTool/agentToolUtils.ts

@@ -55,7 +55,7 @@ import {
 } from '../../utils/permissions/yoloClassifier.js'
 import { emitTaskProgress as emitTaskProgressEvent } from '../../utils/task/sdkProgress.js'
 import { isInProcessTeammate } from '../../utils/teammateContext.js'
-import { getTokenCountFromUsage } from '../../utils/tokens.js'
+import { getTokenCountFromMessages } from '../../utils/tokens.js'
 import { EXIT_PLAN_MODE_V2_TOOL_NAME } from '../ExitPlanModeTool/constants.js'
 import { AGENT_TOOL_NAME, LEGACY_AGENT_TOOL_NAME } from './constants.js'
 import type { AgentDefinition } from './loadAgentsDir.js'
@@ -316,7 +316,7 @@ export function finalizeAgentTool(
     }
   }
 
-  const totalTokens = getTokenCountFromUsage(lastAssistantMessage.message.usage)
+  const totalTokens = getTokenCountFromMessages(agentMessages)
   const totalToolUseCount = countToolUses(agentMessages)
 
   logEvent('tengu_agent_tool_completed', {

package/src/utils/tokens.ts

@@ -52,6 +52,29 @@ export function getTokenCountFromUsage(usage: Usage): number {
   )
 }
 
+/**
+ * Calculate total tokens across all agent messages, matching the ProgressTracker
+ * accumulation logic in LocalAgentTask. In Claude's API:
+ * - input_tokens (and cache tokens) are cumulative per turn — each call already
+ *   includes all previous context, so we keep only the LATEST value.
+ * - output_tokens are per-turn independent, so we SUM them across all turns.
+ */
+export function getTokenCountFromMessages(messages: Message[]): number {
+  let latestInputTokens = 0
+  let cumulativeOutputTokens = 0
+  for (const message of messages) {
+    const usage = getTokenUsage(message)
+    if (usage) {
+      latestInputTokens =
+        usage.input_tokens +
+        (usage.cache_creation_input_tokens ?? 0) +
+        (usage.cache_read_input_tokens ?? 0)
+      cumulativeOutputTokens += usage.output_tokens
+    }
+  }
+  return latestInputTokens + cumulativeOutputTokens
+}
+
 export function tokenCountFromLastAPIResponse(messages: Message[]): number {
   let i = messages.length - 1
   while (i >= 0) {