@make-u-free/migi 0.4.5 → 0.4.7

package/bin/migi.js

@@ -87,10 +87,18 @@ async function readChatInput() {
     let curLine = 0
     let drawnLines = 0
     let cursorLine = 0  // カーソルの物理行（drawn area 先頭からの offset）
+    let drawPending = false
 
     emitKeypressEvents(process.stdin)
     if (process.stdin.isTTY) process.stdin.setRawMode(true)
 
+    // ペースト等の連続入力をまとめて1回の描画にするためのデバウンス
+    function scheduleDraw() {
+      if (drawPending) return
+      drawPending = true
+      setImmediate(() => { drawPending = false; draw() })
+    }
+
     function draw() {
       const w = process.stdout.columns || 80
       const newLines = [
@@ -136,11 +144,12 @@ async function readChatInput() {
 
     const onKey = (str, key) => {
       if (!key) {
-        if (str) { lines[curLine] += str; draw() }
+        if (str) { lines[curLine] += str; scheduleDraw() }
         return
       }
 
       if (key.ctrl && key.name === 'c') {
+        if (drawPending) { drawPending = false; draw() }  // カーソル位置を確定させてから終了
         process.stdout.write(`\x1b[${drawnLines - 1 - curLine}B\n`)
         process.stdin.removeListener('keypress', onKey)
         if (process.stdin.isTTY) process.stdin.setRawMode(false)
@@ -153,9 +162,10 @@ async function readChatInput() {
         if (key.meta || key.shift) {
           lines.splice(curLine + 1, 0, '')
           curLine++
-          draw()
+          scheduleDraw()
         } else {
-          // Enter → 送信
+          // Enter → 送信（保留中の描画があれば先に確定）
+          if (drawPending) { drawPending = false; draw() }
           const content = lines.join('\n').trim()
           if (!content) return
           process.stdout.write(`\x1b[${drawnLines - 1 - curLine}B\n`)
@@ -169,18 +179,18 @@ async function readChatInput() {
       if (key.name === 'backspace') {
         if (lines[curLine].length > 0) {
           lines[curLine] = lines[curLine].slice(0, -1)
-          draw()
+          scheduleDraw()
         } else if (curLine > 0) {
           lines.splice(curLine, 1)
           curLine--
-          draw()
+          scheduleDraw()
         }
         return
       }
 
       if (str && !key.ctrl && !key.meta) {
         lines[curLine] += str
-        draw()
+        scheduleDraw()
       }
     }
 
@@ -239,8 +249,7 @@ async function prompt() {
       console.log('\n' + sepWithLabel(chalk.bold.cyan(agentName) + chalk.dim(`  [スキル: ${parsed.name}]`)))
       const expanded = expandSkill(skill.content, parsed.args)
       try {
-        const reply = await agent.chat(expanded)
-        console.log('\n' + reply + '\n')
+        await agent.chat(expanded)
       } catch (err) {
         console.error(chalk.red('\n  エラー: ' + err.message + '\n'))
       }
@@ -255,8 +264,7 @@ async function prompt() {
   // --- 通常チャット ---
   console.log('\n' + sepWithLabel(chalk.bold.cyan(agentName)))
   try {
-    const reply = await agent.chat(input)
-    console.log('\n' + reply + '\n')
+    await agent.chat(input)
   } catch (err) {
     console.error(chalk.red('\n  エラー: ' + err.message + '\n'))
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@make-u-free/migi",
-  "version": "0.4.5",
+  "version": "0.4.7",
   "description": "Your AI right-hand agent. Works anywhere, with any LLM API.",
   "type": "module",
   "bin": {

package/src/agent.js

@@ -97,28 +97,69 @@ ${userNameLine}
 
     while (true) {
       spinner.start('考え中…')
-      const response = await this.client.chat.completions.create({
+
+      const stream = await this.client.chat.completions.create({
         model: this.model,
         messages,
         tools: this.tools,
-        tool_choice: 'auto'
+        tool_choice: 'auto',
+        stream: true
       })
-      spinner.stop()
 
-      const choice = response.choices[0]
-      messages.push(choice.message)
-      this.history.push(choice.message)
+      let content = ''
+      const tcMap = {}   // tool_calls をインデックスで蓄積
+      let finishReason = null
+      let streaming = false  // 最初のコンテンツが届いたか
+
+      for await (const chunk of stream) {
+        const choice = chunk.choices[0]
+        if (!choice) continue
+        const delta = choice.delta
+        if (choice.finish_reason) finishReason = choice.finish_reason
+
+        // テキストチャンク
+        if (delta?.content) {
+          if (!streaming) {
+            spinner.stop()
+            process.stdout.write('\n')
+            streaming = true
+          }
+          content += delta.content
+          process.stdout.write(delta.content)
+        }
+
+        // tool_calls チャンク（引数はストリームで分割されて届く）
+        if (delta?.tool_calls) {
+          for (const tc of delta.tool_calls) {
+            if (!tcMap[tc.index]) tcMap[tc.index] = { id: '', type: 'function', function: { name: '', arguments: '' } }
+            if (tc.id) tcMap[tc.index].id += tc.id
+            if (tc.function?.name) tcMap[tc.index].function.name += tc.function.name
+            if (tc.function?.arguments) tcMap[tc.index].function.arguments += tc.function.arguments
+          }
+        }
+      }
+
+      spinner.stop()
 
       // 通常の返答
-      if (choice.finish_reason === 'stop') {
-        return choice.message.content
+      if (finishReason === 'stop') {
+        process.stdout.write('\n\n')
+        const assistantMsg = { role: 'assistant', content }
+        messages.push(assistantMsg)
+        this.history.push(assistantMsg)
+        return content
       }
 
       // ツール呼び出し
-      if (choice.finish_reason === 'tool_calls') {
-        const toolResults = []
+      if (finishReason === 'tool_calls') {
+        if (streaming) process.stdout.write('\n')
+        const toolCalls = Object.values(tcMap)
+        const assistantMsg = { role: 'assistant', content: content || null, tool_calls: toolCalls }
+        messages.push(assistantMsg)
+        this.history.push(assistantMsg)
 
-        for (const toolCall of choice.message.tool_calls) {
+        const toolResults = []
+        for (const toolCall of toolCalls) {
           const args = JSON.parse(toolCall.function.arguments)
           const name = toolCall.function.name