ai-project-manage-cli 6.0.35 → 6.0.37

package/dist/index.js

@@ -164,20 +164,51 @@ async function ensureWorkspaceApmDirForInit() {
   }
 }
 async function copyTemplateFiles(targetDir) {
+  if (!existsSync(CLI_TEMPLATE_DIR)) {
+    throw new Error(`[apm] \u672A\u627E\u5230 CLI \u6A21\u677F\u76EE\u5F55: ${CLI_TEMPLATE_DIR}`);
+  }
+  const dirStat = statSync(CLI_TEMPLATE_DIR);
+  if (!dirStat.isDirectory()) {
+    throw new Error(`[apm] CLI \u6A21\u677F\u8DEF\u5F84\u4E0D\u662F\u76EE\u5F55: ${CLI_TEMPLATE_DIR}`);
+  }
+  const entries = readdirSync(CLI_TEMPLATE_DIR);
+  if (entries.length === 0) {
+    throw new Error(`[apm] CLI \u6A21\u677F\u76EE\u5F55\u4E3A\u7A7A: ${CLI_TEMPLATE_DIR}`);
+  }
+  for (const name of entries) {
+    const src = join2(CLI_TEMPLATE_DIR, name);
+    const dest = join2(targetDir, name);
+    cpSync(src, dest, { recursive: true, force: false });
+  }
+}
+
+// src/workdir-path.ts
+import { realpathSync } from "fs";
+import { resolve as resolve2 } from "path";
+function normalizeWorkdirPath(path10) {
+  let normalized = path10.trim().replace(/\\/g, "/").normalize("NFC");
+  if (normalized.startsWith("//?/")) {
+    normalized = normalized.slice(4);
+  }
+  const windowsDrive = /^([A-Za-z]:)\/*(.*)$/.exec(normalized);
+  if (windowsDrive) {
+    const drive = windowsDrive[1].toLowerCase();
+    const rest = windowsDrive[2].replace(/\/+/g, "/").replace(/\/$/, "");
+    return rest ? `${drive}/${rest}` : drive;
+  }
+  normalized = normalized.replace(/\/+/g, "/");
+  if (normalized.length > 1 && normalized.endsWith("/")) {
+    normalized = normalized.slice(0, -1);
+  }
+  return normalized;
+}
+function resolveWorkdirPath(cwd = process.cwd()) {
+  const absolute = resolve2(cwd);
   try {
-    const dirStat = statSync(CLI_TEMPLATE_DIR);
-    if (!dirStat.isDirectory()) return;
+    return normalizeWorkdirPath(realpathSync.native(absolute));
   } catch {
-    return;
+    return normalizeWorkdirPath(absolute);
   }
-  const entries = readdirSync(CLI_TEMPLATE_DIR);
-  await Promise.all(
-    entries.map(async (name) => {
-      const src = join2(CLI_TEMPLATE_DIR, name);
-      const dest = join2(targetDir, name);
-      cpSync(src, dest, { recursive: true, force: false });
-    })
-  );
 }
 
 // src/commands/init.ts
@@ -185,13 +216,23 @@ async function runInit(name) {
   await ensureWorkspaceApmDirForInit();
   const apmDir = workspaceApmDir();
   await copyTemplateFiles(apmDir);
-  if (name) {
+  const trimmedName = name?.trim();
+  if (trimmedName) {
     const apmConfigPath = join3(apmDir, "apm.config.json");
     const config = readFileSync2(apmConfigPath, "utf8");
     const configJson = JSON.parse(config);
-    configJson.name = name;
-    writeFileSync2(apmConfigPath, JSON.stringify(configJson, null, 2), "utf8");
+    configJson.name = trimmedName;
+    writeFileSync2(
+      apmConfigPath,
+      `${JSON.stringify(configJson, null, 2)}
+`,
+      "utf8"
+    );
   }
+  const workdir = resolveWorkdirPath();
+  console.log(`[apm] \u5DF2\u521D\u59CB\u5316\u5DE5\u4F5C\u533A\uFF1A${apmDir}`);
+  console.log(`[apm] \u5DE5\u4F5C\u76EE\u5F55\u8DEF\u5F84\uFF1A${workdir}`);
+  console.log("[apm] \u8BF7\u5728\u5E73\u53F0\u300C\u5BA2\u6237\u673A\u7BA1\u7406 \u2192 \u5DE5\u4F5C\u7A7A\u95F4\u300D\u767B\u8BB0\u4E0A\u8FF0\u76EE\u5F55\u8DEF\u5F84");
 }
 
 // src/commands/login.ts
@@ -328,7 +369,6 @@ async function runLogin(opts) {
 
 // src/commands/branch.ts
 import { execFile } from "child_process";
-import { resolve as resolve2 } from "path";
 import { promisify } from "util";
 var execFileAsync = promisify(execFile);
 function branchNameForSession(sessionId) {
@@ -476,7 +516,7 @@ async function runBranch(sessionId, options = {}) {
   const cfg = await ensureLoggedConfig();
   const api = createApmApiClient(cfg);
   const cwd = options.cwd ?? process.cwd();
-  const workdirPath = resolve2(cwd);
+  const workdirPath = resolveWorkdirPath(cwd);
   const baseline = await api.cli.branchBaseline({
     sessionId: trimmedSessionId,
     workdirPath
@@ -1440,6 +1480,19 @@ var logCtx = (ctx, agentId) => ({
   messageId: ctx.messageId,
   agentId
 });
+function formatCursorRunFailure(runId, options) {
+  const details = [
+    options?.statusError?.trim(),
+    options?.resultText?.trim()
+  ].filter((value, index, arr) => {
+    if (!value) return false;
+    return arr.indexOf(value) === index;
+  });
+  if (details.length === 0) {
+    return `Cursor run \u5931\u8D25: ${runId}`;
+  }
+  return `Cursor run \u5931\u8D25: ${runId} \u2014 ${details.join("\uFF1B")}`;
+}
 async function runCursorAgent(cfg, ctx, options) {
   const signal = options?.signal;
   logAbortSignalStats(signal, "runCursorAgent:start");
@@ -1487,18 +1540,33 @@ async function runCursorAgent(cfg, ctx, options) {
     activeRun = run;
     logAbortSignalStats(signal, "runCursorAgent:after-send");
     console.log(`[apm] Cursor run id=${run.id} agentId=${agent.agentId}`);
+    let lastRunErrorStatus;
     for await (const event of run.stream()) {
       if (signal?.aborted) {
         abortRun();
         throw new Error("\u8FDE\u63A5\u5DF2\u5173\u95ED\uFF0C\u4EFB\u52A1\u4E2D\u65AD");
       }
+      if (event.type === "status" && event.status === "ERROR") {
+        const message = event.message?.trim();
+        if (message) {
+          lastRunErrorStatus = message;
+          console.error(
+            `[apm] Cursor run status=ERROR runId=${run.id}: ${message}`
+          );
+        }
+      }
       eventSession.addEvent(event);
       syncRemoteLog.schedule(eventSession);
     }
     await syncRemoteLog.flush(eventSession);
     const result = await run.wait();
     if (result.status === "error") {
-      throw new Error(`Cursor run \u5931\u8D25: ${result.id}`);
+      const failureMessage = formatCursorRunFailure(result.id, {
+        statusError: lastRunErrorStatus,
+        resultText: result.result
+      });
+      console.error(`[apm] ${failureMessage}`);
+      throw new Error(failureMessage);
     }
     if (result.status === "cancelled") {
       throw new Error(`Cursor run \u5DF2\u53D6\u6D88: ${result.id}`);

package/package.json

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

package/template/apm.config.json

@@ -1,3 +1,3 @@
 {
   "name": ""
-}
+}