@hupan56/wlkj 2.3.2 → 2.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hupan56/wlkj",
-  "version": "2.3.2",
+  "version": "2.3.4",
   "description": "AI Product R&D Workflow - PRD/Prototype/Search/Task/Report",
   "bin": {
     "wlkj": "bin/cli.js"

package/templates/qoder/scripts/common/reqid.py

@@ -140,6 +140,7 @@ def validate_req_ids(prd_paths: List[str], repo_root: Union[str, Path]) -> None:
     seen = {}
     errors = []
     # 全库已有 REQ-ID (用于跨人撞号检测)
+    # existing: {(year,n): [filepath, ...]}
     existing = scan_existing_req_ids(repo_root)
 
     for p in prd_paths:
@@ -158,13 +159,17 @@ def validate_req_ids(prd_paths: List[str], repo_root: Union[str, Path]) -> None:
             )
         else:
             seen[key] = p
-        # 跨人/全库撞号检测: 该号已存在于仓库, 且不是同一个文件 (允许修改自己的)
-        if key in existing and os.path.basename(existing[key]) != basename:
-            errors.append(
-                "撞号: %s 与仓库已有的 %s 都是 REQ-%d-%03d "
-                "(两人离线各建了同号 PRD? 请改其中一个的编号)"
-                % (basename, os.path.basename(existing[key]), year, n)
-            )
+        # 跨人/全库撞号检测: 该号已存在于仓库的其他文件
+        # existing[key] 是列表; 只要里面有"文件名跟当前不同的"就算撞号
+        if key in existing:
+            for other_path in existing[key]:
+                if os.path.basename(other_path) != basename:
+                    errors.append(
+                        "撞号: %s 与仓库已有的 %s 都是 REQ-%d-%03d "
+                        "(两人离线各建了同号 PRD? 请改其中一个的编号)"
+                        % (basename, os.path.basename(other_path), year, n)
+                    )
+                    break  # 一个冲突够了
         # 超界检测 (NNN 不能超过计数器, 防止跳号)
         max_n = current_counter(str(year), repo_root)
         if max_n > 0 and n > max_n:
@@ -253,7 +258,7 @@ def scan_existing_req_ids(repo_root: Optional[Union[str, Path]] = None) -> dict:
             if d.is_dir():
                 scan_dirs.append(d)
 
-    existing = {}
+    existing = {}  # (year, n) -> [filepath, ...] (一个号可能被多个文件用)
     for d in scan_dirs:
         if not d.is_dir():
             continue
@@ -263,7 +268,7 @@ def scan_existing_req_ids(repo_root: Optional[Union[str, Path]] = None) -> dict:
                     continue
                 parsed = parse_req_id(f.name)
                 if parsed:
-                    existing[parsed] = str(f)
+                    existing.setdefault(parsed, []).append(str(f))
         except OSError:
             continue
     return existing

package/templates/cli.js

@@ -1,198 +0,0 @@
-#!/usr/bin/env node
-// wlkj - workflow toolkit
-// 参考 Trellis 架构：用户看到的极简，背后 scripts/hooks 精确控制
-
-const path = require("path");
-const fs = require("fs");
-const { execSync } = require("child_process");
-
-const T = path.join(__dirname, "..", "templates");
-
-// --- helpers ---
-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);
-  }
-  try {
-    return execSync(
-      `python "${p}" ${args.map(a => `"${a}"`).join(" ")}`,
-      { cwd: process.cwd(), encoding: "utf-8", timeout: 15000 }
-    );
-  } catch (e) {
-    return (e.stdout || e.message);
-  }
-}
-
-function cp(src, dest) {
-  const s = path.join(T, src);
-  const d = path.join(process.cwd(), dest);
-  if (!fs.existsSync(s)) return;
-  fs.mkdirSync(path.dirname(d), { recursive: true });
-  if (!fs.existsSync(d)) { fs.copyFileSync(s, d); return true; }
-  return false;
-}
-
-function cpDir(src, dest) {
-  const s = path.join(T, src);
-  const d = path.join(process.cwd(), dest);
-  if (!fs.existsSync(s)) return;
-  fs.mkdirSync(d, { recursive: true });
-  const items = fs.readdirSync(s);
-  items.forEach(item => {
-    const srcPath = path.join(s, item);
-    const destPath = path.join(d, item);
-    if (fs.statSync(srcPath).isDirectory()) {
-      cpDir(path.join(src, item), path.join(dest, item));
-    } else if (!fs.existsSync(destPath)) {
-      fs.copyFileSync(srcPath, destPath);
-    }
-  });
-}
-
-// --- init ---
-function doInit(name) {
-  const cwd = process.cwd();
-  console.log(``);
-  console.log(`wlkj init -> ${cwd}`);
-
-  // 目录结构
-  const dirs = [
-    ".qoder/rules", ".qoder/context", ".qoder/scripts/common",
-    ".qoder/scripts/hooks", ".qoder/skills/prd-generator",
-    ".qoder/skills/spec-generator", ".qoder/skills/spec-coder",
-    ".qoder/skills/test-generator", ".qoder/agents", ".qoder/hooks",
-    ".qoder/tasks", ".qoder/archive", ".qoder/workspace",
-    ".qoder/.runtime/sessions",
-    ".codex/hooks", ".codex/agents",
-    "docs/ai/prd", "docs/ai/specs", "src", "tests"
-  ];
-  dirs.forEach(d => fs.mkdirSync(path.join(cwd, d), { recursive: true }));
-
-  // 模板文件（flat list，一目了然）
-  let copied = 0;
-  const files = [
-    // .qoder 核心
-    ["qoder/config.yaml",        ".qoder/config.yaml"],
-    ["qoder/workflow.md",        ".qoder/workflow.md"],
-    // rules
-    ["rules/code-style.md",      ".qoder/rules/code-style.md"],
-    ["rules/prd-template.md",    ".qoder/rules/prd-template.md"],
-    ["rules/spec-template.md",   ".qoder/rules/spec-template.md"],
-    ["rules/testing.md",         ".qoder/rules/testing.md"],
-    // context
-    ["context/architecture.md",  ".qoder/context/architecture.md"],
-    ["context/data-dictionary.md",".qoder/context/data-dictionary.md"],
-    // skills
-    ["skills/prd-generator/SKILL.md",   ".qoder/skills/prd-generator/SKILL.md"],
-    ["skills/spec-generator/SKILL.md",  ".qoder/skills/spec-generator/SKILL.md"],
-    ["skills/spec-coder/SKILL.md",      ".qoder/skills/spec-coder/SKILL.md"],
-    ["skills/test-generator/SKILL.md",  ".qoder/skills/test-generator/SKILL.md"],
-    // agents
-    ["agents/qoder-spec-gen.toml", ".qoder/agents/qoder-spec-gen.toml"],
-    ["agents/qoder-coder.toml",    ".qoder/agents/qoder-coder.toml"],
-    ["agents/qoder-test-gen.toml", ".qoder/agents/qoder-test-gen.toml"],
-    // hooks
-    ["hooks/post-prd-push.py",    ".qoder/hooks/post-prd-push.py"],
-    // scripts
-    ["scripts/init_developer.py", ".qoder/scripts/init_developer.py"],
-    ["scripts/task.py",           ".qoder/scripts/task.py"],
-    ["scripts/add_session.py",    ".qoder/scripts/add_session.py"],
-    ["scripts/common/__init__.py",   ".qoder/scripts/common/__init__.py"],
-    ["scripts/common/paths.py",      ".qoder/scripts/common/paths.py"],
-    ["scripts/common/developer.py",  ".qoder/scripts/common/developer.py"],
-    ["scripts/common/active_task.py",".qoder/scripts/common/active_task.py"],
-    ["scripts/common/task_utils.py", ".qoder/scripts/common/task_utils.py"],
-    // codex hooks
-    ["codex/config.toml",                    ".codex/config.toml"],
-    ["codex/hooks.json",                     ".codex/hooks.json"],
-    ["codex/hooks/inject-pipeline-state.py", ".codex/hooks/inject-pipeline-state.py"],
-    ["codex/agents/qoder-spec-gen.toml",     ".codex/agents/qoder-spec-gen.toml"],
-    ["codex/agents/qoder-coder.toml",        ".codex/agents/qoder-coder.toml"],
-    ["codex/agents/qoder-test-gen.toml",     ".codex/agents/qoder-test-gen.toml"],
-    // root
-    ["root/AGENTS.md",            "AGENTS.md"],
-  ];
-
-  files.forEach(([s, d]) => { if (cp(s, d)) copied++; });
-  console.log(`  copied ${copied} files`);
-
-  // git init
-  if (!fs.existsSync(path.join(cwd, ".git"))) {
-    try {
-      execSync("git init", { cwd, stdio: "pipe" });
-      console.log("  git init done");
-    } catch (_) {}
-  }
-
-  // developer
-  if (name) {
-    console.log("");
-    process.stdout.write(py("init_developer.py", [name]));
-  } else {
-    console.log("");
-    console.log("  next: npx wlkj init <your-name>");
-  }
-  console.log("");
-}
-
-// --- status ---
-function doStatus() {
-  console.log("");
-  // developer
-  const dev = path.join(process.cwd(), ".qoder", ".developer");
-  if (fs.existsSync(dev)) {
-    const line = fs.readFileSync(dev, "utf-8").split("\n")[0];
-    console.log("dev: " + line.split("=")[1]?.trim());
-  } else {
-    console.log("dev: -");
-  }
-  // task
-  process.stdout.write(py("task.py", ["current", "--source"]));
-  // docs
-  const count = (d) => {
-    const p = path.join(process.cwd(), d);
-    return fs.existsSync(p) ? fs.readdirSync(p).filter(f => f.endsWith(".md")).length : 0;
-  };
-  console.log(`prd: ${count("docs/ai/prd")}  spec: ${count("docs/ai/specs")}`);
-  console.log("");
-}
-
-// --- main ---
-const [,, cmd, ...rest] = process.argv;
-
-switch (cmd) {
-  case "init":
-    doInit(rest[0]);
-    break;
-  case "task":
-    // 映射 -p 到 --priority（CLI 便捷）
-    const mapped = rest.map(a => a === "-p" ? "--priority" : a);
-    process.stdout.write(py("task.py", mapped));
-    break;
-  case "status":
-    doStatus();
-    break;
-  case "session":
-    process.stdout.write(py("add_session.py", rest));
-    break;
-  default:
-    console.log("");
-    console.log("wlkj - workflow toolkit");
-    console.log("");
-    console.log("  npx wlkj init [name]     init workflow + developer");
-    console.log("  npx wlkj status          show status");
-    console.log("  npx wlkj task <cmd>      task management");
-    console.log("  npx wlkj session <args>  record session log");
-    console.log("");
-    console.log("task commands:");
-    console.log('  create "Title" [-p P0|P1|P2|P3] [--assignee who]');
-    console.log("  list [--mine] [--status planning|in_progress]");
-    console.log("  start <name>");
-    console.log("  finish");
-    console.log("  current");
-    console.log("  archive <name>");
-    console.log("  add-subtask <parent> <child>");
-    console.log("");
-}

package/templates/qoder/scripts/code_index.py

@@ -1,41 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
-DEPRECATED: code_index.py used to keep its own (cruder) index builder
-whose schema conflicted with git_sync.py's - running it would overwrite
-the real indexes. It now delegates to the single implementation.
-
-Usage:
-  python code_index.py scan          # full index rebuild (= git_sync.py --index-only)
-  python code_index.py search <kw>   # use search_index.py instead
-"""
-
-import os
-import sys
-
-# UTF-8 stdio (防御性: stdout 被捕获时不崩溃)
-try:
-    sys.stdout.reconfigure(encoding='utf-8', errors='replace')
-except (AttributeError, TypeError, OSError, IOError):
-    try:
-        sys.stdout.reconfigure(encoding='utf-8')
-    except Exception:
-        pass
-
-sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
-
-if __name__ == '__main__':
-    cmd = sys.argv[1] if len(sys.argv) > 1 else ''
-    if cmd == 'scan':
-        from git_sync import build_full_indexes, FAILURES
-        build_full_indexes()
-        sys.exit(1 if FAILURES else 0)
-    elif cmd == 'search' and len(sys.argv) > 2:
-        import subprocess
-        script = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'search_index.py')
-        sys.exit(subprocess.call([sys.executable, script] + sys.argv[2:]))
-    else:
-        print('Usage:')
-        print('  python code_index.py scan          # full index rebuild')
-        print('  python code_index.py search <kw>   # -> search_index.py')
-        sys.exit(1)

package/templates/qoder/scripts/notify.py

@@ -1,5 +0,0 @@
-# notify.py - Simple console notification
-class Notifier:
-    def notify(self, event, title, content):
-        sep = '=' * 50
-        print(chr(10).join(['', sep, 'NOTIFY: ' + title, sep, content, sep]))

package/templates/qoder/scripts/team.py

@@ -1,29 +0,0 @@
-# team.py - Team member registration
-import os, json, sys
-NL = chr(10)
-BASE = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-def add_member(name, role):
-    members_dir = os.path.join(BASE, 'workspace', 'members')
-    member_dir = os.path.join(members_dir, name)
-    os.makedirs(os.path.join(member_dir, 'journal'), exist_ok=True)
-    os.makedirs(os.path.join(member_dir, 'drafts'), exist_ok=True)
-    os.makedirs(os.path.join(member_dir, 'inbox'), exist_ok=True)
-    info = {'name': name, 'role': role}
-    with open(os.path.join(member_dir, 'member.json'), 'w') as f:
-        json.dump(info, f, indent=2)
-    print('OK: member ' + name + ' (' + role + ') added')
-
-def list_members():
-    md = os.path.join(BASE, 'workspace', 'members')
-    if not os.path.isdir(md): print('No members'); return
-    for d in sorted(os.listdir(md)):
-        info_f = os.path.join(md, d, 'member.json')
-        if os.path.isfile(info_f):
-            info = json.load(open(info_f))
-            print(d + ' [' + info.get('role', '?') + ']')
-
-if __name__ == '__main__':
-    if len(sys.argv) < 2: list_members()
-    elif sys.argv[1] == 'add' and len(sys.argv) >= 4: add_member(sys.argv[2], sys.argv[3])
-    else: list_members()