ai-project-manage-cli 5.0.22 → 6.0.24

package/dist/index.js

@@ -13,8 +13,8 @@ var DEFAULT_BASE_URL = "http://127.0.0.1:3000";
 function resolveClientMachineId(cfg) {
   return (cfg.clientMachineId ?? cfg.userId ?? "").trim();
 }
-function resolveAccount(cfg) {
-  return (cfg.account ?? cfg.email ?? "").trim();
+function resolveApiKey(cfg) {
+  return (cfg.apiKey ?? cfg.token ?? "").trim();
 }
 async function readApmConfig() {
   try {
@@ -24,18 +24,17 @@ async function readApmConfig() {
       return null;
     }
     const rawCfg = v;
-    if (typeof rawCfg.baseUrl !== "string" || typeof rawCfg.token !== "string") {
+    if (typeof rawCfg.baseUrl !== "string") {
       return null;
     }
+    const apiKey = resolveApiKey(rawCfg);
+    if (!apiKey) return null;
     const cfg = v;
     const clientMachineId = resolveClientMachineId(cfg);
-    const account = resolveAccount(cfg);
     return {
       baseUrl: cfg.baseUrl.trim().replace(/\/+$/, ""),
-      token: cfg.token,
-      ...clientMachineId ? { clientMachineId } : {},
-      ...account ? { account } : {},
-      ...typeof cfg.email === "string" ? { email: cfg.email } : {}
+      apiKey,
+      ...clientMachineId ? { clientMachineId } : {}
     };
   } catch {
     return null;
@@ -45,9 +44,7 @@ function defaultApmConfig() {
   return {
     baseUrl: DEFAULT_BASE_URL,
     clientMachineId: "",
-    token: "",
-    account: "",
-    email: ""
+    apiKey: ""
   };
 }
 function httpBaseToWsOrigin(httpBase) {
@@ -65,21 +62,20 @@ async function ensureApmConfig() {
 }
 async function writeApmConfig(cfg) {
   const clientMachineId = resolveClientMachineId(cfg);
-  const account = resolveAccount(cfg);
+  const apiKey = resolveApiKey(cfg);
   const normalized = {
     baseUrl: cfg.baseUrl.trim().replace(/\/+$/, ""),
-    token: cfg.token,
-    ...clientMachineId ? { clientMachineId } : {},
-    ...account ? { account, email: account } : {}
+    apiKey,
+    ...clientMachineId ? { clientMachineId } : {}
   };
   mkdirSync(APM_CONFIG_DIR, { recursive: true });
   writeFileSync(APM_CONFIG_PATH, JSON.stringify(normalized, null, 2) + "\n", {
     mode: 384
   });
 }
-function buildAgentWsUrl(httpBase, token) {
+function buildAgentWsUrl(httpBase, apiKey) {
   const origin = httpBaseToWsOrigin(httpBase);
-  const q = new URLSearchParams({ token });
+  const q = new URLSearchParams({ apiKey });
   return `${origin}/ws/agent?${q.toString()}`;
 }
 
@@ -140,9 +136,9 @@ function resolveSessionDocumentPath(sessionId, documentName, apmRoot) {
 }
 async function ensureLoggedConfig() {
   const cfg = await ensureApmConfig();
-  if (!cfg.token) {
+  if (!resolveApiKey(cfg)) {
     console.error(
-      "[apm] \u672A\u68C0\u6D4B\u5230 token\uFF0C\u8BF7\u5148\u6267\u884C: apm login --email ... --password ..."
+      "[apm] \u672A\u68C0\u6D4B\u5230 API Key\uFF0C\u8BF7\u5148\u6267\u884C: apm login --api-key cm_xxx"
     );
     process.exit(1);
   }
@@ -207,14 +203,11 @@ import { createApiClient } from "listpage-http";
 // src/api/request-config.ts
 import { defineEndpoint } from "listpage-http";
 var requestConfig = {
-  auth: {
-    login: defineEndpoint({
-      method: "POST",
-      path: "/auth/login",
-      authRequired: false
-    })
-  },
   cli: {
+    me: defineEndpoint({
+      method: "GET",
+      path: "/cli/me"
+    }),
     sessionDetail: defineEndpoint({
       method: "GET",
       path: "/cli/sessions/detail"
@@ -269,7 +262,7 @@ function createApmApiClient(cfg) {
   const baseURL = `${cfg.baseUrl.trim().replace(/\/+$/, "")}/api/v1`;
   return createApiClient(requestConfig, {
     baseURL,
-    getToken: () => cfg.token || void 0,
+    getToken: () => resolveApiKey(cfg) || void 0,
     successCodes: [0],
     unauthorizedCodes: [401]
   });
@@ -278,22 +271,25 @@ function createApmApiClient(cfg) {
 // 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, "");
+  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]");
+    process.exit(1);
+  }
   const api = createApmApiClient({
     baseUrl,
     clientMachineId: "",
-    token: ""
+    apiKey
   });
   let data;
   try {
-    data = await api.auth.login({
-      account: opts.email,
-      password: opts.password
-    });
+    data = await api.cli.me({});
   } catch (raw) {
     if (raw instanceof ApiError) {
       const err = raw;
       console.error(
-        `[apm] \u767B\u5F55\u5931\u8D25 (${err.httpStatus ?? err.code}):`,
+        `[apm] API Key \u9A8C\u8BC1\u5931\u8D25 (${err.httpStatus ?? err.code}):`,
         err.message
       );
       process.exit(1);
@@ -301,26 +297,25 @@ async function runLogin(opts) {
     console.error("[apm] \u8BF7\u6C42\u5931\u8D25:", raw instanceof Error ? raw.message : raw);
     process.exit(1);
   }
-  const clientMachineId = data?.clientMachine?.id;
-  const token = data?.token;
-  if (!clientMachineId || !token) {
-    console.error(
-      "[apm] \u54CD\u5E94\u7F3A\u5C11 clientMachine.id / token\uFF08\u8BF7\u786E\u8BA4\u670D\u52A1\u7AEF\u4E3A /api/v1/auth/login\uFF09"
-    );
+  const clientMachineId = data?.clientMachineId;
+  if (!clientMachineId) {
+    console.error("[apm] \u54CD\u5E94\u7F3A\u5C11 clientMachineId");
     process.exit(1);
   }
   const cfg = {
     baseUrl,
     clientMachineId,
-    token,
-    account: opts.email,
-    email: opts.email
+    apiKey
   };
   await writeApmConfig(cfg);
   console.error(`[apm] \u5DF2\u4FDD\u5B58\u767B\u5F55\u4FE1\u606F: ${APM_CONFIG_PATH}`);
   console.log(
     JSON.stringify(
-      { clientMachineId: cfg.clientMachineId, baseUrl: cfg.baseUrl },
+      {
+        clientMachineId: cfg.clientMachineId,
+        clientName: data.clientName,
+        baseUrl: cfg.baseUrl
+      },
       null,
       2
     )
@@ -1224,7 +1219,8 @@ function createThrottledCursorMessageLogSync(cfg, ctx, onError) {
   let lastRunAt = 0;
   let timer;
   let latestSession;
-  const syncDirtyEvents = async (session) => {
+  let syncChain = Promise.resolve();
+  const syncDirtyEventsOnce = async (session) => {
     const events = session.getDirtyEvents();
     if (events.length === 0) {
       return;
@@ -1237,6 +1233,14 @@ function createThrottledCursorMessageLogSync(cfg, ctx, onError) {
       onError(err);
     }
   };
+  const drainDirtyEvents = async (session) => {
+    while (session.getDirtyEvents().length > 0) {
+      await syncDirtyEventsOnce(session);
+    }
+  };
+  const enqueueSync = (session) => {
+    syncChain = syncChain.then(() => drainDirtyEvents(session));
+  };
   return {
     schedule(session) {
       latestSession = session;
@@ -1247,7 +1251,7 @@ function createThrottledCursorMessageLogSync(cfg, ctx, onError) {
           clearTimeout(timer);
           timer = void 0;
         }
-        void syncDirtyEvents(session);
+        enqueueSync(session);
         return;
       }
       if (timer) {
@@ -1255,7 +1259,7 @@ function createThrottledCursorMessageLogSync(cfg, ctx, onError) {
       }
       timer = setTimeout(() => {
         timer = void 0;
-        void syncDirtyEvents(latestSession);
+        enqueueSync(latestSession);
       }, CURSOR_MESSAGE_LOG_SYNC_INTERVAL_MS - elapsed);
     },
     async flush(session) {
@@ -1264,7 +1268,8 @@ function createThrottledCursorMessageLogSync(cfg, ctx, onError) {
         clearTimeout(timer);
         timer = void 0;
       }
-      await syncDirtyEvents(session);
+      await syncChain;
+      await drainDirtyEvents(session);
     }
   };
 }
@@ -1438,7 +1443,7 @@ async function runConnect(options) {
     console.error("[apm] config \u7F3A\u5C11 clientMachineId\uFF0C\u8BF7\u91CD\u65B0 apm login");
     process.exit(1);
   }
-  const url = buildAgentWsUrl(cfg.baseUrl, cfg.token);
+  const url = buildAgentWsUrl(cfg.baseUrl, resolveApiKey(cfg));
   console.log(`[apm] \u8FDE\u63A5 ${cfg.baseUrl} \u2026`);
   await new Promise((resolve5, reject) => {
     const ws = new WebSocket(url);
@@ -2453,12 +2458,10 @@ function buildProgram() {
 \u672A\u4F20 --server \u65F6\u4F18\u5148\u4F7F\u7528\u73AF\u5883\u53D8\u91CF AI_PM_SERVER\uFF0C\u5426\u5219\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(
-    "\u8C03\u7528 POST /api/v1/auth/login\uFF0C\u5C06 token \u5199\u5165 ~/.config/apm/config.json"
-  ).requiredOption("--email <\u90AE\u7BB1>", "\u767B\u5F55\u90AE\u7BB1").requiredOption("--password <\u5BC6\u7801>", "\u767B\u5F55\u5BC6\u7801").option("--server <url>", "API \u6839\u5730\u5740\uFF0C\u4F8B\u5982 http://127.0.0.1:3000").action(
-    async (opts) => {
-      await runLogin(opts);
-    }
-  );
+    "\u9A8C\u8BC1 API Key \u5E76\u5199\u5165 ~/.config/apm/config.json\uFF08GET /api/v1/cli/me\uFF09"
+  ).option("--api-key <key>", "\u5BA2\u6237\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);
+  });
   program.command("init").description("\u5728\u5F53\u524D\u5DE5\u4F5C\u76EE\u5F55\u521D\u59CB\u5316 .apm \u6A21\u677F\uFF08\u82E5 .apm \u5DF2\u5B58\u5728\u4E14\u975E\u7A7A\u5219\u62A5\u9519\uFF09").option("--name <name>", "\u5DE5\u4F5C\u76EE\u5F55\u540D\u79F0").action(async (opts) => {
     await runInit(opts.name);
   });

package/package.json

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