@qingflow-tech/qingflow-cli 1.1.47-beta.5 → 1.1.48

package/src/qingflow_mcp/server_app_user.py

@@ -10,7 +10,6 @@ from .config import DEFAULT_PROFILE
 from .response_trim import USER_SERVER_METHOD_MAP, trim_error_response, trim_public_response, wrap_trimmed_methods
 from .session_store import SessionStore
 from .tools.app_tools import AppTools
-from .tools.data_tools import DataTools
 from .tools.auth_tools import AuthTools
 from .tools.code_block_tools import CodeBlockTools
 from .tools.directory_tools import DirectoryTools
@@ -34,15 +33,12 @@ def build_user_server(*, stateless_http: bool = False) -> FastMCP:
 
 ## 页面交接
 
-创建、修改或安装轻流资源后，最终回复主动提供主要结果的可点击页面入口，无需等待用户再次索要。采用“完成结果 + 查看入口”，文案使用“在轻流中查看应用／应用包／视图”，不默认称为“继续编辑”。用户明确要求查看或打开页面时也适用以下规则。
-默认只交付用户请求的主要结果：安装方案默认提供应用包入口；直接创建或修改应用、视图时提供对应入口；用户明确要求多个主要对象时分别提供。使用业务结果中的稳定 `uri`，按 URI 去重，不为全部子资源预签票据。
-主要对象没有可靠 URI 时说明限制，不猜地址，也不替换为不相关页面。部分成功时仅交付已确认成功且可定位的主要结果，保留失败或未验证说明。纯数据问答、中间读取、失败资源和删除操作不自动签发；用户明确要求不提供链接时遵从。
+用户需要查看结果、继续编辑、处理业务或进入工作区页面时，使用 `get_login_link`；纯数据查询不自动签发链接。
 目标路径由业务工具或领域 Skill 根据真实前端路由确定，不由票据工具根据业务标识推导。
 已知目标传可选 `redirect_path`；明确指定页面但路径未知时继续定位或说明限制，不猜测，也不静默改为首页。
 搜索未命中时继续搜索 `login` 或查看服务工具列表，不擅自打开固定正式站点；鉴权或工具失败时如实说明。
-目标浏览器登录态未知时，默认用资源 URI 的同源 pathname 调用 `get_login_link`，为每个实际展示的入口分别签发，不额外追问登录态；只有已有用户确认同一浏览器、网页域名、账号和工作区已登录且无失效信号的事实时，才直接交付稳定 URI。调用过票据工具、自动化浏览器已登录或之前签发过票据均不能证明用户浏览器已登录，已消费链接也不能复用。
-临近交付时再签发，使用返回的完整 URL。用户未要求打开时仅交付，不提前消费；要求“打开”时才调用浏览器。签发失败时说明免登录链接未生成，并提供标注“需登录”的稳定 URI 作为备用入口，不重做业务操作。机器结果继续保留稳定 URI，临时登录链接仅用于面向用户交付。
-浏览器不可用时提供可点击链接，不假称已经打开，不展示工作区数字 ID 或原始 JSON。
+临近交付时再签发，使用返回的完整 URL。要求“给我链接”时仅交付，不提前消费；要求“打开”时才调用浏览器。
+浏览器不可用时提供可点击链接；用“查看记录”“继续编辑”等文案，不展示工作区数字 ID 或原始 JSON。
 链接约 5 分钟内一次性有效，不能作为长期书签；安全验证及原有业务权限不变。
 
 ## App Discovery
@@ -243,7 +239,6 @@ If the current MCP capability is unsupported, the workflow is awkward, or the us
     backend = BackendClient()
     auth = wrap_trimmed_methods(AuthTools(sessions, backend), USER_SERVER_METHOD_MAP)
     apps = wrap_trimmed_methods(AppTools(sessions, backend), USER_SERVER_METHOD_MAP)
-    data_tools = wrap_trimmed_methods(DataTools(sessions, backend), USER_SERVER_METHOD_MAP)
     workspace = wrap_trimmed_methods(WorkspaceTools(sessions, backend), USER_SERVER_METHOD_MAP)
     file_tools = wrap_trimmed_methods(FileTools(sessions, backend), USER_SERVER_METHOD_MAP)
     imports = wrap_trimmed_methods(ImportTools(sessions, backend), USER_SERVER_METHOD_MAP)
@@ -397,8 +392,6 @@ If the current MCP capability is unsupported, the workflow is awkward, or the us
     def app_get(profile: str = DEFAULT_PROFILE, app_key: str = "") -> dict:
         return apps.app_get(profile=profile, app_key=app_key)
 
-    data_tools.register(server)
-
     @server.tool()
     def portal_list(profile: str = DEFAULT_PROFILE) -> dict:
         return resources.portal_list(profile=profile)

package/src/qingflow_mcp/tools/ai_builder_tools.py

@@ -20,7 +20,6 @@ from ..public_surface import public_builder_contract_tool_names
 from ..config import DEFAULT_PROFILE
 from ..errors import QingflowApiError, backend_code_int, backend_code_value_int
 from ..json_types import JSONObject
-from ..resource_uri import try_build_resource_uri
 from ..builder_facade.models import (
     AssociatedResourcesApplyRequest,
     ChartApplyRequest,
@@ -188,26 +187,6 @@ class AiBuilderTools(ToolBase):
             registry=app_form_schema_registry(),
         )
 
-    def _selected_ws_id(self, profile: str) -> int:
-        session_profile, _backend_session, _context = self._require_context(profile, require_workspace=True)
-        assert session_profile.selected_ws_id is not None
-        return session_profile.selected_ws_id
-
-    def _attach_apply_envelope(self, profile: str, tool_name: str, payload: JSONObject) -> JSONObject:
-        result = _attach_builder_apply_envelope(tool_name, payload)
-        eligible = [
-            item
-            for item in result.get("resources") or []
-            if isinstance(item, dict)
-            and item.get("resource_type") in {"package", "app", "view"}
-            and str(item.get("status") or "").lower()
-            not in {"failed", "pending", "planned", "readback_pending", "pending_readback", "unknown", "removed"}
-            and str(item.get("operation") or "").lower() not in {"failed", "removed", "planned"}
-        ]
-        if eligible:
-            _attach_builder_resource_uris(result, eligible, ws_id=self._selected_ws_id(profile))
-        return result
-
     def _apply_app_batch(self, *, tool_name: str, profile: str, apps: list[JSONObject], apply_one) -> JSONObject:
         started_at = time.perf_counter()
         batch_item_apply_ms = 0
@@ -220,7 +199,7 @@ class AiBuilderTools(ToolBase):
                 child_total_ms=child_total_ms,
                 total_ms=_elapsed_ms(started_at),
             )
-            return self._attach_apply_envelope(profile, tool_name, payload)
+            return _attach_builder_apply_envelope(tool_name, payload)
 
         if not isinstance(apps, list) or not apps:
             return finish(
@@ -862,30 +841,16 @@ class AiBuilderTools(ToolBase):
         being_draft: bool = False,
     ) -> JSONObject:
         """Read a canonical draft or published AppForm resource."""
-        result = self._app_form.get(
+        return self._app_form.get(
             profile=profile,
             app_key=app_key,
             schema_version=schema_version,
             being_draft=being_draft,
         )
-        if result.get("status") == "success":
-            _attach_uri(result, result, ws_id=self._selected_ws_id(profile), resource_type="app", app_key=app_key)
-        return result
 
     def app_form_apply(self, *, profile: str, spec: JSONObject) -> JSONObject:
         """Reconcile one complete declarative AppForm target."""
-        result = self._app_form.apply(profile=profile, spec=spec)
-        if result.get("appKey") and (
-            str(result.get("status") or "") == "success" or result.get("createdAppPreserved") is True
-        ):
-            _attach_uri(
-                result,
-                result,
-                ws_id=self._selected_ws_id(profile),
-                resource_type="app",
-                app_key=result.get("appKey"),
-            )
-        return result
+        return self._app_form.apply(profile=profile, spec=spec)
 
     def app_form_evaluate_formula(
         self,
@@ -952,24 +917,12 @@ class AiBuilderTools(ToolBase):
     def package_list(self, *, profile: str, trial_status: str = "all", query: str = "") -> JSONObject:
         """执行分组与包相关逻辑。"""
         normalized_args = {"trial_status": trial_status, "query": query}
-        result = _safe_tool_call(
+        return _safe_tool_call(
             lambda: self._facade.package_list(profile=profile, trial_status=trial_status, query=query),
             error_code="PACKAGE_LIST_FAILED",
             normalized_args=normalized_args,
             suggested_next_call={"tool_name": "package_list", "arguments": {"profile": profile, "trial_status": trial_status, "query": query}},
         )
-        if result.get("status") == "success":
-            ws_id = self._selected_ws_id(profile)
-            for item in result.get("items") or []:
-                if isinstance(item, dict):
-                    _attach_uri(
-                        item,
-                        result,
-                        ws_id=ws_id,
-                        resource_type="package",
-                        package_id=item.get("package_id"),
-                    )
-        return result
 
     def package_resolve(self, *, profile: str, package_name: str) -> JSONObject:
         """执行分组与包相关逻辑。"""
@@ -1109,23 +1062,12 @@ class AiBuilderTools(ToolBase):
     def package_get(self, *, profile: str, package_id: int | None = None) -> JSONObject:
         """执行分组与包相关逻辑。"""
         normalized_args = {"package_id": package_id}
-        result = _publicize_package_fields(_safe_tool_call(
+        return _publicize_package_fields(_safe_tool_call(
             lambda: self._facade.package_get(profile=profile, package_id=package_id),
             error_code="PACKAGE_GET_FAILED",
             normalized_args=normalized_args,
             suggested_next_call={"tool_name": "package_get", "arguments": {"profile": profile, "package_id": package_id}},
         ))
-        if result.get("status") == "success":
-            ws_id = self._selected_ws_id(profile)
-            _attach_uri(
-                result,
-                result,
-                ws_id=ws_id,
-                resource_type="package",
-                package_id=result.get("package_id"),
-            )
-            _attach_package_item_uris(result.get("items"), result, ws_id=ws_id)
-        return result
 
     def package_apply(
         self,
@@ -1155,7 +1097,7 @@ class AiBuilderTools(ToolBase):
             try:
                 visibility_patch = VisibilityPatch.model_validate(visibility)
             except ValidationError as exc:
-                return self._attach_apply_envelope(profile,
+                return _attach_builder_apply_envelope(
                     "package_apply",
                     _visibility_validation_failure(str(exc), tool_name="package_apply", exc=exc),
                 )
@@ -1166,7 +1108,7 @@ class AiBuilderTools(ToolBase):
             creating=package_id is None and bool(str(package_name or "").strip()),
         )
         if icon_failure is not None:
-            return self._attach_apply_envelope(profile, "package_apply", icon_failure)
+            return _attach_builder_apply_envelope("package_apply", icon_failure)
         normalized_args = {
             "package_id": package_id,
             **({"package_name": package_name} if str(package_name or "").strip() else {}),
@@ -1191,7 +1133,7 @@ class AiBuilderTools(ToolBase):
             normalized_args=normalized_args,
             suggested_next_call={"tool_name": "package_apply", "arguments": {"profile": profile, **normalized_args}},
         ))
-        return self._attach_apply_envelope(profile, "package_apply", result)
+        return _attach_builder_apply_envelope("package_apply", result)
 
     def package_update(
         self,
@@ -1245,7 +1187,7 @@ class AiBuilderTools(ToolBase):
             "being_copy_data": being_copy_data,
             "solution_source": solution_source,
         }
-        result = _safe_tool_call(
+        return _safe_tool_call(
             lambda: self._facade.solution_install(
                 profile=profile,
                 solution_key=solution_key,
@@ -1256,7 +1198,6 @@ class AiBuilderTools(ToolBase):
             normalized_args=normalized_args,
             suggested_next_call={"tool_name": "solution_install", "arguments": {"profile": profile, **normalized_args}},
         )
-        return self._attach_apply_envelope(profile, "solution_install", result)
 
     def member_search(
         self,
@@ -1453,7 +1394,7 @@ class AiBuilderTools(ToolBase):
         try:
             request = CustomButtonsApplyRequest.model_validate(raw_request)
         except ValidationError as exc:
-            return self._attach_apply_envelope(profile, "app_custom_buttons_apply", _validation_failure(
+            return _attach_builder_apply_envelope("app_custom_buttons_apply", _validation_failure(
                 str(exc),
                 tool_name="app_custom_buttons_apply",
                 exc=exc,
@@ -1477,7 +1418,7 @@ class AiBuilderTools(ToolBase):
                 },
             ))
         normalized_args = request.model_dump(mode="json")
-        return self._attach_apply_envelope(profile, "app_custom_buttons_apply", _safe_tool_call(
+        return _attach_builder_apply_envelope("app_custom_buttons_apply", _safe_tool_call(
             lambda: self._facade.app_custom_buttons_apply(profile=profile, request=request),
             error_code="CUSTOM_BUTTONS_APPLY_FAILED",
             normalized_args=normalized_args,
@@ -1534,7 +1475,7 @@ class AiBuilderTools(ToolBase):
         try:
             request = AssociatedResourcesApplyRequest.model_validate(raw_request)
         except ValidationError as exc:
-            return self._attach_apply_envelope(profile, "app_associated_resources_apply", _validation_failure(
+            return _attach_builder_apply_envelope("app_associated_resources_apply", _validation_failure(
                 str(exc),
                 tool_name="app_associated_resources_apply",
                 exc=exc,
@@ -1563,7 +1504,7 @@ class AiBuilderTools(ToolBase):
                 },
             ))
         normalized_args = request.model_dump(mode="json", exclude_none=True)
-        return self._attach_apply_envelope(profile, "app_associated_resources_apply", _safe_tool_call(
+        return _attach_builder_apply_envelope("app_associated_resources_apply", _safe_tool_call(
             lambda: self._facade.app_associated_resources_apply(profile=profile, request=request),
             error_code="ASSOCIATED_RESOURCES_APPLY_FAILED",
             normalized_args=normalized_args,
@@ -1688,27 +1629,12 @@ class AiBuilderTools(ToolBase):
                 read_one=lambda item_app_key: self.app_get(profile=profile, app_key=item_app_key, app_keys=None),
             )
         normalized_args = {"app_key": app_key}
-        result = _publicize_package_fields(_safe_tool_call(
+        return _publicize_package_fields(_safe_tool_call(
             lambda: self._facade.app_get(profile=profile, app_key=app_key),
             error_code="APP_GET_FAILED",
             normalized_args=normalized_args,
             suggested_next_call={"tool_name": "app_get", "arguments": {"profile": profile, "app_key": app_key}},
         ))
-        if result.get("status") == "success":
-            ws_id = self._selected_ws_id(profile)
-            _attach_uri(result, result, ws_id=ws_id, resource_type="app", app_key=app_key)
-            for view in result.get("views") or []:
-                if isinstance(view, dict) and (view.get("view_key") or view.get("viewKey")):
-                    _attach_uri(
-                        view,
-                        result,
-                        ws_id=ws_id,
-                        resource_type="view",
-                        app_key=app_key,
-                        view_kind="custom",
-                        view_key=view.get("view_key") or view.get("viewKey"),
-                    )
-        return result
 
     def app_read_fields(self, *, profile: str, app_key: str) -> JSONObject:
         """执行应用相关逻辑。"""
@@ -1801,27 +1727,12 @@ class AiBuilderTools(ToolBase):
                 read_one=lambda item_app_key: self.app_get_views(profile=profile, app_key=item_app_key, app_keys=None),
             )
         normalized_args = {"app_key": app_key}
-        result = _safe_tool_call(
+        return _safe_tool_call(
             lambda: self._facade.app_get_views(profile=profile, app_key=app_key),
             error_code="APP_GET_VIEWS_FAILED",
             normalized_args=normalized_args,
             suggested_next_call={"tool_name": "app_get_views", "arguments": {"profile": profile, "app_key": app_key}},
         )
-        if result.get("status") == "success":
-            ws_id = self._selected_ws_id(profile)
-            _attach_uri(result, result, ws_id=ws_id, resource_type="app", app_key=app_key)
-            for view in result.get("views") or []:
-                if isinstance(view, dict) and (view.get("view_key") or view.get("viewKey")):
-                    _attach_uri(
-                        view,
-                        result,
-                        ws_id=ws_id,
-                        resource_type="view",
-                        app_key=app_key,
-                        view_kind="custom",
-                        view_key=view.get("view_key") or view.get("viewKey"),
-                    )
-        return result
 
     def app_read_flow_summary(self, *, profile: str, app_key: str) -> JSONObject:
         """执行应用相关逻辑。"""
@@ -1960,27 +1871,12 @@ class AiBuilderTools(ToolBase):
         """执行视图相关逻辑。"""
         resolved_view_key = _normalize_builder_view_key(str(view_key or viewgraph_key or "").strip())
         normalized_args = {"view_key": resolved_view_key}
-        result = _safe_tool_call(
+        return _safe_tool_call(
             lambda: self._facade.view_get(profile=profile, view_key=resolved_view_key),
             error_code="VIEW_GET_FAILED",
             normalized_args=normalized_args,
             suggested_next_call={"tool_name": "view_get", "arguments": {"profile": profile, **normalized_args}},
         )
-        if result.get("status") == "success":
-            config = result.get("config") if isinstance(result.get("config"), dict) else {}
-            base_info = result.get("base_info") if isinstance(result.get("base_info"), dict) else {}
-            app_key = str(config.get("appKey") or config.get("formKey") or base_info.get("appKey") or base_info.get("formKey") or "").strip()
-            if app_key:
-                _attach_uri(
-                    result,
-                    result,
-                    ws_id=self._selected_ws_id(profile),
-                    resource_type="view",
-                    app_key=app_key,
-                    view_kind="custom",
-                    view_key=resolved_view_key,
-                )
-        return result
 
     def chart_get(
         self,
@@ -2269,7 +2165,7 @@ class AiBuilderTools(ToolBase):
             )
             failure = normalized_apps_payload.get("failure")
             if isinstance(failure, dict):
-                return self._attach_apply_envelope(profile, "app_schema_apply", failure)
+                return _attach_builder_apply_envelope("app_schema_apply", failure)
             package_id = normalized_apps_payload.get("package_id")  # type: ignore[assignment]
             apps = normalized_apps_payload.get("apps")  # type: ignore[assignment]
             input_warnings = list(normalized_apps_payload.get("warnings") or [])
@@ -2285,7 +2181,7 @@ class AiBuilderTools(ToolBase):
                 )
                 failure = form_result.get("failure")
                 if isinstance(failure, dict):
-                    return self._attach_apply_envelope(profile, "app_schema_apply", failure)
+                    return _attach_builder_apply_envelope("app_schema_apply", failure)
                 normalized_apps.append(form_result.get("payload") or app_item)
             apps = normalized_apps
             result = self._app_schema_apply_multi(
@@ -2299,7 +2195,7 @@ class AiBuilderTools(ToolBase):
                 result_warnings = list(result.get("warnings") or [])
                 result_warnings.extend(deepcopy(input_warnings))
                 result["warnings"] = result_warnings
-            return self._attach_apply_envelope(profile, "app_schema_apply", result)
+            return _attach_builder_apply_envelope("app_schema_apply", result)
         inline_form_layout_sections: list[JSONObject] = []
         if form:
             form_payload: JSONObject = {"form": form}
@@ -2312,7 +2208,7 @@ class AiBuilderTools(ToolBase):
             )
             failure = form_result.get("failure")
             if isinstance(failure, dict):
-                return self._attach_apply_envelope(profile, "app_schema_apply", failure)
+                return _attach_builder_apply_envelope("app_schema_apply", failure)
             normalized_payload = form_result.get("payload") if isinstance(form_result.get("payload"), dict) else {}
             add_fields = list(normalized_payload.get("add_fields") or [])
             inline_form_layout_sections = list(form_result.get("layout_sections") or [])
@@ -2350,7 +2246,7 @@ class AiBuilderTools(ToolBase):
                 inline_form_layout_sections=inline_form_layout_sections,
             ),
         )
-        return self._attach_apply_envelope(profile, "app_schema_apply", result)
+        return _attach_builder_apply_envelope("app_schema_apply", result)
 
     def _app_schema_apply_multi(
         self,
@@ -3629,7 +3525,7 @@ class AiBuilderTools(ToolBase):
                 sections=sections,
             ),
         )
-        return self._attach_apply_envelope(profile, "app_layout_apply", result)
+        return _attach_builder_apply_envelope("app_layout_apply", result)
 
     def _app_layout_apply_once(self, *, profile: str, app_key: str, mode: str = "merge", publish: bool = True, sections: list[JSONObject]) -> JSONObject:
         """执行内部辅助逻辑。"""
@@ -3694,7 +3590,7 @@ class AiBuilderTools(ToolBase):
                 "idempotency_key": idempotency_key,
                 "schema_version": schema_version,
             }
-            return self._attach_apply_envelope(profile, "app_flow_apply", _safe_tool_call(
+            return _attach_builder_apply_envelope("app_flow_apply", _safe_tool_call(
                 lambda: self._facade.flow_patch_nodes(
                     profile=profile,
                     app_key=app_key,
@@ -3715,7 +3611,7 @@ class AiBuilderTools(ToolBase):
                 "idempotency_key": idempotency_key,
                 "schema_version": schema_version,
             }
-            return self._attach_apply_envelope(profile, "app_flow_apply", _safe_tool_call(
+            return _attach_builder_apply_envelope("app_flow_apply", _safe_tool_call(
                 lambda: self._facade.flow_apply(
                     profile=profile,
                     app_key=app_key,
@@ -3751,9 +3647,9 @@ class AiBuilderTools(ToolBase):
                     transitions=effective_transitions,
                 ),
             )
-            return self._attach_apply_envelope(profile, "app_flow_apply", result)
+            return _attach_builder_apply_envelope("app_flow_apply", result)
         normalized_args = {"app_key": app_key, "publish": publish}
-        return self._attach_apply_envelope(profile,
+        return _attach_builder_apply_envelope(
             "app_flow_apply",
             {
                 "status": "failed",
@@ -3888,7 +3784,7 @@ class AiBuilderTools(ToolBase):
                 patch_views=patch_views or [],
             ),
         )
-        return self._attach_apply_envelope(profile, "app_views_apply", result)
+        return _attach_builder_apply_envelope("app_views_apply", result)
 
     def _app_views_apply_view_batch(
         self,
@@ -3899,7 +3795,7 @@ class AiBuilderTools(ToolBase):
     ) -> JSONObject:
         started_at = time.perf_counter()
         if not isinstance(views, list) or not views:
-            return self._attach_apply_envelope(profile,
+            return _attach_builder_apply_envelope(
                 "app_views_apply",
                 _config_failure(
                     tool_name="app_views_apply",
@@ -4130,7 +4026,7 @@ class AiBuilderTools(ToolBase):
             view_write_parallel_wall_ms=view_write_parallel_wall_ms,
             total_ms=_elapsed_ms(started_at),
         )
-        return self._attach_apply_envelope(profile, "app_views_apply", payload)
+        return _attach_builder_apply_envelope("app_views_apply", payload)
 
     def _app_views_apply_once(
         self,
@@ -4253,7 +4149,7 @@ class AiBuilderTools(ToolBase):
                 }
             )
         except ValidationError as exc:
-            return self._attach_apply_envelope(profile, "app_charts_apply", _visibility_validation_failure(
+            return _attach_builder_apply_envelope("app_charts_apply", _visibility_validation_failure(
                 str(exc),
                 tool_name="app_charts_apply",
                 exc=exc,
@@ -4269,7 +4165,7 @@ class AiBuilderTools(ToolBase):
                 },
             ))
         normalized_args = request.model_dump(mode="json")
-        return self._attach_apply_envelope(profile, "app_charts_apply", _safe_tool_call(
+        return _attach_builder_apply_envelope("app_charts_apply", _safe_tool_call(
             lambda: self._facade.chart_apply(profile=profile, request=request),
             error_code="CHART_APPLY_FAILED",
             normalized_args=normalized_args,
@@ -4305,7 +4201,7 @@ class AiBuilderTools(ToolBase):
                 "publish": publish,
                 "patch_sections": patch_sections,
             }
-            return self._attach_apply_envelope(profile, "portal_apply", _publicize_package_fields(_safe_tool_call(
+            return _attach_builder_apply_envelope("portal_apply", _publicize_package_fields(_safe_tool_call(
                 lambda: self._facade.portal_patch_sections(
                     profile=profile,
                     dash_key=dash_key,
@@ -4352,7 +4248,7 @@ class AiBuilderTools(ToolBase):
         try:
             request = PortalApplyRequest.model_validate(request_payload)
         except ValidationError as exc:
-            return self._attach_apply_envelope(profile, "portal_apply", _visibility_validation_failure(
+            return _attach_builder_apply_envelope("portal_apply", _visibility_validation_failure(
                 str(exc),
                 tool_name="portal_apply",
                 exc=exc,
@@ -4383,14 +4279,14 @@ class AiBuilderTools(ToolBase):
             creating=not bool(str(request.dash_key or "").strip()),
         )
         if icon_failure is not None:
-            return self._attach_apply_envelope(profile, "portal_apply", icon_failure)
+            return _attach_builder_apply_envelope("portal_apply", icon_failure)
         result = _publicize_package_fields(_safe_tool_call(
             lambda: self._facade.portal_apply(profile=profile, request=request),
             error_code="PORTAL_APPLY_FAILED",
             normalized_args=normalized_args,
             suggested_next_call={"tool_name": "portal_apply", "arguments": {"profile": profile, **normalized_args}},
         ))
-        return self._attach_apply_envelope(profile, "portal_apply", result)
+        return _attach_builder_apply_envelope("portal_apply", result)
 
     def portal_delete(self, *, profile: str, dash_key: str) -> JSONObject:
         """执行门户删除逻辑。"""
@@ -4401,7 +4297,7 @@ class AiBuilderTools(ToolBase):
             normalized_args=normalized_args,
             suggested_next_call={"tool_name": "portal_delete", "arguments": {"profile": profile, **normalized_args}},
         ))
-        return self._attach_apply_envelope(profile, "portal_delete", result)
+        return _attach_builder_apply_envelope("portal_delete", result)
 
     def app_publish_verify(
         self,
@@ -4440,7 +4336,7 @@ class AiBuilderTools(ToolBase):
                 expected_package_tag_id=expected_package_id,
             ),
         ))
-        return self._attach_apply_envelope(profile, "app_publish_verify", result)
+        return _attach_builder_apply_envelope("app_publish_verify", result)
 
     def _retry_after_self_lock_release(self, *, profile: str, result: JSONObject, retry_call) -> JSONObject:
         """执行内部辅助逻辑。"""
@@ -5806,68 +5702,6 @@ def _publicize_package_fields(value):
     return public
 
 
-def _append_uri_warning(payload: JSONObject, warning: JSONObject | None) -> None:
-    if not warning:
-        return
-    warnings = payload.setdefault("warnings", [])
-    if isinstance(warnings, list) and not any(
-        isinstance(item, dict) and item.get("code") == warning.get("code") for item in warnings
-    ):
-        warnings.append(warning)
-
-
-def _attach_uri(target: JSONObject, payload: JSONObject, *, ws_id: int, **identity: Any) -> None:
-    uri, warning = try_build_resource_uri(ws_id=ws_id, **identity)
-    if uri:
-        target["uri"] = uri
-    _append_uri_warning(payload, warning)
-
-
-def _attach_builder_resource_uris(payload: JSONObject, resources: list[JSONObject], *, ws_id: int) -> None:
-    for resource in resources:
-        resource_type = str(resource.get("resource_type") or "")
-        ids = resource.get("ids") if isinstance(resource.get("ids"), dict) else {}
-        if resource_type == "package":
-            _attach_uri(
-                resource,
-                payload,
-                ws_id=ws_id,
-                resource_type="package",
-                package_id=resource.get("id") or ids.get("package_id"),
-            )
-        elif resource_type == "app":
-            _attach_uri(
-                resource,
-                payload,
-                ws_id=ws_id,
-                resource_type="app",
-                app_key=resource.get("key") or ids.get("app_key"),
-            )
-        elif resource_type == "view":
-            parent = resource.get("parent") if isinstance(resource.get("parent"), dict) else {}
-            _attach_uri(
-                resource,
-                payload,
-                ws_id=ws_id,
-                resource_type="view",
-                app_key=ids.get("app_key") or (parent.get("key") if parent.get("resource_type") == "app" else None),
-                view_kind="custom",
-                view_key=resource.get("key") or ids.get("view_key"),
-            )
-
-
-def _attach_package_item_uris(items: Any, payload: JSONObject, *, ws_id: int) -> None:
-    if not isinstance(items, list):
-        return
-    for item in items:
-        if not isinstance(item, dict):
-            continue
-        if item.get("type") == "app" and item.get("app_key"):
-            _attach_uri(item, payload, ws_id=ws_id, resource_type="app", app_key=item.get("app_key"))
-        if item.get("type") == "group":
-            _attach_package_item_uris(item.get("items"), payload, ws_id=ws_id)
-
-
 def _builder_contract_with_apply_output(tool_name: str, contract: JSONObject) -> JSONObject:
     public = deepcopy(contract)
     if tool_name not in BUILDER_APPLY_TOOL_NAMES:
@@ -5880,7 +5714,7 @@ def _builder_contract_with_apply_output(tool_name: str, contract: JSONObject) ->
     public["output_contract"] = {
         "schema_version": BUILDER_APPLY_SCHEMA_VERSION,
         "preferred_ui_fields": ["operation", "summary", "resources"],
-        "resource_fields": ["resource_type", "operation", "status", "id", "key", "name", "ids", "parent", "uri", "icon_config", "error_code", "message"],
+        "resource_fields": ["resource_type", "operation", "status", "id", "key", "name", "ids", "parent", "icon_config", "error_code", "message"],
         "json_paths": _builder_apply_json_paths(),
         "legacy_fields_preserved": True,
     }
@@ -5932,7 +5766,6 @@ def _builder_apply_json_paths() -> JSONObject:
         "resource_keys": "$.resources[].key",
         "resource_ids": "$.resources[].id",
         "resource_statuses": "$.resources[].status",
-        "resource_uris": "$.resources[].uri",
     }
 
 
@@ -6022,9 +5855,7 @@ def _builder_verification_truthy(value: object) -> bool:
 
 def _builder_apply_resources(tool_name: str, payload: JSONObject) -> list[JSONObject]:
     resources: list[JSONObject]
-    if tool_name == "solution_install":
-        resources = [deepcopy(item) for item in payload.get("resources") or [] if isinstance(item, dict)]
-    elif tool_name == "package_apply":
+    if tool_name == "package_apply":
         resources = _builder_package_resources(payload)
     elif tool_name == "app_schema_apply":
         resources = _builder_schema_resources(payload)