bingocode 1.1.200-beta.17 → 1.1.200-beta.19

package/package.json

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

package/src/server/services/providerService.ts

@@ -9,6 +9,7 @@
 import * as fs from 'fs/promises'
 import * as path from 'path'
 import * as os from 'os'
+import { parse as parseJsonc } from 'jsonc-parser/lib/esm/main.js'
 import { getDirectFetchOptions } from '../../utils/proxy.ts'
 import { ApiError } from '../middleware/errorHandler.js'
 import { anthropicToOpenaiChat } from '../proxy/transform/anthropicToOpenaiChat.js'
@@ -620,7 +621,9 @@ export class ProviderService {
       let originalContent: string | null = null
       try {
         originalContent = await fs.readFile(settingsPath, "utf-8")
-        settings = JSON.parse(originalContent)
+        // VS Code settings.json uses JSONC (JSON with comments) —
+        // parseJsonc handles comments/trailing commas, unlike JSON.parse
+        settings = parseJsonc(originalContent) as Record<string, unknown>
       } catch {
         // File does not exist yet — start fresh
       }
@@ -650,7 +653,9 @@ export class ProviderService {
 
       try {
         await fs.mkdir(path.dirname(settingsPath), { recursive: true })
-        await fs.writeFile(settingsPath, JSON.stringify(settings, null, 4) + '\n')
+        const tmpPath = `${settingsPath}.tmp.${Date.now()}`
+        await fs.writeFile(tmpPath, JSON.stringify(settings, null, 4) + '\n')
+        await fs.rename(tmpPath, settingsPath)
         writtenPaths.push(settingsPath)
       } catch (err) {
         failedPaths.push(settingsPath)
@@ -661,7 +666,9 @@ export class ProviderService {
         // Fix #11: Attempt restore from backup on write failure
         if (originalContent !== null) {
           try {
-            await fs.writeFile(settingsPath, originalContent, "utf-8")
+            const tmpPath2 = `${settingsPath}.tmp.${Date.now()}`
+            await fs.writeFile(tmpPath2, originalContent, "utf-8")
+            await fs.rename(tmpPath2, settingsPath)
             console.error(`[ProviderService] Restored ${settingsPath} from in-memory copy after write failure`)
           } catch {
             // In-memory restore failed, try .bak file
@@ -694,7 +701,9 @@ export class ProviderService {
         const original = originalContents.get(p)
         try {
           if (original !== null) {
-            await fs.writeFile(p, original, "utf-8")
+            const tmpPath = `${p}.tmp.${Date.now()}`
+            await fs.writeFile(tmpPath, original, "utf-8")
+            await fs.rename(tmpPath, p)
           } else {
             await fs.unlink(p).catch(() => {})
           }
@@ -754,14 +763,16 @@ export class ProviderService {
     for (const settingsPath of linkedPaths) {
       try {
         const raw = await fs.readFile(settingsPath, "utf-8")
-        const settings = JSON.parse(raw)
+        const settings = parseJsonc(raw) as Record<string, unknown>
         settings.claudeCode = preLinkClaudeCode[settingsPath] ?? {
           preferredLocation: "panel",
           environmentVariables: [
             { name: "ANTHROPIC_BASE_URL", value: "https://api.anthropic.com" },
           ],
         }
-        await fs.writeFile(settingsPath, JSON.stringify(settings, null, 4) + '\n')
+        const tmpPath = `${settingsPath}.tmp.${Date.now()}`
+        await fs.writeFile(tmpPath, JSON.stringify(settings, null, 4) + '\n')
+        await fs.rename(tmpPath, settingsPath)
       } catch {
         // File may have been moved or deleted since linking — harmless
       }

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) {