ai-project-manage-cli 6.0.109 → 6.0.110

package/dist/index.js

@@ -2637,13 +2637,32 @@ function validateDeployPush(o) {
     }
   };
 }
+function validateSessionCacheCleanupPush(o) {
+  if (o.type !== "session-cache-cleanup") {
+    return { ok: false, reason: "\u671F\u671B session-cache-cleanup" };
+  }
+  if (!nonEmptyString(o.sessionId)) {
+    return { ok: false, reason: "session-cache-cleanup \u7F3A\u5C11 sessionId" };
+  }
+  if (!nonEmptyString(o.workdir)) {
+    return { ok: false, reason: "session-cache-cleanup \u7F3A\u5C11 workdir" };
+  }
+  return {
+    ok: true,
+    data: {
+      type: "session-cache-cleanup",
+      sessionId: o.sessionId.trim(),
+      workdir: o.workdir.trim()
+    }
+  };
+}
 function validateAgentWsMessage(value, kind) {
   if (typeof value !== "object" || value === null) {
     return { ok: false, reason: "\u6D88\u606F\u4F53\u4E0D\u662F JSON \u5BF9\u8C61" };
   }
   const o = value;
   const type = o.type;
-  if (type !== "heartbeat" && type !== "message" && type !== "cancel" && type !== "deploy") {
+  if (type !== "heartbeat" && type !== "message" && type !== "cancel" && type !== "deploy" && type !== "session-cache-cleanup") {
     return { ok: false, reason: `\u672A\u77E5 type: ${String(type)}` };
   }
   if (kind === "heartbeat" || type === "heartbeat") {
@@ -2655,6 +2674,9 @@ function validateAgentWsMessage(value, kind) {
   if (type === "deploy") {
     return validateDeployPush(o);
   }
+  if (type === "session-cache-cleanup") {
+    return validateSessionCacheCleanupPush(o);
+  }
   return validateMessagePush(o);
 }
 
@@ -2893,6 +2915,19 @@ function posixBasename(p) {
   const idx = normalized.lastIndexOf("/");
   return idx >= 0 ? normalized.slice(idx + 1) : normalized;
 }
+function resolveWisdomBackendPackOnlyFromApmConfig(cfg) {
+  const projectName = reqTopLevelName(cfg);
+  const w = cfg.wisdomDeploy ?? {};
+  const mavenLocalRepo = resolveMavenLocalRepoWithSource();
+  return {
+    projectName,
+    packageName: `${projectName}.jar.zip`,
+    mavenLocalRepo: mavenLocalRepo.path,
+    mavenLocalRepoSource: mavenLocalRepo.source,
+    mavenLocalRepoSourceDetail: mavenLocalRepo.sourceDetail,
+    mode: resolveWisdomDeployMode(w.mode)
+  };
+}
 function resolveWisdomBackendDeployFromApmConfig(cfg) {
   const projectName = reqTopLevelName(cfg);
   const w = cfg.wisdomDeploy ?? {};
@@ -4641,6 +4676,12 @@ async function runWisdomSftpDeploy(params) {
   });
   let zipSizeBytes = 0;
   let artifactUploaded = false;
+  if (!packOnly && !params.settings) {
+    throw new DeployExecutionError(
+      "SFTP \u90E8\u7F72\u7F3A\u5C11 wisdomDeploy \u8FDE\u63A5\u914D\u7F6E\uFF08host\u3001remotePath \u7B49\uFF09",
+      1
+    );
+  }
   if (packOnly && artifactUpload.upload) {
     const packed = await packDirectoryWithMinioArchive({
       localDir: params.localDir,
@@ -4684,8 +4725,8 @@ async function runWisdomSftpDeploy(params) {
   return {
     ok: true,
     localDir: params.localDir,
-    host: params.settings.host,
-    remotePath: params.settings.remotePath,
+    host: params.settings?.host ?? "",
+    remotePath: params.settings?.remotePath ?? "",
     zipSizeBytes,
     extracted: packOnly ? false : params.extract,
     packOnly,
@@ -5209,6 +5250,12 @@ async function restartRemoteService(client, config) {
 }
 
 // src/commands/deploy/internal/wisdom-backend/index.ts
+function asFullBackendDeployConfig(config) {
+  if (!("host" in config)) {
+    fail("\u5B8C\u6574\u90E8\u7F72\u7F3A\u5C11 wisdomDeploy \u8FDC\u7A0B\u8FDE\u63A5\u914D\u7F6E");
+  }
+  return config;
+}
 async function runWisdomBackendDeploy(options) {
   const projectRoot = path9.resolve(options.projectRoot ?? process.cwd());
   const config = options.config;
@@ -5260,11 +5307,12 @@ async function runWisdomBackendDeploy(options) {
     log("\u4EC5\u6253\u5305\u5B8C\u6210\uFF08\u672A\u4E0A\u4F20\u8FDC\u7A0B\u670D\u52A1\u5668\uFF09");
     return;
   }
-  const conn = await connectSsh(config);
+  const deployConfig = asFullBackendDeployConfig(config);
+  const conn = await connectSsh(deployConfig);
   try {
     if (config.mode === "full") {
       const mainJar = locateMainJar(projectRoot);
-      await uploadFullJar(conn.sftp, mainJar, config);
+      await uploadFullJar(conn.sftp, mainJar, deployConfig);
       const archiveZipPath = await createUpdatePackage(
         [
           {
@@ -5281,8 +5329,8 @@ async function runWisdomBackendDeploy(options) {
         kind: "backend"
       });
       log("\u91CD\u542F\u670D\u52A1...");
-      await restartRemoteService(conn.client, config);
-      await healthCheckService(conn.client, config);
+      await restartRemoteService(conn.client, deployConfig);
+      await healthCheckService(conn.client, deployConfig);
       log("\u90E8\u7F72\u5B8C\u6210");
       return;
     }
@@ -5290,7 +5338,7 @@ async function runWisdomBackendDeploy(options) {
     let manifest = loadManifest3();
     const remoteLibStats = await getRemoteFileStats(
       conn.sftp,
-      config.remoteLibDir
+      deployConfig.remoteLibDir
     );
     log("\u6536\u96C6 JAR \u66F4\u65B0...");
     const libUploadEntries = listLibFilesToUpload(
@@ -5308,7 +5356,7 @@ async function runWisdomBackendDeploy(options) {
       const remoteZipPath = await uploadUpdatePackage(
         conn.sftp,
         zipPath,
-        config
+        deployConfig
       );
       await uploadDeployArtifactZip({
         zipPath,
@@ -5318,13 +5366,13 @@ async function runWisdomBackendDeploy(options) {
       log("\u8FDC\u7A0B\u89E3\u538B lib \u76EE\u5F55\uFF08\u4EC5\u8986\u76D6\u5DF2\u6709 JAR\uFF09...");
       updated = await extractUpdatePackageOnRemote(
         conn.client,
-        config,
+        deployConfig,
         remoteZipPath
       );
     } else {
       log("\u65E0 JAR \u9700\u8981\u66F4\u65B0\uFF0C\u8DF3\u8FC7\u66F4\u65B0\u5305\u4E0A\u4F20");
     }
-    const runningJar = await getRunningJar(conn.client, config);
+    const runningJar = await getRunningJar(conn.client, deployConfig);
     let needRestart = updated > 0;
     if (!needRestart && !runningJar) {
       log("\u670D\u52A1\u672A\u8FD0\u884C\uFF0C\u9700\u8981\u542F\u52A8");
@@ -5334,9 +5382,9 @@ async function runWisdomBackendDeploy(options) {
     }
     if (needRestart) {
       log("\u91CD\u542F\u670D\u52A1...");
-      await restartRemoteService(conn.client, config);
+      await restartRemoteService(conn.client, deployConfig);
     }
-    await healthCheckService(conn.client, config);
+    await healthCheckService(conn.client, deployConfig);
     if (libUploadEntries.length > 0) {
       manifest = updateManifestEntries(manifest, libUploadEntries, projectRoot);
       saveManifest3(manifest);
@@ -5418,7 +5466,7 @@ async function executeWisdomFrontendDeploy(options) {
   const projectName = resolveProjectNameForDeploy(cfg, cwd, {
     requireName: packOnly || archiveDeployArtifact
   });
-  const settings = resolveWisdomDeployFromApmConfig(cfg);
+  const settings = packOnly ? void 0 : resolveWisdomDeployFromApmConfig(cfg);
   await runWisdomSftpDeploy({
     localDir: distDir,
     settings,
@@ -5430,7 +5478,7 @@ async function executeWisdomFrontendDeploy(options) {
 }
 async function executeWisdomBackendDeployFlow(options) {
   const { cwd, cfg, packOnly } = options;
-  const settings = resolveWisdomBackendDeployFromApmConfig(cfg);
+  const settings = packOnly ? resolveWisdomBackendPackOnlyFromApmConfig(cfg) : resolveWisdomBackendDeployFromApmConfig(cfg);
   if (packOnly) {
     console.error(`[apm] Java\uFF1AMaven \u6784\u5EFA\uFF08\u4EC5\u6253\u5305\uFF0C\u5FFD\u7565\u73AF\u5883 ${options.env}\uFF09`);
   } else {
@@ -5652,7 +5700,8 @@ async function executeDeploy(options) {
   }
   const preDeployLog = outputParts.join("\n");
   const cfg = loadApmConfig({ configPath: apmConfigPath });
-  if (!isWisdomDeployConfigured(cfg)) {
+  const packOnly = Boolean(options.packOnly);
+  if (!packOnly && !isWisdomDeployConfigured(cfg)) {
     const lines = formatMissingWisdomDeployLines();
     throw new DeployExecutionError(lines.join("\n"), 1, lines.join("\n"));
   }
@@ -5662,7 +5711,7 @@ async function executeDeploy(options) {
       cwd,
       configPath: apmConfigPath,
       captureOutput,
-      packOnly: options.packOnly,
+      packOnly,
       archiveDeployArtifact: options.archiveDeployArtifact
     });
     return preDeployLog;
@@ -5945,6 +5994,58 @@ async function handleInboundDeploy(cfg, msg, signal) {
   }
 }
 
+// src/commands/clean-session-cache.ts
+import { existsSync as existsSync20, rmSync as rmSync4 } from "node:fs";
+
+// src/commands/connect/pre-step-cache.ts
+var PULL_TTL_MS = 3e4;
+function sessionWorkdirKey(sessionId, workdir) {
+  return `${sessionId}\0${workdir}`;
+}
+var lastBranchKey = null;
+var lastPullAtByKey = /* @__PURE__ */ new Map();
+function shouldRunBranch(sessionId, workdir) {
+  return lastBranchKey !== sessionWorkdirKey(sessionId, workdir);
+}
+function markBranchDone(sessionId, workdir) {
+  lastBranchKey = sessionWorkdirKey(sessionId, workdir);
+}
+function shouldRunPull(sessionId, workdir) {
+  const key = sessionWorkdirKey(sessionId, workdir);
+  const last = lastPullAtByKey.get(key);
+  if (last == null) {
+    return true;
+  }
+  return Date.now() - last >= PULL_TTL_MS;
+}
+function markPullDone(sessionId, workdir) {
+  lastPullAtByKey.set(sessionWorkdirKey(sessionId, workdir), Date.now());
+}
+function clearPreStepCacheForSession(sessionId, workdir) {
+  const key = sessionWorkdirKey(sessionId, workdir);
+  lastPullAtByKey.delete(key);
+  if (lastBranchKey === key) {
+    lastBranchKey = null;
+  }
+}
+
+// src/commands/clean-session-cache.ts
+function cleanSessionWorkspaceCache(sessionId, workdir) {
+  const trimmedSessionId = sessionId.trim();
+  const trimmedWorkdir = workdir.trim();
+  if (!trimmedSessionId || !trimmedWorkdir) {
+    return;
+  }
+  const dir = sessionDir(trimmedSessionId, workspaceApmDir(trimmedWorkdir));
+  if (existsSync20(dir)) {
+    rmSync4(dir, { recursive: true, force: true });
+    console.log(`[apm] \u5DF2\u6E05\u7406\u4F1A\u8BDD\u7F13\u5B58 ${dir}`);
+  } else {
+    console.log(`[apm] \u4F1A\u8BDD\u7F13\u5B58\u4E0D\u5B58\u5728\uFF0C\u8DF3\u8FC7 ${dir}`);
+  }
+  clearPreStepCacheForSession(trimmedSessionId, trimmedWorkdir);
+}
+
 // src/commands/connect/abort-signal-debug.ts
 import {
   getEventListeners,
@@ -6212,13 +6313,13 @@ ${JSON.stringify(event, null, 2)}
 }
 
 // src/commands/connect/agent-session-registry.ts
-import { existsSync as existsSync20, mkdirSync as mkdirSync9, readFileSync as readFileSync16, writeFileSync as writeFileSync14 } from "node:fs";
+import { existsSync as existsSync21, 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 (!existsSync20(path19)) {
+  if (!existsSync21(path19)) {
     return {};
   }
   try {
@@ -6690,7 +6791,7 @@ async function ensureMessageHasReply(cfg, sessionId, messageId, fallback) {
 }
 
 // src/commands/connect/cli-version-sync.ts
-import { existsSync as existsSync21, readFileSync as readFileSync17, writeFileSync as writeFileSync15 } from "fs";
+import { existsSync as existsSync22, readFileSync as readFileSync17, writeFileSync as writeFileSync15 } from "fs";
 import { join as join17 } from "path";
 var CLI_VERSION_FILE = ".cli-version.json";
 function manifestPath(apmDir) {
@@ -6698,7 +6799,7 @@ function manifestPath(apmDir) {
 }
 function loadManifest4(apmDir) {
   const path19 = toFsPath(manifestPath(apmDir));
-  if (!existsSync21(path19)) {
+  if (!existsSync22(path19)) {
     return null;
   }
   try {
@@ -6739,31 +6840,6 @@ function markSkillsSyncedForCliVersion(workdir, cliVersion) {
   syncedInSession.set(workdir, cliVersion);
 }
 
-// src/commands/connect/pre-step-cache.ts
-var PULL_TTL_MS = 3e4;
-function sessionWorkdirKey(sessionId, workdir) {
-  return `${sessionId}\0${workdir}`;
-}
-var lastBranchKey = null;
-var lastPullAtByKey = /* @__PURE__ */ new Map();
-function shouldRunBranch(sessionId, workdir) {
-  return lastBranchKey !== sessionWorkdirKey(sessionId, workdir);
-}
-function markBranchDone(sessionId, workdir) {
-  lastBranchKey = sessionWorkdirKey(sessionId, workdir);
-}
-function shouldRunPull(sessionId, workdir) {
-  const key = sessionWorkdirKey(sessionId, workdir);
-  const last = lastPullAtByKey.get(key);
-  if (last == null) {
-    return true;
-  }
-  return Date.now() - last >= PULL_TTL_MS;
-}
-function markPullDone(sessionId, workdir) {
-  lastPullAtByKey.set(sessionWorkdirKey(sessionId, workdir), Date.now());
-}
-
 // src/commands/connect/run-slot-pool.ts
 var DEFAULT_MAX_CONCURRENT = 5;
 function createRunSlotPool(maxConcurrent = DEFAULT_MAX_CONCURRENT, options = {}) {
@@ -7063,6 +7139,18 @@ function attachWsHandlers(ws, ctx, onOpen) {
       });
       return;
     }
+    if (validated.data.type === "session-cache-cleanup") {
+      const msg2 = validated.data;
+      const task2 = (async () => {
+        const workdir = requireRemoteWorkdir(msg2.workdir);
+        cleanSessionWorkspaceCache(msg2.sessionId, workdir);
+      })();
+      activeTasks.add(task2);
+      void task2.finally(() => {
+        activeTasks.delete(task2);
+      });
+      return;
+    }
     if (validated.data.type !== "message") {
       return;
     }
@@ -7503,7 +7591,7 @@ function registerDeployMainCommand(program) {
     "\u6C9F\u901A\u7FA4 ID\uFF1B\u4F20\u5165\u65F6\u5728\u5E73\u53F0\u521B\u5EFA\u90E8\u7F72\u8BB0\u5F55\u5E76\u540C\u6B65\u65E5\u5FD7"
   ).option(
     "--pack-only",
-    "\u4EC5\u6784\u5EFA/\u6253\u5305\uFF0C\u4E0D\u4E0A\u4F20\u8FDC\u7A0B SFTP/SSH\uFF1B\u53EF\u5F52\u6863\u5E73\u53F0\u90E8\u7F72\u4EA7\u7269"
+    "\u4EC5\u6784\u5EFA/\u6253\u5305\u5E76\u4E0A\u4F20 MinIO \u5F52\u6863\uFF0C\u4E0D\u4E0A\u4F20\u8FDC\u7A0B SFTP/SSH\uFF08\u65E0\u9700 wisdomDeploy\uFF09"
   ).action(
     async (env, opts) => {
       const cwd = process.cwd();
@@ -7549,7 +7637,7 @@ import path15 from "node:path";
 import Docker from "dockerode";
 
 // src/commands/deploy/internal/backend-deploy/dockerode-client/connection-options.ts
-import { existsSync as existsSync22, readFileSync as readFileSync18 } from "node:fs";
+import { existsSync as existsSync23, readFileSync as readFileSync18 } from "node:fs";
 import path12 from "node:path";
 function asOptionalTlsBuffer(value) {
   if (typeof value !== "string") {
@@ -7561,7 +7649,7 @@ function asOptionalTlsBuffer(value) {
   if (normalized === "") {
     return void 0;
   }
-  if (existsSync22(normalized)) {
+  if (existsSync23(normalized)) {
     return readFileSync18(normalized);
   }
   const looksLikePath = /[\\/]/.test(normalized) || normalized.endsWith(".pem");
@@ -7772,7 +7860,7 @@ var DockerodeClient = class {
 var createDockerodeClient = (config) => new DockerodeClient(config);
 
 // src/commands/deploy/internal/backend-deploy/dockerode-client/env.ts
-import { existsSync as existsSync23, readFileSync as readFileSync19, statSync as statSync10 } from "node:fs";
+import { existsSync as existsSync24, readFileSync as readFileSync19, statSync as statSync10 } from "node:fs";
 import path13 from "node:path";
 function stripSurroundingQuotes(value) {
   const t = value.trim();
@@ -7789,7 +7877,7 @@ function loadEnvFromFile(envFilePath) {
     return {};
   }
   const targetPath = path13.resolve(envFilePath);
-  if (!existsSync23(targetPath) || !statSync10(targetPath).isFile()) {
+  if (!existsSync24(targetPath) || !statSync10(targetPath).isFile()) {
     return {};
   }
   const raw = readFileSync19(targetPath, "utf-8");
@@ -7963,12 +8051,12 @@ function dockerPushImage(params, cwd) {
 }
 
 // src/commands/deploy/internal/backend-deploy/resolve-dockerfile.ts
-import { existsSync as existsSync24 } from "node:fs";
+import { existsSync as existsSync25 } 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 (!existsSync24(dockerfilePath)) {
+  if (!existsSync25(dockerfilePath)) {
     throw new Error(`Dockerfile \u4E0D\u5B58\u5728\uFF1A${dockerfilePath}`);
   }
   Logger.info("\u2713 Dockerfile \u5B58\u5728");
@@ -8289,7 +8377,6 @@ function registerDeploySftpCommands(program) {
     async (opts) => {
       try {
         const cfg = loadApmConfig({ configPath: opts.config });
-        const settings = resolveWisdomDeployFromApmConfig(cfg);
         const projectName = resolveProjectNameForDeploy(cfg, process.cwd(), {
           requireName: true
         });
@@ -8304,6 +8391,7 @@ function registerDeploySftpCommands(program) {
             1
           );
         }
+        const settings = packOnly ? void 0 : resolveWisdomDeployFromApmConfig(cfg);
         const result = await runWisdomSftpDeploy({
           localDir: root,
           settings,

package/package.json

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