@make-u-free/migi 0.3.8 → 0.4.0

package/bin/migi.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import '../src/tls.js'  // 企業CA（Zscaler等）を起動直後に読み込む
-import readline from 'readline'
+import readline, { emitKeypressEvents } from 'readline'
 import chalk from 'chalk'
 import dotenv from 'dotenv'
 import { MigiAgent } from '../src/agent.js'
@@ -78,24 +78,99 @@ function sepWithLabel(label) {
   return chalk.dim(left + right)
 }
 
-// ---- 複数行入力（空行で送信）----
-async function readMultiLine() {
-  const lines = []
+// ---- チャット入力（Enter送信 / Shift+Enter改行）----
+async function readChatInput() {
   return new Promise((resolve) => {
-    const onLine = (line) => {
-      if (line === '' && lines.length > 0) {
-        rl.removeListener('line', onLine)
-        // 入力ボックス下辺（欄の閉じ）+ 欄外ガイド
-        console.log(sep())
-        console.log(chalk.dim(`  ✦ ${model}  ·  Enterで改行 / 空行で送信`))
-        resolve(lines.join('\n'))
-      } else {
-        lines.push(line)
-        process.stdout.write(chalk.cyan('  '))
+    const PFIRST = '  > '
+    const PCONT  = '    '
+    const lines = ['']
+    let curLine = 0
+    let drawnLines = 0
+
+    emitKeypressEvents(process.stdin)
+    if (process.stdin.isTTY) process.stdin.setRawMode(true)
+
+    function draw() {
+      const w = process.stdout.columns || 80
+
+      // 前回描画分をクリア
+      if (drawnLines > 0) {
+        process.stdout.write(`\x1b[${drawnLines}A\x1b[1G`)
+        for (let i = 0; i < drawnLines; i++) {
+          process.stdout.write('\x1b[2K\n')
+        }
+        process.stdout.write(`\x1b[${drawnLines}A\x1b[1G`)
+      }
+
+      // 入力行 + セパレーター + ガイド を描画
+      const allLines = [
+        ...lines.map((l, i) => chalk.cyan(i === 0 ? PFIRST : PCONT) + l),
+        chalk.dim('─'.repeat(w)),
+        chalk.dim(`  ✦ ${model}  ·  Shift+Enterで改行 / Enterで送信`)
+      ]
+      drawnLines = allLines.length
+      process.stdout.write(allLines.join('\n') + '\n')
+
+      // カーソルを入力行の末尾に移動
+      const linesBelow = drawnLines - curLine
+      if (linesBelow > 0) process.stdout.write(`\x1b[${linesBelow}A`)
+      const col = (curLine === 0 ? PFIRST : PCONT).length + lines[curLine].length + 1
+      process.stdout.write(`\x1b[${col}G`)
+    }
+
+    draw()
+
+    const onKey = (str, key) => {
+      if (!key) {
+        if (str) { lines[curLine] += str; draw() }
+        return
+      }
+
+      if (key.ctrl && key.name === 'c') {
+        process.stdout.write(`\x1b[${drawnLines - curLine}B\n`)
+        process.stdin.removeListener('keypress', onKey)
+        if (process.stdin.isTTY) process.stdin.setRawMode(false)
+        console.log(chalk.cyan('\n  お疲れ様でした！またね。\n'))
+        process.exit(0)
+      }
+
+      if (key.name === 'return') {
+        if (key.shift) {
+          // Shift+Enter → 改行
+          lines.splice(curLine + 1, 0, '')
+          curLine++
+          draw()
+        } else {
+          // Enter → 送信
+          const content = lines.join('\n').trim()
+          if (!content) return
+          process.stdout.write(`\x1b[${drawnLines - curLine}B\n`)
+          process.stdin.removeListener('keypress', onKey)
+          if (process.stdin.isTTY) process.stdin.setRawMode(false)
+          resolve(content)
+        }
+        return
+      }
+
+      if (key.name === 'backspace') {
+        if (lines[curLine].length > 0) {
+          lines[curLine] = lines[curLine].slice(0, -1)
+          draw()
+        } else if (curLine > 0) {
+          lines.splice(curLine, 1)
+          curLine--
+          draw()
+        }
+        return
+      }
+
+      if (str && !key.ctrl && !key.meta) {
+        lines[curLine] += str
+        draw()
       }
     }
-    process.stdout.write(chalk.cyan('  '))
-    rl.on('line', onLine)
+
+    process.stdin.on('keypress', onKey)
   })
 }
 
@@ -104,7 +179,7 @@ async function prompt() {
   // 入力ボックス上辺（ユーザー名をセパレーターに埋め込む）
   console.log('\n' + sepWithLabel(chalk.bold.cyan(userName || 'あなた')))
 
-  const input = (await readMultiLine()).trim()
+  const input = (await readChatInput()).trim()
   if (!input) return prompt()
 
   // --- ビルトインコマンド ---

package/package.json

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