@qingflow-tech/qingflow-app-builder-mcp 1.0.9 → 1.0.10

package/src/qingflow_mcp/builder_facade/service.py

@@ -2564,6 +2564,7 @@ class AiBuilderFacade:
                 details=_with_state_read_blocked_details({"app_key": app_key}, resource="custom_buttons", error=api_error),
                 suggested_next_call={"tool_name": "app_get", "arguments": {"profile": profile, "app_key": app_key}},
             ))
+        app_name = self._read_app_name_for_builder_output(profile=profile, app_key=app_key)
 
         existing_by_id = {
             button_id: item
@@ -3013,6 +3014,7 @@ class AiBuilderFacade:
             },
             "verified": verified,
             "app_key": app_key,
+            "app_name": app_name,
             "mode": "apply",
             "created": created,
             "updated": updated,
@@ -3663,6 +3665,7 @@ class AiBuilderFacade:
                 details=_with_state_read_blocked_details({"app_key": app_key}, resource="associated_resources", error=api_error),
                 suggested_next_call={"tool_name": "app_get", "arguments": {"profile": profile, "app_key": app_key}},
             ))
+        app_name = self._read_app_name_for_builder_output(profile=profile, app_key=app_key)
 
         existing_by_id = _associated_resource_index(existing_resources)
         blocking_issues: list[dict[str, Any]] = []
@@ -3671,7 +3674,6 @@ class AiBuilderFacade:
         client_key_to_patch: dict[str, AssociatedResourceUpsertPatch] = {}
         client_key_to_id: dict[str, int] = {}
         used_client_keys: set[str] = set()
-        force_update_resource_ids: set[int] = set()
         resolved_associated_item_refs: dict[str, list[int]] = {}
 
         upsert_resources = list(request.upsert_resources)
@@ -3691,11 +3693,6 @@ class AiBuilderFacade:
                     )
                 )
             upsert_resources.extend(expanded_resources)
-            force_update_resource_ids.update(
-                item_id
-                for item_id in (_coerce_positive_int(patch.associated_item_id) for patch in expanded_resources)
-                if item_id is not None
-            )
             normalized_args["upsert_resources"] = [patch.model_dump(mode="json") for patch in upsert_resources]
             normalized_args["patch_results"] = patch_results
 
@@ -3733,14 +3730,9 @@ class AiBuilderFacade:
                 touched_ids.add(associated_item_id)
                 if client_key:
                     client_key_to_id[client_key] = associated_item_id
-                operation = (
-                    "update"
-                    if associated_item_id in force_update_resource_ids
-                    or _associated_resource_patch_has_match_config(patch)
-                    else "unchanged"
-                    if _associated_resource_matches_patch(existing_by_id[associated_item_id], patch)
-                    else "update"
-                )
+                has_match_config = _associated_resource_patch_has_match_config(patch)
+                identity_matches = _associated_resource_matches_patch(existing_by_id[associated_item_id], patch)
+                operation = "update" if has_match_config or not identity_matches else "unchanged"
                 upsert_ops.append({"operation": operation, "associated_item_id": associated_item_id, "patch": patch, "index": index})
                 continue
             matches = [
@@ -4018,6 +4010,26 @@ class AiBuilderFacade:
 
         for index, view_config in enumerate(request.view_configs):
             resolved_view_config_ids = resolved_associated_item_refs.get(f"view_configs[{index}].associated_item_ids", [])
+            view_name = str(view_config.view_key or "").strip()
+            missing_ref_ids = [
+                str(ref or "").strip()
+                for ref in view_config.associated_item_refs
+                if str(ref or "").strip() and str(ref or "").strip() not in client_key_to_id
+            ]
+            if missing_ref_ids:
+                failed.append(
+                    {
+                        "operation": "view_config",
+                        "index": index,
+                        "view_key": view_config.view_key,
+                        "view_name": view_name,
+                        "status": "failed",
+                        "error_code": "ASSOCIATED_RESOURCE_REF_UNRESOLVED",
+                        "missing_refs": missing_ref_ids,
+                        "message": "view_config references associated resources that were not successfully created or resolved; skipped view config write to avoid clearing existing associations",
+                    }
+                )
+                continue
             selected_ids = [
                 item_id
                 for item_id in (
@@ -4034,19 +4046,21 @@ class AiBuilderFacade:
                 available_resources=resources_after,
             )
             if issues:
-                failed.append({"operation": "view_config", "index": index, "view_key": view_config.view_key, "status": "failed", "issues": issues})
+                failed.append({"operation": "view_config", "index": index, "view_key": view_config.view_key, "view_name": view_name, "status": "failed", "issues": issues})
                 continue
             try:
                 write_executed = True
                 self._update_view_associated_resources_config(profile=profile, view_key=view_config.view_key, associated_resources_payload=view_payload)
                 try:
                     config = self.views.view_get_config(profile=profile, viewgraph_key=view_config.view_key).get("result") or {}
+                    view_name = _extract_view_name(config if isinstance(config, dict) else {}) or view_name
                     actual_config = _extract_view_associated_resources_config(config if isinstance(config, dict) else {}, available_resources=resources_after)
                     verified_config = expected_config is not None and _associated_resources_config_matches(expected_config, actual_config)
                     if not verified_config and expected_config is not None:
                         self._update_view_associated_resources_config(profile=profile, view_key=view_config.view_key, associated_resources_payload=view_payload)
                         refreshed_resources = self._load_associated_resources_for_builder(profile=profile, app_key=app_key)
                         refreshed_config = self.views.view_get_config(profile=profile, viewgraph_key=view_config.view_key).get("result") or {}
+                        view_name = _extract_view_name(refreshed_config if isinstance(refreshed_config, dict) else {}) or view_name
                         actual_config = _extract_view_associated_resources_config(
                             refreshed_config if isinstance(refreshed_config, dict) else {},
                             available_resources=refreshed_resources,
@@ -4055,10 +4069,10 @@ class AiBuilderFacade:
                 except (QingflowApiError, RuntimeError):
                     actual_config = {}
                     verified_config = False
-                view_config_results.append({"index": index, "view_key": view_config.view_key, "status": "success" if verified_config else "partial_success", "associated_resources_verified": verified_config, "expected": expected_config, "actual": actual_config})
+                view_config_results.append({"index": index, "view_key": view_config.view_key, "view_name": view_name, "status": "success" if verified_config else "partial_success", "associated_resources_verified": verified_config, "expected": expected_config, "actual": actual_config})
             except (QingflowApiError, RuntimeError) as error:
                 api_error = _coerce_api_error(error)
-                failed.append({"operation": "view_config", "index": index, "view_key": view_config.view_key, "status": "failed", "error_code": "VIEW_ASSOCIATED_RESOURCES_WRITE_FAILED", "message": api_error.message, "transport_error": _transport_error_payload(api_error)})
+                failed.append({"operation": "view_config", "index": index, "view_key": view_config.view_key, "view_name": view_name, "status": "failed", "error_code": "VIEW_ASSOCIATED_RESOURCES_WRITE_FAILED", "message": api_error.message, "transport_error": _transport_error_payload(api_error)})
 
         final_resources: list[dict[str, Any]] = []
         readback_failed = False
@@ -4134,6 +4148,7 @@ class AiBuilderFacade:
             "verification": {"associated_resources_verified": pool_verified, "associated_resource_view_configs_verified": view_configs_verified, "readback_loaded": not readback_failed},
             "verified": verified,
             "app_key": app_key,
+            "app_name": app_name,
             "mode": "apply",
             "created": created,
             "updated": updated,
@@ -4612,9 +4627,18 @@ class AiBuilderFacade:
             "associated_resources": len(associated_resources),
             "custom_buttons": len(custom_buttons),
         }
+        app_name = str(
+            base_result.get("formTitle")
+            or base_result.get("title")
+            or base_result.get("appName")
+            or base_result.get("name")
+            or app_key
+        ).strip() or app_key
         response = AppReadSummaryResponse(
             app_key=app_key,
-            title=base_result.get("formTitle"),
+            app_name=app_name,
+            name=app_name,
+            title=app_name,
             app_icon=str(base_result.get("appIcon") or "").strip() or None,
             visibility=_public_visibility_from_member_auth(base_result.get("auth")),
             tag_ids=_coerce_int_list(base_result.get("tagIds")),
@@ -5441,7 +5465,7 @@ class AiBuilderFacade:
         for index, patch, config in semantic_patches:
             config_payload = config.model_dump(mode="json", exclude_none=True)
             reason_base = f"upsert_buttons[{index}].trigger_add_data_config"
-            if config.que_relation:
+            if "que_relation" in config.model_fields_set:
                 issues.append(
                     {
                         "error_code": "MIXED_CUSTOM_BUTTON_MAPPING_MODES",
@@ -5745,11 +5769,12 @@ class AiBuilderFacade:
             )
             return {"verified": False, "write_executed": False, "write_succeeded": False, "view_configs": results, "failed": failed, "warnings": warnings}
 
-        view_keys = {
-            _extract_view_key(view)
+        existing_views_by_key = {
+            _extract_view_key(view): view
             for view in (existing_views if isinstance(existing_views, list) else [])
             if isinstance(view, dict) and _extract_view_key(view)
         }
+        view_keys = set(existing_views_by_key)
         button_inventory: dict[int, dict[str, Any]] = {}
         for item in [*existing_buttons, *readback_buttons]:
             if not isinstance(item, dict):
@@ -5781,6 +5806,7 @@ class AiBuilderFacade:
             try:
                 current_response = self.views.view_get_config(profile=profile, viewgraph_key=view_key)
                 current_config = current_response.get("result") if isinstance(current_response.get("result"), dict) else {}
+                view_name = _extract_view_name(current_config) or _extract_view_name(existing_views_by_key.get(view_key) or {}) or view_key
             except (QingflowApiError, RuntimeError) as error:
                 api_error = _coerce_api_error(error)
                 issue = {
@@ -5789,6 +5815,7 @@ class AiBuilderFacade:
                     "status": "failed",
                     "error_code": "VIEW_CONFIG_READ_FAILED",
                     "view_key": view_key,
+                    "view_name": _extract_view_name(existing_views_by_key.get(view_key) or {}) or view_key,
                     "message": api_error.message,
                     "transport_error": _transport_error_payload(api_error),
                 }
@@ -5879,6 +5906,7 @@ class AiBuilderFacade:
                             "status": "failed",
                             "error_code": "INSIDE_BUTTON_BACKEND_UNSUPPORTED",
                             "view_key": view_key,
+                            "view_name": view_name,
                             "message": "backend rejected inside/list-button placement; header/detail placements were retried without inside buttons",
                             "backend_message": api_error.message,
                             "transport_error": _transport_error_payload(api_error),
@@ -5891,9 +5919,10 @@ class AiBuilderFacade:
                             "index": config_index,
                             "operation": "view_config",
                             "status": "failed",
-                            "error_code": "VIEW_BUTTON_CONFIG_WRITE_FAILED",
-                            "view_key": view_key,
-                            "message": fallback_api_error.message,
+                        "error_code": "VIEW_BUTTON_CONFIG_WRITE_FAILED",
+                        "view_key": view_key,
+                        "view_name": view_name,
+                        "message": fallback_api_error.message,
                             "transport_error": _transport_error_payload(fallback_api_error),
                             "initial_error": _transport_error_payload(api_error),
                         }
@@ -5908,6 +5937,7 @@ class AiBuilderFacade:
                         "status": "failed",
                         "error_code": "INSIDE_BUTTON_BACKEND_UNSUPPORTED",
                         "view_key": view_key,
+                        "view_name": view_name,
                         "message": "backend rejected inside/list-button placement",
                         "backend_message": api_error.message,
                         "transport_error": _transport_error_payload(api_error),
@@ -5924,6 +5954,7 @@ class AiBuilderFacade:
                         "status": "failed",
                         "error_code": "VIEW_BUTTON_CONFIG_WRITE_FAILED",
                         "view_key": view_key,
+                        "view_name": view_name,
                         "message": api_error.message,
                         "transport_error": _transport_error_payload(api_error),
                     }
@@ -5953,6 +5984,7 @@ class AiBuilderFacade:
                         "operation": "view_config",
                         "status": "success" if verified else ("partial_success" if unsupported_list_issue is not None else "unverified"),
                         "view_key": view_key,
+                        "view_name": view_name,
                         "mode": "replace" if replace_existing else "merge",
                         "buttons_configured": len(new_dtos),
                         "view_buttons_verified": verified,
@@ -5975,6 +6007,7 @@ class AiBuilderFacade:
                         "operation": "view_config",
                         "status": "unverified",
                         "view_key": view_key,
+                        "view_name": view_name,
                         "mode": "replace" if replace_existing else "merge",
                         "buttons_configured": len(new_dtos),
                         "view_buttons_verified": None,
@@ -7055,6 +7088,7 @@ class AiBuilderFacade:
                 },
                 "app_key": target.app_key,
                 "app_icon": str(resolved.get("app_icon") or visual_result.get("app_icon") or "").strip() or None,
+                "app_name": str(visual_result.get("app_name_after") or target.app_name),
                 "app_name_before": str(visual_result.get("app_name_before") or target.app_name),
                 "app_name_after": str(visual_result.get("app_name_after") or target.app_name),
                 "app_base_updated": bool(visual_result.get("updated")),
@@ -7295,7 +7329,8 @@ class AiBuilderFacade:
             actual_app_name = str(base_info.get("formTitle") or effective_app_name).strip() or effective_app_name
             actual_app_icon = str(base_info.get("appIcon") or visual_result.get("app_icon") or "").strip() or None
             expected_app_icon = str(visual_result.get("app_icon") or "").strip() or None
-            app_base_verified = actual_app_name == effective_app_name and actual_app_icon == expected_app_icon
+            app_icon_verified = True if expected_app_icon is None else actual_app_icon == expected_app_icon
+            app_base_verified = actual_app_name == effective_app_name and app_icon_verified
             verified = app_base_verified and relation_target_metadata_verified
             response = {
                 "status": "success" if verified else "partial_success",
@@ -7319,6 +7354,7 @@ class AiBuilderFacade:
                 },
                 "app_key": target.app_key,
                 "app_icon": str(visual_result.get("app_icon") or "").strip() or None,
+                "app_name": effective_app_name,
                 "app_name_before": str(visual_result.get("app_name_before") or target.app_name),
                 "app_name_after": effective_app_name,
                 "app_base_updated": bool(visual_result.get("updated")),
@@ -7516,6 +7552,7 @@ class AiBuilderFacade:
             },
             "app_key": target.app_key,
             "app_icon": str(visual_result.get("app_icon") or resolved.get("app_icon") or "").strip() or None,
+            "app_name": effective_app_name,
             "app_name_before": str(visual_result.get("app_name_before") or target.app_name),
             "app_name_after": effective_app_name,
             "app_base_updated": bool(visual_result.get("updated")),
@@ -7525,6 +7562,13 @@ class AiBuilderFacade:
                 "updated": updated,
                 "removed": removed,
             },
+            "field_diff_details": _schema_field_diff_details(
+                added=added,
+                updated=updated,
+                removed=removed,
+                before_fields=original_fields,
+                after_fields=current_fields,
+            ),
             "verified": False,
             "tag_ids_after": [],
             "package_attached": None,
@@ -7544,6 +7588,13 @@ class AiBuilderFacade:
         try:
             verified = self.app_read(profile=profile, app_key=target.app_key, include_raw=False)
             verified_field_names = {field["name"] for field in verified["schema"]["fields"]}
+            response["field_diff_details"] = _schema_field_diff_details(
+                added=added,
+                updated=updated,
+                removed=removed,
+                before_fields=original_fields,
+                after_fields=cast(list[dict[str, Any]], verified["schema"]["fields"]),
+            )
             verification_ok = all(name in verified_field_names for name in added + updated) and all(name not in verified_field_names for name in removed)
             data_display_verification = _verify_data_display_readback(
                 form_settings=verified.get("form_settings"),
@@ -7575,7 +7626,8 @@ class AiBuilderFacade:
             actual_app_name = str(base_info.get("formTitle") or effective_app_name).strip() or effective_app_name
             actual_app_icon = str(base_info.get("appIcon") or visual_result.get("app_icon") or "").strip() or None
             expected_app_icon = str(visual_result.get("app_icon") or "").strip() or None
-            app_base_verified = actual_app_name == effective_app_name and actual_app_icon == expected_app_icon
+            app_icon_verified = True if expected_app_icon is None else actual_app_icon == expected_app_icon
+            app_base_verified = actual_app_name == effective_app_name and app_icon_verified
         except (QingflowApiError, RuntimeError) as error:
             base_error = _coerce_api_error(error)
             if verification_error is None:
@@ -7669,6 +7721,7 @@ class AiBuilderFacade:
                 details=_with_state_read_blocked_details({"app_key": app_key}, resource="schema", error=api_error),
                 suggested_next_call={"tool_name": "app_get_layout", "arguments": {"profile": profile, "app_key": app_key}},
             ))
+        app_name = str(schema_result.get("formTitle") or schema_result.get("title") or schema_result.get("appName") or app_key).strip() or app_key
         parsed = _parse_schema(schema_result)
         current_fields = parsed["fields"]
         requested_sections, missing_selectors = _resolve_layout_sections_to_names(requested_sections, current_fields)
@@ -7751,6 +7804,7 @@ class AiBuilderFacade:
                 "warnings": [],
                 "verification": {"layout_verified": True, "layout_summary_verified": True},
                 "app_key": app_key,
+                "app_name": app_name,
                 "layout_diff": {
                     "mode": mode.value,
                     "replaced": mode == LayoutApplyMode.replace,
@@ -7839,6 +7893,7 @@ class AiBuilderFacade:
                 "warnings": [],
                 "verification": {"layout_verified": False, "layout_summary_verified": False, "layout_read_unavailable": True},
                 "app_key": app_key,
+                "app_name": app_name,
                 "layout_diff": {
                     "mode": mode.value,
                     "replaced": mode == LayoutApplyMode.replace,
@@ -7895,6 +7950,7 @@ class AiBuilderFacade:
             "warnings": warnings,
             "verification": {"layout_verified": layout_verified, "layout_summary_verified": layout_summary_verified},
             "app_key": app_key,
+            "app_name": app_name,
             "layout_diff": {
                 "mode": mode.value,
                 "replaced": mode == LayoutApplyMode.replace,
@@ -7957,6 +8013,7 @@ class AiBuilderFacade:
                 details=_with_state_read_blocked_details({"app_key": app_key}, resource="workflow", error=api_error),
                 suggested_next_call={"tool_name": "app_get_flow", "arguments": {"profile": profile, "app_key": app_key}},
             ))
+        app_name = str(base.get("formTitle") or base.get("title") or base.get("appName") or app_key).strip() or app_key
         entity = _entity_spec_from_app(base_info=base, schema=schema, views=None)
         current_fields = _parse_schema(schema)["fields"]
         normalized_nodes, resolution_issues = self._normalize_flow_nodes(profile=profile, current_fields=current_fields, nodes=nodes)
@@ -8124,6 +8181,7 @@ class AiBuilderFacade:
                 "workflow_read_unavailable": verified_nodes_unavailable,
             },
             "app_key": app_key,
+            "app_name": app_name,
             "flow_diff": {"mode": "replace", "node_count": desired_node_count},
             "verified": workflow_verified,
         }
@@ -8199,6 +8257,7 @@ class AiBuilderFacade:
                 details=_with_state_read_blocked_details({"app_key": app_key}, resource="views", error=api_error),
                 suggested_next_call={"tool_name": "app_get", "arguments": {"profile": profile, "app_key": app_key}},
             ))
+        app_name = str(base.get("formTitle") or base.get("title") or base.get("appName") or "").strip() or None
         existing_views = existing_views or []
         existing_by_key: dict[str, dict[str, Any]] = {}
         existing_by_name: dict[str, list[dict[str, Any]]] = {}
@@ -8306,9 +8365,15 @@ class AiBuilderFacade:
                     )
                 )
         removed: list[str] = []
+        removed_keys: set[str] = set()
         view_results: list[dict[str, Any]] = []
-        for name in remove_views:
-            matches = existing_by_name.get(name, [])
+        failed_views: list[dict[str, Any]] = []
+        for selector in remove_views:
+            selector_text = str(selector or "").strip()
+            if not selector_text:
+                continue
+            key_match = existing_by_key.get(selector_text)
+            matches = [key_match] if isinstance(key_match, dict) else existing_by_name.get(selector_text, [])
             if len(matches) > 1:
                 return _failed(
                     "AMBIGUOUS_VIEW",
@@ -8316,7 +8381,7 @@ class AiBuilderFacade:
                     normalized_args=normalized_args,
                     details={
                         "app_key": app_key,
-                        "view_name": name,
+                        "view_name": selector_text,
                         "matches": [
                             {"name": _extract_view_name(view), "view_key": _extract_view_key(view), "type": _normalize_view_type_name(view.get("viewgraphType") or view.get("type"))}
                             for view in matches
@@ -8324,21 +8389,36 @@ class AiBuilderFacade:
                     },
                     suggested_next_call={"tool_name": "app_get", "arguments": {"profile": profile, "app_key": app_key}},
                 )
+            if not matches:
+                failed_view = {
+                    "name": selector_text,
+                    "view_key": selector_text,
+                    "type": None,
+                    "status": "failed",
+                    "error_code": "VIEW_NOT_FOUND",
+                    "message": "remove_views item did not match an existing view name or view_key",
+                }
+                failed_views.append(failed_view)
+                view_results.append(deepcopy(failed_view))
+                continue
             if len(matches) == 1:
                 key = _extract_view_key(matches[0])
+                removed_name = _extract_view_name(matches[0]) or selector_text
                 self.views.view_delete(profile=profile, viewgraph_key=key)
-                removed.append(name)
-                existing_by_name.pop(name, None)
-                existing_by_key.pop(key, None)
-                view_results.append({"name": name, "view_key": key, "type": None, "status": "removed"})
+                removed.append(removed_name)
+                if key:
+                    removed_keys.add(key)
+                    existing_by_key.pop(key, None)
+                existing_by_name.pop(removed_name, None)
+                view_results.append({"name": removed_name, "view_key": key, "type": None, "status": "removed"})
         created: list[str] = []
         updated: list[str] = []
-        failed_views: list[dict[str, Any]] = []
         existing_view_list = [
             view
             for view in (existing_views if isinstance(existing_views, list) else [])
             if isinstance(view, dict)
-            and _extract_view_name(view) not in remove_views
+            and _extract_view_name(view) not in removed
+            and _extract_view_key(view) not in removed_keys
         ]
         for ordinal, patch in enumerate(upsert_views, start=1):
             apply_columns = _resolve_view_visible_field_names(patch)
@@ -8551,6 +8631,11 @@ class AiBuilderFacade:
             if not existing_key and query_condition_payload_for_apply is None:
                 query_condition_payload_for_apply = _empty_view_query_conditions_payload()
                 expected_query_conditions_for_verify = _normalize_view_query_conditions_for_compare(query_condition_payload_for_apply)
+            if not existing_key and associated_resources_payload_for_apply is None:
+                associated_resources_payload_for_apply, _, _ = _build_view_associated_resources_payload(
+                    associated_resources={"visible": True, "limit_type": "all", "associated_item_ids": []},
+                    available_resources=associated_resources,
+                )
             try:
                 view_auth_override = (
                     self._compile_visibility_to_member_auth(profile=profile, visibility=patch.visibility)
@@ -9160,9 +9245,11 @@ class AiBuilderFacade:
                 verification_by_view.append(
                     {
                         "name": name,
+                        "view_key": item.get("view_key"),
                         "type": item.get("type"),
                         "status": "removed",
-                        "present_in_readback": None if verified_views_unavailable else name not in verified_names,
+                        "present_in_readback": None if verified_views_unavailable else name in verified_names,
+                        "removed_verified": None if verified_views_unavailable else name not in verified_names,
                     }
                 )
             else:
@@ -9183,7 +9270,7 @@ class AiBuilderFacade:
         view_filters_verified = verified and not filter_readback_pending and not filter_mismatches
         view_query_conditions_verified = verified and not query_condition_readback_pending and not query_condition_mismatches
         view_associated_resources_verified = verified and not associated_resource_readback_pending and not associated_resource_mismatches
-        view_buttons_verified = verified and not button_readback_pending and not button_mismatches
+        view_buttons_verified = verified and not button_readback_pending and not button_mismatches and not custom_button_readback_pending
         noop = not created and not updated and not removed
         if failed_views:
             successful_changes = bool(created or updated or removed)
@@ -9252,6 +9339,7 @@ class AiBuilderFacade:
                     "custom_button_readback_pending_entries": deepcopy(custom_button_readback_pending_entries),
                 },
                 "app_key": app_key,
+                "app_name": app_name,
                 "views_diff": {"created": created, "updated": updated, "removed": removed, "failed": failed_views},
                 "verified": verified and view_filters_verified and view_query_conditions_verified and view_associated_resources_verified and view_buttons_verified,
             }
@@ -9324,6 +9412,7 @@ class AiBuilderFacade:
                 "by_view": verification_by_view,
             },
             "app_key": app_key,
+            "app_name": app_name,
             "views_diff": {"created": created, "updated": updated, "removed": removed, "failed": []},
             "verified": all_verified,
         }
@@ -9349,6 +9438,7 @@ class AiBuilderFacade:
                 suggested_next_call={"tool_name": "app_get", "arguments": {"profile": profile, "app_key": app_key}},
             )
         tag_ids_before = _coerce_int_list(base_before.get("tagIds"))
+        app_name_before = str(base_before.get("formTitle") or base_before.get("title") or base_before.get("appName") or "").strip() or None
         already_published = bool(base_before.get("appPublishStatus") in {1, 2})
         package_already_attached = None if not expected_package_tag_id else expected_package_tag_id in tag_ids_before
         try:
@@ -9379,6 +9469,7 @@ class AiBuilderFacade:
                 "warnings": [],
                 "verification": {"published": True, "package_attached": package_already_attached, "views_ok": True},
                 "app_key": app_key,
+                "app_name": app_name_before,
                 "published": True,
                 "package_attached": package_already_attached,
                 "tag_ids_after": tag_ids_before,
@@ -9411,6 +9502,7 @@ class AiBuilderFacade:
                 suggested_next_call={"tool_name": "app_get", "arguments": {"profile": profile, "app_key": app_key}},
             )
         tag_ids_after = _coerce_int_list(base.get("tagIds"))
+        app_name_after = str(base.get("formTitle") or base.get("title") or base.get("appName") or app_name_before or "").strip() or None
         package_attached = None if not expected_package_tag_id else expected_package_tag_id in tag_ids_after
         try:
             views, views_unavailable = self._load_views_result(profile=profile, app_key=app_key, tolerate_404=True)
@@ -9451,6 +9543,7 @@ class AiBuilderFacade:
             "warnings": warnings,
             "verification": {"published": bool(base.get("appPublishStatus") in {1, 2}), "package_attached": package_attached, "views_ok": views_ok, "views_read_unavailable": views_unavailable},
             "app_key": app_key,
+            "app_name": app_name_after,
             "published": bool(base.get("appPublishStatus") in {1, 2}),
             "package_attached": package_attached,
             "tag_ids_after": tag_ids_after,
@@ -9588,6 +9681,7 @@ class AiBuilderFacade:
         if resolved_outcome is not None:
             permission_outcomes.append(resolved_outcome)
         app_key = str(app_result.get("app_key") or request.app_key)
+        app_name = str(app_result.get("app_name") or "").strip() or None
         permission_outcome = self._guard_app_permission(
             profile=profile,
             app_key=app_key,
@@ -9933,6 +10027,7 @@ class AiBuilderFacade:
                     "chart_list_source": readback_list_source or existing_chart_list_source,
                 },
                 "app_key": app_key,
+                "app_name": app_name,
                 "chart_results": chart_results,
                 "verified": False if failed_items else verified,
             })
@@ -9961,6 +10056,7 @@ class AiBuilderFacade:
                 "chart_list_source": existing_chart_list_source if noop else readback_list_source,
             },
             "app_key": app_key,
+            "app_name": app_name,
             "chart_results": chart_results,
             "verified": result_verified,
         })
@@ -10246,6 +10342,9 @@ class AiBuilderFacade:
                 "publish_failed": publish_failed,
             },
             "dash_key": dash_key,
+            "dash_name": update_payload.get("dashName"),
+            "package_id": target_package_tag_id,
+            "created": creating,
             "published": published,
             "verified": verified,
             "draft_result": draft_result,
@@ -10338,6 +10437,49 @@ class AiBuilderFacade:
             verification["published"] = False
             return response
         publish_result = self._publish_current_edit_version(profile=profile, app_key=app_key, edit_version_no=edit_version_no)
+        if publish_result.get("status") == "failed" and publish_result.get("error_code") == "APP_EDIT_LOCKED":
+            details = response.get("details")
+            if not isinstance(details, dict):
+                details = {}
+                response["details"] = details
+            suggested = publish_result.get("suggested_next_call")
+            release_args = suggested.get("arguments") if isinstance(suggested, dict) else {}
+            if isinstance(release_args, dict):
+                release_result = self.app_release_edit_lock_if_mine(
+                    profile=profile,
+                    app_key=app_key,
+                    lock_owner_email=str(release_args.get("lock_owner_email") or ""),
+                    lock_owner_name=str(release_args.get("lock_owner_name") or ""),
+                )
+                details["edit_lock_release_result"] = release_result
+                if release_result.get("status") == "success":
+                    retry_result = self._publish_current_edit_version(profile=profile, app_key=app_key, edit_version_no=None)
+                    details["publish_retry_after_edit_lock_release"] = retry_result
+                    publish_result = retry_result
+                    response["retried_after_edit_lock_release"] = True
+                    response["edit_lock_released"] = True
+                elif release_result.get("error_code") == "EDIT_LOCK_OWNER_UNKNOWN" and edit_version_no is not None:
+                    try:
+                        self.apps.app_edit_finished(profile=profile, app_key=app_key, payload={"editVersionNo": edit_version_no})
+                        release_result = {
+                            "status": "success",
+                            "error_code": None,
+                            "recoverable": False,
+                            "message": "released current apply edit context before publish retry",
+                            "details": {"app_key": app_key, "edit_version_no": edit_version_no, "release_strategy": "current_apply_edit_context"},
+                            "verification": {"released": True},
+                            "app_key": app_key,
+                            "verified": True,
+                        }
+                        details["edit_lock_release_result"] = release_result
+                        retry_result = self._publish_current_edit_version(profile=profile, app_key=app_key, edit_version_no=None)
+                        details["publish_retry_after_edit_lock_release"] = retry_result
+                        publish_result = retry_result
+                        response["retried_after_edit_lock_release"] = True
+                        response["edit_lock_released"] = True
+                    except (QingflowApiError, RuntimeError) as error:
+                        api_error = _coerce_api_error(error)
+                        details["current_apply_edit_context_release_error"] = _transport_error_payload(api_error)
         response["publish_result"] = publish_result
         response["published"] = bool(publish_result.get("published"))
         verification["published"] = bool(publish_result.get("published"))
@@ -10362,6 +10504,14 @@ class AiBuilderFacade:
             "schema_source": schema_source,
         }
 
+    def _read_app_name_for_builder_output(self, *, profile: str, app_key: str) -> str | None:
+        try:
+            base = self.apps.app_get_base(profile=profile, app_key=app_key, include_raw=True).get("result") or {}
+        except (QingflowApiError, RuntimeError):
+            return None
+        app_name = str(base.get("formTitle") or base.get("title") or base.get("appName") or "").strip()
+        return app_name or None
+
     def _sync_system_view_apply_config(
         self,
         *,
@@ -12217,6 +12367,8 @@ def _extract_edit_lock_owner(message: str) -> JSONObject:
     patterns = [
         r"应用已被\s*(?P<name>[^（(]+?)\s*[（(](?P<email>[^）)]+)[）)]\s*编辑",
         r"edited by\s*(?P<name>[^<(]+?)\s*<(?P<email>[^>]+)>",
+        r"active editor\s+(?P<email>[A-Za-z0-9._%+\-]+@[A-Za-z0-9.\-]+\.[A-Za-z]{2,})",
+        r"(?P<email>[A-Za-z0-9._%+\-]+@[A-Za-z0-9.\-]+\.[A-Za-z]{2,})",
     ]
     for pattern in patterns:
         match = re.search(pattern, text)
@@ -14193,6 +14345,38 @@ def _parse_schema(schema: dict[str, Any]) -> dict[str, Any]:
     return parsed
 
 
+def _schema_field_identity(field: dict[str, Any] | None, *, fallback_name: str | None = None) -> dict[str, Any]:
+    field = field or {}
+    name = str(field.get("name") or fallback_name or "").strip() or None
+    field_id = str(field.get("field_id") or "").strip() or None
+    que_id = _coerce_positive_int(field.get("que_id") or field.get("queId"))
+    return {
+        "name": name,
+        "field_id": field_id,
+        "que_id": que_id,
+    }
+
+
+def _schema_field_diff_details(
+    *,
+    added: list[str],
+    updated: list[str],
+    removed: list[str],
+    before_fields: list[dict[str, Any]],
+    after_fields: list[dict[str, Any]],
+) -> dict[str, list[dict[str, Any]]]:
+    before_by_name = {str(field.get("name") or ""): field for field in before_fields if str(field.get("name") or "").strip()}
+    after_by_name = {str(field.get("name") or ""): field for field in after_fields if str(field.get("name") or "").strip()}
+    return {
+        "added": [_schema_field_identity(after_by_name.get(name), fallback_name=name) for name in added],
+        "updated": [
+            _schema_field_identity(after_by_name.get(name) or before_by_name.get(name), fallback_name=name)
+            for name in updated
+        ],
+        "removed": [_schema_field_identity(before_by_name.get(name), fallback_name=name) for name in removed],
+    }
+
+
 def _resolve_layout_sections_to_names(
     requested_sections: list[dict[str, Any]],
     fields: list[dict[str, Any]],
@@ -19360,7 +19544,7 @@ def _compare_view_button_summaries(
             expected_without_pending = [item for index, item in enumerate(expected) if index not in pending_indexes]
             if _sorted_view_button_compare_signatures(actual) == _sorted_view_button_compare_signatures(expected_without_pending):
                 return {
-                    "verified": True,
+                    "verified": False,
                     "custom_button_readback_pending": True,
                     "pending_custom_buttons": deepcopy(pending_custom_buttons),
                 }
@@ -19371,7 +19555,7 @@ def _compare_view_button_summaries(
         and _sorted_view_button_compare_signatures(actual_other) == _sorted_view_button_compare_signatures(expected_other)
     )
     return {
-        "verified": custom_button_readback_pending,
+        "verified": False,
         "custom_button_readback_pending": custom_button_readback_pending,
         "pending_custom_buttons": deepcopy(expected_custom) if custom_button_readback_pending else [],
     }