agentengine-sdk-python 0.8.4__py3-none-any.whl → 0.8.6__py3-none-any.whl

ksadk/cli/cmd_invoke.py

@@ -18,7 +18,6 @@ import click
 
 from ksadk.api import AgentEngineAPIError, AgentEngineClient
 from ksadk.cli.agent_ref import merge_agent_inputs, resolve_agent_ref, resolve_openclaw_ref
-from ksadk.cli.invoke_payload import build_chat_request
 from ksadk.cli.cmd_files import (
     _build_sync_payload,
     _collect_local_files_report,
@@ -27,6 +26,7 @@ from ksadk.cli.cmd_files import (
     _normalize_workspace_dir,
     _push_workspace_files,
 )
+from ksadk.cli.invoke_payload import build_chat_request
 from ksadk.cli.resource_common import (
     CONTEXT_SETTINGS,
     CompatibilityAliasCommand,
@@ -36,6 +36,8 @@ from ksadk.hermes_terminal import run_hermes_terminal_session
 from ksadk.terminal_client import run_terminal_session
 from ksadk_runtime_common.workspace_files.constants import DEFAULT_WORKSPACE_MAX_UPLOAD_BYTES
 
+from ksadk.cli.invoke_content import _extract_content, _extract_response_content
+
 console: Any = None
 Markdown: Any = None
 Live: Any = None
@@ -583,6 +585,14 @@ def run_invoke_command(
 
     if message:
         # 单次调用模式
+        if not local and not _is_openclaw_target(next_state, latest_access) and not _is_hermes_target(next_state, latest_access):
+            from ksadk.cli.hosted_invoke import try_invoke_hosted_once
+
+            if try_invoke_hosted_once(
+                endpoint=endpoint, api_key=api_key, session_id=session_id,
+                message=message, model=model, insecure=insecure,
+            ):
+                return
         api_format_resolved = asyncio.run(
             _resolve_remote_api_format(
                 endpoint=endpoint,
@@ -1311,7 +1321,15 @@ async def _invoke_once(
                     last_refresh_time = 0.0
                     full_reasoning = ""
                     async for chunk in _stream_chat(
-                        endpoint, message, api_key, session_id, True, insecure, model, api_format, default_model
+                        endpoint,
+                        message,
+                        api_key,
+                        session_id,
+                        True,
+                        insecure,
+                        model,
+                        api_format,
+                        default_model,
                     ):
                         content, reasoning = _extract_content(chunk)
 
@@ -1341,7 +1359,15 @@ async def _invoke_once(
                     live.refresh()  # 确保最后一次刷新
             else:
                 async for chunk in _stream_chat(
-                    endpoint, message, api_key, session_id, True, insecure, model, api_format, default_model
+                    endpoint,
+                    message,
+                    api_key,
+                    session_id,
+                    True,
+                    insecure,
+                    model,
+                    api_format,
+                    default_model,
                 ):
                     content, reasoning = _extract_content(chunk)
                     if reasoning:
@@ -1359,7 +1385,7 @@ async def _invoke_once(
             else:
                 click.echo(content)
     except Exception as e:
-        click.secho(f"\n❌ 调用失败: {e}", fg="red")
+        raise click.ClickException(f"调用失败: {e}") from e
 
 
 async def _chat(
@@ -1469,87 +1495,37 @@ async def _stream_chat(
     async with httpx.AsyncClient(**client_kwargs) as client:
         async with client.stream("POST", url, json=payload, headers=headers) as response:
             response.raise_for_status()
-            try:
-                current_event = ""
-                # Use aiter_lines() for robust UTF-8 decoding and line splitting
-                async for line in response.aiter_lines():
-                    if not line:
-                        continue
-
-                    if line.startswith("event: "):
-                        current_event = line[7:].strip()
-                        continue
-
-                    if line.startswith("data: "):
-                        data_str = line[6:].strip()
-                        if data_str == "[DONE]":
-                            break
-
-                        try:
-                            data = json.loads(data_str)
-                            if not isinstance(data, dict):
-                                continue
-                            if current_event and isinstance(data, dict):
-                                data = {**data, "_event": current_event}
-                            # 直接 yield 解析后的 JSON 数据，让 _extract_content 处理
-                            yield data
-
-                            # Handle events/errors
-                            error = data.get("error")
-                            if error:
-                                click.secho(f"\nError: {error}", fg="red")
-
-                        except json.JSONDecodeError:
-                            pass
-            except Exception as e:
-                click.secho(f"\nStream error: {e}", fg="red")
-
-
-def _extract_content(chunk: dict) -> tuple[str, str]:
-    """从 OpenAI 流式响应中提取内容 (包含 reasoning_content)"""
-    event_name = str(chunk.get("_event") or "")
-    if event_name == "response.output_text.delta":
-        return str(chunk.get("delta") or ""), ""
-    if event_name == "response.reasoning.delta":
-        return "", str(chunk.get("delta") or "")
-    if event_name == "response.completed":
-        return "", ""
-
-    # OpenAI 格式: {"choices": [{"delta": {"content": "xxx", "reasoning_content": "thought"}}]}
-    try:
-        choices = chunk.get("choices", [])
-        if choices:
-            delta = choices[0].get("delta", {})
-            return delta.get("content", "") or "", delta.get("reasoning_content", "") or ""
-    except (KeyError, IndexError):
-        pass
-
-    if isinstance(chunk.get("output_text"), str):
-        return chunk["output_text"], ""
-    if isinstance(chunk.get("delta"), str):
-        return chunk["delta"], ""
-    return "", ""
-
-
-def _extract_response_content(response: dict) -> str:
-    """从 OpenAI 非流式响应中提取内容"""
-    output_text = response.get("output_text")
-    if output_text:
-        return str(output_text)
-    output = response.get("output") or []
-    for item in output:
-        if not isinstance(item, dict):
-            continue
-        for content in item.get("content") or []:
-            if isinstance(content, dict) and content.get("text"):
-                return str(content["text"])
-
-    # OpenAI 格式: {"choices": [{"message": {"content": "xxx"}}]}
-    try:
-        choices = response.get("choices", [])
-        if choices:
-            message = choices[0].get("message", {})
-            return str(message.get("content") or "")
-    except (KeyError, IndexError):
-        pass
-    return str(response)
+            current_event = ""
+            # Use aiter_lines() for robust UTF-8 decoding and line splitting
+            async for line in response.aiter_lines():
+                if not line:
+                    continue
+
+                if line.startswith("event: "):
+                    current_event = line[7:].strip()
+                    continue
+
+                if line.startswith("data: "):
+                    data_str = line[6:].strip()
+                    if data_str == "[DONE]":
+                        break
+
+                    try:
+                        data = json.loads(data_str)
+                        if not isinstance(data, dict):
+                            continue
+                        if current_event and isinstance(data, dict):
+                            data = {**data, "_event": current_event}
+                        event_type = current_event or data.get("type")
+                        response_payload = data.get("response")
+                        nested_error = (
+                            response_payload.get("error")
+                            if isinstance(response_payload, dict) else None
+                        )
+                        error = data.get("error") or nested_error
+                        if error or event_type in {"error", "response.failed"}:
+                            raise RuntimeError(str(error or data.get("message") or event_type))
+                        yield data
+
+                    except json.JSONDecodeError:
+                        pass

ksadk/cli/cmd_openclaw.py

@@ -46,6 +46,7 @@ from ksadk.cli.error_utils import abort_with_cli_error, remote_error, resolution
 from ksadk.cli.model_catalog import fetch_provider_model_catalog, find_model_in_catalog
 from ksadk.cli.network_options import build_network_payload, network_cli_kwargs, network_options
 from ksadk.cli.resource_common import (
+    build_component_config,
     CONTEXT_SETTINGS,
     ResourceActionDescriptor,
     ResourceDescriptor,
@@ -271,6 +272,7 @@ def _build_openclaw_update_payload(
     network_payload: dict[str, Any] | None,
     include_env: bool,
     include_storage: bool,
+    component_config: dict[str, Any] | None = None,
 ):
     """构建已有 OpenClaw 的最小更新请求，默认保留服务端现有配置。"""
     update_payload: dict[str, Any] = {
@@ -290,6 +292,8 @@ def _build_openclaw_update_payload(
         update_payload["storage"] = storage_config
     if network_payload:
         update_payload["network"] = network_payload
+    if component_config:
+        update_payload["component_config"] = component_config
     return update_payload
 
 
@@ -430,7 +434,7 @@ def _strip_provider_prefix(provider_id: str, model_id: str) -> str:
 def _default_openclaw_model_inputs(provider_id: str, model_id: str) -> list[str]:
     if str(provider_id or "").strip().lower() == "ksyun" and str(
         model_id or ""
-    ).strip().lower() in {"glm-5.1", "glm-5.2"}:
+    ).strip().lower() in {"deepseek-v4.1-flash", "glm-5.3-flash"}:
         return ["text"]
     return ["text", "image"]
 
@@ -2952,6 +2956,9 @@ def channel_doctor(
     "--storage-mount-path", default=None, help="PVC 挂载目录（默认: /home/node/.openclaw）"
 )
 @click.option("--no-storage", is_flag=True, help="禁用默认 PVC 挂载")
+@click.option("--skill-space-id", "skill_space_ids", multiple=True, help="Skill 中心空间 ID（可重复传入多个）")
+@click.option("--sandbox-template-id", default=None, help="沙箱模板 ID（启用 E2B 沙箱执行 execute_skills）")
+@click.option("--sandbox-api-key", default=None, help="沙箱 API Key（可选，默认从服务端注入）")
 @click.option(
     "--agent-id",
     "agent_id_opt",
@@ -2987,6 +2994,9 @@ def deploy(
     subnet_id: Optional[str],
     security_group_id: Optional[str],
     availability_zone: Optional[str],
+    skill_space_ids: tuple[str, ...],
+    sandbox_template_id: Optional[str],
+    sandbox_api_key: Optional[str],
     dry_run: bool,
 ):
     """部署 OpenClaw 到云端
@@ -3052,6 +3062,9 @@ def deploy(
                 mem0_region=mem0_region,
                 extra_env=extra_env,
                 env_file=env_file,
+                skill_space_ids=skill_space_ids,
+                sandbox_template_id=sandbox_template_id,
+                sandbox_api_key=sandbox_api_key,
                 storage_size_gi=storage_size_gi,
                 storage_mount_path=storage_mount_path,
                 no_storage=no_storage,
@@ -3101,6 +3114,9 @@ async def _deploy_openclaw(
     subnet_id: Optional[str] = None,
     security_group_id: Optional[str] = None,
     availability_zone: Optional[str] = None,
+    skill_space_ids: tuple[str, ...] = (),
+    sandbox_template_id: str | None = None,
+    sandbox_api_key: str | None = None,
     dry_run: bool,
 ):
     """异步部署 OpenClaw"""
@@ -3233,6 +3249,13 @@ async def _deploy_openclaw(
         "auth_type": "None",
         "inbound_identity_auth": "None",
     }
+    component_config = build_component_config(
+        skill_space_ids=skill_space_ids,
+        sandbox_template_id=sandbox_template_id,
+        sandbox_api_key=sandbox_api_key,
+    )
+    if component_config:
+        request_data["component_config"] = component_config
     if memory_config:
         request_data["memory_config"] = memory_config
     storage_config = build_storage_config(
@@ -3307,6 +3330,7 @@ async def _deploy_openclaw(
                     network_payload=network_payload,
                     include_env=include_env_on_update,
                     include_storage=include_storage_on_update,
+                    component_config=component_config,
                 )
                 await client.update_agent(existing_agent_id, update_payload)
             else:
@@ -3364,6 +3388,7 @@ async def _deploy_openclaw(
                         network_payload=network_payload,
                         include_env=include_env_on_update,
                         include_storage=include_storage_on_update,
+                        component_config=component_config,
                     )
                     res = await client.update_agent(existing_agent_id, update_payload)
                     agent_id = existing_agent_id

ksadk/cli/cmd_plugin.py

@@ -41,10 +41,9 @@ def _codex_home() -> Path:
 
 
 def _dsh_home() -> Path:
-    configured = os.environ.get(DSH_HOME_ENV, "").strip()
-    if configured:
-        return Path(configured).expanduser()
-    return Path.cwd() / ".agentkit" / "dsh-home"
+    from ksadk.plugins.dsh_home import studio_dsh_home
+
+    return studio_dsh_home(Path.cwd())
 
 
 def _dsh_command() -> tuple[str, ...] | None:
@@ -125,14 +124,24 @@ def _call_codex(operation):
         )
 
 
-def _call_dsh(operation):
+def _call_dsh(operation, *, write: bool = False):
     """Run one bounded DSH Profile lifecycle request from the synchronous CLI."""
 
     from ksadk.plugins.bridges.dsh import DshProfilePluginBridge
+    from ksadk.plugins.dsh_home import (
+        DshHomeVersionError,
+        dsh_home_diagnostic,
+        prepare_studio_dsh_home,
+    )
 
     try:
+        home = _dsh_home()
+        # The bridge creates Profile lock directories even for catalog reads.
+        # Fence a fresh home first; an existing legacy catalog remains readable.
+        if write or dsh_home_diagnostic(home)["status"] == "new":
+            prepare_studio_dsh_home(home)
         with DshProfilePluginBridge(
-            dsh_home=_dsh_home(),
+            dsh_home=home,
             profile=_dsh_profile(),
             dsh_command=_dsh_command(),
         ) as bridge:
@@ -140,7 +149,30 @@ def _call_dsh(operation):
     except (KeyboardInterrupt, SystemExit):
         raise
     except Exception as err:
+        if isinstance(err, DshHomeVersionError):
+            abort_with_cli_error(
+                CLIError(
+                    code=err.code,
+                    message=f"DSH 目录版本未经验证。{err.diagnostic['recovery']}",
+                    exit_code=EXIT_CODE_VALIDATION,
+                    details=err.diagnostic,
+                ),
+                context="Plugin",
+            )
         name = type(err).__name__
+        if name == "DshToolchainUnavailableError":
+            abort_with_cli_error(
+                CLIError(
+                    code="dsh_toolchain_unavailable",
+                    message="DSH 插件开发工具链不可用",
+                    exit_code=EXIT_CODE_VALIDATION,
+                    details={
+                        "hint": "运行 `agentengine plugin toolchain install` 安装受管理 DSH 工具链",
+                        "reason": str(err),
+                    },
+                ),
+                context="Plugin",
+            )
         code = (
             "dsh_plugin_not_found"
             if name == "DshPluginNotFoundError"
@@ -165,6 +197,7 @@ def _call_dsh(operation):
                 exit_code=(
                     EXIT_CODE_RESOLUTION if code == "dsh_plugin_not_found" else EXIT_CODE_VALIDATION
                 ),
+                details={"reason": str(err)},
             ),
             context="Plugin",
         )
@@ -173,6 +206,8 @@ def _call_dsh(operation):
 def _call_dsh_developer(operation):
     """Run one bounded standard DSH bundle development operation."""
 
+    import re
+
     from ksadk.plugins.dsh_toolchain import (
         DshPluginPackError,
         DshPluginSourceError,
@@ -182,8 +217,28 @@ def _call_dsh_developer(operation):
         DshToolchainVersionMismatchError,
     )
 
+    _VERSION_PAIR = re.compile(
+        r"expected (?:pnpm|DSH) (?P<expected>[0-9A-Za-z.\-]+), got (?P<actual>[0-9A-Za-z.\-]+)"
+    )
+
+    def _toolchain_error_details(err: Exception) -> dict:
+        details: dict = {}
+        if isinstance(err, DshToolchainVersionMismatchError):
+            match = _VERSION_PAIR.search(str(err))
+            if match:
+                details["expected"] = match.group("expected")
+                details["actual"] = match.group("actual")
+            details["hint"] = (
+                "使用 corepack 启用固定版本 pnpm（corepack enable 后重试），"
+                "或安装 pnpm 11.7.0 并设置 AGENTENGINE_PNPM_BIN 指向该可执行文件"
+            )
+        elif isinstance(err, DshToolchainUnavailableError):
+            details["hint"] = "运行 `agentengine plugin toolchain install` 安装受管理 DSH 工具链"
+        return details
+
     try:
         return operation()
+
     except (KeyboardInterrupt, SystemExit):
         raise
     except Exception as err:
@@ -211,6 +266,7 @@ def _call_dsh_developer(operation):
         stage = getattr(err, "stage", None)
         if isinstance(stage, str) and stage:
             details["stage"] = stage
+        details.update(_toolchain_error_details(err))
         diagnostic = getattr(err, "diagnostic", None)
         if isinstance(err, DshPluginSourceError):
             diagnostic = str(err)
@@ -533,7 +589,7 @@ def install_dsh_plugin(source: str, accept_host_permissions: bool) -> None:
             context="Plugin",
         )
     host, item = _call_dsh(
-        lambda bridge: bridge.install_plugin(source, accept_host_permissions=True)
+        lambda bridge: bridge.install_plugin(source, accept_host_permissions=True), write=True
     )
     payload = {
         "item": _dsh_inventory_payload(item),
@@ -550,7 +606,7 @@ def install_dsh_plugin(source: str, accept_host_permissions: bool) -> None:
 def enable_dsh_plugin(plugin_name: str) -> None:
     """在 DSH Profile 中启用已安装的 bundle。"""
 
-    host, item = _call_dsh(lambda bridge: bridge.set_enabled(plugin_name, enabled=True))
+    host, item = _call_dsh(lambda bridge: bridge.set_enabled(plugin_name, enabled=True), write=True)
     payload = {
         "item": _dsh_inventory_payload(item),
         "host": {"id": host.host_id, "version": host.version, "available": True},
@@ -566,7 +622,9 @@ def enable_dsh_plugin(plugin_name: str) -> None:
 def disable_dsh_plugin(plugin_name: str) -> None:
     """从 DSH Profile 组合中停用 bundle，但保留已安装包。"""
 
-    host, item = _call_dsh(lambda bridge: bridge.set_enabled(plugin_name, enabled=False))
+    host, item = _call_dsh(
+        lambda bridge: bridge.set_enabled(plugin_name, enabled=False), write=True
+    )
     payload = {
         "item": _dsh_inventory_payload(item),
         "host": {"id": host.host_id, "version": host.version, "available": True},
@@ -597,7 +655,7 @@ def update_dsh_plugin(plugin_name: str, accept_host_permissions: bool) -> None:
             context="Plugin",
         )
     host, item = _call_dsh(
-        lambda bridge: bridge.update_plugin(plugin_name, accept_host_permissions=True)
+        lambda bridge: bridge.update_plugin(plugin_name, accept_host_permissions=True), write=True
     )
     payload = {
         "item": _dsh_inventory_payload(item),
@@ -614,7 +672,7 @@ def update_dsh_plugin(plugin_name: str, accept_host_permissions: bool) -> None:
 def uninstall_dsh_plugin(plugin_name: str) -> None:
     """从 DSH Profile 卸载一个 bundle。"""
 
-    host, _ = _call_dsh(lambda bridge: bridge.uninstall_plugin(plugin_name))
+    host, _ = _call_dsh(lambda bridge: bridge.uninstall_plugin(plugin_name), write=True)
     payload = {
         "ecosystem": "dsh",
         "integrationMode": "bridged",
@@ -634,7 +692,7 @@ def uninstall_dsh_plugin(plugin_name: str) -> None:
 def dsh_profile_info() -> None:
     """预检并显示当前 DSH Profile 的无 Secret 配置摘要。"""
 
-    host, projection = _call_dsh(lambda bridge: bridge.project_profile())
+    host, projection = _call_dsh(lambda bridge: bridge.project_profile(), write=True)
     payload = {
         "profile": projection.model_dump(mode="json", by_alias=True),
         "host": {"id": host.host_id, "version": host.version, "available": True},