@josephyan/qingflow-cli 1.0.11 → 1.1.2

package/src/qingflow_mcp/tools/app_tools.py

@@ -10,6 +10,7 @@ from ..config import DEFAULT_PROFILE
 from ..errors import QingflowApiError, raise_tool_error
 from ..json_types import JSONObject
 from ..list_type_labels import SYSTEM_VIEW_DEFINITIONS, get_app_publish_status_label
+from ..solution.compiler.icon_utils import workspace_icon_config
 from .base import ToolBase, tool_cn_name
 
 
@@ -18,7 +19,7 @@ class AppTools(ToolBase):
 
     类型：应用元数据与配置工具。
     主要职责：
-    1. 查询应用列表、搜索应用、读取应用详情；
+    1. 查询应用列表、读取应用详情；
     2. 读取与更新应用基础配置、表单结构与发布状态；
     3. 提供应用创建、删除、发布等管理能力。
     """
@@ -26,12 +27,8 @@ class AppTools(ToolBase):
     def register(self, mcp: FastMCP) -> None:
         """注册当前工具到 MCP 服务。"""
         @mcp.tool()
-        def app_list(profile: str = DEFAULT_PROFILE, ship_auth: bool = False) -> JSONObject:
-            return self.app_list(profile=profile, ship_auth=ship_auth)
-
-        @mcp.tool()
-        def app_search(profile: str = DEFAULT_PROFILE, keyword: str = "", page_num: int = 1, page_size: int = 50) -> JSONObject:
-            return self.app_search(profile=profile, keyword=keyword, page_num=page_num, page_size=page_size)
+        def app_list(profile: str = DEFAULT_PROFILE, query: str = "", keyword: str = "", ship_auth: bool = False) -> JSONObject:
+            return self.app_list(profile=profile, query=query, keyword=keyword, ship_auth=ship_auth)
 
         @mcp.tool()
         def app_get(profile: str = DEFAULT_PROFILE, app_key: str = "") -> JSONObject:
@@ -90,24 +87,51 @@ class AppTools(ToolBase):
             return self.app_publish(profile=profile, app_key=app_key, payload=payload or {})
 
     @tool_cn_name("应用列表")
-    def app_list(self, *, profile: str, ship_auth: bool = False) -> JSONObject:
+    def app_list(self, *, profile: str, query: str = "", keyword: str = "", ship_auth: bool = False) -> JSONObject:
         """List current-user visible apps in the selected workspace."""
         def runner(session_profile, context):
             result = self.backend.request("GET", context, "/tag/apps")
             items, source_shape = self._extract_visible_apps(result)
+            normalized_query, warnings = _normalize_app_list_query(query=query, keyword=keyword)
+            unfiltered_count = len(items)
+            if normalized_query:
+                items = self._filter_visible_apps(items, normalized_query)
             response = {
                 "profile": profile,
                 "ws_id": session_profile.selected_ws_id,
                 "items": items,
                 "count": len(items),
                 "source_shape": source_shape,
+                "query": normalized_query,
+                "matched_count": len(items),
+                "unfiltered_count": unfiltered_count,
+                "filter_mode": "local_visible_apps",
             }
+            if warnings:
+                response["warnings"] = warnings
             if ship_auth:
                 response["raw"] = result
             return response
 
         return self._run(profile, runner)
 
+    def _filter_visible_apps(self, items: list[JSONObject], query: str) -> list[JSONObject]:
+        """Filter current-user visible apps locally without calling admin search APIs."""
+        needle = query.casefold()
+        matched: list[JSONObject] = []
+        for item in items:
+            haystacks = (
+                item.get("app_key"),
+                item.get("app_name"),
+                item.get("title"),
+                item.get("package_name"),
+                item.get("tag_name"),
+                item.get("group_name"),
+            )
+            if any(needle in str(value).casefold() for value in haystacks if value not in (None, "")):
+                matched.append(item)
+        return matched
+
     @tool_cn_name("应用搜索")
     def app_search(self, *, profile: str, keyword: str = "", page_num: int = 1, page_size: int = 50) -> JSONObject:
         """Search apps by keyword in name/title using backend search API.
@@ -157,6 +181,7 @@ class AppTools(ToolBase):
             warnings: list[JSONObject] = []
             app_name = app_key
             base_info: JSONObject | None = None
+            app_icon = None
 
             try:
                 base_info = self.backend.request("GET", context, f"/app/{app_key}/baseInfo")
@@ -165,6 +190,7 @@ class AppTools(ToolBase):
                         str(base_info.get("formTitle") or base_info.get("title") or base_info.get("appName") or app_key).strip()
                         or app_key
                     )
+                    app_icon = str(base_info.get("appIcon") or "").strip() or None
             except QingflowApiError as exc:
                 if exc.backend_code not in {40002, 40027}:
                     raise
@@ -202,6 +228,8 @@ class AppTools(ToolBase):
                 "data": {
                     "app_key": app_key,
                     "app_name": app_name,
+                    "app_icon": app_icon,
+                    "icon_config": workspace_icon_config(app_icon),
                     "can_create": can_create,
                     "import_capability": import_capability,
                     "accessible_views": accessible_views,
@@ -924,3 +952,20 @@ def _coerce_optional_bool(value: Any) -> bool | None:
     if isinstance(value, bool):
         return value
     return None
+
+
+def _normalize_app_list_query(*, query: str = "", keyword: str = "") -> tuple[str, list[JSONObject]]:
+    normalized_query = str(query or "").strip()
+    normalized_keyword = str(keyword or "").strip()
+    warnings: list[JSONObject] = []
+    if normalized_query and normalized_keyword:
+        warnings.append(
+            {
+                "code": "APP_LIST_QUERY_TAKES_PRECEDENCE",
+                "message": "Both query and keyword were provided; query was used and keyword was ignored.",
+                "ignored_keyword": normalized_keyword,
+            }
+        )
+    if normalized_query:
+        return normalized_query, warnings
+    return normalized_keyword, warnings

package/src/qingflow_mcp/tools/package_tools.py

@@ -7,6 +7,7 @@ from mcp.server.fastmcp import FastMCP
 from ..config import DEFAULT_PROFILE
 from ..errors import QingflowApiError, raise_tool_error
 from ..json_types import JSONObject
+from ..solution.compiler.icon_utils import workspace_icon_config
 from .base import ToolBase, tool_cn_name
 
 
@@ -281,13 +282,26 @@ class PackageTools(ToolBase):
                     "dashKey": item.get("dashKey"),
                 }
             )
+        item_count = None
+        raw_item_count = result.get("itemCount")
+        try:
+            if raw_item_count is not None:
+                coerced_count = int(raw_item_count)
+                if coerced_count >= 0:
+                    item_count = coerced_count
+        except (TypeError, ValueError):
+            item_count = None
+        if item_count is None and "tagItems" in result:
+            item_count = len(tag_items)
+        tag_icon = result.get("tagIcon") if result.get("tagIcon") is not None else permission_source.get("tagIcon")
         compact = {
             "tagId": result.get("tagId"),
             "tagName": result.get("tagName"),
-            "tagIcon": result.get("tagIcon") if result.get("tagIcon") is not None else permission_source.get("tagIcon"),
+            "tagIcon": tag_icon,
+            "iconConfig": workspace_icon_config(str(tag_icon).strip() if tag_icon not in (None, "") else None),
             "publishStatus": result.get("publishStatus") if result.get("publishStatus") is not None else permission_source.get("publishStatus"),
             "beingTrial": result.get("beingTrial"),
-            "itemCount": len(tag_items),
+            "itemCount": item_count,
             "itemPreview": preview,
             "addAppStatus": permission_source.get("addAppStatus"),
             "editAppStatus": permission_source.get("editAppStatus"),