@qingflow-tech/qingflow-app-user-mcp 1.0.1 → 1.0.2

package/README.md

@@ -3,13 +3,13 @@
 Install:
 
 ```bash
-npm install @qingflow-tech/qingflow-app-user-mcp@1.0.1
+npm install @qingflow-tech/qingflow-app-user-mcp@1.0.2
 ```
 
 Run:
 
 ```bash
-npx -y -p @qingflow-tech/qingflow-app-user-mcp@1.0.1 qingflow-app-user-mcp
+npx -y -p @qingflow-tech/qingflow-app-user-mcp@1.0.2 qingflow-app-user-mcp
 ```
 
 Environment:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qingflow-tech/qingflow-app-user-mcp",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Operational end-user MCP for Qingflow records, tasks, comments, and directory workflows.",
   "license": "MIT",
   "type": "module",

package/src/qingflow_mcp/cli/commands/auth.py

@@ -25,8 +25,13 @@ def register(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) ->
     logout.add_argument("--forget-persisted", action="store_true")
     logout.set_defaults(handler=_handle_logout, format_hint="")
 
+
 def _handle_use_credential(args: argparse.Namespace, context: CliContext) -> dict:
-    credential = read_secret_arg(args.credential, stdin_enabled=bool(args.credential_stdin), label="credential")
+    credential = (
+        read_secret_arg(args.credential, stdin_enabled=bool(args.credential_stdin), label="credential")
+        if args.credential or bool(args.credential_stdin)
+        else ""
+    )
     return context.auth.auth_use_credential(
         profile=args.profile,
         base_url=args.base_url,

package/src/qingflow_mcp/config.py

@@ -22,6 +22,7 @@ DEFAULT_REPOSITORY_AUTHOR_NAME = "qingflow-mcp"
 DEFAULT_REPOSITORY_AUTHOR_EMAIL = "qingflow-mcp@local.invalid"
 DEFAULT_REPOSITORY_INTERNAL_SHARE_TOKEN_KEY = "tokenKey"
 DEFAULT_CREDIT_USAGE_RECORD_PATH = "/user/credit/usage"
+DEFAULT_MCPORTER_CONFIG_PATH = "/root/.openclaw/workspace/config/mcporter.json"
 
 
 def get_mcp_home() -> Path:
@@ -33,6 +34,13 @@ def get_profiles_path() -> Path:
     return get_mcp_home() / "profiles.json"
 
 
+def get_mcporter_config_path() -> Path:
+    custom_path = os.getenv("QINGFLOW_MCP_MCPORTER_CONFIG_PATH") or os.getenv(
+        "QINGFLOW_MCP_AUTH_CONFIG_PATH"
+    )
+    return Path(custom_path).expanduser() if custom_path else Path(DEFAULT_MCPORTER_CONFIG_PATH)
+
+
 def get_repository_metadata_dir() -> Path:
     return get_mcp_home() / "repository-metadata"
 

package/src/qingflow_mcp/tools/auth_tools.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import json
 from typing import Any
 
 from mcp.server.fastmcp import FastMCP
@@ -9,6 +10,7 @@ from ..config import (
     DEFAULT_PROFILE,
     get_default_base_url,
     get_default_qf_version,
+    get_mcporter_config_path,
     normalize_base_url,
 )
 from ..errors import QingflowApiError, raise_tool_error
@@ -77,15 +79,24 @@ class AuthTools(ToolBase):
         profile: str = DEFAULT_PROFILE,
         base_url: str | None = None,
         qf_version: str | None = None,
-        credential: str,
+        credential: str | None = None,
         persist: bool = False,
     ) -> dict[str, Any]:
         """执行认证与会话相关逻辑。"""
-        normalized_base_url = self._normalize_base_url(base_url)
+        resolved_base_url, resolved_credential = self._resolve_mcporter_auth_inputs(
+            base_url=base_url,
+            credential=credential,
+        )
+        normalized_base_url = self._normalize_base_url(resolved_base_url)
         normalized_qf_version, qf_version_source = self._resolve_qf_version_input(qf_version)
-        normalized_credential = str(credential).strip()
+        normalized_credential = str(resolved_credential).strip()
         if not normalized_credential:
-            raise_tool_error(QingflowApiError.config_error("credential is required"))
+            raise_tool_error(
+                QingflowApiError.config_error(
+                    "credential is required or configure /root/.openclaw/workspace/config/mcporter.json "
+                    "with mcpServers.qingflow.headers.x-qingflow-client-id"
+                )
+            )
 
         context_payload, detected_qf_version = self._fetch_auth_context(
             normalized_base_url,
@@ -153,6 +164,46 @@ class AuthTools(ToolBase):
             ),
         }
 
+    def _resolve_mcporter_auth_inputs(self, *, base_url: str | None, credential: str | None) -> tuple[str | None, str]:
+        """从参数或 mcporter 配置解析登录所需 base_url 与 credential。"""
+        normalized_base_url = self._normalize_text(base_url)
+        normalized_credential = self._normalize_text(credential)
+        if normalized_base_url and normalized_credential:
+            return normalized_base_url, normalized_credential
+
+        mcporter_context = self._read_mcporter_qingflow_context()
+        if not normalized_base_url:
+            normalized_base_url = self._normalize_text(mcporter_context.get("base_url"))
+        if not normalized_credential:
+            normalized_credential = self._normalize_text(mcporter_context.get("credential"))
+        return normalized_base_url, normalized_credential or ""
+
+    def _read_mcporter_qingflow_context(self) -> dict[str, str]:
+        """读取 OpenClaw mcporter 中的 Qingflow MCP 上下文。"""
+        path = get_mcporter_config_path()
+        if not path.exists():
+            return {}
+        try:
+            with path.open("r", encoding="utf-8") as handle:
+                payload = json.load(handle)
+        except (OSError, json.JSONDecodeError) as exc:
+            raise_tool_error(QingflowApiError.config_error(f"failed to read mcporter config '{path}': {exc}"))
+
+        if not isinstance(payload, dict):
+            raise_tool_error(QingflowApiError.config_error(f"mcporter config '{path}' must be a JSON object"))
+        mcp_servers = payload.get("mcpServers")
+        qingflow = mcp_servers.get("qingflow") if isinstance(mcp_servers, dict) else None
+        if not isinstance(qingflow, dict):
+            return {}
+        headers = qingflow.get("headers")
+        credential = None
+        if isinstance(headers, dict):
+            credential = headers.get("x-qingflow-client-id")
+        return {
+            "base_url": str(qingflow.get("url") or "").strip(),
+            "credential": str(credential or "").strip(),
+        }
+
     @tool_cn_name("我的身份")
     def auth_whoami(self, *, profile: str = DEFAULT_PROFILE) -> dict[str, Any]:
         """执行认证与会话相关逻辑。"""