picocode-core 0.9.133 → 0.9.135

package/package.json

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

package/src/commands.js

@@ -3,6 +3,8 @@ import { join } from 'node:path'
 import { picoHome } from './paths.js'
 import { parseFrontmatter } from './skills.js'
 
+const ARGUMENT = /\{\{([A-Za-z][A-Za-z0-9_-]*):(path|text|choice\(([^{}()]*)\))(?:\:([^{}]*))?\}\}/g
+
 export function globalCommandsDir() {
   return join(picoHome(), 'commands')
 }
@@ -11,6 +13,31 @@ export function projectCommandsDir(root) {
   return join(root, '.pico', 'commands')
 }
 
+function inferredLabel(name) {
+  const words = name.replace(/[-_]+/g, ' ').trim()
+  return words ? words[0].toUpperCase() + words.slice(1) : name
+}
+
+export function parseCommandArguments(body) {
+  const arguments_ = []
+  const seen = new Set()
+  for (const match of body.matchAll(ARGUMENT)) {
+    const [, name, typeSpec, choicesText, explicitLabel] = match
+    if (seen.has(name)) continue
+    const type = typeSpec.startsWith('choice(') ? 'choice' : typeSpec
+    const choices = type === 'choice' ? choicesText.split(',').map((v) => v.trim()).filter(Boolean) : undefined
+    if (type === 'choice' && choices.length === 0) continue
+    seen.add(name)
+    arguments_.push({
+      name,
+      type,
+      label: explicitLabel?.trim() || inferredLabel(name),
+      ...(choices ? { choices } : {}),
+    })
+  }
+  return arguments_
+}
+
 async function scanDir(dir, source) {
   let names = []
   try {
@@ -22,24 +49,42 @@ async function scanDir(dir, source) {
   for (const file of names) {
     if (!file.endsWith('.md')) continue
     try {
-      const { meta } = parseFrontmatter(await readFile(join(dir, file), 'utf-8'))
+      const text = await readFile(join(dir, file), 'utf-8')
+      const { meta, body } = parseFrontmatter(text)
       commands.push({
         name: file.slice(0, -3),
         description: meta.description || '',
         source,
         file: join(dir, file),
+        arguments: parseCommandArguments(body),
       })
     } catch {}
   }
   return commands
 }
 
-export function expandCommand(body, args) {
-  return body.includes('$ARGUMENTS')
-    ? body.replaceAll('$ARGUMENTS', args)
+export function expandCommand(body, args = '', namedValues = {}) {
+  if (args && typeof args === 'object' && !Array.isArray(args)) {
+    namedValues = args
+    args = ''
+  }
+  args = String(args ?? '')
+  namedValues = namedValues && typeof namedValues === 'object' ? namedValues : {}
+  const metadata = new Map(parseCommandArguments(body).map((argument) => [argument.name, argument]))
+  const rendered = body.replace(ARGUMENT, (markup, name) => {
+    const argument = metadata.get(name)
+    if (!argument) return markup
+    const value = Object.hasOwn(namedValues, name) ? String(namedValues[name] ?? '') : ''
+    if (argument.type === 'choice' && value && !argument.choices.includes(value)) {
+      throw new TypeError(`Invalid value for command argument "${name}"`)
+    }
+    return value
+  })
+  return rendered.includes('$ARGUMENTS')
+    ? rendered.replaceAll('$ARGUMENTS', () => args)
     : args
-      ? `${body.trim()}\n\n${args}`
-      : body
+      ? `${rendered.trim()}\n\n${args}`
+      : rendered
 }
 
 export async function createCommandIndex(root) {
@@ -51,11 +96,11 @@ export async function createCommandIndex(root) {
 
   return {
     list: () => commands,
-    async load(name, args = '') {
+    async load(name, args = '', namedValues = {}) {
       const command = byName.get(name)
       if (!command) return null
       const { body } = parseFrontmatter(await readFile(command.file, 'utf-8'))
-      return expandCommand(body.trim(), args.trim())
+      return expandCommand(body.trim(), args, namedValues)
     },
   }
 }

package/src/controller.js

@@ -28,7 +28,7 @@ import { connectOpenAI, openaiCredentials, disconnectOpenAI } from './openai-aut
 import { agentScratchDir, ensureDir } from './paths.js'
 import { loadCodexModels } from './codex-models.js'
 import { fuzzyScore } from './fuzzy.js'
-import { finalizeUserContent, inputTextFromContent, mediaTypeFor } from './attachments.js'
+import { buildUserContent, finalizeUserContent, inputTextFromContent, mediaTypeFor } from './attachments.js'
 
 export const EFFORT_LEVELS = [
   { key: null, desc: 'let the provider decide how much to think' },
@@ -364,8 +364,11 @@ export function createController({ boot }) {
   }
 
   async function executeTurn(text) {
-    const { content, used } = finalizeUserContent(text, state.attachments)
-    const viewed = used.length > 0 && used.every((placeholder) => deliveredImages.has(placeholder))
+    // 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, used } = viewed ? built : finalizeUserContent(text, state.attachments)
     for (const placeholder of used) deliveredImages.delete(placeholder)
     persist(makeEvent('message', { message: { role: 'user', content }, ...(viewed ? { origin: 'view' } : {}) }))
     ensureSession()
@@ -999,8 +1002,8 @@ export function createController({ boot }) {
     send(`Follow these skill instructions now.\n\n${body}`)
   }
 
-  async function sendCommand(name, args) {
-    const text = await boot.commands.load(name, args)
+  async function sendCommand(name, args, namedValues) {
+    const text = await boot.commands.load(name, args, namedValues)
     if (!text) return flash(`could not load command ${name}`)
     send(text)
   }

package/src/git.js

@@ -48,6 +48,7 @@ export function createGitService({ onChange = () => {} } = {}) {
   let gitDir = null
   let epoch = 0
   let watcher = null
+  let treeWatcher = null
   let poll = null
   let debounce = null
   let child = null
@@ -58,6 +59,8 @@ export function createGitService({ onChange = () => {} } = {}) {
     epoch += 1
     watcher?.close()
     watcher = null
+    treeWatcher?.close()
+    treeWatcher = null
     if (poll) clearInterval(poll)
     poll = null
     if (debounce) clearTimeout(debounce)
@@ -85,6 +88,20 @@ export function createGitService({ onChange = () => {} } = {}) {
     } catch {
       watcher = null
     }
+    // the working tree too, so an edit shows up right away rather than at
+    // the next poll. recursive watching rides on FSEvents on macOS; the
+    // refresh is debounced so a burst of writes costs one git call
+    try {
+      treeWatcher = watch(root, { recursive: true }, (_event, file) => {
+        if (epoch !== started) return
+        const name = String(file ?? '')
+        if (name === '.git' || name.startsWith('.git/') || name.includes('node_modules')) return
+        refresh()
+      })
+      treeWatcher.on('error', () => {})
+    } catch {
+      treeWatcher = null
+    }
     poll = setInterval(run, POLL_MS)
     poll.unref?.()
     run()

package/src/skills.js

@@ -121,8 +121,20 @@ Review $ARGUMENTS for security problems. Focus on input validation and secrets.
 \`\`\`
 
 \`$ARGUMENTS\` is replaced with whatever follows the command; without the placeholder,
-arguments are appended after the body. Commands are rescanned every turn, so a new
-command appears in the slash menu from the next message.`
+arguments are appended after the body. For compact typed form fields, put named
+placeholders directly in the Markdown body:
+
+- \`{{file:path:File to review}}\` — path/file picker, named \`file\`
+- \`{{focus:text:Review focus}}\` — text input, named \`focus\`
+- \`{{mode:choice(review,fix):Mode}}\` — choice picker whose selected literal is inserted
+
+The final label is optional and inferred from the name (for example, \`{{focus:text}}\`
+is labelled "Focus"). Names start with a letter and may contain letters, digits, \`_\`,
+and \`-\`. Keep choice values short and comma-separated. A placeholder may be repeated.
+Named fields and \`$ARGUMENTS\` may coexist for backwards compatibility.
+
+Commands are rescanned every turn, so a new command appears in the slash menu from the
+next message.`
 
 export async function createSkillIndex(root) {
   const builtin = [