chore: auto release commit (2026-03-31 15:24:21)

SKILL.md

@@ -8,9 +8,6 @@ metadata:
     slug: account-manager
     emoji: "👤"
     category: "通用"
-    skill_type: 1
-    monthly_price: 0
-    yearly_price: 0
 allowed-tools:
   - bash
 ---

accounts.json

@@ -1,81 +0,0 @@
-{
-    "sohu": [
-        {
-            "id": "sohu_account1",
-            "name": "搜狐账号1",
-            "phone": "13800000000",
-            "platform": "sohu",
-            "profile_dir": "D:/OpenClaw/chrome-profiles/sohu_account1"
-        },
-        {
-            "id": "sohu_account2",
-            "name": "搜狐账号2",
-            "phone": "13900000000",
-            "platform": "sohu",
-            "profile_dir": "D:/OpenClaw/chrome-profiles/sohu_account2"
-        }
-    ],
-    "zhihu": [
-        {
-            "id": "zhihu_account1",
-            "name": "知乎账号1",
-            "phone": "",
-            "platform": "zhihu",
-            "profile_dir": "D:/OpenClaw/chrome-profiles/zhihu_account1"
-        }
-    ],
-    "kimi": [
-        {
-            "id": "kimi_account1",
-            "name": "Kimi账号1",
-            "phone": "13800000000",
-            "platform": "kimi",
-            "profile_dir": "D:/OpenClaw/chrome-profiles/kimi_account1"
-        }
-    ],
-    "deepseek": [
-        {
-            "id": "deepseek_account1",
-            "name": "DeepSeek账号1",
-            "phone": "",
-            "platform": "deepseek",
-            "profile_dir": "D:/OpenClaw/chrome-profiles/deepseek_account1"
-        }
-    ],
-    "doubao": [
-        {
-            "id": "doubao_account1",
-            "name": "豆包账号1",
-            "phone": "",
-            "platform": "doubao",
-            "profile_dir": "D:/OpenClaw/chrome-profiles/doubao_account1"
-        }
-    ],
-    "qianwen": [
-        {
-            "id": "qianwen_account1",
-            "name": "千问账号1",
-            "phone": "",
-            "platform": "qianwen",
-            "profile_dir": "D:/OpenClaw/chrome-profiles/qianwen_account1"
-        }
-    ],
-    "yiyan": [
-        {
-            "id": "yiyan_account1",
-            "name": "一言账号1",
-            "phone": "",
-            "platform": "yiyan",
-            "profile_dir": "D:/OpenClaw/chrome-profiles/yiyan_account1"
-        }
-    ],
-    "yuanbao": [
-        {
-            "id": "yuanbao_account1",
-            "name": "元宝账号1",
-            "phone": "",
-            "platform": "yuanbao",
-            "profile_dir": "D:/OpenClaw/chrome-profiles/yuanbao_account1"
-        }
-    ]
-}

scripts/account.py

@@ -1,7 +1,8 @@
 import sys
 import json
 import os
-import subprocess
+import sqlite3
+from datetime import datetime
 
 # Windows GBK 编码兼容修复
 if sys.platform == "win32":
@@ -9,7 +10,7 @@ if sys.platform == "win32":
     sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding='utf-8', errors='replace')
     sys.stderr = io.TextIOWrapper(sys.stderr.buffer, encoding='utf-8', errors='replace')
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-ACCOUNTS_FILE = os.path.join(BASE_DIR, "accounts.json")
+SKILL_SLUG = "account-manager"
 
 PLATFORM_URLS = {
     # 自媒体/图文平台
@@ -26,50 +27,192 @@ PLATFORM_URLS = {
     "yuanbao": "https://yuanbao.tencent.com"
 }
 
-def load_accounts():
-    with open(ACCOUNTS_FILE, "r", encoding="utf-8") as f:
-        return json.load(f)
+
+def get_data_root():
+    env = (os.getenv("JIANGCHANG_DATA_ROOT") or "").strip()
+    if env:
+        return env
+    if sys.platform == "win32":
+        return r"D:\jiangchang-data"
+    return os.path.join(os.path.expanduser("~"), ".jiangchang-data")
+
+
+def get_user_id():
+    uid = (os.getenv("JIANGCHANG_USER_ID") or "").strip()
+    return uid or "_anon"
+
+
+def get_skill_data_dir():
+    path = os.path.join(get_data_root(), get_user_id(), SKILL_SLUG)
+    os.makedirs(path, exist_ok=True)
+    return path
+
+
+def get_db_path():
+    return os.path.join(get_skill_data_dir(), "account-manager.db")
+
+
+def get_default_profile_dir(account_id):
+    path = os.path.join(get_skill_data_dir(), "profiles", account_id)
+    os.makedirs(path, exist_ok=True)
+    return path
+
+
+def get_conn():
+    return sqlite3.connect(get_db_path())
+
+
+def init_db():
+    conn = get_conn()
+    try:
+        cur = conn.cursor()
+        cur.execute(
+            """
+            CREATE TABLE IF NOT EXISTS accounts (
+                id TEXT PRIMARY KEY,
+                name TEXT NOT NULL,
+                platform TEXT NOT NULL,
+                phone TEXT,
+                profile_dir TEXT,
+                login_status INTEGER DEFAULT 0,
+                last_login_at TEXT,
+                extra_json TEXT,
+                created_at TEXT NOT NULL,
+                updated_at TEXT NOT NULL
+            )
+            """
+        )
+        _ensure_column(cur, "accounts", "login_status", "INTEGER DEFAULT 0")
+        _ensure_column(cur, "accounts", "last_login_at", "TEXT")
+        conn.commit()
+    finally:
+        conn.close()
+
+
+def _ensure_column(cur, table_name, col_name, ddl):
+    cur.execute(f"PRAGMA table_info({table_name})")
+    cols = [row[1] for row in cur.fetchall()]
+    if col_name not in cols:
+        cur.execute(f"ALTER TABLE {table_name} ADD COLUMN {col_name} {ddl}")
+
+
+def get_account_by_id(account_id):
+    init_db()
+    conn = get_conn()
+    try:
+        cur = conn.cursor()
+        cur.execute(
+            "SELECT id, name, platform, phone, profile_dir, login_status, last_login_at, extra_json FROM accounts WHERE id = ?",
+            (account_id,),
+        )
+        row = cur.fetchone()
+        if not row:
+            return None
+        acc = {
+            "id": row[0],
+            "name": row[1],
+            "platform": row[2],
+            "phone": row[3] or "",
+            "profile_dir": row[4] or get_default_profile_dir(row[0]),
+            "login_status": int(row[5] or 0),
+            "last_login_at": row[6],
+        }
+        if row[7]:
+            try:
+                extra = json.loads(row[7])
+                if isinstance(extra, dict):
+                    acc.update(extra)
+            except Exception:
+                pass
+        return acc
+    finally:
+        conn.close()
 
 def cmd_list(platform="all"):
     """
     修改后的 list 功能，能直观打出带着【手机号】的详细台账供AI查询匹配！
     支持查全部(all)，或指定(sohu)
     """
-    accounts = load_accounts()
-    if platform == "all":
-        platforms_to_check = accounts.keys()
-    else:
-        platforms_to_check = [platform]
-        
+    init_db()
+    conn = get_conn()
     found = False
-    for plat in platforms_to_check:
-        platform_accounts = accounts.get(plat, [])
-        for acc in platform_accounts:
-            phone = acc.get('phone', '未绑定手机')
-            print(f"账号ID:{acc['id']} | 名称:{acc['name']} | 手机号:{phone} | 平台:{acc['platform']}")
-            found = True
-            
+    try:
+        cur = conn.cursor()
+        if platform == "all":
+            cur.execute(
+                "SELECT id, name, phone, platform, login_status FROM accounts ORDER BY platform, id"
+            )
+        else:
+            cur.execute(
+                "SELECT id, name, phone, platform, login_status FROM accounts WHERE platform = ? ORDER BY id",
+                (platform,),
+            )
+        rows = cur.fetchall()
+    finally:
+        conn.close()
+
+    found = False
+    for row in rows:
+        phone = row[2] or "未绑定手机"
+        login_text = "已登录" if int(row[4] or 0) == 1 else "未登录"
+        print(f"账号ID:{row[0]} | 名称:{row[1]} | 手机号:{phone} | 平台:{row[3]} | 状态:{login_text}")
+        found = True
+
     if not found:
         print(f"ERROR:NO_ACCOUNTS_FOUND")
 
 def cmd_get(account_id):
-    accounts = load_accounts()
-    for platform_accounts in accounts.values():
-        for acc in platform_accounts:
-            if acc["id"] == account_id:
-                print(json.dumps(acc, ensure_ascii=False))
-                return
+    acc = get_account_by_id(account_id)
+    if acc:
+        print(json.dumps(acc, ensure_ascii=False))
+        return
     print("ERROR:ACCOUNT_NOT_FOUND")
 
+
+def cmd_add(account_id, name, platform, phone="", profile_dir=""):
+    init_db()
+    platform = (platform or "").strip().lower()
+    if platform not in PLATFORM_URLS:
+        print(f"ERROR:INVALID_PLATFORM (支持: {', '.join(sorted(PLATFORM_URLS.keys()))})")
+        return
+
+    account_id = (account_id or "").strip()
+    name = (name or "").strip() or account_id
+    if not account_id:
+        print("ERROR:INVALID_ACCOUNT_ID")
+        return
+
+    profile_dir = (profile_dir or "").strip() or get_default_profile_dir(account_id)
+    os.makedirs(profile_dir, exist_ok=True)
+    now = datetime.now().isoformat(timespec="seconds")
+
+    conn = get_conn()
+    try:
+        cur = conn.cursor()
+        cur.execute(
+            """
+            INSERT INTO accounts (id, name, platform, phone, profile_dir, login_status, last_login_at, extra_json, created_at, updated_at)
+            VALUES (?, ?, ?, ?, ?, 0, NULL, NULL, ?, ?)
+            ON CONFLICT(id) DO UPDATE SET
+                name = excluded.name,
+                platform = excluded.platform,
+                phone = excluded.phone,
+                profile_dir = excluded.profile_dir,
+                updated_at = excluded.updated_at
+            """,
+            (account_id, name, platform, phone, profile_dir, now, now),
+        )
+        conn.commit()
+    finally:
+        conn.close()
+
+    print(f"✅ 已保存账号：{account_id}（{platform}）")
+    print("ℹ️ 请继续执行登录：python account.py login <账号ID>")
+
+
 def cmd_login(account_id):
     """首次登录：打开浏览器，用户手动登录，登录态自动保存到Profile目录"""
-    accounts = load_accounts()
-    target = None
-    for platform_accounts in accounts.values():
-        for acc in platform_accounts:
-            if acc["id"] == account_id:
-                target = acc
-                break
+    target = get_account_by_id(account_id)
 
     if not target:
         print("ERROR:ACCOUNT_NOT_FOUND")
@@ -110,16 +253,48 @@ asyncio.run(main())
         f.write(login_script)
         tmp_path = f.name
 
-    os.system(f'python "{tmp_path}"')
+    exit_code = os.system(f'python "{tmp_path}"')
     os.unlink(tmp_path)
+    if exit_code == 0:
+        _mark_login_success(account_id)
+        print("✅ 登录状态已标记为已登录")
+    else:
+        print("⚠️ 浏览器登录流程异常退出，登录状态未更新")
+
+
+def _mark_login_success(account_id):
+    now = datetime.now().isoformat(timespec="seconds")
+    conn = get_conn()
+    try:
+        cur = conn.cursor()
+        cur.execute(
+            "UPDATE accounts SET login_status = 1, last_login_at = ?, updated_at = ? WHERE id = ?",
+            (now, now, account_id),
+        )
+        conn.commit()
+    finally:
+        conn.close()
 
 if __name__ == "__main__":
     if len(sys.argv) < 2:
-        print("用法：python account.py list [platform] | get <id> | login <id>")
+        print("用法：python account.py add <id> <name> <platform> [phone] [profile_dir] | list [platform] | get <id> | login <id>")
         sys.exit(1)
 
     cmd = sys.argv[1]
-    if cmd == "list":
+    # 兼容写反顺序：python account.py sohu list
+    if len(sys.argv) >= 3 and sys.argv[2] == "list" and cmd in PLATFORM_URLS:
+        cmd_list(cmd)
+    elif cmd in PLATFORM_URLS and len(sys.argv) == 2:
+        cmd_list(cmd)
+    elif cmd == "add" and len(sys.argv) >= 5:
+        cmd_add(
+            sys.argv[2],
+            sys.argv[3],
+            sys.argv[4],
+            sys.argv[5] if len(sys.argv) >= 6 else "",
+            sys.argv[6] if len(sys.argv) >= 7 else "",
+        )
+    elif cmd == "list":
         # 默认不传 platform 时打出 all
         cmd_list(sys.argv[2] if len(sys.argv) >= 3 else "all")
     elif cmd == "get" and len(sys.argv) >= 3: