picocode-core 0.9.177 → 0.9.179

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "picocode-core",
-  "version": "0.9.177",
+  "version": "0.9.179",
   "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,
@@ -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']
 
@@ -183,6 +183,14 @@ export function deriveState(events) {
     toolTrimVersions: new Map(),
   }
 
+  const references = toolResultArchive(events).references
+  const historyTokens = () => Math.ceil(JSON.stringify(applyToolTrims(
+    elideStaleToolResults(state.providerHistory), state.trimmedToolIds,
+    state.toolTrimVersions, state.toolItems, references,
+  )).length / 4)
+  let measuredBaseline = null
+  let contextEdited = false
+
   for (const event of effectiveEvents) {
     if (event.type === 'usage') {
       if (!dropped.has(event.id)) {
@@ -194,6 +202,8 @@ export function deriveState(events) {
         if (event.data.lastPrompt !== undefined) {
           state.lastPromptTokens = event.data.lastPrompt
           state.lastPromptModel = event.data.model
+          measuredBaseline = { tokens: event.data.lastPrompt, history: historyTokens() }
+          contextEdited = false
         }
       }
       continue
@@ -238,6 +248,8 @@ export function deriveState(events) {
         if (!canceledUndoTargets.has(event.id)) foldRewind(state, event)
         break
       case 'compact': {
+        measuredBaseline = null
+        contextEdited = false
         const { summary, keepFrom, sessionFile } = event.data
         if (keepFrom !== undefined || sessionFile) {
           const idx = keepFrom ? state.historyEventIds.indexOf(keepFrom) : -1
@@ -260,6 +272,7 @@ export function deriveState(events) {
         break
       }
       case 'tool_trim':
+        contextEdited = true
         for (const callId of event.data.callIds || []) {
           state.trimmedToolIds.add(callId)
           state.toolTrimVersions.set(callId, event.data.version?.algorithm || 'tool-trim-v1')
@@ -267,10 +280,13 @@ export function deriveState(events) {
         state.lastPromptTokens = 0
         break
       case 'tool_restore':
+        contextEdited = true
         for (const callId of event.data.callIds || []) state.trimmedToolIds.delete(callId)
         state.lastPromptTokens = 0
         break
       case 'clear':
+        measuredBaseline = null
+        contextEdited = false
         state.transcript = []
         state.providerHistory = []
         state.historyEventIds = []
@@ -303,8 +319,11 @@ export function deriveState(events) {
     }
   }
 
+  state.estimatedPromptTokens = contextEdited && measuredBaseline
+    ? Math.max(0, measuredBaseline.tokens + historyTokens() - measuredBaseline.history)
+    : null
   const effectiveHistory = elideStaleToolResults(state.providerHistory)
-  state.providerHistory = applyToolTrims(effectiveHistory, state.trimmedToolIds, state.toolTrimVersions, state.toolItems)
+  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, versions = new Map(), toolItems = new Map()) {
+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()
@@ -112,8 +133,9 @@ export function applyToolTrims(history, trimmedIds, versions = new Map(), toolIt
       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]` })
+      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) })

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