ai-project-manage-cli 4.0.18 → 4.0.20

package/dist/index.js

@@ -374,7 +374,7 @@ async function runComment(requirementId, file, options) {
 }
 
 // src/commands/connect.ts
-import { randomUUID } from "crypto";
+import { randomUUID as randomUUID2 } from "crypto";
 import WebSocket from "ws";
 import { Agent } from "@cursor/sdk";
 import { join as join6 } from "path";
@@ -745,8 +745,7 @@ async function runPull(requirementId, workspaceDir) {
     {
       id: req2.id,
       status: req2.status,
-      title: req2.title,
-      env: req2.envName || ""
+      title: req2.title
     },
     { lineWidth: 0 }
   );
@@ -781,11 +780,149 @@ async function runPull(requirementId, workspaceDir) {
   return WORKITEMS_DIR;
 }
 
+// src/theater-job-report.ts
+import { randomUUID } from "crypto";
+function extractErrorMessage(err) {
+  if (err instanceof Error && err.message.trim()) {
+    return err.message.trim();
+  }
+  if (typeof err === "string" && err.trim()) {
+    return err.trim();
+  }
+  if (typeof err === "object" && err && "message" in err) {
+    const msg = err.message;
+    if (typeof msg === "string" && msg.trim()) return msg.trim();
+    if (Array.isArray(msg)) return msg.map(String).join("\uFF1B");
+  }
+  return "\u672A\u77E5\u9519\u8BEF";
+}
+function isUnauthorizedMessage(msg) {
+  return msg.includes("\u672A\u767B\u5F55") || /401/.test(msg);
+}
+function sendTheaterReportWs(ws, payload) {
+  return new Promise((resolve5, reject) => {
+    const msg_id = randomUUID();
+    const timer = setTimeout(() => {
+      ws.off("message", onMessage);
+      reject(new Error("WebSocket \u4E0A\u62A5\u8D85\u65F6"));
+    }, 3e4);
+    const onMessage = (data) => {
+      const text = typeof data === "string" ? data : data.toString();
+      let frame;
+      try {
+        frame = JSON.parse(text);
+      } catch {
+        return;
+      }
+      if (frame.msg_id !== msg_id) return;
+      clearTimeout(timer);
+      ws.off("message", onMessage);
+      if (frame.type === "ERROR") {
+        reject(
+          new Error(frame.payload?.message?.trim() || "WebSocket \u4E0A\u62A5\u5931\u8D25")
+        );
+        return;
+      }
+      if (frame.type === "ACK") {
+        resolve5();
+        return;
+      }
+    };
+    ws.on("message", onMessage);
+    ws.send(
+      JSON.stringify({
+        type: "THEATER_REPORT",
+        msg_id,
+        ts: (/* @__PURE__ */ new Date()).toISOString(),
+        payload
+      })
+    );
+  });
+}
+async function reportTheaterProgress(api, ws, params) {
+  const body = {
+    sessionId: params.sessionId,
+    memberKey: params.memberKey,
+    status: "IN_PROGRESS",
+    logId: params.logId
+  };
+  try {
+    await api.theater.reportMemberAgentProgress(body);
+  } catch (err) {
+    const msg = extractErrorMessage(err);
+    if (!isUnauthorizedMessage(msg)) throw err;
+    await sendTheaterReportWs(ws, { action: "progress", ...body });
+  }
+}
+async function submitTheaterResult(api, ws, params) {
+  const body = {
+    sessionId: params.sessionId,
+    memberKey: params.memberKey,
+    content: params.content,
+    agentId: params.agentId ?? "",
+    agentStatus: params.agentStatus,
+    logId: params.logId
+  };
+  try {
+    await api.theater.submitMemberResponse(body);
+  } catch (err) {
+    const msg = extractErrorMessage(err);
+    if (!isUnauthorizedMessage(msg)) throw err;
+    await sendTheaterReportWs(ws, {
+      action: "submit",
+      sessionId: params.sessionId,
+      memberKey: params.memberKey,
+      content: params.content,
+      agentId: params.agentId,
+      agentStatus: params.agentStatus,
+      logId: params.logId
+    });
+  }
+}
+async function submitTheaterFailure(api, ws, params) {
+  const content = `[${params.stage}] ${params.error}`;
+  try {
+    await submitTheaterResult(api, ws, {
+      sessionId: params.sessionId,
+      memberKey: params.memberKey,
+      content,
+      agentId: params.agentId,
+      agentStatus: "FAILED",
+      logId: params.logId
+    });
+    return true;
+  } catch (submitErr) {
+    console.error(
+      "[apm] \u65E0\u6CD5\u5C06\u5931\u8D25\u72B6\u6001\u5199\u5165\u5267\u573A\u4F1A\u8BDD:",
+      extractErrorMessage(submitErr)
+    );
+    return false;
+  }
+}
+function logTheaterJobError(stage, err, meta) {
+  const msg = extractErrorMessage(err);
+  const ctx = [
+    meta?.sessionId ? `session=${meta.sessionId}` : "",
+    meta?.memberKey ? `member=${meta.memberKey}` : ""
+  ].filter(Boolean).join(" ");
+  console.error(
+    `[apm] \u5267\u573A THEATER_JOB \u5931\u8D25 \xB7 \u9636\u6BB5=${stage}${ctx ? ` \xB7 ${ctx}` : ""} \xB7 ${msg}`
+  );
+  if (isUnauthorizedMessage(msg)) {
+    console.error("[apm] \u63D0\u793A: \u8BF7\u6267\u884C apm login \u91CD\u65B0\u767B\u5F55\u540E\u518D\u8BD5");
+  }
+}
+
 // src/commands/connect.ts
+var DEFAULT_AGENT_MODEL_ID = "default";
+function resolveAgentModelId(model) {
+  const id = model?.trim();
+  return id || DEFAULT_AGENT_MODEL_ID;
+}
 async function createAgentForJob(payload) {
   const options = {
     apiKey: payload.apiKey,
-    model: { id: payload.model ?? "default" },
+    model: { id: resolveAgentModelId(payload.model) },
     local: { cwd: payload.cwd }
   };
   if (payload.agentId) {
@@ -839,9 +976,10 @@ async function runAgentStream(payload, session, agent) {
   }
   return { agentId: run.agentId, failed, failReason };
 }
-async function handleTheaterJob(api, payload) {
+async function handleTheaterJob(api, ws, payload) {
   const sessionId = payload.theaterSessionId.trim();
   const memberKey = payload.memberKey.trim();
+  const logId = payload.logId?.trim() || void 0;
   if (!sessionId) {
     throw new Error("THEATER_JOB \u7F3A\u5C11 theaterSessionId");
   }
@@ -849,36 +987,53 @@ async function handleTheaterJob(api, payload) {
     throw new Error("THEATER_JOB \u7F3A\u5C11 memberKey");
   }
   console.log("[apm] \u5267\u573A\u4F1A\u8BDD:", sessionId, "\u6210\u5458:", memberKey);
-  await api.theater.reportMemberAgentProgress({
-    sessionId,
-    memberKey,
-    status: "IN_PROGRESS",
-    logId: payload.logId?.trim() || void 0
-  });
-  const eventSession = new EventSession(payload.prompt);
-  const agent = await createAgentForJob(payload);
-  const { agentId, failed, failReason } = await runAgentStream(
-    payload,
-    eventSession,
-    agent
-  );
-  const assistantText = eventSession.getAssistantText();
-  const content = failed ? failReason || assistantText || "\u672A\u77E5\u9519\u8BEF" : assistantText || "[Agent \u672A\u4EA7\u751F\u6587\u672C\u8F93\u51FA]";
-  const result = await api.theater.submitMemberResponse({
-    sessionId,
-    memberKey,
-    content,
-    agentId,
-    agentStatus: failed ? "FAILED" : "SUCCESS",
-    logId: payload.logId?.trim() || void 0
-  });
-  console.log(
-    "[apm] \u5267\u573A\u6210\u5458\u56DE\u590D\u5DF2\u63D0\u4EA4",
-    failed ? "(\u542B\u5931\u8D25\u8BF4\u660E)" : "",
-    result.clearedPending ? "\xB7 \u5DF2\u6E05\u9664\u5F85\u56DE\u590D" : ""
-  );
-  if (result.canAdvance) {
-    console.log("[apm] \u53EF\u624B\u52A8\u63A8\u8FDB\u4E3B\u6301\u8F6E\u6B21\uFF08autoPlay \u5173\u95ED\uFF09");
+  let agentId = payload.agentId?.trim() || void 0;
+  try {
+    await reportTheaterProgress(api, ws, { sessionId, memberKey, logId });
+  } catch (err) {
+    logTheaterJobError("\u4E0A\u62A5\u6267\u884C\u8FDB\u5EA6", err, { sessionId, memberKey });
+    await submitTheaterFailure(api, ws, {
+      sessionId,
+      memberKey,
+      logId,
+      agentId,
+      stage: "\u4E0A\u62A5\u8FDB\u5EA6",
+      error: extractErrorMessage(err)
+    });
+    return;
+  }
+  try {
+    const eventSession = new EventSession(payload.prompt);
+    const agent = await createAgentForJob(payload);
+    const runResult = await runAgentStream(payload, eventSession, agent);
+    agentId = runResult.agentId;
+    const assistantText = eventSession.getAssistantText();
+    const content = runResult.failed ? runResult.failReason || assistantText || "\u672A\u77E5\u9519\u8BEF" : assistantText || "[Agent \u672A\u4EA7\u751F\u6587\u672C\u8F93\u51FA]";
+    await submitTheaterResult(api, ws, {
+      sessionId,
+      memberKey,
+      content,
+      agentId,
+      agentStatus: runResult.failed ? "FAILED" : "SUCCESS",
+      logId
+    });
+    console.log(
+      "[apm] \u5267\u573A\u6210\u5458\u56DE\u590D\u5DF2\u63D0\u4EA4",
+      runResult.failed ? "(\u6267\u884C\u5931\u8D25)" : ""
+    );
+  } catch (err) {
+    logTheaterJobError("\u6267\u884C\u6216\u63D0\u4EA4\u56DE\u590D", err, { sessionId, memberKey });
+    const reported = await submitTheaterFailure(api, ws, {
+      sessionId,
+      memberKey,
+      logId,
+      agentId,
+      stage: "\u6267\u884C\u4EFB\u52A1",
+      error: extractErrorMessage(err)
+    });
+    if (reported) {
+      console.error("[apm] \u5DF2\u5C06\u5931\u8D25\u539F\u56E0\u5199\u5165\u5267\u573A\u4F1A\u8BDD\uFF0C\u53EF\u5728\u7F51\u9875\u67E5\u770B");
+    }
   }
 }
 async function handleWorkflowJob(api, payload) {
@@ -958,7 +1113,7 @@ function runConnect(opts) {
       const sendHeartbeat = () => {
         const frame = {
           type: "HEARTBEAT",
-          msg_id: randomUUID(),
+          msg_id: randomUUID2(),
           ts: (/* @__PURE__ */ new Date()).toISOString(),
           payload: {}
         };
@@ -970,22 +1125,31 @@ function runConnect(opts) {
     });
     ws.on("message", async (data) => {
       const text = typeof data === "string" ? data : data.toString();
+      let msg;
       try {
-        const msg = JSON.parse(text);
-        if (msg.type === "THEATER_JOB") {
-          await handleTheaterJob(api, msg.payload);
-          return;
-        }
-        if (msg.type === "JOB") {
-          await handleWorkflowJob(api, msg.payload);
-          return;
-        }
+        msg = JSON.parse(text);
       } catch (err) {
         console.error(
           "[apm] \u65E0\u6CD5\u89E3\u6790 WebSocket \u6D88\u606F:",
           text,
           err.message
         );
+        return;
+      }
+      try {
+        const jobType = msg.type;
+        if (jobType === "THEATER_JOB") {
+          await handleTheaterJob(api, ws, msg.payload);
+          return;
+        }
+        if (jobType === "JOB") {
+          await handleWorkflowJob(api, msg.payload);
+          return;
+        }
+      } catch (err) {
+        const jobType = msg.type;
+        const label = jobType === "THEATER_JOB" ? "\u5267\u573A THEATER_JOB" : jobType === "JOB" ? "\u5DE5\u4F5C\u6D41 JOB" : String(jobType);
+        console.error(`[apm] ${label} \u5904\u7406\u5931\u8D25:`, extractErrorMessage(err));
       }
     });
     ws.on("error", (err) => {
@@ -2044,7 +2208,7 @@ function loadApmDotEnvIfPresent() {
 
 // src/commands/deploy/internal/minio.ts
 import { statSync as statSync5 } from "node:fs";
-import { readdir } from "node:fs/promises";
+import { readdir, readFile } from "node:fs/promises";
 import path6 from "node:path";
 import * as Minio from "minio";
 var DEFAULT_MAX_FILE_SIZE_MB = 50;
@@ -2094,7 +2258,6 @@ async function collectFiles(root) {
   return out;
 }
 async function readArtifactFile(absPath) {
-  const { readFile } = await import("node:fs/promises");
   return readFile(absPath);
 }
 function toMB(bytes) {

package/package.json

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