ai-project-manage-cli 8.1.20 → 8.1.21

package/README.md

@@ -13,7 +13,14 @@ apm update
 ## 登录
 
 ```bash
-apm login --api-key=cm_xxx --server=http://127.0.0.1:3000
+# 历史兼容：只传一个带端口的 --server → Socket 用该地址，API 去掉端口
+apm login --api-key=cm_xxx --server=https://api.example.com:3334
+# → API https://api.example.com ，Socket wss://api.example.com:3334
+
+# 现在：分别传 API 与 Socket（也可用 APM_SERVER / APM_SOCKET_SERVER）
+apm login --api-key=cm_xxx \
+  --server=https://api.example.com \
+  --socket-server=wss://ws.example.com
 ```
 
 ## 初始化工作区
@@ -36,9 +43,18 @@ apm update-skills
 
 ```bash
 apm connect
-apm connect --server https://your-server.com
+# 历史兼容
+apm connect --server https://api.example.com:3334
+# 分别指定
+apm connect --server https://api.example.com --socket-server wss://ws.example.com
 ```
 
+地址解析：
+
+- **历史**：只传 `--server https://host:port` → Socket 用该地址，API 为去掉端口后的 `https://host`
+- **现在**：`--server` + `--socket-server`，或环境变量 `APM_SERVER` + `APM_SOCKET_SERVER`
+- 登录成功后写入 `~/.config/apm/config.json` 的 `baseUrl` / `socketServer`
+
 启动前会检测 npm registry 上当前大版本的最新包；若落后则先 `npm install -g` 更新，再以新版本重新连接。跨大版本请手动执行 `apm update --major`。
 
 同一时刻仅允许一个 connect。

package/dist/index.js

@@ -16,6 +16,15 @@ function resolveClientMachineId(cfg) {
 function resolveApiKey(cfg) {
   return (cfg.apiKey ?? cfg.token ?? "").trim();
 }
+function stripTrailingSlash(raw) {
+  return raw.trim().replace(/\/+$/, "");
+}
+function readConfigSocketServer(cfg) {
+  const fromNew = typeof cfg.socketServer === "string" ? cfg.socketServer.trim().replace(/\/+$/, "") : "";
+  if (fromNew) return fromNew;
+  const fromLegacy = typeof cfg.wsUrl === "string" ? cfg.wsUrl.trim().replace(/\/+$/, "") : "";
+  return fromLegacy;
+}
 function tryReadApmConfig() {
   try {
     const raw = readFileSync(APM_CONFIG_PATH, "utf8");
@@ -31,10 +40,12 @@ function tryReadApmConfig() {
     if (!apiKey) return null;
     const cfg = v;
     const clientMachineId = resolveClientMachineId(cfg);
+    const socketServer = readConfigSocketServer(cfg);
     return {
       baseUrl: cfg.baseUrl.trim().replace(/\/+$/, ""),
       apiKey,
-      ...clientMachineId ? { clientMachineId } : {}
+      ...clientMachineId ? { clientMachineId } : {},
+      ...socketServer ? { socketServer } : {}
     };
   } catch {
     return null;
@@ -47,11 +58,80 @@ function defaultApmConfig() {
     apiKey: ""
   };
 }
-function httpBaseToWsOrigin(httpBase) {
-  const u = httpBase.trim().replace(/\/+$/, "");
+function assertHttpBase(raw, label) {
+  const u = stripTrailingSlash(raw);
+  if (!u.startsWith("https://") && !u.startsWith("http://")) {
+    throw new Error(`${label} \u5FC5\u987B\u4EE5 http:// \u6216 https:// \u5F00\u5934`);
+  }
+  return new URL(u).origin;
+}
+function normalizeSocketBase(raw) {
+  const u = stripTrailingSlash(raw);
+  if (u.startsWith("https://") || u.startsWith("http://") || u.startsWith("wss://") || u.startsWith("ws://")) {
+    return new URL(u).origin;
+  }
+  throw new Error(
+    "socket server \u5FC5\u987B\u4EE5 http://\u3001https://\u3001ws:// \u6216 wss:// \u5F00\u5934"
+  );
+}
+function httpBaseToWsOrigin(httpOrWsBase) {
+  const u = stripTrailingSlash(httpOrWsBase);
+  if (u.startsWith("wss://") || u.startsWith("ws://")) return u;
   if (u.startsWith("https://")) return "wss://" + u.slice("https://".length);
   if (u.startsWith("http://")) return "ws://" + u.slice("http://".length);
-  throw new Error("baseUrl \u5FC5\u987B\u4EE5 http:// \u6216 https:// \u5F00\u5934");
+  throw new Error("socket server \u5FC5\u987B\u4EE5 http(s):// \u6216 ws(s):// \u5F00\u5934");
+}
+function splitHistoricalServer(server) {
+  const url = new URL(assertHttpBase(server, "server"));
+  const socketServer = url.origin;
+  if (url.port) {
+    url.port = "";
+    return { baseUrl: url.origin, socketServer };
+  }
+  return { baseUrl: url.origin, socketServer: url.origin };
+}
+function resolveApmEndpoints(input = {}) {
+  const serverOpt = stripTrailingSlash(
+    input.server?.trim() || process.env.APM_SERVER?.trim() || ""
+  );
+  const socketOpt = stripTrailingSlash(
+    input.socketServer?.trim() || process.env.APM_SOCKET_SERVER?.trim() || ""
+  );
+  const configBase = stripTrailingSlash(input.configBaseUrl?.trim() || "");
+  const configSocket = stripTrailingSlash(
+    input.configSocketServer?.trim() || ""
+  );
+  if (serverOpt && socketOpt) {
+    return {
+      baseUrl: assertHttpBase(serverOpt, "server"),
+      socketServer: normalizeSocketBase(socketOpt)
+    };
+  }
+  if (serverOpt) {
+    return splitHistoricalServer(serverOpt);
+  }
+  if (configBase && socketOpt) {
+    return {
+      baseUrl: assertHttpBase(configBase, "baseUrl"),
+      socketServer: normalizeSocketBase(socketOpt)
+    };
+  }
+  if (configBase && configSocket) {
+    return {
+      baseUrl: assertHttpBase(configBase, "baseUrl"),
+      socketServer: normalizeSocketBase(configSocket)
+    };
+  }
+  if (configBase) {
+    return splitHistoricalServer(configBase);
+  }
+  if (socketOpt) {
+    return {
+      baseUrl: assertHttpBase(DEFAULT_BASE_URL, "server"),
+      socketServer: normalizeSocketBase(socketOpt)
+    };
+  }
+  return splitHistoricalServer(DEFAULT_BASE_URL);
 }
 async function ensureApmConfig() {
   const existing = await tryReadApmConfig();
@@ -63,20 +143,25 @@ async function ensureApmConfig() {
 async function writeApmConfig(cfg) {
   const clientMachineId = resolveClientMachineId(cfg);
   const apiKey = resolveApiKey(cfg);
+  const socketServer = stripTrailingSlash(
+    cfg.socketServer?.trim() || cfg.wsUrl?.trim() || ""
+  );
   const normalized = {
     baseUrl: cfg.baseUrl.trim().replace(/\/+$/, ""),
     apiKey,
-    ...clientMachineId ? { clientMachineId } : {}
+    ...clientMachineId ? { clientMachineId } : {},
+    ...socketServer ? { socketServer } : {}
   };
   mkdirSync(APM_CONFIG_DIR, { recursive: true });
   writeFileSync(APM_CONFIG_PATH, JSON.stringify(normalized, null, 2) + "\n", {
     mode: 384
   });
 }
-function buildAgentWsUrl(httpBase, apiKey) {
-  const origin = httpBaseToWsOrigin(httpBase);
-  const q = new URLSearchParams({ apiKey });
-  return `${origin}/ws/agent?${q.toString()}`;
+function buildAgentWsUrl(socketServer, apiKey) {
+  const url = new URL(httpBaseToWsOrigin(socketServer));
+  url.pathname = "/ws/agent";
+  url.search = new URLSearchParams({ apiKey }).toString();
+  return url.toString();
 }
 
 // src/commands/sync-webide-agent.ts
@@ -224,18 +309,6 @@ var requestConfig = {
       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"
-    }),
     cursorStoreUpsertAgent: defineEndpoint({
       method: "PUT",
       path: "/cli/cursor-store/agents"
@@ -453,15 +526,20 @@ async function runInit() {
 // src/commands/login.ts
 import { ApiError } from "listpage-http";
 async function runLogin(opts) {
-  const baseUrl = (opts.server?.trim() || process.env.AI_PM_SERVER?.trim() || DEFAULT_BASE_URL).replace(/\/+$/, "");
+  const endpoints = resolveApmEndpoints({
+    server: opts.server,
+    socketServer: opts.socketServer
+  });
   const apiKey = (opts.apiKey?.trim() || process.env.APM_API_KEY?.trim() || "").replace(/^Bearer\s+/i, "");
   if (!apiKey.startsWith("cm_")) {
     console.error("[apm] \u8BF7\u63D0\u4F9B\u6709\u6548\u7684 API Key\uFF08cm_ \u5F00\u5934\uFF09");
-    console.error("[apm] \u7528\u6CD5: apm login --api-key cm_xxx [--server URL]");
+    console.error(
+      "[apm] \u7528\u6CD5: apm login --api-key cm_xxx [--server URL] [--socket-server URL]"
+    );
     process.exit(1);
   }
   const api = createApmApiClient({
-    baseUrl,
+    baseUrl: endpoints.baseUrl,
     clientMachineId: "",
     apiKey
   });
@@ -486,7 +564,8 @@ async function runLogin(opts) {
     process.exit(1);
   }
   const cfg = {
-    baseUrl,
+    baseUrl: endpoints.baseUrl,
+    socketServer: endpoints.socketServer,
     clientMachineId,
     apiKey
   };
@@ -497,7 +576,8 @@ async function runLogin(opts) {
       {
         clientMachineId: cfg.clientMachineId,
         clientName: data.clientName,
-        baseUrl: cfg.baseUrl
+        baseUrl: cfg.baseUrl,
+        socketServer: cfg.socketServer
       },
       null,
       2
@@ -712,6 +792,10 @@ function reexecConnectAfterUpdate(options) {
   if (server) {
     args.push("--server", server);
   }
+  const socketServer = options.socketServer?.trim();
+  if (socketServer) {
+    args.push("--socket-server", socketServer);
+  }
   const result = spawnSync(process.execPath, args, {
     stdio: "inherit",
     env: { ...process.env, [APM_SKIP_SELF_UPDATE_ENV]: "1" }
@@ -1108,9 +1192,6 @@ import { setTimeout as delay } from "node:timers/promises";
 function isWebIdeStartProjectTarget(value) {
   return value === "frontend" || value === "backend" || value === "mobile";
 }
-function isWebIdePackageTarget(value) {
-  return value === "frontend" || value === "backend";
-}
 function nonEmptyString(v) {
   return typeof v === "string" && v.trim().length > 0;
 }
@@ -1270,64 +1351,13 @@ function validateWebIdeStartProjectPush(o) {
     }
   };
 }
-function validateWebIdePackagePush(o) {
-  if (o.type !== "webide-package") {
-    return { ok: false, reason: "\u671F\u671B webide-package" };
-  }
-  if (!nonEmptyString(o.packageId)) {
-    return { ok: false, reason: "webide-package \u7F3A\u5C11 packageId" };
-  }
-  if (!nonEmptyString(o.messageId)) {
-    return { ok: false, reason: "webide-package \u7F3A\u5C11 messageId" };
-  }
-  if (!nonEmptyString(o.projectId)) {
-    return { ok: false, reason: "webide-package \u7F3A\u5C11 projectId" };
-  }
-  if (!isWebIdePackageTarget(o.target)) {
-    return { ok: false, reason: "webide-package \u7F3A\u5C11\u6709\u6548 target" };
-  }
-  if (!nonEmptyString(o.baseBranch)) {
-    return { ok: false, reason: "webide-package \u7F3A\u5C11 baseBranch" };
-  }
-  if (!nonEmptyString(o.content)) {
-    return { ok: false, reason: "webide-package \u7F3A\u5C11 content" };
-  }
-  if (!nonEmptyString(o.model)) {
-    return { ok: false, reason: "webide-package \u7F3A\u5C11 model" };
-  }
-  if (!nonEmptyString(o.apiKey)) {
-    return { ok: false, reason: "webide-package \u7F3A\u5C11 apiKey" };
-  }
-  if (!nonEmptyString(o.workdir)) {
-    return { ok: false, reason: "webide-package \u7F3A\u5C11 workdir" };
-  }
-  if (!nonEmptyString(o.user)) {
-    return { ok: false, reason: "webide-package \u7F3A\u5C11 user" };
-  }
-  return {
-    ok: true,
-    data: {
-      type: "webide-package",
-      packageId: o.packageId.trim(),
-      messageId: o.messageId.trim(),
-      projectId: o.projectId.trim(),
-      target: o.target,
-      baseBranch: o.baseBranch.trim().replace(/^origin\//, ""),
-      content: o.content,
-      model: o.model.trim(),
-      apiKey: o.apiKey.trim(),
-      workdir: o.workdir.trim(),
-      user: o.user.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 !== "webide-message" && type !== "cancel" && type !== "steer" && type !== "webide-start-project" && type !== "webide-stop-terminals" && type !== "webide-package") {
+  if (type !== "heartbeat" && type !== "webide-message" && type !== "cancel" && type !== "steer" && type !== "webide-start-project" && type !== "webide-stop-terminals") {
     return { ok: false, reason: `\u672A\u77E5 type: ${String(type)}` };
   }
   if (kind === "heartbeat" || type === "heartbeat") {
@@ -1345,9 +1375,6 @@ function validateAgentWsMessage(value, kind) {
   if (type === "webide-stop-terminals") {
     return validateWebIdeStopTerminals(o);
   }
-  if (type === "webide-package") {
-    return validateWebIdePackagePush(o);
-  }
   return validateWebIdeMessagePush(o);
 }
 
@@ -1485,14 +1512,6 @@ var ActionWorker = class {
   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,
@@ -1702,49 +1721,6 @@ function handleStopTerminalsAction(payload, ctx) {
   trackActionTask(ctx, task);
 }
 
-// src/commands/connect/actions/package.ts
-function handleWebIdePackageAction(payload, ctx) {
-  const perMessageController = new AbortController();
-  ctx.activeRuns.set(payload.messageId, perMessageController);
-  if (ctx.pendingCancels.has(payload.messageId)) {
-    ctx.activeRuns.delete(payload.messageId);
-    ctx.pendingCancels.delete(payload.messageId);
-    const cancelTask = (async () => {
-      try {
-        const api = createApmApiClient(ctx.cfg);
-        await api.cli.projectPackageUpdateStatus({
-          id: payload.packageId,
-          status: "CANCELLED",
-          error: "\u5DF2\u53D6\u6D88"
-        });
-      } catch (err) {
-        console.error(
-          `[apm] webide-package \u9884\u53D6\u6D88\u5199\u7EC8\u6001\u5931\u8D25 packageId=${payload.packageId}:`,
-          err instanceof Error ? err.message : err
-        );
-      }
-    })();
-    trackActionTask(ctx, cancelTask);
-    return;
-  }
-  const task = (async () => {
-    const handle = new ActionWorker(payload);
-    registerRunSteer(ctx, payload.messageId, handle);
-    const onAbort = () => handle.cancel(payload.messageId);
-    perMessageController.signal.addEventListener("abort", onAbort, {
-      once: true
-    });
-    try {
-      await handle.done;
-    } finally {
-      perMessageController.signal.removeEventListener("abort", onAbort);
-      unregisterRunSteer(ctx, payload.messageId);
-      ctx.activeRuns.delete(payload.messageId);
-    }
-  })();
-  trackActionTask(ctx, task);
-}
-
 // src/commands/connect/actions/index.ts
 function dispatchConnectAction(payload, ctx) {
   switch (payload.type) {
@@ -1765,9 +1741,6 @@ function dispatchConnectAction(payload, ctx) {
     case "webide-stop-terminals":
       handleStopTerminalsAction(payload, ctx);
       return;
-    case "webide-package":
-      handleWebIdePackageAction(payload, ctx);
-      return;
   }
 }
 
@@ -1945,27 +1918,20 @@ function connectOnce(url, ctx, connectionAbort, onConnected) {
     });
   });
 }
-function resolveConnectServerOption(options) {
-  const fromOption = options.server?.trim();
-  if (fromOption) {
-    return fromOption.replace(/\/+$/, "");
-  }
-  const fromEnv = process.env.AI_PM_SERVER?.trim();
-  if (fromEnv) {
-    return fromEnv.replace(/\/+$/, "");
-  }
-  return void 0;
-}
 async function runConnect(options) {
   const { didUpdate } = await runUpdate({ quietIfCurrent: true });
   if (didUpdate) {
     reexecConnectAfterUpdate(options);
   }
   const cfg = await ensureLoggedConfig();
-  const serverOverride = resolveConnectServerOption(options);
-  if (serverOverride) {
-    cfg.baseUrl = serverOverride;
-  }
+  const endpoints = resolveApmEndpoints({
+    server: options.server,
+    socketServer: options.socketServer,
+    configBaseUrl: cfg.baseUrl,
+    configSocketServer: cfg.socketServer
+  });
+  cfg.baseUrl = endpoints.baseUrl;
+  cfg.socketServer = endpoints.socketServer;
   const clientMachineId = resolveClientMachineId(cfg);
   if (!clientMachineId) {
     console.error("[apm] config \u7F3A\u5C11 clientMachineId\uFF0C\u8BF7\u91CD\u65B0 apm login");
@@ -2024,8 +1990,12 @@ async function runConnect(options) {
       lifecycleAbort.signal,
       currentConnectionAbort.signal
     ]);
-    const url = buildAgentWsUrl(cfg.baseUrl, resolveApiKey(cfg));
-    console.log(`[apm] \u8FDE\u63A5 ${cfg.baseUrl} \u2026`);
+    const url = buildAgentWsUrl(
+      cfg.socketServer ?? cfg.baseUrl,
+      resolveApiKey(cfg)
+    );
+    const visible = url.replace(/([?&]apiKey=)[^&]+/, "$1***");
+    console.log(`[apm] \u8FDE\u63A5 ${visible} \u2026`);
     try {
       await connectOnce(url, connectCtx, connectionSignal, () => {
         reconnectDelay = RECONNECT_MIN_MS;
@@ -2062,13 +2032,21 @@ function buildProgram() {
   const program = new Command();
   program.name("apm").description(
     `\u6BD4\u90BB\u661F\u56FE\u547D\u4EE4\u884C\uFF08WebIDE \u5DE5\u4F5C\u533A\u4E0E\u7814\u53D1\u81EA\u52A8\u5316\uFF09\u3002
-\u672A\u4F20 --server \u65F6\u4F18\u5148\u4F7F\u7528\u73AF\u5883\u53D8\u91CF AI_PM_SERVER\uFF0C\u5426\u5219\u9ED8\u8BA4 ${DEFAULT_BASE_URL}\u3002`
+\u5730\u5740\u53EF\u7528 --server / --socket-server\uFF0C\u6216\u73AF\u5883\u53D8\u91CF APM_SERVER / APM_SOCKET_SERVER\uFF1B\u672A\u8BBE\u7F6E\u65F6\u9ED8\u8BA4 ${DEFAULT_BASE_URL}\u3002`
   ).version(readCliVersion(), "-V, --version", "\u663E\u793A\u7248\u672C\u53F7").helpOption("-h, --help", "\u663E\u793A\u5E2E\u52A9").showHelpAfterError(true);
   program.command("login").description(
     "\u9A8C\u8BC1 API Key \u5E76\u5199\u5165 ~/.config/apm/config.json\uFF08GET /api/v1/cli/me\uFF09"
-  ).option("--api-key <key>", "\u8FDC\u7A0B\u4E3B\u673A API Key\uFF08cm_ \u5F00\u5934\uFF09").option("--server <url>", "API \u6839\u5730\u5740\uFF0C\u4F8B\u5982 http://127.0.0.1:3000").action(async (opts) => {
-    await runLogin(opts);
-  });
+  ).option("--api-key <key>", "\u8FDC\u7A0B\u4E3B\u673A API Key\uFF08cm_ \u5F00\u5934\uFF09").option(
+    "--server <url>",
+    "API \u6839\u5730\u5740\uFF1B\u82E5\u53EA\u4F20\u6B64\u9879\u4E14\u5E26\u7AEF\u53E3\uFF0C\u5219\u7AEF\u53E3\u89C6\u4E3A Socket \u7AEF\u53E3\uFF08API \u53BB\u6389\u7AEF\u53E3\uFF09"
+  ).option(
+    "--socket-server <url>",
+    "Agent WebSocket \u6839\u5730\u5740\uFF08\u53EF\u4E0E API \u4E0D\u540C\uFF09\uFF0C\u4F8B\u5982 wss://ws.example.com"
+  ).action(
+    async (opts) => {
+      await runLogin(opts);
+    }
+  );
   program.command("init").description("\u5728\u5F53\u524D\u5DE5\u4F5C\u76EE\u5F55\u6309 WebIDE \u5DE5\u4F5C\u533A\u521D\u59CB\u5316\uFF1A\u4ECE\u5E73\u53F0\u5199\u5165\u6307\u5357\u4E0E\u89C4\u5219").action(async () => {
     await runInit();
   });
@@ -2092,8 +2070,17 @@ function buildProgram() {
   });
   program.command("connect").description(
     "\u8FDE\u63A5\u524D\u68C0\u6D4B\u5E76\u66F4\u65B0\u5230\u5F53\u524D\u5927\u7248\u672C\u6700\u65B0 CLI\uFF0C\u518D\u8FDE\u63A5\u5E73\u53F0 WebSocket\uFF08/ws/agent\uFF09"
-  ).option("--server <url>", "API \u6839\u5730\u5740\uFF0C\u8986\u76D6 config \u4E2D\u7684 baseUrl").action(async (opts) => {
-    await runConnect({ server: opts.server });
+  ).option(
+    "--server <url>",
+    "API \u6839\u5730\u5740\uFF1B\u82E5\u53EA\u4F20\u6B64\u9879\u4E14\u5E26\u7AEF\u53E3\uFF0C\u5219\u7AEF\u53E3\u89C6\u4E3A Socket \u7AEF\u53E3\uFF08\u8986\u76D6 config / APM_SERVER\uFF09"
+  ).option(
+    "--socket-server <url>",
+    "Agent WebSocket \u6839\u5730\u5740\uFF08\u8986\u76D6 config / APM_SOCKET_SERVER\uFF09"
+  ).action(async (opts) => {
+    await runConnect({
+      server: opts.server,
+      socketServer: opts.socketServer
+    });
   });
   return program;
 }