ai-project-manage-cli 6.0.66 → 6.0.68

package/dist/index.js

@@ -2603,7 +2603,20 @@ function fail(message) {
   process.exit(1);
 }
 function expandPath(pathStr) {
-  return path2.resolve(pathStr.replace(/^~(?=\/|$)/, process.env.HOME ?? ""));
+  const home = process.env.HOME ?? process.env.USERPROFILE ?? "";
+  return path2.resolve(pathStr.replace(/^~(?=\/|\\|$)/, home));
+}
+function quoteForShell(value) {
+  if (process.platform === "win32") {
+    return `"${value.replace(/"/g, '""')}"`;
+  }
+  return shellSingleQuote(value);
+}
+function formatMavenLocalRepoArg(repoPath) {
+  if (process.platform === "win32") {
+    return `-Dmaven.repo.local=${quoteForShell(repoPath)}`;
+  }
+  return `-Dmaven.repo.local=${repoPath}`;
 }
 function deployCacheDir() {
   return path2.join(workspaceApmDir(), "deploy", ".deploy_cache");
@@ -2708,33 +2721,40 @@ function getMvnExecutable() {
   const isWin = process.platform === "win32";
   const candidates = isWin ? ["mvn.cmd", "mvn.bat", "mvn"] : ["mvn"];
   for (const name of candidates) {
-    const result = spawnSync2(isWin ? "where" : "which", [name], {
-      encoding: "utf8"
+    const result = spawnSync2(isWin ? `where ${name}` : `which ${name}`, {
+      encoding: "utf8",
+      shell: true
     });
     if (result.status === 0 && result.stdout.trim()) {
-      return result.stdout.trim().split(/\r?\n/)[0];
+      return result.stdout.trim().split(/\r?\n/)[0].trim();
     }
   }
   fail("\u672A\u627E\u5230 mvn \u547D\u4EE4\uFF0C\u8BF7\u786E\u8BA4 Maven \u5DF2\u5B89\u88C5\u5E76\u52A0\u5165 PATH");
 }
 function runMavenBuild(projectRoot, mavenLocalRepo) {
   const mavenRepo = expandPath(mavenLocalRepo);
-  const cmd = [
-    getMvnExecutable(),
+  const mvn = getMvnExecutable();
+  const command = [
+    quoteForShell(mvn),
     "clean",
     "package",
     `-P${MAVEN_PROFILE}`,
-    `-Dmaven.repo.local=${mavenRepo}`,
+    formatMavenLocalRepoArg(mavenRepo),
     "-DskipTests"
-  ];
-  log(`\u5F00\u59CB Maven \u6784\u5EFA: ${cmd.join(" ")}`);
+  ].join(" ");
+  log(`\u5F00\u59CB Maven \u6784\u5EFA: ${command}`);
   log(`Maven \u672C\u5730\u4ED3\u5E93: ${mavenRepo}`);
-  const result = spawnSync2(cmd[0], cmd.slice(1), {
+  log(`\u6784\u5EFA\u76EE\u5F55: ${projectRoot}`);
+  const result = spawnSync2(command, {
     cwd: projectRoot,
-    stdio: "inherit"
+    stdio: "inherit",
+    shell: true,
+    env: process.env
   });
   if (result.status !== 0) {
-    fail(`Maven \u6784\u5EFA\u5931\u8D25\uFF0C\u9000\u51FA\u7801: ${result.status ?? 1}`);
+    fail(
+      `Maven \u6784\u5EFA\u5931\u8D25\uFF0C\u9000\u51FA\u7801: ${result.status ?? 1}\u3002\u8BF7\u5728\u9879\u76EE\u6839\u76EE\u5F55\u624B\u52A8\u6267\u884C\u4EE5\u67E5\u770B\u8BE6\u7EC6\u9519\u8BEF: ${command}`
+    );
   }
 }
 function locateLibDir(projectRoot) {
@@ -2978,9 +2998,7 @@ async function runWisdomBackendDeploy(options) {
   log(`=== \u81EA\u52A8\u90E8\u7F72: ${config.projectName} ===`);
   log(`\u914D\u7F6E\u6587\u4EF6: ${path2.join(workspaceApmDir(), "apm.config.json")}`);
   log(`\u9879\u76EE\u6839\u76EE\u5F55: ${projectRoot}`);
-  if (!options.skipMaven) {
-    runMavenBuild(projectRoot, config.mavenLocalRepo);
-  }
+  runMavenBuild(projectRoot, config.mavenLocalRepo);
   const libDir = locateLibDir(projectRoot);
   let manifest = loadManifest3();
   const conn = await connectSsh(config);
@@ -3110,10 +3128,12 @@ async function runWisdomAutoDeploy(options) {
   const configPath = options.configPath ?? path3.join(workspaceApmDir(cwd), "apm.config.json");
   const cfg = loadApmConfig({ configPath });
   const settings = resolveWisdomBackendDeployFromApmConfig(cfg);
+  console.error(
+    `[apm] \u540E\u7AEF\u90E8\u7F72\u4E0D\u533A\u5206 test/online\uFF0C\u5FFD\u7565\u73AF\u5883\u53C2\u6570: ${options.env}`
+  );
   await runWisdomBackendDeploy({
     config: settings,
-    projectRoot: cwd,
-    skipMaven: Boolean(options.skipMaven)
+    projectRoot: cwd
   });
   return { projectType };
 }
@@ -4498,37 +4518,34 @@ function runShellCommand3(command, cwd) {
 }
 function registerDeployMainCommand(program) {
   program.command("deploy").description(
-    "\u7EDF\u4E00\u90E8\u7F72\uFF1A\u533B\u52A1\u5B58\u91CF\u9879\u76EE\u81EA\u52A8\u8BC6\u522B\u524D\u540E\u7AEF\uFF1B\u5176\u4ED6\u9879\u76EE\u6309 deploy.<\u73AF\u5883> \u6267\u884C shell \u547D\u4EE4"
+    "\u7EDF\u4E00\u90E8\u7F72\uFF1A\u533B\u52A1\u5B58\u91CF\u81EA\u52A8\u8BC6\u522B\u524D\u540E\u7AEF\uFF08\u524D\u7AEF\u6309 deploy:<env> \u811A\u672C\uFF1B\u540E\u7AEF test/online \u540C\u4E00\u5957\uFF09\uFF1B\u5176\u4ED6\u9879\u76EE\u6309 deploy.<\u73AF\u5883> \u6267\u884C shell \u547D\u4EE4"
   ).argument("<env>", "\u90E8\u7F72\u73AF\u5883\u540D\uFF08\u5982 test\u3001online\uFF09").option(
     "--config <path>",
     "apm.config.json \u8DEF\u5F84\uFF08\u9ED8\u8BA4 .apm/apm.config.json\uFF09"
-  ).option("--skip-maven", "\u8DF3\u8FC7 Maven \u6784\u5EFA\uFF08\u4EC5\u533B\u52A1\u540E\u7AEF\uFF09").action(
-    async (env, opts) => {
-      const cwd = process.cwd();
-      const cfg = loadApmConfig({ configPath: opts.config });
-      if (isWisdomLegacyDeploy(cfg)) {
-        await runWisdomAutoDeploy({
-          env,
-          cwd,
-          configPath: opts.config,
-          skipMaven: opts.skipMaven
-        });
-        return;
-      }
-      const deployCommands = cfg.deploy ?? {};
-      const command = deployCommands[env]?.trim();
-      if (!command) {
-        const keys = Object.keys(deployCommands);
-        console.error(
-          keys.length > 0 ? `apm.config.json \u4E2D\u672A\u914D\u7F6E deploy.${env}\uFF0C\u53EF\u7528\u73AF\u5883: ${keys.join(
-            ", "
-          )}` : `apm.config.json \u4E2D\u672A\u914D\u7F6E deploy \u6BB5`
-        );
-        process.exit(1);
-      }
-      runShellCommand3(command, cwd);
+  ).action(async (env, opts) => {
+    const cwd = process.cwd();
+    const cfg = loadApmConfig({ configPath: opts.config });
+    if (isWisdomLegacyDeploy(cfg)) {
+      await runWisdomAutoDeploy({
+        env,
+        cwd,
+        configPath: opts.config
+      });
+      return;
     }
-  );
+    const deployCommands = cfg.deploy ?? {};
+    const command = deployCommands[env]?.trim();
+    if (!command) {
+      const keys = Object.keys(deployCommands);
+      console.error(
+        keys.length > 0 ? `apm.config.json \u4E2D\u672A\u914D\u7F6E deploy.${env}\uFF0C\u53EF\u7528\u73AF\u5883: ${keys.join(
+          ", "
+        )}` : `apm.config.json \u4E2D\u672A\u914D\u7F6E deploy \u6BB5`
+      );
+      process.exit(1);
+    }
+    runShellCommand3(command, cwd);
+  });
 }
 
 // src/commands/deploy/backend.ts
@@ -5428,12 +5445,11 @@ function registerDeployWisdomBackendCommands(program) {
   ).option(
     "--config <path>",
     "apm.config.json \u8DEF\u5F84\uFF08\u9ED8\u8BA4 .apm/apm.config.json\uFF09"
-  ).option("--skip-maven", "\u8DF3\u8FC7 Maven \u6784\u5EFA\uFF0C\u4EC5\u4E0A\u4F20\u5E76\u91CD\u542F").action(async (opts) => {
+  ).action(async (opts) => {
     const cfg = loadApmConfig({ configPath: opts.config });
     const settings = resolveWisdomBackendDeployFromApmConfig(cfg);
     await runWisdomBackendDeploy({
-      config: settings,
-      skipMaven: Boolean(opts.skipMaven)
+      config: settings
     });
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-project-manage-cli",
-  "version": "6.0.66",
+  "version": "6.0.68",
   "description": "命令行工具：后续用于调用平台后端 API 完成运维与自动化操作",
   "type": "module",
   "private": false,

package/template/deploy/README.md

@@ -1,28 +1,8 @@
-## 前端部署
+## 部署
 
-部署测试环境： `apm deploy test`
-部署线上环境： `apm deploy online`
+部署测试环境：`apm deploy test`
+部署线上环境：`apm deploy online`
 
-CLI 会自动识别项目类型（根目录有 `package.json` 为前端 Vue，否则为后端 Java）。
-
-前端仓库需在 `package.json` 中配置 `deploy:test` / `deploy:online` 脚本，例如：
-
-```json
-{
-  "scripts": {
-    "deploy:test": "npm run build && apm deploy-sftp --dir=dist --extract",
-    "deploy:online": "npm run build && apm deploy-sftp --dir=dist --extract"
-  }
-}
-```
-
-执行 `apm deploy test` 时会自动转为 `npm run deploy:test`。
-
-## 后端部署（不区分正式环境和测试环境）
-
-后端仓库直接执行：`apm deploy test` 或 `apm deploy online`（环境参数对后端无影响）
-
-也可单独执行：`apm deploy-wisdom-backend`
 
 ## 前端产物下载地址
 

package/template/skills/apm-deploy/SKILL.md

@@ -1,10 +1,8 @@
 ## 工作流程
 
-### 步骤1: 阅读部署文档  
-使用**Read**工具阅读 `.apm/deploy/README.md`
+在项目根目录执行 `apm deploy <环境名称>`
 
-### 步骤2: 按照文档执行部署命令，禁止猜测参数
+## 示例
 
-如果遇到以下情况则无需部署，直接退出部署流程
-1. 没有找到部署文档，或者部署文档没有可执行的部署命令（或者说部署不可执行）
-2. 用户没有明确部署环境
+1. 部署测试环境：`apm deploy test`
+2. 部署正式环境: `apm deploy online`