ai-project-manage-cli 5.0.14 → 5.0.15

package/dist/index.js

@@ -10,6 +10,12 @@ 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 resolveAccount(cfg) {
+  return (cfg.account ?? cfg.email ?? "").trim();
+}
 async function readApmConfig() {
   try {
     const raw = readFileSync(APM_CONFIG_PATH, "utf8");
@@ -18,14 +24,17 @@ async function readApmConfig() {
       return null;
     }
     const rawCfg = v;
-    if (typeof rawCfg.baseUrl !== "string" || typeof rawCfg.userId !== "string" || typeof rawCfg.token !== "string") {
+    if (typeof rawCfg.baseUrl !== "string" || typeof rawCfg.token !== "string") {
       return null;
     }
     const cfg = v;
+    const clientMachineId = resolveClientMachineId(cfg);
+    const account = resolveAccount(cfg);
     return {
       baseUrl: cfg.baseUrl.trim().replace(/\/+$/, ""),
-      userId: cfg.userId,
       token: cfg.token,
+      ...clientMachineId ? { clientMachineId } : {},
+      ...account ? { account } : {},
       ...typeof cfg.email === "string" ? { email: cfg.email } : {}
     };
   } catch {
@@ -35,8 +44,9 @@ async function readApmConfig() {
 function defaultApmConfig() {
   return {
     baseUrl: DEFAULT_BASE_URL,
-    userId: "",
+    clientMachineId: "",
     token: "",
+    account: "",
     email: ""
   };
 }
@@ -54,11 +64,13 @@ async function ensureApmConfig() {
   return defaults;
 }
 async function writeApmConfig(cfg) {
+  const clientMachineId = resolveClientMachineId(cfg);
+  const account = resolveAccount(cfg);
   const normalized = {
     baseUrl: cfg.baseUrl.trim().replace(/\/+$/, ""),
-    userId: cfg.userId,
     token: cfg.token,
-    ...typeof cfg.email === "string" ? { email: cfg.email } : {}
+    ...clientMachineId ? { clientMachineId } : {},
+    ...account ? { account, email: account } : {}
   };
   mkdirSync(APM_CONFIG_DIR, { recursive: true });
   writeFileSync(APM_CONFIG_PATH, JSON.stringify(normalized, null, 2) + "\n", {
@@ -256,13 +268,13 @@ async function runLogin(opts) {
   const baseUrl = (opts.server?.trim() || process.env.AI_PM_SERVER?.trim() || DEFAULT_BASE_URL).replace(/\/+$/, "");
   const api = createApmApiClient({
     baseUrl,
-    userId: "",
+    clientMachineId: "",
     token: ""
   });
   let data;
   try {
     data = await api.auth.login({
-      email: opts.email,
+      account: opts.email,
       password: opts.password
     });
   } catch (raw) {
@@ -277,24 +289,29 @@ async function runLogin(opts) {
     console.error("[apm] \u8BF7\u6C42\u5931\u8D25:", raw instanceof Error ? raw.message : raw);
     process.exit(1);
   }
-  const userId = data?.user?.id;
+  const clientMachineId = data?.clientMachine?.id;
   const token = data?.token;
-  if (!userId || !token) {
+  if (!clientMachineId || !token) {
     console.error(
-      "[apm] \u54CD\u5E94\u7F3A\u5C11 user.id / token\uFF08\u8BF7\u786E\u8BA4\u670D\u52A1\u7AEF\u4E3A /api/v1/auth/login\uFF09"
+      "[apm] \u54CD\u5E94\u7F3A\u5C11 clientMachine.id / token\uFF08\u8BF7\u786E\u8BA4\u670D\u52A1\u7AEF\u4E3A /api/v1/auth/login\uFF09"
     );
     process.exit(1);
   }
   const cfg = {
     baseUrl,
-    userId,
+    clientMachineId,
     token,
+    account: opts.email,
     email: opts.email
   };
   await writeApmConfig(cfg);
   console.error(`[apm] \u5DF2\u4FDD\u5B58\u767B\u5F55\u4FE1\u606F: ${APM_CONFIG_PATH}`);
   console.log(
-    JSON.stringify({ userId: cfg.userId, baseUrl: cfg.baseUrl }, null, 2)
+    JSON.stringify(
+      { clientMachineId: cfg.clientMachineId, baseUrl: cfg.baseUrl },
+      null,
+      2
+    )
   );
 }
 
@@ -489,7 +506,7 @@ function formatSessionMessagesXml(sessionId, messages) {
     lines.push(
       `  <message id="${escapeXmlAttr(message.id)}" name="${escapeXmlAttr(
         message.name
-      )}" position="${escapeXmlAttr(message.position)}"${roundAttr}>`,
+      )}" expert="${escapeXmlAttr(message.expert)}"${roundAttr}>`,
       `    <content>${wrapCdata(message.content)}</content>`,
       "  </message>"
     );
@@ -613,7 +630,7 @@ async function runPull(sessionId, apmRoot) {
       description: "./RULE.md",
       members: members.map((m) => ({
         name: m.displayName,
-        position: m.position,
+        expert: m.expert,
         system_persona: m.systemPersona,
         skills: []
       })),
@@ -1102,6 +1119,7 @@ async function handleInboundMessage(cfg, raw) {
   try {
     await runBranch(msg.sessionId, { cwd: msg.workdir });
     await runPull(msg.sessionId, workspaceApmDir(msg.workdir));
+    await commitWorkingTreeIfDirty(msg.workdir, "fix: apm pull");
     await updateMessageStatus(cfg, messageId, "TYPING");
     await runCursorAgent(cfg, {
       messageId: msg.messageId,
@@ -1134,13 +1152,13 @@ async function handleInboundMessage(cfg, raw) {
     }
   }
 }
-function startHeartbeat(ws, userId) {
+function startHeartbeat(ws, clientMachineId) {
   const send = () => {
     if (ws.readyState === WebSocket.OPEN) {
       ws.send(
         serializeAgentWsMessage({
           type: "heartbeat",
-          userId
+          userId: clientMachineId
         })
       );
     }
@@ -1154,8 +1172,9 @@ async function runConnect(options) {
   if (options.server?.trim()) {
     cfg.baseUrl = options.server.trim().replace(/\/+$/, "");
   }
-  if (!cfg.userId?.trim()) {
-    console.error("[apm] config \u7F3A\u5C11 userId\uFF0C\u8BF7\u91CD\u65B0 apm login");
+  const clientMachineId = resolveClientMachineId(cfg);
+  if (!clientMachineId) {
+    console.error("[apm] config \u7F3A\u5C11 clientMachineId\uFF0C\u8BF7\u91CD\u65B0 apm login");
     process.exit(1);
   }
   const url = buildAgentWsUrl(cfg.baseUrl, cfg.token);
@@ -1178,7 +1197,7 @@ async function runConnect(options) {
     };
     ws.on("open", () => {
       console.log("[apm] WebSocket \u5DF2\u8FDE\u63A5");
-      stopHeartbeat = startHeartbeat(ws, cfg.userId);
+      stopHeartbeat = startHeartbeat(ws, clientMachineId);
     });
     ws.on("message", (data) => {
       const text = Buffer.isBuffer(data) ? data.toString("utf8") : String(data);
@@ -1862,40 +1881,6 @@ function registerDeployBackendCommands(program) {
 import { copyFile, readdir as readdir2, stat } from "node:fs/promises";
 import path7 from "node:path";
 
-// src/commands/deploy/internal/load-apm-dotenv.ts
-import { existsSync as existsSync10, readFileSync as readFileSync9 } from "node:fs";
-import { join as join9 } from "node:path";
-function loadApmDotEnvIfPresent() {
-  const p = join9(workspaceApmDir(), ".env");
-  if (!existsSync10(p)) {
-    return;
-  }
-  let text;
-  try {
-    text = readFileSync9(p, "utf8");
-  } catch {
-    return;
-  }
-  for (const line of text.split("\n")) {
-    const t = line.trim();
-    if (!t || t.startsWith("#")) {
-      continue;
-    }
-    const eq = t.indexOf("=");
-    if (eq <= 0) {
-      continue;
-    }
-    const key = t.slice(0, eq).trim();
-    let val = t.slice(eq + 1).trim();
-    if (val.startsWith('"') && val.endsWith('"') || val.startsWith("'") && val.endsWith("'")) {
-      val = val.slice(1, -1);
-    }
-    if (process.env[key] === void 0) {
-      process.env[key] = val;
-    }
-  }
-}
-
 // src/commands/deploy/internal/minio.ts
 import { statSync as statSync5 } from "node:fs";
 import { readdir, readFile } from "node:fs/promises";
@@ -2059,31 +2044,6 @@ function artifactObjectKey(namePrefix, branchSegment, relativePath) {
   const rel = sanitizeRelativePath(relativePath);
   return `${base}/${branchSegment}/dist/${rel}`;
 }
-function mergeMinioFromEnv(settings) {
-  const ep = process.env.MINIO_ENDPOINT?.trim();
-  const portRaw = process.env.MINIO_PORT?.trim();
-  const sslRaw = process.env.MINIO_USE_SSL?.trim().toLowerCase();
-  const ak = process.env.MINIO_ACCESS_KEY?.trim();
-  const sk = process.env.MINIO_SECRET_KEY?.trim();
-  const bucket = process.env.MINIO_BUCKET?.trim();
-  const port = portRaw ? Number.parseInt(portRaw, 10) : void 0;
-  let useSsl = settings.useSsl;
-  if (sslRaw === "true" || sslRaw === "1") {
-    useSsl = true;
-  }
-  if (sslRaw === "false" || sslRaw === "0") {
-    useSsl = false;
-  }
-  return {
-    ...settings,
-    endpoint: ep || settings.endpoint,
-    port: port !== void 0 && Number.isFinite(port) && port > 0 ? port : settings.port,
-    useSsl,
-    accessKey: ak || settings.accessKey,
-    secretKey: sk || settings.secretKey,
-    bucket: bucket || settings.bucket
-  };
-}
 async function ensureArtifactRootIndexHtml(root) {
   const indexHtmlPath = path7.join(root, "index.html");
   try {
@@ -2124,7 +2084,7 @@ async function ensureArtifactRootIndexHtml(root) {
 }
 function registerDeployFrontendCommands(program) {
   program.command("deploy-frontend").description(
-    "\u9012\u5F52\u4E0A\u4F20\u524D\u7AEF\u4EA7\u7269\u76EE\u5F55\u5230 MinIO\uFF0C\u5E76\u5728\u6210\u529F\u540E\u4E3A\u8BE5\u6876\u8BBE\u7F6E\u533F\u540D\u53EF\u8BFB\u7B56\u7565\uFF08\u53EF\u5148\u914D\u7F6E .apm/.env \u7684 MINIO_*\uFF0C\u5DF2\u6709\u73AF\u5883\u53D8\u91CF\u4F18\u5148\uFF09"
+    "\u9012\u5F52\u4E0A\u4F20\u524D\u7AEF\u4EA7\u7269\u76EE\u5F55\u5230 MinIO\uFF0C\u5E76\u5728\u6210\u529F\u540E\u4E3A\u8BE5\u6876\u8BBE\u7F6E\u533F\u540D\u53EF\u8BFB\u7B56\u7565\uFF08MinIO \u8FDE\u63A5\u4FE1\u606F\u4EC5\u6765\u81EA apm.config.json frontendDeploy\uFF09"
   ).argument("[name]", "\u73AF\u5883\u540D", "online").option(
     "--dir <path>",
     "\u4EA7\u7269\u76EE\u5F55\uFF1B\u5355\u4ED3\u9ED8\u8BA4 apps/web/dist\uFF08\u9700\u5148 rush build / vite build\uFF09",
@@ -2138,12 +2098,9 @@ function registerDeployFrontendCommands(program) {
     (v) => Number.parseInt(String(v), 10)
   ).action(
     async (name, opts) => {
-      loadApmDotEnvIfPresent();
       const cfg = loadApmConfig({ configPath: opts.config });
       const namePrefix = resolveArtifactNamePrefix(cfg);
-      const settings = mergeMinioFromEnv(
-        resolveFrontendDeployFromApmConfig(cfg)
-      );
+      const settings = resolveFrontendDeployFromApmConfig(cfg);
       const minio = new MinioClient({
         endPoint: settings.endpoint,
         port: settings.port,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-project-manage-cli",
-  "version": "5.0.14",
+  "version": "5.0.15",
   "description": "命令行工具：后续用于调用平台后端 API 完成运维与自动化操作",
   "type": "module",
   "private": false,
@@ -37,4 +37,4 @@
     "minio": "~8.0.7",
     "dockerode": "~5.0.0"
   }
-}
+}

package/template/AGENTS.md

@@ -18,7 +18,7 @@
 2. 根据你的名字从 session.yaml 中找到你对应的人设(system_persona)
 3. 根据人设完成用户指定的任务
 4. 任务有阶段行进展或者任务完成后必须使用 `apm append-message` 回复消息，回复要求简洁不用对本轮工作进行总结
-5. 工作日志放到 `.apm/sessions/<会话ID>/docs/<position>.md` 中，并执行`apm sync-document <会话ID> --file=<position>`同步到远程
+5. 工作日志放到 `.apm/sessions/<会话ID>/docs/<expert>.md` 中，并执行`apm sync-document <会话ID> --file=<expert>`同步到远程
 
 ## 目录声明