myagent-ai 1.6.7 → 1.6.8

package/package.json

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

package/skills/example-skill/SKILL.md

@@ -0,0 +1,33 @@
+# Example Skill
+
+A demonstration skill showing the SKILL.md format used by GLM Agent Engine.
+
+## Description
+
+This is an example skill that demonstrates the expected structure and format for skills in the GLM Agent ecosystem. Skills are self-contained modules that extend the agent's capabilities with specialized functionality.
+
+## Capability
+
+The agent can invoke this skill when users need demonstration or testing of the skill system. It serves as both documentation and a working example for skill developers.
+
+## Instructions
+
+When this skill is loaded, the agent should:
+1. Acknowledge that the example skill has been invoked
+2. Explain the skill system architecture to the user
+3. Guide the user on how to create their own custom skills
+
+## Skill Structure
+
+Each skill should contain:
+- `SKILL.md` - This metadata file (required)
+- Supporting scripts, configs, or data files as needed
+- Any language-specific setup (package.json, requirements.txt, etc.)
+
+## Creating Custom Skills
+
+To create a new skill:
+1. Create a directory under `/home/z/my-project/skills/`
+2. Add a `SKILL.md` file with proper metadata
+3. Include any necessary scripts or configurations
+4. The skill will be automatically detected by the agent engine

package/skills/example-skill/run.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+# Example skill execution script
+# This demonstrates how skills can include executable logic
+
+echo "Example Skill executed at: $(date)"
+echo "Arguments: $@"
+echo "Project directory: ${CLAWHUB_WORKDIR:-/home/z/my-project}"
+
+# Your skill logic goes here
+# Exit 0 for success, non-zero for failure
+exit 0

package/web/api_server.py

@@ -454,7 +454,11 @@ class ApiServer:
         # 支持 path 格式 (如 "coder/python-expert")
         agent_path = data.get("agent_path", agent_name)
         raw_session_id = data.get("session_id", "") or "web_default"
-        session_id = f"{agent_path}_{raw_session_id}"
+        # Avoid double-prefixing: if the session_id already starts with agent_path_, use it directly
+        if raw_session_id.startswith(f"{agent_path}_"):
+            session_id = raw_session_id
+        else:
+            session_id = f"{agent_path}_{raw_session_id}"
         chat_mode = data.get("mode", "")  # "exec" = 执行模式
         escalated = data.get("escalated", False)  # 临时提权到 local
 
@@ -541,7 +545,11 @@ class ApiServer:
 
         agent_path = data.get("agent_path", data.get("agent_name", "default")) or "default"
         raw_session_id = data.get("session_id", "") or "web_default"
-        session_id = f"{agent_path}_{raw_session_id}"
+        # Avoid double-prefixing: if the session_id already starts with agent_path_, use it directly
+        if raw_session_id.startswith(f"{agent_path}_"):
+            session_id = raw_session_id
+        else:
+            session_id = f"{agent_path}_{raw_session_id}"
         chat_mode = data.get("mode", "")
         escalated = data.get("escalated", False)
 
@@ -592,16 +600,7 @@ class ApiServer:
                     agent_path=agent_path, agent_system_prompt=agent_system_prompt,
                     chat_mode=chat_mode, stream_response=response,
                 )
-            elif self.core.main_agent and self.core.llm:
-                # model_chain is empty (no model_id configured), but LLM is available
-                # Use _stream_process_message for true token-by-token streaming
-                full_response = await self._stream_process_message(
-                    clean_message, session_id, response,
-                    agent_path=agent_path, agent_system_prompt=agent_system_prompt,
-                    chat_mode=chat_mode,
-                )
             else:
-                # No LLM at all — non-streaming fallback
                 full_response = await self.core.process_message(clean_message, session_id)
                 await response.write(("data: " + json.dumps({"type": "text", "content": full_response}) + "\n\n").encode())
 
@@ -649,12 +648,6 @@ class ApiServer:
                         agent_path=agent_path, agent_system_prompt=agent_system_prompt_q,
                         chat_mode=chat_mode, stream_response=response,
                     )
-                elif self.core.main_agent and self.core.llm:
-                    full_response = await self._stream_process_message(
-                        clean_message_q, session_id, response,
-                        agent_path=agent_path, agent_system_prompt=agent_system_prompt_q,
-                        chat_mode=chat_mode,
-                    )
                 else:
                     full_response = await self.core.process_message(clean_message_q, session_id)
                     await response.write(("data: " + json.dumps({"type": "text", "content": full_response}) + "\n\n").encode())
@@ -3885,7 +3878,6 @@ class ApiServer:
                 # 获取agent的显示信息
                 avatar = "🤖"
                 display_name = agent_path
-                agent_color = "var(--accent)"
                 if agent_cfg:
                     avatar = agent_cfg.get("avatar_emoji", "🤖") or "🤖"
                     display_name = agent_cfg.get("name", agent_path)
@@ -3895,7 +3887,6 @@ class ApiServer:
                     "agent_path": agent_path,
                     "name": display_name,
                     "avatar": avatar,
-                    "agent_color": agent_color,
                     "response": response,
                 }
             except Exception as e:

package/web/ui/chat.html

@@ -149,6 +149,26 @@ input,textarea,select{font:inherit}
 .session-item:hover .session-actions{opacity:1}
 .session-actions{opacity:0;display:flex;gap:2px;flex-shrink:0}
 .session-actions .session-delete:hover{background:var(--danger);color:#fff}
+.session-more-btn{
+  width:24px;height:24px;border-radius:4px;display:grid;place-items:center;
+  background:var(--bg2);transition:var(--transition);font-size:16px;color:var(--text3);
+  flex-shrink:0;cursor:pointer;border:none;line-height:1;
+}
+.session-more-btn:hover{background:var(--bg3);color:var(--text)}
+.session-context-menu{
+  position:fixed;z-index:1000;background:var(--card);border:1px solid var(--border);
+  border-radius:8px;box-shadow:0 4px 16px rgba(0,0,0,.15);padding:4px;min-width:140px;
+  animation:menuFadeIn .15s ease-out;
+}
+@keyframes menuFadeIn{from{opacity:0;transform:translateY(-4px)}to{opacity:1;transform:translateY(0)}}
+.session-context-menu button{
+  display:flex;align-items:center;gap:8px;width:100%;padding:8px 12px;border:none;
+  background:none;color:var(--text);font-size:13px;cursor:pointer;border-radius:6px;
+  transition:var(--transition);text-align:left;
+}
+.session-context-menu button:hover{background:var(--bg3)}
+.session-context-menu button.danger{color:var(--danger)}
+.session-context-menu button.danger:hover{background:rgba(239,68,68,.1)}
 .session-rename{
   opacity:0;width:24px;height:24px;border-radius:4px;display:grid;place-items:center;
   background:var(--bg2);transition:var(--transition);font-size:12px;color:var(--text3);
@@ -3072,6 +3092,64 @@ async function loadSessions() {
   }
 }
 
+// ── Session context menu (three dots) ──
+let _sessionMenuEl = null;
+function closeSessionMenu() {
+  if (_sessionMenuEl) { _sessionMenuEl.remove(); _sessionMenuEl = null; }
+}
+function toggleSessionMenu(event, sessionId) {
+  event.preventDefault();
+  event.stopPropagation();
+  closeSessionMenu();
+  const menu = document.createElement('div');
+  menu.className = 'session-context-menu';
+  menu.innerHTML = `
+    <button onclick="event.stopPropagation();closeSessionMenu();startRenameSession('${escapeHtml(sessionId)}')">
+      <span>✏️</span> 重命名
+    </button>
+    <button onclick="event.stopPropagation();closeSessionMenu();clearSessionFromMenu('${escapeHtml(sessionId)}')">
+      <span>🗑️</span> 清空消息
+    </button>
+    <button class="danger" onclick="event.stopPropagation();closeSessionMenu();deleteSession('${escapeHtml(sessionId)}')">
+      <span>✕</span> 删除对话
+    </button>
+  `;
+  // Position near the button
+  const btn = event.currentTarget || event.target;
+  const rect = btn.getBoundingClientRect();
+  menu.style.top = rect.bottom + 4 + 'px';
+  menu.style.right = (window.innerWidth - rect.right) + 'px';
+  document.body.appendChild(menu);
+  _sessionMenuEl = menu;
+  // Close on outside click
+  setTimeout(() => {
+    document.addEventListener('click', closeSessionMenu, { once: true });
+  }, 10);
+}
+async function clearSessionFromMenu(id) {
+  if (!id || id === '__new__') return;
+  if (!confirm('确定清空此对话的消息？会话本身不会被删除。')) return;
+  try {
+    const resp = await fetch(`/api/sessions/${encodeURIComponent(id)}/messages`, {
+      method: 'DELETE',
+      headers: { 'Content-Type': 'application/json' }
+    });
+    if (!resp.ok) {
+      const errData = await resp.json().catch(() => ({}));
+      throw new Error(errData.error || 'HTTP ' + resp.status);
+    }
+    if (state.activeSessionId === id) {
+      state.messages = [];
+      renderMessages();
+    }
+    toast('消息已清空', 'success');
+    await loadSessions();
+  } catch (e) {
+    console.error('Clear session error:', e);
+    toast('清空失败: ' + e.message, 'error');
+  }
+}
+
 function formatSessionName(id) {
   if (id.startsWith('web_')) return id.replace('web_', '').replace(/_/g, ' ');
   if (id.startsWith('cli_')) return 'CLI: ' + id.replace('cli_', '');
@@ -3096,8 +3174,7 @@ function renderSessions(filter = '') {
       </div>
       ${s.id !== '__new__' ? `
         <div class="session-actions">
-          <button class="session-rename" onclick="event.stopPropagation();startRenameSession('${escapeHtml(s.id)}')" title="重命名">✏️</button>
-          <button class="session-delete" onclick="event.stopPropagation();deleteSession('${escapeHtml(s.id)}')" title="删除">✕</button>
+          <button class="session-more-btn" onclick="event.stopPropagation();toggleSessionMenu(event,'${escapeHtml(s.id)}')" title="更多操作">⋮</button>
         </div>
       ` : ''}
     </div>
@@ -4952,22 +5029,7 @@ async function selectGroup(gid) {
 
     // Load messages
     var msgsData = await getGroupMessages(gid);
-    // Normalize backend message format: map sender->role, sender_name->agent_name, sender_avatar->agent_emoji
-    groupMessages = (msgsData || []).map(function(m) {
-      if (m.sender) {
-        return {
-          role: m.sender === 'user' ? 'user' : 'assistant',
-          agent: m.agent_path || '',
-          agent_name: m.sender_name || '',
-          agent_emoji: m.sender_avatar || '🤖',
-          agent_color: m.agent_color || '',
-          content: m.content || '',
-          time: m.timestamp ? new Date(m.timestamp * 1000).toISOString() : (m.time || ''),
-          type: m.msg_type === 'system' ? 'system' : '',
-        };
-      }
-      return m;
-    });
+    groupMessages = msgsData || [];
     renderGroupMessages();
   } catch (e) {
     toast('加载群聊失败: ' + e.message, 'error');
@@ -5026,11 +5088,11 @@ function renderGroupMessages() {
         + '<div><div class="message-bubble">' + renderMarkdown(msg.content || '') + '</div>'
         + (msg.time ? '<div class="message-time" style="text-align:right">' + formatTime(msg.time) + '</div>' : '')
         + '</div></div>';
-    } else if (msg.role === 'assistant' || msg.agent) {
-      var agentName = msg.agent_name || msg.agent || 'Agent';
-      var agentEmoji = msg.agent_emoji || '🤖';
-      var agentColor = msg.agent_color || 'var(--accent)';
-      var agentRole = msg.agent_role || '';
+    } else if (msg.role === 'assistant' || msg.sender === 'agent' || msg.agent) {
+      var agentName = msg.agent_name || msg.sender_name || msg.name || msg.agent || 'Agent';
+      var agentEmoji = msg.agent_emoji || msg.sender_avatar || msg.avatar || '🤖';
+      var agentColor = msg.agent_color || msg.color || 'var(--accent)';
+      var agentRole = msg.agent_role || msg.role_detail || '';
       html += '<div class="group-msg-row">'
         + '<div class="group-msg-avatar" style="background:' + agentColor + ';color:#fff">' + agentEmoji + '</div>'
         + '<div>'
@@ -5044,10 +5106,9 @@ function renderGroupMessages() {
       // Multiple agent responses (broadcast response)
       for (var j = 0; j < msg.responses.length; j++) {
         var r = msg.responses[j];
-        // Backend returns "name" and "avatar" fields, with "agent_name"/"agent_emoji" as fallback
-        var rName = r.name || r.agent_name || r.agent || 'Agent';
-        var rEmoji = r.avatar || r.agent_emoji || '🤖';
-        var rColor = r.agent_color || 'var(--accent)';
+        var rName = r.agent_name || r.sender_name || r.name || r.agent || 'Agent';
+        var rEmoji = r.agent_emoji || r.sender_avatar || r.avatar || '🤖';
+        var rColor = r.agent_color || r.color || 'var(--accent)';
         html += '<div class="group-msg-row">'
           + '<div class="group-msg-avatar" style="background:' + rColor + ';color:#fff">' + rEmoji + '</div>'
           + '<div>'