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

package/src/qingflow_mcp/resource_uri.py

@@ -0,0 +1,184 @@
+from __future__ import annotations
+
+import re
+from dataclasses import dataclass
+from typing import Any
+from urllib.parse import quote, unquote, urlsplit, urlunsplit
+
+from .config import get_web_base_url
+from .errors import QingflowApiError
+from .json_types import JSONObject
+
+
+SYSTEM_VIEW_NAMES = frozenset({"all", "initiated", "todo", "done", "cc"})
+_ENCODED_OCTET = re.compile(r"%[0-9A-Fa-f]{2}")
+
+
+@dataclass(frozen=True, slots=True)
+class ResourcePath:
+    resource_type: str
+    ws_id: int
+    package_id: int | None = None
+    app_key: str | None = None
+    view_kind: str | None = None
+    view_key: str | None = None
+
+
+def validate_resource_identity(value: object, field: str = "resource_id") -> str:
+    """按资源 URI 单路径段合同校验并返回规范身份，不读取网页域名配置。"""
+    return _validate_identity(value, field)
+
+
+def validate_positive_resource_id(value: object, field: str = "resource_id") -> int:
+    """按资源 URI 数字路径段合同校验正整数，不接受布尔值或浮点截断。"""
+    return int(_positive_int_segment(value, field))
+
+
+def build_resource_uri(
+    *,
+    ws_id: object,
+    resource_type: str,
+    package_id: object = None,
+    app_key: object = None,
+    view_kind: str | None = None,
+    view_key: object = None,
+    web_origin: str | None = None,
+) -> str:
+    """按固定公共合同构造资源 URI，不接受通用目标路由。"""
+    workspace = _positive_int_segment(ws_id, "ws_id")
+    if resource_type == "package":
+        path = f"/resources/ws/{workspace}/package/{_positive_int_segment(package_id, 'package_id')}"
+    elif resource_type == "app":
+        path = f"/resources/ws/{workspace}/app/{_identity_segment(app_key, 'app_key')}"
+    elif resource_type == "view":
+        app_segment = _identity_segment(app_key, "app_key")
+        if view_kind == "custom":
+            view_segment = _identity_segment(view_key, "view_key")
+        elif view_kind == "system":
+            name = str(view_key or "").strip()
+            if name not in SYSTEM_VIEW_NAMES:
+                raise ValueError("system view name is not supported")
+            view_segment = name
+        else:
+            raise ValueError("view_kind must be custom or system")
+        path = f"/resources/ws/{workspace}/app/{app_segment}/view/{view_kind}/{view_segment}"
+    else:
+        raise ValueError("resource_type is not supported")
+    return f"{_normalize_web_origin(web_origin) if web_origin is not None else get_web_base_url()}{path}"
+
+
+def parse_resource_path(value: str) -> ResourcePath:
+    """严格解析资源 pathname，供免登录签发前校验工作区。"""
+    try:
+        parsed = urlsplit(value)
+        if parsed.scheme or parsed.netloc or parsed.query or parsed.fragment or parsed.path != value:
+            raise ValueError
+        parts = parsed.path.split("/")
+        if len(parts) < 6 or parts[:3] != ["", "resources", "ws"]:
+            raise ValueError
+        ws_id = int(_decode_segment(parts[3], "ws_id"))
+        if ws_id <= 0:
+            raise ValueError
+        if len(parts) == 6 and parts[4] == "package":
+            package_id = int(_decode_segment(parts[5], "package_id"))
+            if package_id <= 0:
+                raise ValueError
+            return ResourcePath("package", ws_id, package_id=package_id)
+        if len(parts) == 6 and parts[4] == "app":
+            return ResourcePath("app", ws_id, app_key=_decode_segment(parts[5], "app_key"))
+        if len(parts) == 9 and parts[4] == "app" and parts[6] == "view":
+            app_key = _decode_segment(parts[5], "app_key")
+            view_kind = parts[7]
+            view_key = _decode_segment(parts[8], "view_key")
+            if view_kind == "system" and view_key not in SYSTEM_VIEW_NAMES:
+                raise ValueError
+            if view_kind not in {"custom", "system"}:
+                raise ValueError
+            return ResourcePath("view", ws_id, app_key=app_key, view_kind=view_kind, view_key=view_key)
+    except (TypeError, ValueError, UnicodeError):
+        pass
+    raise ValueError("resource path is invalid")
+
+
+def try_build_resource_uri(**kwargs: Any) -> tuple[str | None, JSONObject | None]:
+    try:
+        return build_resource_uri(**kwargs), None
+    except (QingflowApiError, ValueError, UnicodeError) as error:
+        return None, {
+            "code": "RESOURCE_URI_UNAVAILABLE",
+            "message": f"resource URI was omitted because its identity or web origin is invalid: {error}",
+        }
+
+
+def _positive_int_segment(value: object, field: str) -> str:
+    if isinstance(value, bool):
+        raise ValueError(f"{field} must be a positive integer")
+    try:
+        parsed = int(value)
+    except (TypeError, ValueError):
+        raise ValueError(f"{field} must be a positive integer") from None
+    if parsed <= 0 or str(value).strip() != str(parsed):
+        raise ValueError(f"{field} must be a positive integer")
+    return str(parsed)
+
+
+def _normalize_web_origin(value: str) -> str:
+    try:
+        parsed = urlsplit(value.strip())
+        if (
+            parsed.scheme not in {"http", "https"}
+            or not parsed.hostname
+            or parsed.username is not None
+            or parsed.password is not None
+            or parsed.path not in {"", "/"}
+            or parsed.query
+            or parsed.fragment
+            or any(character.isspace() or ord(character) < 32 for character in value)
+        ):
+            raise ValueError
+        _ = parsed.port
+    except (AttributeError, ValueError):
+        raise ValueError("web_origin must be an absolute HTTP(S) origin") from None
+    return urlunsplit((parsed.scheme, parsed.netloc, "", "", ""))
+
+
+def _identity_segment(value: object, field: str) -> str:
+    raw = _validate_identity(value, field)
+    return quote(raw, safe="")
+
+
+def _decode_segment(value: str, field: str) -> str:
+    decoded = _validate_identity(unquote(value, errors="strict"), field)
+    if quote(decoded, safe="") != value:
+        raise ValueError(f"{field} must use canonical path encoding")
+    return decoded
+
+
+def _validate_identity(value: object, field: str) -> str:
+    source = str(value or "")
+    if any(ord(character) < 32 or ord(character) == 127 for character in source):
+        raise ValueError(f"{field} must be one safe path segment")
+    raw = source.strip()
+    if not raw:
+        raise ValueError(f"{field} is required")
+    current = raw
+    for _ in range(8):
+        if (
+            current in {".", ".."}
+            or any(character in current for character in "/\\?#")
+            or any(ord(character) < 32 or ord(character) == 127 for character in current)
+        ):
+            raise ValueError(f"{field} must be one safe path segment")
+        decoded = unquote(current, errors="strict")
+        if decoded == current:
+            return raw
+        current = decoded
+    if (
+        current in {".", ".."}
+        or any(character in current for character in "/\\?#")
+        or any(ord(character) < 32 or ord(character) == 127 for character in current)
+    ):
+        raise ValueError(f"{field} must be one safe path segment")
+    if _ENCODED_OCTET.search(current):
+        raise ValueError(f"{field} has excessive encoding")
+    return raw

package/src/qingflow_mcp/response_trim.py

@@ -51,6 +51,10 @@ COMMON_ERROR_DROP_TOP = {
 
 SUCCESS_POLICY_BY_TOOL: dict[str, TransformFn] = {}
 
+#: 这两个校验命令的产出契约明确包含 ok 字段（供阶段 2 SKILL.md 引用），
+#: 需在 success 裁剪时保留 ok（默认 COMMON_SUCCESS_DROP_TOP 会丢弃 ok）。
+_KEEP_OK_TOOLS = {"builder:app_form_validate_formula", "builder:app_form_validate_code_block"}
+
 
 def trim_public_response(tool_name: str | None, payload: dict[str, Any]) -> dict[str, Any]:
     if not isinstance(payload, dict):
@@ -85,6 +89,8 @@ def trim_success_response(tool_name: str | None, payload: dict[str, Any]) -> dic
         drop_keys = COMMON_SUCCESS_DROP_TOP - {"output_profile"}
     if tool_name in {"user:record_insert", "user:record_update", "user:record_delete"} and payload.get("ok") is False:
         drop_keys = drop_keys - {"ok"}
+    if tool_name in _KEEP_OK_TOOLS:
+        drop_keys = drop_keys - {"ok"}
     if tool_name == "builder:app_form_apply" and payload.get("mustReadCurrentStateBeforeRepair") is True:
         drop_keys = drop_keys - {"suggested_next_call"}
     _drop_top_keys(trimmed, drop_keys)
@@ -320,7 +326,7 @@ def _trim_workspace_get(payload: JSONObject) -> None:
 
 def _trim_app_list_like(payload: JSONObject) -> None:
     payload.pop("apps", None)
-    _trim_item_list(payload, "items", allowed=("app_key", "app_name", "package_name"))
+    _trim_item_list(payload, "items", allowed=("app_key", "app_name", "package_name", "uri"))
 
 
 def _trim_app_get(payload: JSONObject) -> None:
@@ -328,7 +334,7 @@ def _trim_app_get(payload: JSONObject) -> None:
     _trim_nested_item_list(
         payload,
         ("data", "accessible_views"),
-        allowed=("view_id", "name", "analysis_supported", "list_supported", "kind"),
+        allowed=("view_id", "name", "analysis_supported", "list_supported", "kind", "uri"),
     )
 
 
@@ -1128,6 +1134,13 @@ def _summarize_form_diff(diff: dict[str, Any]) -> dict[str, Any]:
     return summary
 
 
+def _trim_login_link(payload: JSONObject) -> None:
+    # 临时票据只通过链接交付，必须保留链接和过期时间。
+    for key in list(payload):
+        if key not in {"url", "expires_at"}:
+            payload.pop(key)
+
+
 def _register_policy(domains: tuple[str, ...], names: tuple[str, ...], transform: TransformFn) -> None:
     for domain in domains:
         for name in names:
@@ -1209,6 +1222,7 @@ _register_policy(
     _trim_directory,
 )
 _register_policy((USER_DOMAIN, BUILDER_DOMAIN), ("feedback_submit",), _trim_feedback)
+_register_policy((USER_DOMAIN, BUILDER_DOMAIN), ("get_login_link",), _trim_login_link)
 _register_policy(
     (USER_DOMAIN,),
     (

package/src/qingflow_mcp/server.py

@@ -13,6 +13,7 @@ from .tools.feedback_tools import FeedbackTools
 from .tools.export_tools import ExportTools
 from .tools.file_tools import FileTools
 from .tools.import_tools import ImportTools
+from .tools.login_link_tools import LoginLinkTools
 from .tools.package_tools import PackageTools
 from .tools.navigation_tools import NavigationTools
 from .tools.directory_tools import DirectoryTools
@@ -238,6 +239,7 @@ If the current MCP capability is unsupported, the workflow is awkward, or the us
     sessions = SessionStore()
     backend = BackendClient()
     AuthTools(sessions, backend).register(server)
+    LoginLinkTools(sessions, backend).register(server)
     FeedbackTools(backend, mcp_side="通用").register(server)
     WorkspaceTools(sessions, backend).register(server)
     FileTools(sessions, backend).register(server)

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

@@ -17,6 +17,7 @@ from .tools.export_tools import ExportTools
 from .tools.feedback_tools import FeedbackTools
 from .tools.file_tools import FileTools
 from .tools.import_tools import ImportTools
+from .tools.login_link_tools import LOGIN_LINK_DESCRIPTION, LoginLinkTools
 from .tools.resource_read_tools import ResourceReadTools
 from .tools.task_context_tools import TaskContextTools
 from .tools.workspace_tools import WorkspaceTools
@@ -30,6 +31,17 @@ def build_user_server(*, stateless_http: bool = False) -> FastMCP:
         stateless_http=stateless_http,
         instructions=f"""Use this server for Qingflow operational workflows. Current date: `{today.isoformat()}`.
 
+## 页面交接
+
+用户需要查看结果、继续编辑、处理业务或进入工作区页面时，优先使用业务输出中的稳定 `uri`。纯数据查询和中间读取不签发链接。
+目标路径由业务工具或领域 Skill 根据真实前端路由确定，不由票据工具根据业务标识推导。
+已知目标传可选 `redirect_path`；明确指定页面但路径未知时继续定位或说明限制，不猜测，也不静默改为首页。
+搜索未命中时继续搜索 `login` 或查看服务工具列表，不擅自打开固定正式站点；鉴权或工具失败时如实说明。
+目标浏览器登录态未知时，默认对每个要交付的资源 `uri` 分别调用一次 `get_login_link`；只有用户确认同一浏览器、网页域名、账号和工作区已经登录时才直接交付稳定 `uri`。调用过票据工具、自动化浏览器已登录或之前签发过票据均不能证明用户浏览器已登录，已消费链接也不能复用。
+临近交付时再签发，使用返回的完整 URL。要求“给我链接”时仅交付，不提前消费；要求“打开”时才调用浏览器。签发失败时明确说明需要登录，并提供对应稳定 `uri` 作为备用入口。
+浏览器不可用时提供可点击链接；用“查看记录”“继续编辑”等文案，不展示工作区数字 ID 或原始 JSON。
+链接约 5 分钟内一次性有效，不能作为长期书签；安全验证及原有业务权限不变。
+
 ## App Discovery
 
 If `app_key` is unknown, use `app_list` first. Pass `query` to filter visible apps by keyword.
@@ -237,6 +249,7 @@ If the current MCP capability is unsupported, the workflow is awkward, or the us
     code_block_tools = wrap_trimmed_methods(CodeBlockTools(sessions, backend), USER_SERVER_METHOD_MAP)
     task_context_tools = wrap_trimmed_methods(TaskContextTools(sessions, backend), USER_SERVER_METHOD_MAP)
     directory_tools = wrap_trimmed_methods(DirectoryTools(sessions, backend), USER_SERVER_METHOD_MAP)
+    login_link = LoginLinkTools(sessions, backend)
 
     @server.tool()
     def auth_use_credential(
@@ -258,6 +271,11 @@ If the current MCP capability is unsupported, the workflow is awkward, or the us
     def auth_whoami(profile: str = DEFAULT_PROFILE) -> dict:
         return auth.auth_whoami(profile=profile)
 
+    @server.tool(description=LOGIN_LINK_DESCRIPTION)
+    def get_login_link(profile: str = DEFAULT_PROFILE, redirect_path: str = "") -> dict:
+        """获取一次性免登录链接；redirect_path 可选，仅接受站内业务路径，省略进入首页。"""
+        return login_link.get_login_link(profile=profile, redirect_path=redirect_path)
+
     @server.tool()
     def auth_logout(profile: str = DEFAULT_PROFILE, forget_persisted: bool = False) -> dict:
         return auth.auth_logout(profile=profile, forget_persisted=forget_persisted)