sycommon-python-lib 0.2.6a14__tar.gz → 0.2.7a1__tar.gz

{sycommon_python_lib-0.2.6a14 → sycommon_python_lib-0.2.7a1}/PKG-INFO

@@ -1,24 +1,24 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.2.6a14
+Version: 0.2.7a1
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: aio-pika==9.6.2
 Requires-Dist: aiohttp==3.14.1
 Requires-Dist: aiomysql==0.3.2
-Requires-Dist: anyio==4.13.0
+Requires-Dist: anyio==4.14.0
 Requires-Dist: decorator==5.3.1
-Requires-Dist: deepagents==0.6.10
+Requires-Dist: deepagents==0.6.11
 Requires-Dist: elasticsearch==9.4.1
-Requires-Dist: fastapi==0.137.0
+Requires-Dist: fastapi==0.138.0
 Requires-Dist: jinja2==3.1.6
-Requires-Dist: kafka-python==3.0.0
-Requires-Dist: langchain==1.3.9
-Requires-Dist: langchain-core==1.4.7
+Requires-Dist: kafka-python==3.0.2
+Requires-Dist: langchain==1.3.10
+Requires-Dist: langchain-core==1.4.8
 Requires-Dist: langchain-openai==1.3.2
-Requires-Dist: langfuse==4.7.1
-Requires-Dist: langgraph==1.2.5
+Requires-Dist: langfuse==4.9.1
+Requires-Dist: langgraph==1.2.6
 Requires-Dist: langgraph-checkpoint-postgres==3.1.0
 Requires-Dist: langgraph-checkpoint-redis==0.4.1
 Requires-Dist: ldap3==2.9.1
@@ -32,8 +32,8 @@ 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.62.0
-Requires-Dist: sqlalchemy[asyncio]==2.0.50
+Requires-Dist: sentry-sdk[fastapi]==2.63.0
+Requires-Dist: sqlalchemy[asyncio]==2.0.51
 Requires-Dist: starlette[full]==1.3.1
 Requires-Dist: tiktoken==0.13.0
 Requires-Dist: uvicorn==0.49.0
@@ -43,7 +43,7 @@ Requires-Dist: minio==7.2.20
 Requires-Dist: langchain-mcp-adapters==0.3.0
 Requires-Dist: fastapi-mcp==0.4.0
 Requires-Dist: psycopg[binary,pool]==3.3.4
-Requires-Dist: acp-sdk>=1.0.3
+Requires-Dist: agent-client-protocol==0.10.1
 
 # sycommon-python-lib
 

{sycommon_python_lib-0.2.6a14 → sycommon_python_lib-0.2.7a1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sycommon-python-lib"
-version = "0.2.6a14"
+version = "0.2.7a1"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -8,18 +8,18 @@ dependencies = [
     "aio-pika==9.6.2",
     "aiohttp==3.14.1",
     "aiomysql==0.3.2",
-    "anyio==4.13.0",
+    "anyio==4.14.0",
     "decorator==5.3.1",
-    "deepagents==0.6.10",
+    "deepagents==0.6.11",
     "elasticsearch==9.4.1",
-    "fastapi==0.137.0",
+    "fastapi==0.138.0",
     "jinja2==3.1.6",
-    "kafka-python==3.0.0",
-    "langchain==1.3.9",
-    "langchain-core==1.4.7",
+    "kafka-python==3.0.2",
+    "langchain==1.3.10",
+    "langchain-core==1.4.8",
     "langchain-openai==1.3.2",
-    "langfuse==4.7.1",
-    "langgraph==1.2.5",
+    "langfuse==4.9.1",
+    "langgraph==1.2.6",
     "langgraph-checkpoint-postgres==3.1.0",
     "langgraph-checkpoint-redis==0.4.1",
     "ldap3==2.9.1",
@@ -33,8 +33,8 @@ dependencies = [
     "python-multipart==0.0.32",
     "pyyaml==6.0.3",
     "redis==7.4.0",
-    "sentry-sdk[fastapi]==2.62.0",
-    "sqlalchemy[asyncio]==2.0.50",
+    "sentry-sdk[fastapi]==2.63.0",
+    "sqlalchemy[asyncio]==2.0.51",
     "starlette[full]==1.3.1",
     "tiktoken==0.13.0",
     "uvicorn==0.49.0",
@@ -44,7 +44,7 @@ dependencies = [
     "langchain-mcp-adapters==0.3.0",
     "fastapi-mcp==0.4.0",
     "psycopg[binary,pool]==3.3.4",
-    "acp-sdk>=1.0.3",
+    "agent-client-protocol==0.10.1",
 ]
 
 [tool.setuptools]

sycommon_python_lib-0.2.7a1/src/sycli/acp/__init__.py

@@ -0,0 +1,25 @@
+"""ACP (Agent Client Protocol — Zed) support for sycli.
+
+把本地 CLI 工具暴露成 Zed ACP agent（stdio JSON-RPC），可被任何 ACP client
+（Zed、或我们 sycommon 的 ACP client）连接调用。
+
+使用官方 `agent-client-protocol`（import 名 `acp`）的 stdio transport，
+照 examples/echo_agent.py 模板实现 Agent 协议。
+"""
+
+from sycli.acp.config import ACPConfig, ToolArgument, ToolDef
+from sycli.acp.executor import build_cli_command, execute_command, stream_command
+from sycli.acp.registry import CLIToolAgent, build_agents
+from sycli.acp.server import run_acp_server
+
+__all__ = [
+    "ACPConfig",
+    "CLIToolAgent",
+    "ToolArgument",
+    "ToolDef",
+    "build_agents",
+    "build_cli_command",
+    "execute_command",
+    "run_acp_server",
+    "stream_command",
+]

sycommon_python_lib-0.2.7a1/src/sycli/acp/registry.py

@@ -0,0 +1,223 @@
+"""Zed ACP agent registry.
+
+把 .sycli/acp.yaml 里声明的 CLI 工具暴露成一个 Zed ACP Agent（stdio）。
+照官方 examples/echo_agent.py 模板实现 Agent 协议。
+
+设计：一个 agent 进程承载多个 CLI 工具。prompt 到来时：
+  1. 从输入文本解析 `tool=<name>`（或第一段当作工具名），定位 ToolDef
+  2. build_cli_command 拼命令 → stream_command/execute_command 执行
+  3. 通过 session_update 把输出（逐行流式或一次性）推给 client
+  4. 返回 PromptResponse(stop_reason="end_turn")
+"""
+
+from __future__ import annotations
+
+import os
+from collections.abc import AsyncGenerator
+from typing import TYPE_CHECKING, Any
+from uuid import uuid4
+
+from acp import (
+    Agent,
+    InitializeResponse,
+    NewSessionResponse,
+    PromptResponse,
+    text_block,
+    update_agent_message,
+    update_plan,
+)
+from acp.interfaces import Client
+from acp.schema import (
+    AudioContentBlock,
+    ClientCapabilities,
+    EmbeddedResourceContentBlock,
+    HttpMcpServer,
+    ImageContentBlock,
+    Implementation,
+    McpServerStdio,
+    PlanEntry,
+    ResourceContentBlock,
+    SseMcpServer,
+    TextContentBlock,
+)
+
+from sycli.acp.executor import build_cli_command, execute_command, stream_command
+
+if TYPE_CHECKING:
+    from sycli.acp.config import ACPConfig, ToolDef
+
+
+class CLIToolAgent(Agent):
+    """一个承载多个 CLI 工具的 Zed ACP agent。
+
+    每次 prompt：解析工具名 → 执行对应 CLI → session_update 推输出。
+    """
+
+    _conn: Client | None = None
+
+    def __init__(self, config: "ACPConfig", project_root: str) -> None:
+        self._config = config
+        self._project_root = project_root
+        # 工具名 → ToolDef 索引，便于路由
+        self._tools_by_name: dict[str, "ToolDef"] = {t.name: t for t in config.tools}
+
+    # ---- Agent 协议回调 ----
+    def on_connect(self, conn: Client) -> None:
+        self._conn = conn
+
+    async def initialize(
+        self,
+        protocol_version: int,
+        client_capabilities: ClientCapabilities | None = None,
+        client_info: Implementation | None = None,
+        **kwargs: Any,
+    ) -> InitializeResponse:
+        return InitializeResponse(protocol_version=protocol_version)
+
+    async def new_session(
+        self,
+        cwd: str,
+        additional_directories: list[str] | None = None,
+        mcp_servers: list[HttpMcpServer | SseMcpServer | McpServerStdio] | None = None,
+        **kwargs: Any,
+    ) -> NewSessionResponse:
+        return NewSessionResponse(session_id=uuid4().hex)
+
+    async def prompt(
+        self,
+        prompt: list[
+            TextContentBlock
+            | ImageContentBlock
+            | AudioContentBlock
+            | ResourceContentBlock
+            | EmbeddedResourceContentBlock
+        ],
+        session_id: str,
+        **kwargs: Any,
+    ) -> PromptResponse:
+        assert self._conn is not None, "Agent 未连接"
+
+        # 1. 提取输入文本
+        input_text = _extract_input_text_from_blocks(prompt)
+
+        # 2. 路由到具体 CLI 工具
+        tool_def, remaining_input = _resolve_tool(input_text, self._tools_by_name)
+
+        if tool_def is None:
+            # 找不到工具，列出可用工具
+            available = ", ".join(self._tools_by_name.keys()) or "(无)"
+            await self._conn.session_update(
+                session_id=session_id,
+                update=update_agent_message(text_block(
+                    f"❌ 未识别的 CLI 工具。可用工具: {available}\n"
+                    f"用法: 第一个词为工具名，或用 tool=<name> 指定。"
+                )),
+            )
+            return PromptResponse(stop_reason="end_turn")
+
+        # 3. 上报计划（让 client 看到要执行什么）
+        await self._conn.session_update(
+            session_id=session_id,
+            update=update_plan([PlanEntry(
+                content=f"执行 CLI 工具: {tool_def.name} ({tool_def.command})",
+                priority="medium",
+                status="in_progress",
+            )]),
+        )
+
+        # 4. 拼命令 + 执行环境
+        command = build_cli_command(tool_def, remaining_input)
+        cwd = tool_def.working_dir or self._project_root
+        env = {**os.environ, **tool_def.env} if tool_def.env else None
+
+        # 5. 执行并推送输出
+        if tool_def.stream_output:
+            async for line in stream_command(
+                command, cwd=cwd, timeout=tool_def.timeout, env=env,
+            ):
+                await self._conn.session_update(
+                    session_id=session_id,
+                    update=update_agent_message(text_block(line)),
+                )
+        else:
+            result = await execute_command(
+                command,
+                cwd=cwd,
+                timeout=tool_def.timeout,
+                env=env,
+                max_output_bytes=self._config.max_output_bytes,
+                stdin_input=remaining_input if tool_def.input_mode == "stdin" else None,
+            )
+            output = _format_execution_result(result, tool_def)
+            await self._conn.session_update(
+                session_id=session_id,
+                update=update_agent_message(text_block(output)),
+            )
+
+        return PromptResponse(stop_reason="end_turn")
+
+
+def _extract_input_text_from_blocks(prompt: list[Any]) -> str:
+    """从 prompt 内容块列表里拼接所有 text/plain 文本。"""
+    parts: list[str] = []
+    for block in prompt:
+        text = block.get("text", "") if isinstance(block, dict) else getattr(block, "text", "")
+        if text:
+            parts.append(text)
+    return "\n".join(parts)
+
+
+def _resolve_tool(
+    input_text: str, tools_by_name: dict[str, "ToolDef"]
+) -> tuple["ToolDef | None", str]:
+    """从输入文本解析工具名，返回 (ToolDef, 剩余输入)。
+
+    支持两种写法：
+    - `tool=<name> <args...>`（显式指定）
+    - `<name> <args...>`（第一段当工具名）
+    """
+    stripped = input_text.strip()
+    if not stripped:
+        return None, ""
+
+    # tool=xxx 形式
+    if stripped.startswith("tool="):
+        head, _, rest = stripped.partition(" ")
+        name = head[len("tool="):].strip()
+        if name in tools_by_name:
+            return tools_by_name[name], rest.strip()
+        return None, stripped
+
+    # 第一段当工具名
+    first, _, rest = stripped.partition(" ")
+    if first in tools_by_name:
+        return tools_by_name[first], rest.strip()
+    return None, stripped
+
+
+def _format_execution_result(result: Any, tool_def: "ToolDef") -> str:
+    """把 executor.ExecutionResult 格式化成给 client 看的文本。"""
+    if result.timed_out:
+        return f"Error: Command timed out after {tool_def.timeout}s\n{result.stdout}"
+    if result.exit_code not in tool_def.allowed_exit_codes:
+        parts = []
+        if result.stdout:
+            parts.append(result.stdout)
+        if result.stderr:
+            parts.append(f"[stderr]\n{result.stderr}")
+        parts.append(f"Exit code: {result.exit_code}")
+        return "\n".join(parts)
+    return result.stdout or "(no output)"
+
+
+def build_agents(config: "ACPConfig", project_root: str) -> CLIToolAgent:
+    """创建承载所有 CLI 工具的 Zed ACP agent 实例。
+
+    Args:
+        config: ACP 配置（含 tools 列表）。
+        project_root: CLI 命令执行根目录。
+
+    Returns:
+        CLIToolAgent 实例，ready for acp.run_agent()。
+    """
+    return CLIToolAgent(config=config, project_root=project_root)

sycommon_python_lib-0.2.7a1/src/sycli/acp/server.py

@@ -0,0 +1,33 @@
+"""Zed ACP server bootstrap for sycli.
+
+启动一个 Zed ACP agent（stdio JSON-RPC），把 .sycli/acp.yaml 里声明的 CLI 工具
+作为该 agent 的能力暴露。照官方 examples/echo_agent.py 的 run_agent 模式。
+
+注意：Zed ACP 是 stdio 协议，不像旧 acp-sdk 走 HTTP/FastAPI/uvicorn。
+每个 CLI 工具不是独立的 agent，而是同一个 agent 用「会话内识别指令 → 路由到
+对应工具」的方式承载（一个 agent 进程，多工具）。
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from sycli.acp.registry import build_agents
+
+if TYPE_CHECKING:
+    from sycli.acp.config import ACPConfig
+
+
+def run_acp_server(config: ACPConfig, project_root: str) -> None:
+    """启动 Zed ACP agent（阻塞，直到 client 断开或收到关闭信号）。
+
+    Args:
+        config: ACP 配置（来自 .sycli/acp.yaml），含 tools 列表。
+        project_root: CLI 命令执行的根目录。
+    """
+    import asyncio
+
+    from acp import run_agent
+
+    agent = build_agents(config, project_root)
+    asyncio.run(run_agent(agent))

{sycommon_python_lib-0.2.6a14 → sycommon_python_lib-0.2.7a1}/src/sycli/cli.py

@@ -169,10 +169,8 @@ def _create_parser() -> argparse.ArgumentParser:
     cdp_sub.add_parser("interactive", help="Start interactive CDP REPL")
 
     # ── acp ──
-    p_acp = sub.add_parser("acp", help="Start ACP server exposing CLI tools as agents")
+    p_acp = sub.add_parser("acp", help="Start Zed ACP agent exposing CLI tools over stdio")
     p_acp.add_argument("--config", "-c", help="Path to ACP config file (default: .sycli/acp.yaml)")
-    p_acp.add_argument("--host", help="Override server host")
-    p_acp.add_argument("--port", "-p", type=int, help="Override server port")
     p_acp.add_argument("--project-root", "-r", default=".", help="Project root directory")
 
     # ── version ──

{sycommon_python_lib-0.2.6a14 → sycommon_python_lib-0.2.7a1}/src/sycli/commands/acp_cmd.py

@@ -1,7 +1,8 @@
-"""sycli acp command — start ACP server exposing CLI tools as agents."""
+"""sycli acp command — start a Zed ACP agent exposing CLI tools over stdio."""
 
 from __future__ import annotations
 
+import asyncio
 import signal
 import sys
 from pathlib import Path
@@ -17,10 +18,10 @@ def handle_acp(args) -> int:
         2. Load .sycli/acp.yaml (or --config path)
         3. Validate tool definitions
         4. Print registered agents summary
-        5. Start ACP server (blocking)
+        5. Start Zed ACP agent over stdio (blocking)
 
     Args:
-        args: Parsed argparse namespace with config, host, port, project_root.
+        args: Parsed argparse namespace with config, project_root.
 
     Returns:
         Exit code (0 for success, 1 for error).
@@ -28,22 +29,23 @@ def handle_acp(args) -> int:
     project_root = Path(args.project_root or ".").resolve()
     sycli_dir = project_root / ".sycli"
 
-    if not sycli_dir.exists():
-        error(".sycli/ not found. Run `sycli init` first.")
-        return 1
-
     # Determine config path
-    config_path = Path(args.config) if args.config else sycli_dir / "acp.yaml"
-    if not config_path.exists():
-        config_path = sycli_dir / "acp.json"
+    # 显式 --config 优先（允许指向任意位置，不强制 .sycli/）；
+    # 否则回退到 <project_root>/.sycli/acp.{yaml,json}
+    if args.config:
+        config_path = Path(args.config)
+    else:
+        config_path = sycli_dir / "acp.yaml"
+        if not config_path.exists():
+            config_path = sycli_dir / "acp.json"
 
     if not config_path.exists():
-        error(f"ACP config not found at {sycli_dir / 'acp.yaml'}")
+        if not args.config and not sycli_dir.exists():
+            error(".sycli/ not found. Run `sycli init` first, or 用 --config 指定外部配置。")
+        error(f"ACP config not found at {config_path}")
         error("Create one with your tool definitions. Example:")
         error("""
-  # .sycli/acp.yaml
-  host: "127.0.0.1"
-  port: 8100
+  # acp.yaml
   tools:
     - name: "git-status"
       command: "git"
@@ -62,33 +64,28 @@ def handle_acp(args) -> int:
         error(f"Failed to load ACP config: {e}")
         return 1
 
-    # Override port/host from CLI args
-    if args.host:
-        config.host = args.host
-    if args.port:
-        config.port = args.port
-
     if not config.tools:
         error("No tools defined in ACP config. Add tools to acp.yaml.")
         return 1
 
-    # Print summary
-    header("ACP Server Configuration")
-    info(f"Config:  {config_path}")
-    info(f"Host:    {config.host}")
-    info(f"Port:    {config.port}")
-    info(f"Agents:  {len(config.tools)} registered")
+    # Print summary to stderr（stdout 留给 stdio JSON-RPC）
+    header("Zed ACP Agent Configuration")
+    info(f"Config:   {config_path}")
+    info(f"Transport: stdio (JSON-RPC)")
+    info(f"Agents:   {len(config.tools)} CLI tools exposed")
     print()
     for tool in config.tools:
         desc = tool.description or "(no description)"
         info(f"  {tool.name}: {tool.command} {' '.join(tool.args) if tool.args else ''}")
         info(f"    {desc}")
     print()
+    print("-" * 60, file=sys.stderr)
+    info("Agent ready — waiting for ACP client on stdin/stdout...")
+    print("-" * 60, file=sys.stderr)
 
-    # Start server
+    # Start agent (stdio, blocking)
     from sycli.acp.server import run_acp_server
 
-    # Graceful shutdown on SIGINT
     _shutdown = False
 
     def _signal_handler(sig, frame):
@@ -96,18 +93,17 @@ def handle_acp(args) -> int:
         if _shutdown:
             sys.exit(1)
         _shutdown = True
-        warning("\nShutting down ACP server...")
+        warning("\nShutting down ACP agent...")
 
     signal.signal(signal.SIGINT, _signal_handler)
 
     try:
-        success(f"Starting ACP server on http://{config.host}:{config.port}")
         run_acp_server(config, str(project_root))
     except KeyboardInterrupt:
-        warning("ACP server stopped.")
+        warning("ACP agent stopped.")
         return 0
     except Exception as e:
-        error(f"ACP server failed: {e}")
+        error(f"ACP agent failed: {e}")
         import traceback
 
         traceback.print_exc()