@make-u-free/migi 0.3.7 → 0.3.9

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'
@@ -66,37 +66,84 @@ console.log(chalk.dim('  /exit       終了\n'))
 
 const agent = new MigiAgent({ context, promptFn, apiKey, model, name: agentName, userName, teamsWebhookUrl })
 
-function sep() { return chalk.dim('─'.repeat(process.stdout.columns || 80)) }
+function sep() {
+  const w = process.stdout.columns || 80
+  return chalk.dim('─'.repeat(w))
+}
+
+function sepWithLabel(label) {
+  const w = process.stdout.columns || 80
+  const left = '── ' + label + ' '
+  const right = '─'.repeat(Math.max(0, w - left.length))
+  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 lines = ['']
+
+    emitKeypressEvents(process.stdin)
+    if (process.stdin.isTTY) process.stdin.setRawMode(true)
+    process.stdout.write(chalk.cyan('  '))
+
+    const onKey = (str, key) => {
+      if (!key) {
+        // IME確定などの複合文字
+        if (str) { lines[lines.length - 1] += str; process.stdout.write(str) }
+        return
+      }
+
+      // Ctrl+C
+      if (key.ctrl && key.name === 'c') {
+        console.log(chalk.cyan('\n\n  お疲れ様でした！またね。\n'))
+        process.exit(0)
+      }
+
+      if (key.name === 'return') {
+        if (key.shift) {
+          // Shift+Enter → 改行
+          lines.push('')
+          process.stdout.write('\n  ')
+        } else {
+          // Enter → 送信
+          const content = lines.join('\n').trim()
+          if (!content) return  // 空は無視
+          process.stdin.removeListener('keypress', onKey)
+          if (process.stdin.isTTY) process.stdin.setRawMode(false)
+          process.stdout.write('\n')
+          console.log(sep())
+          console.log(chalk.dim(`  ✦ ${model}  ·  Shift+Enterで改行 / Enterで送信`))
+          resolve(content)
+        }
+        return
+      }
+
+      if (key.name === 'backspace') {
+        const cur = lines[lines.length - 1]
+        if (cur.length > 0) {
+          lines[lines.length - 1] = cur.slice(0, -1)
+          process.stdout.write('\b \b')
+        }
+        return
+      }
+
+      if (str && !key.ctrl && !key.meta) {
+        lines[lines.length - 1] += str
+        process.stdout.write(str)
       }
     }
-    process.stdout.write(chalk.cyan('  '))
-    rl.on('line', onLine)
+
+    process.stdin.on('keypress', onKey)
   })
 }
 
 // ---- メインループ ----
 async function prompt() {
-  // 入力ボックス上辺
-  console.log('\n' + sep())
-  console.log(chalk.bold.cyan(`  ${userName || 'あなた'}`))
-  console.log(sep())
+  // 入力ボックス上辺（ユーザー名をセパレーターに埋め込む）
+  console.log('\n' + sepWithLabel(chalk.bold.cyan(userName || 'あなた')))
 
-  const input = (await readMultiLine()).trim()
+  const input = (await readChatInput()).trim()
   if (!input) return prompt()
 
   // --- ビルトインコマンド ---
@@ -139,9 +186,7 @@ async function prompt() {
   if (parsed) {
     const skill = resolveSkill(parsed.name, process.cwd())
     if (skill) {
-      console.log('\n' + sep())
-      console.log(chalk.bold.cyan(`  ${agentName}`) + chalk.dim(`  [スキル: ${parsed.name}]`))
-      console.log(sep())
+      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)
@@ -158,9 +203,7 @@ async function prompt() {
   }
 
   // --- 通常チャット ---
-  console.log('\n' + sep())
-  console.log(chalk.bold.cyan(`  ${agentName}`))
-  console.log(sep())
+  console.log('\n' + sepWithLabel(chalk.bold.cyan(agentName)))
   try {
     const reply = await agent.chat(input)
     console.log('\n' + reply + '\n')

package/package.json

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