foliko 1.0.9 → 1.0.10

package/cli/src/ui/chat-ui.js

@@ -1,75 +1,31 @@
 /**
  * 聊天界面组件
- * 处理用户输入、粘贴检测、输出渲染
+ * 使用 readline question() 实现多行输入
  */
 
 const readline = require('readline')
-const { EventEmitter } = require('events')
 const { CLEAR_LINE, CYAN, DIM, GREEN, RED, YELLOW, colored } = require('../utils/ansi')
-const { render, renderLine } = require('../utils/markdown')
+const { renderLine } = require('../utils/markdown')
 
-class ChatUI extends EventEmitter {
+class ChatUI {
   constructor(agent) {
-    super()
     this.agent = agent
     this.rl = null
-    this.currentLine = ''
-    this.lines = []
-    this.pasteId = 0
-    this.isFirstLine = true
-
-    // 粘贴检测
-    this.lastKeyTime = 0
-    this.pasteBuffer = ''
-    this.isPasting = false
-
-    // 多行输入：记录上次 Enter 时间，检测连续两次空回车
-    this.lastEnterTime = 0
-    this.LINE_ENDING_INTERVAL = 800  // 毫秒内连续两次空回车结束输入
+    this.lines = []  // 多行输入的累积
   }
 
   /**
    * 启动聊天界面
    */
   start() {
-    this.setupReadline()
-    this.printWelcome()
-    this.prompt()
-  }
-
-  /**
-   * 设置 readline
-   */
-  setupReadline() {
     this.rl = readline.createInterface({
       input: process.stdin,
       output: process.stdout,
       crlfDelay: Infinity
     })
 
-    // 使用 keypress 事件支持特殊按键
-    readline.emitKeypressEvents(process.stdin)
-
-    if (process.stdin.isTTY) {
-      process.stdin.setRawMode(true)
-    }
-
-    // 监听按键
-    process.stdin.on('keypress', this.handleKey.bind(this))
-
-    // 退出时清理
-    process.on('exit', () => {
-      if (process.stdin.isTTY) {
-        process.stdin.setRawMode(false)
-      }
-    })
-
-    process.on('SIGINT', () => {
-      if (process.stdin.isTTY) {
-        process.stdin.setRawMode(false)
-      }
-      process.exit(0)
-    })
+    this.printWelcome()
+    this.promptUser()
   }
 
   /**
@@ -77,174 +33,77 @@ class ChatUI extends EventEmitter {
    */
   printWelcome() {
     console.log(`${colored('Foliko', CYAN)} - 持续对话聊天`)
-    console.log(`${colored('Ctrl+C', DIM)} 退出 | ${colored('Enter', DIM)} 换行 | ${colored('双Enter', DIM)} 发送\n`)
+    console.log(`${colored('Ctrl+C', DIM)} 退出 | ${colored('连续两次回车', DIM)} 发送多行 | ${colored('!!', DIM)} 立即发送\n`)
   }
 
   /**
-   * 显示提示符
+   * 获取多行输入
    */
-  prompt() {
-    const prefix = this.isFirstLine ? colored('> ', GREEN) : colored('- ', DIM)
-    process.stdout.write(`\r${CLEAR_LINE}${prefix}${this.currentLine}`)
-  }
-
-  /**
-   * 处理按键
-   */
-  handleKey(str, key) {
-    // Ctrl+C 退出
-    if (key.ctrl && key.name === 'c') {
-      console.log('\n再见！')
-      if (process.stdin.isTTY) {
-        process.stdin.setRawMode(false)
-      }
-      process.exit(0)
-      return
-    }
-
-    // Enter 发送
-    if (key.name === 'return') {
-      this.handleSubmit()
-      return
-    }
+  getMultilineInput() {
+    return new Promise((resolve) => {
+      const lines = []
+
+      const question = (isFirst) => {
+        const prompt = isFirst ? colored('> ', GREEN) : colored('- ', DIM)
+        this.rl.question(prompt, (input) => {
+          // 输入 !! 立即结束
+          if (input.trim() === '!!') {
+            const result = lines.join('\n').trim()
+            resolve(result)
+            return
+          }
 
-    // Ctrl+Enter 换行
-    if (key.ctrl && key.name === 'return') {
-      this.lines.push(this.currentLine)
-      this.currentLine = ''
-      this.isFirstLine = false
-      this.prompt()
-      return
-    }
+          // 空行：结束输入并发送（第一次空行就发送）
+          if (input.trim() === '') {
+            const result = lines.join('\n').trim()
+            resolve(result)
+            return
+          }
 
-    // Backspace 退格
-    if (key.name === 'backspace') {
-      if (this.currentLine.length > 0) {
-        this.currentLine = this.currentLine.slice(0, -1)
-        this.prompt()
-      } else if (this.lines.length > 0) {
-        this.currentLine = this.lines.pop()
-        this.isFirstLine = this.lines.length === 0
-        this.prompt()
+          // 非空行：添加到 lines，继续输入
+          lines.push(input)
+          question(false)
+        })
       }
-      return
-    }
-
-    // 普通字符
-    if (str && !key.ctrl && !key.meta) {
-      // 直接添加到当前行
-      this.currentLine += str
-      this.prompt()
-    }
-  }
-
-  /**
-   * 处理粘贴
-   */
-  handlePaste() {
-    if (this.pasteBuffer.includes('\n')) {
-      const allLines = this.pasteBuffer.split('\n')
-      this.lines.push(...allLines.slice(0, -1))
-      this.currentLine = allLines[allLines.length - 1]
-      this.isFirstLine = false
-      this.pasteId++
 
-      console.log(`\n${CLEAR_LINE}${colored(`[Pasted text #${this.pasteId} +${this.lines.length + 1} lines]`, CYAN)}`)
-    } else {
-      this.currentLine = this.pasteBuffer
-      this.lines = []
-    }
-    this.pasteBuffer = ''
+      question(true)
+    })
   }
 
   /**
-   * 处理发送
+   * 提示用户输入
    */
-  async handleSubmit() {
-    const now = Date.now()
-    const content = this.lines.length > 0
-      ? [...this.lines, this.currentLine].join('\n')
-      : this.currentLine
-
-    const trimmed = content.trim()
-
-    // 检测连续两次空回车（多行输入结束）
-    if (this.currentLine.trim() === '' && this.lines.length > 0) {
-      if (now - this.lastEnterTime < this.LINE_ENDING_INTERVAL) {
-        // 第二次空回车，结束输入
-        const finalContent = this.lines.join('\n').trim()
-        this.resetInput()
-        console.log()
-
-        if (!finalContent) {
-          this.prompt()
-          return
-        }
+  async promptUser() {
+    try {
+      const input = await this.getMultilineInput()
 
-        await this.sendMessage(finalContent)
+      if (!input) {
+        await this.promptUser()
         return
       }
-    }
-    this.lastEnterTime = now
-
-    // 输入 !! 立即结束多行输入
-    if (this.currentLine.trim() === '!!') {
-      const finalContent = this.lines.join('\n').trim()
-      this.resetInput()
-      console.log()
 
-      if (finalContent) {
-        await this.sendMessage(finalContent)
-      } else {
-        this.prompt()
+      // 退出命令
+      if (input.toLowerCase() === 'exit' || input.toLowerCase() === 'quit') {
+        console.log('再见！')
+        this.rl.close()
+        return
       }
-      return
-    }
 
-    // 显示空行
-    console.log()
+      // 发送消息
+      await this.sendMessage(input)
 
-    // 退出命令
-    if (trimmed.toLowerCase() === 'exit' || trimmed.toLowerCase() === 'quit') {
-      console.log('再见！')
-      if (process.stdin.isTTY) {
-        process.stdin.setRawMode(false)
-      }
-      process.exit(0)
-      return
-    }
-
-    if (!trimmed) {
-      this.resetInput()
-      this.prompt()
-      return
+      // 继续等待下一条消息
+      await this.promptUser()
+    } catch (err) {
+      console.error(`\n${colored('[错误]', RED)} ${err.message}`)
+      await this.promptUser()
     }
-
-    // 重置输入
-    this.resetInput()
-
-    // 发送消息
-    await this.sendMessage(trimmed)
-  }
-
-  /**
-   * 重置输入状态
-   */
-  resetInput() {
-    this.currentLine = ''
-    this.lines = []
-    this.isFirstLine = true
-    this.pasteId = 0
-    this.isPasting = false
-    this.pasteBuffer = ''
-    this.lastEnterTime = 0
   }
 
   /**
    * 发送消息并显示响应
    */
   async sendMessage(message) {
-    console.log(colored('Agent:', GREEN))
     console.log()
 
     // 用于打断的标志
@@ -263,43 +122,18 @@ class ChatUI extends EventEmitter {
 
     try {
       let lineBuffer = ''
-      // 渲染状态追踪
       const renderState = { inThink: false, inCodeBlock: false }
 
-      // 检查是否还有孤立的代理对
-      const hasOrphanedSurrogate = (str) => {
-        if (!str || str.length === 0) return false
-        let i = 0
-        while (i < str.length) {
-          const code = str.charCodeAt(i)
-          if (code >= 0xD800 && code <= 0xDBFF) {
-            const nextCode = str.charCodeAt(i + 1)
-            if (nextCode >= 0xDC00 && nextCode <= 0xDFFF) {
-              i += 2
-              continue
-            }
-            return true // 孤立的高代理
-          }
-          i++
-        }
-        return false
-      }
+      console.log(colored('Agent:', GREEN))
+      console.log()
 
       for await (const chunk of this.agent.chatStream(message)) {
-        // 检查是否被打断
         if (interrupted) break
 
         if (chunk.type === 'text') {
           lineBuffer += chunk.text
 
-          // 如果有孤立代理对，等待下一个chunk补充
-          if (hasOrphanedSurrogate(lineBuffer)) {
-            continue
-          }
-
-          // 当有一行完整内容时，渲染并输出
           while (lineBuffer.includes('\n')) {
-            // 检查是否被打断
             if (interrupted) break
 
             const nlIndex = lineBuffer.indexOf('\n')
@@ -316,7 +150,6 @@ class ChatUI extends EventEmitter {
         }
       }
 
-      // 输出剩余内容
       if (lineBuffer.trim() && !interrupted) {
         console.log(renderLine(lineBuffer, renderState))
       }
@@ -325,11 +158,8 @@ class ChatUI extends EventEmitter {
         console.error(`\n${colored('[错误]', RED)} ${err.message}\n`)
       }
     } finally {
-      // 移除监听器
       process.removeListener('SIGINT', interruptHandler)
     }
-
-    this.prompt()
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foliko",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "简约的插件化 Agent 框架",
   "main": "src/index.js",
   "bin": {