ai-project-manage-cli 6.0.110 → 6.0.111

package/dist/index.js

@@ -3022,8 +3022,8 @@ var DeployExecutionError = class extends Error {
 
 // src/commands/deploy/deploy-debug-log.ts
 import { spawnSync as spawnSync4 } from "node:child_process";
-import { existsSync as existsSync15 } from "node:fs";
-import { dirname as dirname5, join as join16 } from "node:path";
+import { existsSync as existsSync16 } from "node:fs";
+import { dirname as dirname5, join as join17 } from "node:path";
 
 // src/commands/deploy/internal/deploy-artifact-minio.ts
 import { readFile as readFile2 } from "node:fs/promises";
@@ -3277,7 +3277,8 @@ async function uploadDeployArtifactZip(options) {
 
 // src/commands/deploy/internal/deploy-shell-env.ts
 import { spawnSync as spawnSync3 } from "node:child_process";
-import { dirname as dirname4 } from "node:path";
+import { existsSync as existsSync15 } from "node:fs";
+import { dirname as dirname4, join as join16 } from "node:path";
 
 // src/commands/daemon.ts
 import { spawnSync as spawnSync2 } from "child_process";
@@ -4053,17 +4054,38 @@ async function runDaemonLogs(options) {
 // src/commands/deploy/internal/deploy-shell-env.ts
 var PATH_SEP = process.platform === "win32" ? ";" : ":";
 var useNpmShell3 = process.platform === "win32";
-function resolveNpmGlobalBin2() {
-  const result = spawnSync3(useNpmShell3 ? "npm.cmd" : "npm", ["bin", "-g"], {
-    encoding: "utf8",
-    shell: useNpmShell3,
-    stdio: ["ignore", "pipe", "pipe"]
-  });
-  if (result.status !== 0) {
+function readEnvPath(env) {
+  if (process.platform === "win32") {
+    return env.Path ?? env.PATH ?? "";
+  }
+  return env.PATH ?? "";
+}
+function writeEnvPath(env, value) {
+  if (process.platform === "win32") {
+    env.Path = value;
+    delete env.PATH;
+    return;
+  }
+  env.PATH = value;
+}
+function resolveNodeInstallDir() {
+  return dirname4(process.execPath);
+}
+function resolveNpmCmdPath() {
+  if (process.platform !== "win32") {
     return null;
   }
-  const bin = result.stdout?.toString().trim();
-  return bin || null;
+  const candidate = join16(resolveNodeInstallDir(), "npm.cmd");
+  return existsSync15(candidate) ? candidate : null;
+}
+function formatNpmRunShellCommand(scriptName) {
+  const trimmed = scriptName.trim();
+  if (process.platform !== "win32") {
+    return `npm run ${trimmed}`;
+  }
+  const npmCmd = resolveNpmCmdPath();
+  const npm = npmCmd ? `"${npmCmd}"` : "npm.cmd";
+  return `${npm} run ${trimmed}`;
 }
 function prependPath(pathValue, segment) {
   if (!segment) {
@@ -4078,10 +4100,22 @@ function prependPath(pathValue, segment) {
   }
   return `${segment}${PATH_SEP}${pathValue}`;
 }
+function spawnNpm(args, env) {
+  const npmCmdPath = resolveNpmCmdPath();
+  return spawnSync3(npmCmdPath ?? (useNpmShell3 ? "npm.cmd" : "npm"), args, {
+    encoding: "utf8",
+    shell: useNpmShell3 && !npmCmdPath,
+    env,
+    stdio: ["ignore", "pipe", "pipe"]
+  });
+}
+function resolveNpmGlobalBin2() {
+  return resolveNpmGlobalBinWithoutEnv(process.env);
+}
 function buildDeployShellEnv(extra) {
   const env = { ...process.env, ...extra };
-  const pathSegments = [dirname4(process.execPath)];
-  const globalBin = resolveNpmGlobalBin2();
+  const pathSegments = [resolveNodeInstallDir()];
+  const globalBin = resolveNpmGlobalBinWithoutEnv(env);
   if (globalBin) {
     pathSegments.push(globalBin);
   }
@@ -4089,11 +4123,29 @@ function buildDeployShellEnv(extra) {
     resolveApmEntryPath();
   } catch {
   }
+  let pathValue = readEnvPath(env);
   for (const segment of pathSegments) {
-    env.PATH = prependPath(env.PATH, segment);
+    pathValue = prependPath(pathValue, segment);
   }
+  writeEnvPath(env, pathValue);
+  return env;
+}
+function buildDeployShellEnvWithoutGlobalBin(extra) {
+  const env = { ...process.env, ...extra };
+  let pathValue = readEnvPath(env);
+  pathValue = prependPath(pathValue, resolveNodeInstallDir());
+  writeEnvPath(env, pathValue);
   return env;
 }
+function resolveNpmGlobalBinWithoutEnv(baseEnv) {
+  const env = buildDeployShellEnvWithoutGlobalBin(baseEnv);
+  const result = spawnNpm(["bin", "-g"], env);
+  if (result.status !== 0) {
+    return null;
+  }
+  const bin = result.stdout?.toString().trim();
+  return bin || null;
+}
 
 // src/commands/deploy/deploy-debug-log.ts
 var LOG_PREFIX = "[apm:deploy-debug]";
@@ -4196,7 +4248,7 @@ function logExecuteDeployContext(input) {
   const deploymentRunId = process.env[APM_DEPLOYMENT_RUN_ID_ENV]?.trim() || null;
   const shellEnv = buildDeployShellEnv();
   const npmGlobalBin = resolveNpmGlobalBin2();
-  const packageJsonPath = join16(input.cwd, "package.json");
+  const packageJsonPath = join17(input.cwd, "package.json");
   logLine("========== executeDeploy \u4E0A\u4E0B\u6587 ==========");
   logLine(`trigger=${trigger} deployEnv=${input.env}`);
   logLine(`cwd(input)=${input.cwdInput}`);
@@ -4206,12 +4258,12 @@ function logExecuteDeployContext(input) {
     `cwdMatchProcess=${input.cwd === input.processCwd ? "yes" : "no"} (connect \u901A\u5E38\u4E3A no)`
   );
   logLine(
-    `apm.config=${input.apmConfigPath} exists=${existsSync15(
+    `apm.config=${input.apmConfigPath} exists=${existsSync16(
       input.apmConfigPath
     )}`
   );
   logLine(
-    `package.json=${packageJsonPath} exists=${existsSync15(packageJsonPath)}`
+    `package.json=${packageJsonPath} exists=${existsSync16(packageJsonPath)}`
   );
   logLine(
     `flags captureOutput=${input.captureOutput} packOnly=${Boolean(
@@ -4232,10 +4284,10 @@ function logExecuteDeployContext(input) {
   )) {
     logLine(`  ${key}=${value}`);
   }
-  logLine(`process.env.PATH=${summarizePath(process.env.PATH)}`);
+  logLine(`process.env.PATH=${summarizePath(readEnvPath(process.env))}`);
   logLine("--- buildDeployShellEnv()\uFF08\u5B50\u8FDB\u7A0B\u5B9E\u9645 env\uFF09---");
-  logLine(describePathDelta(process.env.PATH, shellEnv.PATH));
-  logLine(`shellEnv.PATH=${summarizePath(shellEnv.PATH)}`);
+  logLine(describePathDelta(readEnvPath(process.env), readEnvPath(shellEnv)));
+  logLine(`shellEnv.PATH=${summarizePath(readEnvPath(shellEnv))}`);
   for (const [key, value] of Object.entries(
     pickEnvKeys(shellEnv, [APM_DEPLOYMENT_RUN_ID_ENV, "NODE_ENV"])
   )) {
@@ -4254,7 +4306,7 @@ function logRunDeployShellContext(input) {
     `stdio=${input.captureOutput ? "stdin=inherit stdout=pipe stderr=pipe" : "inherit"}`
   );
   logLine(`shell=true maxBuffer=${50 * 1024 * 1024}`);
-  logLine(`shellEnv.PATH(head)=${summarizePath(shellEnv.PATH, 8)}`);
+  logLine(`shellEnv.PATH(head)=${summarizePath(readEnvPath(shellEnv), 8)}`);
   logLine("--------------------------------------------");
 }
 function logRunDeployShellResult(input) {
@@ -4267,14 +4319,14 @@ function logWisdomFrontendDeployContext(input) {
   logLine(
     `buildKey=build:${input.env} buildCmd=${input.buildCmd ?? "(missing)"}`
   );
-  logLine(`distDir=${input.distDir} exists=${existsSync15(input.distDir)}`);
+  logLine(`distDir=${input.distDir} exists=${existsSync16(input.distDir)}`);
   logLine(
     `packOnly=${input.packOnly} archiveDeployArtifact=${input.archiveDeployArtifact}`
   );
 }
 
 // src/commands/deploy/internal/wisdom-deploy.ts
-import { existsSync as existsSync19, readFileSync as readFileSync15, statSync as statSync9 } from "node:fs";
+import { existsSync as existsSync20, readFileSync as readFileSync15, statSync as statSync9 } from "node:fs";
 import path10 from "node:path";
 
 // src/commands/deploy/deploy-shell-run.ts
@@ -4383,7 +4435,7 @@ import JSZip2 from "jszip";
 
 // src/commands/deploy/internal/wisdom-backend/manifest.ts
 import {
-  existsSync as existsSync16,
+  existsSync as existsSync17,
   mkdirSync as mkdirSync7,
   readFileSync as readFileSync13,
   statSync as statSync6,
@@ -4405,7 +4457,7 @@ function fileSignature(filePath) {
 }
 function loadManifest3() {
   const manifestPath2 = manifestFilePath();
-  if (!existsSync16(manifestPath2)) {
+  if (!existsSync17(manifestPath2)) {
     return {};
   }
   return JSON.parse(readFileSync13(manifestPath2, "utf8"));
@@ -4847,7 +4899,7 @@ function listAllLibFilesForArchive(libDir) {
 }
 
 // src/commands/deploy/internal/wisdom-backend/maven-build.ts
-import { existsSync as existsSync18, readdirSync as readdirSync6, statSync as statSync8 } from "node:fs";
+import { existsSync as existsSync19, readdirSync as readdirSync6, statSync as statSync8 } from "node:fs";
 import path7 from "node:path";
 import { spawnSync as spawnSync6 } from "node:child_process";
 function getMvnExecutable() {
@@ -4896,11 +4948,11 @@ function runMavenBuild(projectRoot, mavenLocalRepo, repoSource) {
 }
 function locateLibDir(projectRoot) {
   const targetDir = getTargetDir(projectRoot);
-  if (!existsSync18(targetDir)) {
+  if (!existsSync19(targetDir)) {
     fail(`\u6784\u5EFA\u4EA7\u7269\u76EE\u5F55\u4E0D\u5B58\u5728: ${targetDir}`);
   }
   const libDir = path7.join(targetDir, "lib");
-  if (!existsSync18(libDir) || !statSync8(libDir).isDirectory()) {
+  if (!existsSync19(libDir) || !statSync8(libDir).isDirectory()) {
     fail(`lib \u76EE\u5F55\u4E0D\u5B58\u5728: ${libDir}`);
   }
   const libJars = readdirSync6(libDir).filter((name) => name.endsWith(".jar"));
@@ -4912,7 +4964,7 @@ function locateLibDir(projectRoot) {
 }
 function locateMainJar(projectRoot) {
   const targetDir = getTargetDir(projectRoot);
-  if (!existsSync18(targetDir)) {
+  if (!existsSync19(targetDir)) {
     fail(`\u6784\u5EFA\u4EA7\u7269\u76EE\u5F55\u4E0D\u5B58\u5728: ${targetDir}`);
   }
   const jarFiles = readdirSync6(targetDir).filter((name) => name.endsWith(".jar") && !name.endsWith(".jar.original")).map((name) => path7.join(targetDir, name)).sort((a, b) => statSync8(b).mtimeMs - statSync8(a).mtimeMs);
@@ -5401,11 +5453,11 @@ function isWisdomDeployConfigured(cfg) {
   return Boolean(w?.host?.trim() && w?.remotePath?.trim());
 }
 function detectWisdomProjectType(cwd) {
-  return existsSync19(path10.join(cwd, "package.json")) ? "frontend" : "backend";
+  return existsSync20(path10.join(cwd, "package.json")) ? "frontend" : "backend";
 }
 function readPackageScripts(cwd) {
   const pkgPath = path10.join(cwd, "package.json");
-  if (!existsSync19(pkgPath)) {
+  if (!existsSync20(pkgPath)) {
     return {};
   }
   try {
@@ -5420,10 +5472,10 @@ function resolveFrontendBuildCommand(env, cwd) {
   const scripts = readPackageScripts(cwd);
   const buildKey = `build:${env}`;
   if (scripts[buildKey]?.trim()) {
-    return `npm run build:${env}`;
+    return formatNpmRunShellCommand(`build:${env}`);
   }
   if (isProductionDeployEnv(env) && scripts.build?.trim()) {
-    return "npm run build";
+    return formatNpmRunShellCommand("build");
   }
   return null;
 }
@@ -5432,7 +5484,7 @@ function resolveFrontendDistDir(cwd) {
   for (const rel of candidates) {
     const full = path10.join(cwd, rel);
     try {
-      if (existsSync19(full) && statSync9(full).isDirectory()) {
+      if (existsSync20(full) && statSync9(full).isDirectory()) {
         return full;
       }
     } catch {
@@ -5995,7 +6047,7 @@ async function handleInboundDeploy(cfg, msg, signal) {
 }
 
 // src/commands/clean-session-cache.ts
-import { existsSync as existsSync20, rmSync as rmSync4 } from "node:fs";
+import { existsSync as existsSync21, rmSync as rmSync4 } from "node:fs";
 
 // src/commands/connect/pre-step-cache.ts
 var PULL_TTL_MS = 3e4;
@@ -6037,7 +6089,7 @@ function cleanSessionWorkspaceCache(sessionId, workdir) {
     return;
   }
   const dir = sessionDir(trimmedSessionId, workspaceApmDir(trimmedWorkdir));
-  if (existsSync20(dir)) {
+  if (existsSync21(dir)) {
     rmSync4(dir, { recursive: true, force: true });
     console.log(`[apm] \u5DF2\u6E05\u7406\u4F1A\u8BDD\u7F13\u5B58 ${dir}`);
   } else {
@@ -6313,13 +6365,13 @@ ${JSON.stringify(event, null, 2)}
 }
 
 // src/commands/connect/agent-session-registry.ts
-import { existsSync as existsSync21, mkdirSync as mkdirSync9, readFileSync as readFileSync16, writeFileSync as writeFileSync14 } from "node:fs";
+import { existsSync as existsSync22, mkdirSync as mkdirSync9, readFileSync as readFileSync16, writeFileSync as writeFileSync14 } from "node:fs";
 import { dirname as dirname6, resolve as resolve5 } from "node:path";
 function registryPath(workdir, sessionId) {
   return resolve5(workdir, ".apm", "sessions", sessionId, "cursor-agents.json");
 }
 function readRegistry(path19) {
-  if (!existsSync21(path19)) {
+  if (!existsSync22(path19)) {
     return {};
   }
   try {
@@ -6791,15 +6843,15 @@ async function ensureMessageHasReply(cfg, sessionId, messageId, fallback) {
 }
 
 // src/commands/connect/cli-version-sync.ts
-import { existsSync as existsSync22, readFileSync as readFileSync17, writeFileSync as writeFileSync15 } from "fs";
-import { join as join17 } from "path";
+import { existsSync as existsSync23, readFileSync as readFileSync17, writeFileSync as writeFileSync15 } from "fs";
+import { join as join18 } from "path";
 var CLI_VERSION_FILE = ".cli-version.json";
 function manifestPath(apmDir) {
-  return join17(apmDir, CLI_VERSION_FILE);
+  return join18(apmDir, CLI_VERSION_FILE);
 }
 function loadManifest4(apmDir) {
   const path19 = toFsPath(manifestPath(apmDir));
-  if (!existsSync22(path19)) {
+  if (!existsSync23(path19)) {
     return null;
   }
   try {
@@ -7637,7 +7689,7 @@ import path15 from "node:path";
 import Docker from "dockerode";
 
 // src/commands/deploy/internal/backend-deploy/dockerode-client/connection-options.ts
-import { existsSync as existsSync23, readFileSync as readFileSync18 } from "node:fs";
+import { existsSync as existsSync24, readFileSync as readFileSync18 } from "node:fs";
 import path12 from "node:path";
 function asOptionalTlsBuffer(value) {
   if (typeof value !== "string") {
@@ -7649,7 +7701,7 @@ function asOptionalTlsBuffer(value) {
   if (normalized === "") {
     return void 0;
   }
-  if (existsSync23(normalized)) {
+  if (existsSync24(normalized)) {
     return readFileSync18(normalized);
   }
   const looksLikePath = /[\\/]/.test(normalized) || normalized.endsWith(".pem");
@@ -7860,7 +7912,7 @@ var DockerodeClient = class {
 var createDockerodeClient = (config) => new DockerodeClient(config);
 
 // src/commands/deploy/internal/backend-deploy/dockerode-client/env.ts
-import { existsSync as existsSync24, readFileSync as readFileSync19, statSync as statSync10 } from "node:fs";
+import { existsSync as existsSync25, readFileSync as readFileSync19, statSync as statSync10 } from "node:fs";
 import path13 from "node:path";
 function stripSurroundingQuotes(value) {
   const t = value.trim();
@@ -7877,7 +7929,7 @@ function loadEnvFromFile(envFilePath) {
     return {};
   }
   const targetPath = path13.resolve(envFilePath);
-  if (!existsSync24(targetPath) || !statSync10(targetPath).isFile()) {
+  if (!existsSync25(targetPath) || !statSync10(targetPath).isFile()) {
     return {};
   }
   const raw = readFileSync19(targetPath, "utf-8");
@@ -8051,12 +8103,12 @@ function dockerPushImage(params, cwd) {
 }
 
 // src/commands/deploy/internal/backend-deploy/resolve-dockerfile.ts
-import { existsSync as existsSync25 } from "node:fs";
+import { existsSync as existsSync26 } from "node:fs";
 import path14 from "node:path";
 function resolveDockerBuildPaths(cwd) {
   const dockerfilePath = path14.join(cwd, "Dockerfile");
   Logger.info(`\u67E5\u627EDockerfile\u6587\u4EF6\uFF0C\u8DEF\u5F84: ${dockerfilePath}`);
-  if (!existsSync25(dockerfilePath)) {
+  if (!existsSync26(dockerfilePath)) {
     throw new Error(`Dockerfile \u4E0D\u5B58\u5728\uFF1A${dockerfilePath}`);
   }
   Logger.info("\u2713 Dockerfile \u5B58\u5728");

package/package.json

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