ai-project-manage-cli 8.0.10 → 8.0.13

package/dist/index.js

@@ -196,6 +196,10 @@ var init_request_config = __esm({
           method: "GET",
           path: "/cli/apm-log-storage"
         }),
+        getDeployArtifactStorage: defineEndpoint({
+          method: "GET",
+          path: "/cli/deploy-artifact-storage"
+        }),
         projectPackageUpdateStatus: defineEndpoint({
           method: "PUT",
           path: "/cli/project-packages/status"

package/dist/webide-message-worker.js

@@ -100,6 +100,10 @@ var requestConfig = {
       method: "GET",
       path: "/cli/apm-log-storage"
     }),
+    getDeployArtifactStorage: defineEndpoint({
+      method: "GET",
+      path: "/cli/deploy-artifact-storage"
+    }),
     projectPackageUpdateStatus: defineEndpoint({
       method: "PUT",
       path: "/cli/project-packages/status"
@@ -205,8 +209,8 @@ function toFsPath(inputPath) {
   }
   return `\\\\?\\${normalized}`;
 }
-function normalizeWorkdirPath(path) {
-  let normalized = path.trim().replace(/\\/g, "/").normalize("NFC");
+function normalizeWorkdirPath(path2) {
+  let normalized = path2.trim().replace(/\\/g, "/").normalize("NFC");
   if (normalized.startsWith("//?/")) {
     normalized = normalized.slice(4);
   }
@@ -328,9 +332,9 @@ function listWebIdeRuleFileNames(rulesDir) {
 function assertWebIdeTemplateCopiedToApm(apmDir, workdir) {
   const required = ["AGENTS.md", "rules"];
   for (const item of required) {
-    const path = join2(apmDir, item);
-    if (!existsSync(toFsPath(path))) {
-      throw new Error(`[apm] WebIDE \u521D\u59CB\u5316\u4E0D\u5B8C\u6574\uFF0C\u7F3A\u5C11: ${path}`);
+    const path2 = join2(apmDir, item);
+    if (!existsSync(toFsPath(path2))) {
+      throw new Error(`[apm] WebIDE \u521D\u59CB\u5316\u4E0D\u5B8C\u6574\uFF0C\u7F3A\u5C11: ${path2}`);
     }
   }
   const rulesDir = join2(apmDir, "rules");
@@ -614,13 +618,13 @@ function normalizeRepoEntry(raw) {
   return entry;
 }
 function readManifest(workdir) {
-  const path = toFsPath(manifestPath(workdir));
-  if (!existsSync2(path)) {
+  const path2 = toFsPath(manifestPath(workdir));
+  if (!existsSync2(path2)) {
     return null;
   }
   try {
     const raw = JSON.parse(
-      readFileSync2(path, "utf8")
+      readFileSync2(path2, "utf8")
     );
     if (raw?.version !== WORKSPACE_REPOS_VERSION) {
       return null;
@@ -652,8 +656,8 @@ function readManifest(workdir) {
 function writeManifest(workdir, manifest) {
   const apmDir = toFsPath(workspaceApmDir(workdir));
   mkdirSync3(apmDir, { recursive: true });
-  const path = toFsPath(manifestPath(workdir));
-  writeFileSync2(path, `${JSON.stringify(manifest, null, 2)}
+  const path2 = toFsPath(manifestPath(workdir));
+  writeFileSync2(path2, `${JSON.stringify(manifest, null, 2)}
 `, "utf8");
 }
 function manifestStillValid(workdir, manifest) {
@@ -2226,12 +2230,12 @@ import { dirname as dirname3, resolve as resolve5 } from "node:path";
 function registryPath(workdir, taskId) {
   return resolve5(workdir, ".apm", "webide", taskId, "cursor-agent.json");
 }
-function readRegistry(path) {
-  if (!existsSync4(path)) {
+function readRegistry(path2) {
+  if (!existsSync4(path2)) {
     return {};
   }
   try {
-    const parsed = JSON.parse(readFileSync4(path, "utf8"));
+    const parsed = JSON.parse(readFileSync4(path2, "utf8"));
     if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
       const raw = parsed;
       const state = {};
@@ -2259,16 +2263,16 @@ function readRegistry(path) {
   }
   return {};
 }
-function writeRegistry(path, registry) {
-  mkdirSync4(dirname3(path), { recursive: true });
-  writeFileSync3(path, `${JSON.stringify(registry, null, 2)}
+function writeRegistry(path2, registry) {
+  mkdirSync4(dirname3(path2), { recursive: true });
+  writeFileSync3(path2, `${JSON.stringify(registry, null, 2)}
 `, "utf8");
 }
 function syncWebIdeTaskState(workdir, taskId, patch) {
   const trimmedTaskId = taskId.trim();
   if (!trimmedTaskId) return;
-  const path = registryPath(workdir, trimmedTaskId);
-  const current = readRegistry(path);
+  const path2 = registryPath(workdir, trimmedTaskId);
+  const current = readRegistry(path2);
   const next = {
     ...current,
     taskId: trimmedTaskId,
@@ -2292,7 +2296,7 @@ function syncWebIdeTaskState(workdir, taskId, patch) {
   if (patch.status !== void 0) {
     next.status = patch.status;
   }
-  writeRegistry(path, next);
+  writeRegistry(path2, next);
 }
 function loadWebIdeAgentId(workdir, taskId) {
   return readRegistry(registryPath(workdir, taskId)).agentId;
@@ -2301,8 +2305,8 @@ function saveWebIdeAgentId(workdir, taskId, agentId) {
   syncWebIdeTaskState(workdir, taskId, { agentId });
 }
 function clearWebIdeAgentId(workdir, taskId) {
-  const path = registryPath(workdir, taskId);
-  if (!existsSync4(path)) return;
+  const path2 = registryPath(workdir, taskId);
+  if (!existsSync4(path2)) return;
   syncWebIdeTaskState(workdir, taskId, { agentId: "" });
 }
 
@@ -2502,6 +2506,10 @@ var MinioClient = class {
   async putObject(bucket, objectKey, body, meta) {
     await this.inner.putObject(bucket, objectKey, body, body.length, meta);
   }
+  /** 大文件：从本地路径流式上传，避免整包读入内存 */
+  async fPutObject(bucket, objectKey, filePath, meta) {
+    await this.inner.fPutObject(bucket, objectKey, filePath, meta);
+  }
 };
 
 // src/commands/connect/apm-log-minio.ts
@@ -2949,13 +2957,13 @@ async function downloadAttachment(cfg, attachmentId) {
   return Buffer.from(await res.arrayBuffer());
 }
 function loadManifest(dir) {
-  const path = join5(dir, MANIFEST_FILE);
-  if (!existsSync6(path)) {
+  const path2 = join5(dir, MANIFEST_FILE);
+  if (!existsSync6(path2)) {
     return { version: 1, attachments: {} };
   }
   try {
     const parsed = JSON.parse(
-      readFileSync6(path, "utf8")
+      readFileSync6(path2, "utf8")
     );
     if (parsed?.version === 1 && parsed.attachments && typeof parsed.attachments === "object") {
       return parsed;
@@ -3050,14 +3058,14 @@ function projectDocumentLocalPath(apmRoot, projectId, documentPath) {
     ...normalized.split("/")
   );
 }
-function normalizeLocalDocumentPath(path) {
-  const trimmed = path.trim().replace(/\\/g, "/");
+function normalizeLocalDocumentPath(path2) {
+  const trimmed = path2.trim().replace(/\\/g, "/");
   if (!trimmed || trimmed.startsWith("/") || /^[a-zA-Z]:/.test(trimmed)) {
-    throw new Error(`\u975E\u6CD5\u6587\u6863\u8DEF\u5F84: ${path}`);
+    throw new Error(`\u975E\u6CD5\u6587\u6863\u8DEF\u5F84: ${path2}`);
   }
   const segments = trimmed.split("/").filter(Boolean);
   if (segments.some((segment) => segment === ".." || segment === ".")) {
-    throw new Error(`\u975E\u6CD5\u6587\u6863\u8DEF\u5F84: ${path}`);
+    throw new Error(`\u975E\u6CD5\u6587\u6863\u8DEF\u5F84: ${path2}`);
   }
   return segments.join("/");
 }
@@ -3111,15 +3119,15 @@ function diffManifestPaths(remote, local) {
     (local?.documents ?? []).map((doc) => [doc.path, doc.contentHash])
   );
   const download = [];
-  for (const [path, hash] of remoteMap) {
-    if (localMap.get(path) !== hash) {
-      download.push(path);
+  for (const [path2, hash] of remoteMap) {
+    if (localMap.get(path2) !== hash) {
+      download.push(path2);
     }
   }
   const deleteLocal = [];
-  for (const path of localMap.keys()) {
-    if (!remoteMap.has(path)) {
-      deleteLocal.push(path);
+  for (const path2 of localMap.keys()) {
+    if (!remoteMap.has(path2)) {
+      deleteLocal.push(path2);
     }
   }
   return { download, deleteLocal };
@@ -3213,9 +3221,9 @@ ${diagnostic ?? ""}`);
     }
   }
   let deleted = 0;
-  for (const path of deleteLocal) {
+  for (const path2 of deleteLocal) {
     const absPath = toFsPath(
-      projectDocumentLocalPath(targetApmDir, projectId, path)
+      projectDocumentLocalPath(targetApmDir, projectId, path2)
     );
     if (existsSync7(absPath)) {
       rmSync2(absPath, { force: true });
@@ -3262,23 +3270,23 @@ async function syncProjectDocumentsPush(cfg, workdirPath, apmRoot, options) {
     (remoteManifest?.documents ?? []).map((doc) => [doc.path, doc.description])
   );
   let synced = 0;
-  for (const path of localPaths) {
+  for (const path2 of localPaths) {
     const absPath = toFsPath(
-      projectDocumentLocalPath(targetApmDir, projectId, path)
+      projectDocumentLocalPath(targetApmDir, projectId, path2)
     );
     const content = readFileSync7(absPath, "utf8");
     const contentHash = hashLocalFileContent(content);
-    if (remoteHashByPath.get(path) === contentHash) {
+    if (remoteHashByPath.get(path2) === contentHash) {
       continue;
     }
     await api.cli.upsertProjectDocument({
       projectId,
-      path,
+      path: path2,
       content,
-      description: remoteDescriptionByPath.get(path) ?? void 0
+      description: remoteDescriptionByPath.get(path2) ?? void 0
     });
     synced += 1;
-    console.log(`[apm] \u5DF2\u540C\u6B65\u9879\u76EE\u6587\u6863: ${path}`);
+    console.log(`[apm] \u5DF2\u540C\u6B65\u9879\u76EE\u6587\u6863: ${path2}`);
   }
   if (synced === 0) {
     console.log("[apm] \u9879\u76EE\u6587\u6863\u65E0\u53D8\u5316\uFF0C\u8DF3\u8FC7\u63A8\u9001");
@@ -3294,13 +3302,13 @@ function manifestPath2(apmDir) {
   return join7(apmDir, CLI_VERSION_FILE);
 }
 function loadManifest2(apmDir) {
-  const path = toFsPath(manifestPath2(apmDir));
-  if (!existsSync8(path)) {
+  const path2 = toFsPath(manifestPath2(apmDir));
+  if (!existsSync8(path2)) {
     return null;
   }
   try {
     const parsed = JSON.parse(
-      readFileSync8(path, "utf8")
+      readFileSync8(path2, "utf8")
     );
     if (parsed?.version === 1 && typeof parsed.cliVersion === "string" && parsed.cliVersion.trim()) {
       return parsed;
@@ -3982,6 +3990,74 @@ async function handleStartProject(cfg, msg, signal) {
   }
 }
 
+// src/commands/connect/upload-package-artifact.ts
+import fs from "node:fs";
+import path from "node:path";
+
+// src/commands/connect/deploy-artifact-minio.ts
+async function fetchDeployArtifactStorage(cfg) {
+  const api = createApmApiClient(cfg);
+  return api.cli.getDeployArtifactStorage(void 0);
+}
+async function createDeployArtifactMinioClient(cfg) {
+  const storage = await fetchDeployArtifactStorage(cfg);
+  return {
+    client: new MinioClient({
+      endPoint: storage.endpoint,
+      port: storage.port,
+      useSSL: storage.useSsl,
+      accessKey: storage.accessKey,
+      secretKey: storage.secretKey
+    }),
+    bucket: storage.bucket,
+    ...storage.publicEndpoint ? { publicEndpoint: storage.publicEndpoint } : {}
+  };
+}
+
+// src/commands/connect/upload-package-artifact.ts
+function packageTmpDir(packageId) {
+  return `/data/package-tmp/${packageId}`;
+}
+function expectedLocalArtifactPath(target, packageId) {
+  const fileName = target === "frontend" ? "dist.zip" : "jars.zip";
+  return path.join(packageTmpDir(packageId), fileName);
+}
+function packageArtifactObjectKey(target, packageId) {
+  const fileName = target === "frontend" ? "dist.zip" : "jars.zip";
+  return `packages/${target}/${packageId}/${fileName}`;
+}
+function removePackageTmpDir(packageId) {
+  const dir = packageTmpDir(packageId);
+  try {
+    fs.rmSync(dir, { recursive: true, force: true });
+  } catch (err) {
+    console.warn(
+      `[apm] \u6E05\u7406\u6253\u5305\u4E34\u65F6\u76EE\u5F55\u5931\u8D25 ${dir}:`,
+      err instanceof Error ? err.message : err
+    );
+  }
+}
+async function uploadPackageArtifact(cfg, target, packageId) {
+  const localPath = expectedLocalArtifactPath(target, packageId);
+  if (!fs.existsSync(localPath)) {
+    throw new Error(`\u6253\u5305\u4EA7\u7269\u4E0D\u5B58\u5728: ${localPath}`);
+  }
+  const stat = fs.statSync(localPath);
+  if (!stat.isFile() || stat.size <= 0) {
+    throw new Error(`\u6253\u5305\u4EA7\u7269\u65E0\u6548\u6216\u4E3A\u7A7A: ${localPath}`);
+  }
+  const objectKey = packageArtifactObjectKey(target, packageId);
+  const { client, bucket, publicEndpoint } = await createDeployArtifactMinioClient(cfg);
+  await client.ensureBucket(bucket);
+  await client.fPutObject(bucket, objectKey, localPath, {
+    "Content-Type": "application/zip"
+  });
+  removePackageTmpDir(packageId);
+  const base = publicEndpoint?.replace(/\/$/, "") ?? "";
+  const artifactUrl = base ? `${base}/${bucket}/${objectKey}` : null;
+  return { artifactPath: objectKey, artifactUrl };
+}
+
 // src/commands/connect/handle-package.ts
 async function updatePackageStatus(cfg, packageId, status, extra) {
   const api = createApmApiClient(cfg);
@@ -3990,15 +4066,10 @@ async function updatePackageStatus(cfg, packageId, status, extra) {
     status,
     ...extra?.error != null ? { error: extra.error } : {},
     ...extra?.content != null ? { content: extra.content } : {},
-    ...extra?.artifactPath != null ? { artifactPath: extra.artifactPath } : {}
+    ...extra?.artifactPath != null ? { artifactPath: extra.artifactPath } : {},
+    ...extra?.artifactUrl != null ? { artifactUrl: extra.artifactUrl } : {}
   });
 }
-function expectedArtifactPath(target, packageId) {
-  if (target === "frontend") {
-    return `/data/artifacts/vue/${packageId}/dist.zip`;
-  }
-  return `/data/artifacts/springboot/${packageId}/manifest.json`;
-}
 async function handleWebIdePackage(cfg, msg, signal) {
   const workdir = requireRemoteWorkdir(msg.workdir);
   const messageId = msg.messageId;
@@ -4119,7 +4190,6 @@ async function handleWebIdePackage(cfg, msg, signal) {
     );
     eventSession.addCliStep("\u542F\u52A8\u6253\u5305 Agent", "\u51C6\u5907 create\u2026", "running");
     await syncPrepLog();
-    const artifactHint = expectedArtifactPath(msg.target, packageId);
     let failedByTool = false;
     const outcome = await runCursorAgent(
       cfg,
@@ -4226,11 +4296,17 @@ async function handleWebIdePackage(cfg, msg, signal) {
       );
       return;
     }
+    const uploaded = await runPrepStep(
+      "\u4E0A\u4F20\u6253\u5305\u4EA7\u7269\u5230 MinIO",
+      () => uploadPackageArtifact(cfg, msg.target, packageId),
+      (result) => `objectKey=${result.artifactPath}${result.artifactUrl ? ` url=${result.artifactUrl}` : ""}`
+    );
     await updatePackageStatus(cfg, packageId, "SUCCESS", {
-      artifactPath: artifactHint
+      artifactPath: uploaded.artifactPath,
+      ...uploaded.artifactUrl ? { artifactUrl: uploaded.artifactUrl } : {}
     });
     console.log(
-      `[apm] webide-package \u5B8C\u6210 target=${msg.target} packageId=${packageId} agentId=${outcome.agentId}`
+      `[apm] webide-package \u5B8C\u6210 target=${msg.target} packageId=${packageId} agentId=${outcome.agentId} artifact=${uploaded.artifactPath}`
     );
   } catch (err) {
     const detail = err instanceof Error ? err.message : String(err);

package/package.json

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

package/template/rules/webide_package.md

@@ -2,6 +2,8 @@
 
 适用：独立打包 Agent（不 resume 任务对话）。只打 payload 指定的 **一个** target（`frontend` / `backend`）。
 
+产物最终由 CLI 上传 MinIO；本地**只**使用临时目录，不要写 `/data/artifacts/` 持久路径。
+
 ### 开始前
 
 1. Read 本规则全文。
@@ -12,8 +14,9 @@
 
 - **禁止**修改业务代码、提交 Git、创建 PR。
 - **禁止**为修依赖或修编译错误而改代码 / 装依赖 / 改 lockfile；构建失败 → 以错误结束。
-- **禁止**在仓库工作区内留下交付用 zip / 拷贝后的 jar；临时文件只用 `/data/` 下目录（如 `/data/artifacts/.tmp/<packageId>/`），成功后可删临时目录。
-- 临时目录与最终产物均在 `/data` 下，不要用 `/tmp`。
+- **禁止**在仓库工作区内留下交付用 zip。
+- 临时目录统一用：`/data/package-tmp/<packageId>/`（不要用 `/tmp`，不要用 `/data/artifacts/`）。
+- 后端交付 jar 的路径与文件名**只**来自 deploy 文档；禁止在本规则中写死具体项目的 jar 清单。
 
 ### target=frontend（Vue）
 
@@ -21,55 +24,43 @@
 2. **不要**执行 `npm i` / `pnpm i` 等；分支切换后依赖已就绪。
 3. 执行文档中的打包命令（通常 `npm run build`）。
 4. 确认产出 `dist/`（或文档写明的目录）。
-5. 在 `/data` 下压缩（勿在工作区生成 `dist.zip`），落到：
+5. 在临时目录压缩（勿在工作区生成 `dist.zip`），落到：
+
+   `/data/package-tmp/<packageId>/dist.zip`
 
-   `/data/artifacts/vue/<packageId>/dist.zip`
+   **压缩结构（必须）**：zip 内顶层就是名为 `dist` 的目录，解压后得到 `dist/…`，**禁止**出现 `dist/dist/…`。
+
+   - 正确：在**含有 `dist` 的父目录**执行，例如  
+     `mkdir -p /data/package-tmp/<packageId> && zip -r /data/package-tmp/<packageId>/dist.zip dist`  
+     （把目录名 `dist` 打进包，不要先 `cd dist` 再压当前目录）。
+   - 错误：`cd dist && zip -r … .`（解压后没有顶层 `dist`）；或把整个前端仓/多套一层 `dist` 再压（解压成 `dist/dist`）。
 
 6. 缺产物或构建失败 → 调用 **SetPackageFailed**（传入失败原因）后结束。
 
 ### target=backend（SpringBoot）
 
-1. 按 deploy 文档进入后端目录，执行 `mvn clean package`（或以文档为准）。
-2. 按文档收集**全量**需交付的 jar 与 sql（增量规则若文档另有说明则从其规定；无说明则收文档列出的全部）。
-3. 对每个文件算内容 hash（sha256），写入全局池（已存在同 hash 则跳过复制）：
-
-   - jar → `/data/artifacts/springboot/jars/<hash>.jar`
-   - sql → `/data/artifacts/springboot/sqls/<hash>.sql`（或保留扩展名，文件名主体为 hash）
-
-4. 写入清单（**仅**此目录放 manifest，不要堆 jar/sql 副本）：
-
-   `/data/artifacts/springboot/<packageId>/manifest.json`
-
-5. manifest 示例（字段名与结构须一致；值按实际填写）：
-
-```json
-{
-  "packageId": "pkg_…",
-  "projectId": "clx…",
-  "target": "backend",
-  "baseBranch": "release/1.0",
-  "createdAt": "2026-09-02T07:00:00.000Z",
-  "commitId": "a1b2c3d4…",
-  "jars": [
-    {
-      "name": "app-1.2.3.jar",
-      "hash": "e3b0…b855",
-      "path": "/data/artifacts/springboot/jars/e3b0…b855.jar"
-    }
-  ],
-  "sqls": [
-    {
-      "name": "20260301_add_col.sql",
-      "hash": "2c26…e7ae",
-      "path": "/data/artifacts/springboot/sqls/2c26…e7ae.sql"
-    }
-  ]
-}
-```
+1. 按 deploy 文档进入后端目录，执行文档写明的构建命令（通常 `mvn clean package`）。
+2. **只**收集 deploy 文档标明的交付 jar（路径/文件名/glob 以文档为准）。**禁止**全量收集 `target/lib`、**禁止**打包 SQL、**禁止**在规则或命令里写死具体 jar 名。
+3. 确认文档列出的每个 jar 均已生成；缺任一文件 → SetPackageFailed。
+4. 在临时目录将上述 jar **打成一个 zip**（勿在工作区生成交付 zip），落到：
+
+   `/data/package-tmp/<packageId>/jars.zip`
+
+   **压缩结构（必须）**：zip 内顶层直接是各个 `.jar` 文件（解压后同级列出 jar），**禁止**多套一层无意义目录，也禁止把整个 `lib` 目录原样打进包。
+
+   示例（路径与文件列表须来自 deploy，勿照抄本例文件名）：
+
+   ```bash
+   mkdir -p /data/package-tmp/<packageId>/jars
+   # 按 deploy 文档把待交付 jar 拷到临时目录后：
+   cd /data/package-tmp/<packageId>/jars
+   zip /data/package-tmp/<packageId>/jars.zip ./*.jar
+   ```
 
+5. 可选：同临时目录写 `commitId.txt`（后端仓 `git rev-parse HEAD` 一行），非必须。
 6. 构建或落盘失败 → 调用 **SetPackageFailed**（传入失败原因）后结束。
 
 ### 结束
 
-- 成功：确认产物已落到约定路径后正常结束（不要调用 SetPackageFailed）。
+- 成功：确认 zip 已落到 `/data/package-tmp/<packageId>/` 约定文件名后正常结束（不要调用 SetPackageFailed）。CLI 会上传 MinIO 并清理该临时目录。
 - 失败：先调用 SetPackageFailed 写入原因，再结束。