chore: auto release commit (2026-03-31 11:50:55)

.github/workflows/release_skill.yaml

@@ -1,111 +1,11 @@
-name: 技能自动化发布 (测试版-无鉴权)
+name: 技能自动化发布
 on:
   push:
     tags: ["v*"]
 
 jobs:
-  build-and-deploy:
-    runs-on: ubuntu-latest
-    steps:
-      # 1. 下载源码
-      - uses: http://120.25.191.12:3000/admin/actions-checkout@v4
-
-      # 2. 环境及工具准备
-      - name: Setup Tools
-        # 优化：使用国内清华源加速安装速度
-        run: pip install pyarmor requests python-frontmatter --break-system-packages -i https://pypi.tuna.tsinghua.edu.cn/simple
-
-      # 3. 【核心步骤】PyArmor 源代码混淆加密
-      - name: Encrypt Source Code
-        run: |
-          mkdir -p dist/package
-          pyarmor gen -O dist/package scripts/*.py
-          cp SKILL.md dist/package/
-
-      # 4. 提取元数据并物理打包
-      - name: Parse Metadata and Pack
-        id: build_task
-        run: |
-          python -c "
-          import frontmatter, os, json, shutil
-          post = frontmatter.load('SKILL.md')
-          metadata = post.metadata
-
-          # slug 优先从 openclaw.slug 读取，兼容历史用 name
-          openclaw_meta = metadata.get('metadata', {}).get('openclaw', {})
-          slug = (openclaw_meta.get('slug') or metadata.get('slug') or metadata.get('name') or '').strip()
-          if not slug:
-              raise Exception('SKILL.md 缺少 slug/name，无法构建发布包')
-
-          # 以 Git Tag 为准（自动模式）
-          ref_name = (os.environ.get('GITHUB_REF_NAME') or '').strip()
-          if not ref_name:
-              ref_name = (os.environ.get('GITHUB_REF') or '').strip().split('/')[-1]
-          if not ref_name.startswith('v'):
-              raise Exception(f'非法标签: {ref_name}，要求以 v 开头，例如 v1.0.10')
-
-          version = ref_name.lstrip('v')
-
-          # 自动模式：SKILL.md 与 tag 不一致时仅告警，不阻塞发布
-          skill_version = str(metadata.get('version') or '').strip()
-          if skill_version and skill_version != version:
-              print(f'WARNING: SKILL.md version({skill_version}) != tag version({version}), using tag version')
-
-          # 统一覆盖，确保后续输出与上传完全一致
-          metadata['version'] = version
-
-          # 安全写入输出
-          with open(os.environ['GITHUB_OUTPUT'], 'a') as f:
-              f.write(f'slug={slug}\n')
-              f.write(f'version={version}\n')
-              f.write(f'metadata={json.dumps(metadata, ensure_ascii=False)}\n')
-
-          # 制作最终的发布 ZIP 包
-          shutil.make_archive(slug, 'zip', 'dist/package')
-          "
-
-      # 5. 同步数据库记录
-      - name: Sync Database (V2.0)
-        env:
-          METADATA_JSON: ${{ steps.build_task.outputs.metadata }}
-        run: |
-          python -c "
-          import requests, json, os
-          metadata = json.loads(os.environ['METADATA_JSON'])
-          url = 'https://jc2009.com/api/skill/update'
-          res = requests.post(url, json=metadata)
-          print(f'DB Sync Result: {res.text}')
-          if res.status_code != 200:
-              exit(1)
-          try:
-              payload = res.json()
-          except Exception:
-              exit(1)
-          if payload.get('code') != 200:
-              exit(1)
-          "
-
-      # 6. 上传物理包
-      - name: Upload Encrypted ZIP
-        env:
-          SLUG: ${{ steps.build_task.outputs.slug }}
-          VERSION: ${{ steps.build_task.outputs.version }}
-        run: |
-          python -c "
-          import requests, os
-          url = 'https://jc2009.com/api/upload'
-          slug = os.environ['SLUG']
-          version = os.environ['VERSION']
-          payload = {'plugin_name': slug, 'version': version, 'artifact_type': 'skill'}
-          with open(f'{slug}.zip', 'rb') as f:
-              res = requests.post(url, data=payload, files={'file': f})
-          print(f'Upload Result: {res.text}')
-          if res.status_code != 200:
-              exit(1)
-          try:
-              payload = res.json()
-          except Exception:
-              exit(1)
-          if payload.get('code') != 200:
-              exit(1)
-          "
+  release:
+    uses: admin/jiangchang-platform-kit/.github/workflows/reusable-release-skill.yaml@main
+    with:
+      artifact_platform: windows
+      pyarmor_platform: windows.x86_64

SKILL.md

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

release.ps1

@@ -1,31 +1,3 @@
-<#
-.SYNOPSIS
-  One-command release script for skill repos.
-
-.DESCRIPTION
-  - Optional auto-commit
-  - Push current branch
-  - Auto-increment semantic tag (vX.Y.Z)
-  - Create & push tag
-  - Fail fast on unsafe states
-
-.EXAMPLES
-  # Safe mode (recommended): requires clean working tree
-  .\release.ps1
-
-  # Auto commit tracked/untracked changes then release
-  .\release.ps1 -AutoCommit -CommitMessage "chore: update skill config"
-
-  # Dry run (show what would happen)
-  .\release.ps1 -DryRun
-
-  # Custom tag prefix
-  .\release.ps1 -Prefix "v" -Message "正式发布"
-
-.NOTES
-  Requires: git, PowerShell 5+
-#>
-
 [CmdletBinding()]
 param(
   [string]$Prefix = "v",
@@ -39,178 +11,13 @@ param(
 Set-StrictMode -Version Latest
 $ErrorActionPreference = "Stop"
 
-function Invoke-Git {
-  param([Parameter(Mandatory = $true)][string]$Args)
-  Write-Host ">> git $Args" -ForegroundColor DarkGray
-  & cmd /c "git $Args"
-  if ($LASTEXITCODE -ne 0) {
-    throw "git command failed: git $Args"
-  }
+$scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
+$sharedScript = Join-Path $scriptDir "..\jiangchang-platform-kit\tools\release.ps1"
+$sharedScript = [System.IO.Path]::GetFullPath($sharedScript)
+
+if (-not (Test-Path $sharedScript)) {
+  throw "Shared release script not found: $sharedScript"
 }
 
-
-function Get-GitOutput {
-  param([Parameter(Mandatory = $true)][string]$Args)
-  $output = & cmd /c "git $Args" 2>$null
-  if ($LASTEXITCODE -ne 0) {
-    throw "git command failed: git $Args"
-  }
-  return @($output)
-}
-
-function Test-Repo {
-  & git rev-parse --is-inside-work-tree *> $null
-  return ($LASTEXITCODE -eq 0)
-}
-
-function Get-CurrentBranch {
-  $b = (Get-GitOutput "branch --show-current" | Select-Object -First 1).Trim()
-  return $b
-}
-
-
-function Get-StatusPorcelain {
-  $lines = @(Get-GitOutput "status --porcelain")
-  return $lines
-}
-
-function Parse-SemVerTag {
-  param(
-    [string]$Tag,
-    [string]$TagPrefix
-  )
-  $escaped = [regex]::Escape($TagPrefix)
-  $m = [regex]::Match($Tag, "^${escaped}(\d+)\.(\d+)\.(\d+)$")
-  if (-not $m.Success) { return $null }
-
-  return [pscustomobject]@{
-    Raw   = $Tag
-    Major = [int]$m.Groups[1].Value
-    Minor = [int]$m.Groups[2].Value
-    Patch = [int]$m.Groups[3].Value
-  }
-}
-
-function Get-NextTag {
-  param([string]$TagPrefix)
-
-  $tags = Get-GitOutput "tag --list"
-  $parsed = @()
-
-  foreach ($t in $tags) {
-    $t = $t.Trim()
-    if (-not $t) { continue }
-    $obj = Parse-SemVerTag -Tag $t -TagPrefix $TagPrefix
-    if ($null -ne $obj) { $parsed += $obj }
-  }
-
-  if ($parsed.Count -eq 0) {
-    return "${TagPrefix}1.0.1"
-  }
-
-  $latest = $parsed | Sort-Object Major, Minor, Patch | Select-Object -Last 1
-  return "$TagPrefix$($latest.Major).$($latest.Minor).$([int]$latest.Patch + 1)"
-}
-
-
-function Ensure-CleanOrAutoCommit {
-  param(
-    [switch]$DoAutoCommit,
-    [switch]$NeedClean,
-    [switch]$IsDryRun,
-    [string]$Msg
-  )
-
-  $status = @(Get-StatusPorcelain)
-  if ($status.Length -eq 0) { return }
-
-  if ($NeedClean) {
-    Write-Host "Working tree is not clean and -RequireClean is enabled." -ForegroundColor Yellow
-    & git status --short
-    throw "Abort: dirty working tree."
-  }
-
-  # 默认一键发布：有改动就自动提交；也可用 -AutoCommit 显式开启
-  $commitMsg = $Msg
-  if ([string]::IsNullOrWhiteSpace($commitMsg)) {
-    $commitMsg = "chore: auto release commit ($(Get-Date -Format 'yyyy-MM-dd HH:mm:ss'))"
-  }
-
-  if (-not $DoAutoCommit) {
-    Write-Host "Detected uncommitted changes, auto-committing before release..." -ForegroundColor Yellow
-  }
-
-  if ($IsDryRun) {
-    Write-Host "[DryRun] Would run: git add -A" -ForegroundColor Yellow
-    Write-Host "[DryRun] Would run: git commit -m `"$commitMsg`"" -ForegroundColor Yellow
-    return
-  }
-
-  Invoke-Git "add -A"
-  Invoke-Git "commit -m `"$commitMsg`""
-}
-
-
-try {
-  Write-Host "=== Release Script Start ===" -ForegroundColor Cyan
-
-  if (-not (Test-Repo)) {
-    throw "Current directory is not a git repository."
-  }
-
-  $branch = Get-CurrentBranch
-  if ([string]::IsNullOrWhiteSpace($branch)) {
-    throw "Unable to determine current branch."
-  }
-
-  if ($branch -notin @("main", "master")) {
-    throw "Current branch is '$branch'. Release is only allowed from main/master."
-  }
-
-  Invoke-Git "fetch --tags --prune origin"
-
-  Ensure-CleanOrAutoCommit -DoAutoCommit:$AutoCommit -NeedClean:$RequireClean -IsDryRun:$DryRun -Msg $CommitMessage
-
-  $upstream = (& git rev-parse --abbrev-ref --symbolic-full-name "@{u}" 2>$null)
-  $hasUpstream = ($LASTEXITCODE -eq 0)
-
-  if ($DryRun) {
-    if ($hasUpstream) {
-      Write-Host "[DryRun] Would run: git push" -ForegroundColor Yellow
-    } else {
-      Write-Host "[DryRun] Would run: git push -u origin $branch" -ForegroundColor Yellow
-    }
-  } else {
-    if ($hasUpstream) {
-      Invoke-Git "push"
-    } else {
-      Invoke-Git "push -u origin $branch"
-    }
-  }
-
-  $nextTag = Get-NextTag -TagPrefix $Prefix
-  Write-Host "Next tag: $nextTag" -ForegroundColor Green
-
-  $existing = @(Get-GitOutput "tag --list `"$nextTag`"")
-  if ($existing.Length -gt 0) {
-    throw "Tag already exists: $nextTag"
-  }
-
-  if ($DryRun) {
-    Write-Host "[DryRun] Would run: git tag -a $nextTag -m `"$Message`"" -ForegroundColor Yellow
-    Write-Host "[DryRun] Would run: git push origin $nextTag" -ForegroundColor Yellow
-    Write-Host "=== DryRun Complete ===" -ForegroundColor Cyan
-    exit 0
-  }
-
-  Invoke-Git "tag -a $nextTag -m `"$Message`""
-  Invoke-Git "push origin $nextTag"
-
-  Write-Host "Release success: $nextTag" -ForegroundColor Green
-  Write-Host "=== Release Script Done ===" -ForegroundColor Cyan
-  exit 0
-}
-catch {
-  Write-Host "Release failed: $($_.Exception.Message)" -ForegroundColor Red
-  exit 1
-}
+& $sharedScript @PSBoundParameters
+exit $LASTEXITCODE

scripts/account.py

@@ -1,7 +1,9 @@
 import sys
 import json
 import os
+import sqlite3
 import subprocess
+from datetime import datetime
 
 # Windows GBK 编码兼容修复
 if sys.platform == "win32":
@@ -9,7 +11,8 @@ 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"
+LEGACY_ACCOUNTS_FILE = os.path.join(BASE_DIR, "accounts.json")
 
 PLATFORM_URLS = {
     # 自媒体/图文平台
@@ -26,50 +29,197 @@ 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():
+    return (os.getenv("JIANGCHANG_DATA_ROOT") or os.path.join(os.path.expanduser("~"), ".jiangchang-data")).strip()
+
+
+def get_user_id():
+    uid = (os.getenv("JIANGCHANG_USER_ID") or os.getenv("OPENCLAW_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,
+                extra_json TEXT,
+                created_at TEXT NOT NULL,
+                updated_at TEXT NOT NULL
+            )
+            """
+        )
+        conn.commit()
+    finally:
+        conn.close()
+
+
+def migrate_legacy_json_if_needed():
+    init_db()
+    conn = get_conn()
+    try:
+        cur = conn.cursor()
+        cur.execute("SELECT COUNT(1) FROM accounts")
+        count = cur.fetchone()[0]
+        if count > 0:
+            return
+    finally:
+        conn.close()
+
+    if not os.path.exists(LEGACY_ACCOUNTS_FILE):
+        return
+
+    try:
+        with open(LEGACY_ACCOUNTS_FILE, "r", encoding="utf-8") as f:
+            raw = json.load(f)
+    except Exception:
+        return
+
+    now = datetime.now().isoformat(timespec="seconds")
+    rows = []
+    for platform, accounts in (raw or {}).items():
+        for acc in accounts:
+            acc_id = str(acc.get("id") or "").strip()
+            if not acc_id:
+                continue
+            profile_dir = (acc.get("profile_dir") or "").strip() or get_default_profile_dir(acc_id)
+            base = {
+                "id": acc_id,
+                "name": str(acc.get("name") or acc_id),
+                "platform": str(acc.get("platform") or platform),
+                "phone": str(acc.get("phone") or ""),
+                "profile_dir": profile_dir,
+            }
+            extra = {k: v for k, v in acc.items() if k not in base}
+            rows.append(
+                (
+                    base["id"],
+                    base["name"],
+                    base["platform"],
+                    base["phone"],
+                    base["profile_dir"],
+                    json.dumps(extra, ensure_ascii=False) if extra else None,
+                    now,
+                    now,
+                )
+            )
+
+    if not rows:
+        return
+
+    conn = get_conn()
+    try:
+        cur = conn.cursor()
+        cur.executemany(
+            """
+            INSERT OR REPLACE INTO accounts
+            (id, name, platform, phone, profile_dir, extra_json, created_at, updated_at)
+            VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+            """,
+            rows,
+        )
+        conn.commit()
+    finally:
+        conn.close()
+
+def get_account_by_id(account_id):
+    migrate_legacy_json_if_needed()
+    conn = get_conn()
+    try:
+        cur = conn.cursor()
+        cur.execute(
+            "SELECT id, name, platform, phone, profile_dir, 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]),
+        }
+        if row[5]:
+            try:
+                extra = json.loads(row[5])
+                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]
-        
+    migrate_legacy_json_if_needed()
+    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 FROM accounts ORDER BY platform, id")
+        else:
+            cur.execute(
+                "SELECT id, name, phone, platform FROM accounts WHERE platform = ? ORDER BY id",
+                (platform,),
+            )
+        rows = cur.fetchall()
+    finally:
+        conn.close()
+
+    found = False
+    for row in rows:
+        phone = row[2] or "未绑定手机"
+        print(f"账号ID:{row[0]} | 名称:{row[1]} | 手机号:{phone} | 平台:{row[3]}")
+        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_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")