@hupan56/wlkj 2.2.1 → 2.2.2

package/bin/cli.js

@@ -337,6 +337,8 @@ function doHelp() {
   console.log("=== 环境安装 (什么都没装时先跑这个) ===");
   console.log("  npx @hupan56/wlkj install-env       检测+自动装 Node/Python/git");
   console.log("  npx @hupan56/wlkj install-env --check  只检测不装");
+  console.log("  npx @hupan56/wlkj install-env --location D:\\wldev  指定安装目录");
+  console.log("  npx @hupan56/wlkj add-path D:\\wldev\\nodejs  把目录加到系统 PATH");
   console.log("");
   console.log("=== 一键安装 (装好环境后) ===");
   console.log("  npx @hupan56/wlkj init [你的名字]    安装完整引擎 + 自动初始化");
@@ -364,9 +366,20 @@ function doHelp() {
   console.log("");
 }
 
-function doInstallEnv(checkOnly = false) {
+function doInstallEnv(checkOnly = false, location = null) {
   const { execSync } = require("child_process");
+  const isWin = process.platform === "win32";
+  const isMac = process.platform === "darwin";
+
+  // 解析 --location（CLI 入口已提取，这里兜底）
   console.log("\n=== 环境检测 ===\n");
+  if (location) {
+    console.log(`  安装位置: ${location}${isWin ? "" : " (仅 Windows winget 支持指定目录)"}`);
+    // Windows: 预建目录
+    if (isWin) {
+      try { fs.mkdirSync(location, { recursive: true }); } catch { /* */ }
+    }
+  }
 
   // 检测函数
   function check(cmd) {
@@ -377,15 +390,25 @@ function doInstallEnv(checkOnly = false) {
     try { execSync(`where ${cmd}`, { encoding: "utf-8", timeout: 3000, stdio: "pipe" }); return true; }
     catch { try { execSync(`which ${cmd}`, { encoding: "utf-8", timeout: 3000, stdio: "pipe" }); return true; } catch { return false; } }
   }
+  // Windows: 把目录加到用户 PATH（幂等，已存在不重复加）
+  function addToPathWin(dir) {
+    if (!isWin) return false;
+    try {
+      // 用 setx 会截断超长 PATH，改用 PowerShell 读 User PATH 追加
+      const ps = `powershell -NoProfile -Command "$p=[Environment]::GetEnvironmentVariable('Path','User'); if($p -notlike '*{dir}*'){[Environment]::SetEnvironmentVariable('Path',$p.TrimEnd(';')+';{dir}','User')}"`.replace(/{dir}/g, dir.replace(/\\/g, "\\\\"));
+      execSync(ps, { stdio: "pipe", timeout: 15000 });
+      return true;
+    } catch (e) { console.log(`  [WARN] 加 PATH 失败（可手动加）: ${dir}`); return false; }
+  }
   function install(name, wingetId, brewPkg) {
     if (checkOnly) return false;
-    const isWin = process.platform === "win32";
-    const isMac = process.platform === "darwin";
     try {
       if (isWin && has("winget")) {
         console.log(`  用 winget 装 ${name}...`);
-        execSync(`winget install --id ${wingetId} -e --source winget --accept-source-agreements --accept-package-agreements`,
-          { stdio: "inherit", timeout: 300000 });
+        // winget --location 不一定被安装包尊重，但先传上
+        let cmd = `winget install --id ${wingetId} -e --source winget --accept-source-agreements --accept-package-agreements`;
+        if (location) cmd += ` --location "${location}"`;
+        execSync(cmd, { stdio: "inherit", timeout: 300000 });
         return true;
       } else if (isMac && has("brew")) {
         console.log(`  用 brew 装 ${name}...`);
@@ -435,6 +458,20 @@ function doInstallEnv(checkOnly = false) {
     else { need.push("git (手动: https://git-scm.com, 可选)"); }
   }
 
+  // --location 模式: 提示用户验证安装位置 + 手动加 PATH
+  // （winget 的 --location 对 Node/Python 不一定生效，需用户确认）
+  if (location && isWin) {
+    console.log(`\n--- 安装位置确认 ---`);
+    console.log(`  你指定了: ${location}`);
+    console.log(`  注意: winget 的 --location 对 Node.js/Python 不一定生效`);
+    console.log(`        (取决于安装包是否支持自定义路径)`);
+    console.log(`  请检查实际装到哪了:`);
+    console.log(`    重新打开终端后跑: node --version  python --version  git --version`);
+    console.log(`  如果某软件没进 PATH, 手动把它加进去:`);
+    console.log(`    设置 → 系统 → 关于 → 高级系统设置 → 环境变量 → Path → 新建`);
+    console.log(`    或用命令: npx @hupan56/wlkj add-path "D:\\wldev\\nodejs"`);
+  }
+
   console.log("\n=== 结果 ===");
   if (need.length === 0) {
     console.log("  环境就绪! 下一步: npx @hupan56/wlkj init");
@@ -445,13 +482,46 @@ function doInstallEnv(checkOnly = false) {
   }
 }
 
+// add-path: 把目录加到 Windows 用户 PATH（幂等）
+function doAddPath(dir) {
+  if (!dir) { console.log("用法: npx @hupan56/wlkj add-path <目录>"); return; }
+  if (process.platform !== "win32") {
+    console.log("add-path 仅支持 Windows。Mac/Linux 请手动加到 ~/.zshrc 或 ~/.bashrc");
+    return;
+  }
+  const abs = path.resolve(dir);
+  if (!fs.existsSync(abs)) {
+    console.log(`[警告] 目录不存在: ${abs}（仍会加到 PATH）`);
+  }
+  try {
+    const ps = `powershell -NoProfile -Command "$p=[Environment]::GetEnvironmentVariable('Path','User'); if($p -notlike '*${abs.replace(/\\/g,"\\\\")}*'){[Environment]::SetEnvironmentVariable('Path',$p.TrimEnd(';')+';${abs.replace(/\\/g,"\\\\")}','User'); Write-Output 'ADDED'} else { Write-Output 'EXISTS' }"`;
+    const out = execSync(ps, { encoding: "utf-8", timeout: 15000 }).trim();
+    console.log(`  ${out === "ADDED" ? "已加入" : "已存在(无需重复加)"}: ${abs}`);
+    console.log(`  ⚠ 需要重新打开终端才生效`);
+  } catch (e) {
+    console.log(`  失败: ${(e.message || "").slice(0, 100)}`);
+    console.log(`  手动加: 设置 → 系统 → 关于 → 高级系统设置 → 环境变量 → Path → 新建 → ${abs}`);
+  }
+}
+
 const [,, cmd, ...rest] = process.argv;
 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 "install-env": {
+    const checkOnly = rest.includes("--check");
+    // 提取 --location <dir> 或 --location=<dir>
+    let loc = null;
+    const li = rest.indexOf("--location");
+    if (li !== -1 && rest[li + 1]) loc = rest[li + 1];
+    const eq = rest.find(a => a.startsWith("--location="));
+    if (eq) loc = eq.slice("--location=".length);
+    doInstallEnv(checkOnly, loc);
+    break;
+  }
+  case "add-path": doAddPath(rest[0]); break;
   case "task": process.stdout.write(py("task.py", mapped)); break;
   case "status": doStatus(); break;
   case "session": process.stdout.write(py("add_session.py", rest)); break;

package/package.json

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