sandrpod-cli 0.2.2__tar.gz → 0.2.4__tar.gz

{sandrpod_cli-0.2.2 → sandrpod_cli-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sandrpod-cli
-Version: 0.2.2
+Version: 0.2.4
 Summary: Command-line client for SandrPod — self-hosted, multi-cloud sandbox infrastructure for AI agents
 License: MIT
 Project-URL: Homepage, https://github.com/sandrpod/sandrpod

{sandrpod_cli-0.2.2 → sandrpod_cli-0.2.4}/sandrpod_cli/client.py

@@ -15,13 +15,21 @@ class CLIClient:
         api_url: str = "http://localhost:8080",
         timeout: int = 30,
         token: Optional[str] = None,
+        mcp_token: Optional[str] = None,
     ):
         self.api_url = api_url.rstrip("/")
         self.timeout = timeout
+        self.mcp_token = mcp_token
         self.session = requests.Session()
-        # Only set Authorization in session headers; Content-Type is set per-request
-        # so that multipart/form-data uploads can override it automatically.
+        # Two-tier auth (see docs MCP_AUTH_HEADER_CONFLICT_FIX): the platform token
+        # goes in X-Sandrpod-Token, the server's preferred header. Authorization:
+        # Bearer is kept as a legacy fallback for older servers — but crucially it
+        # stays free to carry the *personal* mcp_token through to the sandbox's
+        # agent bridge on /mcp calls (the server passes Authorization through the
+        # tunnel untouched). Content-Type is set per-request so multipart uploads
+        # can override it.
         if token:
+            self.session.headers["X-Sandrpod-Token"] = token
             self.session.headers["Authorization"] = f"Bearer {token}"
 
     def _request(self, method: str, path: str, timeout: int = None, **kwargs) -> requests.Response:
@@ -321,7 +329,13 @@ class CLIClient:
         """沙箱原生 MCP bridge 的实时清单 (聚合 server、工具数、配置文件路径)"""
         # /mcp (not /toolbox/mcp): the streaming bridge proxy, which flushes SSE —
         # the path a real MCP client uses. Works for poder + agent sandboxes.
-        resp = self._request("GET", f"/api/v1/sandboxes/{name}/mcp/manifest")
+        # When the agent guards its bridge with a personal mcp_token, carry it in
+        # Authorization: Bearer — the server auths via X-Sandrpod-Token and passes
+        # this through to the agent's mcpTokenMiddleware untouched.
+        headers = {}
+        if self.mcp_token:
+            headers["Authorization"] = f"Bearer {self.mcp_token}"
+        resp = self._request("GET", f"/api/v1/sandboxes/{name}/mcp/manifest", headers=headers)
         return resp.json()
 
     def mcp_url(self, name: str) -> str:

{sandrpod_cli-0.2.2 → sandrpod_cli-0.2.4}/sandrpod_cli/main.py

@@ -61,6 +61,20 @@ def get_configured_token():
     return config.get("api_token")
 
 
+def get_configured_mcp_token():
+    """获取个人 MCP token（agent bridge 的共享密钥），优先级：环境变量 > 配置文件。
+
+    仅用于 /mcp 相关调用（mcp tools/url），当员工机 agent 以 --mcp-token 启动、
+    对 /mcp 面加了共享密钥时需要。它作为 Authorization: Bearer 透传给 agent 校验，
+    与平台 token（X-Sandrpod-Token）互不冲突。
+    """
+    env_token = os.environ.get("SANDRPOD_MCP_TOKEN")
+    if env_token:
+        return env_token
+    config = load_config()
+    return config.get("mcp_token")
+
+
 def save_config_api_url(url):
     """保存 API URL 到配置文件"""
     config = load_config()
@@ -78,15 +92,18 @@ def save_config_token(token):
 @click.group()
 @click.option("--api-url", default=None, help="API URL (overrides config)")
 @click.option("--timeout", default=30, help="Request timeout")
+@click.option("--mcp-token", default=None, help="个人 MCP token（agent bridge 共享密钥；也可用 SANDRPOD_MCP_TOKEN）")
 @click.pass_context
-def cli(ctx, api_url, timeout):
+def cli(ctx, api_url, timeout, mcp_token):
     """SandrPod CLI - Sandbox Management"""
     ctx.ensure_object(dict)
     # 如果没有传入 --api-url，使用配置的 URL
     if api_url is None:
         api_url = get_configured_api_url()
     token = get_configured_token()
-    ctx.obj["client"] = CLIClient(api_url=api_url, timeout=timeout, token=token)
+    if mcp_token is None:
+        mcp_token = get_configured_mcp_token()
+    ctx.obj["client"] = CLIClient(api_url=api_url, timeout=timeout, token=token, mcp_token=mcp_token)
 
 
 # ========== Config Commands ==========
@@ -945,7 +962,13 @@ def _kv(pairs):
 
 
 def _mcp_config_path(client, name, override):
-    """mcp.json 路径: --config-path > manifest.config_path > 默认 (跨 poder/agent 自适应)"""
+    """mcp.json 路径: --config-path > manifest.config_path > 按 substrate 猜默认。
+
+    优先用 bridge 在 /mcp/manifest 里自报的绝对路径(精确;需较新的
+    agent/toolbox)。旧 bridge 不报 config_path 时按 substrate 回退:
+    poder(容器)沙箱用 /workspace/.sandrpod/mcp.json,direct agent(本机)
+    用 ~/.sandrpod/mcp.json(agent 的 DefaultConfigPath)。
+    """
     if override:
         return override
     try:
@@ -954,6 +977,12 @@ def _mcp_config_path(client, name, override):
             return manifest["config_path"]
     except Exception:
         pass
+    try:
+        sb = client.get_sandbox(name)
+        if str(sb.get("proxy_url", "")).startswith("direct://"):
+            return os.path.expanduser("~/.sandrpod/mcp.json")
+    except Exception:
+        pass
     return DEFAULT_MCP_CONFIG
 
 
@@ -1082,12 +1111,14 @@ def mcp_rm(ctx, name, server, config_path):
 @click.argument("name")
 @click.pass_context
 def mcp_url(ctx, name):
-    """打印沙箱原生 MCP 端点 URL (给 Claude/Cursor 等 MCP 客户端连接)"""
+    """打印沙箱原生 MCP 端点 URL + 连接所需的两层鉴权头"""
     client = ctx.parent.parent.obj["client"]
     click.echo(client.mcp_url(name))
-    auth = client.auth_header()
-    if auth:
-        click.echo(f"# 连接时带鉴权头: Authorization: {auth}", err=True)
+    # 两层鉴权(见 MCP_AUTH_HEADER_CONFLICT_FIX):平台 token 走 X-Sandrpod-Token,
+    # 个人 MCP token 走 Authorization: Bearer(server 原样透传给 agent 校验)。
+    click.echo("# 连接头(两层鉴权):", err=True)
+    click.echo("#   X-Sandrpod-Token: <平台 token>", err=True)
+    click.echo("#   Authorization: Bearer <个人 mcp_token>   (仅当 agent 以 -mcp-token 启动时需要)", err=True)
 
 
 @mcp_group.command(name="tools")

{sandrpod_cli-0.2.2 → sandrpod_cli-0.2.4}/sandrpod_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sandrpod-cli
-Version: 0.2.2
+Version: 0.2.4
 Summary: Command-line client for SandrPod — self-hosted, multi-cloud sandbox infrastructure for AI agents
 License: MIT
 Project-URL: Homepage, https://github.com/sandrpod/sandrpod

{sandrpod_cli-0.2.2 → sandrpod_cli-0.2.4}/setup.py

@@ -10,7 +10,7 @@ long_description = _readme.read_text(encoding="utf-8") if _readme.exists() else
 
 setup(
     name="sandrpod-cli",
-    version="0.2.2",
+    version="0.2.4",
     description=(
         "Command-line client for SandrPod — self-hosted, multi-cloud sandbox "
         "infrastructure for AI agents"