sycommon-python-lib 0.2.7a10__tar.gz → 0.2.7a12__tar.gz

{sycommon_python_lib-0.2.7a10 → sycommon_python_lib-0.2.7a12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.2.7a10
+Version: 0.2.7a12
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -11,14 +11,14 @@ Requires-Dist: anyio==4.14.1
 Requires-Dist: decorator==5.3.1
 Requires-Dist: deepagents==0.6.12
 Requires-Dist: elasticsearch==9.4.1
-Requires-Dist: fastapi==0.138.1
+Requires-Dist: fastapi==0.139.0
 Requires-Dist: jinja2==3.1.6
-Requires-Dist: kafka-python==3.0.6
+Requires-Dist: kafka-python==3.0.7
 Requires-Dist: langchain==1.3.11
 Requires-Dist: langchain-core==1.4.8
 Requires-Dist: langchain-openai==1.3.3
-Requires-Dist: langfuse==4.12.0
-Requires-Dist: langgraph==1.2.6
+Requires-Dist: langfuse==4.13.0
+Requires-Dist: langgraph==1.2.7
 Requires-Dist: langgraph-checkpoint-postgres==3.1.0
 Requires-Dist: langgraph-checkpoint-redis==0.5.0
 Requires-Dist: ldap3==2.9.1
@@ -32,7 +32,7 @@ Requires-Dist: python-dotenv==1.2.2
 Requires-Dist: python-multipart==0.0.32
 Requires-Dist: pyyaml==6.0.3
 Requires-Dist: redis==7.4.0
-Requires-Dist: sentry-sdk[fastapi]==2.63.0
+Requires-Dist: sentry-sdk[fastapi]==2.64.0
 Requires-Dist: sqlalchemy[asyncio]==2.0.51
 Requires-Dist: starlette[full]==1.3.1
 Requires-Dist: tiktoken==0.13.0

{sycommon_python_lib-0.2.7a10 → sycommon_python_lib-0.2.7a12}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sycommon-python-lib"
-version = "0.2.7a10"
+version = "0.2.7a12"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -12,14 +12,14 @@ dependencies = [
     "decorator==5.3.1",
     "deepagents==0.6.12",
     "elasticsearch==9.4.1",
-    "fastapi==0.138.1",
+    "fastapi==0.139.0",
     "jinja2==3.1.6",
-    "kafka-python==3.0.6",
+    "kafka-python==3.0.7",
     "langchain==1.3.11",
     "langchain-core==1.4.8",
     "langchain-openai==1.3.3",
-    "langfuse==4.12.0",
-    "langgraph==1.2.6",
+    "langfuse==4.13.0",
+    "langgraph==1.2.7",
     "langgraph-checkpoint-postgres==3.1.0",
     "langgraph-checkpoint-redis==0.5.0",
     "ldap3==2.9.1",
@@ -33,7 +33,7 @@ dependencies = [
     "python-multipart==0.0.32",
     "pyyaml==6.0.3",
     "redis==7.4.0",
-    "sentry-sdk[fastapi]==2.63.0",
+    "sentry-sdk[fastapi]==2.64.0",
     "sqlalchemy[asyncio]==2.0.51",
     "starlette[full]==1.3.1",
     "tiktoken==0.13.0",

{sycommon_python_lib-0.2.7a10 → sycommon_python_lib-0.2.7a12}/src/sycommon/agent/deep_agent.py

@@ -1346,46 +1346,67 @@ async def _sync_skills_to_sandbox(
     版本比较只看沙箱 sandbox_dest/{name}/SKILL.md,无需 MinIO 锚点:
     - 沙箱有该技能且 version 一致 → 跳过
     - 沙箱没有 / 版本不一致 → 从本地 skills/ 全量上传到沙箱
+
+    性能: 比对与上传均绕过 backend 的懒同步(_skip_lazy_sync=True),
+    避免「比对 read SKILL.md 前先整目录上传」「删除前先上传再删」的往返浪费。
+    多技能的 SKILL.md 比对用 gather 并发; batch_upload 服务端无条件覆盖,
+    无需先删(删除仅在版本不一致时做,用 adelete 走 /delete 而非 /execute)。
     """
     if not os.path.isdir(skills_dir):
         return
 
     try:
-        # 获取沙箱 sandbox_dest 下已有的目录列表
-        existing_dirs = set()
-        tree_result = await backend.atree(sandbox_dest, max_depth=1)
-        if tree_result and tree_result.tree and tree_result.tree.children:
-            for child in tree_result.tree.children:
-                if child.is_dir:
-                    existing_dirs.add(child.name)
-
-        skill_count = 0
-        skip_count = 0
+        # 收集本地技能名 + 本地版本(纯本地读,快)
+        local_skills = []  # [(skill_name, local_version, src_path)]
         for skill_name in sorted(os.listdir(skills_dir)):
             src = os.path.join(skills_dir, skill_name)
             if not os.path.isdir(src):
                 continue
-
-            # 读取本地版本
-            local_skill_md = os.path.join(src, "SKILL.md")
             local_version = ""
+            local_skill_md = os.path.join(src, "SKILL.md")
             if os.path.isfile(local_skill_md):
                 try:
                     with open(local_skill_md, "r", encoding="utf-8") as f:
                         local_version = _parse_skill_version(f.read())
                 except Exception:
                     pass
+            local_skills.append((skill_name, local_version, src))
 
-            # 比较版本:只从沙箱 sandbox_dest/{name}/SKILL.md 读取
-            remote_version = ""
-            if skill_name in existing_dirs:
-                try:
-                    remote_content = await backend.aread(
-                        f"{sandbox_dest}/{skill_name}/SKILL.md")
-                    if remote_content:
-                        remote_version = _parse_skill_version(remote_content)
-                except Exception:
-                    pass
+        # 获取沙箱 sandbox_dest 下已有的目录列表(一次 atree)
+        existing_dirs = set()
+        tree_result = await backend.atree(sandbox_dest, max_depth=1)
+        if tree_result and tree_result.tree and tree_result.tree.children:
+            for child in tree_result.tree.children:
+                if child.is_dir:
+                    existing_dirs.add(child.name)
+
+        # 并发读取所有已存在技能的沙箱 SKILL.md 比对版本(跳过懒同步)
+        async def _read_remote_version(skill_name: str) -> str:
+            if skill_name not in existing_dirs:
+                return ""
+            try:
+                remote_content = await backend.aread(
+                    f"{sandbox_dest}/{skill_name}/SKILL.md",
+                    _skip_lazy_sync=True)
+                if remote_content and remote_content.file_data:
+                    # FileData 是 TypedDict(dict), 用键访问而非属性
+                    return _parse_skill_version(
+                        remote_content.file_data.get("content", "") or "")
+            except Exception:
+                pass
+            return ""
+
+        remote_versions = await asyncio.gather(
+            *[_read_remote_version(name) for name, _, _ in local_skills]
+        )
+        remote_version_map = {
+            name: rv for (name, _, _), rv in zip(local_skills, remote_versions)
+        }
+
+        skill_count = 0
+        skip_count = 0
+        for skill_name, local_version, src in local_skills:
+            remote_version = remote_version_map.get(skill_name, "")
 
             if remote_version and remote_version == local_version:
                 SYLogger.debug(
@@ -1394,10 +1415,13 @@ async def _sync_skills_to_sandbox(
                 skip_count += 1
                 continue
 
-            # 版本不一致或无版本,删除旧目录后全量覆盖
+            # 版本不一致或无版本,删除旧目录(走 /delete,跳过懒同步,毫秒级)
             if skill_name in existing_dirs:
                 try:
-                    await backend.aexecute(f"rm -rf {sandbox_dest}/{skill_name}")
+                    await backend.adelete(
+                        f"{sandbox_dest}/{skill_name}",
+                        recursive=True,
+                        _skip_lazy_sync=True)
                     SYLogger.info(
                         f"[DeepAgent] 技能版本不一致,覆盖: {skill_name} "
                         f"({remote_version or '无版本'} → {local_version})")
@@ -1405,7 +1429,7 @@ async def _sync_skills_to_sandbox(
                     SYLogger.warning(
                         f"[DeepAgent] 删除旧版技能失败: {skill_name}, {e}")
 
-            # 全量上传整个技能目录到沙箱
+            # 全量上传整个技能目录到沙箱(batch_upload 服务端无条件覆盖)
             await backend.async_sync_dirs([(src, f"{sandbox_dest}/{skill_name}")])
             backend._synced_skills.add(skill_name)
             skill_count += 1
@@ -1417,7 +1441,8 @@ async def _sync_skills_to_sandbox(
                 # sandbox_dest 是虚拟绝对路径(/skills/system),沙箱 shell 不重映射裸绝对路径,
                 # 须拼 $_SANDBOX_WORKSPACE 指向真实 workspace 才能命中。否则 chmod 静默失败。
                 await backend.aexecute(
-                    f'chmod -R 555 "$_SANDBOX_WORKSPACE{sandbox_dest}"')
+                    f'chmod -R 555 "$_SANDBOX_WORKSPACE{sandbox_dest}"',
+                    _skip_lazy_sync=True)
                 SYLogger.info(f"[DeepAgent] 已设只读: chmod -R 555 {sandbox_dest}")
             except Exception as e:
                 SYLogger.warning(f"[DeepAgent] chmod 只读失败(忽略): {e}")

{sycommon_python_lib-0.2.7a10 → sycommon_python_lib-0.2.7a12}/src/sycommon/agent/sandbox/file_ops.py

@@ -333,11 +333,17 @@ class FileOperationsMixin:
         limit: int = 2000,
         *,
         timeout: int = None,
+        _skip_lazy_sync: bool = False,
     ) -> ReadResult:
-        """异步读取文件内容"""
+        """异步读取文件内容
+
+        _skip_lazy_sync=True 时跳过懒同步（供内部技能版本比对用，
+        避免 read SKILL.md 触发整目录上传）。
+        """
         try:
             # 按需懒同步：检测是否读取 skill 资源
-            await self._lazy_sync_skill_from_path(file_path)
+            if not _skip_lazy_sync:
+                await self._lazy_sync_skill_from_path(file_path)
 
             await self._ensure_synced_async()
             SYLogger.info(
@@ -738,10 +744,16 @@ class FileOperationsMixin:
         recursive: bool = False,
         *,
         timeout: int = None,
+        _skip_lazy_sync: bool = False,
     ) -> DeleteResult:
-        """异步删除文件或文件夹"""
+        """异步删除文件或文件夹
+
+        _skip_lazy_sync=True 时跳过懒同步（供内部技能覆盖删除用，
+        避免「删之前先把要删的技能上传一遍」的浪费）。
+        """
         try:
-            await self._lazy_sync_skill_from_path(path)
+            if not _skip_lazy_sync:
+                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", {

{sycommon_python_lib-0.2.7a10 → sycommon_python_lib-0.2.7a12}/src/sycommon/agent/sandbox/http_sandbox_backend.py

@@ -813,17 +813,21 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
                 truncated=False
             )
 
-    async def aexecute(self, command: str, *, timeout: int = None) -> ExecuteResponse:
+    async def aexecute(self, command: str, *, timeout: int = None, _skip_lazy_sync: bool = False) -> ExecuteResponse:
         """异步执行 shell 命令（服务端负责路径隔离和目录初始化）
 
         如果命令引用了 /skills/<name>/ 下的资源，
         会自动按需同步该 skill 的整个目录到沙箱。
+
+        _skip_lazy_sync=True 时跳过懒同步（仅供内部技能同步/删除使用，
+        避免删前先传、比对前先传的往返浪费）。
         """
         command = self._inject_env(command)
         SYLogger.info(f"[Sandbox] aexecute 开始: command={command}")
 
         # 按需懒同步：检测命令中是否引用了 skill 资源
-        await self._lazy_sync_skill_from_path(command)
+        if not _skip_lazy_sync:
+            await self._lazy_sync_skill_from_path(command)
 
         await self._ensure_synced_async()
         SYLogger.info(f"[Sandbox] _ensure_synced_async 完成，开始执行命令: {command}")

{sycommon_python_lib-0.2.7a10 → sycommon_python_lib-0.2.7a12}/src/sycommon/llm/get_llm.py

@@ -10,7 +10,17 @@ from sycommon.middleware.context import current_llm_api_key
 
 
 def resolve_api_key(config_apikey: Optional[str]) -> str:
-    """LLM 网关 apiKey 取值：per-user ContextVar → 配置全局 key → "-" 兜底。"""
+    """LLM 网关 apiKey 取值：override → per-user 派生 key → 配置全局 key → "-" 兜底。
+
+    llm_key_override 优先级最高：stream_chat 在 LLM 报错降级时 set="global" 强制
+    走 nacos 全局 apiKey，或 set 成显式 key。默认 None 时走 per-user 派生 key。
+    """
+    from sycommon.middleware.context import llm_key_override
+    ov = llm_key_override.get()
+    if ov == "global":
+        return config_apikey or "-"
+    if ov:                    # 显式指定 key
+        return ov
     return current_llm_api_key.get() or config_apikey or "-"
 
 

sycommon_python_lib-0.2.7a12/src/sycommon/middleware/context.py

@@ -0,0 +1,16 @@
+import contextvars
+
+current_trace_id = contextvars.ContextVar("trace_id", default=None)
+
+current_headers = contextvars.ContextVar("headers", default=None)
+
+# per-user LLM 网关 apiKey：agent 创建入口 set，get_llm 读取，沿 task 树传播。
+# 为 None 时 get_llm 回退到 LLMConfig.apiKey 全局 key。
+current_llm_api_key = contextvars.ContextVar("llm_api_key", default=None)
+
+# LLM 网关 apiKey 降级开关（resolve_api_key 最先检查，优先级高于派生 key）：
+#   "global" = 强制用 nacos 全局 LLMConfig.apiKey（派生 key 失败时兜底）
+#   其它非空字符串 = 直接用该 key
+#   None = 走 per-user 派生 key（默认，正常路径）
+# 沿 asyncio task 树传播，请求结束自动重置 → 每次新请求仍优先派生 key。
+llm_key_override = contextvars.ContextVar("llm_key_override", default=None)

{sycommon_python_lib-0.2.7a10 → sycommon_python_lib-0.2.7a12}/src/sycommon_python_lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.2.7a10
+Version: 0.2.7a12
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -11,14 +11,14 @@ Requires-Dist: anyio==4.14.1
 Requires-Dist: decorator==5.3.1
 Requires-Dist: deepagents==0.6.12
 Requires-Dist: elasticsearch==9.4.1
-Requires-Dist: fastapi==0.138.1
+Requires-Dist: fastapi==0.139.0
 Requires-Dist: jinja2==3.1.6
-Requires-Dist: kafka-python==3.0.6
+Requires-Dist: kafka-python==3.0.7
 Requires-Dist: langchain==1.3.11
 Requires-Dist: langchain-core==1.4.8
 Requires-Dist: langchain-openai==1.3.3
-Requires-Dist: langfuse==4.12.0
-Requires-Dist: langgraph==1.2.6
+Requires-Dist: langfuse==4.13.0
+Requires-Dist: langgraph==1.2.7
 Requires-Dist: langgraph-checkpoint-postgres==3.1.0
 Requires-Dist: langgraph-checkpoint-redis==0.5.0
 Requires-Dist: ldap3==2.9.1
@@ -32,7 +32,7 @@ Requires-Dist: python-dotenv==1.2.2
 Requires-Dist: python-multipart==0.0.32
 Requires-Dist: pyyaml==6.0.3
 Requires-Dist: redis==7.4.0
-Requires-Dist: sentry-sdk[fastapi]==2.63.0
+Requires-Dist: sentry-sdk[fastapi]==2.64.0
 Requires-Dist: sqlalchemy[asyncio]==2.0.51
 Requires-Dist: starlette[full]==1.3.1
 Requires-Dist: tiktoken==0.13.0

{sycommon_python_lib-0.2.7a10 → sycommon_python_lib-0.2.7a12}/src/sycommon_python_lib.egg-info/SOURCES.txt

@@ -324,4 +324,5 @@ tests/test_resilient_pg_saver.py
 tests/test_simple_chat_agent.py
 tests/test_skill_regex_upgrade.py
 tests/test_skill_write_guard.py
-tests/test_sycli.py
+tests/test_sycli.py
+tests/test_sync_skills_to_sandbox.py

{sycommon_python_lib-0.2.7a10 → sycommon_python_lib-0.2.7a12}/src/sycommon_python_lib.egg-info/requires.txt

@@ -5,14 +5,14 @@ anyio==4.14.1
 decorator==5.3.1
 deepagents==0.6.12
 elasticsearch==9.4.1
-fastapi==0.138.1
+fastapi==0.139.0
 jinja2==3.1.6
-kafka-python==3.0.6
+kafka-python==3.0.7
 langchain==1.3.11
 langchain-core==1.4.8
 langchain-openai==1.3.3
-langfuse==4.12.0
-langgraph==1.2.6
+langfuse==4.13.0
+langgraph==1.2.7
 langgraph-checkpoint-postgres==3.1.0
 langgraph-checkpoint-redis==0.5.0
 ldap3==2.9.1
@@ -26,7 +26,7 @@ python-dotenv==1.2.2
 python-multipart==0.0.32
 pyyaml==6.0.3
 redis==7.4.0
-sentry-sdk[fastapi]==2.63.0
+sentry-sdk[fastapi]==2.64.0
 sqlalchemy[asyncio]==2.0.51
 starlette[full]==1.3.1
 tiktoken==0.13.0

sycommon_python_lib-0.2.7a12/tests/test_sync_skills_to_sandbox.py

@@ -0,0 +1,207 @@
+"""_sync_skills_to_sandbox 性能优化单测。
+
+验证三点:
+1. 比对/删除/上传全程不触发 backend 的懒同步(_skip_lazy_sync=True 生效)
+2. 版本不一致时用 adelete(recursive=True) 删除(替代 aexecute rm -rf)
+3. 多技能的 SKILL.md 比对是并发发出的(gather)
+"""
+import asyncio
+import os
+import sys
+import tempfile
+
+import pytest
+
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "src"))
+
+from sycommon.models.sandbox import TreeNode  # noqa: E402
+from sycommon.agent.sandbox.file_ops import TreeResult  # noqa: E402
+
+
+def _skill_md(version: str) -> str:
+    return f"---\nname: x\ndescription: y\nversion: {version}\n---\nbody\n"
+
+
+class FakeBackend:
+    """记录所有调用 + 计数懒同步的假沙箱后端。
+
+    aread/adelete/aexecute 接受 _skip_lazy_sync 形参;
+    若该参数为 False, 计入 lazy_sync_calls(模拟真实 backend 的懒同步副作用)。
+    """
+
+    def __init__(self, remote_versions: dict[str, str], remote_exists: set[str]):
+        # remote_versions: {skill_name: version}  ("" 表示无 version 字段)
+        # remote_exists:   {skill_name, ...}      atree 返回的已存在目录
+        self._remote_versions = remote_versions
+        self._remote_exists = remote_exists
+        self.lazy_sync_calls = 0          # 懒同步触发次数(应始终为 0)
+        self.aread_calls = []             # [(path, skip_lazy)]
+        self.adelete_calls = []           # [(path, recursive, skip_lazy)]
+        self.aexecute_calls = []          # [(command, skip_lazy)]
+        self.sync_dirs_calls = []         # [(src, dest)]
+        self._synced_skills = set()
+        self._aread_gate = asyncio.Event()
+        self._aread_gate.set()            # 默认不阻塞; 个别 case 主动 clear 制造串行检测
+
+    # --- tree ---
+    async def atree(self, path, max_depth=1):
+        children = [TreeNode(path=f"/skills/system/{n}", name=n, is_dir=True)
+                    for n in self._remote_exists]
+        return TreeResult(tree=TreeNode(path="/skills/system", name="system",
+                                        is_dir=True, children=children))
+
+    # --- read ---
+    async def aread(self, file_path, offset=0, limit=2000, *, timeout=None,
+                    _skip_lazy_sync=False):
+        if not _skip_lazy_sync:
+            self.lazy_sync_calls += 1
+        self.aread_calls.append((file_path, _skip_lazy_sync))
+        await self._aread_gate.wait()      # 用于并发性断言
+        # 解析 /skills/system/<name>/SKILL.md
+        parts = file_path.split("/")
+        name = parts[-2] if len(parts) >= 2 else ""
+        ver = self._remote_versions.get(name, None)
+        if ver is None:
+            return ReadResult(error=f"File '{file_path}': not found")
+        content = _skill_md(ver) if ver else "---\nname: x\n---\nbody\n"
+        from deepagents.backends.protocol import ReadResult
+        # FileData 是 TypedDict(dict)
+        return ReadResult(file_data={"content": content, "encoding": "utf-8"})
+
+    # --- delete ---
+    async def adelete(self, path, recursive=False, *, timeout=None,
+                      _skip_lazy_sync=False):
+        if not _skip_lazy_sync:
+            self.lazy_sync_calls += 1
+        self.adelete_calls.append((path, recursive, _skip_lazy_sync))
+        from sycommon.agent.sandbox.file_ops import DeleteResult
+        return DeleteResult(path=path)
+
+    # --- execute (chmod 用) ---
+    async def aexecute(self, command, *, timeout=None, _skip_lazy_sync=False):
+        if not _skip_lazy_sync:
+            self.lazy_sync_calls += 1
+        self.aexecute_calls.append((command, _skip_lazy_sync))
+        from sycommon.agent.sandbox.http_sandbox_backend import ExecuteResponse
+        return ExecuteResponse(output="", exit_code=0, truncated=False)
+
+    # --- 上传整目录 ---
+    async def async_sync_dirs(self, dirs, *, timeout=None):
+        for src, dest in dirs:
+            self.sync_dirs_calls.append((src, dest))
+        return {src: {"success": 1, "failed": 0, "errors": []} for src, _ in dirs}
+
+
+def _make_skills_dir(specs):
+    """specs: [(name, version_or_None)] -> 临时目录, 每技能含 SKILL.md"""
+    d = tempfile.mkdtemp()
+    for name, ver in specs:
+        sd = os.path.join(d, name)
+        os.makedirs(sd)
+        md = os.path.join(sd, "SKILL.md")
+        with open(md, "w") as f:
+            f.write(_skill_md(ver) if ver else "---\nname: x\n---\nbody\n")
+        # 加一个脚本文件, 让 async_sync_dirs 有东西传
+        with open(os.path.join(sd, "script.py"), "w") as f:
+            f.write("# x\n")
+    return d
+
+
+@pytest.mark.asyncio
+async def test_versions_match_skips_all_upload_and_delete():
+    from sycommon.agent.deep_agent import _sync_skills_to_sandbox
+    skills = _make_skills_dir([("sy-a", "1.0.0"), ("sy-b", "2.0.0")])
+    backend = FakeBackend(
+        remote_versions={"sy-a": "1.0.0", "sy-b": "2.0.0"},
+        remote_exists={"sy-a", "sy-b"},
+    )
+    await _sync_skills_to_sandbox(skills, backend, sandbox_dest="/skills/system",
+                                  chmod_readonly=False)
+    # 版本一致: 不传文件、不删
+    assert backend.sync_dirs_calls == []
+    assert backend.adelete_calls == []
+    # 全程不触发懒同步
+    assert backend.lazy_sync_calls == 0
+
+
+@pytest.mark.asyncio
+async def test_version_mismatch_uses_adelete_recursive_no_lazy():
+    from sycommon.agent.deep_agent import _sync_skills_to_sandbox
+    skills = _make_skills_dir([("sy-a", "1.0.0")])
+    backend = FakeBackend(remote_versions={"sy-a": "0.9.0"},  # 沙箱旧版本
+                          remote_exists={"sy-a"})
+    await _sync_skills_to_sandbox(skills, backend, sandbox_dest="/skills/system",
+                                  chmod_readonly=False)
+    # 删除走 adelete(recursive=True), 而非 aexecute rm -rf
+    assert len(backend.adelete_calls) == 1
+    path, recursive, skip = backend.adelete_calls[0]
+    assert path == "/skills/system/sy-a"
+    assert recursive is True
+    assert skip is True
+    # 没有用 aexecute 删(rm -rf), chmod 也走 _skip_lazy_sync=True
+    for cmd, skip in backend.aexecute_calls:
+        assert skip is True
+        assert "rm -rf" not in cmd
+    # 上传了一次
+    assert len(backend.sync_dirs_calls) == 1
+    # 全程不触发懒同步
+    assert backend.lazy_sync_calls == 0
+
+
+@pytest.mark.asyncio
+async def test_remote_no_version_triggers_overwrite():
+    """沙箱旧副本无 version 字段(remote_version=="")→ 视为不一致 → 覆盖。"""
+    from sycommon.agent.deep_agent import _sync_skills_to_sandbox
+    skills = _make_skills_dir([("sy-a", "1.0.0")])
+    backend = FakeBackend(remote_versions={"sy-a": ""},  # 无 version
+                          remote_exists={"sy-a"})
+    await _sync_skills_to_sandbox(skills, backend, sandbox_dest="/skills/system",
+                                  chmod_readonly=False)
+    assert len(backend.adelete_calls) == 1   # 删旧
+    assert len(backend.sync_dirs_calls) == 1  # 重传
+    assert backend.lazy_sync_calls == 0
+
+
+@pytest.mark.asyncio
+async def test_remote_missing_skill_uploaded_without_delete():
+    """沙箱里没有该技能(不在 existing_dirs)→ 直接传, 不删。"""
+    from sycommon.agent.deep_agent import _sync_skills_to_sandbox
+    skills = _make_skills_dir([("sy-new", "1.0.0")])
+    backend = FakeBackend(remote_versions={}, remote_exists=set())
+    await _sync_skills_to_sandbox(skills, backend, sandbox_dest="/skills/system",
+                                  chmod_readonly=False)
+    assert backend.adelete_calls == []        # 没有旧目录可删
+    assert len(backend.sync_dirs_calls) == 1  # 直接传
+
+
+@pytest.mark.asyncio
+async def test_comparison_is_concurrent():
+    """多技能的 aread 比对是 gather 并发, 不是串行。
+
+    用 gate 让每个 aread 阻塞; 串行下总耗时 ≈ N * delay, 并发下 ≈ delay。
+    """
+    from sycommon.agent.deep_agent import _sync_skills_to_sandbox
+    skills = _make_skills_dir([("s1", "1.0.0"), ("s2", "1.0.0"), ("s3", "1.0.0")])
+    backend = FakeBackend(
+        remote_versions={"s1": "1.0.0", "s2": "1.0.0", "s3": "1.0.0"},
+        remote_exists={"s1", "s2", "s3"},
+    )
+
+    delay = 0.15
+    orig_aread = backend.aread
+
+    async def slow_aread(*a, **kw):
+        await asyncio.sleep(delay)
+        return await orig_aread(*a, **kw)
+    backend.aread = slow_aread
+
+    loop = asyncio.get_event_loop()
+    t0 = loop.time()
+    await _sync_skills_to_sandbox(skills, backend, sandbox_dest="/skills/system",
+                                  chmod_readonly=False)
+    elapsed = loop.time() - t0
+
+    # 并发: 3 个 aread 应在 ~delay 内完成; 串行至少 3*delay
+    assert elapsed < 3 * delay, (
+        f"比对疑似串行: elapsed={elapsed:.2f}s, delay={delay}s (并发应<{delay*2:.2f}s)")
+    assert backend.lazy_sync_calls == 0

sycommon_python_lib-0.2.7a10/src/sycommon/middleware/context.py

@@ -1,9 +0,0 @@
-import contextvars
-
-current_trace_id = contextvars.ContextVar("trace_id", default=None)
-
-current_headers = contextvars.ContextVar("headers", default=None)
-
-# per-user LLM 网关 apiKey：agent 创建入口 set，get_llm 读取，沿 task 树传播。
-# 为 None 时 get_llm 回退到 LLMConfig.apiKey 全局 key。
-current_llm_api_key = contextvars.ContextVar("llm_api_key", default=None)