bingocode 1.1.200-beta.9 → 1.1.201

package/src/utils/attachments.ts

@@ -64,6 +64,7 @@ import {
 } from 'src/types/textInputTypes.js'
 import { randomUUID, type UUID } from 'crypto'
 import { getInitialSettings, getSettings_DEPRECATED } from './settings/settings.js'
+import { getCurrentSessionBrainMode } from './sessionStorage.js'
 import { getSnippetForTwoFileDiff } from 'src/tools/FileEditTool/utils.js'
 import type {
   ContentBlockParam,
@@ -1594,7 +1595,6 @@ function getCriticalSystemReminderAttachment(
 }
 
 function getBrainModeReminderAttachment(): Attachment[] {
-  const { getCurrentSessionBrainMode } = require('./sessionStorage.js')
   if (!getInitialSettings().brainMode && !getCurrentSessionBrainMode()) {
     return []
   }
@@ -1602,7 +1602,7 @@ function getBrainModeReminderAttachment(): Attachment[] {
     {
       type: 'system_reminder' as const,
       content:
-        '/brain active — Only use Agent and AskUserQuestion. Do NOT use Bash/Read/Grep/Glob/Write/Edit directly. Delegate everything.',
+        '/brain active — You are the high-dimensional thinker. Delegate everything through Agent.',
     },
   ]
 }

package/src/utils/context.ts

@@ -6,7 +6,7 @@ import { getCanonicalName } from './model/model.js'
 import { getModelCapability } from './model/modelCapabilities.js'
 
 // Model context window size (200k tokens for all models right now)
-export const MODEL_CONTEXT_WINDOW_DEFAULT = 200_000
+export const MODEL_CONTEXT_WINDOW_DEFAULT = 1_000_000
 
 // Maximum output tokens for compact operations
 export const COMPACT_MAX_OUTPUT_TOKENS = 20_000

package/src/utils/sessionStorage.ts

@@ -2303,6 +2303,7 @@ export async function loadTranscriptFromFile(
   filePath: string,
 ): Promise<LogOption> {
   if (filePath.endsWith('.jsonl')) {
+    const data = await loadTranscriptFile(filePath)
     const {
       messages,
       summaries,
@@ -2315,7 +2316,7 @@ export async function loadTranscriptFromFile(
       leafUuids,
       contentReplacements,
       worktreeStates,
-    } = await loadTranscriptFile(filePath)
+    } = data
 
     if (messages.size === 0) {
       throw new Error('No messages found in JSONL file')
@@ -2360,6 +2361,7 @@ export async function loadTranscriptFromFile(
       worktreeSession: worktreeStates.has(sessionId)
         ? worktreeStates.get(sessionId)
         : undefined,
+      brainMode: resolveBrainMode(data, sessionId),
     }
   }
 
@@ -2988,6 +2990,7 @@ export async function loadFullLog(log: LogOption): Promise<LogOption> {
   }
 
   try {
+    const data = await loadTranscriptFile(sessionFile)
     const {
       messages,
       summaries,
@@ -3008,7 +3011,7 @@ export async function loadFullLog(log: LogOption): Promise<LogOption> {
       contextCollapseCommits,
       contextCollapseSnapshot,
       leafUuids,
-    } = await loadTranscriptFile(sessionFile)
+    } = data
 
     if (messages.size === 0) {
       return log
@@ -3044,7 +3047,7 @@ export async function loadFullLog(log: LogOption): Promise<LogOption> {
       agentColor: sessionId ? agentColors.get(sessionId) : log.agentColor,
       agentSetting: sessionId ? agentSettings.get(sessionId) : log.agentSetting,
       mode: sessionId ? (modes.get(sessionId) as LogOption['mode']) : log.mode,
-      brainMode: sessionId ? brainModes.get(sessionId) : log.brainMode,
+      brainMode: sessionId ? resolveBrainMode(data, sessionId) : log.brainMode,
       worktreeSession:
         sessionId && worktreeStates.has(sessionId)
           ? worktreeStates.get(sessionId)
@@ -3633,7 +3636,7 @@ export async function loadTranscriptFile(
           agentColors.set(entry.sessionId, entry.agentColor)
         } else if (entry.type === 'agent-setting' && entry.sessionId) {
           agentSettings.set(entry.sessionId, entry.agentSetting)
-} else if (entry.type === 'mode' && entry.sessionId) {
+        } else if (entry.type === 'mode' && entry.sessionId) {
           modes.set(entry.sessionId, entry.mode)
         } else if (entry.type === 'brain-mode' && entry.sessionId) {
           brainModes.set(entry.sessionId, entry.brainMode)
@@ -3851,6 +3854,17 @@ export async function loadTranscriptFile(
   }
 }
 
+/**
+ * Resolves the brainMode flag for a given session from a loaded transcript.
+ * Encapsulates the Map.get() pattern so callers do not need to remember it.
+ */
+export function resolveBrainMode(
+  transcript: Awaited<ReturnType<typeof loadTranscriptFile>>,
+  sessionId: string,
+): boolean | undefined {
+  return transcript.brainModes.get(sessionId as UUID)
+}
+
 /**
  * Loads all messages, summaries, file history snapshots, and attribution snapshots from a specific session file.
  */
@@ -3860,6 +3874,11 @@ async function loadSessionFile(sessionId: UUID): Promise<{
   customTitles: Map<UUID, string>
   tags: Map<UUID, string>
   agentSettings: Map<UUID, string>
+  agentColors: Map<UUID, string>
+  modes: Map<UUID, string>
+  prNumbers: Map<UUID, number>
+  prUrls: Map<UUID, string>
+  prRepositories: Map<UUID, string>
   worktreeStates: Map<UUID, PersistedWorktreeSession | null>
   fileHistorySnapshots: Map<UUID, FileHistorySnapshotMessage>
   attributionSnapshots: Map<UUID, AttributionSnapshotMessage>
@@ -3910,12 +3929,18 @@ export async function getLastSessionLog(
   sessionId: UUID,
 ): Promise<LogOption | null> {
   // Single read: load all session data at once instead of reading the file twice
+  const data = await loadSessionFile(sessionId)
   const {
     messages,
     summaries,
     customTitles,
     tags,
     agentSettings,
+    modes,
+    agentColors,
+    prNumbers,
+    prUrls,
+    prRepositories,
     worktreeStates,
     brainModes,
     fileHistorySnapshots,
@@ -3923,7 +3948,7 @@ export async function getLastSessionLog(
     contentReplacements,
     contextCollapseCommits,
     contextCollapseSnapshot,
-  } = await loadSessionFile(sessionId)
+  } = data
   if (messages.size === 0) return null
   // Prime getSessionMessages cache so recordTranscript (called after REPL
   // mount on --resume) skips a second full file load. -170~227ms on large sessions.
@@ -3962,7 +3987,12 @@ export async function getLastSessionLog(
       contentReplacements.get(sessionId) ?? [],
     ),
     worktreeSession: worktreeStates.get(sessionId),
-    brainMode: brainModes.get(sessionId),
+    brainMode: resolveBrainMode(data, sessionId),
+    mode: modes.get(sessionId) as 'coordinator' | 'normal' | undefined,
+    agentColor: agentColors.get(sessionId),
+    prNumber: prNumbers.get(sessionId),
+    prUrl: prUrls.get(sessionId),
+    prRepository: prRepositories.get(sessionId),
     contextCollapseCommits: contextCollapseCommits.filter(
       e => e.sessionId === sessionId,
     ),
@@ -4641,6 +4671,7 @@ export async function loadAllLogsFromSessionFile(
   sessionFile: string,
   projectPathOverride?: string,
 ): Promise<LogOption[]> {
+  const data = await loadTranscriptFile(sessionFile, { keepAllLeaves: true })
   const {
     messages,
     summaries,
@@ -4658,7 +4689,7 @@ export async function loadAllLogsFromSessionFile(
     attributionSnapshots,
     contentReplacements,
     leafUuids,
-  } = await loadTranscriptFile(sessionFile, { keepAllLeaves: true })
+  } = data
 
   if (messages.size === 0) return []
 
@@ -4716,7 +4747,7 @@ export async function loadAllLogsFromSessionFile(
       agentColor: agentColors.get(sessionId),
       agentSetting: agentSettings.get(sessionId),
       mode: modes.get(sessionId) as LogOption['mode'],
-      brainMode: brainModes.get(sessionId),
+      brainMode: resolveBrainMode(data, sessionId),
       prNumber: prNumbers.get(sessionId),
       prUrl: prUrls.get(sessionId),
       prRepository: prRepositories.get(sessionId),

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