ai-project-manage-cli 8.1.24 → 8.1.25

package/dist/index.js

@@ -1641,6 +1641,9 @@ async function pushCurrentBranch(cwd) {
   });
 }
 
+// src/commands/branch.ts
+import { basename as basename2 } from "path";
+
 // src/utils/workspace-repos.ts
 import {
   existsSync as existsSync7,
@@ -1754,6 +1757,7 @@ function formatRepoLabel(workdir, repoAbs) {
 }
 
 // src/commands/branch.ts
+import { existsSync as existsSync8 } from "fs";
 var TASK_BRANCH_PREFIX = "feat/task-";
 async function syncTaskRepos(workdir, options = {}) {
   const opts = typeof options === "string" ? { message: options } : options;
@@ -1825,9 +1829,12 @@ async function ensureTaskFeatureBranch(branch, projectId, options) {
   await ensureFeatureBranch(gitRoot, branch, projectId);
   return branch;
 }
+function isWorkspaceReposManifestFile(manifestPath2) {
+  return basename2(manifestPath2.replace(/\\/g, "/")) === WORKSPACE_REPOS_MANIFEST;
+}
 function resolveTaskBranchRepoRoots(workdirPath, reposManifest) {
   const manifestPath2 = resolveReposManifestPath(reposManifest);
-  if (manifestPath2) {
+  if (manifestPath2 && !isWorkspaceReposManifestFile(manifestPath2)) {
     const entries = loadHomeRepositoryEntries(manifestPath2);
     const roots2 = resolveHomeRepositoryAbsolutePaths(workdirPath, entries);
     console.log(
@@ -1835,6 +1842,13 @@ function resolveTaskBranchRepoRoots(workdirPath, reposManifest) {
     );
     return roots2;
   }
+  if (manifestPath2 && isWorkspaceReposManifestFile(manifestPath2)) {
+    const fsPath = toFsPath(manifestPath2);
+    if (!existsSync8(fsPath)) {
+      throw new Error(`[apm] \u672A\u627E\u5230\u5DE5\u4F5C\u533A\u4ED3\u5E93\u6E05\u5355 ${manifestPath2}`);
+    }
+    console.log(`[apm] \u4F7F\u7528\u663E\u5F0F\u5DE5\u4F5C\u533A\u4ED3\u5E93\u6E05\u5355 ${manifestPath2}`);
+  }
   const workspace = loadWorkspaceReposCache(workdirPath);
   const roots = resolveWorkspaceRepoAbsolutePaths(workspace);
   console.log(
@@ -1919,7 +1933,7 @@ async function runEnsureTaskBranchCli(options = {}) {
 
 // src/utils/user-prompt-cache.ts
 import { createHash } from "crypto";
-import { existsSync as existsSync8, mkdirSync as mkdirSync6, readFileSync as readFileSync7, writeFileSync as writeFileSync5 } from "fs";
+import { existsSync as existsSync9, mkdirSync as mkdirSync6, readFileSync as readFileSync7, writeFileSync as writeFileSync5 } from "fs";
 import { join as join11 } from "path";
 import { tmpdir } from "os";
 var CACHE_ROOT = join11(tmpdir(), "apm-hooks");
@@ -1941,7 +1955,7 @@ function formatUserPromptAsCommitMessage(prompt) {
 }
 function loadUserPromptCommitMessage(workdirInput) {
   const path = toFsPath(userPromptCachePath(workdirInput));
-  if (!existsSync8(path)) return null;
+  if (!existsSync9(path)) return null;
   try {
     const raw = readFileSync7(path, "utf8");
     const msg = formatUserPromptAsCommitMessage(raw);
@@ -1991,7 +2005,7 @@ async function runCommitTaskReposCli(options = {}) {
   );
   if (result.failed.length > 0) {
     throw new Error(
-      `[apm] \u4EE5\u4E0B\u4ED3\u5E93 commit/push \u5931\u8D25: ${result.failed.join(", ")}`
+      `[apm] \u591A\u4ED3\u6536\u5C3E\u90E8\u5206\u5931\u8D25: ${result.failed.join(", ")}`
     );
   }
 }

package/dist/worker-script.js

@@ -579,6 +579,9 @@ function resolveHomeRepositoryAbsolutePaths(workdirInput, entries) {
   return entries.map((entry) => resolve3(join4(workdir, entry.path)));
 }
 
+// src/commands/branch.ts
+import { basename as basename2 } from "path";
+
 // src/utils/workspace-repos.ts
 import {
   existsSync as existsSync3,
@@ -861,6 +864,7 @@ function formatRepoLabel(workdir, repoAbs) {
 }
 
 // src/commands/branch.ts
+import { existsSync as existsSync4 } from "fs";
 var TASK_BRANCH_PREFIX = "feat/task-";
 async function commitWorkspaceReposIfDirty(workdir, message, reposManifest) {
   const result = await commitTaskReposIfDirty(workdir, message, reposManifest);
@@ -970,9 +974,12 @@ async function resolveProjectIdForTask(taskId) {
   }
   return projectId;
 }
+function isWorkspaceReposManifestFile(manifestPath2) {
+  return basename2(manifestPath2.replace(/\\/g, "/")) === WORKSPACE_REPOS_MANIFEST;
+}
 function resolveTaskBranchRepoRoots(workdirPath, reposManifest) {
   const manifestPath2 = resolveReposManifestPath(reposManifest);
-  if (manifestPath2) {
+  if (manifestPath2 && !isWorkspaceReposManifestFile(manifestPath2)) {
     const entries = loadHomeRepositoryEntries(manifestPath2);
     const roots2 = resolveHomeRepositoryAbsolutePaths(workdirPath, entries);
     console.log(
@@ -980,6 +987,13 @@ function resolveTaskBranchRepoRoots(workdirPath, reposManifest) {
     );
     return roots2;
   }
+  if (manifestPath2 && isWorkspaceReposManifestFile(manifestPath2)) {
+    const fsPath = toFsPath(manifestPath2);
+    if (!existsSync4(fsPath)) {
+      throw new Error(`[apm] \u672A\u627E\u5230\u5DE5\u4F5C\u533A\u4ED3\u5E93\u6E05\u5355 ${manifestPath2}`);
+    }
+    console.log(`[apm] \u4F7F\u7528\u663E\u5F0F\u5DE5\u4F5C\u533A\u4ED3\u5E93\u6E05\u5355 ${manifestPath2}`);
+  }
   const workspace = loadWorkspaceReposCache(workdirPath);
   const roots = resolveWorkspaceRepoAbsolutePaths(workspace);
   console.log(
@@ -1690,7 +1704,7 @@ function createUpsertWebIdeTestCasesTool(options) {
 }
 
 // src/commands/connect/tools/mysql-tools.ts
-import { existsSync as existsSync4, readFileSync as readFileSync4, statSync as statSync3 } from "node:fs";
+import { existsSync as existsSync5, readFileSync as readFileSync4, statSync as statSync3 } from "node:fs";
 import { isAbsolute, relative as relative2, resolve as resolve5 } from "node:path";
 import mysql from "mysql2/promise";
 var MAX_RESULT_ROWS = 100;
@@ -1769,7 +1783,7 @@ function resolveSqlArtifactPath(workdir, absolutePath) {
     return { ok: false, error: "path \u5FC5\u987B\u4F4D\u4E8E\u5F53\u524D\u5DE5\u4F5C\u533A\u5185" };
   }
   const fsPath = toFsPath(targetAbs);
-  if (!existsSync4(fsPath)) {
+  if (!existsSync5(fsPath)) {
     return { ok: false, error: `\u6587\u4EF6\u4E0D\u5B58\u5728: ${absolutePath}` };
   }
   let st;
@@ -2644,14 +2658,14 @@ async function runCursorAgent(cfg2, ctx, options) {
 }
 
 // src/commands/connect/webide-agent-registry.ts
-import { existsSync as existsSync5, mkdirSync as mkdirSync4, readFileSync as readFileSync5, writeFileSync as writeFileSync3 } from "node:fs";
+import { existsSync as existsSync6, mkdirSync as mkdirSync4, readFileSync as readFileSync5, writeFileSync as writeFileSync3 } from "node:fs";
 import { dirname as dirname3, resolve as resolve6 } from "node:path";
 function registryPath(workdir, taskId, fileName = "cursor-agent.json") {
   return resolve6(workdir, ".apm", "webide", taskId, fileName);
 }
 var DESIGN_AGENT_FILE = "design-agent.json";
 function readRegistry(path) {
-  if (!existsSync5(path)) {
+  if (!existsSync6(path)) {
     return {};
   }
   try {
@@ -2726,7 +2740,7 @@ function saveWebIdeAgentId(workdir, taskId, agentId) {
 }
 function clearWebIdeAgentId(workdir, taskId) {
   const path = registryPath(workdir, taskId);
-  if (!existsSync5(path)) return;
+  if (!existsSync6(path)) return;
   syncWebIdeTaskState(workdir, taskId, { agentId: "" });
 }
 function loadWebIdeDesignAgentId(workdir, taskId) {
@@ -2746,7 +2760,7 @@ function saveWebIdeDesignAgentId(workdir, taskId, agentId) {
 }
 function clearWebIdeDesignAgentId(workdir, taskId) {
   const path = registryPath(workdir, taskId, DESIGN_AGENT_FILE);
-  if (!existsSync5(path)) return;
+  if (!existsSync6(path)) return;
   const current = readRegistry(path);
   const next = { ...current };
   delete next.agentId;
@@ -2802,24 +2816,27 @@ async function fetchAssumptionAnswersAndContinueAssessment(options) {
   if (ids.length === 0) {
     throw new Error("\u6CA1\u6709\u5DF2\u786E\u8BA4\u7684\u5047\u8BBE");
   }
-  const answers = [];
+  const lines = [];
+  if (title?.trim()) {
+    lines.push(title.trim(), "");
+  }
+  let index = 0;
   for (const id of ids) {
     const row = byId.get(id);
     if (!row || row.status !== "RESOLVED") {
       throw new Error(`\u5047\u8BBE\u5C1A\u672A\u5168\u90E8\u786E\u8BA4: ${id}`);
     }
-    answers.push({
-      questionId: id,
-      prompt: row.prompt,
-      selectedOptionId: row.selectedOptionId,
-      customAnswer: row.customAnswer,
-      resolution: row.resolution
-    });
+    const text = asString4(row.resolution) || asString4(row.customAnswer) || asString4(row.selectedOptionId);
+    if (!text) {
+      throw new Error(`\u5047\u8BBE\u7B54\u6848\u4E3A\u7A7A: ${id}`);
+    }
+    index += 1;
+    lines.push(`${index}. ${text}`);
   }
   console.log(
-    `[apm] \u5047\u8BBE\u7ED3\u679C\u5DF2\u62C9\u53D6 taskId=${taskId} count=${answers.length}`
+    `[apm] \u5047\u8BBE\u7ED3\u679C\u5DF2\u62C9\u53D6 taskId=${taskId} count=${index}`
   );
-  return JSON.stringify({ title, answers }, null, 2);
+  return lines.join("\n");
 }
 function createWebIdeAskQuestionExecute(options) {
   const { cfg: cfg2, taskId, onAwaitingAssumptions } = options;
@@ -3083,7 +3100,7 @@ function resolveMessageReplyFallback(fallback) {
 
 // src/commands/sync-webide-agent.ts
 import {
-  existsSync as existsSync6,
+  existsSync as existsSync7,
   mkdirSync as mkdirSync5,
   readdirSync as readdirSync3,
   readFileSync as readFileSync6,
@@ -3099,7 +3116,7 @@ function withTrailingNewline(text) {
 }
 function readRevision(apmDir) {
   const path = toFsPath(join6(apmDir, REVISION_FILE));
-  if (!existsSync6(path)) return null;
+  if (!existsSync7(path)) return null;
   try {
     const parsed = JSON.parse(readFileSync6(path, "utf8"));
     if (parsed?.version === 1 && parsed.revision?.trim()) {
@@ -3400,7 +3417,7 @@ async function ensureWebIdePullRequests(cfg2, taskId, workdir) {
 }
 
 // src/commands/sync-webide-attachments.ts
-import { existsSync as existsSync7, readFileSync as readFileSync7, writeFileSync as writeFileSync5 } from "fs";
+import { existsSync as existsSync8, readFileSync as readFileSync7, writeFileSync as writeFileSync5 } from "fs";
 import { join as join7 } from "path";
 var MANIFEST_FILE = ".sync-manifest.json";
 async function downloadAttachment(cfg2, attachmentId) {
@@ -3418,7 +3435,7 @@ async function downloadAttachment(cfg2, attachmentId) {
 }
 function loadManifest(dir) {
   const path = join7(dir, MANIFEST_FILE);
-  if (!existsSync7(path)) {
+  if (!existsSync8(path)) {
     return { version: 1, attachments: {} };
   }
   try {
@@ -3441,7 +3458,7 @@ function saveManifest(dir, manifest) {
   );
 }
 function isAttachmentUpToDate(entry, item, dest) {
-  if (!entry || !existsSync7(dest)) return false;
+  if (!entry || !existsSync8(dest)) return false;
   if (entry.name !== item.name) return false;
   const createdAt = item.createdAt ?? "";
   return entry.createdAt === createdAt;
@@ -3488,7 +3505,7 @@ async function syncWebIdeAttachments(cfg2, taskId, workdir, attachments) {
 
 // src/commands/sync-webide-design.ts
 import { createHash } from "crypto";
-import { existsSync as existsSync8, readdirSync as readdirSync4, readFileSync as readFileSync8, statSync as statSync4, writeFileSync as writeFileSync6 } from "fs";
+import { existsSync as existsSync9, readdirSync as readdirSync4, readFileSync as readFileSync8, statSync as statSync4, writeFileSync as writeFileSync6 } from "fs";
 import { join as join8 } from "path";
 
 // src/opc-shared-types.ts
@@ -3511,7 +3528,7 @@ function hashBuffer(buf) {
 }
 function loadManifest2(dir) {
   const path = join8(dir, MANIFEST_FILE2);
-  if (!existsSync8(path)) {
+  if (!existsSync9(path)) {
     return { version: 1, files: {} };
   }
   try {
@@ -3555,7 +3572,7 @@ async function syncWebIdeDesign(cfg2, taskId, workdir, artifacts) {
     if (!name || !isWebIdeDesignArtifactName(name)) continue;
     const localPath = join8(dir, name);
     const entry = manifest.files[name];
-    if (entry?.contentHash === art.contentHash && existsSync8(localPath)) {
+    if (entry?.contentHash === art.contentHash && existsSync9(localPath)) {
       continue;
     }
     const buf = await downloadDesignFile(cfg2, taskId, name);
@@ -3568,7 +3585,7 @@ async function syncWebIdeDesign(cfg2, taskId, workdir, artifacts) {
 }
 function listLocalDesignArtifactFiles(taskId, workdir) {
   const dir = webideDesignDir(taskId, workdir);
-  if (!existsSync8(dir)) return [];
+  if (!existsSync9(dir)) return [];
   const out = [];
   for (const name of readdirSync4(dir)) {
     if (!isWebIdeDesignArtifactName(name)) continue;

package/package.json

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