@josephyan/qingflow-cli 1.0.11 → 1.1.2

package/src/qingflow_mcp/tools/resource_read_tools.py

@@ -6,6 +6,7 @@ from typing import Any
 from ..errors import QingflowApiError, raise_tool_error
 from ..json_types import JSONObject
 from ..list_type_labels import SYSTEM_VIEW_DEFINITIONS
+from ..solution.compiler.icon_utils import workspace_icon_config
 from .app_tools import _analysis_supported_for_view_type
 from .base import ToolBase, tool_cn_name
 from .qingbi_report_tools import QingbiReportTools
@@ -75,6 +76,7 @@ class ResourceReadTools(ToolBase):
                     "dash_key": dash_key,
                     "dash_name": dash_name,
                     "dash_icon": dash_icon,
+                    "icon_config": workspace_icon_config(dash_icon),
                     "package_tag_ids": package_tag_ids,
                     "component_count": len(components),
                     "components": components,
@@ -368,6 +370,7 @@ def _normalize_portal_list_items(raw_items: Any) -> list[dict[str, Any]]:
                 "dash_key": dash_key or None,
                 "dash_name": dash_name or None,
                 "dash_icon": dash_icon,
+                "icon_config": workspace_icon_config(dash_icon),
                 "package_tag_ids": package_tag_ids,
             }
         )

package/src/qingflow_mcp/tools/solution_tools.py

@@ -38,7 +38,6 @@ from .qingbi_report_tools import QingbiReportTools
 from .record_tools import RecordTools
 from .role_tools import RoleTools
 from .view_tools import ViewTools
-from .workflow_tools import WorkflowTools
 from .workspace_tools import WorkspaceTools
 
 STAGED_BUILD_MODES = {"preflight", "plan", "apply", "repair"}
@@ -737,6 +736,36 @@ class SolutionTools(ToolBase):
     ) -> dict[str, Any]:
         """执行方案相关逻辑。"""
         mode = _normalize_staged_build_mode(mode)
+        app_key = str(flow_spec.get("app_key") or "").strip()
+        spec_payload = flow_spec.get("spec")
+        if app_key and isinstance(spec_payload, dict) and spec_payload:
+            from .ai_builder_tools import AiBuilderTools
+
+            builder = AiBuilderTools(self.sessions, self.backend)
+            if mode in {"preflight", "plan"}:
+                return {
+                    "build_id": build_id or _generate_build_id(run_label=run_label, stage_name="flow"),
+                    "mode": mode,
+                    "stage": "flow",
+                    "status": "planned" if mode == "plan" else "preflighted",
+                    "normalized_args": {"app_key": app_key, "spec": spec_payload},
+                    "tool_name": "solution_build_flow",
+                }
+            result = builder.app_flow_apply(
+                profile=profile,
+                app_key=app_key,
+                spec=spec_payload,
+                publish=publish,
+                schema_version=flow_spec.get("schema_version") or flow_spec.get("schemaVersion"),
+            )
+            return {
+                "build_id": build_id,
+                "mode": mode,
+                "stage": "flow",
+                "status": result.get("status"),
+                "result": result,
+                "tool_name": "solution_build_flow",
+            }
         return self._stage_build(
             profile=profile,
             mode=mode,
@@ -1409,7 +1438,6 @@ class SolutionTools(ToolBase):
             role_tools=RoleTools(self.sessions, self.backend),
             app_tools=AppTools(self.sessions, self.backend),
             record_tools=RecordTools(self.sessions, self.backend),
-            workflow_tools=WorkflowTools(self.sessions, self.backend),
             view_tools=ViewTools(self.sessions, self.backend),
             chart_tools=QingbiReportTools(self.sessions, self.backend),
             portal_tools=PortalTools(self.sessions, self.backend),

package/src/qingflow_mcp/tools/workflow_tools.py

@@ -14,25 +14,13 @@ class WorkflowTools(ToolBase):
 
     类型：流程配置工具。
     主要职责：
-    1. 查询流程节点与流程图配置；
-    2. 读取与更新流程规则；
-    3. 支持流程发布与流程调试辅助能力。
+    1. 支持流程运行时校验与调试辅助能力；
+    2. 保留 legacy 节点写路径供内部/测试直接调用（非 MCP 公开）。
+    设计期流程配置读取统一走 WorkflowSpec（app_flow_get / GET /api/workflow/spec）。
     """
 
     def register(self, mcp: FastMCP) -> None:
         """注册当前工具到 MCP 服务。"""
-        @mcp.tool()
-        def workflow_list_nodes(profile: str = DEFAULT_PROFILE, app_key: str = "") -> JSONObject:
-            return self.workflow_list_nodes(profile=profile, app_key=app_key)
-
-        @mcp.tool()
-        def workflow_get_node_detail(profile: str = DEFAULT_PROFILE, app_key: str = "", audit_node_id: int = 0) -> JSONObject:
-            return self.workflow_get_node_detail(profile=profile, app_key=app_key, audit_node_id=audit_node_id)
-
-        @mcp.tool()
-        def workflow_get_global_settings(profile: str = DEFAULT_PROFILE, app_key: str = "") -> JSONObject:
-            return self.workflow_get_global_settings(profile=profile, app_key=app_key)
-
         @mcp.tool()
         def workflow_get_future_nodes(profile: str = DEFAULT_PROFILE, app_key: str = "", apply_id: int = 0) -> JSONObject:
             return self.workflow_get_future_nodes(profile=profile, app_key=app_key, apply_id=apply_id)
@@ -53,22 +41,6 @@ class WorkflowTools(ToolBase):
                 audit_node_id=audit_node_id,
             )
 
-        @mcp.tool()
-        def workflow_get_qsource_active(profile: str = DEFAULT_PROFILE, app_key: str = "", qsource_id: int = 0) -> JSONObject:
-            return self.workflow_get_qsource_active(profile=profile, app_key=app_key, qsource_id=qsource_id)
-
-        @mcp.tool()
-        def workflow_get_qsource_passive(profile: str = DEFAULT_PROFILE, app_key: str = "", qsource_id: int = 0) -> JSONObject:
-            return self.workflow_get_qsource_passive(profile=profile, app_key=app_key, qsource_id=qsource_id)
-
-        @mcp.tool()
-        def workflow_get_editable_question_ids(profile: str = DEFAULT_PROFILE, app_key: str = "", audit_node_id: int = 0) -> JSONObject:
-            return self.workflow_get_editable_question_ids(profile=profile, app_key=app_key, audit_node_id=audit_node_id)
-
-        @mcp.tool()
-        def workflow_get_print_nodes(profile: str = DEFAULT_PROFILE, app_key: str = "") -> JSONObject:
-            return self.workflow_get_print_nodes(profile=profile, app_key=app_key)
-
     @tool_cn_name("流程节点列表")
     def workflow_list_nodes(self, *, profile: str, app_key: str) -> JSONObject:
         """执行流程相关逻辑。"""

package/src/qingflow_mcp/version.py

@@ -0,0 +1,110 @@
+from __future__ import annotations
+
+import json
+import re
+import shutil
+import sys
+from importlib import metadata
+from pathlib import Path
+
+
+def get_cli_version() -> str:
+    package_json_version = _find_package_json_version()
+    if package_json_version:
+        return package_json_version
+    try:
+        return metadata.version("qingflow-mcp")
+    except metadata.PackageNotFoundError:
+        return "0+local"
+
+
+def get_cli_version_info() -> dict[str, str | None]:
+    package_root = _find_package_root()
+    return {
+        "version": get_cli_version(),
+        "package": _find_package_name(package_root) or "@qingflow-tech/qingflow-cli",
+        "executable_path": _resolve_executable_path(),
+        "command_path": shutil.which("qingflow"),
+        "package_root": str(package_root) if package_root is not None else None,
+        "skill_version": _find_skill_version(package_root),
+    }
+
+
+def _find_package_json_version() -> str | None:
+    package_root = _find_package_root()
+    if package_root is None:
+        return None
+    try:
+        payload = json.loads((package_root / "package.json").read_text(encoding="utf-8"))
+    except (OSError, json.JSONDecodeError):
+        return None
+    version = str(payload.get("version") or "")
+    return version or None
+
+
+def _find_package_root() -> Path | None:
+    current = Path(__file__).resolve()
+    for parent in current.parents:
+        package_json = parent / "package.json"
+        if not package_json.exists():
+            continue
+        try:
+            payload = json.loads(package_json.read_text(encoding="utf-8"))
+        except (OSError, json.JSONDecodeError):
+            continue
+        name = str(payload.get("name") or "")
+        version = str(payload.get("version") or "")
+        if version and name in {
+            "qingflow-mcp-workspace",
+            "@qingflow-tech/qingflow-cli",
+            "@qingflow-tech/qingflow-app-user-mcp",
+            "@qingflow-tech/qingflow-app-builder-mcp",
+            "@josephyan/qingflow-cli",
+            "@josephyan/qingflow-app-user-mcp",
+            "@josephyan/qingflow-app-builder-mcp",
+        }:
+            return parent
+    return None
+
+
+def _find_package_name(package_root: Path | None) -> str | None:
+    if package_root is None:
+        return None
+    try:
+        payload = json.loads((package_root / "package.json").read_text(encoding="utf-8"))
+    except (OSError, json.JSONDecodeError):
+        return None
+    name = str(payload.get("name") or "")
+    return name or None
+
+
+def _resolve_executable_path() -> str | None:
+    if not sys.argv:
+        return None
+    raw = str(sys.argv[0] or "").strip()
+    if not raw:
+        return None
+    try:
+        return str(Path(raw).resolve())
+    except OSError:
+        return raw
+
+
+def _find_skill_version(package_root: Path | None) -> str | None:
+    if package_root is None:
+        return None
+    candidates = [
+        package_root / "skills" / "qingflow-cli" / "SKILL.md",
+        package_root / "skill" / "qingflow-cli" / "SKILL.md",
+    ]
+    for skill_file in candidates:
+        if not skill_file.exists():
+            continue
+        try:
+            text = skill_file.read_text(encoding="utf-8")
+        except OSError:
+            continue
+        match = re.search(r"Skill\s*版本\**[:：]\s*`?([^`\s）)]+)", text)
+        if match:
+            return match.group(1).strip()
+    return None

package/src/qingflow_mcp/solution/compiler/workflow_compiler.py

@@ -1,173 +0,0 @@
-from __future__ import annotations
-
-from typing import Any
-
-from ..spec_models import EntitySpec, WorkflowNodeType
-
-
-WORKFLOW_TYPE_MAP = {
-    WorkflowNodeType.start: {"type": 0, "dealType": 3},
-    WorkflowNodeType.branch: {"type": 1, "dealType": None},
-    WorkflowNodeType.audit: {"type": 0, "dealType": 0},
-    WorkflowNodeType.fill: {"type": 0, "dealType": 1},
-    WorkflowNodeType.copy: {"type": 0, "dealType": 2},
-    WorkflowNodeType.webhook: {"type": 3, "dealType": 10},
-    WorkflowNodeType.condition: {"type": 2, "dealType": None},
-}
-
-
-def _default_audit_user_infos() -> dict[str, Any]:
-    return {
-        "member": [],
-        "depart": [],
-        "role": [],
-        "dynamic": [],
-        "includeSubDeparts": None,
-        "externalMemberList": [],
-        "externalDepartList": [],
-        "role_refs": [],
-    }
-
-
-def compile_workflow(entity: EntitySpec) -> dict[str, Any] | None:
-    workflow = entity.workflow
-    if workflow is None or not workflow.enabled:
-        return None
-    actions: list[dict[str, Any]] = []
-    seen_node_ids: set[str] = set()
-    created_extra_branch_lanes: set[str] = set()
-    start_node_ids = {
-        node.node_id
-        for node in workflow.nodes
-        if node.node_type == WorkflowNodeType.start
-    }
-    for node in workflow.nodes:
-        if node.node_type == WorkflowNodeType.start:
-            seen_node_ids.add(node.node_id)
-            continue
-        if node.parent_node_id and node.parent_node_id not in seen_node_ids:
-            raise ValueError(f"workflow node '{node.node_id}' must appear after parent node '{node.parent_node_id}'")
-        if node.branch_parent_id and node.branch_parent_id not in seen_node_ids:
-            raise ValueError(f"workflow node '{node.node_id}' must appear after branch node '{node.branch_parent_id}'")
-        branch_index = _branch_index(node)
-        branch_lane_ref = _branch_lane_ref(node.branch_parent_id, branch_index) if node.branch_parent_id else None
-        if branch_lane_ref and branch_index > 2 and branch_lane_ref not in created_extra_branch_lanes:
-            actions.append(
-                {
-                    "action": "create_sub_branch",
-                    "node_id": branch_lane_ref,
-                    "payload": {
-                        "editVersionNo": 1,
-                        "auditNodeRef": node.branch_parent_id,
-                    },
-                }
-            )
-            created_extra_branch_lanes.add(branch_lane_ref)
-        lane_only = bool((node.config or {}).get("__lane_only__")) and node.node_type == WorkflowNodeType.condition and branch_lane_ref
-        if lane_only:
-            lane_payload = {key: value for key, value in node.config.items() if key != "__lane_only__"}
-            actions.append(
-                {
-                    "action": "update_node",
-                    "node_id": branch_lane_ref,
-                    "node_name": node.name,
-                    "node_type": node.node_type.value,
-                    "payload": {
-                        "editVersionNo": 1,
-                        "auditNodeName": node.name,
-                        "type": WORKFLOW_TYPE_MAP[node.node_type]["type"],
-                        "dealType": WORKFLOW_TYPE_MAP[node.node_type]["dealType"],
-                        **lane_payload,
-                    },
-                }
-            )
-            seen_node_ids.add(node.node_id)
-            continue
-        actions.append(
-            {
-                "action": "add_node",
-                "node_id": node.node_id,
-                "node_name": node.name,
-                "node_type": node.node_type.value,
-                "payload": {
-                    "editVersionNo": 1,
-                    "auditNodeName": node.name,
-                    "type": WORKFLOW_TYPE_MAP[node.node_type]["type"],
-                    "dealType": WORKFLOW_TYPE_MAP[node.node_type]["dealType"],
-                    "prevNodeRef": _prev_node_ref(node, branch_lane_ref, start_node_ids),
-                    "auditUserInfos": _build_audit_user_infos(node)
-                    if node.node_type in {WorkflowNodeType.audit, WorkflowNodeType.fill, WorkflowNodeType.copy}
-                    else None,
-                    **node.config,
-                },
-            }
-        )
-        seen_node_ids.add(node.node_id)
-    return {
-        "global_settings": {
-            "editVersionNo": 1,
-            **workflow.global_settings,
-        },
-        "actions": actions,
-    }
-
-
-def _build_audit_user_infos(node) -> dict[str, Any]:
-    audit_user_infos = _default_audit_user_infos()
-    assignees = node.assignees or {}
-    member_uids = assignees.get("member_uids") or []
-    if member_uids:
-        audit_user_infos["member"] = [
-            {"uid": uid, "beingFrontendConfig": True}
-            for uid in member_uids
-            if isinstance(uid, int) and uid > 0
-        ]
-    role_refs = assignees.get("role_refs") or []
-    if role_refs:
-        audit_user_infos["role_refs"] = [role_ref for role_ref in role_refs if role_ref]
-    role_entries = assignees.get("role_entries") or []
-    if role_entries:
-        audit_user_infos["role"] = [
-            {
-                "roleId": int(entry.get("roleId") or entry.get("role_id")),
-                "roleName": entry.get("roleName") or entry.get("role_name") or str(entry.get("roleId") or entry.get("role_id")),
-                "roleIcon": entry.get("roleIcon") or entry.get("role_icon") or "ex-user-outlined",
-                "beingFrontendConfig": True,
-            }
-            for entry in role_entries
-            if isinstance(entry, dict) and isinstance(entry.get("roleId") or entry.get("role_id"), int) and int(entry.get("roleId") or entry.get("role_id")) > 0
-        ]
-    include_sub_departs = assignees.get("include_sub_departs")
-    if include_sub_departs is not None:
-        audit_user_infos["includeSubDeparts"] = bool(include_sub_departs)
-    return audit_user_infos
-
-
-def _prev_node_ref(node, branch_lane_ref: str | None, start_node_ids: set[str]) -> str:
-    if branch_lane_ref:
-        if node.parent_node_id and node.parent_node_id != node.branch_parent_id:
-            return node.parent_node_id
-        return branch_lane_ref
-    if node.parent_node_id in start_node_ids:
-        return "__applicant__"
-    return node.parent_node_id or "__applicant__"
-
-
-def _branch_index(node) -> int:
-    config = node.config or {}
-    raw_value = getattr(node, "branch_index", None)
-    if raw_value is None:
-        raw_value = config.get("branch_index", config.get("branchIndex", config.get("lane_index", config.get("laneIndex", 1))))
-    try:
-        branch_index = int(raw_value)
-    except (TypeError, ValueError) as exc:
-        raise ValueError(f"workflow node '{node.node_id}' has invalid branch index '{raw_value}'") from exc
-    if branch_index <= 0:
-        raise ValueError(f"workflow node '{node.node_id}' branch index must be positive")
-    return branch_index
-
-
-def _branch_lane_ref(branch_parent_id: str | None, branch_index: int) -> str:
-    if not branch_parent_id:
-        raise ValueError("branch_parent_id is required for branch lane references")
-    return f"__branch_lane__{branch_parent_id}__{branch_index}"