ai-project-manage-cli 7.1.16 → 7.1.18

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");
 }
@@ -2681,14 +2774,29 @@ import {
   rmSync,
   writeFileSync as writeFileSync7
 } from "fs";
-import { dirname as dirname4, join as join6, relative as relative2, sep } from "path";
+import { createHash } from "crypto";
+import { dirname as dirname5, join as join6, relative as relative2, sep } from "path";
 var MANIFEST_FILE = "manifest.json";
-function projectDocumentsDir(apmRoot) {
-  return join6(apmRoot ?? workspaceApmDir(), "docs");
+function normalizeProjectIdForPath(projectId) {
+  const id = projectId.trim();
+  if (!id) {
+    throw new Error("projectId \u4E0D\u80FD\u4E3A\u7A7A");
+  }
+  if (id.includes("..") || id.includes("/") || id.includes("\\") || id.includes("\0")) {
+    throw new Error(`\u975E\u6CD5 projectId: ${projectId}`);
+  }
+  return id;
+}
+function projectDocumentsDir(apmRoot, projectId) {
+  const id = normalizeProjectIdForPath(projectId);
+  return join6(apmRoot ?? workspaceApmDir(), "project", id);
 }
-function projectDocumentLocalPath(apmRoot, documentPath) {
+function projectDocumentLocalPath(apmRoot, projectId, documentPath) {
   const normalized = normalizeLocalDocumentPath(documentPath);
-  return join6(projectDocumentsDir(apmRoot), ...normalized.split("/"));
+  return join6(
+    projectDocumentsDir(apmRoot, projectId),
+    ...normalized.split("/")
+  );
 }
 function normalizeLocalDocumentPath(path) {
   const trimmed = path.trim().replace(/\\/g, "/");
@@ -2701,8 +2809,14 @@ function normalizeLocalDocumentPath(path) {
   }
   return segments.join("/");
 }
-function readLocalManifest(apmRoot) {
-  const manifestPath3 = join6(projectDocumentsDir(apmRoot), MANIFEST_FILE);
+function hashLocalFileContent(content) {
+  return createHash("sha256").update(content, "utf8").digest("hex");
+}
+function readLocalManifest(apmRoot, projectId) {
+  const manifestPath3 = join6(
+    projectDocumentsDir(apmRoot, projectId),
+    MANIFEST_FILE
+  );
   if (!existsSync5(manifestPath3)) {
     return null;
   }
@@ -2714,6 +2828,29 @@ function readLocalManifest(apmRoot) {
     return null;
   }
 }
+function listLocalDocumentPaths(apmRoot, projectId) {
+  const root = projectDocumentsDir(apmRoot, projectId);
+  if (!existsSync5(root)) {
+    return [];
+  }
+  const paths = [];
+  const walk = (dir) => {
+    for (const entry of readdirSync3(dir, { withFileTypes: true })) {
+      const abs = join6(dir, entry.name);
+      if (entry.isDirectory()) {
+        walk(abs);
+        continue;
+      }
+      if (entry.isFile() && entry.name === MANIFEST_FILE) {
+        continue;
+      }
+      const rel = relative2(root, abs).split(sep).join("/");
+      paths.push(rel);
+    }
+  };
+  walk(root);
+  return paths.sort();
+}
 function diffManifestPaths(remote, local) {
   const remoteMap = new Map(
     (remote?.documents ?? []).map((doc) => [doc.path, doc.contentHash])
@@ -2735,7 +2872,11 @@ function diffManifestPaths(remote, local) {
   }
   return { download, deleteLocal };
 }
-async function resolveProjectIdForSync(api, workdirPath) {
+async function resolveProjectIdForSync(api, workdirPath, options) {
+  const explicit = options?.projectId?.trim();
+  if (explicit) {
+    return { projectId: explicit, diagnostic: null };
+  }
   try {
     const baseline = await api.cli.workspaceBaseline({ workdirPath });
     const projectId = baseline.projectId?.trim() || null;
@@ -2763,7 +2904,7 @@ async function resolveProjectIdForSync(api, workdirPath) {
     };
   }
 }
-async function syncProjectDocumentsPull(workdirPath, apmDir) {
+async function syncProjectDocumentsPull(workdirPath, apmDir, options) {
   const empty = {
     synced: false,
     projectId: null,
@@ -2780,7 +2921,8 @@ async function syncProjectDocumentsPull(workdirPath, apmDir) {
   const api = createApmApiClient(cfg);
   const { projectId, diagnostic } = await resolveProjectIdForSync(
     api,
-    workdirPath
+    workdirPath,
+    options
   );
   if (!projectId) {
     console.log(`[apm] \u672A\u80FD\u540C\u6B65\u9879\u76EE\u6587\u6863\u3002
@@ -2788,14 +2930,16 @@ ${diagnostic ?? ""}`);
     return empty;
   }
   const targetApmDir = apmDir ?? workspaceApmDir(workdirPath);
-  const docsDir = projectDocumentsDir(targetApmDir);
+  const docsDir = projectDocumentsDir(targetApmDir, projectId);
   await ensureDirExists(docsDir);
-  const { manifest: remoteManifest } = await api.cli.getProjectDocumentManifest({ projectId });
+  const { manifest: remoteManifest } = await api.cli.getProjectDocumentManifest(
+    { projectId }
+  );
   if (!remoteManifest) {
     console.log(`[apm] \u9879\u76EE ${projectId} \u65E0\u9879\u76EE\u6587\u6863 manifest\uFF0C\u8DF3\u8FC7\u540C\u6B65\u3002`);
     return { ...empty, projectId };
   }
-  const localManifest = readLocalManifest(targetApmDir);
+  const localManifest = readLocalManifest(targetApmDir, projectId);
   const { download, deleteLocal } = diffManifestPaths(
     remoteManifest,
     localManifest
@@ -2808,16 +2952,18 @@ ${diagnostic ?? ""}`);
     });
     for (const doc of list) {
       const absPath = toFsPath(
-        projectDocumentLocalPath(targetApmDir, doc.path)
+        projectDocumentLocalPath(targetApmDir, projectId, doc.path)
       );
-      await ensureDirExists(dirname4(absPath));
+      await ensureDirExists(dirname5(absPath));
       writeFileSync7(absPath, doc.content, "utf8");
       downloaded += 1;
     }
   }
   let deleted = 0;
   for (const path of deleteLocal) {
-    const absPath = toFsPath(projectDocumentLocalPath(targetApmDir, path));
+    const absPath = toFsPath(
+      projectDocumentLocalPath(targetApmDir, projectId, path)
+    );
     if (existsSync5(absPath)) {
       rmSync(absPath, { force: true });
       deleted += 1;
@@ -2830,7 +2976,7 @@ ${diagnostic ?? ""}`);
     "utf8"
   );
   console.log(
-    `[apm] \u5DF2\u540C\u6B65\u9879\u76EE\u6587\u6863: \u4E0B\u8F7D ${downloaded}\uFF0C\u5220\u9664\u672C\u5730 ${deleted}`
+    `[apm] \u5DF2\u540C\u6B65\u9879\u76EE\u6587\u6863: projectId=${projectId} \u4E0B\u8F7D ${downloaded}\uFF0C\u5220\u9664\u672C\u5730 ${deleted} \u2192 .apm/project/${projectId}/`
   );
   return {
     synced: true,
@@ -2839,6 +2985,53 @@ ${diagnostic ?? ""}`);
     deleted
   };
 }
+async function syncProjectDocumentsPush(cfg, workdirPath, apmRoot, options) {
+  const api = createApmApiClient(cfg);
+  const { projectId } = await resolveProjectIdForSync(
+    api,
+    workdirPath,
+    options
+  );
+  if (!projectId) {
+    return 0;
+  }
+  const targetApmDir = apmRoot ?? workspaceApmDir(workdirPath);
+  const localPaths = listLocalDocumentPaths(targetApmDir, projectId);
+  if (localPaths.length === 0) {
+    console.log("[apm] \u9879\u76EE\u6587\u6863\u65E0\u672C\u5730\u6587\u4EF6\uFF0C\u8DF3\u8FC7\u63A8\u9001");
+    return 0;
+  }
+  const remoteManifest = (await api.cli.getProjectDocumentManifest({ projectId })).manifest ?? null;
+  const remoteHashByPath = new Map(
+    (remoteManifest?.documents ?? []).map((doc) => [doc.path, doc.contentHash])
+  );
+  const remoteDescriptionByPath = new Map(
+    (remoteManifest?.documents ?? []).map((doc) => [doc.path, doc.description])
+  );
+  let synced = 0;
+  for (const path of localPaths) {
+    const absPath = toFsPath(
+      projectDocumentLocalPath(targetApmDir, projectId, path)
+    );
+    const content = readFileSync6(absPath, "utf8");
+    const contentHash = hashLocalFileContent(content);
+    if (remoteHashByPath.get(path) === contentHash) {
+      continue;
+    }
+    await api.cli.upsertProjectDocument({
+      projectId,
+      path,
+      content,
+      description: remoteDescriptionByPath.get(path) ?? void 0
+    });
+    synced += 1;
+    console.log(`[apm] \u5DF2\u540C\u6B65\u9879\u76EE\u6587\u6863: ${path}`);
+  }
+  if (synced === 0) {
+    console.log("[apm] \u9879\u76EE\u6587\u6863\u65E0\u53D8\u5316\uFF0C\u8DF3\u8FC7\u63A8\u9001");
+  }
+  return synced;
+}
 
 // src/commands/init.ts
 async function ensureWorkspaceInitialized(workdir, options) {
@@ -2947,11 +3140,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";
@@ -3285,7 +3478,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 });
@@ -3309,6 +3510,30 @@ async function handleWebIdeInboundMessage(cfg, msg, signal, options) {
     }
     if (signal.aborted) throw new Error("\u4EFB\u52A1\u5DF2\u53D6\u6D88");
     const api = createApmApiClient(cfg);
+    let projectId = null;
+    try {
+      const baseline = await api.cli.projectBaseBranch({ taskId });
+      projectId = baseline.projectId?.trim() || null;
+      if (projectId) {
+        const docs = await syncProjectDocumentsPull(workdir, void 0, {
+          projectId
+        });
+        if (docs.synced) {
+          console.log(
+            `[apm] webide \u9879\u76EE\u6587\u6863\u5DF2\u5C31\u7EEA projectId=${projectId} downloaded=${docs.downloaded} deleted=${docs.deleted}`
+          );
+        }
+      } else {
+        console.warn(
+          `[apm] WebIDE \u65E0\u6CD5\u89E3\u6790\u4EFB\u52A1\u6240\u5C5E\u9879\u76EE\uFF0C\u8DF3\u8FC7\u9879\u76EE\u6587\u6863\u540C\u6B65 taskId=${taskId}`
+        );
+      }
+    } catch (err) {
+      console.warn(
+        "[apm] WebIDE \u9879\u76EE\u6587\u6863\u540C\u6B65\u5931\u8D25:",
+        err instanceof Error ? err.message : err
+      );
+    }
     try {
       const attachments = await api.cli.webideListAttachments({ taskId });
       const names = await syncWebIdeAttachments(
@@ -3426,6 +3651,16 @@ async function handleWebIdeInboundMessage(cfg, msg, signal, options) {
         `[apm] webide \u81EA\u52A8 push action=${msg.action} repos=${pushed}`
       );
     }
+    if (projectId) {
+      try {
+        await syncProjectDocumentsPush(cfg, workdir, void 0, { projectId });
+      } catch (err) {
+        console.warn(
+          "[apm] WebIDE \u9879\u76EE\u6587\u6863\u63A8\u9001\u5931\u8D25:",
+          err instanceof Error ? err.message : err
+        );
+      }
+    }
     await logSyncRef.current?.markRun(outcome.runId, "finished");
     await updateStatus(cfg, messageId, "SUCCESS");
     console.log(

package/package.json

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

package/template/AGENTS.md

@@ -33,10 +33,11 @@
     - webide_testcase.md：WebIDE 生成测试用例时读取，按规范编写并提交用例
     - webide_merge.md：WebIDE 验收通过后读取；直接调用 MergeWebIdePullRequests 合并代码
 
-- 项目文档（`.apm/docs/`）:
+- 项目文档（`.apm/project/<项目ID>/`）:
 
-  - 索引: `.apm/docs/manifest.json` — 本项目在平台登记的文档列表
-  - 文档文件: `.apm/docs/{path}` — 与 manifest 中 path 对应；`apm pull` 自动同步，`apm connect` 消息结束后自动推回平台
+  - 索引: `.apm/project/<项目ID>/manifest.json` — 该项目在平台登记的文档列表
+  - 文档文件: `.apm/project/<项目ID>/{path}` — 与 manifest 中 path 对应；`apm pull` / Session `connect` 会同步；WebIDE 处理 `webide-message` 时按**任务所属项目**拉取到对应目录，结束后推回平台
+  - 部署/本地 dev：Read `.apm/project/<项目ID>/deploy.md`（完整路径以 prompt 为准）
   - 任务涉及菜单名、路由、业务术语等时，**先 Read manifest 与相关文档**，禁止猜测路径
 
 - 本轮任务需要关注的文档指引（.apm/sessions/<会话 ID>/\*）:

package/template/rules/webide_terminal.md

@@ -13,7 +13,7 @@
 
 ## 启动命令来源
 
-必须 Read `.apm/docs/deploy.md`，按文档中的 cwd / command / 服务划分调用 `StartWebIdeTerminal`。
+必须 Read `.apm/project/<项目ID>/deploy.md`（完整路径以本轮 prompt 中给出的为准，勿省略项目 ID），按文档中的 cwd / command / 服务划分调用 `StartWebIdeTerminal`。
 
 - 文档不存在或未写明启动方式 → 用 AppendMessage 说明无法启动本地环境，**禁止猜测命令**。
 
@@ -22,13 +22,13 @@
 固定顺序：
 
 1. **`ListWebIdeTerminals`**
-2. 若无活终端 → Read `deploy.md` → 按前后端分别 `StartWebIdeTerminal`；已有活终端则复用
+2. 若无活终端 → Read prompt 中的 `.apm/project/<项目ID>/deploy.md` 完整路径 → 按前后端分别 `StartWebIdeTerminal`；已有活终端则复用
 3. 等待 READY / 端口即可
 4. AppendMessage：可在「终端」面板观察本地日志；「浏览器」面板由平台打开本客户机外网地址（勿粘贴整段 stdout；无需 Agent 打开浏览器）
 
 后续改码（热更新）：有活终端则**复用，不重起**。
 
-显式重跑：`StopAllWebIdeTerminals` → 再 Read `deploy.md` → 重新 Start。
+显式重跑：`StopAllWebIdeTerminals` → 再 Read `.apm/project/<项目ID>/deploy.md` → 重新 Start。
 
 ## 规范