picocode-core 0.9.156 → 0.9.158

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "picocode-core",
-  "version": "0.9.156",
+  "version": "0.9.158",
   "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,42 @@
 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)
+// a whole patch rides along only while it is small; a bigger commit
+// arrives as its header and stat, and the model pulls the files it cares
+// about with git show. 8KB is a couple of thousand tokens
+const COMMIT_PATCH_LIMIT = 8 * 1024
+const COMMIT_STAT_FILES = 80
+const GIT_SHOW = ['--no-optional-locks', 'show', '--format=%H%nAuthor: %an <%ae>%nDate: %ad%n%n%B']
+
+function trimStat(stat) {
+  const lines = stat.trimEnd().split('\n')
+  if (lines.length <= COMMIT_STAT_FILES + 1) return stat.trimEnd()
+  return [...lines.slice(0, COMMIT_STAT_FILES), `... ${lines.length - COMMIT_STAT_FILES - 1} more files`, lines.at(-1)].join('\n')
+}
+
+export async function hydrateCommit(part) {
+  const head = commitLabel(part)
+  const options = { cwd: part.root, maxBuffer: 64 * 1024 * 1024 }
+  try {
+    const { stdout: full } = await exec('git', [...GIT_SHOW, '--stat', '--patch', part.hash], options)
+    if (full.length <= COMMIT_PATCH_LIMIT) return { type: 'text', text: `${head}\n${full.trimEnd()}\n[/commit]` }
+    const { stdout: stat } = await exec('git', [...GIT_SHOW, '--stat', part.hash], options)
+    const note = `[patch omitted: ${Math.round(full.length / 1024)}KB; run git show ${part.hash.slice(0, 7)} -- <path> for the files you need]`
+    return { type: 'text', text: `${head}\n${trimStat(stat)}\n${note}\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

@@ -879,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) {
@@ -1374,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 } : {}) })