fix: improve size calculation for LRU cache and handle nested object content

This commit is contained in:
xutianyi
2026-04-05 01:43:18 +08:00
parent f49c7d7e8c
commit 354c11f035
2 changed files with 27 additions and 4 deletions

View File

@@ -34,7 +34,18 @@ export class FileStateCache {
this.cache = new LRUCache<string, FileState>({
max: maxEntries,
maxSize: maxSizeBytes,
sizeCalculation: value => Math.max(1, Buffer.byteLength(value.content)),
sizeCalculation: value => {
const c = value.content
const s =
typeof c === 'string'
? c
: c === null || c === undefined
? ''
: typeof c === 'object'
? JSON.stringify(c)
: String(c)
return Math.max(1, Buffer.byteLength(s, 'utf8'))
},
})
}

View File

@@ -45,6 +45,14 @@ export type PermissionPromptTool = Tool<
// during permission prompts or limited tool operations
const ASK_READ_FILE_STATE_CACHE_SIZE = 10
/** Transcript JSON may deserialize Write tool `content` as a nested object — LRU needs strings. */
function coerceToolContentToString(value: unknown): string {
if (typeof value === 'string') return value
if (value === null || value === undefined) return ''
if (typeof value === 'object') return JSON.stringify(value)
return String(value)
}
/**
* Checks if the result should be considered successful based on the last message.
* Returns true if:
@@ -402,14 +410,18 @@ export function extractReadFilesFromMessages(
) {
// Extract file_path and content from the Write tool use input
const input = content.input as
| { file_path?: string; content?: string }
| { file_path?: string; content?: unknown }
| undefined
if (input?.file_path && input?.content) {
if (
input?.file_path &&
input.content !== undefined &&
input.content !== null
) {
// Normalize to absolute path for consistent cache lookups
const absolutePath = expandPath(input.file_path, cwd)
fileWriteToolUseIds.set(content.id, {
filePath: absolutePath,
content: input.content,
content: coerceToolContentToString(input.content),
})
}
} else if (