@josephyan/qingflow-cli 0.2.0-beta.984 → 0.2.0-beta.986

package/src/qingflow_mcp/server_app_builder.py

@@ -56,38 +56,18 @@ def build_builder_server() -> FastMCP:
     feedback = FeedbackTools(backend, mcp_side="App Builder MCP")
 
     @server.tool()
-    def auth_login(
+    def auth_use_credential(
         profile: str = DEFAULT_PROFILE,
         base_url: str | None = None,
         qf_version: str | None = None,
-        email: str = "",
-        password: str = "",
-        persist: bool = True,
-    ) -> dict:
-        return auth.auth_login(
-            profile=profile,
-            base_url=base_url,
-            qf_version=qf_version,
-            email=email,
-            password=password,
-            persist=persist,
-        )
-
-    @server.tool()
-    def auth_use_token(
-        profile: str = DEFAULT_PROFILE,
-        base_url: str | None = None,
-        qf_version: str | None = None,
-        token: str = "",
-        ws_id: int | None = None,
+        credential: str = "",
         persist: bool = False,
     ) -> dict:
-        return auth.auth_use_token(
+        return auth.auth_use_credential(
             profile=profile,
             base_url=base_url,
             qf_version=qf_version,
-            token=token,
-            ws_id=ws_id,
+            credential=credential,
             persist=persist,
         )
 
@@ -113,10 +93,6 @@ def build_builder_server() -> FastMCP:
             include_external=include_external,
         )
 
-    @server.tool()
-    def workspace_select(profile: str = DEFAULT_PROFILE, ws_id: int = 0) -> dict:
-        return workspace.workspace_select(profile=profile, ws_id=ws_id)
-
     @server.tool()
     def file_upload_local(
         profile: str = DEFAULT_PROFILE,

package/src/qingflow_mcp/server_app_user.py

@@ -191,38 +191,18 @@ If the current MCP capability is unsupported, the workflow is awkward, or the us
     directory_tools = wrap_trimmed_methods(DirectoryTools(sessions, backend), USER_SERVER_METHOD_MAP)
 
     @server.tool()
-    def auth_login(
+    def auth_use_credential(
         profile: str = DEFAULT_PROFILE,
         base_url: str | None = None,
         qf_version: str | None = None,
-        email: str = "",
-        password: str = "",
-        persist: bool = True,
-    ) -> dict:
-        return auth.auth_login(
-            profile=profile,
-            base_url=base_url,
-            qf_version=qf_version,
-            email=email,
-            password=password,
-            persist=persist,
-        )
-
-    @server.tool()
-    def auth_use_token(
-        profile: str = DEFAULT_PROFILE,
-        base_url: str | None = None,
-        qf_version: str | None = None,
-        token: str = "",
-        ws_id: int | None = None,
+        credential: str = "",
         persist: bool = False,
     ) -> dict:
-        return auth.auth_use_token(
+        return auth.auth_use_credential(
             profile=profile,
             base_url=base_url,
             qf_version=qf_version,
-            token=token,
-            ws_id=ws_id,
+            credential=credential,
             persist=persist,
         )
 
@@ -248,10 +228,6 @@ If the current MCP capability is unsupported, the workflow is awkward, or the us
             include_external=include_external,
         )
 
-    @server.tool()
-    def workspace_select(profile: str = DEFAULT_PROFILE, ws_id: int = 0) -> dict:
-        return workspace.workspace_select(profile=profile, ws_id=ws_id)
-
     @server.tool()
     def app_list(profile: str = DEFAULT_PROFILE) -> dict:
         return apps.app_list(profile=profile)

package/src/qingflow_mcp/session_store.py

@@ -29,6 +29,9 @@ class SessionProfile:
     base_url: str
     qf_version: str | None
     qf_version_source: str | None
+    token: str | None
+    login_token: str | None
+    credential: str | None
     uid: int
     email: str | None
     nick_name: str | None
@@ -45,6 +48,9 @@ class SessionProfile:
             base_url=value["base_url"],
             qf_version=value.get("qf_version"),
             qf_version_source=value.get("qf_version_source"),
+            token=value.get("token"),
+            login_token=value.get("login_token"),
+            credential=value.get("credential"),
             uid=value["uid"],
             email=value.get("email"),
             nick_name=value.get("nick_name"),
@@ -60,6 +66,7 @@ class SessionProfile:
 class BackendSession:
     token: str
     login_token: str | None
+    credential: str | None
     profile: str
     base_url: str
     qf_version: str | None
@@ -85,6 +92,7 @@ class SessionStore:
         qf_version_source: str | None = None,
         token: str,
         login_token: str | None,
+        credential: str | None = None,
         uid: int,
         email: str | None,
         nick_name: str | None,
@@ -99,14 +107,22 @@ class SessionStore:
                 self._set_secret(self._login_token_key(profile), login_token)
             else:
                 self._delete_secret(self._login_token_key(profile))
+            if credential:
+                self._set_secret(self._credential_key(profile), credential)
+            else:
+                self._delete_secret(self._credential_key(profile))
         else:
             self._delete_secret(self._token_key(profile))
             self._delete_secret(self._login_token_key(profile))
+            self._delete_secret(self._credential_key(profile))
         session_profile = SessionProfile(
             profile=profile,
             base_url=normalize_base_url(base_url) or base_url,
             qf_version=(str(qf_version).strip() or None) if qf_version is not None else None,
             qf_version_source=(str(qf_version_source).strip() or None) if qf_version_source is not None else None,
+            token=str(token).strip() or None,
+            login_token=(str(login_token).strip() or None) if login_token is not None else None,
+            credential=(str(credential).strip() or None) if credential is not None else None,
             uid=uid,
             email=email,
             nick_name=nick_name,
@@ -117,8 +133,9 @@ class SessionStore:
             updated_at=now,
         )
         self._memory_sessions[profile] = BackendSession(
-            token=token,
-            login_token=login_token,
+            token=session_profile.token or token,
+            login_token=session_profile.login_token,
+            credential=session_profile.credential,
             profile=profile,
             base_url=session_profile.base_url,
             qf_version=session_profile.qf_version,
@@ -146,14 +163,19 @@ class SessionStore:
                 memory_session.qf_version = session_profile.qf_version
                 memory_session.qf_version_source = session_profile.qf_version_source
             return memory_session
-        if not session_profile or not session_profile.persisted:
+        if not session_profile:
             return None
-        token = self._get_secret(self._token_key(profile))
+        token = self._get_secret(self._token_key(profile)) if session_profile.persisted else None
+        if not token:
+            token = session_profile.token
         if not token:
             return None
+        login_token = self._get_secret(self._login_token_key(profile)) if session_profile.persisted else None
+        credential = self._get_secret(self._credential_key(profile)) if session_profile.persisted else None
         backend_session = BackendSession(
             token=token,
-            login_token=self._get_secret(self._login_token_key(profile)),
+            login_token=login_token or session_profile.login_token,
+            credential=credential or session_profile.credential,
             profile=profile,
             base_url=session_profile.base_url,
             qf_version=session_profile.qf_version,
@@ -234,6 +256,7 @@ class SessionStore:
         self._logged_out_profiles.discard(profile)
         self._delete_secret(self._token_key(profile))
         self._delete_secret(self._login_token_key(profile))
+        self._delete_secret(self._credential_key(profile))
         payload = self._load_profiles()
         profiles = payload.get("profiles", {})
         if profile in profiles:
@@ -249,6 +272,9 @@ class SessionStore:
     def _login_token_key(self, profile: str) -> str:
         return f"{profile}:login-token"
 
+    def _credential_key(self, profile: str) -> str:
+        return f"{profile}:credential"
+
     def _upsert_profile(self, profile: SessionProfile) -> None:
         payload = self._load_profiles()
         payload.setdefault("profiles", {})[profile.profile] = asdict(profile)