@qingflow-tech/qingflow-cli 1.1.61-beta.4 → 1.1.61

package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/summary.json

@@ -136,10 +136,10 @@
           ]
         }
       ],
-      "description": "字段选择器;用于定位应用的数据标题、数据封面、自定义编号取值来源或其他配置引用的字段。至少提供 queId 或 name,两者同时提供时必须指向同一字段。后端允许同父级同名字段,queId 是稳定身份;name 仅在唯一时可解析,命中多个同名时报 AMBIGUOUS_FIELD_SELECTOR,此时必须改用 queId。",
+      "description": "字段选择器;用于定位应用的数据标题、数据封面、自定义编号取值来源或其他配置引用的字段。至少提供 queId 或 name,两者同时提供时必须指向同一字段。",
       "properties": {
         "name": {
-          "description": "字段名称;仅在当前作用域内唯一时可用于解析,同名命中多个字段时报 AMBIGUOUS_FIELD_SELECTOR,应改用 queId。",
+          "description": "字段名称;仅在当前作用域内唯一时可用于解析。",
           "minLength": 1,
           "type": "string"
         },
@@ -258,9 +258,13 @@
           "type": "array"
         },
         "width": {
-          "description": "字段在所在行的宽度百分比(1-100 整数);后端不校验总和与取值,存量数据存在 33/34 等三等分布值。",
-          "maximum": 100,
-          "minimum": 1,
+          "description": "字段在所在行的宽度百分比;只能选择 25、50、75 或 100。",
+          "enum": [
+            25,
+            50,
+            75,
+            100
+          ],
           "type": "integer"
         }
       },
@@ -330,10 +334,11 @@
           "description": "段落判别值。"
         },
         "rows": {
-          "description": "段落内的有序字段行;可为空数组(空 = 存量空段落形态,后端容忍,round-trip 空↔空稳定)。",
+          "description": "段落内的非空有序字段行。",
           "items": {
             "$ref": "#/$defs/FieldRow"
           },
+          "minItems": 1,
           "type": "array"
         },
         "sectionId": {
@@ -378,6 +383,7 @@
             ],
             "type": "object"
           },
+          "minItems": 1,
           "type": "array"
         },
         "sectionId": {
@@ -689,7 +695,6 @@
   "x-qingflow-supported-field-types": [
     "text",
     "long_text",
-    "rich_text",
     "number",
     "amount",
     "link",

package/src/qingflow_mcp/builder_facade/service.py

@@ -163,14 +163,9 @@ FIELD_TYPE_TO_QUESTION_TYPE: dict[str, int] = {
     FieldType.relation.value: 25,
 }
 
-# code_block / q_linker 输出目标字段类型。后端写链无类型白名单(FormSvcImpl 原样
-# 落库),运行时 DataSvcImpl.getAnswerValueByString:attachment 按拆分 URL 写入、
-# subtable 整表组装(均有专门分支),rich_text/data_relation 走 Question.canImport
-# 兜底按字符串写入(不报错)——四者为存量合法配置,与 validator 侧白名单同口径。
 INTEGRATION_OUTPUT_TARGET_FIELD_TYPES: tuple[str, ...] = (
     FieldType.text.value,
     FieldType.long_text.value,
-    "rich_text",
     FieldType.number.value,
     FieldType.amount.value,
     FieldType.date.value,
@@ -178,9 +173,6 @@ INTEGRATION_OUTPUT_TARGET_FIELD_TYPES: tuple[str, ...] = (
     FieldType.single_select.value,
     FieldType.multi_select.value,
     FieldType.boolean.value,
-    FieldType.attachment.value,
-    "data_relation",
-    FieldType.subtable.value,
 )
 
 MATCH_TYPE_ACCURACY = 1
@@ -23245,23 +23237,6 @@ def _apply_field_mutation(field: dict[str, Any], mutation: Any) -> None:
         field.pop("_question_rebuild_required", None)
 
 
-class AmbiguousFieldSelector(ValueError):
-    """name-only selector 命中多个同名字段。
-
-    方案 A(duplicate-field-name):后端以 queId 为字段身份、允许同父级同名;
-    name 命中多个字段时禁止静默取第一个,必须显式失败并给出候选 queId。
-    compiler 包装层(app_form)把它转写为 AMBIGUOUS_FIELD_SELECTOR 错误码。
-    """
-
-    def __init__(self, location: str, candidates: list[int]) -> None:
-        self.location = location
-        self.candidates = candidates
-        super().__init__(
-            f"{location} matches multiple fields with the same name; "
-            f"use queId to disambiguate (candidate queIds: {sorted(candidates)})"
-        )
-
-
 def _resolve_field_selector_with_uniqueness(
     *,
     fields: list[dict[str, Any]],
@@ -23277,12 +23252,7 @@ def _resolve_field_selector_with_uniqueness(
         name = str(selector.name or "").strip()
         matched = [field for field in fields if str(field.get("name") or "").strip() == name]
         if len(matched) > 1:
-            candidate_ids = [
-                ref
-                for candidate in matched
-                if (ref := _coerce_any_int(candidate.get("que_id"))) is not None
-            ]
-            raise AmbiguousFieldSelector(location, candidate_ids)
+            raise ValueError(f"{location} matched multiple fields with the same name; use field_id or que_id")
     else:
         matched = []
     if len(matched) != 1:
@@ -29962,14 +29932,6 @@ def _build_view_update_payload(
         payload["viewgraphType"] = "calendarView"
         payload["beingShowTitleQue"] = True
         payload.pop("groupQueId", None)
-    elif normalized_type == "hierarchy":
-        payload["viewgraphType"] = "hierarchyView"
-        payload["beingShowTitleQue"] = True
-        payload.pop("groupQueId", None)
-    elif normalized_type == "calendar":
-        payload["viewgraphType"] = "calendarView"
-        payload["beingShowTitleQue"] = True
-        payload.pop("groupQueId", None)
     return _hydrate_view_backend_payload(
         payload=payload,
         view_type=normalized_type,

package/src/qingflow_mcp/cli/main.py

@@ -7,22 +7,11 @@ import sys
 from typing import Any, Callable, TextIO
 
 from ..errors import QingflowApiError, backend_code_value_int, message_looks_like_invalid_token
-from ..public_surface import (
-    NON_TOOL_CLI_HANDLER_ROUTES,
-    cli_public_tool_spec_from_namespace,
-    cli_route_from_namespace,
-    cli_trim_key_from_namespace,
-)
+from ..public_surface import cli_public_tool_spec_from_namespace
 from ..resource_uri import cli_resource_base_url
 from ..response_trim import resolve_cli_tool_name, trim_error_response, trim_public_response
 from ..tools.ai_builder_tools import _attach_builder_apply_envelope
 from ..version import get_cli_version, get_cli_version_info
-from ..tool_policy import (
-    TOOL_POLICY_ENV,
-    TOOL_POLICY_INVALID,
-    ToolPolicyViolation,
-    parse_tool_policy,
-)
 from .context import CliContext, build_cli_context
 from .formatters import emit_json_result, emit_text_result
 from .commands import register_all_commands
@@ -101,14 +90,6 @@ def run(
     if handler is None:
         parser.print_help(out)
         return 2
-    violation = _cli_tool_policy_violation(args)
-    if violation is not None:
-        return _emit_error(
-            violation.payload(),
-            json_mode=bool(args.json),
-            stdout=out,
-            stderr=err,
-        )
     try:
         if _should_force_json_output(args):
             setattr(args, "json", True)
@@ -141,20 +122,6 @@ def run(
     return exit_code
 
 
-def _cli_tool_policy_violation(args: argparse.Namespace) -> ToolPolicyViolation | None:
-    stable_id = cli_trim_key_from_namespace(args)
-    if stable_id is None:
-        # 仅显式登记的非业务分发器可跳过闸门；无子命令的新增 handler 也必须默认拒绝。
-        if cli_route_from_namespace(args) in NON_TOOL_CLI_HANDLER_ROUTES:
-            return None
-        return ToolPolicyViolation(
-            TOOL_POLICY_INVALID,
-            "user:unregistered",
-            "CLI 业务命令未登记稳定工具 ID",
-        )
-    return parse_tool_policy(os.getenv(TOOL_POLICY_ENV)).violation_for(stable_id)
-
-
 def _handle_version(_args: argparse.Namespace, _context: CliContext) -> dict[str, Any]:
     info = get_cli_version_info()
     return {

package/src/qingflow_mcp/cloud_context.py

@@ -2,14 +2,11 @@ from __future__ import annotations
 
 from contextvars import ContextVar
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, Callable
+from typing import Callable
 
 from .backend_client import BackendRequestContext
 from .session_store import BackendSession, SessionProfile
 
-if TYPE_CHECKING:
-    from .tool_policy import ToolPolicySnapshot
-
 
 CLOUD_PROFILE_NAME = "__cloud_mcp__"
 
@@ -76,15 +73,3 @@ current_call_platform: ContextVar[str] = ContextVar(
     "qingflow_mcp_current_call_platform",
     default="",
 )
-
-# 远端 MCP 每个 HTTP 请求独立绑定策略原文；缺头用 None 表示，不回退进程环境变量。
-current_tool_policy_header: ContextVar[str | None] = ContextVar(
-    "qingflow_mcp_current_tool_policy_header",
-    default=None,
-)
-
-# 在 HTTP 入口合成一次快照，列表与调用共用，避免将 URL 选择保存到会话或共享环境。
-current_http_tool_policy: ContextVar[ToolPolicySnapshot | None] = ContextVar(
-    "qingflow_mcp_current_http_tool_policy",
-    default=None,
-)

package/src/qingflow_mcp/public_surface.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import argparse
 from argparse import Namespace
 from dataclasses import dataclass
 
@@ -110,7 +109,6 @@ USER_PUBLIC_TOOL_SPECS: tuple[PublicToolSpec, ...] = (
     PublicToolSpec(USER_DOMAIN, "record_export_direct", ("record_export_direct",), ("export", "direct"), cli_show_effective_context=True),
     PublicToolSpec(USER_DOMAIN, "record_code_block_run", ("record_code_block_run",), ("record", "code-block-run"), cli_show_effective_context=True, cli_context_write=True),
     PublicToolSpec(USER_DOMAIN, "task_list", ("task_list",), ("task", "list"), cli_show_effective_context=True),
-    PublicToolSpec(USER_DOMAIN, "task_workbench", cli_route=("task",), mcp_public=False),
     PublicToolSpec(USER_DOMAIN, "task_get", ("task_get",), ("task", "get"), cli_show_effective_context=True),
     PublicToolSpec(USER_DOMAIN, "task_action_execute", ("task_action_execute",), ("task", "action"), cli_show_effective_context=True, cli_context_write=True),
     PublicToolSpec(
@@ -132,12 +130,12 @@ USER_PUBLIC_TOOL_SPECS: tuple[PublicToolSpec, ...] = (
 
 
 BUILDER_PUBLIC_TOOL_SPECS: tuple[PublicToolSpec, ...] = (
-    PublicToolSpec(BUILDER_DOMAIN, "auth_use_credential", ("auth_use_credential",), cli_public=False),
-    PublicToolSpec(BUILDER_DOMAIN, "auth_whoami", ("auth_whoami",), cli_public=False),
-    PublicToolSpec(BUILDER_DOMAIN, "auth_logout", ("auth_logout",), cli_public=False),
+    PublicToolSpec(BUILDER_DOMAIN, "auth_use_credential", ("auth_use_credential",), ("builder", "auth", "use-credential"), cli_public=False),
+    PublicToolSpec(BUILDER_DOMAIN, "auth_whoami", ("auth_whoami",), ("builder", "auth", "whoami"), cli_public=False),
+    PublicToolSpec(BUILDER_DOMAIN, "auth_logout", ("auth_logout",), ("builder", "auth", "logout"), cli_public=False),
     PublicToolSpec(BUILDER_DOMAIN, "get_login_link", ("get_login_link",), mcp_public=True, cli_public=False),
-    PublicToolSpec(BUILDER_DOMAIN, "workspace_list", ("workspace_list",), cli_public=False),
-    PublicToolSpec(BUILDER_DOMAIN, "workspace_get", ("workspace_get",), cli_public=False),
+    PublicToolSpec(BUILDER_DOMAIN, "workspace_list", ("workspace_list",), ("builder", "workspace", "list"), cli_public=False),
+    PublicToolSpec(BUILDER_DOMAIN, "workspace_get", ("workspace_get",), ("builder", "workspace", "get"), cli_public=False),
     PublicToolSpec(BUILDER_DOMAIN, "file_upload_local", ("file_upload_local",), ("builder", "file", "upload-local"), has_contract=True, cli_show_effective_context=True, cli_context_write=True),
     PublicToolSpec(BUILDER_DOMAIN, "feedback_submit", ("feedback_submit",), ("builder", "feedback", "submit"), has_contract=True),
     PublicToolSpec(BUILDER_DOMAIN, "builder_tool_contract", ("builder_tool_contract",), ("builder", "contract"), has_contract=False),
@@ -196,8 +194,7 @@ PUBLIC_TOOL_BY_KEY: dict[str, PublicToolSpec] = {spec.trim_key: spec for spec in
 PUBLIC_TOOL_BY_CLI_ROUTE: dict[tuple[str, ...], PublicToolSpec] = {
     spec.cli_route: spec
     for spec in ALL_PUBLIC_TOOL_SPECS
-    # 隐藏命令仍有可达 handler，闸门绑定不能把“帮助不可见”误当成“不可执行”。
-    if spec.cli_route is not None
+    if spec.cli_public and spec.cli_route is not None
 }
 PUBLIC_TOOL_BY_CLI_ROUTE.update(
     {
@@ -208,9 +205,6 @@ PUBLIC_TOOL_BY_CLI_ROUTE.update(
     }
 )
 
-# 这些 handler 只负责版本输出或参数迁移提示，不会发起轻流业务请求。
-NON_TOOL_CLI_HANDLER_ROUTES = frozenset({("version",), ("record", "schema")})
-
 
 def public_tool_specs(domain: str | None = None) -> tuple[PublicToolSpec, ...]:
     if domain is None:
@@ -264,13 +258,11 @@ def cli_route_from_namespace(args: Namespace) -> tuple[str, ...] | None:
         record_command = getattr(args, "record_command", None)
         if record_command == "schema":
             schema_command = getattr(args, "record_schema_command", None)
-            if isinstance(schema_command, str) and schema_command:
-                return (command, "schema", schema_command)
-            return (command, "schema")
+            return (command, "schema", schema_command) if isinstance(schema_command, str) and schema_command else None
         return (command, record_command) if isinstance(record_command, str) and record_command else None
     if command == "task":
         task_command = getattr(args, "task_command", None)
-        return (command, task_command) if isinstance(task_command, str) and task_command else (command,)
+        return (command, task_command) if isinstance(task_command, str) and task_command else None
     if command != "builder":
         child_attr = f"{command}_command"
         child = getattr(args, child_attr, None)
@@ -291,54 +283,3 @@ def cli_route_from_namespace(args: Namespace) -> tuple[str, ...] | None:
     child_attr = f"builder_{builder_command.replace('-', '_')}_command"
     child = getattr(args, child_attr, None)
     return ("builder", builder_command, child) if isinstance(child, str) and child else None
-
-
-def discover_cli_handler_routes(
-    parser: argparse.ArgumentParser,
-) -> dict[tuple[str, ...], tuple[str, ...]]:
-    """从 argparse 实际 handler 树枚举规范化路由及其实现，包含中间交互入口。"""
-    discovered: dict[tuple[str, ...], set[str]] = {}
-
-    def walk(current: argparse.ArgumentParser, path: tuple[str, ...], inherited: dict[str, object]) -> None:
-        attrs = dict(inherited)
-        for action in current._actions:
-            if isinstance(action, argparse._SubParsersAction):
-                continue
-            if action.dest != argparse.SUPPRESS and action.default != argparse.SUPPRESS:
-                attrs.setdefault(action.dest, action.default)
-        attrs.update(current._defaults)
-
-        handler = current._defaults.get("handler")
-        if callable(handler):
-            variants = [attrs]
-            for action in current._actions:
-                if isinstance(action, argparse._SubParsersAction) or action.choices is None:
-                    continue
-                variants.extend({**attrs, action.dest: choice} for choice in action.choices)
-            for variant in variants:
-                route = cli_route_from_namespace(Namespace(**variant))
-                if route is None:
-                    route = _normalize_cli_parser_path(path)
-                if route:
-                    identity = f"{handler.__module__}:{handler.__qualname__}"
-                    discovered.setdefault(route, set()).add(identity)
-
-        for action in current._actions:
-            if not isinstance(action, argparse._SubParsersAction):
-                continue
-            for name, child in action.choices.items():
-                next_attrs = dict(attrs)
-                next_attrs[action.dest] = name
-                walk(child, path + (name,), next_attrs)
-
-    walk(parser, (), {})
-    return {route: tuple(sorted(handlers)) for route, handlers in discovered.items()}
-
-
-def _normalize_cli_parser_path(path: tuple[str, ...]) -> tuple[str, ...]:
-    normalized = list(path)
-    if normalized and normalized[0] == "build":
-        normalized[0] = "builder"
-    if len(normalized) > 1 and normalized[0] == "builder" and normalized[1] == "associated-resources":
-        normalized[1] = "associated-resource"
-    return tuple(normalized)

package/src/qingflow_mcp/response_trim.py

@@ -51,9 +51,8 @@ COMMON_ERROR_DROP_TOP = {
 
 SUCCESS_POLICY_BY_TOOL: dict[str, TransformFn] = {}
 
-#: 这些校验命令的产出契约明确包含 ok 字段（供阶段 2 SKILL.md 引用），
+#: 这两个校验命令的产出契约明确包含 ok 字段（供阶段 2 SKILL.md 引用），
 #: 需在 success 裁剪时保留 ok（默认 COMMON_SUCCESS_DROP_TOP 会丢弃 ok）。
-#: `builder:app_views_validate`（views 声明式校验）同属校验类工具，ok 同样进产出契约。
 _KEEP_OK_TOOLS = {
     "builder:app_form_validate_formula",
     "builder:app_form_validate_code_block",

package/src/qingflow_mcp/server.py

@@ -2,6 +2,8 @@ from __future__ import annotations
 
 from datetime import date
 
+from mcp.server.fastmcp import FastMCP
+
 from .backend_client import BackendClient
 from .session_store import SessionStore
 from .tools.app_tools import AppTools
@@ -24,11 +26,9 @@ from .tools.task_context_tools import TaskContextTools
 from .tools.view_tools import ViewTools
 from .tools.workflow_tools import WorkflowTools
 from .tools.workspace_tools import WorkspaceTools
-from .tool_catalog import stdio_server_bindings
-from .tool_policy import PolicyAwareFastMCP, configure_tool_policy
 
 
-def _register_missing_builder_tools(server: PolicyAwareFastMCP) -> None:
+def _register_missing_builder_tools(server: FastMCP) -> None:
     """Add current high-level builder tools to the unified MCP without duplicate names."""
     from .server_app_builder import build_builder_server
 
@@ -48,10 +48,10 @@ def _register_missing_builder_tools(server: PolicyAwareFastMCP) -> None:
         )
 
 
-def build_server() -> PolicyAwareFastMCP:
+def build_server() -> FastMCP:
     today = date.today()
     current_year = today.year
-    server = PolicyAwareFastMCP(
+    server = FastMCP(
         "Qingflow MCP",
         instructions=f"""Use this unified server for Qingflow operational and builder workflows. Current date: `{today.isoformat()}`.
 
@@ -259,14 +259,8 @@ If the current MCP capability is unsupported, the workflow is awkward, or the us
     WorkflowTools(sessions, backend).register(server)
     ViewTools(sessions, backend).register(server)
     SolutionTools(sessions, backend).register(server)
-    # 保存补齐 Builder 前的真实注册来源，裸名冲突只能绑定最终保留 callable 的来源域。
-    legacy_tool_names = set(server._tool_manager._tools)
     _register_missing_builder_tools(server)
-    return configure_tool_policy(
-        server,
-        stdio_server_bindings(legacy_tool_names, server._tool_manager._tools),
-        source="environment",
-    )
+    return server
 
 
 mcp = build_server()

package/src/qingflow_mcp/server_app_builder.py

@@ -2,6 +2,8 @@ from __future__ import annotations
 
 import json
 
+from mcp.server.fastmcp import FastMCP
+
 from .backend_client import BackendClient
 from .config import DEFAULT_PROFILE
 from .response_trim import BUILDER_SERVER_METHOD_MAP, trim_error_response, trim_public_response, wrap_trimmed_methods
@@ -12,8 +14,6 @@ from .tools.auth_tools import AuthTools
 from .tools.feedback_tools import FeedbackTools
 from .tools.file_tools import FileTools
 from .tools.workspace_tools import WorkspaceTools
-from .tool_catalog import builder_server_bindings
-from .tool_policy import PolicyAwareFastMCP, configure_tool_policy
 
 
 def _config_failure(message: str, *, fix_hint: str) -> dict:
@@ -27,8 +27,8 @@ def _config_failure(message: str, *, fix_hint: str) -> dict:
     }
 
 
-def build_builder_server() -> PolicyAwareFastMCP:
-    server = PolicyAwareFastMCP(
+def build_builder_server() -> FastMCP:
+    server = FastMCP(
         "Qingflow App Builder MCP",
         instructions=(
             "Use this server for AI-native Qingflow builder workflows. "
@@ -689,11 +689,7 @@ def build_builder_server() -> PolicyAwareFastMCP:
             expected_package_id=expected_package_id,
         )
 
-    return configure_tool_policy(
-        server,
-        builder_server_bindings(server._tool_manager._tools),
-        source="environment",
-    )
+    return server
 
 
 def main() -> None:

package/src/qingflow_mcp/server_app_user.py

@@ -3,6 +3,8 @@ from __future__ import annotations
 import json
 from datetime import date
 
+from mcp.server.fastmcp import FastMCP
+
 from .backend_client import BackendClient
 from .config import DEFAULT_PROFILE
 from .response_trim import USER_SERVER_METHOD_MAP, trim_error_response, trim_public_response, wrap_trimmed_methods
@@ -20,14 +22,12 @@ from .tools.login_link_tools import LOGIN_LINK_DESCRIPTION, LoginLinkTools
 from .tools.resource_read_tools import ResourceReadTools
 from .tools.task_context_tools import TaskContextTools
 from .tools.workspace_tools import WorkspaceTools
-from .tool_catalog import user_server_bindings
-from .tool_policy import PolicyAwareFastMCP, configure_tool_policy
 
 
-def build_user_server(*, stateless_http: bool = False) -> PolicyAwareFastMCP:
+def build_user_server(*, stateless_http: bool = False) -> FastMCP:
     today = date.today()
     current_year = today.year
-    server = PolicyAwareFastMCP(
+    server = FastMCP(
         "Qingflow App User MCP",
         stateless_http=stateless_http,
         instructions=f"""Use this server for Qingflow operational workflows. Current date: `{today.isoformat()}`.
@@ -507,11 +507,7 @@ If the current MCP capability is unsupported, the workflow is awkward, or the us
     task_context_tools.register(server)
     directory_tools.register_frontend_search(server)
 
-    return configure_tool_policy(
-        server,
-        user_server_bindings(server._tool_manager._tools),
-        source="request" if stateless_http else "environment",
-    )
+    return server
 
 
 mcp = build_user_server()

package/src/qingflow_mcp/server_cloud.py

@@ -6,15 +6,11 @@ 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 (
-    CloudMcpContext,
-    current_call_platform,
-    current_cloud_context,
-    current_http_tool_policy,
-    current_tool_policy_header,
-)
+from .cloud_context import CloudMcpContext, current_call_platform, current_cloud_context
 from .cloud_oauth_proxy import (
     CloudOAuthProxyConfig,
     OAuthAccessTokenResolver,
@@ -25,8 +21,6 @@ from .config import get_cloud_http_allowed_hosts, get_cloud_http_host, get_cloud
 from .errors import QingflowApiError, is_auth_like_error
 from .server_app_builder import build_builder_server
 from .server_app_user import build_user_server
-from .tool_catalog import combined_server_bindings
-from .tool_policy import PolicyAwareFastMCP, configure_tool_policy, parse_http_tool_policy
 
 
 BUILDER_TOOL_PREFIX = "builder_"
@@ -170,18 +164,12 @@ class CloudMcpAuthApp:
                 cloud_context.token,
             )
 
-        tool_policy_header = _extract_header(scope, "x-qingflow-tool-policy")
-        http_tool_policy = parse_http_tool_policy(tool_policy_header, bytes(scope.get("query_string") or b""))
         context_token = current_cloud_context.set(cloud_context)
         call_platform_token = current_call_platform.set(call_platform)
-        tool_policy_token = current_tool_policy_header.set(tool_policy_header)
-        http_tool_policy_token = current_http_tool_policy.set(http_tool_policy)
         try:
             scope = _ensure_streamable_http_accept(scope)
             await self._app(scope, receive, send)
         finally:
-            current_http_tool_policy.reset(http_tool_policy_token)
-            current_tool_policy_header.reset(tool_policy_token)
             current_call_platform.reset(call_platform_token)
             current_cloud_context.reset(context_token)
 
@@ -409,29 +397,16 @@ def build_cloud_app() -> CloudMcpAuthApp:
     )
 
 
-def build_combined_server() -> PolicyAwareFastMCP:
+def build_combined_server() -> FastMCP:
     server = build_user_server(stateless_http=True)
     builder_server = build_builder_server()
-    user_tool_names = set(server._tool_manager._tools)
-    builder_tool_names = set(builder_server._tool_manager._tools)
     server._mcp_server.name = "Qingflow Combined MCP"
     _register_prefixed_builder_tools(server, builder_server)
     _set_combined_instructions(server, builder_server)
-    return configure_tool_policy(
-        server,
-        combined_server_bindings(
-            user_tool_names,
-            builder_tool_names,
-            builder_prefix=BUILDER_TOOL_PREFIX,
-        ),
-        source="request",
-    )
+    return server
 
 
-def _register_prefixed_builder_tools(
-    target_server: PolicyAwareFastMCP,
-    builder_server: PolicyAwareFastMCP,
-) -> None:
+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,
@@ -444,10 +419,7 @@ def _register_prefixed_builder_tools(
         )
 
 
-def _set_combined_instructions(
-    user_server: PolicyAwareFastMCP,
-    builder_server: PolicyAwareFastMCP,
-) -> None:
+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.
@@ -482,14 +454,6 @@ def _extract_host(scope: dict[str, Any]) -> str:
     return ""
 
 
-def _extract_header(scope: dict[str, Any], name: str) -> str | None:
-    expected = name.lower().encode("latin1")
-    for key, value in scope.get("headers", []):
-        if key.lower() == expected:
-            return value.decode("utf-8", errors="replace")
-    return None
-
-
 async def _read_request_body(
     receive: Callable[[], Awaitable[dict[str, Any]]],
     limit: int,