picocode-core 0.9.180 → 0.9.182

package/package.json

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

package/src/agent-transcript.js

@@ -1,4 +1,4 @@
-import { defaultTitle } from './tools/recorder.js'
+import { defaultTitle, toolResultOutput } from './tools/recorder.js'
 
 function parseCallArgs(call) {
   try {
@@ -30,7 +30,11 @@ function settleTool(tools, event) {
   if (!item) return
   item.status = event.type === 'tool_error' ? 'error' : 'done'
   item.error = event.error ? String(event.error) : null
-  item.fullOutput = event.result === undefined ? null : typeof event.result === 'string' ? event.result : JSON.stringify(event.result, null, 2)
+  item.fullOutput = toolResultOutput(item.name, event.result)
+  if (item.name === 'bash') {
+    item.exitCode = event.result?.exitCode
+    item.background = event.result?.status === 'running'
+  }
 }
 
 // a deliberation reads as turns: each turn owns the tool runs its

package/src/agent.js

@@ -98,6 +98,10 @@ export async function summarizeText({ text, modelName, auth }) {
   return getText(out.lastResponse?.content || '').trim()
 }
 
+function estimateTokens(value) {
+  return Math.ceil(JSON.stringify(value ?? '').length / 4)
+}
+
 export async function runTurn({ history, tools, recorder, modelName, effort, auth, system, signal, onStream, stallMs = STALL_MS }) {
   const collected = []
   let roundText = ''
@@ -108,6 +112,20 @@ export async function runTurn({ history, tools, recorder, modelName, effort, aut
   // of the current context as actually sent
   let cumulativePrompt = 0
   let lastPromptTokens = 0
+  let estimatedOutputChars = 0
+  let estimatedPromptTokens = 0
+  const estimatedUsage = () => {
+    const exact = usageSeen || {}
+    const completionTokens = (exact.completionTokens || 0) + Math.ceil(estimatedOutputChars / 4)
+    const prompt = (exact.promptTokens || 0) + estimatedPromptTokens
+    return {
+      promptTokens: prompt,
+      completionTokens,
+      totalTokens: prompt + completionTokens,
+      cachedTokens: exact.cachedTokens || 0,
+      thoughtTokens: exact.thoughtTokens || 0,
+    }
+  }
 
   const internal = new AbortController()
   const onUserAbort = () => internal.abort()
@@ -137,8 +155,15 @@ export async function runTurn({ history, tools, recorder, modelName, effort, aut
     arm()
     if (event.type === 'content') {
       roundText += event.content
+      estimatedOutputChars += String(event.content ?? '').length
+      onStream?.({ type: 'usage_estimate', usage: estimatedUsage() })
+    } else if (event.type === 'thinking') {
+      estimatedOutputChars += String(event.content ?? '').length
+      onStream?.({ type: 'usage_estimate', usage: estimatedUsage() })
     } else if (event.type === 'tool_calls_ready') {
       collected.push({ role: 'assistant', content: roundText, tool_calls: event.calls })
+      estimatedOutputChars += JSON.stringify(event.calls ?? []).length
+      onStream?.({ type: 'usage_estimate', usage: estimatedUsage() })
       roundText = ''
     } else if (event.type === 'tool_complete') {
       collected.push({ role: 'tool', tool_call_id: event.call.id, content: JSON.stringify(event.result) })
@@ -149,6 +174,8 @@ export async function runTurn({ history, tools, recorder, modelName, effort, aut
       const prompt = event.usage?.promptTokens || 0
       lastPromptTokens = Math.max(0, prompt - cumulativePrompt)
       cumulativePrompt = prompt
+      estimatedPromptTokens = 0
+      estimatedOutputChars = 0
     }
     onStream?.(event)
   }
@@ -158,12 +185,15 @@ export async function runTurn({ history, tools, recorder, modelName, effort, aut
     scope(
       { inherit: Inherit.Conversation, system, tools, until: noToolsCalled(), stream },
       async (ctx) => {
+        const hydratedHistory = await hydrateImages(ctx.history)
+        estimatedPromptTokens = estimateTokens({ system, history: hydratedHistory, tools })
+        onStream?.({ type: 'usage_estimate', usage: estimatedUsage() })
         const out = await model({
           model: modelName,
           ...(effort && { effort }),
           ...(auth?.apiKey && { apiKey: auth.apiKey }),
           ...(auth?.headers && { headers: auth.headers }),
-        })({ ...ctx, history: await hydrateImages(ctx.history), abortSignal: internal.signal })
+        })({ ...ctx, history: hydratedHistory, abortSignal: internal.signal })
         // Prepared bytes and omission notices belong only to the request, not
         // the conversation returned by the provider or subsequent tool rounds.
         return { ...out, history: [...ctx.history, ...out.history.slice(ctx.history.length)] }

package/src/controller.js

@@ -119,6 +119,7 @@ export function createController({ boot }) {
     startedAt: 0,
     overlay: [],
     streaming: null,
+    liveUsage: null,
     queued: [],
     expedited: [],
     views: [],
@@ -545,6 +546,15 @@ export function createController({ boot }) {
         set({ turnPhase: 'thinking' })
       } else if (event.type === 'content') {
         set({ turnPhase: 'responding', streaming: (state.streaming || '') + event.content })
+      } else if (event.type === 'usage' || event.type === 'usage_estimate') {
+        const base = state.derived.usageActive
+        set({ liveUsage: {
+          promptTokens: base.promptTokens + (event.usage.promptTokens || 0),
+          completionTokens: base.completionTokens + (event.usage.completionTokens || 0),
+          totalTokens: base.totalTokens + (event.usage.totalTokens || 0),
+          cachedTokens: base.cachedTokens + (event.usage.cachedTokens || 0),
+          thoughtTokens: base.thoughtTokens + (event.usage.thoughtTokens || 0),
+        } })
       } else if (event.type === 'tool_calls_ready') {
         set({ turnPhase: 'tools' })
         updateOverlay((items) => {
@@ -594,7 +604,7 @@ export function createController({ boot }) {
     const researchAgentLimit = nextResearchAgentLimit || null
     nextResearchAgentLimit = null
     emit('turn', 'start')
-    set({ busy: true, turnPhase: 'responding', startedAt: Date.now() })
+    set({ busy: true, turnPhase: 'responding', startedAt: Date.now(), liveUsage: null })
 
     const { auth, ok } = await codexAuth()
     if (!ok) {
@@ -643,7 +653,7 @@ export function createController({ boot }) {
       })
     } catch (err) {
       abort = null
-      set({ overlay: [], streaming: null, turnPhase: 'idle', busy: false })
+      set({ overlay: [], streaming: null, liveUsage: null, turnPhase: 'idle', busy: false })
       flash(`error: ${errorText(err, 120)}`)
       return
     }
@@ -665,6 +675,7 @@ export function createController({ boot }) {
     state.turnPhase = 'idle'
     state.busy = false
     reDerive()
+    set({ liveUsage: null })
     boot.git.refresh()
     if (result.stalled) {
       flash('model stalled · turn interrupted')

package/src/tools/recorder.js

@@ -22,6 +22,14 @@ export function defaultTitle(name, args = {}) {
   return raw.length > 60 ? raw.slice(0, 60) + '…' : raw
 }
 
+export function toolResultOutput(name, result) {
+  if (result === undefined) return null
+  if (name === 'bash' && result && typeof result === 'object') {
+    return [result.stdout, result.stderr].filter(Boolean).join('\n')
+  }
+  return typeof result === 'string' ? result : JSON.stringify(result, null, 2)
+}
+
 export function createRecorder(onChange) {
   return {
     currentCall: null,
@@ -67,9 +75,9 @@ export function recorded(recorder, name, fn) {
     recorder.begin(name, args)
     try {
       const result = await fn(args)
-      if (!recorder.pending?.fullOutput && result !== undefined) {
+      if (recorder.pending?.fullOutput == null && result !== undefined) {
         recorder.extra({
-          fullOutput: typeof result === 'string' ? result : JSON.stringify(result, null, 2),
+          fullOutput: toolResultOutput(name, result),
         })
       }
       recorder.done()