@qingflow-tech/qingflow-cli 1.1.41 → 1.1.43

package/src/qingflow_mcp/tools/base.py

@@ -5,7 +5,8 @@ from contextvars import ContextVar
 from typing import Any, Callable, TypeVar
 
 from ..backend_client import BackendRequestContext, BackendClient
-from ..cloud_context import current_cloud_context
+from ..auth_provider import CliSessionFacade
+from ..cloud_context import current_call_platform, current_cloud_context
 from ..config import (
     get_credit_meter_enabled,
     get_credit_usage_base_url,
@@ -21,7 +22,7 @@ _RUN_DEPTH: ContextVar[int] = ContextVar("qingflow_mcp_tool_run_depth", default=
 
 
 class ToolBase:
-    def __init__(self, sessions: SessionStore, backend: BackendClient) -> None:
+    def __init__(self, sessions: SessionStore | CliSessionFacade, backend: BackendClient) -> None:
         self.sessions = sessions
         self.backend = backend
 
@@ -30,7 +31,8 @@ class ToolBase:
         if cloud_context is not None:
             return cloud_context.as_tool_context(profile)
 
-        self._ensure_environment_credential_matches(profile)
+        if not self._uses_oauth(profile):
+            self._ensure_environment_credential_matches(profile)
         session_profile = self.sessions.get_profile(profile)
         if session_profile is None:
             raise QingflowApiError.auth_required(profile)
@@ -83,8 +85,18 @@ class ToolBase:
                     return func(refreshed_profile, refreshed_context)
                 except QingflowApiError as refreshed_error:
                     self._handle_error(profile, refreshed_error)
+            if error.looks_like_invalid_token() and self._refresh_oauth_session(profile):
+                try:
+                    refreshed_profile, _, refreshed_context = self._require_context(
+                        profile,
+                        require_workspace=require_workspace,
+                    )
+                    return func(refreshed_profile, refreshed_context)
+                except QingflowApiError as refreshed_error:
+                    self._handle_error(profile, refreshed_error)
             if (
                 error.looks_like_invalid_token()
+                and not self._uses_oauth(profile)
                 and session_profile is not None
                 and backend_session is not None
                 and self._refresh_session_from_credential(
@@ -121,6 +133,19 @@ class ToolBase:
                     http_status=error.http_status,
                 )
                 raise_tool_error(refreshed_error)
+            if self._uses_oauth(profile):
+                oauth_error = QingflowApiError(
+                    category="auth",
+                    message=(
+                        f"OAuth session for profile '{profile}' has expired and could not be refreshed. "
+                        "Run auth login --method oauth again."
+                    ),
+                    backend_code=error.backend_code,
+                    request_id=error.request_id,
+                    http_status=error.http_status,
+                    details={"reason": "oauth_relogin_required"},
+                )
+                raise_tool_error(oauth_error)
             self.sessions.invalidate(profile)
             error = QingflowApiError(
                 category="auth",
@@ -142,6 +167,20 @@ class ToolBase:
         current_cloud_context.set(refreshed_context)
         return True
 
+    def _refresh_oauth_session(self, profile: str) -> bool:
+        if not self._uses_oauth(profile):
+            return False
+        assert isinstance(self.sessions, CliSessionFacade)
+        try:
+            return self.sessions.refresh_oauth_session(profile, force=True)
+        except QingflowApiError as error:
+            if (error.details or {}).get("reason") == "oauth_relogin_required":
+                raise
+            return False
+
+    def _uses_oauth(self, profile: str) -> bool:
+        return isinstance(self.sessions, CliSessionFacade) and self.sessions.uses_oauth(profile)
+
     def _refresh_session_from_credential(
         self,
         profile: str,
@@ -323,6 +362,7 @@ class ToolBase:
                 "scene": "MCP",
                 "aiBiz": "MCP",
                 "extraInfo": tool_name,
+                "callPlatform": current_call_platform.get(),
             },
         )
 

package/src/qingflow_mcp/tools/task_context_tools.py

@@ -535,6 +535,10 @@ class TaskContextTools(ToolBase):
                     task_context=task_context,
                     fields=field_updates,
                 )
+            elif normalized_action == "transfer" and body.get("answers") is None:
+                record = task_context.get("record") if isinstance(task_context.get("record"), dict) else {}
+                current_answers = record.get("answers") if isinstance(record.get("answers"), list) else []
+                prepared_fields = {"merged_answers": current_answers}
             before_apply_status = ((task_context.get("record") or {}).get("apply_status"))
             runtime_baseline = None
             if normalized_action != "save_only":
@@ -704,6 +708,8 @@ class TaskContextTools(ToolBase):
                 action_payload["auditFeedback"] = audit_feedback
             if merged_answers is not None:
                 action_payload["answers"] = merged_answers
+            elif payload.get("answers") is not None:
+                action_payload["answers"] = payload["answers"]
             return self._approval_tools.record_transfer(
                 profile=profile,
                 app_key=app_key,