picocode-core 0.9.176 → 0.9.178

package/package.json

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

package/src/controller.js

@@ -11,7 +11,7 @@ import { createAgentManager } from './agents.js'
 import { runDeliberation, validateDeliberation } from './deliberation.js'
 import { deliberationsFromEvents } from './deliberation-history.js'
 import { compactionPrompt, formatCompactSummary, summarySections, compactionKeepFrom } from './compaction.js'
-import { completedToolCalls, TOOL_TRIM_VERSION } from './tool-trimming.js'
+import { completedToolCalls, retrieveToolResult, TOOL_TRIM_VERSION } from './tool-trimming.js'
 import { createToolset } from './tools/index.js'
 import { defaultTitle } from './tools/recorder.js'
 import { scanUserTools } from './user-tools.js'
@@ -603,6 +603,7 @@ export function createController({ boot }) {
     const context = await createAgentContext(boot, { userTools: userToolScan.tools })
     const { tools, recorder } = createToolset({
       ...context.tools,
+      toolResult: (id) => retrieveToolResult(state.events, id),
       sessionId: state.session?.id,
       sessionFile: state.session?.file,
       wakeups: boot.wakeups,
@@ -835,7 +836,7 @@ export function createController({ boot }) {
     const unavailable = ids.filter((id) => !completed.has(id))
     if (unavailable.length) return flash(`error: tool calls are not completed in current context: ${unavailable.join(', ')}`)
     const eligible = type === 'tool_trim'
-      ? ids.filter((id) => state.derived.toolItems.get(id)?.contextCanTrim)
+      ? 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 }))
@@ -1217,6 +1218,7 @@ export function createController({ boot }) {
     return createToolset({
       cwd: boot.cwd,
       env: boot.env,
+      toolResult: (id) => retrieveToolResult(state.events, id),
       hostTools: boot.hostTools ?? [],
       tracker: boot.tracker,
       skills: boot.skills,

package/src/derive.js

@@ -1,6 +1,6 @@
 import { continuationMessage } from './compaction.js'
 import { applySteering } from './steer.js'
-import { annotateToolContext, applyToolTrims } from './tool-trimming.js'
+import { annotateToolContext, applyToolTrims, toolResultArchive } from './tool-trimming.js'
 
 const DROPPING_MODES = ['both', 'chat', 'summary']
 
@@ -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, toolResultArchive(events).references)
   annotateToolContext(state, state.providerHistory, state.trimmedToolIds)
   return state
 }

package/src/tool-trimming.js

@@ -92,7 +92,28 @@ export function completedToolCalls(history) {
   return new Map([...callsIn(history)].filter(([, entry]) => entry.result))
 }
 
-export function applyToolTrims(history, trimmedIds) {
+export function toolResultArchive(events) {
+  const history = events.filter((event) => event.type === 'message').map((event) => event.data.message)
+  const references = new Map()
+  for (const message of history) {
+    for (const call of message.tool_calls || []) {
+      if (!references.has(call.id)) references.set(call.id, `t${references.size + 1}`)
+    }
+  }
+  const results = new Map()
+  for (const [callId, entry] of completedToolCalls(history)) {
+    results.set(references.get(callId), { callId, name: entry.call.function.name, arguments: entry.call.function.arguments, result: entry.result.content })
+  }
+  return { references, results }
+}
+
+export function retrieveToolResult(events, id) {
+  const result = toolResultArchive(events).results.get(id)
+  if (!result) throw new Error(`no saved tool result with id ${id}`)
+  return structuredClone(result)
+}
+
+export function applyToolTrims(history, trimmedIds, versions = new Map(), toolItems = new Map(), references = new Map()) {
   if (!trimmedIds.size) return history
   const completed = completedToolCalls(history)
   const callMessages = new Map()
@@ -106,8 +127,19 @@ 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 error = item?.status === 'error' ? `error: ${item.error || 'tool failed'}\n` : ''
+      const reference = references.get(id)
+      resultMessages.set(entry.resultIndex, { ...entry.result, content: `${error}[compacted; retrieve with tool_result(${JSON.stringify({ id: reference })})]` })
+    } 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)
 }
@@ -129,13 +161,12 @@ export function annotateToolContext(state, effectiveHistory, trimmedIds) {
     item.contextAvailable = !!entry
     item.contextTrimmed = !!entry && trimmedIds.has(item.callId)
     item.contextTokens = entry ? entryTokens(entry.call.function.arguments, entry.result.content) : 0
-    item.contextCanTrim = !!entry && !item.contextTrimmed &&
-      entryTokens(trimArguments(entry.call.function.arguments), trimResult(entry.result.content)) < item.contextTokens
+    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,

package/src/tools/index.js

@@ -7,7 +7,7 @@ import { createGlob } from './glob.js'
 import { createGrep } from './grep.js'
 import { createView } from './view.js'
 
-export function createToolset({ cwd, env, tracker, skills, shells, sessionId, sessionFile, wakeups, memory, agents, deliberations, onAgentsCollected, askUser, mcpTools = [], userTools = [], hostTools = [], signal, maxToolCalls, maxAgentStarts, requireAgentPlan = false, allowNames, onToolUpdate, viewer }) {
+export function createToolset({ toolResult, cwd, env, tracker, skills, shells, sessionId, sessionFile, wakeups, memory, agents, deliberations, onAgentsCollected, askUser, mcpTools = [], userTools = [], hostTools = [], signal, maxToolCalls, maxAgentStarts, requireAgentPlan = false, allowNames, onToolUpdate, viewer }) {
   const recorder = createRecorder(onToolUpdate)
   let agentStarts = 0
   let plannedAgentStarts = requireAgentPlan ? null : maxAgentStarts
@@ -22,6 +22,16 @@ export function createToolset({ cwd, env, tracker, skills, shells, sessionId, se
     createGrep(deps),
   ]
 
+  if (toolResult) local.push({
+    name: 'tool_result',
+    description: 'Retrieve the original arguments and result of a compacted tool call using its retrieval ID. This reads saved data without rerunning the tool or restoring other calls.',
+    schema: {
+      description: describeParam,
+      id: { type: 'string', description: 'retrieval ID shown in the compacted result, such as t42' },
+    },
+    execute: ({ id }) => toolResult(id),
+  })
+
   if (viewer) local.push(createView({ ...deps, viewer }))
 
   if (shells) {