myagent-ai 1.9.1 → 1.9.3

package/core/llm.py

@@ -649,28 +649,36 @@ class LLMClient:
             logger.error(f"流式 LLM 调用失败: {e}")
 
     async def _stream_openai(self, kwargs: dict) -> AsyncGenerator[str, None]:
-        """OpenAI / 兼容接口 (含 Zhipu) 流式调用"""
-        loop = asyncio.get_running_loop()
-
-        def _create_stream():
-            return self._client.chat.completions.create(**kwargs)
-
-        stream = await loop.run_in_executor(None, _create_stream)
+        """OpenAI / 兼容接口 (含 Zhipu) 流式调用
 
-        # 使用迭代器在 executor 中逐步获取
-        def _next_chunk(it):
-            try:
-                return next(it)
-            except StopIteration:
-                return None
+        支持两种客户端:
+        - AsyncOpenAI: 使用 async for 直接异步迭代
+        - 同步 OpenAI: 在 executor 中同步迭代
+        """
+        # 判断客户端类型，选择合适的流式迭代方式
+        is_async = hasattr(self._client, '__aenter__')
+
+        if is_async:
+            # AsyncOpenAI: 直接异步迭代
+            stream = await self._client.chat.completions.create(**kwargs)
+            async for chunk in stream:
+                if chunk.choices and chunk.choices[0].delta.content:
+                    yield chunk.choices[0].delta.content
+        else:
+            # 同步 OpenAI: 在 executor 中迭代
+            loop = asyncio.get_running_loop()
 
-        iterator = iter(stream)
-        while True:
-            chunk = await loop.run_in_executor(None, _next_chunk, iterator)
-            if chunk is None:
-                break
-            if chunk.choices and chunk.choices[0].delta.content:
-                yield chunk.choices[0].delta.content
+            def _create_and_iterate():
+                stream = self._client.chat.completions.create(**kwargs)
+                results = []
+                for chunk in stream:
+                    if chunk.choices and chunk.choices[0].delta.content:
+                        results.append(chunk.choices[0].delta.content)
+                return results
+
+            chunks = await loop.run_in_executor(None, _create_and_iterate)
+            for content in chunks:
+                yield content
 
     async def _stream_anthropic(
         self, messages: List[Message], kwargs: dict

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "myagent-ai",
-  "version": "1.9.1",
+  "version": "1.9.3",
   "description": "本地桌面端执行型AI助手 - Open Interpreter 风格 | Local Desktop Execution-Oriented AI Assistant",
   "main": "main.py",
   "bin": {

package/web/ui/chat/chat.js

@@ -3,7 +3,7 @@
 
 (function() {
   var base = new URL('.', window.location.href).href;
-  var v = '?v=5';
+  var v = '?v=6';
   var files = [
     { url: base + 'left_sessions.html' + v, container: 'leftSessionsContainer' },
     { url: base + 'middle_chat.html' + v, container: 'middleChatContainer' },

package/web/ui/chat/flow_engine.js

@@ -620,17 +620,17 @@ function toggleExecEventsPanel(header) {
 function renderInlineExecEvent(data, msgIdx) {
   // V2 Tool Event handling (called with full part: {type:'v2_tool', data:{...}})
   if (data.type === 'v2_tool') {
-    var inner = data.data;
-    var isStart = inner.status === 'running' || inner.type === 'tool_start';
-    var iconEmoji = isStart ? '⚡' : (inner.success ? '✅' : '❌');
-    var title = inner.title || (inner.tool_name || '工具调用');
-    var metaParts = [];
+    let inner = data.data;
+    let isStart = inner.status === 'running' || inner.type === 'tool_start';
+    let iconEmoji = isStart ? '⚡' : (inner.success ? '✅' : '❌');
+    let title = inner.title || (inner.tool_name || '工具调用');
+    let metaParts = [];
     if (inner.tool_name) metaParts.push(escapeHtml(inner.tool_name));
     if (inner.timeout) metaParts.push('超时 ' + inner.timeout + 's');
     if (inner.callback !== undefined) metaParts.push(inner.callback ? '回调LLM' : '无回调');
-    var metaText = metaParts.join(' · ');
+    let metaText = metaParts.join(' · ');
 
-    var bodyHtml = '';
+    let bodyHtml = '';
     if (inner.type === 'tool_result' && inner.summary) {
       bodyHtml += '<div class="inline-exec-summary">' + escapeHtml(inner.summary) + '</div>';
     }
@@ -639,7 +639,7 @@ function renderInlineExecEvent(data, msgIdx) {
     }
     // Show params for tool_start
     if (inner.type === 'tool_start' && inner.params) {
-      var paramPreview = typeof inner.params === 'string' ? inner.params : JSON.stringify(inner.params);
+      let paramPreview = typeof inner.params === 'string' ? inner.params : JSON.stringify(inner.params);
       if (paramPreview.length > 200) paramPreview = paramPreview.substring(0, 200) + '...';
       bodyHtml += '<div class="inline-exec-code">' + escapeHtml(paramPreview) + '</div>';
     }
@@ -827,7 +827,8 @@ async function sendMessage() {
   // ── 如果正在生成，弹出处理选择框 ──
   if (state.isGenerating) {
     state.tempInputText = text;
-    document.getElementById('injectModal').style.display = 'flex';
+    var modal = document.getElementById('injectModal');
+    if (modal) { modal.style.display = 'flex'; }
     return;
   }
 
@@ -1230,6 +1231,19 @@ function stopGenerating() {
   if (state.abortController) {
     state.abortController.abort();
   }
+  // 立即重置 UI 状态（防止 abort 后 finally 未执行导致 UI 卡死）
+  state.isGenerating = false;
+  state.abortController = null;
+  hideTypingIndicator();
+  stopExecTimerPolling();
+  var sendBtn = document.getElementById('sendBtn');
+  var stopBtn = document.getElementById('stopBtn');
+  var input = document.getElementById('userInput');
+  if (sendBtn) { sendBtn.style.display = ''; sendBtn.disabled = !(input && input.value.trim()); }
+  if (stopBtn) stopBtn.style.display = 'none';
+  // 关闭可能打开的 injectModal
+  var injectModal = document.getElementById('injectModal');
+  if (injectModal) injectModal.style.display = 'none';
 }
 
 // ══════════════════════════════════════════════════════
@@ -1237,7 +1251,8 @@ function stopGenerating() {
 // ══════════════════════════════════════════════════════
 
 function closeInjectModal() {
-  document.getElementById('injectModal').style.display = 'none';
+  var modal = document.getElementById('injectModal');
+  if (modal) modal.style.display = 'none';
   state.tempInputText = '';
 }
 
@@ -1438,7 +1453,8 @@ function handleKeyDown(e) {
     if (state.isGenerating) {
       // 任务执行中，使用统一的 injectModal 弹出选择对话框
       state.tempInputText = text;
-      document.getElementById('injectModal').style.display = 'flex';
+      var modal = document.getElementById('injectModal');
+      if (modal) { modal.style.display = 'flex'; }
     } else {
       sendMessage();
     }

package/web/ui/chat/middle_chat.html

@@ -142,4 +142,17 @@
         <div class="input-hint">MyAgent 可能会出错，请核实重要信息</div>
       </div>
     </div>
+
+    <!-- Inject Modal (生成中消息注入选择) -->
+    <div id="injectModal" class="modal-overlay" style="display:none">
+      <div class="modal">
+        <h3>任务执行中</h3>
+        <p>Agent 正在执行任务，请选择如何处理你的消息：</p>
+        <div style="display:flex;flex-direction:column;gap:8px;margin-bottom:0">
+          <button class="modal-btn" style="width:100%;justify-content:center;background:var(--accent);color:#fff" onclick="handleInjectChoice('queue')">排队等待</button>
+          <button class="modal-btn" style="width:100%;justify-content:center" onclick="handleInjectChoice('inject')">注入当前任务</button>
+          <button class="modal-btn" style="width:100%;justify-content:center;color:var(--text2)" onclick="closeInjectModal()">取消</button>
+        </div>
+      </div>
+    </div>
   </div>