@fivetu53/soul-chat 1.1.5 → 1.1.6

package/bin/index.js

@@ -1,11 +1,13 @@
 #!/usr/bin/env node
 
-import readline from 'readline';
+import termkit from 'terminal-kit';
 import { execSync } from 'child_process';
 import fs from 'fs';
 import os from 'os';
 import { Marked } from 'marked';
 import { markedTerminal } from 'marked-terminal';
+
+const term = termkit.terminal;
 import { loadConfig, saveConfig, getConfigPath } from './config.js';
 import { checkAuth, showAuthScreen } from './auth.js';
 import {
@@ -940,174 +942,144 @@ const slashCommands = [
   { cmd: '/help', desc: '显示帮助' },
 ];
 
+// 聊天输入历史
+const chatHistory = [];
+
 function chatPrompt(query) {
   return new Promise((resolve) => {
-    const stdin = process.stdin;
-
-    // 先打印下方提示
-    console.log(c('hint', '  输入 / 选择命令  Ctrl+J 换行  Esc 双击回滚  Ctrl+C 双击退出'));
+    // 打印提示
+    console.log(c('hint', '  输入 / 选择命令  Esc 双击回滚  Ctrl+C 双击退出  Ctrl+J 换行'));
     console.log(c('primary', '  门户网站: https://soul-chat.jdctools.com.cn'));
-    // 光标上移3行，显示输入提示
     process.stdout.write('\x1b[3A');
     process.stdout.write(query);
 
     let input = '';
-    let cursorPos = 0;  // 光标位置
-    let lastInputTime = Date.now();
-
-    // 计算字符显示宽度（中文2，英文1）
-    const charWidth = (ch) => ch.charCodeAt(0) > 127 ? 2 : 1;
-    const strWidth = (str) => [...str].reduce((w, ch) => w + charWidth(ch), 0);
+    let lastCtrlC = 0;
+    let lastEsc = 0;
+    let historyIndex = chatHistory.length;
+    let savedInput = '';
 
+    const stdin = process.stdin;
     stdin.setRawMode(true);
     stdin.resume();
 
-    const onData = (chunk) => {
-      const char = chunk.toString();
+    const onData = (key) => {
       const now = Date.now();
-      const timeDiff = now - lastInputTime;
-      lastInputTime = now;
-
-      // 方向键处理 (ESC [ A/B/C/D)
-      if (chunk[0] === 27 && chunk[1] === 91) {
-        if (chunk[2] === 68) { // 左
-          if (cursorPos > 0) {
-            const ch = input[cursorPos - 1];
-            if (ch === '\n') {
-              // 跨行移动太复杂，暂不支持
-            } else {
-              cursorPos--;
-              process.stdout.write('\x1b[' + charWidth(ch) + 'D');
-            }
-          }
-          return;
-        }
-        if (chunk[2] === 67) { // 右
-          if (cursorPos < input.length) {
-            const ch = input[cursorPos];
-            if (ch === '\n') {
-              // 跨行移动太复杂，暂不支持
-            } else {
-              cursorPos++;
-              process.stdout.write('\x1b[' + charWidth(ch) + 'C');
-            }
-          }
-          return;
-        }
-        // 上下键忽略
-        return;
-      }
 
-      // Ctrl+V - 粘贴图片
-      if (char === '\x16') {
-        const img = getClipboardImage();
-        if (img) {
-          pendingImage = img;
-          const hint = `[图片 ${img.width}x${img.height}] `;
-          input = input.slice(0, cursorPos) + hint + input.slice(cursorPos);
-          cursorPos += hint.length;
-          process.stdout.write(c('cyan', hint));
-        }
+      // 检测粘贴（多字符同时到达）
+      if (key.length > 1 && key[0] !== 27) {
+        // 粘贴模式：将换行替换为 ↵ 符号
+        let text = key.toString().replace(/\r\n|\r|\n/g, '↵');
+        input += text;
+        process.stdout.write(text);
         return;
       }
 
-      // Ctrl+J - 插入换行（只在行尾支持）
-      if (char === '\x0a' && chunk.length === 1 && chunk[0] === 10) {
-        if (cursorPos === input.length) {
-          input += '\n';
-          cursorPos++;
-          process.stdout.write('\n  ');
+      // Ctrl+C
+      if (key[0] === 3) {
+        if (now - lastCtrlC < 500) {
+          stdin.setRawMode(false);
+          cleanup();
+          process.exit();
         }
+        lastCtrlC = now;
+        // 清空当前行
+        process.stdout.write('\r' + query + '\x1b[K');
+        input = '';
         return;
       }
 
-      // Enter 键 - 发送消息
-      if (char === '\r' || char === '\n') {
-        if (timeDiff < 10 && input.length > 0) {
-          input = input.slice(0, cursorPos) + ' ' + input.slice(cursorPos);
-          cursorPos++;
-          process.stdout.write(' ');
-        } else {
+      // Esc
+      if (key[0] === 27 && key.length === 1) {
+        if (now - lastEsc < 500) {
           stdin.removeListener('data', onData);
           stdin.setRawMode(false);
           console.log();
-          resolve(input);
+          resolve('/rollback');
+          return;
         }
-        return;
-      }
-
-      // Ctrl+C - 单击清空，双击退出
-      if (char === '\u0003') {
-        if (now - lastCtrlCTime < 500) {
-          stdin.removeListener('data', onData);
-          stdin.setRawMode(false);
-          cleanup();
-          process.exit();
-        } else {
-          lastCtrlCTime = now;
-          // 清空输入
-          process.stdout.write('\r' + query + ' '.repeat(strWidth(input)) + '\r' + query);
-          input = '';
-          cursorPos = 0;
+        lastEsc = now;
+        if (currentAbortController) {
+          currentAbortController.abort();
         }
         return;
       }
 
-      // Esc - 单击打断回复，双击触发回滚
-      if (chunk[0] === 27 && chunk.length === 1) {
-        if (now - lastEscTime < 500) {
-          stdin.removeListener('data', onData);
-          stdin.setRawMode(false);
-          console.log();
-          resolve('/rollback');
-        } else {
-          lastEscTime = now;
-          if (currentAbortController) {
-            currentAbortController.abort();
-          }
+      // 上下方向键 - 历史
+      if (key[0] === 27 && key[1] === 91) {
+        if (key[2] === 65 && historyIndex > 0) { // 上
+          if (historyIndex === chatHistory.length) savedInput = input;
+          historyIndex--;
+          process.stdout.write('\r' + query + '\x1b[K');
+          input = chatHistory[historyIndex];
+          process.stdout.write(input);
+        } else if (key[2] === 66 && historyIndex < chatHistory.length) { // 下
+          historyIndex++;
+          process.stdout.write('\r' + query + '\x1b[K');
+          input = historyIndex === chatHistory.length ? savedInput : chatHistory[historyIndex];
+          process.stdout.write(input);
         }
         return;
       }
 
-      // 斜杠命令选择器
-      if (char === '/' && input === '') {
+      // Enter - 发送
+      if (key[0] === 13) {
         stdin.removeListener('data', onData);
-        showCommandSelector(stdin, query, resolve);
+        stdin.setRawMode(false);
+        console.log();
+        const finalInput = input.replace(/↵/g, '\n');
+        if (finalInput.trim()) chatHistory.push(input);
+        resolve(finalInput);
         return;
       }
 
-      // 退格
-      if (char === '\u007f' || char === '\b') {
-        if (cursorPos > 0) {
-          const delChar = input[cursorPos - 1];
-          input = input.slice(0, cursorPos - 1) + input.slice(cursorPos);
-          cursorPos--;
+      // Ctrl+J - 换行符号
+      if (key[0] === 10) {
+        input += '↵';
+        process.stdout.write('↵');
+        return;
+      }
 
-          if (delChar === '\n') {
-            process.stdout.write('\x1b[A\x1b[999C');
+      // Backspace
+      if (key[0] === 127) {
+        if (input.length > 0) {
+          const deleted = input[input.length - 1];
+          input = input.slice(0, -1);
+          // 中文等宽字符占2列
+          const isWide = /[\u4e00-\u9fff\u3400-\u4dbf\uf900-\ufaff\u3000-\u303f\uff00-\uffef]/.test(deleted);
+          if (isWide) {
+            process.stdout.write('\b\b  \b\b');
           } else {
-            const w = charWidth(delChar);
-            const afterCursor = input.slice(cursorPos);
-            // 左移，重绘后面的内容，清除末尾，回到光标位置
-            process.stdout.write('\x1b[' + w + 'D');
-            process.stdout.write(afterCursor + ' '.repeat(w));
-            const moveBack = strWidth(afterCursor) + w;
-            if (moveBack > 0) process.stdout.write('\x1b[' + moveBack + 'D');
+            process.stdout.write('\b \b');
           }
         }
         return;
       }
 
+      // Ctrl+V - 粘贴图片
+      if (key[0] === 22) {
+        const img = getClipboardImage();
+        if (img) {
+          pendingImage = img;
+          const hint = `[图片 ${img.width}x${img.height}] `;
+          input += hint;
+          process.stdout.write(hint);
+        }
+        return;
+      }
+
+      // 斜杠命令选择
+      if (key[0] === 47 && input === '') { // /
+        stdin.removeListener('data', onData);
+        showCommandSelector(stdin, query, resolve);
+        return;
+      }
+
       // 普通字符
-      if (char >= ' ' || char === '\t') {
-        input = input.slice(0, cursorPos) + char + input.slice(cursorPos);
-        const afterCursor = input.slice(cursorPos + 1);
-        cursorPos++;
-        // 输出字符和后面的内容
-        process.stdout.write(char + afterCursor);
-        // 光标回到正确位置
-        const moveBack = strWidth(afterCursor);
-        if (moveBack > 0) process.stdout.write('\x1b[' + moveBack + 'D');
+      if (key[0] >= 32 || key[0] === 9) {
+        const char = key.toString();
+        input += char;
+        process.stdout.write(char);
       }
     };
 
@@ -1119,12 +1091,10 @@ function chatPrompt(query) {
 function showCommandSelector(stdin, query, resolve) {
   let selected = 0;
 
-  // 清除当前行并显示命令列表
   process.stdout.write('\r\x1b[K');
   console.log();
 
   const drawCommands = () => {
-    // 上移到命令列表开始位置
     process.stdout.write(`\x1b[${slashCommands.length}A`);
     slashCommands.forEach((cmd, i) => {
       const prefix = i === selected ? c('cyan', '> ') : '  ';
@@ -1133,7 +1103,6 @@ function showCommandSelector(stdin, query, resolve) {
     });
   };
 
-  // 初始绘制
   slashCommands.forEach((cmd, i) => {
     const prefix = i === selected ? c('cyan', '> ') : '  ';
     const cmdText = i === selected ? c('cyan', cmd.cmd.padEnd(10)) : cmd.cmd.padEnd(10);
@@ -1141,71 +1110,33 @@ function showCommandSelector(stdin, query, resolve) {
   });
 
   const onSelect = (key) => {
-    // 上下键
     if (key[0] === 27 && key[1] === 91) {
-      if (key[2] === 65) { // 上
-        selected = selected > 0 ? selected - 1 : slashCommands.length - 1;
-        drawCommands();
-      } else if (key[2] === 66) { // 下
-        selected = selected < slashCommands.length - 1 ? selected + 1 : 0;
-        drawCommands();
-      }
+      if (key[2] === 65) selected = selected > 0 ? selected - 1 : slashCommands.length - 1;
+      else if (key[2] === 66) selected = selected < slashCommands.length - 1 ? selected + 1 : 0;
+      drawCommands();
       return;
     }
 
-    // Enter - 选择命令
     if (key[0] === 13) {
       stdin.removeListener('data', onSelect);
       stdin.setRawMode(false);
-      // 清除命令列表
       process.stdout.write(`\x1b[${slashCommands.length}A`);
-      for (let i = 0; i < slashCommands.length; i++) {
-        console.log('\x1b[K');
-      }
+      for (let i = 0; i < slashCommands.length; i++) console.log('\x1b[K');
       process.stdout.write(`\x1b[${slashCommands.length}A`);
       resolve(slashCommands[selected].cmd);
       return;
     }
 
-    // Esc - 取消
     if (key[0] === 27 && key.length === 1) {
       stdin.removeListener('data', onSelect);
-      // 清除命令列表，重新开始输入
       process.stdout.write(`\x1b[${slashCommands.length}A`);
-      for (let i = 0; i < slashCommands.length; i++) {
-        console.log('\x1b[K');
-      }
+      for (let i = 0; i < slashCommands.length; i++) console.log('\x1b[K');
       process.stdout.write(`\x1b[${slashCommands.length}A`);
       process.stdout.write(query);
-      // 重新监听输入
-      let input = '';
-      const onData = (chunk) => {
-        const char = chunk.toString();
-        if (char === '\r' || char === '\n') {
-          stdin.removeListener('data', onData);
-          stdin.setRawMode(false);
-          console.log();
-          resolve(input);
-        } else if (char === '\u0003') {
-          stdin.removeListener('data', onData);
-          stdin.setRawMode(false);
-          cleanup();
-          process.exit();
-        } else if (char === '\u007f' || char === '\b') {
-          if (input.length > 0) {
-            input = input.slice(0, -1);
-            process.stdout.write('\b \b');
-          }
-        } else if (char >= ' ') {
-          input += char;
-          process.stdout.write(char);
-        }
-      };
-      stdin.on('data', onData);
+      chatPrompt(query).then(resolve);
       return;
     }
 
-    // Ctrl+C - 退出
     if (key[0] === 3) {
       stdin.removeListener('data', onSelect);
       stdin.setRawMode(false);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fivetu53/soul-chat",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "Soul Chat - 智能 AI 伴侣命令行客户端",
   "type": "module",
   "bin": {
@@ -12,7 +12,12 @@
   "engines": {
     "node": ">=18.0.0"
   },
-  "keywords": ["ai", "chat", "cli", "soul-chat"],
+  "keywords": [
+    "ai",
+    "chat",
+    "cli",
+    "soul-chat"
+  ],
   "author": "u53",
   "license": "UNLICENSED",
   "repository": {
@@ -25,12 +30,8 @@
     "dev": "node --watch bin/index.js"
   },
   "dependencies": {
-    "ink": "^4.4.1",
-    "ink-select-input": "^5.0.0",
-    "ink-spinner": "^5.0.0",
-    "ink-text-input": "^5.0.1",
     "marked": "^15.0.12",
     "marked-terminal": "^7.3.0",
-    "react": "^18.2.0"
+    "terminal-kit": "^3.1.2"
   }
 }