@straiffi/archon 1.3.9 → 1.3.10

package/dist/server/lib/agent.js

@@ -1,10 +1,11 @@
 import { spawn } from 'child_process';
 import { randomUUID } from 'crypto';
-import { isAbsolute, join, relative, resolve, sep } from 'path';
+import { readFileSync } from 'fs';
+import { extname, isAbsolute, join, relative, resolve, sep } from 'path';
 import Database from 'better-sqlite3';
 import db from '../db.js';
 import { getChatSession, updateChatSessionUsageSnapshot } from './chats.js';
-import { normalizeModelId } from './models.js';
+import { normalizeClaudeModelId, normalizeModelId } from './models.js';
 import { PLAN_MODE_QUESTION_TOOL_NAME } from './planModeQuestions.js';
 import { getSpecSession, updateSpecSessionResumeId, updateSpecSessionStatus, updateSpecSessionTitle, updateSpecSessionUsageSnapshot } from './specs.js';
 import { updateSpecReviewRunStatus, updateSpecReviewRunStreaming, updateSpecReviewRunUsage } from './specReviews.js';
@@ -14,6 +15,74 @@ import { getTicket } from './tickets.js';
 const OPENCODE_PLACEHOLDER_TITLE_PATTERN = /^New session\b/i;
 const OPENCODE_SESSION_METADATA_LOOKUP_DELAY_MS = 1500;
 const AGENT_PROGRESS_UPDATE_INTERVAL_MS = 100;
+const resolveAgentModel = (tool, model) => {
+    if (tool === 'claude') {
+        return normalizeClaudeModelId(model) || null;
+    }
+    return normalizeModelId(model) || null;
+};
+const CLAUDE_IMAGE_EXTENSIONS = {
+    '.png': 'image/png',
+    '.jpg': 'image/jpeg',
+    '.jpeg': 'image/jpeg',
+    '.webp': 'image/webp',
+    '.gif': 'image/gif',
+};
+const buildClaudeStdinMessage = (prompt, files, cwd) => {
+    if (files.length === 0) {
+        return JSON.stringify({ type: 'user', message: { role: 'user', content: prompt } });
+    }
+    const content = [{ type: 'text', text: prompt }];
+    for (const filePath of files) {
+        const absolutePath = isAbsolute(filePath) ? filePath : join(cwd, filePath);
+        const ext = extname(absolutePath).toLowerCase();
+        const mediaType = CLAUDE_IMAGE_EXTENSIONS[ext];
+        if (!mediaType) {
+            continue;
+        }
+        const data = readFileSync(absolutePath).toString('base64');
+        content.push({
+            type: 'image',
+            source: { type: 'base64', media_type: mediaType, data },
+        });
+    }
+    return JSON.stringify({ type: 'user', message: { role: 'user', content } });
+};
+const writeClaudeStdin = (child, message) => {
+    const stdin = child.stdin;
+    if (!stdin) {
+        return;
+    }
+    try {
+        stdin.end(message);
+    }
+    catch {
+        // Best-effort: the child may have exited already.
+    }
+};
+const buildClaudeArgs = (mode, model, resumeSessionId, sessionId) => {
+    const baseArgs = mode === 'plan'
+        ? [
+            '--permission-mode',
+            'plan',
+            '--disallowedTools',
+            PLAN_MODE_QUESTION_TOOL_NAME,
+        ]
+        : ['--dangerously-skip-permissions'];
+    return [
+        ...baseArgs,
+        '--print',
+        '--verbose',
+        '--output-format',
+        'stream-json',
+        '--include-partial-messages',
+        '--input-format',
+        'stream-json',
+        ...(model ? ['--model', model] : []),
+        resumeSessionId ? '--resume' : '--session-id',
+        sessionId,
+    ];
+};
 const OPENCODE_SESSION_BY_ID_QUERY = 'SELECT id, title FROM session WHERE id = ? LIMIT 1';
 const OPENCODE_SESSION_BY_CREATED_AT_QUERY = 'SELECT id, title FROM session WHERE time_created > ? ORDER BY time_created DESC LIMIT 1';
 const OPENCODE_COMPLETED_ASSISTANT_MESSAGE_USAGE_QUERY = "SELECT data FROM message WHERE session_id = ? AND json_extract(data, '$.role') = 'assistant' AND json_extract(data, '$.time.completed') IS NOT NULL ORDER BY time_created DESC LIMIT 1";
@@ -101,6 +170,8 @@ const extractChatUsageSnapshot = (value) => {
             ['result', 'usage', 'totalTokens'],
         ]),
         usage_snapshot_input_tokens: getNumberAtPaths(value, [
+            ['message', 'usage', 'input_tokens'],
+            ['usage', 'input_tokens'],
             ['tokens', 'input'],
             ['usage', 'tokens', 'input'],
             ['usage', 'input'],
@@ -111,6 +182,8 @@ const extractChatUsageSnapshot = (value) => {
             ['result', 'usage', 'inputTokens'],
         ]),
         usage_snapshot_output_tokens: getNumberAtPaths(value, [
+            ['message', 'usage', 'output_tokens'],
+            ['usage', 'output_tokens'],
             ['tokens', 'output'],
             ['usage', 'tokens', 'output'],
             ['usage', 'output'],
@@ -121,6 +194,8 @@ const extractChatUsageSnapshot = (value) => {
             ['result', 'usage', 'outputTokens'],
         ]),
         usage_snapshot_cache_read_tokens: getNumberAtPaths(value, [
+            ['message', 'usage', 'cache_read_input_tokens'],
+            ['usage', 'cache_read_input_tokens'],
             ['tokens', 'cache', 'read'],
             ['usage', 'tokens', 'cacheRead'],
             ['usage', 'cacheRead'],
@@ -141,6 +216,7 @@ const extractChatUsageSnapshot = (value) => {
             ['result', 'usage', 'reasoningTokens'],
         ]),
         usage_snapshot_cost: getNumberAtPaths(value, [
+            ['total_cost_usd'],
             ['cost'],
             ['result', 'cost'],
         ]),
@@ -161,6 +237,12 @@ const mergeUsageFromJsonLine = (current, line) => {
             continue;
         }
     }
+    if (next.usage_snapshot_total_tokens === null && next.usage_snapshot_input_tokens !== null && next.usage_snapshot_output_tokens !== null) {
+        next = {
+            ...next,
+            usage_snapshot_total_tokens: next.usage_snapshot_input_tokens + next.usage_snapshot_output_tokens,
+        };
+    }
     return next;
 };
 const hasUsageSnapshot = (value) => {
@@ -1162,7 +1244,7 @@ export const stopSpecReviewAgent = async (specReviewRunId) => {
     return true;
 };
 export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = null, resumeSessionId = null, sessionField = 'session_id', trackBuildProcess = false, emitSuccessUpdate = true, opencodeAgentMode, }) => {
-    const resolvedModel = normalizeModelId(model);
+    const resolvedModel = resolveAgentModel(tool, model);
     return new Promise((resolve, reject) => {
         let sessionId = null;
         let spawnTimestamp = null;
@@ -1211,30 +1293,7 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
                 sessionId = resumeSessionId || randomUUID();
                 return [
                     'claude',
-                    opencodeAgentMode === 'plan'
-                        ? [
-                            '--permission-mode',
-                            'plan',
-                            '--disallowedTools',
-                            PLAN_MODE_QUESTION_TOOL_NAME,
-                            '--print',
-                            '--verbose',
-                            '--output-format',
-                            'stream-json',
-                            resumeSessionId ? '--resume' : '--session-id',
-                            sessionId,
-                            prompt,
-                        ]
-                        : [
-                            '--dangerously-skip-permissions',
-                            '--print',
-                            '--verbose',
-                            '--output-format',
-                            'stream-json',
-                            resumeSessionId ? '--resume' : '--session-id',
-                            sessionId,
-                            prompt,
-                        ]
+                    buildClaudeArgs(opencodeAgentMode, resolvedModel, resumeSessionId, sessionId),
                 ];
             })()
             : ['opencode', ['run', ...(opencodeAgentMode === 'plan' ? ['--agent', 'plan'] : []), '--format', 'json', '--thinking', ...(resumeSessionId ? ['--session', resumeSessionId] : []), ...(resolvedModel ? ['--model', resolvedModel] : []), ...(variant ? ['--variant', variant] : []), prompt]];
@@ -1247,10 +1306,13 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
         }
         const child = spawn(cmd, args, {
             cwd,
-            stdio: ['ignore', 'pipe', 'pipe'],
+            stdio: tool === 'claude' ? ['pipe', 'pipe', 'pipe'] : ['ignore', 'pipe', 'pipe'],
             env: { ...process.env, PWD: cwd },
             detached: process.platform !== 'win32',
         });
+        if (tool === 'claude') {
+            writeClaudeStdin(child, buildClaudeStdinMessage(prompt, [], cwd));
+        }
         if (trackBuildProcess && buildState) {
             buildState.child = child;
             activeBuildProcesses.set(ticketId, buildState);
@@ -1423,7 +1485,7 @@ export const runAgent = ({ ticketId, tool, prompt, cwd, io, model, variant = nul
     });
 };
 export const runChatAgent = ({ chatSessionId, tool, prompt, files = [], cwd, io, model, variant = null, resumeSessionId = null, opencodeAgentMode = 'build', }) => {
-    const resolvedModel = normalizeModelId(model);
+    const resolvedModel = resolveAgentModel(tool, model);
     return new Promise((resolve, reject) => {
         let sessionId = null;
         let spawnTimestamp = null;
@@ -1453,30 +1515,7 @@ export const runChatAgent = ({ chatSessionId, tool, prompt, files = [], cwd, io,
                 sessionId = resumeSessionId || randomUUID();
                 return [
                     'claude',
-                    opencodeAgentMode === 'plan'
-                        ? [
-                            '--permission-mode',
-                            'plan',
-                            '--disallowedTools',
-                            PLAN_MODE_QUESTION_TOOL_NAME,
-                            '--print',
-                            '--verbose',
-                            '--output-format',
-                            'stream-json',
-                            resumeSessionId ? '--resume' : '--session-id',
-                            sessionId,
-                            prompt,
-                        ]
-                        : [
-                            '--dangerously-skip-permissions',
-                            '--print',
-                            '--verbose',
-                            '--output-format',
-                            'stream-json',
-                            resumeSessionId ? '--resume' : '--session-id',
-                            sessionId,
-                            prompt,
-                        ]
+                    buildClaudeArgs(opencodeAgentMode, resolvedModel, resumeSessionId, sessionId),
                 ];
             })()
             : ['opencode', ['run', ...(opencodeAgentMode === 'plan' ? ['--agent', 'plan'] : []), '--format', 'json', '--thinking', ...(resumeSessionId ? ['--session', resumeSessionId] : []), ...(resolvedModel ? ['--model', resolvedModel] : []), ...(variant ? ['--variant', variant] : []), ...files.flatMap(filePath => ['--file', filePath]), ...(files.length > 0 ? ['--'] : []), prompt]];
@@ -1502,12 +1541,15 @@ export const runChatAgent = ({ chatSessionId, tool, prompt, files = [], cwd, io,
         }
         const child = spawn(cmd, args, {
             cwd,
-            stdio: ['ignore', 'pipe', 'pipe'],
+            stdio: tool === 'claude' ? ['pipe', 'pipe', 'pipe'] : ['ignore', 'pipe', 'pipe'],
             env: { ...process.env, PWD: cwd },
             detached: process.platform !== 'win32',
         });
         chatState.child = child;
         activeChatProcesses.set(chatSessionId, chatState);
+        if (tool === 'claude') {
+            writeClaudeStdin(child, buildClaudeStdinMessage(prompt, files, cwd));
+        }
         startTime = Date.now();
         if (tool === 'claude') {
             const logLines = [];
@@ -1748,7 +1790,7 @@ export const runChatAgent = ({ chatSessionId, tool, prompt, files = [], cwd, io,
     });
 };
 export const runSpecAgent = ({ specSessionId, tool, prompt, files = [], cwd, io, model, variant = null, resumeSessionId = null, }) => {
-    const resolvedModel = normalizeModelId(model);
+    const resolvedModel = resolveAgentModel(tool, model);
     return new Promise((resolve, reject) => {
         let sessionId = null;
         let spawnTimestamp = null;
@@ -1778,19 +1820,7 @@ export const runSpecAgent = ({ specSessionId, tool, prompt, files = [], cwd, io,
                 sessionId = resumeSessionId || randomUUID();
                 return [
                     'claude',
-                    [
-                        '--permission-mode',
-                        'plan',
-                        '--disallowedTools',
-                        PLAN_MODE_QUESTION_TOOL_NAME,
-                        '--print',
-                        '--verbose',
-                        '--output-format',
-                        'stream-json',
-                        resumeSessionId ? '--resume' : '--session-id',
-                        sessionId,
-                        prompt,
-                    ],
+                    buildClaudeArgs('plan', resolvedModel, resumeSessionId, sessionId),
                 ];
             })()
             : ['opencode', ['run', '--agent', 'plan', '--format', 'json', '--thinking', ...(resumeSessionId ? ['--session', resumeSessionId] : []), ...(resolvedModel ? ['--model', resolvedModel] : []), ...(variant ? ['--variant', variant] : []), ...files.flatMap(filePath => ['--file', filePath]), ...(files.length > 0 ? ['--'] : []), prompt]];
@@ -1816,12 +1846,15 @@ export const runSpecAgent = ({ specSessionId, tool, prompt, files = [], cwd, io,
         }
         const child = spawn(cmd, args, {
             cwd,
-            stdio: ['ignore', 'pipe', 'pipe'],
+            stdio: tool === 'claude' ? ['pipe', 'pipe', 'pipe'] : ['ignore', 'pipe', 'pipe'],
             env: { ...process.env, PWD: cwd },
             detached: process.platform !== 'win32',
         });
         specState.child = child;
         activeSpecProcesses.set(specSessionId, specState);
+        if (tool === 'claude') {
+            writeClaudeStdin(child, buildClaudeStdinMessage(prompt, files, cwd));
+        }
         startTime = Date.now();
         if (tool === 'claude') {
             const logLines = [];
@@ -2072,7 +2105,7 @@ export const runSpecAgent = ({ specSessionId, tool, prompt, files = [], cwd, io,
  * the spec_sessions row is never touched by this path.
  */
 export const runSpecReviewAgent = ({ specReviewRunId, tool, prompt, files = [], cwd, io, model, variant = null, }) => {
-    const resolvedModel = normalizeModelId(model);
+    const resolvedModel = resolveAgentModel(tool, model);
     return new Promise((resolve, reject) => {
         let settled = false;
         let startTime = null;
@@ -2099,31 +2132,22 @@ export const runSpecReviewAgent = ({ specReviewRunId, tool, prompt, files = [],
         const [cmd, args] = tool === 'claude'
             ? [
                 'claude',
-                [
-                    '--permission-mode',
-                    'plan',
-                    '--disallowedTools',
-                    PLAN_MODE_QUESTION_TOOL_NAME,
-                    '--print',
-                    '--verbose',
-                    '--output-format',
-                    'stream-json',
-                    '--session-id',
-                    randomUUID(),
-                    prompt,
-                ],
+                buildClaudeArgs('plan', resolvedModel, null, randomUUID()),
             ]
             : ['opencode', ['run', '--agent', 'plan', '--format', 'json', '--thinking', ...(resolvedModel ? ['--model', resolvedModel] : []), ...(variant ? ['--variant', variant] : []), ...files.flatMap(filePath => ['--file', filePath]), ...(files.length > 0 ? ['--'] : []), prompt]];
         updateSpecReviewRunStreaming(specReviewRunId, null);
         emitReviewUpdated();
         const child = spawn(cmd, args, {
             cwd,
-            stdio: ['ignore', 'pipe', 'pipe'],
+            stdio: tool === 'claude' ? ['pipe', 'pipe', 'pipe'] : ['ignore', 'pipe', 'pipe'],
             env: { ...process.env, PWD: cwd },
             detached: process.platform !== 'win32',
         });
         reviewState.child = child;
         activeSpecReviewProcesses.set(specReviewRunId, reviewState);
+        if (tool === 'claude') {
+            writeClaudeStdin(child, buildClaudeStdinMessage(prompt, files, cwd));
+        }
         startTime = Date.now();
         if (tool === 'claude') {
             const logLines = [];