ai-project-manage-cli 8.0.18 → 8.1.1

package/dist/index.js

@@ -1,30 +1,22 @@
 #!/usr/bin/env node
-var __defProp = Object.defineProperty;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __esm = (fn, res, err) => function __init() {
-  if (err) throw err[0];
-  try {
-    return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
-  } catch (e) {
-    throw err = [e], e;
-  }
-};
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
+
+// src/index.ts
+import { Command } from "commander";
 
 // src/config.ts
 import { mkdirSync, readFileSync, writeFileSync } from "fs";
 import { homedir } from "os";
 import { join } from "path";
+var APM_CONFIG_DIR = join(homedir(), ".config", "apm");
+var APM_CONFIG_PATH = join(APM_CONFIG_DIR, "config.json");
+var DEFAULT_BASE_URL = "http://127.0.0.1:3000";
 function resolveClientMachineId(cfg) {
   return (cfg.clientMachineId ?? cfg.userId ?? "").trim();
 }
 function resolveApiKey(cfg) {
   return (cfg.apiKey ?? cfg.token ?? "").trim();
 }
-async function tryReadApmConfig() {
+function tryReadApmConfig() {
   try {
     const raw = readFileSync(APM_CONFIG_PATH, "utf8");
     const v = JSON.parse(raw);
@@ -86,170 +78,8 @@ function buildAgentWsUrl(httpBase, apiKey) {
   const q = new URLSearchParams({ apiKey });
   return `${origin}/ws/agent?${q.toString()}`;
 }
-var APM_CONFIG_DIR, APM_CONFIG_PATH, DEFAULT_BASE_URL;
-var init_config = __esm({
-  "src/config.ts"() {
-    "use strict";
-    APM_CONFIG_DIR = join(homedir(), ".config", "apm");
-    APM_CONFIG_PATH = join(APM_CONFIG_DIR, "config.json");
-    DEFAULT_BASE_URL = "http://127.0.0.1:3000";
-  }
-});
-
-// src/api/request-config.ts
-import { defineEndpoint } from "listpage-http";
-var requestConfig;
-var init_request_config = __esm({
-  "src/api/request-config.ts"() {
-    "use strict";
-    requestConfig = {
-      cli: {
-        me: defineEndpoint(
-          {
-            method: "GET",
-            path: "/cli/me"
-          }
-        ),
-        webideAppendMessageContent: defineEndpoint({
-          method: "PUT",
-          path: "/cli/webide/messages/content"
-        }),
-        webideEnsureMessageContent: defineEndpoint({
-          method: "PUT",
-          path: "/cli/webide/messages/ensure-content"
-        }),
-        webideSetMessageError: defineEndpoint({
-          method: "PUT",
-          path: "/cli/webide/messages/error"
-        }),
-        webideUpdateMessageStatus: defineEndpoint({
-          method: "PUT",
-          path: "/cli/webide/messages/status"
-        }),
-        webideUpsertMessageLog: defineEndpoint({
-          method: "PUT",
-          path: "/cli/webide/message-logs"
-        }),
-        webideReplaceAssumptions: defineEndpoint({
-          method: "PUT",
-          path: "/cli/webide/assumptions"
-        }),
-        webideListAssumptions: defineEndpoint({
-          method: "GET",
-          path: "/cli/webide/assumptions"
-        }),
-        webideListAttachments: defineEndpoint({
-          method: "GET",
-          path: "/cli/webide/attachments"
-        }),
-        webideListDesignArtifacts: defineEndpoint({
-          method: "GET",
-          path: "/cli/webide/design-artifacts"
-        }),
-        webideRegisterDesignArtifacts: defineEndpoint({
-          method: "PUT",
-          path: "/cli/webide/design-artifacts"
-        }),
-        webideRecommendPlan: defineEndpoint({
-          method: "PUT",
-          path: "/cli/webide/plan-recommendation"
-        }),
-        webideUpsertPlan: defineEndpoint({
-          method: "PUT",
-          path: "/cli/webide/plan"
-        }),
-        webideReplaceTestCases: defineEndpoint({
-          method: "PUT",
-          path: "/cli/webide/test-cases"
-        }),
-        webideUpsertSqlExecution: defineEndpoint({
-          method: "PUT",
-          path: "/cli/webide/sql-executions"
-        }),
-        webideFinalizeSqlExecution: defineEndpoint({
-          method: "PUT",
-          path: "/cli/webide/sql-executions/finalize"
-        }),
-        projectBaseBranch: defineEndpoint(
-          {
-            method: "GET",
-            path: "/cli/tasks/project-base-branch"
-          }
-        ),
-        createWebIdeDraftPullRequest: defineEndpoint({
-          method: "POST",
-          path: "/cli/webide/draft-pull-requests"
-        }),
-        webideMergePullRequests: defineEndpoint({
-          method: "POST",
-          path: "/cli/webide/pull-requests/merge"
-        }),
-        getProjectDocumentManifest: defineEndpoint({
-          method: "GET",
-          path: "/cli/project-documents/manifest"
-        }),
-        listProjectDocuments: defineEndpoint({
-          method: "GET",
-          path: "/cli/project-documents"
-        }),
-        upsertProjectDocument: defineEndpoint({
-          method: "PUT",
-          path: "/cli/project-documents/upsert"
-        }),
-        removeProjectDocument: defineEndpoint({
-          method: "DELETE",
-          path: "/cli/project-documents"
-        }),
-        getApmLogStorage: defineEndpoint({
-          method: "GET",
-          path: "/cli/apm-log-storage"
-        }),
-        projectPackageUpdateStatus: defineEndpoint({
-          method: "PUT",
-          path: "/cli/project-packages/status"
-        }),
-        projectPackageAppendContent: defineEndpoint({
-          method: "PUT",
-          path: "/cli/project-packages/content"
-        }),
-        projectPackageEnsureContent: defineEndpoint({
-          method: "PUT",
-          path: "/cli/project-packages/ensure-content"
-        })
-      }
-    };
-  }
-});
-
-// src/api/client.ts
-var client_exports = {};
-__export(client_exports, {
-  createApmApiClient: () => createApmApiClient
-});
-import { createApiClient } from "listpage-http";
-function createApmApiClient(cfg) {
-  const baseURL = `${cfg.baseUrl.trim().replace(/\/+$/, "")}/api/v1`;
-  return createApiClient(requestConfig, {
-    baseURL,
-    getToken: () => resolveApiKey(cfg) || void 0,
-    successCodes: [0],
-    unauthorizedCodes: [401]
-  });
-}
-var init_client = __esm({
-  "src/api/client.ts"() {
-    "use strict";
-    init_request_config();
-    init_config();
-  }
-});
-
-// src/index.ts
-init_config();
-import { Command } from "commander";
 
 // src/utils/workspace.ts
-init_config();
 import { copyFileSync, existsSync, mkdirSync as mkdirSync2, readdirSync, statSync } from "fs";
 import { dirname, join as join2, resolve as resolve2 } from "path";
 import { fileURLToPath } from "url";
@@ -421,9 +251,147 @@ async function runInit() {
 }
 
 // src/commands/login.ts
-init_config();
-init_client();
 import { ApiError } from "listpage-http";
+
+// src/api/client.ts
+import { createApiClient } from "listpage-http";
+
+// src/api/request-config.ts
+import { defineEndpoint } from "listpage-http";
+var requestConfig = {
+  cli: {
+    me: defineEndpoint(
+      {
+        method: "GET",
+        path: "/cli/me"
+      }
+    ),
+    webideAppendMessageContent: defineEndpoint({
+      method: "PUT",
+      path: "/cli/webide/messages/content"
+    }),
+    webideEnsureMessageContent: defineEndpoint({
+      method: "PUT",
+      path: "/cli/webide/messages/ensure-content"
+    }),
+    webideSetMessageError: defineEndpoint({
+      method: "PUT",
+      path: "/cli/webide/messages/error"
+    }),
+    webideUpdateMessageStatus: defineEndpoint({
+      method: "PUT",
+      path: "/cli/webide/messages/status"
+    }),
+    /** CLI 改工作流状态统一入口（start-/complete- 等） */
+    webideRunAction: defineEndpoint({
+      method: "POST",
+      path: "/cli/webide/actions"
+    }),
+    webideUpsertMessageLog: defineEndpoint({
+      method: "PUT",
+      path: "/cli/webide/message-logs"
+    }),
+    webideReplaceAssumptions: defineEndpoint({
+      method: "PUT",
+      path: "/cli/webide/assumptions"
+    }),
+    webideListAssumptions: defineEndpoint({
+      method: "GET",
+      path: "/cli/webide/assumptions"
+    }),
+    webideListAttachments: defineEndpoint({
+      method: "GET",
+      path: "/cli/webide/attachments"
+    }),
+    webideListDesignArtifacts: defineEndpoint({
+      method: "GET",
+      path: "/cli/webide/design-artifacts"
+    }),
+    webideRegisterDesignArtifacts: defineEndpoint({
+      method: "PUT",
+      path: "/cli/webide/design-artifacts"
+    }),
+    webideRecommendPlan: defineEndpoint({
+      method: "PUT",
+      path: "/cli/webide/plan-recommendation"
+    }),
+    webideUpsertPlan: defineEndpoint({
+      method: "PUT",
+      path: "/cli/webide/plan"
+    }),
+    webideReplaceTestCases: defineEndpoint({
+      method: "PUT",
+      path: "/cli/webide/test-cases"
+    }),
+    webideUpsertSqlExecution: defineEndpoint({
+      method: "PUT",
+      path: "/cli/webide/sql-executions"
+    }),
+    webideFinalizeSqlExecution: defineEndpoint({
+      method: "PUT",
+      path: "/cli/webide/sql-executions/finalize"
+    }),
+    projectBaseBranch: defineEndpoint(
+      {
+        method: "GET",
+        path: "/cli/tasks/project-base-branch"
+      }
+    ),
+    createWebIdeDraftPullRequest: defineEndpoint({
+      method: "POST",
+      path: "/cli/webide/draft-pull-requests"
+    }),
+    webideMergePullRequests: defineEndpoint({
+      method: "POST",
+      path: "/cli/webide/pull-requests/merge"
+    }),
+    getProjectDocumentManifest: defineEndpoint({
+      method: "GET",
+      path: "/cli/project-documents/manifest"
+    }),
+    listProjectDocuments: defineEndpoint({
+      method: "GET",
+      path: "/cli/project-documents"
+    }),
+    upsertProjectDocument: defineEndpoint({
+      method: "PUT",
+      path: "/cli/project-documents/upsert"
+    }),
+    removeProjectDocument: defineEndpoint({
+      method: "DELETE",
+      path: "/cli/project-documents"
+    }),
+    getApmLogStorage: defineEndpoint({
+      method: "GET",
+      path: "/cli/apm-log-storage"
+    }),
+    projectPackageUpdateStatus: defineEndpoint({
+      method: "PUT",
+      path: "/cli/project-packages/status"
+    }),
+    projectPackageAppendContent: defineEndpoint({
+      method: "PUT",
+      path: "/cli/project-packages/content"
+    }),
+    projectPackageEnsureContent: defineEndpoint({
+      method: "PUT",
+      path: "/cli/project-packages/ensure-content"
+    })
+  }
+};
+
+// src/api/client.ts
+function createApmApiClient(cfg) {
+  const baseURL = `${cfg.baseUrl.trim().replace(/\/+$/, "")}/api/v1`;
+  return createApiClient(requestConfig, {
+    baseURL,
+    getToken: () => resolveApiKey(cfg) || void 0,
+    successCodes: [0],
+    unauthorizedCodes: [401]
+  });
+}
+
+// src/commands/login.ts
 async function runLogin(opts) {
   const baseUrl = (opts.server?.trim() || process.env.AI_PM_SERVER?.trim() || DEFAULT_BASE_URL).replace(/\/+$/, "");
   const apiKey = (opts.apiKey?.trim() || process.env.APM_API_KEY?.trim() || "").replace(/^Bearer\s+/i, "");
@@ -479,8 +447,6 @@ async function runLogin(opts) {
 
 // src/commands/update.ts
 import { spawnSync } from "child_process";
-import { existsSync as existsSync2 } from "fs";
-import { join as join4 } from "path";
 
 // src/version.ts
 import { readFileSync as readFileSync2 } from "fs";
@@ -603,7 +569,7 @@ async function runUpdate(options = {}) {
   });
   if (resolved.action === "skip") {
     console.log(`[apm] \u5DF2\u662F\u6700\u65B0\u7248\u672C ${current}`);
-    return { didUpdate: false };
+    return;
   }
   if (resolved.majorUpgradeAvailable) {
     console.log(
@@ -640,54 +606,14 @@ async function runUpdate(options = {}) {
   } else {
     console.log(`[apm] \u5DF2\u662F\u6700\u65B0\u7248\u672C ${current}`);
   }
-  return { didUpdate: expectedBump };
-}
-function resolveApmEntryPath(entryArg = process.argv[1]) {
-  const fromArgv = entryArg?.trim();
-  if (fromArgv && existsSync2(fromArgv)) {
-    return fromArgv;
-  }
-  const npmResult = runNpm(["root", "-g"], {
-    encoding: "utf8",
-    stdio: ["ignore", "pipe", "pipe"]
-  });
-  if (npmResult.status === 0) {
-    const globalRoot = npmResult.stdout?.toString().trim();
-    if (globalRoot) {
-      const candidate = join4(globalRoot, CLI_PACKAGE_NAME, "dist", "index.js");
-      if (existsSync2(candidate)) {
-        return candidate;
-      }
-    }
-  }
-  if (fromArgv) {
-    return fromArgv;
-  }
-  console.error("[apm] \u65E0\u6CD5\u89E3\u6790 apm \u5165\u53E3\u8DEF\u5F84");
-  process.exit(1);
-}
-function reexecConnectAfterUpdate(options) {
-  console.log("[apm] \u66F4\u65B0\u5B8C\u6210\uFF0C\u6B63\u5728\u4EE5\u65B0\u7248\u672C\u91CD\u65B0\u8FDE\u63A5\u2026");
-  const apmScript = resolveApmEntryPath();
-  const args = [apmScript, "connect"];
-  const server = options.server?.trim();
-  if (server) {
-    args.push("--server", server);
-  }
-  const result = spawnSync(process.execPath, args, { stdio: "inherit" });
-  if (result.error) {
-    console.error("[apm] \u91CD\u542F connect \u5931\u8D25:", result.error.message);
-    process.exit(1);
-  }
-  process.exit(result.status ?? 0);
 }
 
 // src/commands/update-skills.ts
-import { existsSync as existsSync3, statSync as statSync2 } from "fs";
+import { existsSync as existsSync2, statSync as statSync2 } from "fs";
 async function syncWorkspaceSkills(workdir) {
   const apmDir = workspaceApmDir(workdir);
   const fsApmDir = toFsPath(apmDir);
-  if (!existsSync3(fsApmDir)) {
+  if (!existsSync2(fsApmDir)) {
     throw new Error("[apm] \u672A\u627E\u5230 .apm \u76EE\u5F55\uFF0C\u8BF7\u5148\u6267\u884C apm init");
   }
   const apmStat = statSync2(fsApmDir);
@@ -699,7 +625,7 @@ async function syncWorkspaceSkills(workdir) {
 }
 async function runUpdateSkills() {
   const apmDir = workspaceApmDir();
-  if (!existsSync3(apmDir)) {
+  if (!existsSync2(apmDir)) {
     console.error("[apm] \u672A\u627E\u5230 .apm \u76EE\u5F55\uFF0C\u8BF7\u5148\u6267\u884C apm init");
     process.exit(1);
   }
@@ -710,21 +636,16 @@ async function runUpdateSkills() {
   await syncWorkspaceSkills(resolveWorkdirPath());
 }
 
-// src/commands/sync-project-documents.ts
-init_config();
-
 // src/utils/project-documents.ts
-init_client();
-init_config();
 import {
-  existsSync as existsSync4,
+  existsSync as existsSync3,
   readdirSync as readdirSync2,
   readFileSync as readFileSync3,
   rmSync,
   writeFileSync as writeFileSync2
 } from "fs";
 import { createHash } from "crypto";
-import { dirname as dirname3, join as join5, relative, sep } from "path";
+import { dirname as dirname3, join as join4, relative, sep } from "path";
 
 // src/utils/git.ts
 import { execFile as execFile2 } from "child_process";
@@ -798,11 +719,11 @@ function normalizeProjectIdForPath(projectId) {
 }
 function projectDocumentsDir(apmRoot, projectId) {
   const id = normalizeProjectIdForPath(projectId);
-  return join5(apmRoot ?? workspaceApmDir(), "project", id);
+  return join4(apmRoot ?? workspaceApmDir(), "project", id);
 }
 function projectDocumentLocalPath(apmRoot, projectId, documentPath) {
   const normalized = normalizeLocalDocumentPath(documentPath);
-  return join5(
+  return join4(
     projectDocumentsDir(apmRoot, projectId),
     ...normalized.split("/")
   );
@@ -822,11 +743,11 @@ function hashLocalFileContent(content) {
   return createHash("sha256").update(content, "utf8").digest("hex");
 }
 function readLocalManifest(apmRoot, projectId) {
-  const manifestPath = join5(
+  const manifestPath = join4(
     projectDocumentsDir(apmRoot, projectId),
     MANIFEST_FILE
   );
-  if (!existsSync4(manifestPath)) {
+  if (!existsSync3(manifestPath)) {
     return null;
   }
   try {
@@ -839,13 +760,13 @@ function readLocalManifest(apmRoot, projectId) {
 }
 function listLocalDocumentPaths(apmRoot, projectId) {
   const root = projectDocumentsDir(apmRoot, projectId);
-  if (!existsSync4(root)) {
+  if (!existsSync3(root)) {
     return [];
   }
   const paths = [];
   const walk = (dir) => {
     for (const entry of readdirSync2(dir, { withFileTypes: true })) {
-      const abs = join5(dir, entry.name);
+      const abs = join4(dir, entry.name);
       if (entry.isDirectory()) {
         walk(abs);
         continue;
@@ -974,13 +895,13 @@ ${diagnostic ?? ""}`);
     const absPath = toFsPath(
       projectDocumentLocalPath(targetApmDir, projectId, path)
     );
-    if (existsSync4(absPath)) {
+    if (existsSync3(absPath)) {
       rmSync(absPath, { force: true });
       deleted += 1;
     }
   }
   writeFileSync2(
-    toFsPath(join5(docsDir, MANIFEST_FILE)),
+    toFsPath(join4(docsDir, MANIFEST_FILE)),
     `${JSON.stringify(remoteManifest, null, 2)}
 `,
     "utf8"
@@ -1064,7 +985,6 @@ async function runSyncProjectDocuments(options) {
 // src/commands/connect.ts
 import WebSocket from "ws";
 import { setTimeout as delay } from "node:timers/promises";
-init_config();
 
 // src/ws/protocol.ts
 function isWebIdeStartProjectTarget(value) {
@@ -1123,6 +1043,7 @@ function validateWebIdeMessagePush(o) {
   if (!nonEmptyString(o.user)) {
     return { ok: false, reason: "webide-message \u7F3A\u5C11 user" };
   }
+  const useNewAgent = o.useNewAgent === true;
   return {
     ok: true,
     data: {
@@ -1134,7 +1055,8 @@ function validateWebIdeMessagePush(o) {
       model: o.model.trim(),
       apiKey: o.apiKey.trim(),
       workdir: o.workdir.trim(),
-      user: o.user.trim()
+      user: o.user.trim(),
+      ...useNewAgent ? { useNewAgent: true } : {}
     }
   };
 }
@@ -1294,18 +1216,13 @@ function handleCancelAction(payload, ctx) {
   ctx.activeRuns.get(messageId)?.abort();
 }
 
-// src/commands/connect/actions/webide-message.ts
-init_client();
-
-// src/commands/connect/webide-worker-pool.ts
+// src/commands/connect/core/worker/worker.ts
+import { dirname as dirname4, join as join5 } from "path";
+import { fileURLToPath as fileURLToPath3 } from "url";
 import { Worker } from "node:worker_threads";
+
+// src/commands/connect/core/worker/config.ts
 import { totalmem } from "node:os";
-import { fileURLToPath as fileURLToPath3 } from "node:url";
-import { dirname as dirname4, join as join6 } from "node:path";
-var workerFile = join6(
-  dirname4(fileURLToPath3(import.meta.url)),
-  "webide-message-worker.js"
-);
 var SYSTEM_RESERVE_MB = 3072;
 var MIN_WEBIDE_WORKER_HEAP_MB = 1536;
 var MAX_WEBIDE_WORKER_HEAP_MB = 8192;
@@ -1324,85 +1241,111 @@ function resolveWebIdeWorkerHeapMb(env = process.env, totalMemoryBytes = totalme
   if (!Number.isFinite(n)) return fallback;
   return Math.min(16384, Math.max(MIN_WEBIDE_WORKER_HEAP_MB, n));
 }
-function spawnWebIdeMessageWorker(cfg, msg) {
-  const maxOldGenerationSizeMb = resolveWebIdeWorkerHeapMb();
-  const worker = new Worker(workerFile, {
-    workerData: { cfg, msg },
-    // worker_threads 不支持 execArgv 里的 --max-old-space-size，必须用 resourceLimits
-    resourceLimits: { maxOldGenerationSizeMb }
-  });
-  console.log(
-    `[apm] webide worker spawn messageId=${msg.messageId} heapMb=${maxOldGenerationSizeMb}`
-  );
-  let settled = false;
-  let resolveDone;
-  const done = new Promise((resolve3) => {
-    resolveDone = resolve3;
-  });
-  const failIfStillQueued = async (reason) => {
-    if (settled) return;
-    try {
-      const { createApmApiClient: createApmApiClient2 } = await Promise.resolve().then(() => (init_client(), client_exports));
-      const api = createApmApiClient2(cfg);
-      if (msg.type === "webide-package") {
-        await api.cli.projectPackageUpdateStatus({
-          id: msg.packageId,
-          status: "CANCELLED",
-          error: reason
-        });
-        return;
-      }
-      await api.cli.webideSetMessageError({
-        id: msg.messageId,
-        error: reason,
-        asCancelled: true
-      });
-    } catch (err) {
-      console.error(
-        `[apm] webide worker \u5931\u8D25\u5199\u7EC8\u6001\u5931\u8D25 messageId=${msg.messageId}:`,
-        err instanceof Error ? err.message : err
-      );
+
+// src/commands/connect/core/worker/worker.ts
+var workerFile = join5(
+  dirname4(fileURLToPath3(import.meta.url)),
+  "worker-script.js"
+);
+var ActionWorker = class {
+  worker;
+  _status = "pending";
+  maxOldGenerationSizeMb = resolveWebIdeWorkerHeapMb();
+  apmClient;
+  msg;
+  promise;
+  resolve;
+  reject;
+  constructor(msg) {
+    const cfg = tryReadApmConfig();
+    if (!cfg) {
+      throw new Error("\u672A\u68C0\u6D4B\u5230\u767B\u5F55\u4FE1\u606F\uFF0C\u8BF7\u5148\u6267\u884C apm login");
     }
-  };
-  worker.on("message", (m) => {
+    this.msg = msg;
+    this.apmClient = createApmApiClient(cfg);
+    this.promise = new Promise((resolve3, reject) => {
+      this.resolve = resolve3;
+      this.reject = reject;
+    });
+    this.worker = new Worker(workerFile, {
+      workerData: { msg, cfg },
+      resourceLimits: { maxOldGenerationSizeMb: this.maxOldGenerationSizeMb }
+    });
+    this.worker.on("message", this.onMessage);
+    this.worker.on("error", this.onError);
+    this.worker.on("exit", this.onExit);
+  }
+  get status() {
+    return this._status;
+  }
+  set status(value) {
+    this._status = value;
+    if (value === "done") {
+      this.resolve();
+    } else if (value === "error") {
+      this.reject();
+    }
+  }
+  onMessage = (m) => {
     if (m?.type === "done" || m?.type === "error") {
-      settled = true;
       if (m.type === "error") {
         console.error(
           `[apm] webide worker error messageId=${m.messageId}: ${m.error}`
         );
       }
-      void worker.terminate().finally(() => resolveDone());
+      this.worker.terminate().finally(() => {
+        this.resolve();
+      });
     }
-  });
-  worker.on("error", (err) => {
+  };
+  onError = (err) => {
     const detail = err instanceof Error ? err.message : String(err);
     console.error("[apm] webide worker crashed:", err);
-    const oomHint = /memory limit|heap out of memory/i.test(detail) ? `\uFF08\u5F53\u524D\u5806\u4E0A\u9650 ${maxOldGenerationSizeMb}MB\uFF1B8G \u53CA\u4EE5\u4E0B\u673A\u5668\u8C03\u9AD8 APM_WEBIDE_WORKER_HEAP_MB \u6613\u89E6\u53D1\u6574\u673A OOM\uFF0C\u5EFA\u8BAE\u52A0\u5185\u5B58/swap \u6216\u7F29\u77ED\u5355\u6B21\u4EFB\u52A1\uFF09` : "";
-    void failIfStillQueued(`WebIDE worker \u5D29\u6E83: ${detail}${oomHint}`).finally(
-      () => resolveDone()
-    );
-  });
-  worker.on("exit", (code) => {
-    if (!settled && code !== 0) {
+    const oomHint = /memory limit|heap out of memory/i.test(detail) ? `\uFF08\u5F53\u524D\u5806\u4E0A\u9650 ${this.maxOldGenerationSizeMb}MB\uFF1B8G \u53CA\u4EE5\u4E0B\u673A\u5668\u8C03\u9AD8 APM_WEBIDE_WORKER_HEAP_MB \u6613\u89E6\u53D1\u6574\u673A OOM\uFF0C\u5EFA\u8BAE\u52A0\u5185\u5B58/swap \u6216\u7F29\u77ED\u5355\u6B21\u4EFB\u52A1\uFF09` : "";
+    this.failIfStillQueued(`WebIDE worker \u5D29\u6E83: ${detail}${oomHint}`);
+  };
+  onExit = async (code) => {
+    if (this.status === "pending" && code !== 0) {
       console.error(`[apm] webide worker exit code=${code}`);
-      void failIfStillQueued(`WebIDE worker \u5F02\u5E38\u9000\u51FA code=${code}`).finally(
-        () => resolveDone()
-      );
+      this.failIfStillQueued(`WebIDE worker \u5F02\u5E38\u9000\u51FA code=${code}`);
       return;
     }
     if (code !== 0) {
       console.error(`[apm] webide worker exit code=${code}`);
+      this.status = "error";
+      return;
     }
-    resolveDone();
-  });
-  return {
-    cancel(messageId) {
-      worker.postMessage({ type: "cancel", messageId });
-    },
-    done
+    this.status = "done";
   };
-}
+  failIfStillQueued = async (reason) => {
+    if (this.status !== "pending") return;
+    try {
+      if (this.msg.type === "webide-package") {
+        await this.apmClient.cli.projectPackageUpdateStatus({
+          id: this.msg.packageId,
+          status: "CANCELLED",
+          error: reason
+        });
+        return;
+      }
+      await this.apmClient.cli.webideSetMessageError({
+        id: this.msg.messageId,
+        error: reason,
+        asCancelled: true
+      });
+    } catch (err) {
+      console.error("[apm] WebIDE worker \u5931\u8D25\u5199\u7EC8\u6001\u5931\u8D25:", err);
+    } finally {
+      this.status = "error";
+    }
+  };
+  cancel(msg_id) {
+    this.worker.postMessage({ type: "cancel", messageId: msg_id });
+  }
+  get done() {
+    return this.promise;
+  }
+};
 
 // src/commands/connect/actions/types.ts
 function trackActionTask(ctx, task) {
@@ -1437,7 +1380,7 @@ function handleWebIdeMessageAction(payload, ctx) {
     return;
   }
   const task = (async () => {
-    const handle = spawnWebIdeMessageWorker(ctx.cfg, payload);
+    const handle = new ActionWorker(payload);
     const onAbort = () => handle.cancel(payload.messageId);
     perMessageController.signal.addEventListener("abort", onAbort, {
       once: true
@@ -1453,7 +1396,6 @@ function handleWebIdeMessageAction(payload, ctx) {
 }
 
 // src/commands/connect/actions/start-project.ts
-init_client();
 function handleStartProjectAction(payload, ctx) {
   const perMessageController = new AbortController();
   ctx.activeRuns.set(payload.messageId, perMessageController);
@@ -1478,7 +1420,7 @@ function handleStartProjectAction(payload, ctx) {
     return;
   }
   const task = (async () => {
-    const handle = spawnWebIdeMessageWorker(ctx.cfg, payload);
+    const handle = new ActionWorker(payload);
     const onAbort = () => handle.cancel(payload.messageId);
     perMessageController.signal.addEventListener("abort", onAbort, {
       once: true
@@ -1493,8 +1435,7 @@ function handleStartProjectAction(payload, ctx) {
   trackActionTask(ctx, task);
 }
 
-// src/commands/connect/pty-session-mcp.ts
-init_config();
+// src/commands/connect/mcps/pty-session-mcp.ts
 var DEFAULT_PTY_SESSION_PORT = "7788";
 function resolvePtySessionBaseUrl(env = process.env) {
   const explicit = env.LOCAL_TERMINAL_URL?.trim();
@@ -1590,7 +1531,6 @@ function handleStopTerminalsAction(payload, ctx) {
 }
 
 // src/commands/connect/actions/package.ts
-init_client();
 function handleWebIdePackageAction(payload, ctx) {
   const perMessageController = new AbortController();
   ctx.activeRuns.set(payload.messageId, perMessageController);
@@ -1616,7 +1556,7 @@ function handleWebIdePackageAction(payload, ctx) {
     return;
   }
   const task = (async () => {
-    const handle = spawnWebIdeMessageWorker(ctx.cfg, payload);
+    const handle = new ActionWorker(payload);
     const onAbort = () => handle.cancel(payload.messageId);
     perMessageController.signal.addEventListener("abort", onAbort, {
       once: true
@@ -1655,25 +1595,15 @@ function dispatchConnectAction(payload, ctx) {
 }
 
 // src/commands/connect-lock.ts
-init_config();
 import {
-  existsSync as existsSync5,
+  existsSync as existsSync4,
   mkdirSync as mkdirSync3,
   readFileSync as readFileSync4,
   unlinkSync,
   writeFileSync as writeFileSync3
 } from "fs";
-import { join as join7 } from "path";
-var CONNECT_LOCK_PATH = join7(APM_CONFIG_DIR, "connect.lock");
-var LEGACY_DAEMON_PID_PATH = join7(APM_CONFIG_DIR, "connect.pid");
-var LEGACY_DAEMON_FILES = [
-  LEGACY_DAEMON_PID_PATH,
-  join7(APM_CONFIG_DIR, "connect.supervisor.cjs"),
-  join7(APM_CONFIG_DIR, "connect.launch.json"),
-  join7(APM_CONFIG_DIR, "connect.ecosystem.config.cjs"),
-  join7(APM_CONFIG_DIR, "connect.ecosystem.cjs"),
-  join7(APM_CONFIG_DIR, "connect.entry.cjs")
-];
+import { join as join6 } from "path";
+var CONNECT_LOCK_PATH = join6(APM_CONFIG_DIR, "connect.lock");
 function isProcessAlive(pid) {
   if (!Number.isInteger(pid) || pid <= 0) return false;
   try {
@@ -1683,30 +1613,8 @@ function isProcessAlive(pid) {
     return false;
   }
 }
-function readLegacyDaemonPid() {
-  if (!existsSync5(LEGACY_DAEMON_PID_PATH)) return null;
-  try {
-    const pid = Number.parseInt(
-      readFileSync4(LEGACY_DAEMON_PID_PATH, "utf8").trim(),
-      10
-    );
-    if (!Number.isInteger(pid) || pid <= 0) return null;
-    return pid;
-  } catch {
-    return null;
-  }
-}
-function removeLegacyDaemonFiles() {
-  for (const file of LEGACY_DAEMON_FILES) {
-    if (!existsSync5(file)) continue;
-    try {
-      unlinkSync(file);
-    } catch {
-    }
-  }
-}
 function readConnectLock() {
-  if (!existsSync5(CONNECT_LOCK_PATH)) return null;
+  if (!existsSync4(CONNECT_LOCK_PATH)) return null;
   try {
     const raw = readFileSync4(CONNECT_LOCK_PATH, "utf8");
     const parsed = JSON.parse(raw);
@@ -1759,24 +1667,6 @@ function releaseConnectLock() {
   } catch {
   }
 }
-function assertConnectNotRunning() {
-  pruneStaleConnectLock();
-  const lock = readConnectLock();
-  if (lock && isProcessAlive(lock.pid) && lock.pid !== process.pid) {
-    console.error(
-      `[apm] \u5DF2\u6709 apm connect \u5728\u8FD0\u884C (pid=${lock.pid})\uFF0C\u8BF7\u5148\u505C\u6B62\u540E\u518D\u542F\u52A8`
-    );
-    process.exit(1);
-  }
-  const legacyPid = readLegacyDaemonPid();
-  if (legacyPid && isProcessAlive(legacyPid) && legacyPid !== process.pid) {
-    console.error(
-      `[apm] \u68C0\u6D4B\u5230\u65E7\u7248\u540E\u53F0 connect (pid=${legacyPid})\uFF0C\u8BF7\u5148\u7ED3\u675F\u8BE5\u8FDB\u7A0B\u540E\u518D\u542F\u52A8`
-    );
-    process.exit(1);
-  }
-  removeLegacyDaemonFiles();
-}
 
 // src/commands/connect.ts
 var HEARTBEAT_MS = 3e4;
@@ -1890,10 +1780,6 @@ function resolveConnectServerOption(options) {
   return void 0;
 }
 async function runConnect(options) {
-  const { didUpdate } = await runUpdate();
-  if (didUpdate) {
-    reexecConnectAfterUpdate(options);
-  }
   const cfg = await ensureLoggedConfig();
   const serverOverride = resolveConnectServerOption(options);
   if (serverOverride) {
@@ -1904,7 +1790,6 @@ async function runConnect(options) {
     console.error("[apm] config \u7F3A\u5C11 clientMachineId\uFF0C\u8BF7\u91CD\u65B0 apm login");
     process.exit(1);
   }
-  assertConnectNotRunning();
   acquireConnectLock();
   process.on("exit", releaseConnectLock);
   let shuttingDown = false;
@@ -2021,7 +1906,7 @@ function buildProgram() {
     await runSyncProjectDocuments(opts);
   });
   program.command("connect").description(
-    "\u8FDE\u63A5\u5E73\u53F0 WebSocket\uFF08/ws/agent\uFF09\uFF0C\u7EF4\u6301\u5FC3\u8DF3\u5E76\u5904\u7406\u4E0B\u884C webide-message\uFF1B\u542F\u52A8\u524D\u81EA\u52A8 apm update \u5230\u5F53\u524D\u5927\u7248\u672C\u6700\u65B0\u7248"
+    "\u8FDE\u63A5\u5E73\u53F0 WebSocket\uFF08/ws/agent\uFF09\uFF0C\u7EF4\u6301\u5FC3\u8DF3\u5E76\u5904\u7406\u4E0B\u884C webide-message"
   ).option("--server <url>", "API \u6839\u5730\u5740\uFF0C\u8986\u76D6 config \u4E2D\u7684 baseUrl").action(async (opts) => {
     await runConnect({ server: opts.server });
   });