myagent-ai 1.19.4 → 1.19.6

package/core/context_builder.py

@@ -13,6 +13,7 @@ core/context_builder.py - 上下文构建器
   <usersays>         - 用户语音转文本输入（键盘输入时为空）
   <task_plan>        - 当前任务计划（Markdown 格式，上轮已完成时为空）
   <tools>            - 可用工具列表（名称、描述、参数格式）
+  <skill_prompts>    - SKILL.md 格式技能的完整指令（Prompt 类型技能注入）
 
 使用示例:
     builder = ContextBuilder(memory_manager=mm, skill_registry=sr)
@@ -169,6 +170,7 @@ class ContextBuilder:
             self._build_user_input(user_typed_text, user_voice_text),
             self._build_task_plan(task_plan),
             self._build_tools(self.skill_registry),
+            self._build_skill_prompts(self.skill_registry),
         ]
 
         context_body = "\n".join(sections)
@@ -766,6 +768,51 @@ class ContextBuilder:
         lines.append("</tools>")
         return "\n".join(lines)
 
+    def _build_skill_prompts(
+        self,
+        skill_registry: Optional["SkillRegistry"],
+    ) -> str:
+        """
+        构建 <skill_prompts> 段落 —— SKILL.md 格式技能的完整指令内容。
+
+        对于 SKILL.md 目录格式的 Prompt 类型技能，将完整的 markdown body
+        注入到 LLM 上下文中，使 LLM 能按照技能指令执行任务。
+        普通 Python 技能（有 execute 实现）不在此处注入。
+
+        Returns:
+            <skill_prompts> XML 段落字符串，无 Prompt 技能时返回空字符串
+        """
+        if not skill_registry:
+            return ""
+
+        # 收集所有 markdown 类型且未禁用的技能的 body
+        prompt_skills = []
+        try:
+            for skill in skill_registry._skills.values():
+                if skill_registry._is_disabled(skill.name):
+                    continue
+                # 检查是否为 SKILL.md 格式技能
+                body = getattr(skill, 'get_body', None)
+                if body and callable(body):
+                    content = body()
+                    if content:
+                        prompt_skills.append((skill.name, content))
+        except Exception as e:
+            logger.warning(f"获取 skill prompts 失败: {e}")
+            return ""
+
+        if not prompt_skills:
+            return ""
+
+        lines: List[str] = ["<skill_prompts>"]
+        for skill_name, content in prompt_skills:
+            safe_name = _xml_escape(skill_name)
+            lines.append(f"<{safe_name}>")
+            lines.append(content)
+            lines.append(f"</{safe_name}>")
+        lines.append("</skill_prompts>")
+        return "\n".join(lines)
+
     # =========================================================================
     # Token 预算管理
     # =========================================================================
@@ -818,8 +865,8 @@ class ContextBuilder:
             return re.sub(pattern, replacement, xml, count=1, flags=re.DOTALL)
 
         # 按优先级从低到高裁剪（记忆最优先保留，知识库和任务计划优先裁剪）
-        # recent_summary 是兜底机制，最先裁剪
-        for tag in ['recent_summary', 'knowledge', 'task_plan', 'recall_memory', 'automemory']:
+        # recent_summary 是兜底机制，最先裁剪；skill_prompts 其次
+        for tag in ['recent_summary', 'skill_prompts', 'knowledge', 'task_plan', 'recall_memory', 'automemory']:
             if estimated <= budget:
                 break
             if f'<{tag}>' in context_xml:

package/core/logger.py

@@ -18,6 +18,8 @@ from logging.handlers import RotatingFileHandler, TimedRotatingFileHandler
 from pathlib import Path
 from typing import Optional, Dict, Any
 from datetime import datetime
+from zoneinfo import ZoneInfo
+import time as _time
 
 
 # ANSI 颜色码
@@ -31,8 +33,21 @@ COLORS = {
 }
 
 
+def _tz_converter(timestamp):
+    """logging.Formatter.converter — 使用配置时区替代系统时区"""
+    try:
+        from config import ConfigManager
+        tz_name = ConfigManager().get("timezone", "Asia/Shanghai")
+        tz = ZoneInfo(tz_name)
+    except Exception:
+        tz = ZoneInfo("Asia/Shanghai")
+    dt = datetime.fromtimestamp(timestamp, tz=tz)
+    return dt.timetuple()
+
+
 class ColorFormatter(logging.Formatter):
     """带颜色的控制台日志格式化器"""
+    converter = staticmethod(_tz_converter)
 
     def format(self, record):
         color = COLORS.get(record.levelname, COLORS["RESET"])
@@ -42,6 +57,7 @@ class ColorFormatter(logging.Formatter):
 
 class FileFormatter(logging.Formatter):
     """文件日志格式化器(无颜色)"""
+    converter = staticmethod(_tz_converter)
 
     def format(self, record):
         # 去除 ANSI 颜色码
@@ -60,8 +76,14 @@ class JsonFormatter(logging.Formatter):
     """
 
     def format(self, record):
+        try:
+            from config import ConfigManager
+            tz_name = ConfigManager().get("timezone", "Asia/Shanghai")
+            tz = ZoneInfo(tz_name)
+        except Exception:
+            tz = ZoneInfo("Asia/Shanghai")
         log_entry: Dict[str, Any] = {
-            "timestamp": datetime.utcnow().isoformat() + "Z",
+            "timestamp": datetime.now(tz).isoformat(),
             "level": record.levelname,
             "logger": record.name,
             "message": record.getMessage(),
@@ -197,7 +219,12 @@ def setup_logger(
 
         else:
             # 不轮转，按日期命名
-            log_file = log_path / f"{name}_{datetime.now().strftime('%Y%m%d')}.log"
+            try:
+                from config import ConfigManager
+                _tz = ZoneInfo(ConfigManager().get("timezone", "Asia/Shanghai"))
+            except Exception:
+                _tz = ZoneInfo("Asia/Shanghai")
+            log_file = log_path / f"{name}_{datetime.now(_tz).strftime('%Y%m%d')}.log"
             fh = logging.FileHandler(log_file, encoding="utf-8")
             fh.setFormatter(
                 JsonFormatter() if json_format

package/core/utils.py

@@ -24,7 +24,9 @@ def get_config_tz() -> ZoneInfo:
         return _tz_cache
     try:
         from config import ConfigManager
-        tz_name = ConfigManager().get("timezone", "Asia/Shanghai")
+        cfg = ConfigManager()
+        cfg.load()
+        tz_name = cfg.config.timezone
         _tz_cache = ZoneInfo(tz_name)
     except Exception:
         _tz_cache = ZoneInfo("Asia/Shanghai")

package/install.ps1

@@ -48,8 +48,6 @@ if (-not (Test-Path $VENV_DIR)) {
     Write-Host "[✓] 虚拟环境已创建。" -ForegroundColor Green
 }
 
-$PIP = "$VENV_DIR\Scripts\python.exe -m pip"
-
 # 3. 升级 pip
 Write-Host "[*] 正在升级 pip..." -ForegroundColor Cyan
 & $VENV_DIR\Scripts\python.exe -m pip install --upgrade pip --quiet
@@ -66,7 +64,17 @@ if ($LASTEXITCODE -ne 0) {
 }
 Write-Host "[✓] 核心依赖安装成功。" -ForegroundColor Green
 
-# 5. 安装可选依赖 (失败不影响核心功能)
+# 5. 安装 Windows 桌面依赖 (托盘图标、窗口管理等)
+Write-Host "[*] 正在安装 Windows 桌面依赖..." -ForegroundColor Cyan
+$winPkgs = @("pystray", "pygetwindow")
+& $VENV_DIR\Scripts\python.exe -m pip install $winPkgs
+if ($LASTEXITCODE -eq 0) {
+    Write-Host "[✓] Windows 桌面依赖安装成功。" -ForegroundColor Green
+} else {
+    Write-Host "[!] Windows 桌面依赖安装失败（系统托盘可能不可用，但不影响核心功能）。" -ForegroundColor Yellow
+}
+
+# 6. 安装可选依赖 (语音识别等，失败不影响核心功能)
 if (Test-Path "requirements-optional.txt") {
     Write-Host "`n[*] 正在安装可选依赖 (语音识别等)..." -ForegroundColor Cyan
     Write-Host "    (如果编译失败，不影响核心功能)" -ForegroundColor DarkGray

package/main.py

@@ -692,7 +692,7 @@ def create_tray_icon(app: MyAgentApp, web_port: int = 8767):
         from PIL import Image, ImageDraw, ImageFont
     except Exception:
         # pystray 可能因缺少 GUI 环境 (X11/Wayland) 或未安装而失败
-        logger.info("pystray 不可用（未安装或缺少 GUI 环境），跳过系统托盘")
+        app.logger.info("pystray 不可用（未安装或缺少 GUI 环境），跳过系统托盘")
         return None
 
     # ── 图标颜色主题 ──

package/package.json

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

package/requirements.txt

@@ -68,6 +68,8 @@ edge-tts>=6.1.0
 chardet>=5.0.0
 # xlrd: 旧版 Excel (.xls) 文件读取
 xlrd>=2.0.0
+# tzdata: Windows 上 ZoneInfo 所需的时区数据
+tzdata>=2024.1
 
 # ============================================================
 # Anthropic Claude (可选)

package/skills/registry.py

@@ -215,6 +215,11 @@ def _load_skill_from_md(skill_dir: Path) -> Optional[Skill]:
         for ref_file in sorted(ref_dir.glob("*.md")):
             references.append(ref_file.name)
 
+    # 提取 SKILL.md body（YAML front matter 之后的内容）
+    body = ""
+    if len(parts) >= 3:
+        body = parts[2].strip()
+
     class MarkdownSkill(Skill):
         """SKILL.md 格式的技能包装器"""
         def __init__(self):
@@ -230,13 +235,21 @@ def _load_skill_from_md(skill_dir: Path) -> Optional[Skill]:
             self._references = references
             self._has_templates = (skill_dir / "templates").exists()
             self._has_scripts = (skill_dir / "scripts").exists()
+            self._body = body
 
         async def execute(self, **kwargs) -> SkillResult:
+            # SKILL.md 技能的指令已通过 <skill_prompts> 注入 system prompt
+            # 如果 LLM 仍然调用了此工具，返回确认信息
             return SkillResult(
-                success=False,
-                error=f"SKILL.md 格式技能不支持直接调用，请通过 LLM 使用 /{self.name} 触发",
+                success=True,
+                output=f"[{self.name}] 技能指令已激活，请按照 <skill_prompts> 中 {self.name} 的完整指令执行任务。",
+                message=f"技能 {self.name} 已激活",
             )
 
+        def get_body(self) -> str:
+            """返回 SKILL.md 的 body 内容"""
+            return self._body
+
         def to_openclaw_format(self) -> Dict[str, Any]:
             info = super().to_openclaw_format()
             info["skill_type"] = "markdown"

package/web/ui/index.html

@@ -2,7 +2,7 @@
 <html lang="zh-CN">
 <head>
 <meta charset="UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover">
 <title>MyAgent 管理后台</title>
 <style>
 *{margin:0;padding:0;box-sizing:border-box}
@@ -34,7 +34,7 @@
   --ok:#22c55e;--success:#22c55e;--warn:#f59e0b;--danger:#ef4444;--info:#3b82f6;
   --border:#2e3347;--border-light:#232733;
 }
-body{font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,sans-serif;background:var(--bg);color:var(--text);height:100vh;display:flex}
+body{font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,sans-serif;background:var(--bg);color:var(--text);height:100vh;height:100dvh;display:flex}
 .sidebar{width:220px;background:var(--surface);border-right:1px solid var(--border);display:flex;flex-direction:column;flex-shrink:0}
 .sidebar .logo{padding:20px;font-size:18px;font-weight:700;border-bottom:1px solid var(--border);display:flex;align-items:center;gap:8px}
 .sidebar .logo span{color:var(--primary)}
@@ -178,7 +178,7 @@ tr:hover{background:var(--surface2)}
 /* ── Mobile Responsive ── */
 @media(max-width:768px){
   /* [v1.18.10] 移动端侧边栏：收起时与内容同平面(flex行布局)，展开时才浮层覆盖 */
-  body{flex-direction:row;height:100vh;overflow:hidden}
+  body{flex-direction:row;height:100vh;height:100dvh;overflow:hidden}
   /* 默认收起状态：同一平面，56px窄栏，不浮动，不溢出 */
   .sidebar{position:relative;left:auto;top:auto;height:auto;width:56px;z-index:auto;flex-shrink:0;transition:width .3s ease;overflow:hidden}
   .sidebar .nav-item{justify-content:center;padding:10px 0;position:relative}
@@ -210,7 +210,7 @@ tr:hover{background:var(--surface2)}
   .main{flex:1;min-width:0;min-height:0;overflow:hidden}
   .header{padding:12px 16px;padding-left:12px}
   .header h2{font-size:16px}
-  .content{padding:16px}
+  .content{padding:16px;padding-bottom:max(16px,env(safe-area-inset-bottom))}
   .grid{grid-template-columns:1fr}
   .form-row{grid-template-columns:1fr}
   .table-wrap{overflow-x:auto;-webkit-overflow-scrolling:touch}