gitdone-agent 0.6.7 → 0.6.9

package/index.js

@@ -27,7 +27,7 @@ import { randomUUID } from 'node:crypto'
 // Reported to the server on every sync so the web UI can flag outdated agents.
 // Keep in lockstep with packages/agent/package.json "version" AND
 // src/lib/agentVersion.ts LATEST_AGENT_VERSION.
-const AGENT_VERSION = '0.6.6'
+const AGENT_VERSION = '0.6.9'
 
 const AGENT_DIR = join(homedir(), '.gitdone-agent')
 const CONFIG_PATH = join(AGENT_DIR, 'config.json')
@@ -783,6 +783,18 @@ function ensureAiMcpConfig(cfg) {
   return AI_MCP_CONFIG_PATH
 }
 
+// Sanitise the model value from a command payload into a safe `--model`
+// argument. gitDone sends a stable CLI alias ("opus"/"sonnet"/"haiku"), but we
+// also allow a full model id (letters, digits, dot, dash). Anything else — or a
+// missing value — yields null, so the agent falls back to the machine's own
+// default model. Bounds the length as a belt-and-braces guard (gd-354).
+function aiModelArg(raw) {
+  if (typeof raw !== 'string') return null
+  const m = raw.trim()
+  if (!m || m.length > 100) return null
+  return /^[A-Za-z0-9._-]+$/.test(m) ? m : null
+}
+
 // Run a headless Claude Code session for an `ai_run` command and stream its
 // output back. Long-running and fire-and-forget: it wires up async handlers and
 // returns immediately so the agent's snapshot loop is never blocked.
@@ -790,6 +802,7 @@ function runAiCommand(cfg, cmd, repoPath) {
   const runId = cmd.payload?.runId
   const prompt = cmd.payload?.prompt ?? ''
   const allowCommit = cmd.payload?.allowCommit === true
+  const model = aiModelArg(cmd.payload?.model)
   if (!runId || !prompt) {
     reportCommandResult(cfg, cmd.id, 'error', 'invalid ai_run payload')
     return
@@ -819,6 +832,8 @@ function runAiCommand(cfg, cmd, repoPath) {
     '-p',
     '--output-format', 'stream-json',
     '--verbose',
+    // Model chosen in gitDone (project default / task); omitted → machine default (gd-354).
+    ...(model ? ['--model', model] : []),
     '--permission-mode', 'acceptEdits',
     '--allowedTools', 'Read,Edit,Write,Bash,mcp__gitdone__*',
     // Block git commit/push unless this repo opted in (per-repo aiAutoCommit).
@@ -961,6 +976,7 @@ async function runAiChat(cfg, cmd, repoPath) {
   const images = Array.isArray(cmd.payload?.images) ? cmd.payload.images.filter((u) => typeof u === 'string' && u) : []
   const claudeSessionId = cmd.payload?.claudeSessionId || null
   const allowCommit = cmd.payload?.allowCommit === true
+  const model = aiModelArg(cmd.payload?.model)
   // A turn may be text-only, image-only, or both — but needs at least one.
   if (!sessionId || (!prompt && images.length === 0)) {
     reportCommandResult(cfg, cmd.id, 'error', 'invalid ai_chat payload')
@@ -988,6 +1004,9 @@ async function runAiChat(cfg, cmd, repoPath) {
     // Stream the reply token-by-token so the console can show it being written
     // live, not only once each block is complete (gd-302).
     '--include-partial-messages',
+    // Model resolved for this session (picker / project default); omitted →
+    // machine default (gd-354). Kept consistent across the session's turns.
+    ...(model ? ['--model', model] : []),
     '--permission-mode', 'acceptEdits',
     '--allowedTools', 'Read,Edit,Write,Bash,mcp__gitdone__*',
     // Block git commit/push unless this repo opted in (per-repo aiAutoCommit).

package/package.json

@@ -1,6 +1,6 @@
 {
     "name":  "gitdone-agent",
-    "version":  "0.6.7",
+    "version":  "0.6.9",
     "description":  "Local git agent for gitdone — watches a local repo and sends snapshots to gitdone.eu",
     "type":  "module",
     "bin":  {