ai-project-manage-cli 7.1.17 → 7.1.19

package/dist/webide-message-worker.js

@@ -342,6 +342,36 @@ function requireRemoteWorkdir(workdir) {
 import { execFile } from "child_process";
 import { promisify } from "util";
 var execFileAsync = promisify(execFile);
+function toHttpsGitRemoteUrl(raw) {
+  let s = raw.trim();
+  if (!s) return null;
+  const sshScp = /^git@([^:]+):(.+)$/.exec(s);
+  if (sshScp) {
+    s = `https://${sshScp[1]}/${sshScp[2]}`;
+  } else {
+    const sshUri = /^ssh:\/\/(?:git@)?([^/]+)\/(.+)$/i.exec(s);
+    if (sshUri) {
+      s = `https://${sshUri[1]}/${sshUri[2]}`;
+    } else if (/^http:\/\//i.test(s)) {
+      s = `https://${s.slice("http://".length)}`;
+    } else if (!/^https:\/\//i.test(s)) {
+      const scpLike = /^([^/:]+):(.+)$/.exec(s);
+      if (scpLike && !scpLike[1].includes(".")) {
+        return null;
+      }
+      if (scpLike) {
+        s = `https://${scpLike[1]}/${scpLike[2]}`;
+      } else if (s.includes("/")) {
+        s = `https://${s}`;
+      } else {
+        return null;
+      }
+    }
+  }
+  s = s.replace(/\/+$/, "");
+  if (!/^https:\/\//i.test(s)) return null;
+  return s;
+}
 async function tryReadGitOriginUrl(cwd) {
   try {
     const { stdout } = await execFileAsync(
@@ -355,6 +385,11 @@ async function tryReadGitOriginUrl(cwd) {
     return null;
   }
 }
+async function tryReadHttpsGitOriginUrl(cwd) {
+  const raw = await tryReadGitOriginUrl(cwd);
+  if (!raw) return null;
+  return toHttpsGitRemoteUrl(raw);
+}
 
 // src/git-utils.ts
 import { execFile as execFile2 } from "child_process";
@@ -718,7 +753,7 @@ import {
   statSync as statSync2,
   writeFileSync as writeFileSync3
 } from "fs";
-import { basename as basename2, join as join3, relative, resolve as resolve3 } from "path";
+import { basename as basename2, dirname as dirname2, join as join3, relative, resolve as resolve3 } from "path";
 var WORKSPACE_REPOS_MANIFEST = "workspace-repos.json";
 var WORKSPACE_REPOS_VERSION = 1;
 var SKIP_DIR_NAMES = /* @__PURE__ */ new Set([".apm", "node_modules"]);
@@ -743,6 +778,20 @@ function toRelativeRepoPath(workdir, repoAbs) {
   const rel = relative(workdir, repoAbs).replace(/\\/g, "/");
   return rel === "" ? "." : rel;
 }
+function normalizeRepoEntry(raw) {
+  if (!raw || typeof raw !== "object") return null;
+  const o = raw;
+  if (typeof o.path !== "string" || !o.path.trim()) return null;
+  const entry = {
+    path: o.path.trim().replace(/\\/g, "/")
+  };
+  if (typeof o.remoteUrl === "string" && o.remoteUrl.trim()) {
+    entry.remoteUrl = o.remoteUrl.trim();
+  } else if (o.remoteUrl === null) {
+    entry.remoteUrl = null;
+  }
+  return entry;
+}
 function readManifest(workdir) {
   const path = toFsPath(manifestPath(workdir));
   if (!existsSync2(path)) {
@@ -764,7 +813,17 @@ function readManifest(workdir) {
     if (typeof raw.workdir !== "string" || !raw.workdir.trim()) {
       return null;
     }
-    return raw;
+    const repos = raw.repos.map((item) => normalizeRepoEntry(item)).filter((item) => item != null);
+    if (repos.length === 0) {
+      return null;
+    }
+    return {
+      version: WORKSPACE_REPOS_VERSION,
+      kind: raw.kind,
+      workdir: raw.workdir,
+      repos,
+      scannedAt: typeof raw.scannedAt === "string" && raw.scannedAt.trim() ? raw.scannedAt : (/* @__PURE__ */ new Date()).toISOString()
+    };
   } catch {
     return null;
   }
@@ -859,6 +918,31 @@ function loadWorkspaceReposCache(workdirInput) {
     workdir
   };
 }
+async function enrichWorkspaceReposRemoteUrls(manifest) {
+  let changed = false;
+  const repos = [];
+  for (const entry of manifest.repos) {
+    const abs = absoluteRepoPath(manifest.workdir, entry);
+    const remoteUrl = await tryReadHttpsGitOriginUrl(abs);
+    const next = {
+      path: entry.path,
+      remoteUrl: remoteUrl || null
+    };
+    if ((entry.remoteUrl ?? null) !== next.remoteUrl) {
+      changed = true;
+    }
+    repos.push(next);
+  }
+  const nextManifest = {
+    ...manifest,
+    repos,
+    scannedAt: changed ? (/* @__PURE__ */ new Date()).toISOString() : manifest.scannedAt
+  };
+  if (changed) {
+    writeManifest(manifest.workdir, nextManifest);
+  }
+  return nextManifest;
+}
 function resolveWorkspaceRepos(workdirInput, options) {
   const workdir = resolveWorkdirPath(workdirInput);
   if (!options?.forceRescan) {
@@ -871,6 +955,15 @@ function resolveWorkspaceRepos(workdirInput, options) {
     }
   }
   const scanned = scanWorkspaceRepos(workdir);
+  const previous = readManifest(workdir);
+  if (previous) {
+    const prevByPath = new Map(previous.repos.map((r) => [r.path, r]));
+    scanned.repos = scanned.repos.map((entry) => {
+      const old = prevByPath.get(entry.path);
+      if (!old?.remoteUrl) return entry;
+      return { ...entry, remoteUrl: old.remoteUrl };
+    });
+  }
   writeManifest(workdir, scanned);
   console.log(
     `[apm] \u5DF2\u626B\u63CF\u5DE5\u4F5C\u533A\u4ED3\u5E93 kind=${scanned.kind} repos=${scanned.repos.map((r) => r.path).join(", ")} \u2192 .apm/${WORKSPACE_REPOS_MANIFEST}`
@@ -1329,7 +1422,7 @@ ${JSON.stringify(event, null, 2)}
 
 // src/commands/connect/agent-session-registry.ts
 import { existsSync as existsSync3, mkdirSync as mkdirSync4, readFileSync as readFileSync4, writeFileSync as writeFileSync4 } from "node:fs";
-import { dirname as dirname2, resolve as resolve4 } from "node:path";
+import { dirname as dirname3, resolve as resolve4 } from "node:path";
 function registryPath(workdir, sessionId) {
   return resolve4(workdir, ".apm", "sessions", sessionId, "cursor-agents.json");
 }
@@ -1355,7 +1448,7 @@ function readRegistry(path) {
   return {};
 }
 function writeRegistry(path, registry) {
-  mkdirSync4(dirname2(path), { recursive: true });
+  mkdirSync4(dirname3(path), { recursive: true });
   writeFileSync4(path, `${JSON.stringify(registry, null, 2)}
 `, "utf8");
 }
@@ -2279,7 +2372,7 @@ async function runCursorAgent(cfg, ctx, options) {
 
 // src/commands/connect/webide-agent-registry.ts
 import { existsSync as existsSync4, mkdirSync as mkdirSync6, readFileSync as readFileSync5, writeFileSync as writeFileSync5 } from "node:fs";
-import { dirname as dirname3, resolve as resolve5 } from "node:path";
+import { dirname as dirname4, resolve as resolve5 } from "node:path";
 function registryPath2(workdir, taskId) {
   return resolve5(workdir, ".apm", "webide", taskId, "cursor-agent.json");
 }
@@ -2300,7 +2393,7 @@ function readRegistry2(path) {
   return {};
 }
 function writeRegistry2(path, registry) {
-  mkdirSync6(dirname3(path), { recursive: true });
+  mkdirSync6(dirname4(path), { recursive: true });
   writeFileSync5(path, `${JSON.stringify(registry, null, 2)}
 `, "utf8");
 }
@@ -2625,7 +2718,24 @@ async function resolveRepositoryIdForSync(api, workdirPath) {
     };
   }
 }
-async function syncRemoteDeploymentConfig(workdirPath, apmDir) {
+async function writeDeploymentConfigContent(apmDir, content, configName) {
+  let parsed;
+  try {
+    parsed = JSON.parse(content);
+  } catch {
+    console.warn(
+      `[apm] \u8FDC\u7A0B\u90E8\u7F72\u914D\u7F6E\u300C${configName}\u300DJSON \u65E0\u6548\uFF08${TEMPLATE_HINT}\uFF09`
+    );
+    return false;
+  }
+  const apmConfigPath = toFsPath(join5(apmDir, "apm.config.json"));
+  writeFileSync6(apmConfigPath, `${JSON.stringify(parsed, null, 2)}
+`, "utf8");
+  console.log(`[apm] \u5DF2\u540C\u6B65\u5E73\u53F0\u90E8\u7F72\u914D\u7F6E: ${configName}`);
+  console.log("[apm] \u5DF2\u5199\u5165 .apm/apm.config.json");
+  return true;
+}
+async function syncRemoteDeploymentConfig(workdirPath, apmDir, options) {
   const cfg = await tryReadApmConfig();
   if (!cfg || !resolveApiKey(cfg)) {
     console.log(
@@ -2635,10 +2745,14 @@ async function syncRemoteDeploymentConfig(workdirPath, apmDir) {
     return { synced: false, repositoryId: null };
   }
   const api = createApmApiClient(cfg);
-  const { repositoryId, diagnostic } = await resolveRepositoryIdForSync(
-    api,
-    workdirPath
-  );
+  const preferredId = options?.repositoryId?.trim() || "";
+  let repositoryId = preferredId || null;
+  let diagnostic = null;
+  if (!repositoryId) {
+    const resolved = await resolveRepositoryIdForSync(api, workdirPath);
+    repositoryId = resolved.repositoryId;
+    diagnostic = resolved.diagnostic;
+  }
   if (!repositoryId) {
     console.log(
       `[apm] \u672A\u80FD\u540C\u6B65\u5E73\u53F0\u90E8\u7F72\u914D\u7F6E\uFF08${TEMPLATE_HINT}\uFF09\u3002
@@ -2655,21 +2769,15 @@ ${diagnostic ?? ""}
     );
     return { synced: false, repositoryId };
   }
-  let parsed;
-  try {
-    parsed = JSON.parse(config.content);
-  } catch {
-    console.warn(
-      `[apm] \u8FDC\u7A0B\u90E8\u7F72\u914D\u7F6E\u300C${config.name}\u300DJSON \u65E0\u6548\uFF08${TEMPLATE_HINT}\uFF09`
-    );
+  const targetApmDir = apmDir ?? workspaceApmDir(workdirPath);
+  const wrote = await writeDeploymentConfigContent(
+    targetApmDir,
+    config.content,
+    config.name
+  );
+  if (!wrote) {
     return { synced: false, repositoryId };
   }
-  const targetApmDir = apmDir ?? workspaceApmDir(workdirPath);
-  const apmConfigPath = toFsPath(join5(targetApmDir, "apm.config.json"));
-  writeFileSync6(apmConfigPath, `${JSON.stringify(parsed, null, 2)}
-`, "utf8");
-  console.log(`[apm] \u5DF2\u540C\u6B65\u5E73\u53F0\u90E8\u7F72\u914D\u7F6E: ${config.name}`);
-  console.log("[apm] \u5DF2\u5199\u5165 .apm/apm.config.json");
   return { synced: true, repositoryId, configName: config.name };
 }
 
@@ -2682,7 +2790,7 @@ import {
   writeFileSync as writeFileSync7
 } from "fs";
 import { createHash } from "crypto";
-import { dirname as dirname4, join as join6, relative as relative2, sep } from "path";
+import { dirname as dirname5, join as join6, relative as relative2, sep } from "path";
 var MANIFEST_FILE = "manifest.json";
 function normalizeProjectIdForPath(projectId) {
   const id = projectId.trim();
@@ -2861,7 +2969,7 @@ ${diagnostic ?? ""}`);
       const absPath = toFsPath(
         projectDocumentLocalPath(targetApmDir, projectId, doc.path)
       );
-      await ensureDirExists(dirname4(absPath));
+      await ensureDirExists(dirname5(absPath));
       writeFileSync7(absPath, doc.content, "utf8");
       downloaded += 1;
     }
@@ -2987,15 +3095,18 @@ function markBranchDone(sessionId, workdir) {
 }
 
 // src/commands/connect/webide-pull-requests.ts
-var TEST_START_ACTIONS = /* @__PURE__ */ new Set([
+var PRE_AGENT_PR_ACTIONS = /* @__PURE__ */ new Set([
   "generate-cases",
   "run-auto-test",
-  // 跳过/直接进手工测试不发 Cursor，PR 延后到部署或验收
-  "deploy",
+  // 验收合并前兜底确保 PR 存在
   "accept"
 ]);
+var POST_AGENT_PR_ACTIONS = /* @__PURE__ */ new Set(["create-pr", "finish-manual-test"]);
 function shouldEnsureWebIdePullRequests(action) {
-  return TEST_START_ACTIONS.has(action);
+  return PRE_AGENT_PR_ACTIONS.has(action);
+}
+function shouldEnsureWebIdePullRequestsAfterAgent(action) {
+  return POST_AGENT_PR_ACTIONS.has(action);
 }
 async function ensureWebIdePullRequests(cfg, taskId, workdir) {
   const api = createApmApiClient(cfg);
@@ -3047,11 +3158,11 @@ async function ensureWebIdePullRequests(cfg, taskId, workdir) {
 
 // src/version.ts
 import { readFileSync as readFileSync8 } from "fs";
-import { dirname as dirname5, join as join8 } from "path";
+import { dirname as dirname6, join as join8 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 function readCliVersion() {
   try {
-    const dir = dirname5(fileURLToPath2(import.meta.url));
+    const dir = dirname6(fileURLToPath2(import.meta.url));
     const pkgPath = join8(dir, "..", "package.json");
     const pkg = JSON.parse(readFileSync8(pkgPath, "utf8"));
     return pkg.version ?? "0.0.0";
@@ -3344,7 +3455,8 @@ var WEBIDE_CODE_CHANGE_ACTIONS = /* @__PURE__ */ new Set([
   "start-develop",
   "fix-and-retest",
   "report-defect",
-  "deploy"
+  "create-pr",
+  "finish-manual-test"
 ]);
 function shouldCommitAfterWebIdeMessage(action) {
   return WEBIDE_CODE_CHANGE_ACTIONS.has(action);
@@ -3385,7 +3497,15 @@ async function handleWebIdeInboundMessage(cfg, msg, signal, options) {
       await syncWorkspaceSkills(cfg, workdir);
       markSkillsSyncedForCliVersion(workdir, cliVersion);
     }
-    resolveWorkspaceRepos(workdir);
+    const workspaceRepos = resolveWorkspaceRepos(workdir);
+    try {
+      await enrichWorkspaceReposRemoteUrls(workspaceRepos);
+    } catch (err) {
+      console.warn(
+        "[apm] \u8865\u9F50 workspace-repos remoteUrl \u5931\u8D25:",
+        err instanceof Error ? err.message : err
+      );
+    }
     if (shouldRunBranch(branchCacheKey, workdir)) {
       if (signal.aborted) throw new Error("\u4EFB\u52A1\u5DF2\u53D6\u6D88");
       const branchResult = await runTaskBranch(taskId, { cwd: workdir });
@@ -3550,6 +3670,16 @@ async function handleWebIdeInboundMessage(cfg, msg, signal, options) {
         `[apm] webide \u81EA\u52A8 push action=${msg.action} repos=${pushed}`
       );
     }
+    if (shouldEnsureWebIdePullRequestsAfterAgent(msg.action)) {
+      if (signal.aborted) throw new Error("\u4EFB\u52A1\u5DF2\u53D6\u6D88");
+      if (!shouldCommitAfterWebIdeMessage(msg.action)) {
+        const pushed = await pushWorkspaceRepos(workdir);
+        console.log(
+          `[apm] webide create-pr \u524D push action=${msg.action} repos=${pushed}`
+        );
+      }
+      await ensureWebIdePullRequests(cfg, taskId, workdir);
+    }
     if (projectId) {
       try {
         await syncProjectDocumentsPush(cfg, workdir, void 0, { projectId });

package/package.json

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