@hupan56/wlkj 2.2.0 → 2.2.1

package/bin/cli.js

@@ -7,6 +7,23 @@ const { execSync } = require("child_process");
 
 const T = path.join(__dirname, "..", "templates");
 
+// 当前 npm 包版本（从 package.json 读，不硬编码）
+const PKG_VERSION = JSON.parse(
+  fs.readFileSync(path.join(__dirname, "..", "package.json"), "utf-8")
+).version;
+
+// 升级时受保护的用户数据文件（绝不覆盖）
+// 这些文件含团队/机器特定配置，覆盖 = 数据丢失
+const PROTECTED_FILES = new Set([
+  "config.yaml",        // 团队 git 仓库 URL、平台映射
+  "settings.json",      // 本地权限/hook 配置
+]);
+
+// 本地状态文件（升级时也绝不碰，但不算"受保护配置"，不提示合并）
+const LOCAL_STATE_FILES = new Set([
+  ".developer", ".current-task", ".engine-version",
+]);
+
 function py(script, args = []) {
   const p = path.join(process.cwd(), ".qoder", "scripts", script);
   if (!fs.existsSync(p)) { console.log("请先运行: npx wlkj init"); process.exit(1); }
@@ -48,10 +65,16 @@ function doInit(name) {
 
   // === 1. 拷贝完整引擎 (镜像 .qoder/ 结构) ===
   // 源: templates/qoder/*  目标: .qoder/*
+  // 注意: init 用 "update" 模式的保护逻辑更安全 —— 新装时目标文件不存在,
+  // 保护逻辑不触发; 重跑 init 时 config.yaml/settings.json 不会被覆盖。
   const qoderSrc = path.join(T, "qoder");
   let copied = 0;
   if (fs.existsSync(qoderSrc)) {
-    copied = copyDirRecursive(qoderSrc, path.join(cwd, ".qoder"));
+    const r = copyDirRecursive(qoderSrc, path.join(cwd, ".qoder"), "update");
+    copied = r.copied;
+    if (r.protectedN > 0) {
+      console.log(`  [保护] ${r.protectedN} 个配置文件未覆盖（新版存为 .new）`);
+    }
   }
   console.log(`  引擎: ${copied} 个文件 (${hasExisting ? "更新" : "新建"})`);
 
@@ -86,7 +109,8 @@ function doInit(name) {
     const baseGitignore = [
       "# Source code repos (cloned by git_sync.py)", "data/code/",
       "", "# AI pipeline runtime", ".qoder/.developer", ".qoder/.current-task",
-      ".qoder/.runtime/", "", "# Personal learning", ".qoder/learning/feedback.jsonl",
+      ".qoder/.engine-version", ".qoder/.runtime/", "",
+      "# Personal learning", ".qoder/learning/feedback.jsonl",
       "", "# Machine-local", "data/index/.last-sync", "data/index/.prd-collected.json",
       "data/index/.index-meta.json", "data/index/.sync-lock", "data/index/.file-keys.json",
       "data/index/.inverted-cache.json", "data/index/*.corrupt",
@@ -113,8 +137,11 @@ function doInit(name) {
     console.log(`  setup.py 未找到, 跳过自动初始化`);
   }
 
+  // === 7. 写版本戳 ===
+  writeEngineVersion(cwd);
+
   console.log(`\n${"=".repeat(50)}`);
-  console.log(`  安装完成!`);
+  console.log(`  安装完成!  (v${PKG_VERSION})`);
   console.log(`${"=".repeat(50)}`);
   console.log(`\n  现在可以开始了:`);
   console.log(`    在 Qoder 里说 "写个 XX 的需求"`);
@@ -123,31 +150,98 @@ function doInit(name) {
   console.log(`  环境问题? python .qoder/scripts/init_doctor.py --fix\n`);
 }
 
-// 递归拷贝目录, 返回文件数
-function copyDirRecursive(src, dst) {
-  let count = 0;
-  if (!fs.existsSync(src)) return 0;
+// 递归拷贝目录, 返回 {copied, protected, skipped}
+// mode: "init" (新装, 全拷) | "update" (升级, 保护用户数据)
+function copyDirRecursive(src, dst, mode = "init") {
+  let copied = 0, protectedN = 0, skipped = 0;
+  if (!fs.existsSync(src)) return { copied, protectedN, skipped };
   fs.mkdirSync(dst, { recursive: true });
   for (const entry of fs.readdirSync(src, { withFileTypes: true })) {
     if (entry.name === "__pycache__" || entry.name.endsWith(".pyc")) continue;
     const s = path.join(src, entry.name);
     const d = path.join(dst, entry.name);
     if (entry.isDirectory()) {
-      count += copyDirRecursive(s, d);
+      const r = copyDirRecursive(s, d, mode);
+      copied += r.copied; protectedN += r.protectedN; skipped += r.skipped;
     } else {
-      // 不覆盖已存在的 (增量更新, 保留用户改动)
-      // 但 .py 和 .md / config.yaml / rules 始终更新 (引擎文件)
       const isEngine = entry.name.endsWith(".py") || entry.name.endsWith(".md") ||
                        entry.name.endsWith(".yaml") || entry.name.endsWith(".yml") ||
                        entry.name.endsWith(".toml") || entry.name.endsWith(".json") ||
                        entry.name.endsWith(".html") || entry.name.endsWith(".txt");
-      if (isEngine || !fs.existsSync(d)) {
-        fs.copyFileSync(s, d);
+
+      if (mode === "update") {
+        // 升级模式: 受保护文件绝不覆盖
+        if (PROTECTED_FILES.has(entry.name) && fs.existsSync(d)) {
+          // 新版内容存为 .new 让用户手动合并（仅当内容不同）
+          if (!filesEqual(s, d)) {
+            fs.copyFileSync(s, d + ".new");
+            protectedN++;
+          } else {
+            skipped++;
+          }
+          continue;
+        }
+        // 引擎文件: 无条件刷新（纯引擎, 不含用户数据）
+        // 非引擎文件: 已存在跳过, 不存在才建
+        if (isEngine || !fs.existsSync(d)) {
+          fs.copyFileSync(s, d);
+          copied++;
+        } else {
+          skipped++;
+        }
+      } else {
+        // init 模式: 引擎文件全覆盖, 非引擎已存在跳过 (保留用户改动)
+        if (isEngine || !fs.existsSync(d)) {
+          fs.copyFileSync(s, d);
+        }
+        copied++;
       }
-      count++;
     }
   }
-  return count;
+  return { copied, protectedN, skipped };
+}
+
+// 两文件内容是否相同（先比大小再比内容）
+function filesEqual(a, b) {
+  try {
+    const sa = fs.statSync(a), sb = fs.statSync(b);
+    if (sa.size !== sb.size) return false;
+    return fs.readFileSync(a).equals(fs.readFileSync(b));
+  } catch { return false; }
+}
+
+// 版本戳: .qoder/.engine-version 存当前引擎版本
+function writeEngineVersion(cwd) {
+  try {
+    const p = path.join(cwd, ".qoder", ".engine-version");
+    fs.mkdirSync(path.dirname(p), { recursive: true });
+    fs.writeFileSync(p, PKG_VERSION + "\n", "utf-8");
+  } catch { /* 不阻塞 */ }
+}
+
+function readEngineVersion(cwd) {
+  try {
+    const p = path.join(cwd, ".qoder", ".engine-version");
+    if (fs.existsSync(p)) return fs.readFileSync(p, "utf-8").trim();
+  } catch { /* */ }
+  return null;
+}
+
+// 跑 install_qoderwork.py（升级时强制刷新 commands）
+function runQoderWorkInstall(cwd, forceCommands) {
+  const script = path.join(cwd, ".qoder", "scripts", "install_qoderwork.py");
+  if (!fs.existsSync(script)) {
+    console.log("  [跳过] install_qoderwork.py 不存在");
+    return;
+  }
+  const args = ["python", `"${script}"`];
+  if (forceCommands) args.push("--force-commands");
+  try {
+    console.log(`\n--- 刷新 QoderWork ---`);
+    execSync(args.join(" "), { cwd, stdio: "inherit", timeout: 60000 });
+  } catch (e) {
+    console.log(`  QoderWork 刷新失败 (不阻塞): ${(e.message || "").slice(0, 80)}`);
+  }
 }
 
 function doStatus() {
@@ -165,12 +259,80 @@ function doStatus() {
     const n = fs.readdirSync(wsSpecs).filter(f => f.endsWith(".md")).length;
     console.log(`PRDs: ${n}`);
   }
+  const ver = readEngineVersion(process.cwd());
+  console.log(`engine: ${ver || "未知"} (最新: v${PKG_VERSION})${ver === PKG_VERSION ? " [最新]" : ver ? " [可升级: npx @hupan56/wlkj update]" : ""}`);
+  console.log("");
+}
+
+function doUpdate() {
+  const cwd = process.cwd();
+  const oldVer = readEngineVersion(cwd);
+  const qoderSrc = path.join(T, "qoder");
+
+  // 前置检查: 必须已装过
+  if (!fs.existsSync(path.join(cwd, ".qoder", "scripts"))) {
+    console.log("\n  未检测到已安装的引擎。首次安装请用:");
+    console.log("    npx @hupan56/wlkj init [你的名字]\n");
+    return;
+  }
+
+  console.log(`\nwlkj update${oldVer ? " " + oldVer : ""} -> v${PKG_VERSION}\n`);
+
+  // === 1. 刷新引擎文件（保护 config.yaml / settings.json）===
+  let copied = 0, protectedN = 0, skipped = 0;
+  if (fs.existsSync(qoderSrc)) {
+    const r = copyDirRecursive(qoderSrc, path.join(cwd, ".qoder"), "update");
+    copied = r.copied; protectedN = r.protectedN; skipped = r.skipped;
+  }
+  console.log(`  引擎刷新: ${copied} 个文件${skipped ? ` / ${skipped} 无变化` : ""}`);
+
+  // 报告受保护文件
+  if (protectedN > 0) {
+    console.log(`  [保护] ${protectedN} 个配置文件已保留你的本地设置:`);
+    console.log(`         新版模板存为 .new 文件, 如需合并新结构请手动对比:`);
+    // 列出实际生成的 .new 文件
+    try {
+      for (const f of fs.readdirSync(path.join(cwd, ".qoder"))) {
+        if (f.endsWith(".new")) {
+          console.log(`           .qoder/${f}`);
+        }
+      }
+    } catch { /* */ }
+  } else {
+    console.log(`  config.yaml / settings.json: 已保护（未改动）`);
+  }
+
+  // === 2. 根文件（文档类, 安全覆盖）===
+  ["root/AGENTS.md", "root/新手指南.md"].forEach(f => {
+    const src = path.join(T, f);
+    if (fs.existsSync(src)) {
+      fs.copyFileSync(src, path.join(cwd, path.basename(f)));
+    }
+  });
+  console.log(`  根文档: 已更新`);
+
+  // === 3. 刷新 QoderWork commands（强制覆盖已存在的）===
+  runQoderWorkInstall(cwd, true);
+
+  // === 4. 写版本戳 ===
+  writeEngineVersion(cwd);
+
+  console.log(`\n${"=".repeat(50)}`);
+  console.log(`  升级完成!  (v${PKG_VERSION})`);
+  console.log(`${"=".repeat(50)}`);
+  console.log(`\n  生效方式:`);
+  console.log(`    Qoder IDE / Quest: 新建对话即可`);
+  console.log(`    QoderWork: 重启应用或新建对话`);
+  if (protectedN > 0) {
+    console.log(`\n  ⚠ 有配置文件新版有变化, 生成 .new 文件:`);
+    console.log(`    确认无需合并后可直接删除, 或手动合并后删除`);
+  }
   console.log("");
 }
 
 function doHelp() {
   console.log("");
-  console.log("wlkj - AI 产品研发工作流 (v2.0)");
+  console.log(`wlkj - AI 产品研发工作流 (v${PKG_VERSION})`);
   console.log("");
   console.log("=== 环境安装 (什么都没装时先跑这个) ===");
   console.log("  npx @hupan56/wlkj install-env       检测+自动装 Node/Python/git");
@@ -179,23 +341,26 @@ function doHelp() {
   console.log("=== 一键安装 (装好环境后) ===");
   console.log("  npx @hupan56/wlkj init [你的名字]    安装完整引擎 + 自动初始化");
   console.log("");
+  console.log("=== 升级 (已装用户, 新版本发布后) ===");
+  console.log("  npx @hupan56/wlkj update              刷新引擎, 保护你的配置");
+  console.log("");
   console.log("=== 安装后怎么用 ===");
   console.log("  在 Qoder (IDE/Quest/QoderWork) 里:");
   console.log("    说中文: '写个 XX 的需求' '查一下 XX 代码' '建个任务'");
   console.log("    或斜杠: /wl-prd /wl-search /wl-task /wl-status /wl-report");
   console.log("");
   console.log("=== 状态 ===");
-  console.log("  npx wlkj status            查看当前状态");
+  console.log("  npx @hupan56/wlkj status            查看当前状态 + 引擎版本");
   console.log("");
   console.log("=== 环境修复 ===");
   console.log("  python .qoder/scripts/init_doctor.py --fix   自动修复环境");
   console.log("  python .qoder/scripts/setup.py               重新初始化");
   console.log("");
   console.log("=== Git (中文命令) ===");
-  console.log("  npx wlkj 提交PRD           提交 PRD");
-  console.log("  npx wlkj 提交任务           提交任务");
-  console.log("  npx wlkj 提交               全部提交并推送");
-  console.log("  npx wlkj 拉取最新 / 同步    git pull");
+  console.log("  npx @hupan56/wlkj 提交PRD           提交 PRD");
+  console.log("  npx @hupan56/wlkj 提交任务           提交任务");
+  console.log("  npx @hupan56/wlkj 提交               全部提交并推送");
+  console.log("  npx @hupan56/wlkj 拉取最新 / 同步    git pull");
   console.log("");
 }
 
@@ -285,6 +450,7 @@ const mapped = rest.map(a => a === "-p" ? "--priority" : a);
 
 switch (cmd) {
   case "init": doInit(rest[0]); break;
+  case "update": case "upgrade": doUpdate(); break;
   case "install-env": doInstallEnv(rest[0] === "--check"); break;
   case "task": process.stdout.write(py("task.py", mapped)); break;
   case "status": doStatus(); break;

package/package.json

@@ -1,12 +1,28 @@
 {
   "name": "@hupan56/wlkj",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "AI Product R&D Workflow - PRD/Prototype/Search/Task/Report",
-  "bin": { "wlkj": "./bin/cli.js" },
-  "files": ["bin/", "templates/"],
-  "keywords": ["workflow", "ai", "prd", "pipeline", "qoder", "product", "team"],
+  "bin": {
+    "wlkj": "bin/cli.js"
+  },
+  "files": [
+    "bin/",
+    "templates/"
+  ],
+  "keywords": [
+    "workflow",
+    "ai",
+    "prd",
+    "pipeline",
+    "qoder",
+    "product",
+    "team"
+  ],
   "license": "MIT",
-  "publishConfig": { "access": "public" },
-  "engines": { "node": ">=16" }
+  "publishConfig": {
+    "access": "public"
+  },
+  "engines": {
+    "node": ">=16"
+  }
 }
-

package/templates/qoder/scripts/install_qoderwork.py

@@ -88,6 +88,16 @@ def find_source_skills() -> list:
     return result
 
 
+def file_equal(a: Path, b: Path) -> bool:
+    """快速判断两文件内容是否相同（先比大小再比内容，避免无谓全读）。"""
+    try:
+        if a.stat().st_size != b.stat().st_size:
+            return False
+        return a.read_bytes() == b.read_bytes()
+    except OSError:
+        return False
+
+
 def create_junction(link: Path, target: Path) -> bool:
     """用 mklink /J 创建 junction。返回是否成功。"""
     # 用 errors="replace" 防止 Windows GBK 输出（如"为...创建的联接"）触发 UnicodeDecodeError
@@ -197,6 +207,8 @@ def main():
                         help="仅检查状态，不改动")
     parser.add_argument("--copy", action="store_true",
                         help="用拷贝代替 junction（非 Windows 或不想软链时用）")
+    parser.add_argument("--force-commands", action="store_true",
+                        help="强制覆盖已存在的 command 文件（升级时用；默认已存在则跳过）")
     args = parser.parse_args()
 
     print("=" * 56)
@@ -295,7 +307,7 @@ def main():
     # 同时安装 commands (让 QoderWork 用户级也能看到 /wl-* 命令)
     if action in ("install", "check") and SOURCE_COMMANDS_DIR.is_dir():
         print("\n--- Commands (/wl-* 斜杠命令) ---")
-        cmd_count = {"ok": 0, "new": 0}
+        cmd_count = {"ok": 0, "new": 0, "upd": 0}
         for cmd_file in sorted(SOURCE_COMMANDS_DIR.glob("wl-*.md")):
             name = cmd_file.name  # e.g. wl-prd.md
             target = QODERWORK_COMMANDS_DIR / name
@@ -305,18 +317,31 @@ def main():
                 else:
                     print(f"  [MISS] {name}")
             else:  # install
-                if target.exists():
-                    cmd_count["ok"] += 1
-                else:
+                need_copy = False
+                if not target.exists():
+                    need_copy = True
+                elif args.force_commands:
+                    # 强制刷新（升级场景）：仅当内容不同才覆盖，避免无谓写
+                    import shutil
+                    if not file_equal(cmd_file, target):
+                        need_copy = True
+                if need_copy:
                     try:
                         QODERWORK_COMMANDS_DIR.mkdir(parents=True, exist_ok=True)
-                        # commands 是单文件, 用拷贝 (不像 skills 是目录用 junction)
                         import shutil
                         shutil.copy2(str(cmd_file), str(target))
-                        cmd_count["new"] += 1
+                        if target.exists() and args.force_commands:
+                            cmd_count["upd"] += 1
+                        else:
+                            cmd_count["new"] += 1
                     except OSError as e:
                         print(f"  [ERR] {name}: {e}")
-        print(f"  commands: {cmd_count['new']} 新建 / {cmd_count['ok']} 已存在")
+                else:
+                    cmd_count["ok"] += 1
+        msg = f"  commands: {cmd_count['new']} 新建 / {cmd_count['ok']} 已存在"
+        if cmd_count["upd"]:
+            msg += f" / {cmd_count['upd']} 刷新"
+        print(msg)
 
     if action == "install" and counts["err"] == 0:
         print("\n✓ 安装完成。重启 QoderWork（或新建对话）后技能生效。")