ai-project-manage-cli 7.1.28 → 7.1.29

package/dist/index.js

@@ -480,123 +480,33 @@ var init_minio = __esm({
   }
 });
 
-// src/commands/deploy/internal/deploy-artifact-minio.ts
-import { readFile as readFile2 } from "node:fs/promises";
-function formatDeployArtifactTimestamp(date = /* @__PURE__ */ new Date()) {
-  const pad2 = (n) => String(n).padStart(2, "0");
-  return `${date.getFullYear()}${pad2(date.getMonth() + 1)}${pad2(date.getDate())}${pad2(date.getHours())}${pad2(date.getMinutes())}${pad2(date.getSeconds())}`;
-}
-function sanitizeDeployProjectName(name) {
-  const trimmed = name.trim().replace(/\\/g, "/");
-  const base = trimmed.split("/").filter(Boolean).pop() ?? trimmed;
-  try {
-    return sanitizeRelativePath(base.replace(/[/\\:*?"<>|]/g, "_"));
-  } catch {
-    return "project";
-  }
-}
-function buildDeployArtifactFileName(kind, projectName, timestamp = formatDeployArtifactTimestamp()) {
-  const safeName = sanitizeDeployProjectName(projectName);
-  const suffix = kind === "frontend" ? "dist.zip" : "jar.zip";
-  return `${timestamp}-${safeName}.${suffix}`;
-}
-function buildDeployArtifactObjectKey(projectName, fileName) {
-  const safeProject = sanitizeDeployProjectName(projectName);
-  return `deploy/${safeProject}/${fileName}`;
-}
-function resolveDeploymentRunIdFromEnv() {
-  const raw = process.env[APM_DEPLOYMENT_RUN_ID_ENV]?.trim();
-  return raw || null;
-}
-async function fetchDeployArtifactStorage(api) {
-  return api.cli.getDeployArtifactStorage(void 0);
-}
-async function uploadDeployArtifactZip(options) {
-  const deploymentRunId = options.deploymentRunId ?? resolveDeploymentRunIdFromEnv();
-  if (!deploymentRunId && !options.uploadWithoutRunId) {
-    return null;
-  }
-  const cfg = await tryReadApmConfig();
-  if (!cfg || !resolveApiKey(cfg)) {
-    console.warn("[apm] \u672A\u767B\u5F55\uFF0C\u8DF3\u8FC7 MinIO \u90E8\u7F72\u4EA7\u7269\u5F52\u6863");
-    return null;
-  }
-  const api = options.api ?? createApmApiClient(cfg);
-  let storage;
-  try {
-    storage = await fetchDeployArtifactStorage(api);
-  } catch (error) {
-    const detail = error instanceof Error ? error.message : String(error);
-    console.warn(`[apm] \u83B7\u53D6 MinIO \u914D\u7F6E\u5931\u8D25\uFF0C\u8DF3\u8FC7\u90E8\u7F72\u4EA7\u7269\u5F52\u6863: ${detail}`);
-    return null;
-  }
-  const fileName = buildDeployArtifactFileName(
-    options.kind,
-    options.projectName,
-    options.timestamp
-  );
-  const objectKey = buildDeployArtifactObjectKey(options.projectName, fileName);
-  let body;
-  try {
-    body = await readFile2(options.zipPath);
-  } catch (error) {
-    const detail = error instanceof Error ? error.message : String(error);
-    console.warn(`[apm] \u8BFB\u53D6\u90E8\u7F72\u4EA7\u7269 zip \u5931\u8D25\uFF0C\u8DF3\u8FC7 MinIO \u5F52\u6863: ${detail}`);
-    return null;
-  }
-  try {
-    const client = new MinioClient({
+// src/commands/connect/apm-log-minio.ts
+function createApmLogMinioClient() {
+  const storage = APM_LOG_MINIO_CONFIG;
+  return {
+    client: new MinioClient({
       endPoint: storage.endpoint,
       port: storage.port,
       useSSL: storage.useSsl,
       accessKey: storage.accessKey,
       secretKey: storage.secretKey
-    });
-    await client.ensureBucket(storage.bucket);
-    await client.putObject(storage.bucket, objectKey, body, {
-      "Content-Type": "application/zip"
-    });
-    console.error(
-      `[apm] \u672C\u5730\u76F4\u4F20 MinIO\uFF08\u4E0D\u7ECF\u5E73\u53F0\u670D\u52A1\u5668\uFF09: ${storage.endpoint}:${storage.port}/${storage.bucket}/${objectKey} (${(body.length / 1024 / 1024).toFixed(
-        2
-      )} MB)`
-    );
-  } catch (error) {
-    const detail = error instanceof Error ? error.message : String(error);
-    console.warn(`[apm] MinIO \u90E8\u7F72\u4EA7\u7269\u5F52\u6863\u5931\u8D25: ${detail}`);
-    return null;
-  }
-  if (deploymentRunId) {
-    try {
-      await api.cli.attachTaskDeploymentArtifact({
-        id: deploymentRunId,
-        artifactObjectKey: objectKey,
-        artifactFileName: fileName
-      });
-      console.error(
-        `[apm] \u5DF2\u7ED1\u5B9A\u90E8\u7F72\u4EA7\u7269\u5230\u8BB0\u5F55 id=${deploymentRunId} file=${fileName}`
-      );
-    } catch (error) {
-      const detail = error instanceof Error ? error.message : String(error);
-      console.warn(`[apm] \u7ED1\u5B9A\u90E8\u7F72\u4EA7\u7269\u5230\u8BB0\u5F55\u5931\u8D25: ${detail}`);
-      return null;
-    }
-  }
-  return {
-    objectKey,
-    fileName,
+    }),
     bucket: storage.bucket
   };
 }
-var APM_DEPLOYMENT_RUN_ID_ENV;
-var init_deploy_artifact_minio = __esm({
-  "src/commands/deploy/internal/deploy-artifact-minio.ts"() {
+var APM_LOG_MINIO_CONFIG;
+var init_apm_log_minio = __esm({
+  "src/commands/connect/apm-log-minio.ts"() {
     "use strict";
-    init_client();
-    init_config();
-    init_minio();
     init_minio();
-    APM_DEPLOYMENT_RUN_ID_ENV = "APM_DEPLOYMENT_RUN_ID";
+    APM_LOG_MINIO_CONFIG = {
+      endpoint: "objectstorageapi.gzg.sealos.run",
+      port: 443,
+      useSsl: true,
+      accessKey: "428hqav4",
+      secretKey: "68b8srk4vdbjdhlc",
+      bucket: "428hqav4-apm-log"
+    };
   }
 });
 
@@ -719,8 +629,7 @@ var init_webide_terminal_registry = __esm({
   "src/commands/connect/webide-terminal-registry.ts"() {
     "use strict";
     init_client();
-    init_deploy_artifact_minio();
-    init_minio();
+    init_apm_log_minio();
     execFileAsync3 = promisify3(execFile3);
     WEBIDE_TERMINAL_LINES_PER_CHUNK = 50;
     SYNC_INTERVAL_MS = 400;
@@ -738,17 +647,9 @@ var init_webide_terminal_registry = __esm({
       bucket = "";
       async ensureMinio() {
         if (this.minio) return;
-        const storage = await fetchDeployArtifactStorage(
-          createApmApiClient(this.cfg)
-        );
-        this.minio = new MinioClient({
-          endPoint: storage.endpoint,
-          port: storage.port,
-          useSSL: storage.useSsl,
-          accessKey: storage.accessKey,
-          secretKey: storage.secretKey
-        });
-        this.bucket = storage.bucket;
+        const created = createApmLogMinioClient();
+        this.minio = created.client;
+        this.bucket = created.bucket;
         await this.minio.ensureBucket(this.bucket);
       }
       listLocal(taskId) {
@@ -4374,11 +4275,124 @@ var DeployExecutionError = class extends Error {
 };
 
 // src/commands/deploy/deploy-debug-log.ts
-init_deploy_artifact_minio();
 import { spawnSync as spawnSync4 } from "node:child_process";
 import { existsSync as existsSync17 } from "node:fs";
 import { dirname as dirname6, join as join18 } from "node:path";
 
+// src/commands/deploy/internal/deploy-artifact-minio.ts
+init_client();
+init_config();
+init_minio();
+init_minio();
+import { readFile as readFile2 } from "node:fs/promises";
+var APM_DEPLOYMENT_RUN_ID_ENV = "APM_DEPLOYMENT_RUN_ID";
+function formatDeployArtifactTimestamp(date = /* @__PURE__ */ new Date()) {
+  const pad2 = (n) => String(n).padStart(2, "0");
+  return `${date.getFullYear()}${pad2(date.getMonth() + 1)}${pad2(date.getDate())}${pad2(date.getHours())}${pad2(date.getMinutes())}${pad2(date.getSeconds())}`;
+}
+function sanitizeDeployProjectName(name) {
+  const trimmed = name.trim().replace(/\\/g, "/");
+  const base = trimmed.split("/").filter(Boolean).pop() ?? trimmed;
+  try {
+    return sanitizeRelativePath(base.replace(/[/\\:*?"<>|]/g, "_"));
+  } catch {
+    return "project";
+  }
+}
+function buildDeployArtifactFileName(kind, projectName, timestamp = formatDeployArtifactTimestamp()) {
+  const safeName = sanitizeDeployProjectName(projectName);
+  const suffix = kind === "frontend" ? "dist.zip" : "jar.zip";
+  return `${timestamp}-${safeName}.${suffix}`;
+}
+function buildDeployArtifactObjectKey(projectName, fileName) {
+  const safeProject = sanitizeDeployProjectName(projectName);
+  return `deploy/${safeProject}/${fileName}`;
+}
+function resolveDeploymentRunIdFromEnv() {
+  const raw = process.env[APM_DEPLOYMENT_RUN_ID_ENV]?.trim();
+  return raw || null;
+}
+async function fetchDeployArtifactStorage(api) {
+  return api.cli.getDeployArtifactStorage(void 0);
+}
+async function uploadDeployArtifactZip(options) {
+  const deploymentRunId = options.deploymentRunId ?? resolveDeploymentRunIdFromEnv();
+  if (!deploymentRunId && !options.uploadWithoutRunId) {
+    return null;
+  }
+  const cfg = await tryReadApmConfig();
+  if (!cfg || !resolveApiKey(cfg)) {
+    console.warn("[apm] \u672A\u767B\u5F55\uFF0C\u8DF3\u8FC7 MinIO \u90E8\u7F72\u4EA7\u7269\u5F52\u6863");
+    return null;
+  }
+  const api = options.api ?? createApmApiClient(cfg);
+  let storage;
+  try {
+    storage = await fetchDeployArtifactStorage(api);
+  } catch (error) {
+    const detail = error instanceof Error ? error.message : String(error);
+    console.warn(`[apm] \u83B7\u53D6 MinIO \u914D\u7F6E\u5931\u8D25\uFF0C\u8DF3\u8FC7\u90E8\u7F72\u4EA7\u7269\u5F52\u6863: ${detail}`);
+    return null;
+  }
+  const fileName = buildDeployArtifactFileName(
+    options.kind,
+    options.projectName,
+    options.timestamp
+  );
+  const objectKey = buildDeployArtifactObjectKey(options.projectName, fileName);
+  let body;
+  try {
+    body = await readFile2(options.zipPath);
+  } catch (error) {
+    const detail = error instanceof Error ? error.message : String(error);
+    console.warn(`[apm] \u8BFB\u53D6\u90E8\u7F72\u4EA7\u7269 zip \u5931\u8D25\uFF0C\u8DF3\u8FC7 MinIO \u5F52\u6863: ${detail}`);
+    return null;
+  }
+  try {
+    const client = new MinioClient({
+      endPoint: storage.endpoint,
+      port: storage.port,
+      useSSL: storage.useSsl,
+      accessKey: storage.accessKey,
+      secretKey: storage.secretKey
+    });
+    await client.ensureBucket(storage.bucket);
+    await client.putObject(storage.bucket, objectKey, body, {
+      "Content-Type": "application/zip"
+    });
+    console.error(
+      `[apm] \u672C\u5730\u76F4\u4F20 MinIO\uFF08\u4E0D\u7ECF\u5E73\u53F0\u670D\u52A1\u5668\uFF09: ${storage.endpoint}:${storage.port}/${storage.bucket}/${objectKey} (${(body.length / 1024 / 1024).toFixed(
+        2
+      )} MB)`
+    );
+  } catch (error) {
+    const detail = error instanceof Error ? error.message : String(error);
+    console.warn(`[apm] MinIO \u90E8\u7F72\u4EA7\u7269\u5F52\u6863\u5931\u8D25: ${detail}`);
+    return null;
+  }
+  if (deploymentRunId) {
+    try {
+      await api.cli.attachTaskDeploymentArtifact({
+        id: deploymentRunId,
+        artifactObjectKey: objectKey,
+        artifactFileName: fileName
+      });
+      console.error(
+        `[apm] \u5DF2\u7ED1\u5B9A\u90E8\u7F72\u4EA7\u7269\u5230\u8BB0\u5F55 id=${deploymentRunId} file=${fileName}`
+      );
+    } catch (error) {
+      const detail = error instanceof Error ? error.message : String(error);
+      console.warn(`[apm] \u7ED1\u5B9A\u90E8\u7F72\u4EA7\u7269\u5230\u8BB0\u5F55\u5931\u8D25: ${detail}`);
+      return null;
+    }
+  }
+  return {
+    objectKey,
+    fileName,
+    bucket: storage.bucket
+  };
+}
+
 // src/commands/deploy/internal/deploy-shell-env.ts
 import { spawnSync as spawnSync3 } from "node:child_process";
 import { existsSync as existsSync16 } from "node:fs";
@@ -5527,7 +5541,6 @@ function runDeployShellCommand(command, cwd, captureOutput) {
 
 // src/commands/deploy/internal/wisdom-backend/index.ts
 import path9 from "node:path";
-init_deploy_artifact_minio();
 
 // src/commands/deploy/internal/wisdom-backend/jar-incremental.ts
 import {
@@ -5596,7 +5609,6 @@ import SftpClient from "ssh2-sftp-client";
 import { readdir as readdir2, readFile as readFile3, unlink, writeFile } from "node:fs/promises";
 import path3 from "node:path";
 import JSZip from "jszip";
-init_deploy_artifact_minio();
 init_minio();
 async function addDirToZip(dir, zipFolder) {
   const entries = await readdir2(dir, { withFileTypes: true });
@@ -5686,7 +5698,6 @@ async function packDirectoryWithMinioArchive(input) {
 }
 
 // src/commands/deploy/internal/wisdom-sftp.ts
-init_deploy_artifact_minio();
 var SFTP_UPLOAD_MAX_ATTEMPTS = 3;
 var SFTP_FAST_PUT_OPTIONS = {
   chunkSize: 64 * 1024,
@@ -6896,9 +6907,6 @@ function printDeployExecutionError(error) {
   console.error(error.message);
 }
 
-// src/commands/deploy/platform/deploy-run-coordinator.ts
-init_deploy_artifact_minio();
-
 // src/commands/deploy/platform/deploy-console-capture.ts
 function captureDeployConsole(logSyncer) {
   const chunks = [];
@@ -7428,14 +7436,34 @@ var EventSession = class {
     });
     this.markDirty(this.events.length - 1);
   }
-  /** CLI 本地准备步骤（工作区/分支/文档等），写入日志供 WebIDE 查看 */
+  /**
+   * CLI 本地准备步骤（工作区/分支/文档等），写入日志供 WebIDE 查看。
+   * 同名 step 原地更新（进行中→完成合并为一行），终态时写入 durationMs。
+   */
   addCliStep(step, text, status = "ok") {
+    const existingIndex = this.events.findIndex(
+      (e) => e.type === "cli_step" && e.step === step
+    );
+    const now = Date.now();
+    if (existingIndex >= 0) {
+      const existing = this.events[existingIndex];
+      existing.status = status;
+      existing.text = text;
+      if (status !== "running") {
+        const startedAt = typeof existing.at === "string" ? Date.parse(existing.at) : NaN;
+        if (Number.isFinite(startedAt)) {
+          existing.durationMs = Math.max(0, now - startedAt);
+        }
+      }
+      this.markDirty(existingIndex);
+      return;
+    }
     this.events.push({
       type: "cli_step",
       step,
       status,
       text,
-      at: (/* @__PURE__ */ new Date()).toISOString()
+      at: new Date(now).toISOString()
     });
     this.markDirty(this.events.length - 1);
   }

package/dist/webide-message-worker.js

@@ -1362,14 +1362,34 @@ var EventSession = class {
     });
     this.markDirty(this.events.length - 1);
   }
-  /** CLI 本地准备步骤（工作区/分支/文档等），写入日志供 WebIDE 查看 */
+  /**
+   * CLI 本地准备步骤（工作区/分支/文档等），写入日志供 WebIDE 查看。
+   * 同名 step 原地更新（进行中→完成合并为一行），终态时写入 durationMs。
+   */
   addCliStep(step, text, status = "ok") {
+    const existingIndex = this.events.findIndex(
+      (e) => e.type === "cli_step" && e.step === step
+    );
+    const now = Date.now();
+    if (existingIndex >= 0) {
+      const existing = this.events[existingIndex];
+      existing.status = status;
+      existing.text = text;
+      if (status !== "running") {
+        const startedAt = typeof existing.at === "string" ? Date.parse(existing.at) : NaN;
+        if (Number.isFinite(startedAt)) {
+          existing.durationMs = Math.max(0, now - startedAt);
+        }
+      }
+      this.markDirty(existingIndex);
+      return;
+    }
     this.events.push({
       type: "cli_step",
       step,
       status,
       text,
-      at: (/* @__PURE__ */ new Date()).toISOString()
+      at: new Date(now).toISOString()
     });
     this.markDirty(this.events.length - 1);
   }
@@ -2683,9 +2703,27 @@ var MinioClient = class {
   }
 };
 
-// src/commands/deploy/internal/deploy-artifact-minio.ts
-async function fetchDeployArtifactStorage(api) {
-  return api.cli.getDeployArtifactStorage(void 0);
+// src/commands/connect/apm-log-minio.ts
+var APM_LOG_MINIO_CONFIG = {
+  endpoint: "objectstorageapi.gzg.sealos.run",
+  port: 443,
+  useSsl: true,
+  accessKey: "428hqav4",
+  secretKey: "68b8srk4vdbjdhlc",
+  bucket: "428hqav4-apm-log"
+};
+function createApmLogMinioClient() {
+  const storage = APM_LOG_MINIO_CONFIG;
+  return {
+    client: new MinioClient({
+      endPoint: storage.endpoint,
+      port: storage.port,
+      useSSL: storage.useSsl,
+      accessKey: storage.accessKey,
+      secretKey: storage.secretKey
+    }),
+    bucket: storage.bucket
+  };
 }
 
 // src/commands/connect/webide-message-log.ts
@@ -2728,15 +2766,9 @@ function createThrottledWebIdeMessageLogSync(cfg, ctx, onError, options) {
   let firstLogNotified = false;
   const ensureMinio = async () => {
     if (minio) return;
-    const storage = await fetchDeployArtifactStorage(createApmApiClient(cfg));
-    minio = new MinioClient({
-      endPoint: storage.endpoint,
-      port: storage.port,
-      useSSL: storage.useSsl,
-      accessKey: storage.accessKey,
-      secretKey: storage.secretKey
-    });
-    bucket = storage.bucket;
+    const created = createApmLogMinioClient();
+    minio = created.client;
+    bucket = created.bucket;
     await minio.ensureBucket(bucket);
   };
   const notifyFirstLog = async () => {

package/package.json

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