picocode-core 0.9.155 → 0.9.157

package/package.json

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

package/src/agent.js

@@ -1,11 +1,31 @@
 import { readFile } from 'node:fs/promises'
+import { execFile } from 'node:child_process'
+import { promisify } from 'node:util'
 import { compose, scope, model, noToolsCalled, Inherit, getText } from '@prsm/ai'
-import { fileLabel, mediaTypeFor, selectionLabel } from './attachments.js'
+import { commitLabel, fileLabel, mediaTypeFor, selectionLabel } from './attachments.js'
+
+const exec = promisify(execFile)
+const COMMIT_PATCH_LIMIT = 60 * 1024
+
+// a commit part carries the commit itself: its header, stat, and patch,
+// cut off past the limit, so the model reads what happened without a
+// git call of its own
+export async function hydrateCommit(part) {
+  const head = commitLabel(part)
+  try {
+    const { stdout } = await exec('git', ['--no-optional-locks', 'show', '--stat', '--patch', '--format=%H%nAuthor: %an <%ae>%nDate: %ad%n%n%B', part.hash], { cwd: part.root, maxBuffer: COMMIT_PATCH_LIMIT * 4 })
+    const body = stdout.length > COMMIT_PATCH_LIMIT ? `${stdout.slice(0, COMMIT_PATCH_LIMIT)}\n[patch truncated at ${COMMIT_PATCH_LIMIT} bytes]` : stdout
+    return { type: 'text', text: `${head}\n${body.trimEnd()}\n[/commit]` }
+  } catch {
+    return { type: 'text', text: `${head}\n[commit unavailable]\n[/commit]` }
+  }
+}
 
 // file parts reach the model as a labelled path; it reads them itself
 async function hydratePart(part) {
   if (part.type === 'file') return { type: 'text', text: fileLabel(part.path) }
   if (part.type === 'selection') return { type: 'text', text: selectionLabel(part) }
+  if (part.type === 'commit') return hydrateCommit(part)
   if (part.type !== 'image' || part.source?.kind !== 'path') return part
   const mediaType = part.source.mediaType || mediaTypeFor(part.source.path)
   if (!mediaType) return { type: 'text', text: `[image unavailable: ${part.source.path}]` }

package/src/attachments.js

@@ -72,6 +72,7 @@ export function splitTextByImagePaths(text, exists = existsSync) {
 
 export const fileLabel = (path) => `[file: ${path}]`
 export const selectionLabel = (part) => `[selection: ${part.path}:${part.fromLine}-${part.toLine}]\n${part.text}\n[/selection]`
+export const commitLabel = (part) => `[commit: ${part.hash.slice(0, 7)} ${JSON.stringify(part.subject ?? '')}]`
 
 // [Image #n] and [File #n] placeholders in the composed text stand for
 // attachments; they become image, file, or selection parts of the user message
@@ -86,6 +87,8 @@ export function buildUserContent(text, attachments) {
     if (before) parts.push({ type: 'text', text: before })
     parts.push(attachment.kind === 'selection'
       ? { type: 'selection', path: attachment.path, text: attachment.text, fromLine: attachment.fromLine, toLine: attachment.toLine, ...(Number.isInteger(attachment.fromColumn) ? { fromColumn: attachment.fromColumn } : {}), ...(Number.isInteger(attachment.toColumn) ? { toColumn: attachment.toColumn } : {}) }
+      : attachment.kind === 'commit'
+        ? { type: 'commit', hash: attachment.hash, subject: attachment.subject, root: attachment.root }
       : attachment.kind === 'file'
         ? { type: 'file', path: attachment.path }
         : { type: 'image', source: { kind: 'path', path: attachment.path, mediaType: attachment.mediaType } })
@@ -128,6 +131,10 @@ export function inputTextFromContent(content, { attachments, nextId }) {
       const placeholder = `[File #${nextId()}]`
       attachments.set(placeholder, { path: part.path, kind: 'file' })
       out += placeholder
+    } else if (part.type === 'commit' && part.hash) {
+      const placeholder = `[File #${nextId()}]`
+      attachments.set(placeholder, { hash: part.hash, subject: part.subject, root: part.root, kind: 'commit' })
+      out += placeholder
     } else if (part.type === 'selection' && part.path) {
       const placeholder = `[File #${nextId()}]`
       attachments.set(placeholder, { path: part.path, text: part.text, fromLine: part.fromLine, toLine: part.toLine, ...(Number.isInteger(part.fromColumn) ? { fromColumn: part.fromColumn } : {}), ...(Number.isInteger(part.toColumn) ? { toColumn: part.toColumn } : {}), kind: 'selection' })

package/src/controller.js

@@ -30,6 +30,7 @@ import { loadCodexModels } from './codex-models.js'
 import { fuzzyScore } from './fuzzy.js'
 import { MAX_DELIBERATION_ROUNDS } from './deliberation.js'
 import { buildUserContent, finalizeUserContent, inputTextFromContent, mediaTypeFor, stashImages } from './attachments.js'
+import { settlePending } from './pending.js'
 
 export const EFFORT_LEVELS = [
   { key: null, desc: 'let the provider decide how much to think' },
@@ -118,6 +119,7 @@ export function createController({ boot }) {
     streaming: null,
     queued: [],
     expedited: [],
+    views: [],
     sent: [],
     question: null,
     rewindUndo: null,
@@ -396,16 +398,18 @@ export function createController({ boot }) {
     state.streaming = null
   }
 
-  async function executeTurn(text) {
-    // an image the model asked to view arrives with its path in the label;
-    // that text must not be scanned for image paths or it attaches twice
-    const built = buildUserContent(text, state.attachments)
-    const viewed = built.used.length > 0 && built.used.every((placeholder) => deliveredImages.has(placeholder))
-    const { content: built2, used } = viewed ? built : finalizeUserContent(text, state.attachments)
-    for (const placeholder of used) deliveredImages.delete(placeholder)
+  async function persistUserMessage(text, { viewed = false } = {}) {
+    // a view label carries the image's path; only user text is scanned
+    // for paths, or the viewed image would attach twice
+    const { content: built } = viewed ? buildUserContent(text, state.attachments) : finalizeUserContent(text, state.attachments)
     ensureSession()
-    const content = state.session.file ? await stashImages(built2, sessionAttachmentsDir(boot.root, state.session.id)) : built2
+    const content = state.session.file ? await stashImages(built, sessionAttachmentsDir(boot.root, state.session.id)) : built
     persist(makeEvent('message', { message: { role: 'user', content }, ...(viewed ? { origin: 'view' } : {}) }))
+  }
+
+  async function executeTurn(text, { views = [] } = {}) {
+    for (const view of views) await persistUserMessage(view, { viewed: true })
+    if (text) await persistUserMessage(text)
     reDerive()
     await runAgentTurn()
   }
@@ -463,11 +467,12 @@ export function createController({ boot }) {
       set({ compacting: false, compactStatus: null, busy: false })
     }
 
-    if (state.expedited.length > 0 || state.queued.length > 0) {
-      const next = takePending()
-      if (controller.signal.aborted) emit('input', next.join('\n'))
+    if (state.expedited.length > 0 || state.queued.length > 0 || state.views.length > 0) {
+      const settled = settlePending({ ...state, interrupted: controller.signal.aborted })
+      set({ expedited: [], queued: settled.queued, views: [] })
+      if (settled.recall.length > 0) emit('input', settled.recall.join('\n'))
       else {
-        executeTurn(next.join('\n'))
+        executeTurn(settled.messages.join('\n'), { views: settled.views })
         return
       }
     }
@@ -571,7 +576,7 @@ export function createController({ boot }) {
               : item,
           ),
         )
-        if (state.expedited.length > 0) {
+        if (state.expedited.length > 0 || state.views.length > 0) {
           sendAfterToolTriggered = true
           controller.abort()
         }
@@ -680,18 +685,15 @@ export function createController({ boot }) {
       )
     }
 
-    const expeditedMessages = state.expedited
-    const pendingMessages = state.queued
-    if (expeditedMessages.length > 0 || pendingMessages.length > 0) {
-      set({ expedited: [], queued: [] })
+    if (state.expedited.length > 0 || state.queued.length > 0 || state.views.length > 0) {
       // an interrupt is the user taking the wheel: nothing pending may
-      // auto-send, expedited or not; it all returns to the composer
-      if (result.interrupted && !sendAfterToolTriggered) {
-        emit('input', [...expeditedMessages, ...pendingMessages].join('\n'))
-      } else {
-        const next = sendAfterToolTriggered ? expeditedMessages : [...expeditedMessages, ...pendingMessages]
-        if (sendAfterToolTriggered && pendingMessages.length > 0) set({ queued: pendingMessages })
-        executeTurn(next.join('\n'))
+      // auto-send, expedited or not; it all returns to the composer, and
+      // an image the model asked for is dropped with the turn
+      const settled = settlePending({ ...state, afterTool: sendAfterToolTriggered, interrupted: result.interrupted })
+      set({ expedited: [], queued: settled.queued, views: [] })
+      if (settled.recall.length > 0) emit('input', settled.recall.join('\n'))
+      else {
+        executeTurn(settled.messages.join('\n'), { views: settled.views })
         return
       }
     }
@@ -749,6 +751,7 @@ export function createController({ boot }) {
     state.rewindUndo = null
     state.queued = []
     state.expedited = []
+    state.views = []
     state.sent = []
     state.model = model ?? state.defaultModel
     state.effort = effort === undefined ? state.defaultEffort : effort
@@ -795,6 +798,7 @@ export function createController({ boot }) {
     state.rewindUndo = null
     state.queued = []
     state.expedited = []
+    state.views = []
     state.sent = []
     agents.restore(forked.events)
     reDerive()
@@ -854,12 +858,10 @@ export function createController({ boot }) {
 
   // an image the model asked to see rides in as an expedited user message,
   // which the tool-completion path sends right after the current call
-  const deliveredImages = new Set()
   function deliverImage(path, label) {
     const placeholder = attachImage(path)
     if (!placeholder) return false
-    deliveredImages.add(placeholder)
-    set({ expedited: [...state.expedited, `${label}\n${placeholder}`] })
+    set({ views: [...state.views, `${label}\n${placeholder}`] })
     return true
   }
 
@@ -877,6 +879,15 @@ export function createController({ boot }) {
     return placeholder
   }
 
+  // a commit of the session's repository; the model receives the commit
+  // itself when the message is sent
+  function attachCommit({ hash, subject = '' }) {
+    if (!/^[0-9a-f]{7,40}$/i.test(String(hash ?? ''))) return null
+    const placeholder = `[File #${++state.imageCount}]`
+    state.attachments.set(placeholder, { hash, subject: String(subject), root: boot.root, kind: 'commit' })
+    return placeholder
+  }
+
   // a project-relative pick: images attach as images, anything else as a
   // file reference
   function attachProjectFile(file) {
@@ -949,7 +960,7 @@ export function createController({ boot }) {
       boot.git.retarget(next.root)
       next.mcp.connectAll()
       emit('mcp', next.mcp.list())
-      set({ queued: [], expedited: [] })
+      set({ queued: [], expedited: [], views: [] })
       emit('project', boot)
       await resume(meta)
       flash(`switched to ${next.displayCwd}`)
@@ -1372,6 +1383,7 @@ export function createController({ boot }) {
     attachImage,
     attachFile,
     attachSelection,
+    attachCommit,
     attachProjectFile,
     detachImage,
     costSummary,

package/src/derive.js

@@ -101,7 +101,7 @@ function foldMessage(state, event) {
   if (message.role === 'user') {
     const text = Array.isArray(message.content)
       ? message.content
-          .map((p) => (p.type === 'text' ? p.text : p.type === 'file' ? `[file: ${p.path}]` : p.type === 'selection' ? `[selection: ${p.path}:${p.fromLine}-${p.toLine}]` : `[image: ${String(p.source?.path || '').split('/').pop() || 'attached'}]`))
+          .map((p) => (p.type === 'text' ? p.text : p.type === 'file' ? `[file: ${p.path}]` : p.type === 'selection' ? `[selection: ${p.path}:${p.fromLine}-${p.toLine}]` : p.type === 'commit' ? `[commit: ${String(p.hash).slice(0, 7)}]` : `[image: ${String(p.source?.path || '').split('/').pop() || 'attached'}]`))
           .join('')
       : String(message.content)
     state.transcript.push({ ...base, kind: 'user', text, content: message.content, ...(event.data.origin ? { origin: event.data.origin } : {}) })

package/src/pending.js

@@ -0,0 +1,8 @@
+// what happens to the messages waiting on a turn once it ends. images the
+// model asked to view travel apart from the user's own text, so a view
+// delivery is never folded into a user message
+export function settlePending({ views = [], expedited = [], queued = [], afterTool = false, interrupted = false }) {
+  if (interrupted && !afterTool) return { views: [], messages: [], queued: [], recall: [...expedited, ...queued] }
+  if (afterTool) return { views, messages: expedited, queued, recall: [] }
+  return { views, messages: [...expedited, ...queued], queued: [], recall: [] }
+}