coding-tool-x 3.3.2 → 3.3.4

package/src/server/api/sessions.js

@@ -279,6 +279,7 @@ module.exports = (config) => {
 
       const stream = fs.createReadStream(sessionFile, { encoding: 'utf8' });
       const rl = readline.createInterface({ input: stream, crlfDelay: Infinity });
+      let lastAssistantModel = null;
 
       try {
         for await (const line of rl) {
@@ -297,31 +298,45 @@ module.exports = (config) => {
             }
 
             if (json.type === 'user' || json.type === 'assistant') {
+              const resolvedModel = json.message?.model || json.model || lastAssistantModel || null;
+              const messageId = json.message?.id || json.uuid || null;
               const message = {
                 type: json.type,
                 content: null,
                 timestamp: json.timestamp || null,
-                model: json.model || null
+                model: resolvedModel,
+                messageId,
+                subtype: null
               };
+              let deferredToolResultContent = '';
 
               if (json.type === 'user') {
                 if (typeof json.message?.content === 'string') {
                   message.content = json.message.content;
                 } else if (Array.isArray(json.message?.content)) {
-                  const parts = [];
+                  const userParts = [];
+                  const toolResultParts = [];
                   for (const item of json.message.content) {
                     if (item.type === 'text' && item.text) {
-                      parts.push(item.text);
+                      userParts.push(item.text);
                     } else if (item.type === 'tool_result') {
                       const resultContent = typeof item.content === 'string'
                         ? item.content
                         : JSON.stringify(item.content, null, 2);
-                      parts.push(`**[工具结果]**\n\`\`\`\n${resultContent}\n\`\`\``);
+                      toolResultParts.push(`**[工具结果]**\n\`\`\`\n${resultContent}\n\`\`\``);
                     } else if (item.type === 'image') {
-                      parts.push('[图片]');
+                      userParts.push('[图片]');
                     }
                   }
-                  message.content = parts.join('\n\n') || '[工具交互]';
+
+                  if (userParts.length > 0) {
+                    message.content = userParts.join('\n\n');
+                  }
+
+                  // Claude tool_result is carried in a "user" envelope, but should be rendered as AI tool output.
+                  if (toolResultParts.length > 0) {
+                    deferredToolResultContent = toolResultParts.join('\n\n');
+                  }
                 }
               } else if (json.type === 'assistant') {
                 if (Array.isArray(json.message?.content)) {
@@ -340,11 +355,26 @@ module.exports = (config) => {
                 } else if (typeof json.message?.content === 'string') {
                   message.content = json.message.content;
                 }
+
+                if (message.model) {
+                  lastAssistantModel = message.model;
+                }
               }
 
               if (message.content && message.content !== 'Warmup') {
                 allMessages.push(message);
               }
+
+              if (deferredToolResultContent) {
+                allMessages.push({
+                  type: 'assistant',
+                  subtype: 'tool_result',
+                  content: deferredToolResultContent,
+                  timestamp: json.timestamp || null,
+                  model: resolvedModel,
+                  messageId: messageId ? `${messageId}-tool-result` : null
+                });
+              }
             }
           } catch (err) {
             // Skip invalid lines

package/src/server/opencode-proxy-server.js

@@ -2125,6 +2125,16 @@ function sendChatCompletionsSse(res, responseObject) {
   const message = responseObject?.choices?.[0]?.message || {};
   const text = message?.content || '';
   const toolCalls = Array.isArray(message?.tool_calls) ? message.tool_calls : [];
+  const streamedToolCalls = toolCalls.map((toolCall, index) => {
+    const numericIndex = Number(toolCall?.index);
+    const normalizedIndex = Number.isFinite(numericIndex) ? numericIndex : index;
+
+    if (toolCall && typeof toolCall === 'object' && !Array.isArray(toolCall)) {
+      return { ...toolCall, index: normalizedIndex };
+    }
+
+    return { index: normalizedIndex };
+  });
   const finishReason = responseObject?.choices?.[0]?.finish_reason || 'stop';
 
   setSseHeaders(res);
@@ -2140,7 +2150,7 @@ function sendChatCompletionsSse(res, responseObject) {
         delta: {
           role: 'assistant',
           ...(text ? { content: text } : {}),
-          ...(toolCalls.length > 0 ? { tool_calls: toolCalls } : {})
+          ...(streamedToolCalls.length > 0 ? { tool_calls: streamedToolCalls } : {})
         },
         finish_reason: null
       }

package/src/server/services/codex-parser.js

@@ -63,11 +63,22 @@ function extractSessionMeta(lines) {
  */
 function extractMessages(lines) {
   const messages = [];
+  let currentTurnModel = null;
+  let lastAssistantModel = null;
 
   lines.forEach(line => {
+    if (line.type === 'turn_context') {
+      const model = line.payload?.model;
+      if (typeof model === 'string' && model.trim()) {
+        currentTurnModel = model.trim();
+      }
+      return;
+    }
+
     if (line.type !== 'response_item') return;
 
     const payload = line.payload;
+    const resolvedModel = payload?.model || currentTurnModel || lastAssistantModel || null;
 
     // 用户/助手消息
     if (payload.type === 'message') {
@@ -81,8 +92,12 @@ function extractMessages(lines) {
         messages.push({
           role: payload.role,
           content: text,
-          timestamp: line.timestamp
+          timestamp: line.timestamp,
+          model: payload.role === 'assistant' ? resolvedModel : null
         });
+        if (payload.role === 'assistant' && resolvedModel) {
+          lastAssistantModel = resolvedModel;
+        }
       }
     }
 
@@ -101,8 +116,12 @@ function extractMessages(lines) {
         name: payload.name,
         arguments: parsedArguments,
         callId: payload.call_id,
-        timestamp: line.timestamp
+        timestamp: line.timestamp,
+        model: resolvedModel
       });
+      if (resolvedModel) {
+        lastAssistantModel = resolvedModel;
+      }
     }
 
     // 工具输出
@@ -119,8 +138,12 @@ function extractMessages(lines) {
         role: 'tool_output',
         callId: payload.call_id,
         output: parsedOutput,
-        timestamp: line.timestamp
+        timestamp: line.timestamp,
+        model: resolvedModel
       });
+      if (resolvedModel) {
+        lastAssistantModel = resolvedModel;
+      }
     }
 
     // 推理内容
@@ -135,8 +158,12 @@ function extractMessages(lines) {
         messages.push({
           role: 'reasoning',
           content: text,
-          timestamp: line.timestamp
+          timestamp: line.timestamp,
+          model: resolvedModel
         });
+        if (resolvedModel) {
+          lastAssistantModel = resolvedModel;
+        }
       }
     }
   });

package/src/server/services/opencode-sessions.js

@@ -359,7 +359,19 @@ function getSessionRowsByProjectId(projectId) {
       s.time_created,
       s.time_updated,
       s.time_compacting,
-      s.time_archived
+      s.time_archived,
+      (
+        COALESCE((
+          SELECT SUM(length(CAST(COALESCE(m.data, '') AS BLOB)))
+          FROM message m
+          WHERE m.session_id = s.id
+        ), 0) +
+        COALESCE((
+          SELECT SUM(length(CAST(COALESCE(p.data, '') AS BLOB)))
+          FROM part p
+          WHERE p.session_id = s.id
+        ), 0)
+      ) AS size
     FROM session s
     WHERE s.project_id = ${sqlQuote(projectId)}
       AND s.time_archived IS NULL
@@ -387,7 +399,19 @@ function getSessionRowById(sessionId) {
       s.time_created,
       s.time_updated,
       s.time_compacting,
-      s.time_archived
+      s.time_archived,
+      (
+        COALESCE((
+          SELECT SUM(length(CAST(COALESCE(m.data, '') AS BLOB)))
+          FROM message m
+          WHERE m.session_id = s.id
+        ), 0) +
+        COALESCE((
+          SELECT SUM(length(CAST(COALESCE(p.data, '') AS BLOB)))
+          FROM part p
+          WHERE p.session_id = s.id
+        ), 0)
+      ) AS size
     FROM session s
     WHERE s.id = ${sqlQuote(sessionId)}
     LIMIT 1
@@ -426,11 +450,12 @@ function getPartRowsBySessionId(sessionId) {
 }
 
 function normalizeSession(session, projectId = null) {
+  const size = Number(session?.size);
   return {
     sessionId: session.id,
     projectName: projectId || session.project_id,
     mtime: toIsoTime(session.time_updated) || new Date().toISOString(),
-    size: 0,
+    size: Number.isFinite(size) && size > 0 ? size : 0,
     filePath: '',
     gitBranch: null,
     firstMessage: session.title || session.slug || null,