@qingflow-tech/qingflow-cli 1.1.39 → 1.1.40

package/README.md

@@ -7,7 +7,7 @@ Qingflow CLI 是轻流面向开发者和 AI Agent 的命令行工具。它把轻
 ## 安装
 
 ```bash
-npm install @qingflow-tech/qingflow-cli@1.1.39
+npm install @qingflow-tech/qingflow-cli@1.1.40
 ```
 
 推荐从官网复制这一条一键安装 Qingflow CLI：
@@ -21,7 +21,7 @@ npx qingflow-cli@latest install
 ## 运行
 
 ```bash
-npx -y -p @qingflow-tech/qingflow-cli@1.1.39 qingflow
+npx -y -p @qingflow-tech/qingflow-cli@1.1.40 qingflow
 ```
 
 全局安装后可以直接运行：
@@ -55,7 +55,7 @@ qingflow-skills install --agent codex --scope user
 如果你通过一次性 `npx -p` 执行 skills 安装，建议加 `--copy`，避免 symlink 指向 npm 临时执行缓存：
 
 ```bash
-npx -y -p @qingflow-tech/qingflow-cli@1.1.39 qingflow-skills install --agent codex --scope user --copy
+npx -y -p @qingflow-tech/qingflow-cli@1.1.40 qingflow-skills install --agent codex --scope user --copy
 ```
 
 `qingflow-skills install` 默认使用 symlink，且遇到同名 skill 不会覆盖；只有显式传入 `--force` 才会替换。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qingflow-tech/qingflow-cli",
-  "version": "1.1.39",
+  "version": "1.1.40",
   "description": "Human-friendly Qingflow command line interface for auth, record operations, import, tasks, and stable builder flows.",
   "license": "MIT",
   "type": "module",

package/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "qingflow-mcp"
-version = "1.1.39"
+version = "1.1.40"
 description = "User-authenticated MCP server for Qingflow"
 readme = "README.md"
 license = "MIT"

package/src/qingflow_mcp/builder_facade/service.py

@@ -294,8 +294,8 @@ class AiBuilderFacade:
         self.directory = directory
         self.solutions = solutions
 
-    def _with_backend_context(self, profile: str, handler):
-        return self.apps._run(profile, lambda _session_profile, context: handler(context))
+    def _with_backend_context(self, profile: str, handler, *, tool_name: str = "搭建后台上下文"):
+        return self.apps._run(profile, lambda _session_profile, context: handler(context), tool_name=tool_name)
 
     def _read_app_base_raw_direct(self, *, profile: str, app_key: str) -> JSONObject:
         return self._with_backend_context(
@@ -7392,7 +7392,7 @@ class AiBuilderFacade:
             )
             return _normalize_associated_resources_payload(payload, include_raw=include_raw)
 
-        return self.apps._run(profile, runner)
+        return self.apps._run(profile, runner, tool_name="关联资源读取")
 
     def _match_field_index_for_app(self, *, profile: str, app_key: str) -> dict[int, dict[str, Any]]:
         state = self._load_base_schema_state(profile=profile, app_key=app_key)
@@ -7466,7 +7466,7 @@ class AiBuilderFacade:
             result = self.apps.backend.request("POST", context, f"/app/{app_key}/asosChart", json_body=payload)
             return result if isinstance(result, dict) else {"result": result}
 
-        return self.apps._run(profile, runner)
+        return self.apps._run(profile, runner, tool_name="关联资源创建")
 
     def _associated_resource_update(
         self,
@@ -7489,21 +7489,21 @@ class AiBuilderFacade:
             result = self.apps.backend.request("POST", context, f"/app/{app_key}/asosChart/{associated_item_id}", json_body=payload)
             return result if isinstance(result, dict) else {"result": result}
 
-        return self.apps._run(profile, runner)
+        return self.apps._run(profile, runner, tool_name="关联资源更新")
 
     def _associated_resource_delete(self, *, profile: str, app_key: str, associated_item_id: int) -> JSONObject:
         def runner(_: Any, context: BackendRequestContext) -> JSONObject:
             result = self.apps.backend.request("DELETE", context, f"/app/{app_key}/asosChart/{associated_item_id}")
             return result if isinstance(result, dict) else {"result": result}
 
-        return self.apps._run(profile, runner)
+        return self.apps._run(profile, runner, tool_name="关联资源删除")
 
     def _associated_resource_reorder(self, *, profile: str, app_key: str, associated_item_ids: list[int]) -> JSONObject:
         def runner(_: Any, context: BackendRequestContext) -> JSONObject:
             result = self.apps.backend.request("POST", context, f"/app/{app_key}/asosChart/ordinal", json_body=list(associated_item_ids))
             return result if isinstance(result, dict) else {"result": result}
 
-        return self.apps._run(profile, runner)
+        return self.apps._run(profile, runner, tool_name="关联资源排序")
 
     def _update_view_associated_resources_config(
         self,
@@ -13246,7 +13246,7 @@ class AiBuilderFacade:
                     params={"beingDraft": True},
                 )
 
-            self.buttons._run(profile, runner)
+            self.buttons._run(profile, runner, tool_name="自定义按钮删除校验")
         except (QingflowApiError, RuntimeError) as error:
             api_error = _coerce_api_error(error)
             if _delete_readback_is_not_found(api_error):

package/src/qingflow_mcp/server_cloud.py

@@ -6,15 +6,20 @@ from typing import Any
 
 import anyio
 import uvicorn
+from mcp.server.fastmcp import FastMCP
 
 from .backend_client import BackendClient
 from .cloud_auth import CloudAuthBroker
 from .cloud_context import current_cloud_context
 from .config import get_cloud_http_allowed_hosts, get_cloud_http_host, get_cloud_http_port
 from .errors import QingflowApiError, is_auth_like_error
+from .server_app_builder import build_builder_server
 from .server_app_user import build_user_server
 
 
+BUILDER_TOOL_PREFIX = "builder_"
+
+
 ASGIApp = Callable[
     [
         dict[str, Any],
@@ -94,6 +99,7 @@ class CloudMcpAuthApp:
 
         token = current_cloud_context.set(cloud_context)
         try:
+            scope = _ensure_streamable_http_accept(scope)
             await self._app(scope, receive, send)
         finally:
             current_cloud_context.reset(token)
@@ -160,16 +166,67 @@ class LazyCloudApp:
         send: Callable[[dict[str, Any]], Awaitable[None]],
     ) -> None:
         if self._app is None:
-            self._app = build_cloud_user_app()
+            self._app = build_cloud_app()
         await self._app(scope, receive, send)
 
 
 def build_cloud_user_app() -> CloudMcpAuthApp:
-    server = build_user_server()
+    return build_cloud_app()
+
+
+def build_cloud_app() -> CloudMcpAuthApp:
+    server = build_combined_server()
     broker = CloudAuthBroker.from_config(backend=BackendClient())
     return CloudMcpAuthApp(server.streamable_http_app(), broker)
 
 
+def build_combined_server() -> FastMCP:
+    server = build_user_server()
+    builder_server = build_builder_server()
+    server._mcp_server.name = "Qingflow Combined MCP"
+    _register_prefixed_builder_tools(server, builder_server)
+    _set_combined_instructions(server, builder_server)
+    return server
+
+
+def _register_prefixed_builder_tools(target_server: FastMCP, builder_server: FastMCP) -> None:
+    for original_name, tool in builder_server._tool_manager._tools.items():
+        target_server._tool_manager.add_tool(
+            tool.fn,
+            name=f"{BUILDER_TOOL_PREFIX}{original_name}",
+            title=tool.title,
+            description=tool.description,
+            annotations=tool.annotations,
+            icons=tool.icons,
+            meta=tool.meta,
+        )
+
+
+def _set_combined_instructions(user_server: FastMCP, builder_server: FastMCP) -> None:
+    user_instructions = user_server.instructions or ""
+    builder_instructions = builder_server.instructions or ""
+    user_server._mcp_server.instructions = f"""Use this combined Qingflow MCP server for both user operational workflows and builder workflows.
+
+## Tool Namespaces
+
+User tools keep their original names, such as `app_get`, `record_list`, `task_list`, `portal_get`,
+and `chart_get`.
+Builder tools are exposed with the `{BUILDER_TOOL_PREFIX}` prefix. For example, Builder `app_get` is
+`builder_app_get`, Builder `view_get` is `builder_view_get`, and Builder `builder_tool_contract` is
+`builder_builder_tool_contract`.
+When reading the Builder workflow instructions below, add `{BUILDER_TOOL_PREFIX}` to every Builder tool
+name before calling it.
+
+## User Workflows
+
+{user_instructions}
+
+## Builder Workflows
+
+{builder_instructions}
+"""
+
+
 def _extract_host(scope: dict[str, Any]) -> str:
     for key, value in scope.get("headers", []):
         if key.lower() == b"host":
@@ -222,11 +279,40 @@ def _rewrite_host(scope: dict[str, Any], internal_host: str) -> dict[str, Any]:
     return rewritten
 
 
+def _ensure_streamable_http_accept(scope: dict[str, Any]) -> dict[str, Any]:
+    existing_values: list[str] = []
+    headers_without_accept: list[tuple[bytes, bytes]] = []
+    for key, value in scope.get("headers", []):
+        if key.lower() == b"accept":
+            existing_values.append(value.decode("latin1"))
+        else:
+            headers_without_accept.append((key, value))
+
+    required = ["application/json", "text/event-stream"]
+    merged_values = [value.strip() for value in ",".join(existing_values).split(",") if value.strip()]
+    normalized_media_types = {
+        value.split(";", 1)[0].strip().lower()
+        for value in merged_values
+    }
+    if not merged_values or "*/*" in normalized_media_types:
+        merged_values = list(required)
+    else:
+        for media_type in required:
+            if media_type not in normalized_media_types:
+                merged_values.append(media_type)
+
+    rewritten = dict(scope)
+    rewritten["headers"] = headers_without_accept + [
+        (b"accept", ", ".join(merged_values).encode("latin1"))
+    ]
+    return rewritten
+
+
 app = LazyCloudApp()
 
 
 def main() -> None:
-    uvicorn.run(build_cloud_user_app(), host=get_cloud_http_host(), port=get_cloud_http_port())
+    uvicorn.run(build_cloud_app(), host=get_cloud_http_host(), port=get_cloud_http_port())
 
 
 if __name__ == "__main__":