@genduo/desk 0.5.1 → 0.5.3

package/jdy_secrets.py

@@ -38,8 +38,17 @@ JDY_PWD_F_PASSWORD = "_widget_1729661480439"    # Password (text)
 JDY_API_KEY_TITLE = "api key 精细化运营"
 JDY_MCP_KEYRING_SERVICE = "JDY_MCP"
 JDY_MCP_KEYRING_ACCOUNT = "本机JDY服务器URL"
-# 兼容旧条目（早期文档写过 account=服务器URL）
-JDY_MCP_KEYRING_ACCOUNT_ALIASES = ("本机JDY服务器URL", "服务器URL")
+# 钥匙串访问里常见：服务/位置与账户同为「本机 JDY 服务器 URL」；亦兼容 JDY_MCP + 无空格旧名
+JDY_MCP_KEYRING_ACCOUNT_ALIASES = (
+    "本机JDY服务器URL",
+    "本机 JDY 服务器 URL",
+    "服务器URL",
+)
+JDY_MCP_KEYRING_SERVICE_ALIASES = (
+    "本机JDY服务器URL",
+    "本机 JDY 服务器 URL",
+    "JDY_MCP",
+)
 
 # 别名（旧调用方）
 JDY_MCP_SERVICE = JDY_MCP_KEYRING_SERVICE
@@ -55,19 +64,47 @@ def _get_mcp_url() -> str:
         return env
     try:
         import keyring
-        for acct in JDY_MCP_KEYRING_ACCOUNT_ALIASES:
-            v = keyring.get_password(JDY_MCP_KEYRING_SERVICE, acct)
-            if v:
-                return v
+        for svc in JDY_MCP_KEYRING_SERVICE_ALIASES:
+            for acct in JDY_MCP_KEYRING_ACCOUNT_ALIASES:
+                v = keyring.get_password(svc, acct)
+                if v:
+                    return v
     except Exception:
         pass
-    # keyring 未装或读失败时：同条目的 security CLI
-    for acct in JDY_MCP_KEYRING_ACCOUNT_ALIASES:
+    # keyring 未装或读失败时：security CLI（通用密码；服务/账户多种写法）
+    for svc in JDY_MCP_KEYRING_SERVICE_ALIASES:
+        for acct in JDY_MCP_KEYRING_ACCOUNT_ALIASES:
+            try:
+                r = subprocess.run(
+                    ["security", "find-generic-password",
+                     "-s", svc, "-a", acct, "-w"],
+                    capture_output=True, text=True,
+                )
+                if r.returncode == 0 and (r.stdout or "").strip():
+                    return (r.stdout or "").rstrip("\n")
+            except Exception:
+                pass
+    # 「密码」App 网站密码（用户常写成 本机 JDY 服务器 URL + jiandaoyun.com）
+    for acct in (
+        "本机JDY服务器URL",
+        "本机 JDY 服务器 URL",
+        "服务器URL",
+    ):
+        for server in ("jiandaoyun.com", "www.jiandaoyun.com"):
+            try:
+                r = subprocess.run(
+                    ["security", "find-internet-password",
+                     "-s", server, "-a", acct, "-w"],
+                    capture_output=True, text=True,
+                )
+                if r.returncode == 0 and (r.stdout or "").strip():
+                    return (r.stdout or "").rstrip("\n")
+            except Exception:
+                pass
+        # 仅按账户名扫（不限网站）
         try:
             r = subprocess.run(
-                ["security", "find-generic-password",
-                 "-s", JDY_MCP_KEYRING_SERVICE,
-                 "-a", acct, "-w"],
+                ["security", "find-internet-password", "-a", acct, "-w"],
                 capture_output=True, text=True,
             )
             if r.returncode == 0 and (r.stdout or "").strip():
@@ -75,8 +112,9 @@ def _get_mcp_url() -> str:
         except Exception:
             pass
     raise RuntimeError(
-        "未找到 JDY MCP URL：请设置环境变量 JDY_MCP_URL "
-        "或钥匙串条目 JDY_MCP/本机JDY服务器URL"
+        "未找到 JDY MCP URL：请设置环境变量 JDY_MCP_URL，"
+        "或通用密码「本机 JDY 服务器 URL」（服务/账户同名；亦兼容 JDY_MCP），"
+        "或「密码」App 网站条目（账户 本机 JDY 服务器 URL）"
     )
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@genduo/desk",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "Local Mac desk agent CLI for genduo",
   "bin": {
     "genduo-desk": "bin/genduo-desk.js"