MaiBot 1.4.1__tar.gz → 1.4.2__tar.gz

{maibot-1.4.1 → maibot-1.4.2/MaiBot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MaiBot
-Version: 1.4.1
+Version: 1.4.2
 Summary: MaiCore 是一个基于大语言模型的可交互智能体
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
@@ -26,7 +26,7 @@ Requires-Dist: jieba>=0.42.1
 Requires-Dist: json-repair<0.61,>=0.60.1
 Requires-Dist: jsonschema<5,>=4.26.0
 Requires-Dist: maim-message==0.6.8
-Requires-Dist: maibot-dashboard==1.10.1
+Requires-Dist: maibot-dashboard==1.10.2
 Requires-Dist: maibot-plugin-sdk>=2.20.0
 Requires-Dist: mcp<2,>=1.28.1
 Requires-Dist: msgpack>=1.2.1
@@ -132,9 +132,9 @@ MaiSaka 不仅仅是一个机器人，不仅仅是一个可以帮你完成任务
 
 <picture><source media="(prefers-color-scheme: dark)" srcset="depends-data/readme/sec-install-night.svg"><img src="depends-data/readme/sec-install-day.svg" alt="安装 · INSTALL" width="100%"></picture>
 
-**最新版本: v1.3.17**
+**最新版本: v1.4.2**
 
-<sub><sup><strong>Latest Version: v1.3.17</strong></sup></sub>
+<sub><sup><strong>Latest Version: v1.4.2</strong></sup></sub>
 
 - **发布**：[Release](https://github.com/Mai-with-u/MaiBot/releases/) 页面展示了最新发布的正式版。
   <sub><sup><strong>Download</strong>: Visit the <a href="https://github.com/Mai-with-u/MaiBot/releases/">Release</a> page to get the latest version.</sup></sub>

{maibot-1.4.1 → maibot-1.4.2}/MaiBot.egg-info/requires.txt

@@ -19,7 +19,7 @@ jieba>=0.42.1
 json-repair<0.61,>=0.60.1
 jsonschema<5,>=4.26.0
 maim-message==0.6.8
-maibot-dashboard==1.10.1
+maibot-dashboard==1.10.2
 maibot-plugin-sdk>=2.20.0
 mcp<2,>=1.28.1
 msgpack>=1.2.1

{maibot-1.4.1/MaiBot.egg-info → maibot-1.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MaiBot
-Version: 1.4.1
+Version: 1.4.2
 Summary: MaiCore 是一个基于大语言模型的可交互智能体
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
@@ -26,7 +26,7 @@ Requires-Dist: jieba>=0.42.1
 Requires-Dist: json-repair<0.61,>=0.60.1
 Requires-Dist: jsonschema<5,>=4.26.0
 Requires-Dist: maim-message==0.6.8
-Requires-Dist: maibot-dashboard==1.10.1
+Requires-Dist: maibot-dashboard==1.10.2
 Requires-Dist: maibot-plugin-sdk>=2.20.0
 Requires-Dist: mcp<2,>=1.28.1
 Requires-Dist: msgpack>=1.2.1
@@ -132,9 +132,9 @@ MaiSaka 不仅仅是一个机器人，不仅仅是一个可以帮你完成任务
 
 <picture><source media="(prefers-color-scheme: dark)" srcset="depends-data/readme/sec-install-night.svg"><img src="depends-data/readme/sec-install-day.svg" alt="安装 · INSTALL" width="100%"></picture>
 
-**最新版本: v1.3.17**
+**最新版本: v1.4.2**
 
-<sub><sup><strong>Latest Version: v1.3.17</strong></sup></sub>
+<sub><sup><strong>Latest Version: v1.4.2</strong></sup></sub>
 
 - **发布**：[Release](https://github.com/Mai-with-u/MaiBot/releases/) 页面展示了最新发布的正式版。
   <sub><sup><strong>Download</strong>: Visit the <a href="https://github.com/Mai-with-u/MaiBot/releases/">Release</a> page to get the latest version.</sup></sub>

{maibot-1.4.1 → maibot-1.4.2}/README.md

@@ -73,9 +73,9 @@ MaiSaka 不仅仅是一个机器人，不仅仅是一个可以帮你完成任务
 
 <picture><source media="(prefers-color-scheme: dark)" srcset="depends-data/readme/sec-install-night.svg"><img src="depends-data/readme/sec-install-day.svg" alt="安装 · INSTALL" width="100%"></picture>
 
-**最新版本: v1.3.17**
+**最新版本: v1.4.2**
 
-<sub><sup><strong>Latest Version: v1.3.17</strong></sup></sub>
+<sub><sup><strong>Latest Version: v1.4.2</strong></sup></sub>
 
 - **发布**：[Release](https://github.com/Mai-with-u/MaiBot/releases/) 页面展示了最新发布的正式版。
   <sub><sup><strong>Download</strong>: Visit the <a href="https://github.com/Mai-with-u/MaiBot/releases/">Release</a> page to get the latest version.</sup></sub>

{maibot-1.4.1 → maibot-1.4.2}/changelogs/changelog.md

@@ -1,5 +1,11 @@
 # 更新日志
 
+# [1.4.2] - 2026-11-8
+
+- 修复Docker启动时挂载目录问题，将会阻拦未更新的挂载路径
+- 优化部分麦麦观察的显示方式
+- Webui首页会显示桌宠
+
 # [1.4.1] - 2026-11-7
 
 - 修复一键包更新由于传入路径错误失败的问题

{maibot-1.4.1 → maibot-1.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "MaiBot"
-version = "1.4.1"
+version = "1.4.2"
 description = "MaiCore 是一个基于大语言模型的可交互智能体"
 readme = "README.md"
 requires-python = ">=3.12"
@@ -30,7 +30,7 @@ dependencies = [
     "json-repair>=0.60.1,<0.61",
     "jsonschema>=4.26.0,<5",
     "maim-message==0.6.8",
-    "maibot-dashboard==1.10.1",
+    "maibot-dashboard==1.10.2",
     "maibot-plugin-sdk>=2.20.0",
     "mcp>=1.28.1,<2",
     "msgpack>=1.2.1",

{maibot-1.4.1 → maibot-1.4.2}/src/config/config.py

@@ -16,7 +16,7 @@ from src.common.version import read_project_version
 from src.agent.config import AgentConfig
 from src.desktop_pet.config import DesktopPetConfig
 from src.files.config import FilesConfig
-from src.web_search.config import WebConfig, resolve_web_search_config
+from src.web_search.config import WebConfig, WebSearchConfigError, require_web_service
 
 from .config_base import AttributeData, ConfigBase, Field
 from .builtin_typo_migration import migrate_builtin_typo_config
@@ -195,7 +195,6 @@ class ModelConfig(ConfigBase):
     """API提供商列表"""
 
     def model_post_init(self, context: Any = None):
-        resolve_web_search_config(self.web, self.model_task_config.web_search)
         if not self.models:
             raise ValueError(t("config.models_empty"))
         if not self.api_providers:
@@ -228,6 +227,12 @@ class ModelConfig(ConfigBase):
                         model_name=model.name,
                     )
                 )
+        web_services = self.model_task_config.web_search.model_list
+        if web_services and web_services[0]:
+            try:
+                require_web_service(self.web, web_services[0])
+            except WebSearchConfigError as exc:
+                logger.warning(f"联网工具配置有误，调用时将返回 {exc.code}：{exc}")
         return super().model_post_init(context)
 
 

maibot-1.4.2/src/desktop_pet/config.py

@@ -0,0 +1,101 @@
+"""内置桌宠配置。
+
+WebUI 的排布完全由字段元数据声明：
+- ``x-row`` + ``x-row-columns``：相邻同名字段排成一行的多列；
+- ``x-column-group`` + ``x-column``：相邻字段按列标题分成并排的几列；
+- ``x-depends-on``：依赖同级布尔开关，开关关闭时该字段只读；
+- ``x-layout``/``x-input-width``：标签在左、控件在右，并限制控件宽度。
+"""
+
+from typing import Literal
+
+from src.config.config_base import ConfigBase, Field
+
+
+def _switch(label: str, **extra: object) -> dict[str, object]:
+    return {"x-widget": "switch", "x-layout": "inline-right", "label": {"zh_CN": label}, **extra}
+
+
+def _number(label: str, **extra: object) -> dict[str, object]:
+    return {
+        "x-widget": "input",
+        "x-layout": "inline-right",
+        "x-input-width": "min(100%, 7.5rem)",
+        "label": {"zh_CN": label},
+        **extra,
+    }
+
+
+_CORE_ROW = {"x-row": "desktop-pet-core", "x-row-columns": 4}
+_COLUMNS = {"x-column-group": "desktop-pet-columns"}
+_SKIN_COLUMN = {**_COLUMNS, "x-column": "皮肤"}
+_WAKE_COLUMN = {**_COLUMNS, "x-column": "主动思考"}
+_SCREEN_COLUMN = {**_COLUMNS, "x-column": "读取桌面"}
+
+
+class DesktopPetConfig(ConfigBase):
+    __ui_label__ = "桌宠"
+    __ui_order__ = 45
+
+    enabled: bool = Field(default=False, json_schema_extra=_switch("启用桌宠", **_CORE_ROW))
+    """启用本机桌宠或接受远端桌宠连接，和网页聊天室共用聊天与昵称；支持热重载。"""
+
+    mode: Literal["local", "remote"] = Field(
+        default="local",
+        json_schema_extra={
+            "x-widget": "select",
+            "x-layout": "inline-right",
+            "x-input-width": "min(100%, 9rem)",
+            "x-option-labels": {"local": "本机", "remote": "远端连接"},
+            "label": {"zh_CN": "运行模式"},
+            **_CORE_ROW,
+        },
+    )
+    """local 在本机 Windows 启动窗口；remote 等待独立 Windows 客户端连接，服务器可使用 Linux。一次连接一台桌宠。"""
+
+    chat_tools_enabled: bool = Field(default=False, json_schema_extra=_switch("聊天流工具", **_CORE_ROW))
+    """允许桌宠与网页共用的主人聊天查询其他聊天流并唤起传话；不影响图片发送。"""
+
+    show_current_task: bool = Field(default=False, json_schema_extra=_switch("显示桌宠手中事", **_CORE_ROW))
+    """在桌宠底部显示当前动作的像素字幕；需单独配置 fast_model，未配置时不可启用。"""
+
+    skin_id: str = Field(default="builtin", json_schema_extra={"label": {"zh_CN": "当前皮肤"}, **_SKIN_COLUMN})
+    """选择已安装的皮肤 ID；支持热切换，builtin 为内置麦麦。"""
+
+    proactive_wake_enabled: bool = Field(default=False, json_schema_extra=_switch("定期主动思考", **_WAKE_COLUMN))
+    """桌宠运行期间定期唤醒主人聊天流，自主探索并选择是否交流；会调用模型，默认关闭。"""
+
+    proactive_wake_interval_minutes: int = Field(
+        default=30,
+        ge=1,
+        le=1440,
+        json_schema_extra=_number("主动思考间隔（分钟）", **_WAKE_COLUMN, **{"x-depends-on": "proactive_wake_enabled"}),
+    )
+    """每次间隔后触发一次，范围 1～1440 分钟；重启或修改桌宠配置后重新计时，不补跑离线周期。"""
+
+    screen_read_enabled: bool = Field(default=False, json_schema_extra=_switch("允许读取桌面", **_SCREEN_COLUMN))
+    """允许主人聊天工具和桌宠按钮截图本机主屏并交给聊天模型理解；截图可能包含屏幕上的私人信息。默认关闭，不授予鼠标键盘控制。"""
+
+    screen_read_interval_seconds: int = Field(
+        default=10,
+        ge=2,
+        le=3600,
+        json_schema_extra=_number("屏幕时间线投递间隔（秒）", **_SCREEN_COLUMN, **{"x-depends-on": "screen_read_enabled"}),
+    )
+    """按此间隔将有变化的关键帧拼图交给模型，最多 6 帧；无明显变化不重复投递。停止或重启后需手动重新开启。"""
+
+    screen_sample_interval_seconds: float = Field(
+        default=2,
+        ge=0.5,
+        le=30,
+        json_schema_extra=_number("屏幕差异采样间隔（秒）", **_SCREEN_COLUMN, **{"x-depends-on": "screen_read_enabled"}),
+    )
+    """截图和比较画面的频率，独立于模型调用；有效采样间隔不超过时间线投递间隔。"""
+
+    screen_change_threshold: float = Field(
+        default=0.015,
+        ge=0.001,
+        le=1,
+        json_schema_extra=_number("屏幕变化比例阈值", **_SCREEN_COLUMN, **{"x-depends-on": "screen_read_enabled"}),
+    )
+    """缩略图中明显变化的像素比例达到阈值才保留，0.015 表示 1.5%；越低越敏感，小面积更新可能被过滤。"""

{maibot-1.4.1 → maibot-1.4.2}/src/desktop_pet/service.py

@@ -58,6 +58,9 @@ class DesktopPetService:
         self._screen_error = ""
         self._screen_last_capture = ""
         self._thinking_caption = ThinkingCaption(self._command)
+        # 供 WebUI 首页卡片展示：窗口当前是否在思考、最近一次显示的气泡文字
+        self._thinking = False
+        self._bubble = ""
 
     def observe_stage(self, data: Dict[str, Any]) -> None:
         from .chat_tools import is_owner_chat
@@ -77,6 +80,8 @@ class DesktopPetService:
             "error": self._error,
             "skin_id": self._skin_id,
             "screen_reading": self._screen_reading(),
+            "thinking": self._thinking and self._ready and not self._closing,
+            "bubble": self._bubble,
         }
 
     async def start(self) -> None:
@@ -144,6 +149,7 @@ class DesktopPetService:
 
     async def _stop(self) -> None:
         self._closing = True
+        self._thinking = False
         self._thinking_caption.cancel()
         if self._todo_task is not None:
             self._todo_task.cancel()
@@ -863,8 +869,10 @@ class DesktopPetService:
             command = {"type": action}
         elif action == "say":
             command = {"type": "notice", "parts": [{"kind": "text", "text": text}]}
+            self._bubble = _bubble_text(text)
         elif action == "set_thinking":
             command = {"type": "thinking" if active else "idle"}
+            self._thinking = active
         else:
             raise ValueError(f"未知桌宠操作: {action}")
         await self._command(command)
@@ -877,6 +885,7 @@ class DesktopPetService:
             session = chat_manager.get_session_by_session_id(session_id)
             if (session is not None and session.platform == INTERNAL_CHAT_PLATFORM
                     and not session.group_id and session.user_id == INTERNAL_CHAT_USER_ID):
+                self._thinking = True
                 self._observe(self._command({"type": "thinking"}))
 
     async def notify_reply(self, message: Dict[str, Any]) -> None:
@@ -897,6 +906,15 @@ class DesktopPetService:
             if not self._visible:
                 await self.control("show")
             await self._command({"type": "reply", "parts": parts})
+            self._thinking = False
+            text = "".join(part.get("text", "") for part in parts if part.get("kind") == "text")
+            self._bubble = _bubble_text(text) or "[图片]"
+
+
+def _bubble_text(text: str) -> str:
+    """首页卡片只放一行摘要，完整内容在聊天记录里。"""
+    text = " ".join(text.split())
+    return text if len(text) <= 120 else f"{text[:119]}…"
 
 
 desktop_pet_service = DesktopPetService()

{maibot-1.4.1 → maibot-1.4.2}/src/plugin_runtime/capabilities/web.py

@@ -6,7 +6,8 @@ from typing import Any, Dict
 import json
 
 from src.core.tooling import ToolInvocation
-from src.web_search.config import WebRuntimeConfig, resolve_web_search_config
+from src.plugin_runtime.protocol.errors import ErrorCode, RPCError
+from src.web_search.config import WebRuntimeConfig, WebSearchConfigError, resolve_web_search_config
 from src.web_search.models import WebSearchError
 from src.web_search.service import WebSearchService
 
@@ -31,7 +32,10 @@ async def call(plugin_id: str, capability: str, args: Dict[str, Any]) -> Dict[st
     # 固定本次调用的配置，避免热重载在请求中途替换服务或凭据。
     config = get_config().model_copy(deep=True)
     invocation = ToolInvocation(tool_name=tool_name, arguments=args, metadata={"plugin_id": plugin_id})
-    result = await get_service().execute(config, invocation)
+    try:
+        result = await get_service().execute(config, invocation)
+    except WebSearchConfigError as exc:
+        raise RPCError(ErrorCode.E_WEB_SERVICE_CONFIG_INVALID, str(exc)) from exc
     payload = asdict(result)
     # 不静默截断正文；限制序列化结果，给 RPC 帧和协议包装留出空间。
     if len(json.dumps(payload, ensure_ascii=False)) > MAX_RESULT_CHARS:

{maibot-1.4.1 → maibot-1.4.2}/src/plugin_runtime/protocol/errors.py

@@ -34,6 +34,7 @@ class ErrorCode(str, Enum):
     # 能力调用
     E_CAPABILITY_DENIED = "E_CAPABILITY_DENIED"
     E_CAPABILITY_FAILED = "E_CAPABILITY_FAILED"
+    E_WEB_SERVICE_CONFIG_INVALID = "E_WEB_SERVICE_CONFIG_INVALID"
 
 
 class RPCError(Exception):

{maibot-1.4.1 → maibot-1.4.2}/src/web_search/config.py

@@ -5,6 +5,14 @@ from urllib.parse import urlsplit
 
 from src.config.config_base import ConfigBase, Field
 
+from .models import WebSearchError
+
+
+class WebSearchConfigError(WebSearchError):
+    """已分配的联网服务缺失或配置不完整。"""
+
+    code = "E_WEB_SERVICE_CONFIG_INVALID"
+
 
 class WebServiceConfig(ConfigBase):
     adapter: Literal["deepseek", "tavily", "stepsearch_mcp", "anysearch", "exa", "firecrawl"] = "deepseek"
@@ -65,14 +73,26 @@ class WebSearchTaskConfig(ConfigBase):
 def resolve_web_search_config(config: WebConfig, task: WebSearchTaskConfig) -> "WebRuntimeConfig":
     """只有功能分配能启用统一联网工具，服务定义本身不授予使用权限。"""
     selected = task.model_list[0] if task.model_list else ""
-    if selected and selected not in config.services:
-        raise ValueError(f"web_search 引用了不存在的联网服务：{selected}，请先取消该功能分配")
     return WebRuntimeConfig(
         enabled=bool(selected), search=selected, fetch=selected,
         preview_chars=config.preview_chars, services=config.services,
     )
 
 
+def require_web_service(config: WebConfig, name: str) -> WebServiceConfig:
+    """获取指定的联网服务并检查调用所需的配置。"""
+    service = config.services.get(name)
+    if service is None:
+        raise WebSearchConfigError(f"web_search 引用了不存在的联网服务：{name}，请修正或取消该功能分配")
+    if service.adapter == "stepsearch_mcp":
+        field, value = "server_ref", service.server_ref
+    else:
+        field, value = "api_key", service.api_key
+    if not value.strip():
+        raise WebSearchConfigError(f"联网服务 {name} 缺少 {field}")
+    return service
+
+
 class WebRuntimeConfig(WebConfig):
     """由功能分配生成的调用快照，不作为持久化配置的启用入口。"""
 
@@ -86,16 +106,6 @@ class WebRuntimeConfig(WebConfig):
     """网页读取使用的 services 条目名；留空不提供统一读取工具。"""
 
     def model_post_init(self, context: Any = None) -> None:
-        for operation in ("search", "fetch"):
-            selected = self.search if operation == "search" else self.fetch
-            if selected and selected not in self.services:
-                raise ValueError(f"web.{operation} 引用了不存在的服务：{selected}")
-            if self.enabled and selected:
-                service = self.services[selected]
-                if service.adapter == "stepsearch_mcp" and not service.server_ref.strip():
-                    raise ValueError(f"联网服务 {selected} 缺少 server_ref")
-                if service.adapter != "stepsearch_mcp" and not service.api_key.strip():
-                    raise ValueError(f"联网服务 {selected} 缺少 api_key")
         if self.enabled and not (self.search or self.fetch):
             raise ValueError("启用联网功能时至少需要选择一个 search 或 fetch 服务")
         super().model_post_init(context)

{maibot-1.4.1 → maibot-1.4.2}/src/web_search/provider.py

@@ -15,7 +15,7 @@ from src.core.tooling import (
 )
 from src.maisaka.tool_result_store import ToolResultStore, tool_result_store
 
-from .config import WebRuntimeConfig
+from .config import WebRuntimeConfig, WebSearchConfigError
 from .models import PageResult, WebSearchError
 from .service import WebSearchService
 
@@ -44,7 +44,8 @@ class WebSearchToolProvider:
         specs = []
         annotation = ToolAnnotation(read_only=True, destructive=False, open_world=True)
         if config.search:
-            adapter = config.services[config.search].adapter
+            service = config.services.get(config.search)
+            adapter = service.adapter if service is not None else ""
             limit = {"deepseek": 128, "firecrawl": 500}.get(adapter, 1000)
             max_results = 10 if adapter == "anysearch" else 20
             specs.append(
@@ -139,6 +140,13 @@ class WebSearchToolProvider:
                 structured_content={**payload, **metadata},
                 metadata=metadata,
             )
+        except WebSearchConfigError as exc:
+            return ToolExecutionResult(
+                tool_name=invocation.tool_name,
+                success=False,
+                error_message=str(exc),
+                structured_content={"error_code": exc.code, "message": str(exc)},
+            )
         except WebSearchError as exc:
             return ToolExecutionResult(tool_name=invocation.tool_name, success=False, error_message=str(exc))
 

{maibot-1.4.1 → maibot-1.4.2}/src/web_search/service.py

@@ -14,7 +14,7 @@ from .adapters.exa import ExaAdapter
 from .adapters.firecrawl import FirecrawlAdapter
 from .adapters.stepsearch import MCPCaller, StepSearchAdapter
 from .adapters.tavily import TavilyAdapter
-from .config import WebRuntimeConfig
+from .config import WebRuntimeConfig, require_web_service
 from .models import PageResult, SearchResult, WebSearchError
 
 
@@ -46,9 +46,9 @@ class WebSearchService:
             raise WebSearchError("未知联网工具")
         search = invocation.tool_name == "web_search"
         name = config.search if search else config.fetch
-        if not name or name not in config.services:
+        if not name:
             raise WebSearchError("当前操作未配置联网服务")
-        settings = config.services[name]
+        settings = require_web_service(config, name)
         if settings.adapter == "deepseek":
             adapter = DeepSeekAdapter(settings, self.transport)
         elif settings.adapter == "tavily":

maibot-1.4.2/src/webui/routers/desktop_pet.py

@@ -0,0 +1,113 @@
+"""桌宠皮肤管理与首页卡片：读写与校验在工作线程进行，预览不修改当前皮肤。"""
+
+from typing import Any, Dict
+from zipfile import BadZipFile
+from fastapi import APIRouter, HTTPException, Request
+from pydantic import BaseModel
+import asyncio
+
+from src.common.paths import get_instance_root
+from src.desktop_pet.remote_server import on_main_loop
+from src.desktop_pet.service import desktop_pet_service
+from src.desktop_pet.thinking_caption import fast_model_configured
+from src.desktop_pet.skins import MAX_BYTES, find_skin, install_zip, list_skins
+from src.desktop_pet.todos import TodoStore
+
+router = APIRouter(prefix="/desktop-pet", tags=["desktop-pet"])
+
+
+@router.get("/skins")
+def skins():
+    return list_skins(get_instance_root())
+
+
+@router.get("/skins/{skin_id}")
+def skin(skin_id: str):
+    try:
+        return find_skin(get_instance_root(), skin_id)
+    except (BadZipFile, ValueError, OSError, KeyError, TypeError) as exc:
+        raise HTTPException(422, str(exc)) from exc
+
+
+@router.post("/skins")
+async def install(request: Request):
+    chunks = []
+    size = 0
+    async for chunk in request.stream():
+        size += len(chunk)
+        if size > MAX_BYTES:
+            raise HTTPException(413, "皮肤包不能超过 32 MiB")
+        chunks.append(chunk)
+    try:
+        return await asyncio.to_thread(install_zip, get_instance_root(), b"".join(chunks))
+    except (BadZipFile, ValueError, OSError, KeyError, TypeError) as exc:
+        raise HTTPException(422, str(exc)) from exc
+
+
+@router.get("/capabilities")
+def capabilities():
+    return {"fast_model_configured": fast_model_configured()}
+
+
+# ─── 首页桌宠卡片 ─────────────────────────────────────────────
+
+TODO_PREVIEW_LIMIT = 20
+CHAT_MAX_LENGTH = 2000
+
+
+class VisibilityBody(BaseModel):
+    visible: bool
+
+
+class ChatBody(BaseModel):
+    text: str
+
+
+def _todo_summary() -> Dict[str, Any]:
+    """读取未完成的待办，只读不写；本机窗口和远端客户端共用同一份待办文件。"""
+    path = get_instance_root() / "data" / "plugins" / "sengokucola.desktop-pet" / "todos.json"
+    if not path.exists():
+        return {"pending": 0, "items": []}
+    items = [item for item in TodoStore(path).list() if item["status"] != "completed"]
+    preview = [{"id": item["id"], "text": item["text"], "due_at": item.get("due_at")} for item in items]
+    return {"pending": len(items), "items": preview[:TODO_PREVIEW_LIMIT]}
+
+
+@router.get("/status")
+async def status():
+    state = desktop_pet_service.status()
+    try:
+        todos = await asyncio.to_thread(_todo_summary)
+    except (OSError, ValueError, KeyError, TypeError):
+        # 待办文件读不出来时卡片照常显示状态，只是没有待办数
+        todos = {"pending": 0, "items": []}
+    return {**state, "todos": todos}
+
+
+@router.post("/visibility")
+async def visibility(body: VisibilityBody):
+    state = desktop_pet_service.status()
+    if not state["enabled"]:
+        raise HTTPException(409, "桌宠没有开启")
+    if not state["ready"]:
+        raise HTTPException(409, "桌宠窗口还没有就绪")
+    try:
+        return await on_main_loop(lambda: desktop_pet_service.control("show" if body.visible else "hide"))
+    except (RuntimeError, ConnectionError, TimeoutError, ValueError) as exc:
+        raise HTTPException(409, str(exc)) from exc
+
+
+@router.post("/chat")
+async def chat(body: ChatBody):
+    """首页卡片给桌宠说话：和桌宠窗口里输入一样投递到主人聊天，回复会在桌宠和网页同步显示。"""
+    text = body.text.strip()
+    if not text:
+        raise HTTPException(422, "消息不能为空")
+    if len(text) > CHAT_MAX_LENGTH:
+        raise HTTPException(422, f"消息不能超过 {CHAT_MAX_LENGTH} 字")
+    if not desktop_pet_service.status()["enabled"]:
+        raise HTTPException(409, "桌宠没有开启")
+    from src.webui.routers.chat.service import relay_plugin_chat_message
+
+    message_id = await relay_plugin_chat_message("builtin.desktop_pet", text)
+    return {"message_id": message_id}

maibot-1.4.1/src/desktop_pet/config.py

@@ -1,57 +0,0 @@
-"""内置桌宠配置。"""
-
-from typing import Literal
-
-from src.config.config_base import ConfigBase, Field
-
-
-class DesktopPetConfig(ConfigBase):
-    __ui_label__ = "桌宠"
-    __ui_order__ = 45
-
-    enabled: bool = Field(default=False, json_schema_extra={"label": {"zh_CN": "启用桌宠"}})
-    """启用本机桌宠或接受远端桌宠连接，和网页聊天室共用聊天与昵称；支持热重载。"""
-
-    mode: Literal["local", "remote"] = Field(default="local", json_schema_extra={"label": {"zh_CN": "运行模式"}})
-    """local 在本机 Windows 启动窗口；remote 等待独立 Windows 客户端连接，服务器可使用 Linux。一次连接一台桌宠。"""
-
-    chat_tools_enabled: bool = Field(default=False, json_schema_extra={"label": {"zh_CN": "聊天流工具"}})
-    """允许桌宠与网页共用的主人聊天查询其他聊天流并唤起传话；不影响图片发送。"""
-
-    skin_id: str = Field(default="builtin", json_schema_extra={"label": {"zh_CN": "当前皮肤"}})
-    """选择已安装的皮肤 ID；支持热切换，builtin 为内置麦麦。"""
-
-    show_current_task: bool = Field(
-        default=False, json_schema_extra={"label": {"zh_CN": "显示桌宠手中事"}},
-    )
-    """在桌宠底部显示当前动作的像素字幕；需单独配置 fast_model，未配置时不可启用。"""
-
-    proactive_wake_enabled: bool = Field(
-        default=False, json_schema_extra={"label": {"zh_CN": "定期主动思考"}},
-    )
-    """桌宠运行期间定期唤醒主人聊天流，自主探索并选择是否交流；会调用模型，默认关闭。"""
-
-    proactive_wake_interval_minutes: int = Field(
-        default=30, ge=1, le=1440, json_schema_extra={"label": {"zh_CN": "主动思考间隔（分钟）"}},
-    )
-    """每次间隔后触发一次，范围 1～1440 分钟；重启或修改桌宠配置后重新计时，不补跑离线周期。"""
-
-    screen_read_enabled: bool = Field(
-        default=False, json_schema_extra={"label": {"zh_CN": "允许读取桌面"}},
-    )
-    """允许主人聊天工具和桌宠按钮截图本机主屏并交给聊天模型理解；截图可能包含屏幕上的私人信息。默认关闭，不授予鼠标键盘控制。"""
-
-    screen_read_interval_seconds: int = Field(
-        default=10, ge=2, le=3600, json_schema_extra={"label": {"zh_CN": "屏幕时间线投递间隔（秒）"}},
-    )
-    """按此间隔将有变化的关键帧拼图交给模型，最多 6 帧；无明显变化不重复投递。停止或重启后需手动重新开启。"""
-
-    screen_sample_interval_seconds: float = Field(
-        default=2, ge=0.5, le=30, json_schema_extra={"label": {"zh_CN": "屏幕差异采样间隔（秒）"}},
-    )
-    """截图和比较画面的频率，独立于模型调用；有效采样间隔不超过时间线投递间隔。"""
-
-    screen_change_threshold: float = Field(
-        default=0.015, ge=0.001, le=1, json_schema_extra={"label": {"zh_CN": "屏幕变化比例阈值"}},
-    )
-    """缩略图中明显变化的像素比例达到阈值才保留，0.015 表示 1.5%；越低越敏感，小面积更新可能被过滤。"""