@make-u-free/migi 0.2.7 → 0.2.9

package/package.json

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

package/src/agent.js

@@ -65,7 +65,25 @@ ${userNameLine}
       (context ? `\n## ロードされたコンテキスト\n${context}` : '')
   }
 
+  // tool_calls に対応する tool 結果がない壊れた履歴を修復する
+  _sanitizeHistory() {
+    const cleaned = []
+    for (let i = 0; i < this.history.length; i++) {
+      const msg = this.history[i]
+      if (msg.role === 'assistant' && msg.tool_calls?.length) {
+        const toolIds = msg.tool_calls.map(t => t.id)
+        const hasAllResults = toolIds.every(id =>
+          this.history.slice(i + 1).some(m => m.role === 'tool' && m.tool_call_id === id)
+        )
+        if (!hasAllResults) continue  // 対応する結果がなければ丸ごとスキップ
+      }
+      cleaned.push(msg)
+    }
+    this.history = cleaned
+  }
+
   async chat(userMessage) {
+    this._sanitizeHistory()
     this.history.push({ role: 'user', content: userMessage })
 
     const messages = [
@@ -104,7 +122,11 @@ ${userNameLine}
           let result
 
           if (approved) {
-            result = await executeTool(name, args, { teamsWebhookUrl: this.teamsWebhookUrl })
+            try {
+              result = await executeTool(name, args, { teamsWebhookUrl: this.teamsWebhookUrl })
+            } catch (err) {
+              result = `エラー: ${err.message}`
+            }
           } else {
             result = 'ユーザーによりキャンセルされました'
             console.log(chalk.dim('  → キャンセル'))

package/src/tools.js

@@ -1,8 +1,10 @@
 import { readFileSync, writeFileSync, appendFileSync, existsSync, mkdirSync } from 'fs'
 import { execSync } from 'child_process'
 import { dirname, extname } from 'path'
+import { request } from 'https'
 import { glob } from 'glob'
 import xlsxPkg from 'xlsx'
+import { httpsAgent } from './tls.js'
 const { readFile: xlsxReadFile, utils: xlsxUtils } = xlsxPkg
 
 // ---- OpenAI ツールスキーマ定義 ----
@@ -179,13 +181,29 @@ export async function executeTool(name, args, opts = {}) {
       const url = opts.teamsWebhookUrl
       if (!url) return 'エラー: Teams Webhook URL が設定されていません'
       const body = JSON.stringify({ text: args.message })
-      const res = await fetch(url, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body
+      return new Promise((resolve) => {
+        const parsed = new URL(url)
+        const options = {
+          hostname: parsed.hostname,
+          path: parsed.pathname + parsed.search,
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+            'Content-Length': Buffer.byteLength(body)
+          },
+          ...(httpsAgent ? { agent: httpsAgent } : {})
+        }
+        const req = request(options, (res) => {
+          if (res.statusCode >= 200 && res.statusCode < 300) {
+            resolve('Teams に通知しました')
+          } else {
+            resolve(`エラー: Teams への送信に失敗しました (${res.statusCode})`)
+          }
+        })
+        req.on('error', (err) => resolve(`エラー: ${err.message}`))
+        req.write(body)
+        req.end()
       })
-      if (!res.ok) return `エラー: Teams への送信に失敗しました (${res.status})`
-      return 'Teams に通知しました'
     }
 
     default: