sycommon-python-lib 0.2.8a7__py3-none-any.whl → 0.2.8a8__py3-none-any.whl

sycli/cli.py

@@ -173,6 +173,11 @@ def _create_parser() -> argparse.ArgumentParser:
     p_acp.add_argument("--config", "-c", help="Path to ACP config file (default: .sycli/acp.yaml)")
     p_acp.add_argument("--project-root", "-r", default=".", help="Project root directory")
 
+    # ── acp-serve ──
+    p_acp_serve = sub.add_parser(
+        "acp-serve", help="Serve a DeepAgent as Zed ACP agent over stdio (LLM-backed)")
+    p_acp_serve.add_argument("--project-root", "-r", default=".", help="Project root directory")
+
     # ── version ──
     sub.add_parser("version", help="Show version")
 
@@ -243,6 +248,10 @@ def main() -> None:
         from sycli.commands.acp_cmd import handle_acp
         sys.exit(handle_acp(args))
 
+    elif args.command == "acp-serve":
+        from sycli.commands.acp_serve_cmd import handle_acp_serve
+        sys.exit(handle_acp_serve(args))
+
 
 def _handle_status(args) -> None:
     """Show current RL state."""

sycli/commands/acp_serve_cmd.py

@@ -0,0 +1,113 @@
+"""sycli acp-serve command — 把 DeepAgent 起成 Zed ACP agent（stdio）。
+
+与 `sycli acp` 的区别：
+- acp：把 .sycli/acp.yaml 里的静态 CLI 工具暴露成 ACP agent（无 LLM，纯命令路由）。
+- acp-serve：把一个真的 DeepAgent（LLM + 本地 shell 后端）暴露成 ACP agent，
+  Zed/其它 ACP client 连上后即可对话式驱动它干活。
+
+stdio 约定：stdout 是 JSON-RPC 通道，一切诊断输出走 stderr。
+"""
+
+from __future__ import annotations
+
+import signal
+import sys
+from pathlib import Path
+
+
+def _e(msg: str) -> None:
+    """stderr 诊断输出（stdout 留给 JSON-RPC）。"""
+    print(f"  {msg}", file=sys.stderr)
+
+
+def handle_acp_serve(args) -> int:
+    """Handle `sycli acp-serve` command.
+
+    Flow:
+        1. Resolve project root, load sycli.json（LLM 配置）
+        2. Build DeepAgent graph（LLM + LocalShellBackend）
+        3. Serve over stdio as Zed ACP agent (blocking)
+
+    Args:
+        args: Parsed argparse namespace with project_root.
+
+    Returns:
+        Exit code (0 for success, 1 for error).
+    """
+    project_root = Path(args.project_root or ".").resolve()
+    config_path = project_root / ".sycli" / "sycli.json"
+
+    from sycli.models.config_models import SycliConfig
+
+    config = SycliConfig.load(config_path)
+    issues = config.validate_config()
+    fatal = [i for i in issues if "base_url" in i or "api_key" in i]
+    if fatal:
+        for i in fatal:
+            _e(f"✘ Config: {i}")
+        _e("✘ LLM 未配置，无法启动 DeepAgent。先运行 `sycli init` 或检查 sycli.json。")
+        return 1
+
+    # Print summary to stderr（stdout 留给 stdio JSON-RPC）
+    _e("═" * 60)
+    _e("Zed ACP DeepAgent Server")
+    _e(f"  Project:  {project_root}")
+    _e(f"  Config:   {config_path if config_path.exists() else '(defaults)'}")
+    _e(f"  Model:    {config.llm.model} @ {config.llm.resolved_base_url()}")
+    _e("  Transport: stdio (JSON-RPC)")
+    _e("─" * 60)
+
+    # Build DeepAgent graph（延迟导入：出错时不污染 stdout）
+    def _build_graph():
+        from deepagents import create_deep_agent
+        from sycli.agents.factory import build_subagents
+        from sycli.core.backend import create_backend
+        from sycli.core.llm import create_llm
+
+        llm = create_llm(config.llm, streaming=True)
+        backend = create_backend(project_root)
+        subagents = build_subagents(config, llm, backend, project_name=project_root.name, mode="serve", project_root=str(project_root))
+        return create_deep_agent(
+            model=llm,
+            backend=backend,
+            system_prompt=(
+                "你是 sycli DeepAgent，正通过 ACP 协议被远程 client 驱动。"
+                "在项目根目录内完成任务；需要拆解任务时用 write_todos 维护计划。"
+            ),
+            subagents=subagents,
+            checkpointer=None,  # langchain-acp 适配层自动挂进程内 checkpointer
+            debug=False,
+            name="sycli-acp-serve",
+        )
+
+    from sycommon.agent.acp.server_adapter import serve_graph
+
+    _shutdown = False
+
+    def _signal_handler(sig, frame):
+        nonlocal _shutdown
+        if _shutdown:
+            sys.exit(1)
+        _shutdown = True
+        _e("⚠ Shutting down ACP DeepAgent...")
+
+    signal.signal(signal.SIGINT, _signal_handler)
+
+    try:
+        serve_graph(
+            graph_factory=_build_graph,
+            agent_name="sycli-deepagent",
+            agent_title="sycli DeepAgent",
+        )
+    except KeyboardInterrupt:
+        _e("⚠ ACP DeepAgent stopped.")
+        return 0
+    except Exception as e:
+        _e(f"✘ ACP server failed: {e}")
+        import traceback
+
+        traceback.print_exc(file=sys.stderr)
+        return 1
+
+    return 0
+

sycommon/agent/acp/server_adapter.py

@@ -0,0 +1,99 @@
+"""ACP server 适配器——把 LangGraph/DeepAgent graph 暴露成 ACP agent（stdio）。
+
+与 client.py 相反的方向：client.py 让我们的 agent 通过 ACP 调远程 agent（如 Codex）；
+本模块让我们的 agent（DeepAgent compiled graph）反过来被 ACP client（Zed 编辑器、
+其它主控 agent）驱动，基于 langchain-acp 的 LangChainAcpAgent 适配层。
+
+对外暴露：
+- serve_graph：把 compiled graph 包成 ACP agent 并阻塞跑 stdio JSON-RPC 循环。
+- build_acp_server_agent：只构建 LangChainAcpAgent（不进 IO 循环，测试/嵌入用）。
+
+会话与状态：
+- 每 ACP session 对应 graph 一个 thread_id（session_id），多轮上下文由
+  langgraph checkpointer 维持；无 checkpointer 的 graph 会被适配层自动挂
+  MemorySaver（进程内，进程退出即失）。
+- deepagents 的 write_todos 计划事件经 DeepAgentsCompatibilityBridge 投影成
+  ACP AgentPlanUpdate，client（如 Zed）能实时看到计划进度。
+"""
+
+from __future__ import annotations
+
+import logging
+from typing import Any, Callable, Optional
+
+from langchain_acp import create_acp_agent, run_acp
+from langchain_acp.runtime.adapter import LangChainAcpAgent
+
+logger = logging.getLogger(__name__)
+
+# graph 工厂类型：langchain-acp 以 FactoryGraphSource 调用工厂，签名是
+# factory(session: AcpSessionContext) -> compiled graph（session 可忽略）。
+# 声明成可选参以兼容「无参工厂」——我们只透传给 langchain-acp。
+GraphFactory = Callable[..., Any]
+
+
+def _adapt_factory(factory: GraphFactory) -> GraphFactory:
+    """把任意零参工厂包成 langchain-acp 要求的 (session) -> graph 签名。"""
+    def _wrapped(session: Any = None) -> Any:  # noqa: ARG001
+        return factory()
+    return _wrapped
+
+
+def build_acp_server_agent(
+    graph: Any = None,
+    *,
+    graph_factory: Optional[GraphFactory] = None,
+    agent_name: str = "sycommon-deepagent",
+    agent_title: str = "sycommon DeepAgent",
+) -> LangChainAcpAgent:
+    """构建 ACP 化的 agent（不进 IO 循环）。
+
+    Args:
+        graph: 已编译的 LangGraph/DeepAgent graph（与 graph_factory 二选一）。
+        graph_factory: 返回 compiled graph 的零参工厂（优先级低于 graph）。
+        agent_name: ACP agentInfo.name（client 侧展示用）。
+        agent_title: ACP agentInfo.title。
+
+    Returns:
+        LangChainAcpAgent，可直接传给 acp.run_agent 或自托管事件循环。
+    """
+    if graph is None and graph_factory is None:
+        raise ValueError("graph 与 graph_factory 至少提供一个")
+    agent = create_acp_agent(
+        graph=graph,
+        graph_factory=_adapt_factory(graph_factory) if graph_factory else None,
+        config=_make_config(agent_name, agent_title),
+    )
+    logger.info("[acp_server] agent 就绪 name=%s（等待 stdio client 连接）", agent_name)
+    return agent
+
+
+def serve_graph(
+    graph: Any = None,
+    *,
+    graph_factory: Optional[GraphFactory] = None,
+    agent_name: str = "sycommon-deepagent",
+    agent_title: str = "sycommon DeepAgent",
+) -> None:
+    """把 graph 包成 ACP agent 并阻塞运行 stdio JSON-RPC 循环。
+
+    stdout 是 JSON-RPC 通道，任何日志必须走 stderr（上层负责 logging 配置）。
+    client 断开 stdin 或进程被 kill 时返回。
+    """
+    agent = build_acp_server_agent(
+        graph, graph_factory=graph_factory,
+        agent_name=agent_name, agent_title=agent_title,
+    )
+    run_acp(graph_source=agent._graph_source, config=agent._config)
+
+
+def _make_config(agent_name: str, agent_title: str) -> Any:
+    """构造 AdapterConfig（agent 标识 + deepagents 兼容桥）。"""
+    from langchain_acp import AdapterConfig
+    from langchain_acp.bridges import DeepAgentsCompatibilityBridge
+
+    return AdapterConfig(
+        agent_name=agent_name,
+        agent_title=agent_title,
+        capability_bridges=(DeepAgentsCompatibilityBridge(),),
+    )

sycommon/agent/sandbox/minio_sync.py

@@ -121,7 +121,7 @@ class MinioSyncService(metaclass=SingletonMeta):
     def _load_config(self, config: dict = None) -> dict:
         """从 Nacos 配置或环境变量加载 MinIO 配置"""
         if config:
-            minio_cfg = config.get("Minio", {})
+            minio_cfg = config.get("Minio") or config.get("llm", {}).get("Minio") or {}
             if minio_cfg.get("endpoint"):
                 return {
                     "endpoint": minio_cfg.get("endpoint", ""),
@@ -134,7 +134,8 @@ class MinioSyncService(metaclass=SingletonMeta):
         try:
             from sycommon.config.Config import Config
             nacos_cfg = Config().config
-            minio_cfg = nacos_cfg.get("Minio", {})
+            # Minio 配置挂在 llm 共享配置下（llm.Minio），不是顶层；这里兼容两种位置
+            minio_cfg = nacos_cfg.get("Minio") or nacos_cfg.get("llm", {}).get("Minio") or {}
             if minio_cfg.get("endpoint"):
                 return {
                     "endpoint": minio_cfg.get("endpoint", ""),

{sycommon_python_lib-0.2.8a7.dist-info → sycommon_python_lib-0.2.8a8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.2.8a7
+Version: 0.2.8a8
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -43,7 +43,8 @@ Requires-Dist: minio==7.2.20
 Requires-Dist: langchain-mcp-adapters==0.3.2
 Requires-Dist: fastapi-mcp==0.4.0
 Requires-Dist: psycopg[binary,pool]==3.3.4
-Requires-Dist: agent-client-protocol==0.12.0
+Requires-Dist: agent-client-protocol==0.11.0
+Requires-Dist: langchain-acp==1.7.0
 Requires-Dist: pypinyin==0.55.0
 
 # sycommon-python-lib

{sycommon_python_lib-0.2.8a7.dist-info → sycommon_python_lib-0.2.8a8.dist-info}/RECORD

@@ -61,7 +61,7 @@ command/templates/web/tools/mq.py.tpl,sha256=OMiZc4tI-rI2wYe7vYMuIStTB4YISJsaOIi
 nexus/__init__.py,sha256=U3xttvnZU9KqgzmgEx3TSjuJ8KDmIvPaVA6rqAdAI8A,1265
 sycli/__init__.py,sha256=KhBtgawbYr8KkVi2jEPmrfVOidBojsZHOB9s4xHv4L0,84
 sycli/__main__.py,sha256=d-RT-h0MqndA9xRO9YdHJjQt6YKGqTyDr69AHkHBlNE,121
-sycli/cli.py,sha256=RgwKvRQ8-vwLxJP8wE9OXQFDfGOkG-eBVl0uAWv64nQ,22639
+sycli/cli.py,sha256=SJX9NS1IAX5_dyRezIUyWZahUbL0hGvH8AGdfFwaxAE,23044
 sycli/simple_chat_agent.py,sha256=_nnRqUhuhW27KNuWTnAzU97WMmo6M8dsx-ieYOyqfzM,6442
 sycli/acp/__init__.py,sha256=TalXyrLls6T9QML6CEKeCJ0X7I5uW79qsq_zCqXvAEg,823
 sycli/acp/config.py,sha256=AZlTMnkT9TxBjFo-VXMxvEiETMzrl_Urkc5EnpBtMzo,4472
@@ -85,6 +85,7 @@ sycli/cdp/capabilities/performance.py,sha256=Gdo_XLFecUZPzi2eBSlWutfD2R_N8HDDYWG
 sycli/cdp/capabilities/screenshot.py,sha256=OzQiiTVFAbPeQniWKIaeQFNA2xJ8ngcQ9R91DXoNaKw,1797
 sycli/commands/__init__.py,sha256=EbizXI__GBFr4gkqusUtMfGZ6slUN9fsnrDbFXMB-iQ,31
 sycli/commands/acp_cmd.py,sha256=QYdp9oQAF1w3X0Finbwz9SInwn2P3I2wIhafgyJeZ_M,3387
+sycli/commands/acp_serve_cmd.py,sha256=Nk61uSZ-4CZNTzUDBfobbX_fG7O10xhw5RzV9ZdvtOM,3897
 sycli/commands/cdp_cmd.py,sha256=gKzTe4NggKRl-58belKutyQ8R5-7GKkQCGbhsFEjEjA,9061
 sycli/commands/chat_cmd.py,sha256=9qvCWEpglbE4WXkGLf7VWUiyV1G8OvIUkhccOddFBwY,9095
 sycli/commands/create_cmd.py,sha256=i4HyOXbxHNvV7jI7MOvZFibZpDea8aJbamrX8UOXNKM,3820
@@ -144,6 +145,7 @@ sycommon/agent/summarization_utils.py,sha256=-jQJNKZrb0np_L66qiaXWdXJC98Y4CUn9q8
 sycommon/agent/acp/__init__.py,sha256=_5QYNAgO_6b0xQXzK8ICRegODEPDQ_AhHC6XCderljg,1908
 sycommon/agent/acp/client.py,sha256=XEOoUsvVI67k0Lw0ZF6T-0Qut-vh5myVfCYQd8RJBwg,27787
 sycommon/agent/acp/fetch.py,sha256=dae2zVLgIQoj821dVg89mr5zPJ5OoaLVchcSuojWJ0Y,6986
+sycommon/agent/acp/server_adapter.py,sha256=PdMfvg3aV23pAqsqAG9KSbRE-PVTdhqp3GZNaHd7EDk,4063
 sycommon/agent/acp/ssh_init.py,sha256=7OOxo0ew2J65qVkzNxTocgHlQ4RSqELujSoN_yfx-Hg,12319
 sycommon/agent/acp/tool.py,sha256=lS5MUjsPbPLzofE0L__nfog2cJojaITiosWl4ucNXOQ,11245
 sycommon/agent/mcp/__init__.py,sha256=CJZU6h6-Z6e7BEeWMaII8MQY21SlyihaT5gt0UR8GNc,666
@@ -157,7 +159,7 @@ sycommon/agent/sandbox/__init__.py,sha256=N6Mcg6Lyvk9dzZYD7Vh2yahStg3hYgtgCBb3ja
 sycommon/agent/sandbox/consistent_hash.py,sha256=ou6cS0f6Z79VGFE5Bk9PaiW2YsAKDVnG1P9pk9UmE4c,7452
 sycommon/agent/sandbox/file_ops.py,sha256=XpjxOqZvUYnGHq4ZqVJTZgTinZbzG5revp7Yqlh8u4k,43890
 sycommon/agent/sandbox/http_sandbox_backend.py,sha256=xuRejln7HFCW6Aj1Wm_k7mcPndOASynJz7OTMlMWh6w,92514
-sycommon/agent/sandbox/minio_sync.py,sha256=Q4SVX-ZRoF9KxGNSc5Zd9_Nt6G01fdtaj3ED0Ed1LeY,46562
+sycommon/agent/sandbox/minio_sync.py,sha256=JSjqOVzDDRpZRM4GfrwwxKgk0Kiuv95toFXXy6Nun-A,46756
 sycommon/agent/sandbox/sandbox_pool.py,sha256=cvFD9VuFpYsHO-yOfuSvvJXQ3QDayFuXiXrJiuaKwpY,9400
 sycommon/agent/sandbox/sandbox_recovery.py,sha256=Sig1Db9_dZIufbkHgWEYPnBGhK8e7UZx8-EscXYsX7g,7559
 sycommon/agent/sandbox/session.py,sha256=14WP9GI-GOLoEdAmbkFHwyGdUQWcO7epOBq3GrB5rHw,2447
@@ -329,8 +331,8 @@ sycommon/tools/timing.py,sha256=IVJVqQdCFcm2timqSvKu9Ht372i8pF3K7b2JbtkcBWg,2137
 sycommon/tools/user_id.py,sha256=CfQ9bVRbtCYRHkizo-efx42DE600vNGAblXZJkJT7Nk,4867
 sycommon/xxljob/__init__.py,sha256=1VrCsCpzEcU9JLEjpyrbzfL0g0Wu8pIFgkJZJMQjmuw,89
 sycommon/xxljob/xxljob_service.py,sha256=cWLa-mrm7rJHigHrpj-xrSudDwBCtEfssv2pEntBxqA,7865
-sycommon_python_lib-0.2.8a7.dist-info/METADATA,sha256=tmtxkx8ciK_VB_JBkzyrOgn6wtqwfqjRqVCt2Vf5kxQ,8151
-sycommon_python_lib-0.2.8a7.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-sycommon_python_lib-0.2.8a7.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
-sycommon_python_lib-0.2.8a7.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
-sycommon_python_lib-0.2.8a7.dist-info/RECORD,,
+sycommon_python_lib-0.2.8a8.dist-info/METADATA,sha256=aCqQD-fPA4igNNYxHL4mB4HyVzaYnHAYlGBjJmZgTsU,8188
+sycommon_python_lib-0.2.8a8.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+sycommon_python_lib-0.2.8a8.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
+sycommon_python_lib-0.2.8a8.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
+sycommon_python_lib-0.2.8a8.dist-info/RECORD,,