picocode-core 0.9.175 → 0.9.177

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "picocode-core",
-  "version": "0.9.175",
+  "version": "0.9.177",
   "description": "The agent runtime behind pico: sessions, tools, subagents, MCP, memory, and model access",
   "type": "module",
   "license": "MIT",

package/src/controller.js

@@ -834,7 +834,11 @@ export function createController({ boot }) {
     const completed = completedToolCalls(state.derived.providerHistory)
     const unavailable = ids.filter((id) => !completed.has(id))
     if (unavailable.length) return flash(`error: tool calls are not completed in current context: ${unavailable.join(', ')}`)
-    persist(makeEvent(type, { callIds: ids, version: TOOL_TRIM_VERSION }))
+    const eligible = type === 'tool_trim'
+      ? ids.filter((id) => !state.derived.trimmedToolIds.has(id))
+      : ids.filter((id) => state.derived.toolItems.get(id)?.contextTrimmed)
+    if (!eligible.length) return false
+    persist(makeEvent(type, { callIds: eligible, version: TOOL_TRIM_VERSION }))
     ensureSession()
     reDerive()
     return true

package/src/derive.js

@@ -180,6 +180,7 @@ export function deriveState(events) {
     toolItems: new Map(),
     latestCompactIndex,
     trimmedToolIds: new Set(),
+    toolTrimVersions: new Map(),
   }
 
   for (const event of effectiveEvents) {
@@ -259,7 +260,10 @@ export function deriveState(events) {
         break
       }
       case 'tool_trim':
-        for (const callId of event.data.callIds || []) state.trimmedToolIds.add(callId)
+        for (const callId of event.data.callIds || []) {
+          state.trimmedToolIds.add(callId)
+          state.toolTrimVersions.set(callId, event.data.version?.algorithm || 'tool-trim-v1')
+        }
         state.lastPromptTokens = 0
         break
       case 'tool_restore':
@@ -272,6 +276,7 @@ export function deriveState(events) {
         state.historyEventIds = []
         state.toolItems = new Map()
         state.trimmedToolIds = new Set()
+        state.toolTrimVersions = new Map()
         state.lastPromptTokens = 0
         break
       case 'context_file':
@@ -299,7 +304,7 @@ export function deriveState(events) {
   }
 
   const effectiveHistory = elideStaleToolResults(state.providerHistory)
-  state.providerHistory = applyToolTrims(effectiveHistory, state.trimmedToolIds)
+  state.providerHistory = applyToolTrims(effectiveHistory, state.trimmedToolIds, state.toolTrimVersions, state.toolItems)
   annotateToolContext(state, state.providerHistory, state.trimmedToolIds)
   return state
 }

package/src/tool-trimming.js

@@ -92,7 +92,7 @@ export function completedToolCalls(history) {
   return new Map([...callsIn(history)].filter(([, entry]) => entry.result))
 }
 
-export function applyToolTrims(history, trimmedIds) {
+export function applyToolTrims(history, trimmedIds, versions = new Map(), toolItems = new Map()) {
   if (!trimmedIds.size) return history
   const completed = completedToolCalls(history)
   const callMessages = new Map()
@@ -106,8 +106,18 @@ export function applyToolTrims(history, trimmedIds) {
       callMessages.set(entry.callIndex, callMessage)
     }
     const call = callMessage.tool_calls.find((candidate) => candidate.id === id)
-    call.function.arguments = trimArguments(call.function.arguments)
-    resultMessages.set(entry.resultIndex, { ...entry.result, content: trimResult(entry.result.content) })
+    if (versions.get(id) === 'tool-compact-v2') {
+      const item = toolItems.get(id)
+      let args
+      try { args = JSON.parse(call.function.arguments) } catch { args = {} }
+      const description = item?.description || args?.description || call.function.name
+      call.function.arguments = JSON.stringify({ description })
+      const outcome = item?.status === 'error' ? 'error' : item?.status || 'completed'
+      resultMessages.set(entry.resultIndex, { ...entry.result, content: `[${outcome}; tool arguments and result compacted, originals retained in session log]` })
+    } else {
+      call.function.arguments = trimArguments(call.function.arguments)
+      resultMessages.set(entry.resultIndex, { ...entry.result, content: trimResult(entry.result.content) })
+    }
   }
   return history.map((message, index) => callMessages.get(index) || resultMessages.get(index) || message)
 }
@@ -118,20 +128,23 @@ function resultText(content) {
   return JSON.stringify(content ?? '')
 }
 
+function entryTokens(args, result) {
+  return Math.ceil((String(args ?? '').length + resultText(result).length) / 4)
+}
+
 export function annotateToolContext(state, effectiveHistory, trimmedIds) {
   const completed = completedToolCalls(effectiveHistory)
   for (const item of state.toolItems.values()) {
     const entry = completed.get(item.callId)
     item.contextAvailable = !!entry
     item.contextTrimmed = !!entry && trimmedIds.has(item.callId)
-    item.contextTokens = entry
-      ? Math.ceil((String(entry.call.function.arguments ?? '').length + resultText(entry.result.content).length) / 4)
-      : 0
+    item.contextTokens = entry ? entryTokens(entry.call.function.arguments, entry.result.content) : 0
+    item.contextCanTrim = !!entry && !item.contextTrimmed
   }
 }
 
 export const TOOL_TRIM_VERSION = {
-  algorithm: ALGORITHM,
+  algorithm: 'tool-compact-v2',
   argumentChars: ARGUMENT_CHARS,
   resultChars: RESULT_CHARS,
   stringChars: STRING_CHARS,