sycommon-python-lib 0.2.5a37__tar.gz → 0.2.5a39__tar.gz

{sycommon_python_lib-0.2.5a37 → sycommon_python_lib-0.2.5a39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.2.5a37
+Version: 0.2.5a39
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{sycommon_python_lib-0.2.5a37 → sycommon_python_lib-0.2.5a39}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sycommon-python-lib"
-version = "0.2.5a37"
+version = "0.2.5a39"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.11"

{sycommon_python_lib-0.2.5a37 → sycommon_python_lib-0.2.5a39}/src/sycommon/agent/deep_agent.py

@@ -762,13 +762,10 @@ class DeepAgent:
 
                             # 发送 tool_call 事件，前端根据 tool_call_id 更新
                             tc_id = existing_tc["id"]
-                            if tc_id:
+                            if tc_id and tc_id not in seen_tool_call_ids:
                                 current_args = existing_tc["args"]
-                                # 只有以下情况才发送：
-                                # 1. 首次出现（args 为空，先发一个占位）
-                                # 2. args 解析成功（有实质更新）
                                 is_first = not existing_tc.get("_sent")
-                                if is_first or args_parsed:
+                                if is_first:
                                     event = ChatEventBuilder.tool_call(
                                         name=existing_tc["name"],
                                         args=current_args,
@@ -777,6 +774,7 @@ class DeepAgent:
                                         agent=DEFAULT_AGENT_NAME,
                                     )
                                     existing_tc["_sent"] = True
+                                    seen_tool_call_ids.add(tc_id)
                                     if on_event:
                                         await on_event(event)
                                     yield event
@@ -788,6 +786,9 @@ class DeepAgent:
                                 tc_id = tc.get("id", "")
                                 if not tc_id:
                                     continue
+                                if tc_id in seen_tool_call_ids:
+                                    continue
+                                seen_tool_call_ids.add(tc_id)
 
                                 tc_name = tc.get("name", "unknown")
                                 tc_args = tc.get("args", {})
@@ -1237,7 +1238,11 @@ async def _sync_skills_to_sandbox(
     skills_dir: str,
     backend: HTTPSandboxBackend,
 ) -> None:
-    """同步 skills 到沙箱（按版本检查，版本不一致则覆盖）"""
+    """同步 skills SKILL.md 到沙箱（按版本检查，版本不一致则覆盖）
+
+    只同步 SKILL.md 文件，不同步 scripts/ 等大目录。
+    scripts/ 在 agent 实际调用时由 HTTPSandboxBackend._lazy_sync_skill_from_path 按需同步。
+    """
     if not os.path.isdir(skills_dir):
         return
 
@@ -1291,9 +1296,15 @@ async def _sync_skills_to_sandbox(
                         f"[DeepAgent] 删除旧版技能失败: {skill_name}, {e}")
                     continue
 
-            await backend.async_sync_dirs([(src, f"/skills/{skill_name}")])
-            SYLogger.info(
-                f"[DeepAgent] 同步技能到沙箱: {skill_name} v{local_version}")
+            # 只同步 SKILL.md（不再同步整个目录）
+            if os.path.isfile(local_skill_md):
+                with open(local_skill_md, "rb") as f:
+                    content = f.read()
+                await backend.aupload_files([
+                    (f"/skills/{skill_name}/SKILL.md", content)
+                ])
+                SYLogger.info(
+                    f"[DeepAgent] 同步技能元数据到沙箱: {skill_name} v{local_version} (仅 SKILL.md)")
     except Exception as e:
         SYLogger.warning(f"[DeepAgent] 技能同步失败: {e}")
 
@@ -1303,16 +1314,14 @@ async def _create_sandbox_backend(
     config: AgentConfig,
     project_root: Path,
 ) -> HTTPSandboxBackend:
-    """创建并同步沙箱后端"""
-    sync_dirs = []
+    """创建并同步沙箱后端
 
-    if config.skills_dir:
-        skills_dir = Path(config.skills_dir)
-    else:
-        skills_dir = project_root / "skills"
-    skills_dir.mkdir(parents=True, exist_ok=True)
-    sync_dirs.append((str(skills_dir), "/skills"))
+    注意：skills 目录不再通过 sync_dirs 全量同步，
+    而是由 _sync_skills_to_sandbox() 做版本感知的增量同步。
+    """
+    sync_dirs = []
 
+    # skills 不再通过 sync_dirs 全量同步，改由 _sync_skills_to_sandbox() 按版本增量同步
     if config.memory_dir:
         memory_dir = Path(config.memory_dir)
     else:
@@ -1320,12 +1329,19 @@ async def _create_sandbox_backend(
     memory_dir.mkdir(parents=True, exist_ok=True)
     sync_dirs.append((str(memory_dir), "/memory"))
 
+    # 确定 skills_dir，传递给沙箱后端用于懒同步
+    if config.skills_dir:
+        skills_dir_for_backend = str(Path(config.skills_dir))
+    else:
+        skills_dir_for_backend = str(project_root / "skills")
+
     sandbox_backend = HTTPSandboxBackend.from_nacos(
         service_name=config.sandbox_service_name,
         user_id=user_id,
         timeout=config.sandbox_timeout,
         sync_dirs=sync_dirs,
         auto_sync=True,
+        skills_dir=skills_dir_for_backend,
     )
 
     try:

{sycommon_python_lib-0.2.5a37 → sycommon_python_lib-0.2.5a39}/src/sycommon/agent/multi_agent_team.py

@@ -655,16 +655,14 @@ async def _create_sandbox_backend_for_team(
     config: TeamConfig,
     project_root: Path,
 ) -> HTTPSandboxBackend:
-    """创建并同步沙箱后端（团队版本）"""
-    sync_dirs = []
+    """创建并同步沙箱后端（团队版本）
 
-    if config.skills_dir:
-        skills_dir = Path(config.skills_dir)
-    else:
-        skills_dir = project_root / "skills"
-    skills_dir.mkdir(parents=True, exist_ok=True)
-    sync_dirs.append((str(skills_dir), "/skills"))
+    注意：skills 目录不再通过 sync_dirs 全量同步，
+    而是由 _sync_skills_to_sandbox() 做版本感知的增量同步。
+    """
+    sync_dirs = []
 
+    # skills 不再通过 sync_dirs 全量同步，改由 _sync_skills_to_sandbox() 按版本增量同步
     if config.memory_dir:
         memory_dir = Path(config.memory_dir)
     else:
@@ -672,6 +670,12 @@ async def _create_sandbox_backend_for_team(
     memory_dir.mkdir(parents=True, exist_ok=True)
     sync_dirs.append((str(memory_dir), "/memory"))
 
+    # 确定 skills_dir，传递给沙箱后端用于懒同步
+    if config.skills_dir:
+        skills_dir_for_backend = str(Path(config.skills_dir))
+    else:
+        skills_dir_for_backend = str(project_root / "skills")
+
     sandbox_backend = HTTPSandboxBackend.from_nacos(
         service_name=config.sandbox_service_name,
         user_id=user_id,
@@ -679,6 +683,7 @@ async def _create_sandbox_backend_for_team(
         sync_dirs=sync_dirs,
         auto_sync=True,
         version=get_env_var('VERSION') or None,
+        skills_dir=skills_dir_for_backend,
     )
 
     # 健康检查

{sycommon_python_lib-0.2.5a37 → sycommon_python_lib-0.2.5a39}/src/sycommon/agent/sandbox/file_ops.py

@@ -182,6 +182,7 @@ class FileOperationsMixin:
     def ls(self: "HTTPSandboxBackend", path: str) -> LsResult:
         """列出目录内容"""
         try:
+            self._lazy_sync_skill_from_path_sync(path)
             self._ensure_synced_sync()
             SYLogger.info(f"[Sandbox] 列出目录: {path}")
             result = self._post_sync(f"{SANDBOX_API_PREFIX}/ls", {
@@ -198,6 +199,7 @@ class FileOperationsMixin:
     async def als(self: "HTTPSandboxBackend", path: str, *, timeout: int = None) -> LsResult:
         """异步列出目录内容"""
         try:
+            await self._lazy_sync_skill_from_path(path)
             await self._ensure_synced_async()
             SYLogger.info(f"[Sandbox] 异步列出目录: {path}")
             result = await self._post_async_with_failover(f"{SANDBOX_API_PREFIX}/ls", {
@@ -221,6 +223,9 @@ class FileOperationsMixin:
     ) -> ReadResult:
         """读取文件内容"""
         try:
+            # 按需懒同步：检测是否读取 skill 资源
+            self._lazy_sync_skill_from_path_sync(file_path)
+
             self._ensure_synced_sync()
             SYLogger.info(
                 f"[Sandbox] 读取文件: {file_path} (offset={offset}, limit={limit})")
@@ -256,6 +261,9 @@ class FileOperationsMixin:
     ) -> ReadResult:
         """异步读取文件内容"""
         try:
+            # 按需懒同步：检测是否读取 skill 资源
+            await self._lazy_sync_skill_from_path(file_path)
+
             await self._ensure_synced_async()
             SYLogger.info(
                 f"[Sandbox] 异步读取文件: {file_path} (offset={offset}, limit={limit})")
@@ -302,6 +310,7 @@ class FileOperationsMixin:
                 /conversation_history/ 路径）。设为 False 时，文件已存在返回错误。
         """
         try:
+            self._lazy_sync_skill_from_path_sync(file_path)
             self._ensure_synced_sync()
             SYLogger.info(f"[Sandbox] 写入文件: {file_path} ({len(content)} 字符)")
             result = self._post_sync(f"{SANDBOX_API_PREFIX}/write", {
@@ -340,6 +349,7 @@ class FileOperationsMixin:
             timeout: 请求超时时间。
         """
         try:
+            await self._lazy_sync_skill_from_path(file_path)
             await self._ensure_synced_async()
             SYLogger.info(f"[Sandbox] 异步写入文件: {file_path} ({len(content)} 字符)")
             result = await self._post_async_with_failover(f"{SANDBOX_API_PREFIX}/write", {
@@ -374,6 +384,7 @@ class FileOperationsMixin:
     ) -> EditResult:
         """编辑文件"""
         try:
+            self._lazy_sync_skill_from_path_sync(file_path)
             self._ensure_synced_sync()
             result = self._post_sync(f"{SANDBOX_API_PREFIX}/edit", {
                 "file_path": file_path,
@@ -402,6 +413,7 @@ class FileOperationsMixin:
     ) -> EditResult:
         """异步编辑文件"""
         try:
+            await self._lazy_sync_skill_from_path(file_path)
             await self._ensure_synced_async()
             result = await self._post_async_with_failover(f"{SANDBOX_API_PREFIX}/edit", {
                 "file_path": file_path,
@@ -424,6 +436,7 @@ class FileOperationsMixin:
     def glob(self: "HTTPSandboxBackend", pattern: str, path: str | None = None) -> GlobResult:
         """glob 搜索文件"""
         try:
+            self._lazy_sync_skill_from_path_sync(path or "/")
             self._ensure_synced_sync()
             result = self._post_sync(f"{SANDBOX_API_PREFIX}/glob", {
                 "pattern": pattern,
@@ -439,6 +452,7 @@ class FileOperationsMixin:
     async def aglob(self: "HTTPSandboxBackend", pattern: str, path: str | None = None, *, timeout: int = None) -> GlobResult:
         """异步 glob 搜索文件"""
         try:
+            await self._lazy_sync_skill_from_path(path or "/")
             await self._ensure_synced_async()
             result = await self._post_async_with_failover(f"{SANDBOX_API_PREFIX}/glob", {
                 "pattern": pattern,
@@ -456,6 +470,7 @@ class FileOperationsMixin:
     def tree(self: "HTTPSandboxBackend", path: str = "/", max_depth: int = 30, max_files: int = 0) -> TreeResult:
         """以树形结构展示目录"""
         try:
+            self._lazy_sync_skill_from_path_sync(path)
             self._ensure_synced_sync()
             SYLogger.info(f"[Sandbox] tree: {path}")
             result = self._post_sync(f"{SANDBOX_API_PREFIX}/tree", {
@@ -476,6 +491,7 @@ class FileOperationsMixin:
     async def atree(self: "HTTPSandboxBackend", path: str = "/", max_depth: int = 30, max_files: int = 0, *, timeout: int = None) -> TreeResult:
         """异步以树形结构展示目录"""
         try:
+            await self._lazy_sync_skill_from_path(path)
             await self._ensure_synced_async()
             SYLogger.info(f"[Sandbox] 异步 tree: {path}")
             result = await self._post_async_with_failover(f"{SANDBOX_API_PREFIX}/tree", {
@@ -501,6 +517,7 @@ class FileOperationsMixin:
     ) -> GrepResult:
         """搜索文件内容"""
         try:
+            self._lazy_sync_skill_from_path_sync(path or "/")
             self._ensure_synced_sync()
             result = self._post_sync(f"{SANDBOX_API_PREFIX}/grep", {
                 "pattern": pattern,
@@ -534,6 +551,7 @@ class FileOperationsMixin:
     ) -> GrepResult:
         """异步搜索文件内容"""
         try:
+            await self._lazy_sync_skill_from_path(path or "/")
             await self._ensure_synced_async()
             result = await self._post_async_with_failover(f"{SANDBOX_API_PREFIX}/grep", {
                 "pattern": pattern,
@@ -564,6 +582,7 @@ class FileOperationsMixin:
     ) -> DeleteResult:
         """删除文件或文件夹"""
         try:
+            self._lazy_sync_skill_from_path_sync(path)
             self._ensure_synced_sync()
             SYLogger.info(f"[Sandbox] 删除: {path} (recursive={recursive})")
             result = self._post_sync(f"{SANDBOX_API_PREFIX}/delete", {
@@ -593,6 +612,7 @@ class FileOperationsMixin:
     ) -> DeleteResult:
         """异步删除文件或文件夹"""
         try:
+            await self._lazy_sync_skill_from_path(path)
             await self._ensure_synced_async()
             SYLogger.info(f"[Sandbox] 异步删除: {path} (recursive={recursive})")
             result = await self._post_async_with_failover(f"{SANDBOX_API_PREFIX}/delete", {
@@ -618,6 +638,7 @@ class FileOperationsMixin:
     async def astat(self: "HTTPSandboxBackend", path: str, *, timeout: int = None) -> "StatResult":
         """异步检查文件或目录状态"""
         try:
+            await self._lazy_sync_skill_from_path(path)
             await self._ensure_synced_async()
             SYLogger.info(f"[Sandbox] 异步查询文件状态: {path}")
             result = await self._post_async_with_failover(f"{SANDBOX_API_PREFIX}/stat", {

{sycommon_python_lib-0.2.5a37 → sycommon_python_lib-0.2.5a39}/src/sycommon/agent/sandbox/http_sandbox_backend.py

@@ -14,7 +14,7 @@ import sys
 import tempfile
 import threading
 import requests
-from pathlib import Path
+from pathlib import Path, PurePosixPath
 from typing import Optional, List
 
 import aiohttp
@@ -126,6 +126,7 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
         nacos_group: str = "DEFAULT_GROUP",
         token: str = None,
         env: dict[str, str] = None,
+        skills_dir: str = None,
     ):
         """
         初始化 HTTP 沙箱后端
@@ -139,6 +140,7 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
             nacos_service_name: Nacos 服务名（用于故障转移时重新发现服务）
             nacos_group: Nacos 服务分组
             env: 注入到沙箱的环境变量字典，每次执行命令时自动前置 export
+            skills_dir: 本地 skills 目录路径，用于 execute 时按需懒同步 scripts/
         """
         self._base_url = base_url.rstrip("/")
         self._user_id = user_id.lower().replace(" ", "") if user_id else user_id
@@ -149,6 +151,10 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
         self._workspace_verified = False
         self._local_mode: Optional[bool] = None
 
+        # Skills 懒同步：记录本地 skills 目录，访问时按需同步整个 skill 子目录
+        self._skills_dir = skills_dir
+        self._synced_skills: set[str] = set()  # 已完整同步的 skill 名称
+
         # Token authentication: instance-level > env var
         self._token = token if token is not None else os.environ.get(
             "SANDBOX_TOKEN", "")
@@ -244,6 +250,7 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
         auto_sync: bool = False,
         load_balance: bool = True,
         env: dict[str, str] = None,
+        skills_dir: str = None,
     ) -> "HTTPSandboxBackend":
         """
         从 Nacos 服务发现创建后端实例
@@ -257,6 +264,7 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
             sync_dirs: 要同步的目录列表 [(本地路径, 沙箱路径), ...]
             auto_sync: 是否在首次文件操作时自动同步
             load_balance: 是否基于 user_id 进行负载均衡（默认 True）
+            skills_dir: 本地 skills 目录路径，用于 execute 时按需懒同步 scripts/
 
         Returns:
             HTTPSandboxBackend 实例
@@ -279,6 +287,7 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
                 sync_dirs=sync_dirs,
                 auto_sync=auto_sync,
                 env=env,
+                skills_dir=skills_dir,
             )
 
         from sycommon.synacos.nacos_service import NacosService
@@ -330,6 +339,7 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
             nacos_service_name=service_name,
             nacos_group=group,
             env=env,
+            skills_dir=skills_dir,
         )
 
     @classmethod
@@ -344,17 +354,22 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
         auto_sync: bool = False,
         load_balance: bool = True,
         env: dict[str, str] = None,
+        skills_dir: str = None,
     ) -> "HTTPSandboxBackend":
         """异步从 Nacos 服务发现创建后端实例"""
         return await asyncio.to_thread(
             cls.from_nacos,
-            service_name, user_id, group, version, timeout, sync_dirs, auto_sync, load_balance, env,
+            service_name, user_id, group, version, timeout, sync_dirs, auto_sync, load_balance, env, skills_dir,
         )
 
     # ============== 内部方法 - 同步版本 ==============
 
     def _refresh_from_nacos_and_switch_sync(self) -> bool:
-        """从 Nacos 重新获取服务实例并切换（同步版本）"""
+        """从 Nacos 重新获取服务实例并切换（同步版本）
+
+        优先从 MinIO 恢复用户文件到新沙箱，避免沙箱间互相迁移脏数据。
+        只有 MinIO 不可用时才尝试从旧沙箱拉取。
+        """
         # 防止递归：如果在故障转移过程中再次调用，直接返回 False
         if getattr(self, '_in_failover', False):
             SYLogger.warning("[Sandbox] 已在故障转移过程中，跳过重复调用")
@@ -399,33 +414,40 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
                 old_url = self._base_url
                 SYLogger.info(f"[Sandbox] 准备切换服务: {old_url} -> {new_url}")
 
-                # 1. 先从旧服务下载工作空间文件
-                workspace_files = []
-                try:
-                    sync_result = self._sync_workspace_sync()
-                    workspace_files = sync_result.get("files", [])
-                    SYLogger.info(
-                        f"[Sandbox] 从旧服务获取 {len(workspace_files)} 个工作空间文件")
-                except Exception as e:
-                    SYLogger.warning(f"[Sandbox] 获取工作空间文件失败: {e}")
-
-                # 2. 切换到新服务
+                # 1. 切换到新服务
                 self._base_url = new_url
                 self._synced = False
 
-                # 3. 同步配置的目录到新服务
+                # 2. 同步配置的目录到新服务（skills, memory 等本地文件）
                 if self._sync_dirs:
                     SYLogger.info(f"[Sandbox] 重新同步配置目录到新服务...")
                     self._sync_sync()
 
-                # 4. 上传工作空间文件到新服务
-                if workspace_files:
-                    SYLogger.info(
-                        f"[Sandbox] 上传 {len(workspace_files)} 个工作空间文件到新服务...")
-                    upload_result = self._upload_workspace_files_sync(
-                        workspace_files)
+                # 3. 优先从 MinIO 恢复用户工作空间文件
+                workspace_restored = False
+                try:
+                    from sycommon.agent.sandbox.minio_sync import MinioSyncService
+                    minio = MinioSyncService()
+                    if minio.is_available():
+                        SYLogger.info(
+                            f"[Sandbox] 从 MinIO 恢复用户文件到新沙箱...")
+                        import asyncio
+                        loop = asyncio.new_event_loop()
+                        try:
+                            restored = loop.run_until_complete(
+                                minio.restore_from_minio(self, self._user_id))
+                            workspace_restored = restored > 0
+                            SYLogger.info(
+                                f"[Sandbox] MinIO 恢复完成: {restored} 个文件")
+                        finally:
+                            loop.close()
+                except Exception as e:
+                    SYLogger.warning(
+                        f"[Sandbox] MinIO 恢复失败: {e}")
+
+                if not workspace_restored:
                     SYLogger.info(
-                        f"[Sandbox] 工作空间迁移完成: 成功 {upload_result['success']}, 失败 {upload_result['failed']}")
+                        f"[Sandbox] MinIO 无可用数据，新沙箱将从空工作空间开始")
 
                 SYLogger.info(f"[Sandbox] 服务切换完成: {old_url} -> {new_url}")
                 return True
@@ -702,9 +724,17 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
             )
 
     async def aexecute(self, command: str, *, timeout: int = None) -> ExecuteResponse:
-        """异步执行 shell 命令（服务端负责路径隔离和目录初始化）"""
+        """异步执行 shell 命令（服务端负责路径隔离和目录初始化）
+
+        如果命令引用了 /skills/<name>/ 下的资源，
+        会自动按需同步该 skill 的整个目录到沙箱。
+        """
         command = self._inject_env(command)
         SYLogger.info(f"[Sandbox] aexecute 开始: command={command}")
+
+        # 按需懒同步：检测命令中是否引用了 skill 资源
+        await self._lazy_sync_skill_from_path(command)
+
         await self._ensure_synced_async()
         SYLogger.info(f"[Sandbox] _ensure_synced_async 完成，开始执行命令: {command}")
         try:
@@ -728,6 +758,79 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
                 truncated=False
             )
 
+    async def _lazy_sync_skill_from_path(self, path: str) -> None:
+        """从文件路径中检测是否访问了 skill 资源，按需同步整个 skill 目录
+
+        检测路径中是否包含 /skills/<name>/ 模式（不限 scripts/，覆盖
+        assets/、references/ 及任意自定义子目录）。
+        如果该 skill 尚未同步，则上传整个 skill 目录到沙箱。
+        """
+        if not self._skills_dir:
+            return
+
+        import re
+        # 匹配 /skills/<skill_name>/ 或 skills/<skill_name>/
+        match = re.search(r'/skills/([a-zA-Z0-9_\-]+)/', path)
+        if not match:
+            match = re.search(r'(?:^|\s|")skills/([a-zA-Z0-9_\-]+)/', path)
+        if not match:
+            return
+
+        skill_name = match.group(1)
+        if skill_name in self._synced_skills:
+            return
+
+        skill_dir = os.path.join(self._skills_dir, skill_name)
+        if not os.path.isdir(skill_dir):
+            self._synced_skills.add(skill_name)
+            return
+
+        try:
+            await self.async_sync_dirs([
+                (skill_dir, f"/skills/{skill_name}")
+            ])
+            self._synced_skills.add(skill_name)
+            SYLogger.info(
+                f"[Sandbox] 懒同步技能目录: {skill_name}/")
+        except Exception as e:
+            SYLogger.warning(
+                f"[Sandbox] 懒同步技能目录失败: {skill_name}, {e}")
+
+    def _lazy_sync_skill_from_path_sync(self, path: str) -> None:
+        """同步版本的懒同步（在同步文件操作中调用）
+
+        内部使用 asyncio.run_coroutine_threadsafe 或回退到同步上传。
+        """
+        if not self._skills_dir:
+            return
+
+        import re
+        match = re.search(r'/skills/([a-zA-Z0-9_\-]+)/', path)
+        if not match:
+            match = re.search(r'(?:^|\s|")skills/([a-zA-Z0-9_\-]+)/', path)
+        if not match:
+            return
+
+        skill_name = match.group(1)
+        if skill_name in self._synced_skills:
+            return
+
+        skill_dir = os.path.join(self._skills_dir, skill_name)
+        if not os.path.isdir(skill_dir):
+            self._synced_skills.add(skill_name)
+            return
+
+        try:
+            # 同步版本直接调用同步上传方法
+            self._upload_directory_sync(
+                skill_dir, f"/skills/{skill_name}", mode="full")
+            self._synced_skills.add(skill_name)
+            SYLogger.info(
+                f"[Sandbox] 懒同步技能目录(sync): {skill_name}/")
+        except Exception as e:
+            SYLogger.warning(
+                f"[Sandbox] 懒同步技能目录失败(sync): {skill_name}, {e}")
+
     async def _sync_async(self, *, timeout: int = None) -> dict:
         """同步目录（异步版本）
 
@@ -855,7 +958,7 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
 
                     local_file = Path(root) / file
                     relative_path = local_file.relative_to(local_path)
-                    sandbox_path = str(Path(remote_path) / relative_path)
+                    sandbox_path = str(PurePosixPath(remote_path) / relative_path.as_posix())
                     result.append((sandbox_path, local_file))
             return result
 
@@ -1236,7 +1339,7 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
 
                 local_file = Path(root) / file
                 relative_path = local_file.relative_to(local_path)
-                sandbox_path = str(Path(remote_path) / relative_path)
+                sandbox_path = str(PurePosixPath(remote_path) / relative_path.as_posix())
                 files_to_upload.append((sandbox_path, local_file))
 
         SYLogger.info(f"[Sandbox] 准备上传 {len(files_to_upload)} 个文件到沙箱")

{sycommon_python_lib-0.2.5a37 → sycommon_python_lib-0.2.5a39}/src/sycommon/agent/sandbox/minio_sync.py

@@ -218,6 +218,19 @@ class MinioSyncService(metaclass=SingletonMeta):
         """异步删除 MinIO 中指定前缀下的所有对象"""
         return await asyncio.to_thread(self.remove_prefix, prefix)
 
+    async def cleanup_user_history(self, user_id: str) -> None:
+        """清理用户沙箱对话历史和工具缓存（沙箱 + MinIO 双删）
+
+        用于新建会话/重置对话时，确保沙箱和 MinIO 中的
+        conversation_history 和 large_tool_results 都被清除，
+        避免 restore_from_minio 把旧文件同步回来。
+        """
+        uid = user_id.lower().replace(" ", "")
+        await asyncio.gather(
+            self.aremove_prefix(f"{uid}/current/conversation_history/"),
+            self.aremove_prefix(f"{uid}/current/large_tool_results/"),
+        )
+
     # ============== 查找最近副本 ==============
 
     def find_latest_object_key(self, user_id: str, file_path: str) -> Optional[str]:
@@ -303,7 +316,10 @@ class MinioSyncService(metaclass=SingletonMeta):
     async def sync_sandbox_to_minio(self, sandbox_backend, user_id: str) -> int:
         """扫描沙箱目录，增量同步文件到 MinIO
 
-        存储到 {user_id}/current/ 目录，只上传新增或修改的文件。
+        存储到 {user_id}/current/ 目录：
+        - 上传新增或修改的文件
+        - 删除 MinIO 中存在但沙箱中已不存在的文件（双向同步）
+
         max_files=0 表示不限制，tree 返回全部文件。
         下载/上传采用并发（每批 CONCURRENT_BATCH 个），避免串行太慢。
 
@@ -329,6 +345,13 @@ class MinioSyncService(metaclass=SingletonMeta):
 
         sandbox_files = self.collect_sandbox_files(tree_result)
         if not sandbox_files:
+            # 沙箱为空，清理 MinIO 中该用户的所有文件
+            try:
+                removed = await self.aremove_prefix(f"{user_id.lower()}/current/")
+                if removed > 0:
+                    SYLogger.info(f"[MinIO] 沙箱为空，清理 MinIO: user={user_id}, removed={removed}")
+            except Exception as e:
+                SYLogger.warning(f"[MinIO] 沙箱为空时清理 MinIO 失败: {e}")
             return 0
 
         # 2. 确定存储目录
@@ -353,17 +376,36 @@ class MinioSyncService(metaclass=SingletonMeta):
             SYLogger.warning(f"[MinIO] 列出已有副本失败，将全量上传: {e}")
 
         # 4. 找出需要同步的文件（新增的不在 MinIO 中）
+        sandbox_file_set = set(sandbox_files)
         changed_files = [
             fp for fp in sandbox_files if fp not in existing_objects]
 
+        # 5. 找出需要删除的文件（MinIO 中存在但沙箱中已不存在）
+        deleted_files = [
+            fp for fp in existing_objects if fp not in sandbox_file_set]
+
+        # 删除 MinIO 中的孤立文件
+        if deleted_files:
+            removed_count = 0
+            for fp in deleted_files:
+                try:
+                    object_key = f"{prefix}{fp}"
+                    await self.aremove_object(object_key)
+                    removed_count += 1
+                except Exception as e:
+                    SYLogger.warning(f"[MinIO] 删除孤立文件失败: {fp}, {e}")
+            if removed_count > 0:
+                SYLogger.info(
+                    f"[MinIO] 清理孤立文件: user={user_id}, removed={removed_count}")
+
         if not changed_files:
-            SYLogger.info(f"[MinIO] 所有文件均无变化，跳过同步: user={user_id}")
+            SYLogger.info(f"[MinIO] 所有文件均无变化: user={user_id}")
             return 0
 
         SYLogger.info(
             f"[MinIO] 检测到 {len(changed_files)} 个文件有变化: user={user_id}")
 
-        # 5. 并发下载并上传变化文件
+        # 6. 并发下载并上传变化文件
         synced = await self._sync_batch(sandbox_backend, changed_files, existing_objects, prefix)
 
         SYLogger.info(