chore: auto release commit (2026-06-19 11:07:44)

scripts/service/account_service.py

@@ -18,6 +18,7 @@ import sys
 import tempfile
 import time
 import uuid
+from dataclasses import dataclass, field
 from typing import Optional
 
 from db.accounts_repo import (
@@ -43,6 +44,7 @@ from db.accounts_repo import (
     update_account_session_status,
     update_credential_last_used,
     upsert_platform,
+    ensure_platform_from_caller_meta,
 )
 from db.auth_strategy import (
     ALL_AUTH_STRATEGIES,
@@ -64,6 +66,7 @@ from util.constants import SKILL_SLUG
 from util.logging_config import get_skill_logger
 from util.platforms import (
     DEFAULT_CAPABILITIES_JSON,
+    PlatformResolveResult,
     _platform_list_cn_for_help,
     get_platform_spec,
     is_valid_platform_key_format,
@@ -191,6 +194,108 @@ def _remove_profile_dir(path: str) -> None:
         _say_err(f"WARNING: 未能删除用户数据目录（可手工删）：{p}\n   {e}")
 
 
+@dataclass
+class PlatformCallerMeta:
+    """调用方为未注册自定义平台提供的自动注册元数据（pick-web / add-web）。"""
+
+    display_name: Optional[str] = None
+    url: Optional[str] = None
+    domain: Optional[str] = None
+    auth_strategy: Optional[str] = None
+    aliases: list[str] = field(default_factory=list)
+
+    def is_sufficient_for_auto_register(self) -> bool:
+        return bool((self.display_name or "").strip() and (self.url or "").strip())
+
+
+def _emit_platform_resolve_error(result: PlatformResolveResult, hint: str = "") -> None:
+    code = result.error_code or "INVALID_PLATFORM"
+    if not code.startswith("ERROR:"):
+        code = f"ERROR:{code}"
+    _say(_err_json(code, result.message or "无法识别平台。"))
+    if hint:
+        _say(hint)
+
+
+def _resolve_or_auto_register(
+    platform_input: str,
+    meta: Optional[PlatformCallerMeta] = None,
+    *,
+    hint: str = "",
+) -> Optional[str]:
+    """解析平台；未注册时可在元数据充足时自动 ensure（幂等、仅填空字段）。"""
+    init_db()
+    conn = get_conn()
+    try:
+        result = resolve_platform_key_dynamic(platform_input, conn=conn)
+        if result.ok:
+            return result.platform_key
+
+        if result.error_code in ("PLATFORM_DISABLED", "INVALID_PLATFORM_KEY", "INVALID_PLATFORM"):
+            _emit_platform_resolve_error(result, hint=hint)
+            return None
+
+        if result.error_code != "PLATFORM_NOT_REGISTERED":
+            _emit_platform_resolve_error(result, hint=hint)
+            if result.error_code not in (
+                "PLATFORM_NOT_REGISTERED",
+                "INVALID_PLATFORM_KEY",
+                "PLATFORM_DISABLED",
+            ):
+                _say("支持：" + _platform_list_cn_for_help())
+            return None
+
+        raw_key = (platform_input or "").strip().lower()
+        if not is_valid_platform_key_format(raw_key):
+            _emit_platform_resolve_error(
+                PlatformResolveResult(
+                    error_code="INVALID_PLATFORM_KEY",
+                    message=result.message or f"平台 key 格式非法：「{platform_input}」。",
+                ),
+                hint=hint,
+            )
+            return None
+
+        if not meta or not meta.is_sufficient_for_auto_register():
+            _emit_platform_resolve_error(
+                PlatformResolveResult(
+                    error_code="PLATFORM_NOT_REGISTERED",
+                    message=(
+                        f"平台 {raw_key} 尚未注册。"
+                        "请传入 --platform-display-name 与 --platform-url，"
+                        "或先执行 account platform ensure。"
+                    ),
+                ),
+                hint=hint,
+            )
+            return None
+
+        if meta.auth_strategy and meta.auth_strategy not in ALL_AUTH_STRATEGIES:
+            _say(_err_json(
+                "ERR_AUTH_STRATEGY_NOT_SUPPORTED",
+                f"不支持的 --platform-auth-strategy：{meta.auth_strategy}",
+            ))
+            return None
+
+        seed_platforms(conn)
+        action = ensure_platform_from_caller_meta(
+            conn,
+            raw_key,
+            display_name=(meta.display_name or "").strip(),
+            domain=(meta.domain or "generic").strip() or "generic",
+            default_url=(meta.url or "").strip(),
+            aliases=meta.aliases,
+            default_auth_strategy=meta.auth_strategy,
+            capabilities_json=DEFAULT_CAPABILITIES_JSON,
+        )
+        get_skill_logger().info(
+            "platform_auto_registered key=%s action=%s", raw_key, action
+        )
+        return raw_key
+    finally:
+        conn.close()
+
+
 def _resolve_or_fail(input_name: str, hint: str = "") -> Optional[str]:
     """Resolve platform key or emit structured JSON error and return None."""
     init_db()
@@ -203,15 +308,8 @@ def _resolve_or_fail(input_name: str, hint: str = "") -> Optional[str]:
     if result.ok:
         return result.platform_key
 
-    code = result.error_code or "INVALID_PLATFORM"
-    if not code.startswith("ERROR:"):
-        code = f"ERROR:{code}"
-    _say(_err_json(code, result.message or "无法识别平台。"))
-    if hint and result.error_code == "PLATFORM_NOT_REGISTERED":
-        _say(hint)
-    elif hint:
-        _say(hint)
-    elif result.error_code not in ("PLATFORM_NOT_REGISTERED", "INVALID_PLATFORM_KEY", "PLATFORM_DISABLED"):
+    _emit_platform_resolve_error(result, hint=hint)
+    if result.error_code not in ("PLATFORM_NOT_REGISTERED", "INVALID_PLATFORM_KEY", "PLATFORM_DISABLED"):
         _say("支持：" + _platform_list_cn_for_help())
     return None
 
@@ -331,13 +429,14 @@ def cmd_account_add_web(
     auth_strategy: Optional[str] = None,
     session_persistent: Optional[int] = None,
     device_fingerprint: Optional[str] = None,
+    platform_meta: Optional[PlatformCallerMeta] = None,
 ) -> None:
     """account add-web — create a web/RPA account record."""
     log = get_skill_logger()
     log.info("account_add_web_attempt platform=%s login_id_type=%s env=%s role=%s",
              platform_input, login_id_type, environment, role)
 
-    key = _resolve_or_fail(platform_input)
+    key = _resolve_or_auto_register(platform_input, platform_meta)
     if not key:
         return
 
@@ -1047,13 +1146,14 @@ def cmd_account_pick_web(
     ttl_sec: int = 900,
     holder: Optional[str] = None,
     purpose: Optional[str] = None,
+    platform_meta: Optional[PlatformCallerMeta] = None,
 ) -> None:
     """Pick a web/RPA account for use. Optionally acquire a lease."""
     log = get_skill_logger()
     log.info("account_pick_web_attempt platform=%s env=%s tenant=%s role=%s lease=%s",
              platform_input, environment, tenant_id, role, do_lease)
 
-    key = _resolve_or_fail(platform_input)
+    key = _resolve_or_auto_register(platform_input, platform_meta)
     if not key:
         return