picocode-core 0.9.134 → 0.9.136

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "picocode-core",
-  "version": "0.9.134",
+  "version": "0.9.136",
   "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,8 @@ 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 { MAX_DELIBERATION_ROUNDS } from './deliberation.js'
+import { buildUserContent, finalizeUserContent, inputTextFromContent, mediaTypeFor } from './attachments.js'
 
 export const EFFORT_LEVELS = [
   { key: null, desc: 'let the provider decide how much to think' },
@@ -73,8 +74,9 @@ function parallelPrompt(task, agentLimit) {
   return `Use parallel agents for the following task: ${task}\n\nFirst call agent_plan. Interpret any agent-count instruction in the user's task semantically and declare that count; if the user gave no count, declare the configured default budget of ${agentLimit}. Then use agent_start within that enforced budget to delegate distinct, focused parts of the task to the configured worker model. Collect workers with agent_collect, critically evaluate their results, and synthesize the final response. When useful and the budget permits, use independent workers to check important disputed or weak conclusions. Do not delegate final synthesis. Do not emit progress updates while agents run; Pico displays agent activity automatically.`
 }
 
-function deliberatePrompt(decision) {
-  return `Deliberate on the following decision: ${decision}\n\nImmediately call deliberate with a self-contained brief. Do not research first, start ordinary agents, or approximate the deliberation yourself. The deliberation participants own all supporting research.`
+function deliberatePrompt(decision, rounds) {
+  const withRounds = rounds ? ` and rounds set to ${rounds}` : ''
+  return `Deliberate on the following decision: ${decision}\n\nImmediately call deliberate with a self-contained brief${withRounds}. Do not research first, start ordinary agents, or approximate the deliberation yourself. The deliberation participants own all supporting research.`
 }
 
 function workerSystemPrompt(scratchpad) {
@@ -364,8 +366,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()
@@ -982,13 +987,16 @@ export function createController({ boot }) {
     return true
   }
 
-  function sendDeliberate(decision) {
+  // rounds, when given, is passed along to the tool call; the tool itself
+  // clamps to its 1..5 range
+  function sendDeliberate(decision, rounds) {
     if (!decision) {
       flash('usage: /deliberate <decision>')
       return true
     }
     if (!modelAvailable(boot.deliberationModel)) return false
-    send(deliberatePrompt(decision))
+    const n = Number(rounds)
+    send(deliberatePrompt(decision, Number.isInteger(n) && n >= 1 && n <= MAX_DELIBERATION_ROUNDS ? n : null))
     return true
   }
 
@@ -999,8 +1007,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/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 = [