@fivetu53/soul-chat 1.1.2 → 1.1.4

package/bin/api.js

@@ -182,10 +182,11 @@ export async function createCharacter(character) {
 }
 
 // Chat APIs
-export async function sendMessage(message, characterId, conversationId, image = null) {
+export async function sendMessage(message, characterId, conversationId, image = null, signal = null) {
   const response = await request('/api/chat', {
     method: 'POST',
-    body: JSON.stringify({ message, characterId, conversationId, image })
+    body: JSON.stringify({ message, characterId, conversationId, image }),
+    signal
   });
 
   if (!response.ok) {
@@ -237,6 +238,28 @@ export async function deleteLastMessages(conversationId) {
   return data;
 }
 
+export async function deleteMessagesAfter(conversationId, messageId) {
+  const response = await request(`/api/chat/conversations/${conversationId}/after/${messageId}`, {
+    method: 'DELETE'
+  });
+  const data = await response.json();
+  if (!response.ok) throw new Error(data.error);
+  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, deleteMessagesAfter, regenerateMessage, getMemories, pinMemory, deleteMemory
 } from './api.js';
 
 // Setup marked with terminal renderer
@@ -538,6 +538,31 @@ async function showChat() {
       continue;
     }
 
+    if (input === '/rollback') {
+      // 回滚到指定消息
+      if (!currentConversationId) {
+        continue;
+      }
+      const selectedMsg = await selectMessageToRollback(messages);
+      if (selectedMsg) {
+        const confirmed = await confirmRollback();
+        if (confirmed) {
+          try {
+            await deleteMessagesAfter(currentConversationId, selectedMsg.id);
+            // 从本地 messages 数组中移除选中消息之后的所有消息
+            const idx = messages.findIndex(m => m.id === selectedMsg.id);
+            if (idx !== -1) {
+              messages.splice(idx + 1);
+            }
+            messages.push({ role: 'system', text: '✓ 已回滚到该消息' });
+          } catch (err) {
+            messages.push({ role: 'system', text: `✗ 回滚失败: ${err.message}` });
+          }
+        }
+      }
+      continue;
+    }
+
     if (input === '/help') {
       console.log(c('cyan', '\n  可用命令:'));
       console.log(c('gray', '  /back   - 返回主菜单'));
@@ -547,72 +572,89 @@ async function showChat() {
       console.log(c('gray', '  /export - 导出对话'));
       console.log(c('gray', '  Ctrl+C  - 清空输入 (双击退出)'));
       console.log(c('gray', '  Ctrl+V  - 粘贴图片'));
+      console.log(c('gray', '  Esc     - 打断回复 (双击回滚)'));
       await sleep(2000);
       continue;
     }
 
     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);
+      if (!currentConversationId) {
+        console.log(c('yellow', '  没有可重新生成的对话'));
+        await sleep(1000);
+        continue;
+      }
 
-          // 重新发送用户消息
-          const regenText = lastUserMsg.text;
-          messages.push({ role: 'user', text: regenText, timestamp: new Date() });
-          drawMessages();
+      // 找到最后一条 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', '思考中...'));
+      // 显示思考中
+      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 {}
+      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;
     }
@@ -644,11 +686,15 @@ async function showChat() {
     // 显示思考中
     process.stdout.write(c('bot', `  ${currentCharacter.name}: `) + c('hint', '思考中...'));
 
+    // 创建 AbortController 用于打断请求
+    currentAbortController = new AbortController();
+    let aborted = false;
+
     try {
-      // 发送消息（带图片）
+      // 发送消息（带图片和 abort signal）
       const imageBase64 = pendingImage?.base64 || null;
       pendingImage = null;  // 清空待发送图片
-      const response = await sendMessage(input, currentCharacter.id, currentConversationId, imageBase64);
+      const response = await sendMessage(input, currentCharacter.id, currentConversationId, imageBase64, currentAbortController.signal);
 
       // 清除思考中，开始打字机效果
       process.stdout.write('\r\x1b[K');
@@ -662,58 +708,83 @@ async function showChat() {
       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 === '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);
-                // 统计换行数
-                lineCount += (json.content.match(/\n/g) || []).length;
+      try {
+        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 === '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);
+                  // 统计换行数
+                  lineCount += (json.content.match(/\n/g) || []).length;
+                }
+              } catch (e) {
+                // 忽略解析错误
               }
-            } catch (e) {
-              // 忽略解析错误
             }
           }
         }
+      } catch (readErr) {
+        if (readErr.name === 'AbortError') {
+          aborted = true;
+        } else {
+          throw readErr;
+        }
       }
 
       console.log(); // 结束当前行
-      messages.push({ role: 'bot', text: fullResponse || '...', timestamp: new Date() });
+
+      if (aborted) {
+        // 被打断，显示提示，删除用户消息
+        messages.pop(); // 删除刚添加的用户消息
+        messages.push({ role: 'system', text: '⚠️ 已打断回复' });
+      } else {
+        messages.push({ role: 'bot', text: fullResponse || '...', timestamp: new Date() });
+      }
+
       // 重绘消息列表（带 markdown 渲染）
       drawMessages();
       await sleep(100); // 短暂延迟让用户看到渲染效果
     } catch (err) {
       process.stdout.write('\r\x1b[K');
-      console.log(c('red', `  错误: ${err.message}`));
-      await sleep(1500);
+      if (err.name === 'AbortError') {
+        // 被打断
+        messages.pop(); // 删除用户消息
+        messages.push({ role: 'system', text: '⚠️ 已打断回复' });
+        drawMessages();
+      } else {
+        console.log(c('red', `  错误: ${err.message}`));
+        await sleep(1500);
+      }
+    } finally {
+      currentAbortController = null;
     }
   }
 }
@@ -856,6 +927,8 @@ function prompt(query) {
 // 聊天输入（处理粘贴带换行的情况，支持图片粘贴）
 let pendingImage = null;  // 待发送的图片
 let lastCtrlCTime = 0;    // 上次 Ctrl+C 时间
+let lastEscTime = 0;      // 上次 Esc 时间
+let currentAbortController = null;  // 用于打断请求
 
 // 斜杠命令列表
 const slashCommands = [
@@ -872,7 +945,7 @@ function chatPrompt(query) {
     const stdin = process.stdin;
 
     // 先打印下方提示
-    console.log(c('hint', '  输入 / 选择命令  Ctrl+C 清空 (双击退出)  Ctrl+V 粘贴图片'));
+    console.log(c('hint', '  输入 / 选择命令  Ctrl+J 换行  Esc 双击回滚  Ctrl+C 双击退出'));
     console.log(c('primary', '  门户网站: https://soul-chat.jdctools.com.cn'));
     // 光标上移3行，显示输入提示
     process.stdout.write('\x1b[3A');
@@ -902,7 +975,14 @@ function chatPrompt(query) {
         return;
       }
 
-      // Enter 键
+      // Ctrl+J - 插入换行
+      if (char === '\x0a' && chunk.length === 1 && chunk[0] === 10) {
+        input += '\n';
+        process.stdout.write('\n  '); // 换行并缩进
+        return;
+      }
+
+      // Enter 键 - 发送消息
       if (char === '\r' || char === '\n') {
         // 如果是快速输入（粘贴），把换行当作空格
         if (timeDiff < 10 && input.length > 0) {
@@ -935,6 +1015,25 @@ function chatPrompt(query) {
         return;
       }
 
+      // Esc - 单击打断回复，双击触发回滚
+      if (chunk[0] === 27 && chunk.length === 1) {
+        const now = Date.now();
+        if (now - lastEscTime < 500) {
+          // 双击 Esc - 触发回滚流程
+          stdin.removeListener('data', onData);
+          stdin.setRawMode(false);
+          console.log();
+          resolve('/rollback');
+        } else {
+          // 单击 Esc - 打断回复（如果正在生成）
+          lastEscTime = now;
+          if (currentAbortController) {
+            currentAbortController.abort();
+          }
+        }
+        return;
+      }
+
       // 斜杠命令选择器
       if (char === '/' && input === '') {
         stdin.removeListener('data', onData);
@@ -1068,6 +1167,177 @@ function showCommandSelector(stdin, query, resolve) {
   stdin.on('data', onSelect);
 }
 
+// 消息选择器（用于回滚）
+function selectMessageToRollback(messages) {
+  return new Promise((resolve) => {
+    const stdin = process.stdin;
+    // 只显示有 id 的消息（排除系统消息和初始欢迎消息）
+    const selectableMessages = messages.filter(m => m.id);
+    if (selectableMessages.length === 0) {
+      resolve(null);
+      return;
+    }
+
+    let selected = selectableMessages.length - 1; // 默认选中最后一条
+    const maxDisplay = 10; // 最多显示10条
+
+    const getDisplayMessages = () => {
+      // 显示最后 maxDisplay 条
+      const start = Math.max(0, selectableMessages.length - maxDisplay);
+      return selectableMessages.slice(start);
+    };
+
+    const drawList = () => {
+      const displayMsgs = getDisplayMessages();
+      const startIdx = Math.max(0, selectableMessages.length - maxDisplay);
+
+      // 上移到列表开始位置
+      process.stdout.write(`\x1b[${displayMsgs.length + 2}A`);
+
+      console.log(c('yellow', '  选择要保留到哪条消息（之后的消息将被删除）：') + '\x1b[K');
+      displayMsgs.forEach((msg, i) => {
+        const globalIdx = startIdx + i;
+        const isSelected = globalIdx === selected;
+        const prefix = isSelected ? c('cyan', '> ') : '  ';
+        const roleIcon = msg.role === 'user' ? '👤' : '🤖';
+        const preview = msg.text.slice(0, 30).replace(/\n/g, ' ') + (msg.text.length > 30 ? '...' : '');
+        const line = isSelected ? c('cyan', `${roleIcon} ${preview}`) : `${roleIcon} ${preview}`;
+        console.log(`  ${prefix}${line}\x1b[K`);
+      });
+      console.log(c('gray', '  ↑↓选择 Enter确认 Esc取消') + '\x1b[K');
+    };
+
+    // 初始绘制
+    console.log();
+    console.log(c('yellow', '  选择要保留到哪条消息（之后的消息将被删除）：'));
+    const displayMsgs = getDisplayMessages();
+    const startIdx = Math.max(0, selectableMessages.length - maxDisplay);
+    displayMsgs.forEach((msg, i) => {
+      const globalIdx = startIdx + i;
+      const isSelected = globalIdx === selected;
+      const prefix = isSelected ? c('cyan', '> ') : '  ';
+      const roleIcon = msg.role === 'user' ? '👤' : '🤖';
+      const preview = msg.text.slice(0, 30).replace(/\n/g, ' ') + (msg.text.length > 30 ? '...' : '');
+      const line = isSelected ? c('cyan', `${roleIcon} ${preview}`) : `${roleIcon} ${preview}`;
+      console.log(`  ${prefix}${line}`);
+    });
+    console.log(c('gray', '  ↑↓选择 Enter确认 Esc取消'));
+
+    stdin.setRawMode(true);
+    stdin.resume();
+
+    const onKey = (key) => {
+      // 上下键
+      if (key[0] === 27 && key[1] === 91) {
+        if (key[2] === 65 && selected > 0) { // 上
+          selected--;
+          drawList();
+        } else if (key[2] === 66 && selected < selectableMessages.length - 1) { // 下
+          selected++;
+          drawList();
+        }
+        return;
+      }
+
+      // Enter - 确认选择
+      if (key[0] === 13) {
+        stdin.removeListener('data', onKey);
+        stdin.setRawMode(false);
+        // 清除选择列表
+        const lines = getDisplayMessages().length + 2;
+        process.stdout.write(`\x1b[${lines}A`);
+        for (let i = 0; i < lines; i++) console.log('\x1b[K');
+        process.stdout.write(`\x1b[${lines}A`);
+        resolve(selectableMessages[selected]);
+        return;
+      }
+
+      // Esc - 取消
+      if (key[0] === 27 && key.length === 1) {
+        stdin.removeListener('data', onKey);
+        stdin.setRawMode(false);
+        // 清除选择列表
+        const lines = getDisplayMessages().length + 2;
+        process.stdout.write(`\x1b[${lines}A`);
+        for (let i = 0; i < lines; i++) console.log('\x1b[K');
+        process.stdout.write(`\x1b[${lines}A`);
+        resolve(null);
+        return;
+      }
+    };
+
+    stdin.on('data', onKey);
+  });
+}
+
+// 确认对话框
+function confirmRollback() {
+  return new Promise((resolve) => {
+    const stdin = process.stdin;
+    const options = ['确认删除', '取消'];
+    let selected = 1; // 默认选中取消
+
+    const drawOptions = () => {
+      process.stdout.write('\x1b[3A');
+      console.log(c('yellow', '  确定删除此消息之后的所有内容？') + '\x1b[K');
+      options.forEach((opt, i) => {
+        const prefix = i === selected ? c('cyan', '> ') : '  ';
+        const text = i === selected ? c('cyan', opt) : opt;
+        console.log(`  ${prefix}${text}\x1b[K`);
+      });
+    };
+
+    // 初始绘制
+    console.log();
+    console.log(c('yellow', '  确定删除此消息之后的所有内容？'));
+    options.forEach((opt, i) => {
+      const prefix = i === selected ? c('cyan', '> ') : '  ';
+      const text = i === selected ? c('cyan', opt) : opt;
+      console.log(`  ${prefix}${text}`);
+    });
+
+    stdin.setRawMode(true);
+    stdin.resume();
+
+    const onKey = (key) => {
+      // 上下键
+      if (key[0] === 27 && key[1] === 91) {
+        if (key[2] === 65 || key[2] === 66) { // 上或下
+          selected = selected === 0 ? 1 : 0;
+          drawOptions();
+        }
+        return;
+      }
+
+      // Enter - 确认
+      if (key[0] === 13) {
+        stdin.removeListener('data', onKey);
+        stdin.setRawMode(false);
+        // 清除对话框
+        process.stdout.write('\x1b[3A');
+        for (let i = 0; i < 3; i++) console.log('\x1b[K');
+        process.stdout.write('\x1b[3A');
+        resolve(selected === 0);
+        return;
+      }
+
+      // Esc - 取消
+      if (key[0] === 27 && key.length === 1) {
+        stdin.removeListener('data', onKey);
+        stdin.setRawMode(false);
+        // 清除对话框
+        process.stdout.write('\x1b[3A');
+        for (let i = 0; i < 3; i++) console.log('\x1b[K');
+        process.stdout.write('\x1b[3A');
+        resolve(false);
+        return;
+      }
+    };
+
+    stdin.on('data', onKey);
+  });
+}
+
 function cleanup() {
   showCursor();
   clearScreen();

package/package.json

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