@fivetu53/soul-chat 1.1.2 → 1.1.3

package/bin/api.js

@@ -237,6 +237,19 @@ export async function deleteLastMessages(conversationId) {
   return data;
 }
 
+export async function regenerateMessage(conversationId) {
+  const response = await request(`/api/chat/conversations/${conversationId}/regenerate`, {
+    method: 'POST'
+  });
+
+  if (!response.ok) {
+    const data = await response.json();
+    throw new Error(data.error);
+  }
+
+  return response;
+}
+
 // Memory APIs
 export async function getMemories(characterId) {
   const response = await request(`/api/memories/${characterId}`);

package/bin/index.js

@@ -10,7 +10,7 @@ import { loadConfig, saveConfig, getConfigPath } from './config.js';
 import { checkAuth, showAuthScreen } from './auth.js';
 import {
   isLoggedIn, getCurrentUser, logout, updateProfile,
-  sendMessage, getCharacters, createCharacter, getConversations, getMessages, clearConversation, deleteLastMessages, getMemories, pinMemory, deleteMemory
+  sendMessage, getCharacters, createCharacter, getConversations, getMessages, clearConversation, deleteLastMessages, regenerateMessage, getMemories, pinMemory, deleteMemory
 } from './api.js';
 
 // Setup marked with terminal renderer
@@ -553,66 +553,82 @@ async function showChat() {
 
     if (input === '/regen') {
       // 重新生成最后一条回复
-      if (messages.length >= 2) {
-        const lastUserMsg = [...messages].reverse().find(m => m.role === 'user');
-        if (lastUserMsg) {
-          // 删除服务端最后两条
-          if (currentConversationId) {
-            try { await deleteLastMessages(currentConversationId); } catch {}
-          }
-          messages.splice(-2);
-
-          // 重新发送用户消息
-          const regenText = lastUserMsg.text;
-          messages.push({ role: 'user', text: regenText, timestamp: new Date() });
-          drawMessages();
-
-          // 显示思考中
-          process.stdout.write(c('bot', `  ${currentCharacter.name}: `) + c('hint', '思考中...'));
-
-          try {
-            const response = await sendMessage(regenText, currentCharacter.id, currentConversationId, null);
-            process.stdout.write('\r\x1b[K');
-            process.stdout.write(c('bot', `  ${currentCharacter.name}: `));
-
-            let fullResponse = '';
-            const reader = response.body.getReader();
-            const decoder = new TextDecoder();
-            let buffer = '';
-
-            while (true) {
-              const { done, value } = await reader.read();
-              if (done) break;
-              buffer += decoder.decode(value, { stream: true });
-              const lines = buffer.split('\n');
-              buffer = lines.pop() || '';
-
-              for (const line of lines) {
-                if (line.startsWith('data: ')) {
-                  const data = line.slice(6);
-                  if (data === '[DONE]') continue;
-                  try {
-                    const json = JSON.parse(data);
-                    if (json.type === 'info') {
-                      currentConversationId = json.conversationId;
-                    } else if (json.type === 'content') {
-                      fullResponse += json.content;
-                      process.stdout.write(json.content);
-                    }
-                  } catch {}
+      if (!currentConversationId) {
+        console.log(c('yellow', '  没有可重新生成的对话'));
+        await sleep(1000);
+        continue;
+      }
+
+      // 找到最后一条 AI 回复的索引
+      let lastBotIdx = -1;
+      for (let i = messages.length - 1; i >= 0; i--) {
+        if (messages[i].role === 'bot') {
+          lastBotIdx = i;
+          break;
+        }
+      }
+
+      if (lastBotIdx === -1) {
+        console.log(c('yellow', '  没有可重新生成的回复'));
+        await sleep(1000);
+        continue;
+      }
+
+      // 删除客户端的 AI 回复（以及之后的 system 消息）
+      messages.splice(lastBotIdx);
+      drawMessages();
+
+      // 显示思考中
+      process.stdout.write(c('bot', `  ${currentCharacter.name}: `) + c('hint', '重新生成中...'));
+
+      try {
+        const response = await regenerateMessage(currentConversationId);
+        process.stdout.write('\r\x1b[K');
+        process.stdout.write(c('bot', `  ${currentCharacter.name}: `));
+
+        let fullResponse = '';
+        const reader = response.body.getReader();
+        const decoder = new TextDecoder();
+        let buffer = '';
+
+        while (true) {
+          const { done, value } = await reader.read();
+          if (done) break;
+          buffer += decoder.decode(value, { stream: true });
+          const lines = buffer.split('\n');
+          buffer = lines.pop() || '';
+
+          for (const line of lines) {
+            if (line.startsWith('data: ')) {
+              const data = line.slice(6);
+              if (data === '[DONE]') continue;
+              try {
+                const json = JSON.parse(data);
+                if (json.type === 'tool_call') {
+                  process.stdout.write('\r\x1b[K');
+                  process.stdout.write(c('cyan', `  🔍 正在搜索: ${json.query}...`));
+                  messages.push({ role: 'system', text: `🔍 正在搜索: ${json.query}` });
+                } else if (json.type === 'tool_result') {
+                  process.stdout.write('\r\x1b[K');
+                  process.stdout.write(c('green', `  📋 找到 ${json.count} 条结果\n`));
+                  process.stdout.write(c('bot', `  ${currentCharacter.name}: `));
+                  messages.push({ role: 'system', text: `📋 找到 ${json.count} 条结果` });
+                } else if (json.type === 'content') {
+                  fullResponse += json.content;
+                  process.stdout.write(json.content);
                 }
-              }
+              } catch {}
             }
-
-            console.log();
-            messages.push({ role: 'bot', text: fullResponse || '...', timestamp: new Date() });
-            drawMessages();
-          } catch (err) {
-            process.stdout.write('\r\x1b[K');
-            console.log(c('red', `  错误: ${err.message}`));
-            await sleep(1500);
           }
         }
+
+        console.log();
+        messages.push({ role: 'bot', text: fullResponse || '...', timestamp: new Date() });
+        drawMessages();
+      } catch (err) {
+        process.stdout.write('\r\x1b[K');
+        console.log(c('red', `  错误: ${err.message}`));
+        await sleep(1500);
       }
       continue;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fivetu53/soul-chat",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Soul Chat - 智能 AI 伴侣命令行客户端",
   "type": "module",
   "bin": {