draftgo-cli 1.0.0 → 1.1.1

package/resources/skill/scripts/draftgo_sync.py

@@ -1,12 +1,18 @@
 #!/usr/bin/env python3
 """
 DraftGo Sync Script
-推送本地页面 / 导航栏 / DB Meta 修改到云端。
+推送本地修改到云端。覆盖所有 init 拉取的类型：
+  pages / nav / db_meta / aihub / external_apis / system_config / roles / users
 
 用法：
-  python draftgo_sync.py pages   [page_id ...]
-  python draftgo_sync.py nav     [nav_id ...]
-  python draftgo_sync.py db_meta [db_meta_id ...]
+  python draftgo_sync.py pages         [page_id ...]
+  python draftgo_sync.py nav           [nav_id ...]
+  python draftgo_sync.py db_meta       [db_meta_id ...]
+  python draftgo_sync.py aihub         [aihub_id ...]
+  python draftgo_sync.py external_apis [api_id ...]
+  python draftgo_sync.py system_config [config_key ...]
+  python draftgo_sync.py roles         [role_id ...]   ⚠️ 涉及权限，调用前应人工确认
+  python draftgo_sync.py users         [user_id ...]   ⚠️ 涉及账号，调用前应人工确认
 """
 import json, sys
 from pathlib import Path
@@ -131,19 +137,113 @@ def sync_nav(server, token, ids=None):
         print(f"  {'OK' if ok else 'ERR'} [{name}] nav_id={nid}{'' if ok else ' -> ' + str(info)}")
 
 
+def sync_aihub(server, token, ids=None):
+    items = _load_index("aihub/index.json")
+    if ids:
+        items = [it for it in items if str(it.get("id")) in ids]
+    for it in items:
+        iid = it.get("id")
+        name = it.get("name", iid)
+        # 服务端 AIHubUpdate 接受的字段子集
+        payload = {k: it.get(k) for k in (
+            "type", "name", "data", "priority", "version",
+            "tags", "describe", "permission", "status",
+        ) if it.get(k) is not None}
+        ok, info = api_call("PUT", server, token, f"/api/aihub/{iid}", payload)
+        print(f"  {'OK' if ok else 'ERR'} [{name}] aihub_id={iid}{'' if ok else ' -> ' + str(info)}")
+
+
+def sync_external_apis(server, token, ids=None):
+    items = _load_index("external_apis/index.json")
+    if ids:
+        items = [it for it in items if str(it.get("id")) in ids]
+    for it in items:
+        iid = it.get("id")
+        code = it.get("code", iid)
+        # 服务端 ExternalAPIUpdate 接受字段
+        payload = {k: it.get(k) for k in (
+            "name", "base_url", "method", "path", "headers",
+            "auth_type", "auth_config", "timeout_ms", "permission",
+            "param_schema", "tags", "description", "status",
+        ) if it.get(k) is not None}
+        ok, info = api_call("PUT", server, token, f"/api/external-apis/{iid}", payload)
+        print(f"  {'OK' if ok else 'ERR'} [{code}] api_id={iid}{'' if ok else ' -> ' + str(info)}")
+
+
+def sync_system_config(server, token, keys=None):
+    items = _load_index("system_config/index.json")
+    if keys:
+        items = [it for it in items if str(it.get("config_key")) in keys]
+    for it in items:
+        ck = it.get("config_key")
+        if not ck:
+            continue
+        # 优先使用 parsed_value（init 时 GET 返回的解析值），其次 config_value
+        value = it.get("parsed_value") if "parsed_value" in it else it.get("config_value")
+        payload = {
+            "config_value": value,
+            "value_type": it.get("value_type"),
+            "category": it.get("category"),
+            "description": it.get("description"),
+            "is_sensitive": it.get("is_sensitive"),
+            "status": it.get("status"),
+        }
+        payload = {k: v for k, v in payload.items() if v is not None}
+        ok, info = api_call("PUT", server, token, f"/api/system/{ck}", payload)
+        print(f"  {'OK' if ok else 'ERR'} [{ck}]{'' if ok else ' -> ' + str(info)}")
+
+
+def sync_roles(server, token, ids=None):
+    items = _load_index("roles/index.json")
+    if ids:
+        items = [it for it in items if str(it.get("id")) in ids]
+    for it in items:
+        rid = it.get("id")
+        code = it.get("code", rid)
+        # RoleUpdateRequest 字段
+        payload = {k: it.get(k) for k in (
+            "name", "description", "status", "sort_order", "user_visible",
+        ) if it.get(k) is not None}
+        ok, info = api_call("PUT", server, token, f"/api/roles/{rid}", payload)
+        print(f"  {'OK' if ok else 'ERR'} [{code}] role_id={rid}{'' if ok else ' -> ' + str(info)}")
+
+
+def sync_users(server, token, ids=None):
+    items = _load_index("users/index.json")
+    if ids:
+        items = [it for it in items if str(it.get("id")) in ids]
+    for it in items:
+        uid = it.get("id")
+        uname = it.get("username", uid)
+        # UserUpdateRequest 字段子集（不下发 password / role_ids 之类敏感修改）
+        payload = {k: it.get(k) for k in (
+            "username", "email", "phone_number", "nickname",
+            "avatar", "status", "notes",
+        ) if it.get(k) is not None}
+        ok, info = api_call("PUT", server, token, f"/api/users/{uid}", payload)
+        print(f"  {'OK' if ok else 'ERR'} [{uname}] user_id={uid}{'' if ok else ' -> ' + str(info)}")
+
+
+HANDLERS = {
+    "pages":         sync_pages,
+    "nav":           sync_nav,
+    "db_meta":       sync_db_meta,
+    "aihub":         sync_aihub,
+    "external_apis": sync_external_apis,
+    "system_config": sync_system_config,
+    "roles":         sync_roles,
+    "users":         sync_users,
+}
+
+
 def main():
-    if len(sys.argv) < 2 or sys.argv[1] not in ("pages", "nav", "db_meta"):
-        print("usage: draftgo_sync.py pages|nav|db_meta [id ...]")
+    if len(sys.argv) < 2 or sys.argv[1] not in HANDLERS:
+        print(f"usage: draftgo_sync.py {{{'|'.join(HANDLERS)}}} [id ...]")
         sys.exit(1)
     mode = sys.argv[1]
     ids = sys.argv[2:] or None
     server, token = load_config()
-    if mode == "pages":
-        sync_pages(server, token, ids)
-    elif mode == "db_meta":
-        sync_db_meta(server, token, ids)
-    else:
-        sync_nav(server, token, ids)
+    HANDLERS[mode](server, token, ids)
 
 
 if __name__ == "__main__":

package/resources/skill/sync/SKILL.md

@@ -1,45 +1,102 @@
 ---
 name: draftgo-sync
-description: Use this skill when the user says "同步页面", "同步导航", "同步数据库", "sync pages", "sync nav", "sync db_meta", "/draftgo sync", or wants to push local page/navigation/db_meta changes to the DraftGo server.
-version: 1.0.0
+description: Use this skill when the user says "同步页面", "同步导航", "同步数据库", "同步AI资产", "同步外部API", "同步系统配置", "同步角色", "同步用户", "sync pages", "sync nav", "sync db_meta", "sync aihub", "sync external_apis", "sync system_config", "sync roles", "sync users", "/draftgo sync", or wants to push local changes to the DraftGo server.
+version: 1.1.0
 allowed-tools: Bash(python:*), Read, Glob
 ---
 
 # DraftGo 同步
 
-> **STOP — 禁止手动调用 API、禁止用 curl、禁止自己写 Python 上传逻辑。**
-> 唯一正确方式：运行下方 Python 脚本。脚本已处理所有字段结构、token 读取、错误处理。
+> **STOP — 禁止用 curl、禁止自己写 Python 上传逻辑。**
+> 唯一正确方式：运行下方 Python 脚本。脚本覆盖 init 拉取的全部 8 种类型，已处理字段结构、token 读取、错误处理。
 
-脚本固定位于 `.draftgo/skill/scripts/draftgo_sync.py`。
+脚本路径取决于安装方式：
+- CLI 安装：`.draftgo/skill/scripts/draftgo_sync.py`
+- Claude Code 安装：`.claude/skills/draftgo/scripts/draftgo_sync.py`
 
 ## 同步页面（"同步页面" / "sync pages"）
 
 ```
-!python .draftgo/skill/scripts/draftgo_sync.py pages
-!python .draftgo/skill/scripts/draftgo_sync.py pages <page_id>
+!python <skill_scripts>/draftgo_sync.py pages
+!python <skill_scripts>/draftgo_sync.py pages <page_id>
 ```
 
 ## 同步数据库元数据（"同步数据库" / "sync db_meta"）
 
 ```
-!python .draftgo/skill/scripts/draftgo_sync.py db_meta
-!python .draftgo/skill/scripts/draftgo_sync.py db_meta <db_meta_id>
+!python <skill_scripts>/draftgo_sync.py db_meta
+!python <skill_scripts>/draftgo_sync.py db_meta <db_meta_id>
 ```
 
 ## 同步导航栏（"同步导航" / "sync nav"）
 
 ```
-!python .draftgo/skill/scripts/draftgo_sync.py nav
-!python .draftgo/skill/scripts/draftgo_sync.py nav <nav_id>
+!python <skill_scripts>/draftgo_sync.py nav
+!python <skill_scripts>/draftgo_sync.py nav <nav_id>
 ```
 
-脚本会自动读取 `.draftgo/config.json` 和 `.draftgo/token`。
+脚本会自动读取 `.draftgo/config.json`。
+
+## 同步 AI 资产（"同步AI资产" / "sync aihub"）
+
+```
+!python <skill_scripts>/draftgo_sync.py aihub
+!python <skill_scripts>/draftgo_sync.py aihub <aihub_id>
+```
+
+读取 `.draftgo/aihub/index.json`，按 `AIHubUpdate` schema 推送。
+
+## 同步外部 API（"同步外部API" / "sync external_apis"）
+
+```
+!python <skill_scripts>/draftgo_sync.py external_apis
+!python <skill_scripts>/draftgo_sync.py external_apis <api_id>
+```
+
+读取 `.draftgo/external_apis/index.json`（已包含 init 时合并的 detail 字段），按 `ExternalAPIUpdate` schema 推送。
+
+## 同步系统配置（"同步系统配置" / "sync system_config"）
+
+```
+!python <skill_scripts>/draftgo_sync.py system_config
+!python <skill_scripts>/draftgo_sync.py system_config <config_key>
+```
+
+读取 `.draftgo/system_config/index.json`，按 `config_key` 调用 `PUT /api/system/{config_key}`。脚本优先使用 `parsed_value`。
+
+## 同步角色（"同步角色" / "sync roles"）⚠️ 需二次确认
+
+roles 涉及权限安全，**强制要求人工确认**：
+
+1. 读取 `.draftgo/roles/index.json`
+2. **向用户展示即将同步的变更内容**
+3. **等待用户明确确认**
+4. 确认后运行：
+   ```
+   !python <skill_scripts>/draftgo_sync.py roles
+   !python <skill_scripts>/draftgo_sync.py roles <role_id>
+   ```
+5. 用户拒绝则不同步
+
+## 同步用户（"同步用户" / "sync users"）⚠️ 需二次确认
+
+users 涉及账号安全，**强制要求人工确认**：
+
+1. 读取 `.draftgo/users/index.json`
+2. **向用户展示即将同步的变更内容**
+3. **等待用户明确确认**
+4. 确认后运行：
+   ```
+   !python <skill_scripts>/draftgo_sync.py users
+   !python <skill_scripts>/draftgo_sync.py users <user_id>
+   ```
+5. 脚本不会下发 password / role_ids；如需修改请走专用接口
 
 ## 同步方式
 
-**必须用 Python 脚本同步，禁止用 curl。**
+**所有类型必须用 Python 脚本同步，禁止用 curl。**
 
-curl 在 Windows/Git Bash 环境下传输大 HTML 时会报 `Argument list too long`（exit 126）。
+curl 在 Windows/Git Bash 环境下传输大 HTML / JSON 时会报 `Argument list too long`（exit 126）。
 统一使用 `draftgo_sync.py` 或临时 Python 脚本（`urllib.request`）进行同步。
 
 ## 接口说明
@@ -62,6 +119,18 @@ payload 必须包含完整元数据（从 `pages/index.json` 读取）+ HTML：
 
 **导航栏同步**：`PUT /api/navigations/{id}`，payload 为 `{"html": "..."}` 字符串。
 
+**DB Meta 同步**：`PUT /api/db-meta/{id}`，payload 含 `type`, `label`, `describe`, `schema`, `permission`, `schema_validation`, `extra`。
+
+**AI 资产同步**：`PUT /api/aihub/{id}`，payload 子集：`type`, `name`, `data`, `priority`, `version`, `tags`, `describe`, `permission`, `status`。
+
+**外部 API 同步**：`PUT /api/external-apis/{id}`，payload 子集：`name`, `base_url`, `method`, `path`, `headers`, `auth_type`, `auth_config`, `timeout_ms`, `permission`, `param_schema`, `tags`, `description`, `status`。
+
+**系统配置同步**：`PUT /api/system/{config_key}`，payload：`config_value`(parsed), `value_type`, `category`, `description`, `is_sensitive`, `status`。
+
+**角色同步**：`PUT /api/roles/{id}`，payload 含 `name`, `description`, `status`, `sort_order`, `user_visible`。
+
+**用户同步**：`PUT /api/users/{id}`，payload 子集：`username`, `email`, `phone_number`, `nickname`, `avatar`, `status`, `notes`（不含 password / role_ids）。
+
 ## 失败处理
 
 如果报错 `未找到 .draftgo/config.json`，提示用户先运行 `/draftgo init`。

package/src/commands/doctor.js

@@ -5,8 +5,9 @@ const { all } = require('../installers');
 const { detectTargets } = require('../detect');
 const { findPython } = require('../python');
 const { readInstalledVersion, getPackageVersion } = require('../skill');
+const { fetchLatestVersion, cmpSemver } = require('../updateCheck');
 
-function doctor(projectDir) {
+async function doctor(projectDir, flags = {}) {
   log.title('draftgo doctor');
 
   log.info(`Node 版本：${process.version}`);
@@ -19,6 +20,20 @@ function doctor(projectDir) {
   if (py) log.ok(`Python：${py.bin} (${py.version})`);
   else log.err('Python 未检测到（DraftGo init/sync 脚本需要 Python 3.9+）。');
 
+  console.log('');
+  if (!flags['skip-update-check'] && process.env.DRAFTGO_NO_UPDATE_CHECK !== '1') {
+    const current = getPackageVersion();
+    const latest = await fetchLatestVersion();
+    if (!latest) {
+      log.dim('CLI 最新版查询失败（可能离线或 registry 不可达）');
+    } else if (cmpSemver(latest, current) > 0) {
+      log.warn(`CLI 有新版：${current} → ${latest}`);
+      log.dim('  下次运行 `draftgo update` 时会自动升级。');
+    } else {
+      log.ok(`CLI 已是最新：${current}`);
+    }
+  }
+
   console.log('');
   log.info('项目中检测到的 AI 工具信号：');
   const hits = detectTargets(projectDir);

package/src/commands/help.js

@@ -10,21 +10,27 @@ function help() {
 Usage:
   draftgo init [<target>...]       Install skill. No target = auto-detect.
                                     Use "all" to install every target.
-  draftgo update [<target>...]     Update skill body + entry files (preserves
-                                    config/iteration/bugs/local data).
+  draftgo update [<target>...]     Update skill + entry files. If a newer CLI
+                                    version exists on npm, upgrades the CLI
+                                    automatically then reruns itself.
   draftgo uninstall [<target>...]  Remove entry files for target(s).
                                     --purge also removes .draftgo/ (runtime data).
   draftgo status                   Show installed targets and skill version.
-  draftgo doctor                   Diagnose environment (python, targets).
+  draftgo doctor                   Diagnose environment (python, targets,
+                                    CLI freshness).
   draftgo list-targets             List supported AI tools.
   draftgo -v | --version           Print CLI version.
   draftgo -h | --help              Show this help.
 
 Flags:
-  --project <dir>    Operate on <dir> instead of the current working directory.
-  --force            Overwrite existing skill body during install/update.
-  --purge            (uninstall) Also remove the entire .draftgo/ directory.
-  --yes              Assume "yes" for interactive prompts.
+  --project <dir>          Operate on <dir> instead of the current directory.
+  --force                  Overwrite existing skill body during install/update.
+  --purge                  (uninstall) Also remove the entire .draftgo/ directory.
+  --skip-update-check      Do not contact npm to check for a newer CLI.
+  --yes                    Assume "yes" for interactive prompts.
+
+Environment:
+  DRAFTGO_NO_UPDATE_CHECK=1     Disable the automatic CLI-freshness check.
 
 Targets:
 ${targets}
@@ -34,7 +40,7 @@ Examples:
   draftgo init claudecode      # install for Claude Code only
   draftgo init claudecode kiro # install for both
   draftgo init all             # install for every supported target
-  draftgo update               # refresh skill content to latest
+  draftgo update               # upgrade CLI if needed, then refresh skill
   draftgo uninstall --purge    # full removal incl. runtime data
 `);
 }

package/src/commands/update.js

@@ -1,14 +1,81 @@
 'use strict';
 
+const { spawnSync } = require('child_process');
 const log = require('../logger');
 const { all, resolveTargets } = require('../installers');
 const { updateSkillBody, readInstalledVersion, getPackageVersion } = require('../skill');
+const { fetchLatestVersion, cmpSemver } = require('../updateCheck');
+
+// Env flag we set before re-exec to avoid infinite upgrade loops.
+const REENTRY_FLAG = 'DRAFTGO_UPDATE_REENTERED';
+
+function runNpmInstallLatest() {
+  const npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+  log.step('执行：npm install -g draftgo-cli@latest');
+  const r = spawnSync(npm, ['install', '-g', 'draftgo-cli@latest'], { stdio: 'inherit' });
+  if (r.error) { log.err(`升级失败：${r.error.message}`); return false; }
+  if (r.status !== 0) {
+    log.err(`npm install 返回码 ${r.status}`);
+    log.dim('  常见原因：权限不足（macOS/Linux 用 sudo，或用 nvm 管理 Node）');
+    return false;
+  }
+  return true;
+}
+
+function reExecSameCommand(projectDir) {
+  // Re-run `draftgo update` from the freshly installed global CLI, so the user
+  // gets the newest skill content written into .draftgo/skill in the same call.
+  const cmd = process.platform === 'win32' ? 'draftgo.cmd' : 'draftgo';
+  const args = ['update', '--project', projectDir, '--skip-update-check'];
+  log.step('以新版 CLI 重新执行：draftgo update');
+  const r = spawnSync(cmd, args, {
+    stdio: 'inherit',
+    env: { ...process.env, [REENTRY_FLAG]: '1' },
+  });
+  if (r.error) {
+    log.err(`重新执行失败：${r.error.message}`);
+    log.dim('  请手动在项目目录再跑一次：draftgo update');
+    return 1;
+  }
+  return r.status || 0;
+}
+
+async function maybeAutoUpgrade(projectDir, flags) {
+  if (flags['skip-update-check']) return { upgraded: false };
+  if (process.env[REENTRY_FLAG] === '1') return { upgraded: false };
+  if (process.env.DRAFTGO_NO_UPDATE_CHECK === '1') return { upgraded: false };
+
+  const current = getPackageVersion();
+  const latest = await fetchLatestVersion();
+  if (!latest) {
+    log.dim('  （查询最新版失败，按当前 CLI 继续）');
+    return { upgraded: false };
+  }
+  if (cmpSemver(latest, current) <= 0) {
+    log.dim(`  CLI 已是最新（${current}）`);
+    return { upgraded: false };
+  }
+
+  log.warn(`draftgo-cli 有新版：${current} → ${latest}，自动升级中……`);
+  const ok = runNpmInstallLatest();
+  if (!ok) {
+    log.warn('自动升级失败，回退到当前 CLI 继续执行。');
+    return { upgraded: false };
+  }
+  log.ok(`CLI 已升级到 ${latest}。`);
+  const code = reExecSameCommand(projectDir);
+  return { upgraded: true, exitCode: code };
+}
 
 async function update(projectDir, positional, flags) {
   log.title('draftgo update');
 
   const prev = readInstalledVersion(projectDir);
-  log.info(`当前已装：${prev || '未安装'}，CLI 版本：${getPackageVersion()}`);
+  log.info(`当前已装 skill：${prev || '未安装'}，CLI 版本：${getPackageVersion()}`);
+
+  // Auto-upgrade-and-rerun path.
+  const { upgraded, exitCode } = await maybeAutoUpgrade(projectDir, flags);
+  if (upgraded) return exitCode;
 
   // Determine which entry files to refresh:
   //   - no positional → refresh only targets that are currently installed

package/src/index.js

@@ -34,7 +34,7 @@ async function run(argv) {
       case 'status':
         return require('./commands/status')(projectDir);
       case 'doctor':
-        return require('./commands/doctor')(projectDir);
+        return await require('./commands/doctor')(projectDir, flags);
       case 'list-targets':
       case 'targets':
         return require('./commands/listTargets')();

package/src/updateCheck.js

@@ -0,0 +1,58 @@
+'use strict';
+
+// Fetch the latest draftgo-cli version from the npm registry.
+// No cache — every call hits the network. Returns null on any failure so
+// callers can gracefully fall back.
+
+const https = require('https');
+const { getPackageVersion } = require('./skill');
+
+const REGISTRY_URL = 'https://registry.npmjs.org/draftgo-cli/latest';
+
+function fetchLatestVersion(timeoutMs = 3000) {
+  return new Promise((resolve) => {
+    let req;
+    try {
+      req = https.get(
+        REGISTRY_URL,
+        { timeout: timeoutMs, headers: { accept: 'application/json' } },
+        (res) => {
+          if (res.statusCode !== 200) { res.resume(); return resolve(null); }
+          let body = '';
+          res.setEncoding('utf8');
+          res.on('data', (c) => { body += c; });
+          res.on('end', () => {
+            try { resolve(JSON.parse(body).version || null); }
+            catch { resolve(null); }
+          });
+        }
+      );
+    } catch {
+      return resolve(null);
+    }
+    req.on('error', () => resolve(null));
+    req.on('timeout', () => { req.destroy(); resolve(null); });
+  });
+}
+
+// Compare 'a.b.c' ignoring prerelease tags. Returns 1 / 0 / -1.
+function cmpSemver(a, b) {
+  const pa = String(a).split('-')[0].split('.').map((x) => Number(x) || 0);
+  const pb = String(b).split('-')[0].split('.').map((x) => Number(x) || 0);
+  for (let i = 0; i < 3; i++) {
+    const d = (pa[i] || 0) - (pb[i] || 0);
+    if (d !== 0) return d > 0 ? 1 : -1;
+  }
+  return 0;
+}
+
+// Report-only helper used by doctor. Never throws.
+async function getFreshness() {
+  if (process.env.DRAFTGO_NO_UPDATE_CHECK === '1') return null;
+  const current = getPackageVersion();
+  const latest = await fetchLatestVersion();
+  if (!latest) return null;
+  return { current, latest, outdated: cmpSemver(latest, current) > 0 };
+}
+
+module.exports = { fetchLatestVersion, cmpSemver, getFreshness };