@qingflow-tech/qingflow-cli 1.1.47-beta.1 → 1.1.47-beta.2

package/src/qingflow_mcp/server_app_builder.py

@@ -9,6 +9,7 @@ from .config import DEFAULT_PROFILE
 from .response_trim import BUILDER_SERVER_METHOD_MAP, trim_error_response, trim_public_response, wrap_trimmed_methods
 from .session_store import SessionStore
 from .tools.ai_builder_tools import AiBuilderTools
+from .tools.login_link_tools import LOGIN_LINK_DESCRIPTION, LoginLinkTools
 from .tools.auth_tools import AuthTools
 from .tools.feedback_tools import FeedbackTools
 from .tools.file_tools import FileTools
@@ -41,6 +42,7 @@ def build_builder_server() -> FastMCP:
             "member_search/role_search/role_create when workflow assignees must come from the directory or role catalog, preferring roles over explicit members unless the user explicitly names members, "
             "then app_form_apply for complete app form targets, explicit app_delete for application deletion, and app_flow_apply/app_views_apply/app_associated_resources_apply/app_charts_apply/portal_apply/portal_delete for non-form patches. app_custom_buttons_apply is maintenance-only for explicit standalone button work outside normal view design. These apply/delete tools perform validation, normalization, writes, and readback verification where applicable. AppForm publishes only after a draft change or when the published form lags behind; views noop requests skip publish, app_custom_buttons_apply and app_associated_resources_apply publish after at least one write succeeds and expose no draft-only parameter, charts are immediate-live without publish and resolve targets by chart_id first then exact unique chart name, portal updates use replace semantics only when sections are supplied and edit-mode base-info-only updates may omit sections, portal delete separates DELETE execution from readback verification, portal pc layout is a 24-column grid and mobile is a 6-column grid so omit position or use layout_preset when unsure, publish=false only guarantees draft/base-info updates for tools that still expose that parameter, and flow should use publish=false whenever you only want draft/precheck behavior. "
             "Builder apply/write outputs include schema_version, operation, summary, and resources[]; use resources[].id/key/name/ids/parent as the stable UI and agent display entry, and keep legacy fields such as field_diff/views_diff/chart_results only for compatibility or troubleshooting. "
+            "For page handoff, prefer stable resource uri values in read/apply outputs. Do not issue tickets for intermediate reads. If the target browser state is unknown, issue one fresh get_login_link ticket per delivered resource uri; only deliver the stable uri directly after the user confirms the same browser, web origin, account, and workspace are already logged in. A prior ticket, an automated browser session, or another resource ticket is not that evidence, and consumed tickets cannot be reused. Do not open a returned URL unless the user asks; if ticket issuance fails, state that login is required and provide the stable uri as the fallback. "
             "For existing object parameter replacement, prefer patch_views, patch_buttons, patch_resources, and patch_charts with set/unset; the tool reads current config and full-saves internally, while upsert_* is for creation or full target configuration and should not be used as an incomplete partial update. "
             "For builder delete/remove apply results, separate delete execution from readback verification: after DELETE is sent, resources expose delete_executed, readback_status, and safe_to_retry_delete=false. If readback_status is unavailable or still_exists, do not blindly repeat the delete; confirm later with app_get/view_get/chart_get or the relevant apply readback. Views/buttons use single-item readback; associated resources use one app-level resource-pool readback because there is no confirmed single-item GET. "
             "For builder write/apply results, separate write execution from final readback verification: status=partial_success with write_executed=true and safe_to_retry=false means the write was sent or succeeded, while final readback, publish verification, or metadata confirmation is pending or permission-restricted. Report it as written but unverified; do not repeat the same write blindly. "
@@ -64,6 +66,7 @@ def build_builder_server() -> FastMCP:
     workspace = wrap_trimmed_methods(WorkspaceTools(sessions, backend), BUILDER_SERVER_METHOD_MAP)
     files = wrap_trimmed_methods(FileTools(sessions, backend), BUILDER_SERVER_METHOD_MAP)
     ai_builder = wrap_trimmed_methods(AiBuilderTools(sessions, backend), BUILDER_SERVER_METHOD_MAP)
+    login_link = LoginLinkTools(sessions, backend)
     feedback = FeedbackTools(backend, mcp_side="App Builder MCP")
 
     @server.tool()
@@ -90,6 +93,10 @@ def build_builder_server() -> FastMCP:
     def auth_logout(profile: str = DEFAULT_PROFILE, forget_persisted: bool = False) -> dict:
         return auth.auth_logout(profile=profile, forget_persisted=forget_persisted)
 
+    @server.tool(description=LOGIN_LINK_DESCRIPTION)
+    def get_login_link(profile: str = DEFAULT_PROFILE, redirect_path: str = "") -> dict:
+        return login_link.get_login_link(profile=profile, redirect_path=redirect_path)
+
     @server.tool()
     def workspace_list(
         profile: str = DEFAULT_PROFILE,

package/src/qingflow_mcp/server_app_user.py

@@ -33,11 +33,12 @@ def build_user_server(*, stateless_http: bool = False) -> FastMCP:
 
 ## 页面交接
 
-用户需要查看结果、继续编辑、处理业务或进入工作区页面时，使用 `get_login_link`；纯数据查询不自动签发链接。
+用户需要查看结果、继续编辑、处理业务或进入工作区页面时，优先使用业务输出中的稳定 `uri`。纯数据查询和中间读取不签发链接。
 目标路径由业务工具或领域 Skill 根据真实前端路由确定，不由票据工具根据业务标识推导。
 已知目标传可选 `redirect_path`；明确指定页面但路径未知时继续定位或说明限制，不猜测，也不静默改为首页。
 搜索未命中时继续搜索 `login` 或查看服务工具列表，不擅自打开固定正式站点；鉴权或工具失败时如实说明。
-临近交付时再签发，使用返回的完整 URL。要求“给我链接”时仅交付，不提前消费；要求“打开”时才调用浏览器。
+目标浏览器登录态未知时，默认对每个要交付的资源 `uri` 分别调用一次 `get_login_link`；只有用户确认同一浏览器、网页域名、账号和工作区已经登录时才直接交付稳定 `uri`。调用过票据工具、自动化浏览器已登录或之前签发过票据均不能证明用户浏览器已登录，已消费链接也不能复用。
+临近交付时再签发，使用返回的完整 URL。要求“给我链接”时仅交付，不提前消费；要求“打开”时才调用浏览器。签发失败时明确说明需要登录，并提供对应稳定 `uri` 作为备用入口。
 浏览器不可用时提供可点击链接；用“查看记录”“继续编辑”等文案，不展示工作区数字 ID 或原始 JSON。
 链接约 5 分钟内一次性有效，不能作为长期书签；安全验证及原有业务权限不变。
 

package/src/qingflow_mcp/tools/ai_builder_tools.py

@@ -20,6 +20,7 @@ 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,
@@ -187,6 +188,26 @@ 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
@@ -199,7 +220,7 @@ class AiBuilderTools(ToolBase):
                 child_total_ms=child_total_ms,
                 total_ms=_elapsed_ms(started_at),
             )
-            return _attach_builder_apply_envelope(tool_name, payload)
+            return self._attach_apply_envelope(profile, tool_name, payload)
 
         if not isinstance(apps, list) or not apps:
             return finish(
@@ -841,16 +862,30 @@ class AiBuilderTools(ToolBase):
         being_draft: bool = False,
     ) -> JSONObject:
         """Read a canonical draft or published AppForm resource."""
-        return self._app_form.get(
+        result = 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."""
-        return self._app_form.apply(profile=profile, spec=spec)
+        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
 
     def app_form_evaluate_formula(
         self,
@@ -917,12 +952,24 @@ class AiBuilderTools(ToolBase):
     def package_list(self, *, profile: str, trial_status: str = "all", query: str = "") -> JSONObject:
         """执行分组与包相关逻辑。"""
         normalized_args = {"trial_status": trial_status, "query": query}
-        return _safe_tool_call(
+        result = _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:
         """执行分组与包相关逻辑。"""
@@ -1062,12 +1109,23 @@ class AiBuilderTools(ToolBase):
     def package_get(self, *, profile: str, package_id: int | None = None) -> JSONObject:
         """执行分组与包相关逻辑。"""
         normalized_args = {"package_id": package_id}
-        return _publicize_package_fields(_safe_tool_call(
+        result = _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,
@@ -1097,7 +1155,7 @@ class AiBuilderTools(ToolBase):
             try:
                 visibility_patch = VisibilityPatch.model_validate(visibility)
             except ValidationError as exc:
-                return _attach_builder_apply_envelope(
+                return self._attach_apply_envelope(profile,
                     "package_apply",
                     _visibility_validation_failure(str(exc), tool_name="package_apply", exc=exc),
                 )
@@ -1108,7 +1166,7 @@ class AiBuilderTools(ToolBase):
             creating=package_id is None and bool(str(package_name or "").strip()),
         )
         if icon_failure is not None:
-            return _attach_builder_apply_envelope("package_apply", icon_failure)
+            return self._attach_apply_envelope(profile, "package_apply", icon_failure)
         normalized_args = {
             "package_id": package_id,
             **({"package_name": package_name} if str(package_name or "").strip() else {}),
@@ -1133,7 +1191,7 @@ class AiBuilderTools(ToolBase):
             normalized_args=normalized_args,
             suggested_next_call={"tool_name": "package_apply", "arguments": {"profile": profile, **normalized_args}},
         ))
-        return _attach_builder_apply_envelope("package_apply", result)
+        return self._attach_apply_envelope(profile, "package_apply", result)
 
     def package_update(
         self,
@@ -1187,7 +1245,7 @@ class AiBuilderTools(ToolBase):
             "being_copy_data": being_copy_data,
             "solution_source": solution_source,
         }
-        return _safe_tool_call(
+        result = _safe_tool_call(
             lambda: self._facade.solution_install(
                 profile=profile,
                 solution_key=solution_key,
@@ -1198,6 +1256,7 @@ 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,
@@ -1394,7 +1453,7 @@ class AiBuilderTools(ToolBase):
         try:
             request = CustomButtonsApplyRequest.model_validate(raw_request)
         except ValidationError as exc:
-            return _attach_builder_apply_envelope("app_custom_buttons_apply", _validation_failure(
+            return self._attach_apply_envelope(profile, "app_custom_buttons_apply", _validation_failure(
                 str(exc),
                 tool_name="app_custom_buttons_apply",
                 exc=exc,
@@ -1418,7 +1477,7 @@ class AiBuilderTools(ToolBase):
                 },
             ))
         normalized_args = request.model_dump(mode="json")
-        return _attach_builder_apply_envelope("app_custom_buttons_apply", _safe_tool_call(
+        return self._attach_apply_envelope(profile, "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,
@@ -1475,7 +1534,7 @@ class AiBuilderTools(ToolBase):
         try:
             request = AssociatedResourcesApplyRequest.model_validate(raw_request)
         except ValidationError as exc:
-            return _attach_builder_apply_envelope("app_associated_resources_apply", _validation_failure(
+            return self._attach_apply_envelope(profile, "app_associated_resources_apply", _validation_failure(
                 str(exc),
                 tool_name="app_associated_resources_apply",
                 exc=exc,
@@ -1504,7 +1563,7 @@ class AiBuilderTools(ToolBase):
                 },
             ))
         normalized_args = request.model_dump(mode="json", exclude_none=True)
-        return _attach_builder_apply_envelope("app_associated_resources_apply", _safe_tool_call(
+        return self._attach_apply_envelope(profile, "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,
@@ -1629,12 +1688,27 @@ 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}
-        return _publicize_package_fields(_safe_tool_call(
+        result = _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:
         """执行应用相关逻辑。"""
@@ -1727,12 +1801,27 @@ 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}
-        return _safe_tool_call(
+        result = _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:
         """执行应用相关逻辑。"""
@@ -1871,12 +1960,27 @@ 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}
-        return _safe_tool_call(
+        result = _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,
@@ -2165,7 +2269,7 @@ class AiBuilderTools(ToolBase):
             )
             failure = normalized_apps_payload.get("failure")
             if isinstance(failure, dict):
-                return _attach_builder_apply_envelope("app_schema_apply", failure)
+                return self._attach_apply_envelope(profile, "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 [])
@@ -2181,7 +2285,7 @@ class AiBuilderTools(ToolBase):
                 )
                 failure = form_result.get("failure")
                 if isinstance(failure, dict):
-                    return _attach_builder_apply_envelope("app_schema_apply", failure)
+                    return self._attach_apply_envelope(profile, "app_schema_apply", failure)
                 normalized_apps.append(form_result.get("payload") or app_item)
             apps = normalized_apps
             result = self._app_schema_apply_multi(
@@ -2195,7 +2299,7 @@ class AiBuilderTools(ToolBase):
                 result_warnings = list(result.get("warnings") or [])
                 result_warnings.extend(deepcopy(input_warnings))
                 result["warnings"] = result_warnings
-            return _attach_builder_apply_envelope("app_schema_apply", result)
+            return self._attach_apply_envelope(profile, "app_schema_apply", result)
         inline_form_layout_sections: list[JSONObject] = []
         if form:
             form_payload: JSONObject = {"form": form}
@@ -2208,7 +2312,7 @@ class AiBuilderTools(ToolBase):
             )
             failure = form_result.get("failure")
             if isinstance(failure, dict):
-                return _attach_builder_apply_envelope("app_schema_apply", failure)
+                return self._attach_apply_envelope(profile, "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 [])
@@ -2246,7 +2350,7 @@ class AiBuilderTools(ToolBase):
                 inline_form_layout_sections=inline_form_layout_sections,
             ),
         )
-        return _attach_builder_apply_envelope("app_schema_apply", result)
+        return self._attach_apply_envelope(profile, "app_schema_apply", result)
 
     def _app_schema_apply_multi(
         self,
@@ -3525,7 +3629,7 @@ class AiBuilderTools(ToolBase):
                 sections=sections,
             ),
         )
-        return _attach_builder_apply_envelope("app_layout_apply", result)
+        return self._attach_apply_envelope(profile, "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:
         """执行内部辅助逻辑。"""
@@ -3590,7 +3694,7 @@ class AiBuilderTools(ToolBase):
                 "idempotency_key": idempotency_key,
                 "schema_version": schema_version,
             }
-            return _attach_builder_apply_envelope("app_flow_apply", _safe_tool_call(
+            return self._attach_apply_envelope(profile, "app_flow_apply", _safe_tool_call(
                 lambda: self._facade.flow_patch_nodes(
                     profile=profile,
                     app_key=app_key,
@@ -3611,7 +3715,7 @@ class AiBuilderTools(ToolBase):
                 "idempotency_key": idempotency_key,
                 "schema_version": schema_version,
             }
-            return _attach_builder_apply_envelope("app_flow_apply", _safe_tool_call(
+            return self._attach_apply_envelope(profile, "app_flow_apply", _safe_tool_call(
                 lambda: self._facade.flow_apply(
                     profile=profile,
                     app_key=app_key,
@@ -3647,9 +3751,9 @@ class AiBuilderTools(ToolBase):
                     transitions=effective_transitions,
                 ),
             )
-            return _attach_builder_apply_envelope("app_flow_apply", result)
+            return self._attach_apply_envelope(profile, "app_flow_apply", result)
         normalized_args = {"app_key": app_key, "publish": publish}
-        return _attach_builder_apply_envelope(
+        return self._attach_apply_envelope(profile,
             "app_flow_apply",
             {
                 "status": "failed",
@@ -3784,7 +3888,7 @@ class AiBuilderTools(ToolBase):
                 patch_views=patch_views or [],
             ),
         )
-        return _attach_builder_apply_envelope("app_views_apply", result)
+        return self._attach_apply_envelope(profile, "app_views_apply", result)
 
     def _app_views_apply_view_batch(
         self,
@@ -3795,7 +3899,7 @@ class AiBuilderTools(ToolBase):
     ) -> JSONObject:
         started_at = time.perf_counter()
         if not isinstance(views, list) or not views:
-            return _attach_builder_apply_envelope(
+            return self._attach_apply_envelope(profile,
                 "app_views_apply",
                 _config_failure(
                     tool_name="app_views_apply",
@@ -4026,7 +4130,7 @@ class AiBuilderTools(ToolBase):
             view_write_parallel_wall_ms=view_write_parallel_wall_ms,
             total_ms=_elapsed_ms(started_at),
         )
-        return _attach_builder_apply_envelope("app_views_apply", payload)
+        return self._attach_apply_envelope(profile, "app_views_apply", payload)
 
     def _app_views_apply_once(
         self,
@@ -4149,7 +4253,7 @@ class AiBuilderTools(ToolBase):
                 }
             )
         except ValidationError as exc:
-            return _attach_builder_apply_envelope("app_charts_apply", _visibility_validation_failure(
+            return self._attach_apply_envelope(profile, "app_charts_apply", _visibility_validation_failure(
                 str(exc),
                 tool_name="app_charts_apply",
                 exc=exc,
@@ -4165,7 +4269,7 @@ class AiBuilderTools(ToolBase):
                 },
             ))
         normalized_args = request.model_dump(mode="json")
-        return _attach_builder_apply_envelope("app_charts_apply", _safe_tool_call(
+        return self._attach_apply_envelope(profile, "app_charts_apply", _safe_tool_call(
             lambda: self._facade.chart_apply(profile=profile, request=request),
             error_code="CHART_APPLY_FAILED",
             normalized_args=normalized_args,
@@ -4201,7 +4305,7 @@ class AiBuilderTools(ToolBase):
                 "publish": publish,
                 "patch_sections": patch_sections,
             }
-            return _attach_builder_apply_envelope("portal_apply", _publicize_package_fields(_safe_tool_call(
+            return self._attach_apply_envelope(profile, "portal_apply", _publicize_package_fields(_safe_tool_call(
                 lambda: self._facade.portal_patch_sections(
                     profile=profile,
                     dash_key=dash_key,
@@ -4248,7 +4352,7 @@ class AiBuilderTools(ToolBase):
         try:
             request = PortalApplyRequest.model_validate(request_payload)
         except ValidationError as exc:
-            return _attach_builder_apply_envelope("portal_apply", _visibility_validation_failure(
+            return self._attach_apply_envelope(profile, "portal_apply", _visibility_validation_failure(
                 str(exc),
                 tool_name="portal_apply",
                 exc=exc,
@@ -4279,14 +4383,14 @@ class AiBuilderTools(ToolBase):
             creating=not bool(str(request.dash_key or "").strip()),
         )
         if icon_failure is not None:
-            return _attach_builder_apply_envelope("portal_apply", icon_failure)
+            return self._attach_apply_envelope(profile, "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 _attach_builder_apply_envelope("portal_apply", result)
+        return self._attach_apply_envelope(profile, "portal_apply", result)
 
     def portal_delete(self, *, profile: str, dash_key: str) -> JSONObject:
         """执行门户删除逻辑。"""
@@ -4297,7 +4401,7 @@ class AiBuilderTools(ToolBase):
             normalized_args=normalized_args,
             suggested_next_call={"tool_name": "portal_delete", "arguments": {"profile": profile, **normalized_args}},
         ))
-        return _attach_builder_apply_envelope("portal_delete", result)
+        return self._attach_apply_envelope(profile, "portal_delete", result)
 
     def app_publish_verify(
         self,
@@ -4336,7 +4440,7 @@ class AiBuilderTools(ToolBase):
                 expected_package_tag_id=expected_package_id,
             ),
         ))
-        return _attach_builder_apply_envelope("app_publish_verify", result)
+        return self._attach_apply_envelope(profile, "app_publish_verify", result)
 
     def _retry_after_self_lock_release(self, *, profile: str, result: JSONObject, retry_call) -> JSONObject:
         """执行内部辅助逻辑。"""
@@ -5702,6 +5806,68 @@ 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:
@@ -5714,7 +5880,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", "icon_config", "error_code", "message"],
+        "resource_fields": ["resource_type", "operation", "status", "id", "key", "name", "ids", "parent", "uri", "icon_config", "error_code", "message"],
         "json_paths": _builder_apply_json_paths(),
         "legacy_fields_preserved": True,
     }
@@ -5766,6 +5932,7 @@ def _builder_apply_json_paths() -> JSONObject:
         "resource_keys": "$.resources[].key",
         "resource_ids": "$.resources[].id",
         "resource_statuses": "$.resources[].status",
+        "resource_uris": "$.resources[].uri",
     }
 
 
@@ -5855,7 +6022,9 @@ def _builder_verification_truthy(value: object) -> bool:
 
 def _builder_apply_resources(tool_name: str, payload: JSONObject) -> list[JSONObject]:
     resources: list[JSONObject]
-    if tool_name == "package_apply":
+    if tool_name == "solution_install":
+        resources = [deepcopy(item) for item in payload.get("resources") or [] if isinstance(item, dict)]
+    elif tool_name == "package_apply":
         resources = _builder_package_resources(payload)
     elif tool_name == "app_schema_apply":
         resources = _builder_schema_resources(payload)