ai-project-manage-cli 7.1.18 → 7.1.20

package/dist/index.js

@@ -1099,8 +1099,8 @@ import { Command } from "commander";
 init_config();
 
 // src/commands/init.ts
-import { join as join5 } from "path";
-import { readFileSync as readFileSync4, writeFileSync as writeFileSync5 } from "fs";
+import { join as join6 } from "path";
+import { readFileSync as readFileSync5, writeFileSync as writeFileSync6 } from "fs";
 
 // src/command-utils.ts
 init_config();
@@ -1388,8 +1388,8 @@ async function copyTemplateFiles(targetDir, workdir = resolveWorkdirPath()) {
 
 // src/deployment-config-sync.ts
 init_client();
-import { join as join3 } from "path";
-import { writeFileSync as writeFileSync3 } from "fs";
+import { join as join4 } from "path";
+import { writeFileSync as writeFileSync4 } from "fs";
 
 // src/git-remote.ts
 import { execFile } from "child_process";
@@ -1649,6 +1649,162 @@ async function resolveBranchBaseline(api, sessionId, workdirPath) {
 
 // src/deployment-config-sync.ts
 init_config();
+
+// src/workspace-repos.ts
+import {
+  existsSync as existsSync2,
+  mkdirSync as mkdirSync3,
+  readFileSync as readFileSync3,
+  readdirSync as readdirSync2,
+  statSync as statSync2,
+  writeFileSync as writeFileSync3
+} from "fs";
+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;
+function manifestPath(workdir) {
+  return join3(workspaceApmDir(workdir), WORKSPACE_REPOS_MANIFEST);
+}
+function absoluteRepoPath(workdir, entry) {
+  if (entry.path === "." || entry.path === "") {
+    return workdir;
+  }
+  return resolve3(workdir, entry.path);
+}
+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 path19 = toFsPath(manifestPath(workdir));
+  if (!existsSync2(path19)) {
+    return null;
+  }
+  try {
+    const raw = JSON.parse(
+      readFileSync3(path19, "utf8")
+    );
+    if (raw?.version !== WORKSPACE_REPOS_VERSION) {
+      return null;
+    }
+    if (raw.kind !== "single" && raw.kind !== "multi") {
+      return null;
+    }
+    if (!Array.isArray(raw.repos) || raw.repos.length === 0) {
+      return null;
+    }
+    if (typeof raw.workdir !== "string" || !raw.workdir.trim()) {
+      return null;
+    }
+    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;
+  }
+}
+function writeManifest(workdir, manifest) {
+  const apmDir = toFsPath(workspaceApmDir(workdir));
+  mkdirSync3(apmDir, { recursive: true });
+  const path19 = toFsPath(manifestPath(workdir));
+  writeFileSync3(path19, `${JSON.stringify(manifest, null, 2)}
+`, "utf8");
+}
+function isPathInsideOrEqual(parentAbs, childAbs) {
+  const parent = normalizeWorkdirPath(parentAbs);
+  const child = normalizeWorkdirPath(childAbs);
+  if (child === parent) return true;
+  const prefix = parent.endsWith("/") ? parent : `${parent}/`;
+  return child.startsWith(prefix);
+}
+function findWorkspaceReposManifestNearPath(startDirInput) {
+  let current = resolve3(startDirInput);
+  for (; ; ) {
+    const candidates = /* @__PURE__ */ new Set([normalizeWorkdirPath(current)]);
+    try {
+      if (existsSync2(toFsPath(current))) {
+        candidates.add(resolveWorkdirPath(current));
+      }
+    } catch {
+    }
+    for (const candidate of candidates) {
+      const cached = readManifest(candidate);
+      if (!cached) continue;
+      const cachedWorkdir = resolveWorkdirPath(cached.workdir);
+      const candidateNorm = resolveWorkdirPath(candidate);
+      if (cachedWorkdir === candidateNorm) {
+        return { ...cached, workdir: cachedWorkdir };
+      }
+    }
+    const parent = dirname2(current);
+    if (parent === current) {
+      return null;
+    }
+    current = parent;
+  }
+}
+function matchWorkspaceRepoEntryForPath(manifest, pathInput) {
+  const target = resolveWorkdirPath(pathInput);
+  const workdir = resolveWorkdirPath(manifest.workdir);
+  let best = null;
+  let bestLen = -1;
+  for (const entry of manifest.repos) {
+    const abs = resolveWorkdirPath(absoluteRepoPath(workdir, entry));
+    if (!isPathInsideOrEqual(abs, target)) {
+      continue;
+    }
+    if (abs.length > bestLen) {
+      best = entry;
+      bestLen = abs.length;
+    }
+  }
+  return best;
+}
+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;
+}
+
+// src/deployment-config-sync.ts
 var TEMPLATE_HINT = "\u4FDD\u7559\u6A21\u677F .apm/apm.config.json";
 var SYNC_HINT = "\u767B\u8BB0\u5DE5\u4F5C\u7A7A\u95F4\u8DEF\u5F84\u3001\u7ED1\u5B9A\u4ED3\u5E93\u540E\uFF0C\u53EF\u6267\u884C: apm sync-deploy-config";
 async function resolveRepositoryIdForSync(api, workdirPath) {
@@ -1663,7 +1819,73 @@ async function resolveRepositoryIdForSync(api, workdirPath) {
     };
   }
 }
-async function syncRemoteDeploymentConfig(workdirPath, apmDir) {
+async function resolveDeployCwdForRepository(workspaceRoot, repositoryId, api) {
+  const start = resolveWorkdirPath(workspaceRoot);
+  let manifest = findWorkspaceReposManifestNearPath(start);
+  if (!manifest) {
+    return null;
+  }
+  try {
+    manifest = await enrichWorkspaceReposRemoteUrls(manifest);
+  } catch {
+    return null;
+  }
+  let client = api;
+  if (!client) {
+    const cfg = await tryReadApmConfig();
+    if (!cfg || !resolveApiKey(cfg)) {
+      return null;
+    }
+    client = createApmApiClient(cfg);
+  }
+  for (const entry of manifest.repos) {
+    const abs = absoluteRepoPath(manifest.workdir, entry);
+    const remoteUrl = toHttpsGitRemoteUrl(entry.remoteUrl ?? "");
+    if (!remoteUrl) {
+      continue;
+    }
+    let baseBranch = "";
+    try {
+      const gitRoot = await resolveGitRepoRoot(abs);
+      baseBranch = (await resolveDefaultRemoteBranch(gitRoot)).trim();
+    } catch {
+      continue;
+    }
+    if (!baseBranch) {
+      continue;
+    }
+    try {
+      const matched = await client.cli.matchRepository({
+        url: remoteUrl,
+        baseBranch
+      });
+      if (matched.repositoryId?.trim() === repositoryId) {
+        return abs;
+      }
+    } catch {
+      continue;
+    }
+  }
+  return null;
+}
+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(join4(apmDir, "apm.config.json"));
+  writeFileSync4(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(
@@ -1673,10 +1895,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
@@ -1693,21 +1919,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(join3(targetApmDir, "apm.config.json"));
-  writeFileSync3(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 };
 }
 
@@ -1715,14 +1935,14 @@ ${diagnostic ?? ""}
 init_client();
 init_config();
 import {
-  existsSync as existsSync2,
-  readdirSync as readdirSync2,
-  readFileSync as readFileSync3,
+  existsSync as existsSync3,
+  readdirSync as readdirSync3,
+  readFileSync as readFileSync4,
   rmSync,
-  writeFileSync as writeFileSync4
+  writeFileSync as writeFileSync5
 } from "fs";
 import { createHash } from "crypto";
-import { dirname as dirname2, join as join4, relative, sep } from "path";
+import { dirname as dirname3, join as join5, relative as relative2, sep } from "path";
 var MANIFEST_FILE = "manifest.json";
 function normalizeProjectIdForPath(projectId) {
   const id = projectId.trim();
@@ -1736,11 +1956,11 @@ function normalizeProjectIdForPath(projectId) {
 }
 function projectDocumentsDir(apmRoot, projectId) {
   const id = normalizeProjectIdForPath(projectId);
-  return join4(apmRoot ?? workspaceApmDir(), "project", id);
+  return join5(apmRoot ?? workspaceApmDir(), "project", id);
 }
 function projectDocumentLocalPath(apmRoot, projectId, documentPath) {
   const normalized = normalizeLocalDocumentPath(documentPath);
-  return join4(
+  return join5(
     projectDocumentsDir(apmRoot, projectId),
     ...normalized.split("/")
   );
@@ -1760,16 +1980,16 @@ function hashLocalFileContent(content) {
   return createHash("sha256").update(content, "utf8").digest("hex");
 }
 function readLocalManifest(apmRoot, projectId) {
-  const manifestPath3 = join4(
+  const manifestPath3 = join5(
     projectDocumentsDir(apmRoot, projectId),
     MANIFEST_FILE
   );
-  if (!existsSync2(manifestPath3)) {
+  if (!existsSync3(manifestPath3)) {
     return null;
   }
   try {
     return JSON.parse(
-      readFileSync3(manifestPath3, "utf8")
+      readFileSync4(manifestPath3, "utf8")
     );
   } catch {
     return null;
@@ -1777,13 +1997,13 @@ function readLocalManifest(apmRoot, projectId) {
 }
 function listLocalDocumentPaths(apmRoot, projectId) {
   const root = projectDocumentsDir(apmRoot, projectId);
-  if (!existsSync2(root)) {
+  if (!existsSync3(root)) {
     return [];
   }
   const paths = [];
   const walk = (dir) => {
-    for (const entry of readdirSync2(dir, { withFileTypes: true })) {
-      const abs = join4(dir, entry.name);
+    for (const entry of readdirSync3(dir, { withFileTypes: true })) {
+      const abs = join5(dir, entry.name);
       if (entry.isDirectory()) {
         walk(abs);
         continue;
@@ -1791,7 +2011,7 @@ function listLocalDocumentPaths(apmRoot, projectId) {
       if (entry.isFile() && entry.name === MANIFEST_FILE) {
         continue;
       }
-      const rel = relative(root, abs).split(sep).join("/");
+      const rel = relative2(root, abs).split(sep).join("/");
       paths.push(rel);
     }
   };
@@ -1901,8 +2121,8 @@ ${diagnostic ?? ""}`);
       const absPath = toFsPath(
         projectDocumentLocalPath(targetApmDir, projectId, doc.path)
       );
-      await ensureDirExists(dirname2(absPath));
-      writeFileSync4(absPath, doc.content, "utf8");
+      await ensureDirExists(dirname3(absPath));
+      writeFileSync5(absPath, doc.content, "utf8");
       downloaded += 1;
     }
   }
@@ -1911,13 +2131,13 @@ ${diagnostic ?? ""}`);
     const absPath = toFsPath(
       projectDocumentLocalPath(targetApmDir, projectId, path19)
     );
-    if (existsSync2(absPath)) {
+    if (existsSync3(absPath)) {
       rmSync(absPath, { force: true });
       deleted += 1;
     }
   }
-  writeFileSync4(
-    toFsPath(join4(docsDir, MANIFEST_FILE)),
+  writeFileSync5(
+    toFsPath(join5(docsDir, MANIFEST_FILE)),
     `${JSON.stringify(remoteManifest, null, 2)}
 `,
     "utf8"
@@ -1960,7 +2180,7 @@ async function syncProjectDocumentsPush(cfg, workdirPath, apmRoot, options) {
     const absPath = toFsPath(
       projectDocumentLocalPath(targetApmDir, projectId, path19)
     );
-    const content = readFileSync3(absPath, "utf8");
+    const content = readFileSync4(absPath, "utf8");
     const contentHash = hashLocalFileContent(content);
     if (remoteHashByPath.get(path19) === contentHash) {
       continue;
@@ -1999,11 +2219,11 @@ async function ensureWorkspaceInitialized(workdir, options) {
   await syncProjectDocumentsPull(workdir, apmDir);
   const trimmedName = options?.name?.trim();
   if (trimmedName) {
-    const apmConfigPath = toFsPath(join5(apmDir, "apm.config.json"));
-    const config = readFileSync4(apmConfigPath, "utf8");
+    const apmConfigPath = toFsPath(join6(apmDir, "apm.config.json"));
+    const config = readFileSync5(apmConfigPath, "utf8");
     const configJson = JSON.parse(config);
     configJson.name = trimmedName;
-    writeFileSync5(
+    writeFileSync6(
       apmConfigPath,
       `${JSON.stringify(configJson, null, 2)}
 `,
@@ -2036,7 +2256,7 @@ async function runInit(name) {
 // src/commands/login.ts
 init_config();
 init_client();
-import { existsSync as existsSync3 } from "fs";
+import { existsSync as existsSync4 } from "fs";
 import { ApiError } from "listpage-http";
 async function runLogin(opts) {
   const baseUrl = (opts.server?.trim() || process.env.AI_PM_SERVER?.trim() || DEFAULT_BASE_URL).replace(/\/+$/, "");
@@ -2091,169 +2311,13 @@ async function runLogin(opts) {
   );
   const workdir = resolveWorkdirPath();
   const apmDir = workspaceApmDir(workdir);
-  if (existsSync3(apmDir)) {
+  if (existsSync4(apmDir)) {
     await syncRemoteDeploymentConfig(workdir, apmDir);
   }
 }
 
 // src/commands/branch.ts
 init_client();
-
-// src/workspace-repos.ts
-import {
-  existsSync as existsSync4,
-  mkdirSync as mkdirSync3,
-  readFileSync as readFileSync5,
-  readdirSync as readdirSync3,
-  statSync as statSync2,
-  writeFileSync as writeFileSync6
-} from "fs";
-import { basename as basename2, dirname as dirname3, join as join6, relative as relative2, resolve as resolve3 } from "path";
-var WORKSPACE_REPOS_MANIFEST = "workspace-repos.json";
-var WORKSPACE_REPOS_VERSION = 1;
-function manifestPath(workdir) {
-  return join6(workspaceApmDir(workdir), WORKSPACE_REPOS_MANIFEST);
-}
-function absoluteRepoPath(workdir, entry) {
-  if (entry.path === "." || entry.path === "") {
-    return workdir;
-  }
-  return resolve3(workdir, entry.path);
-}
-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 path19 = toFsPath(manifestPath(workdir));
-  if (!existsSync4(path19)) {
-    return null;
-  }
-  try {
-    const raw = JSON.parse(
-      readFileSync5(path19, "utf8")
-    );
-    if (raw?.version !== WORKSPACE_REPOS_VERSION) {
-      return null;
-    }
-    if (raw.kind !== "single" && raw.kind !== "multi") {
-      return null;
-    }
-    if (!Array.isArray(raw.repos) || raw.repos.length === 0) {
-      return null;
-    }
-    if (typeof raw.workdir !== "string" || !raw.workdir.trim()) {
-      return null;
-    }
-    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;
-  }
-}
-function writeManifest(workdir, manifest) {
-  const apmDir = toFsPath(workspaceApmDir(workdir));
-  mkdirSync3(apmDir, { recursive: true });
-  const path19 = toFsPath(manifestPath(workdir));
-  writeFileSync6(path19, `${JSON.stringify(manifest, null, 2)}
-`, "utf8");
-}
-function isPathInsideOrEqual(parentAbs, childAbs) {
-  const parent = normalizeWorkdirPath(parentAbs);
-  const child = normalizeWorkdirPath(childAbs);
-  if (child === parent) return true;
-  const prefix = parent.endsWith("/") ? parent : `${parent}/`;
-  return child.startsWith(prefix);
-}
-function findWorkspaceReposManifestNearPath(startDirInput) {
-  let current = resolve3(startDirInput);
-  for (; ; ) {
-    const candidates = /* @__PURE__ */ new Set([normalizeWorkdirPath(current)]);
-    try {
-      if (existsSync4(toFsPath(current))) {
-        candidates.add(resolveWorkdirPath(current));
-      }
-    } catch {
-    }
-    for (const candidate of candidates) {
-      const cached = readManifest(candidate);
-      if (!cached) continue;
-      const cachedWorkdir = resolveWorkdirPath(cached.workdir);
-      const candidateNorm = resolveWorkdirPath(candidate);
-      if (cachedWorkdir === candidateNorm) {
-        return { ...cached, workdir: cachedWorkdir };
-      }
-    }
-    const parent = dirname3(current);
-    if (parent === current) {
-      return null;
-    }
-    current = parent;
-  }
-}
-function matchWorkspaceRepoEntryForPath(manifest, pathInput) {
-  const target = resolveWorkdirPath(pathInput);
-  const workdir = resolveWorkdirPath(manifest.workdir);
-  let best = null;
-  let bestLen = -1;
-  for (const entry of manifest.repos) {
-    const abs = resolveWorkdirPath(absoluteRepoPath(workdir, entry));
-    if (!isPathInsideOrEqual(abs, target)) {
-      continue;
-    }
-    if (abs.length > bestLen) {
-      best = entry;
-      bestLen = abs.length;
-    }
-  }
-  return best;
-}
-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;
-}
-
-// src/commands/branch.ts
 var SESSION_BRANCH_PREFIX = "feat/session-";
 function branchNameForSession(sessionId) {
   const id = sessionId.trim();
@@ -3861,6 +3925,7 @@ function validateDeployPush(o) {
       deploymentRunId: o.deploymentRunId.trim(),
       workdir: o.workdir.trim(),
       environment,
+      ...typeof o.repositoryId === "string" && o.repositoryId.trim() ? { repositoryId: o.repositoryId.trim() } : {},
       ...o.packOnly === true ? { packOnly: true } : {}
     }
   };
@@ -6774,7 +6839,8 @@ async function executeDeploy(options) {
   try {
     const configSyncResult = await syncRemoteDeploymentConfig(
       cwd,
-      workspaceApmDir(cwd)
+      workspaceApmDir(cwd),
+      options.repositoryId ? { repositoryId: options.repositoryId } : void 0
     );
     if (configSyncResult.synced && configSyncResult.configName) {
       outputParts.push(
@@ -7049,6 +7115,7 @@ async function handleInboundDeploy(cfg, msg, signal) {
   if (signal.aborted) return;
   const api = createApmApiClient(cfg);
   const deploymentRunId = msg.deploymentRunId;
+  const repositoryId = msg.repositoryId?.trim() || "";
   await api.cli.updateTaskDeploymentStatus({
     id: deploymentRunId,
     status: "DEPLOYING"
@@ -7057,13 +7124,33 @@ async function handleInboundDeploy(cfg, msg, signal) {
     api,
     deploymentRunId,
     run: async (appendLog) => {
-      const workdir = requireRemoteWorkdir(msg.workdir);
+      const workspaceRoot = requireRemoteWorkdir(msg.workdir);
+      let cwd = workspaceRoot;
+      if (repositoryId) {
+        const resolved = await resolveDeployCwdForRepository(
+          workspaceRoot,
+          repositoryId,
+          api
+        );
+        if (resolved) {
+          cwd = resolved;
+          appendLog(
+            `[apm] \u591A\u4ED3\u90E8\u7F72\uFF1A\u6309 repositoryId=${repositoryId} \u89E3\u6790 cwd=${cwd}
+`
+          );
+        } else {
+          appendLog(
+            `[apm] \u672A\u5728 workspace-repos \u547D\u4E2D repositoryId=${repositoryId}\uFF0C\u4F7F\u7528\u5DE5\u4F5C\u7A7A\u95F4\u76EE\u5F55 cwd=${cwd}
+`
+          );
+        }
+      }
       const displayCommand = resolveDeployCommand(
         msg.environment,
         msg.packOnly
       );
       console.log(
-        `[apm] deploy start id=${deploymentRunId} env=${msg.environment} cwd=${workdir}`
+        `[apm] deploy start id=${deploymentRunId} env=${msg.environment} cwd=${cwd}` + (repositoryId ? ` repositoryId=${repositoryId}` : "")
       );
       console.log(`[apm] deploy command: ${displayCommand}`);
       if (signal.aborted) {
@@ -7071,11 +7158,12 @@ async function handleInboundDeploy(cfg, msg, signal) {
       }
       const deployOptions = {
         env: msg.environment,
-        cwd: workdir,
+        cwd,
         packOnly: msg.packOnly,
         captureOutput: true,
         archiveDeployArtifact: true,
-        deployTrigger: "connect"
+        deployTrigger: "connect",
+        ...repositoryId ? { repositoryId } : {}
       };
       const output = await executeDeploy(deployOptions);
       if (output.trim()) {

package/dist/webide-message-worker.js

@@ -2718,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(
@@ -2728,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
@@ -2748,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 };
 }
 
@@ -3080,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);
@@ -3101,17 +3119,21 @@ async function ensureWebIdePullRequests(cfg, taskId, workdir) {
       "[apm] WebIDE PR\uFF1A\u8BFB\u53D6\u4ED3\u5E93\u6E05\u5355\u5931\u8D25:",
       err instanceof Error ? err.message : err
     );
-    return;
+    return { ensured: 0, skipped: 0, failed: 1 };
   }
   console.log(
     `[apm] WebIDE PR\uFF1A\u51C6\u5907\u4E3A ${repoRoots.length} \u4E2A\u4ED3\u5E93\u521B\u5EFA feat/task-${taskId}`
   );
+  let ensured = 0;
+  let skipped = 0;
+  let failed = 0;
   for (const gitRoot of repoRoots) {
     const label = formatRepoLabel(workdir, gitRoot);
     try {
       const originUrl = await tryReadGitOriginUrl(gitRoot);
       if (!originUrl) {
         console.warn(`[apm] WebIDE PR\uFF1A\u8DF3\u8FC7 ${label}\uFF08\u65E0 remote.origin.url\uFF09`);
+        skipped += 1;
         continue;
       }
       const matched = await api.cli.matchRepository({ url: originUrl });
@@ -3120,22 +3142,26 @@ async function ensureWebIdePullRequests(cfg, taskId, workdir) {
         console.warn(
           `[apm] WebIDE PR\uFF1A\u8DF3\u8FC7 ${label}\uFF08\u5E73\u53F0\u672A\u767B\u8BB0\u4ED3\u5E93 ${originUrl}\uFF09`
         );
+        skipped += 1;
         continue;
       }
       const pr = await api.cli.createWebIdeDraftPullRequest({
         taskId,
         repositoryId
       });
+      ensured += 1;
       console.log(
         `[apm] WebIDE PR\uFF1A${label} \u2192 #${pr.number} ${pr.state} ${pr.url || ""}`
       );
     } catch (err) {
+      failed += 1;
       console.warn(
         `[apm] WebIDE PR\uFF1A${label} \u5931\u8D25:`,
         err instanceof Error ? err.message : err
       );
     }
   }
+  return { ensured, skipped, failed };
 }
 
 // src/version.ts
@@ -3437,7 +3463,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);
@@ -3651,6 +3678,20 @@ 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}`
+        );
+      }
+      const prResult = await ensureWebIdePullRequests(cfg, taskId, workdir);
+      if (prResult.ensured === 0) {
+        const detail = prResult.failed > 0 ? `\u521B\u5EFA PR \u5931\u8D25\uFF08${prResult.failed} \u4E2A\u4ED3\u5E93\u51FA\u9519\uFF09` : "\u672A\u80FD\u521B\u5EFA PR\uFF1A\u672A\u5339\u914D\u5230\u53EF\u767B\u8BB0\u7684\u4ED3\u5E93\uFF0C\u8BF7\u68C0\u67E5\u5DE5\u4F5C\u533A git remote \u4E0E\u5E73\u53F0\u4ED3\u5E93\u767B\u8BB0";
+        throw new Error(detail);
+      }
+    }
     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.18",
+  "version": "7.1.20",
   "description": "命令行工具：后续用于调用平台后端 API 完成运维与自动化操作",
   "type": "module",
   "private": false,