ai-project-manage-cli 7.1.11 → 7.1.13

package/dist/webide-message-worker.js

@@ -1,5 +1,5 @@
 // src/commands/connect/webide-message-worker.ts
-import { parentPort, workerData } from "node:worker_threads";
+import { parentPort as parentPort2, workerData } from "node:worker_threads";
 
 // src/api/client.ts
 import { createApiClient } from "listpage-http";
@@ -100,6 +100,22 @@ var requestConfig = {
       method: "PUT",
       path: "/cli/webide/test-cases"
     }),
+    webideListTerminals: defineEndpoint({
+      method: "GET",
+      path: "/cli/webide/terminals"
+    }),
+    webideUpsertTerminal: defineEndpoint({
+      method: "POST",
+      path: "/cli/webide/terminals"
+    }),
+    webideUpdateTerminalStatus: defineEndpoint({
+      method: "PUT",
+      path: "/cli/webide/terminals/status"
+    }),
+    webideUpdateTerminalMeta: defineEndpoint({
+      method: "PUT",
+      path: "/cli/webide/terminals/meta"
+    }),
     branchBaseline: defineEndpoint({
       method: "GET",
       path: "/cli/tasks/branch-baseline"
@@ -136,6 +152,10 @@ var requestConfig = {
       method: "POST",
       path: "/cli/webide/draft-pull-requests"
     }),
+    webideMergePullRequests: defineEndpoint({
+      method: "POST",
+      path: "/cli/webide/pull-requests/merge"
+    }),
     getRepositoryProjectDocumentManifest: defineEndpoint({
       method: "GET",
       path: "/cli/repository-project-documents/manifest"
@@ -381,6 +401,22 @@ async function hasUpstream(cwd) {
     return false;
   }
 }
+async function pushCurrentBranch(cwd) {
+  if (!await isGitRepo(cwd)) {
+    return false;
+  }
+  const originUrl = await tryReadGitOriginUrl(cwd);
+  if (!originUrl) {
+    console.log("[apm] \u672A\u914D\u7F6E remote.origin\uFF0C\u8DF3\u8FC7 push");
+    return false;
+  }
+  if (await hasUpstream(cwd)) {
+    await execGit(cwd, ["push"]);
+  } else {
+    await execGit(cwd, ["push", "-u", "origin", "HEAD"]);
+  }
+  return true;
+}
 var GITIGNORE_COMMIT_MESSAGE = "chore(apm): ignore .apm directory";
 async function commitAndPushGitignore(workdir) {
   if (!await isGitRepo(workdir)) {
@@ -390,17 +426,12 @@ async function commitAndPushGitignore(workdir) {
   await execGit(workdir, ["add", "--", ".gitignore"]);
   await execGit(workdir, ["commit", "-m", GITIGNORE_COMMIT_MESSAGE]);
   console.log(`[apm] \u5DF2\u63D0\u4EA4 .gitignore: ${GITIGNORE_COMMIT_MESSAGE}`);
-  const originUrl = await tryReadGitOriginUrl(workdir);
-  if (!originUrl) {
-    console.log("[apm] \u672A\u914D\u7F6E remote.origin\uFF0C\u8BF7\u7A0D\u540E\u624B\u52A8 push .gitignore");
-    return;
-  }
-  if (await hasUpstream(workdir)) {
-    await execGit(workdir, ["push"]);
+  const pushed = await pushCurrentBranch(workdir);
+  if (pushed) {
+    console.log("[apm] \u5DF2\u63A8\u9001 .gitignore");
   } else {
-    await execGit(workdir, ["push", "-u", "origin", "HEAD"]);
+    console.log("[apm] \u672A\u914D\u7F6E remote.origin\uFF0C\u8BF7\u7A0D\u540E\u624B\u52A8 push .gitignore");
   }
-  console.log("[apm] \u5DF2\u63A8\u9001 .gitignore");
 }
 
 // src/baseline-resolve.ts
@@ -854,6 +885,21 @@ async function commitWorkspaceReposIfDirty(workdir, message) {
   }
   return committed;
 }
+async function pushWorkspaceRepos(workdir) {
+  const workdirPath = resolveWorkdirPath(workdir);
+  const manifest = loadWorkspaceReposCache(workdirPath);
+  const repoRoots = resolveWorkspaceRepoAbsolutePaths(manifest);
+  let pushed = 0;
+  for (const gitRoot of repoRoots) {
+    const label = formatRepoLabel(workdirPath, gitRoot);
+    const did = await pushCurrentBranch(gitRoot);
+    if (did) {
+      pushed += 1;
+      console.log(`[apm] WebIDE \u5DF2 push @ ${label}`);
+    }
+  }
+  return pushed;
+}
 function branchNameForTask(taskId) {
   const id = taskId.trim();
   if (!id) {
@@ -1525,6 +1571,35 @@ ${payload}`;
   };
 }
 
+// src/commands/connect/webide-merge-tools.ts
+function createMergeWebIdePullRequestsTool(options) {
+  const { cfg, taskId } = options;
+  return {
+    description: "Merge all open pull requests for this WebIDE task. Call once with confirmedConflictFree=true. No baseline sync or review is required before calling.",
+    inputSchema: {
+      type: "object",
+      properties: {
+        confirmedConflictFree: {
+          type: "boolean",
+          description: "Must be true to confirm you intend to merge this task's open PRs now."
+        }
+      },
+      required: ["confirmedConflictFree"]
+    },
+    execute: async (args) => {
+      if (args.confirmedConflictFree !== true) {
+        throw new Error(
+          "MergeWebIdePullRequests \u8981\u6C42 confirmedConflictFree=true\u3002"
+        );
+      }
+      const api = createApmApiClient(cfg);
+      console.log(`[apm] MergeWebIdePullRequests taskId=${taskId}`);
+      const result = await api.cli.webideMergePullRequests({ taskId });
+      return JSON.stringify(result, null, 2);
+    }
+  };
+}
+
 // src/commands/connect/webide-plan-tools.ts
 function asString(value) {
   return typeof value === "string" ? value.trim() : "";
@@ -1679,6 +1754,164 @@ function createUpsertWebIdeTestCasesTool(options) {
   };
 }
 
+// src/commands/connect/webide-terminal-tools.ts
+function asString3(value) {
+  return typeof value === "string" ? value.trim() : "";
+}
+function asPorts(value) {
+  if (!Array.isArray(value)) return void 0;
+  const ports = value.map((p) => typeof p === "number" ? p : Number(p)).filter((p) => Number.isFinite(p) && p > 0 && p < 65536).map((p) => Math.trunc(p));
+  return ports.length ? ports : void 0;
+}
+function createWebIdeTerminalTools(options) {
+  const { cfg, taskId, workdir, rpc } = options;
+  const StartWebIdeTerminal = {
+    description: "Start a long-running WebIDE terminal (e.g. frontend/backend dev server). Process outlives this message. Same key already RUNNING/READY returns idempotently. Do NOT use Shell for long-lived dev servers. Returns terminalId, pid, ports.",
+    inputSchema: {
+      type: "object",
+      properties: {
+        key: {
+          type: "string",
+          description: "Stable key, e.g. frontend / backend"
+        },
+        name: { type: "string", description: "Display name" },
+        cwd: {
+          type: "string",
+          description: "Working directory (absolute or under workspace)"
+        },
+        command: {
+          type: "string",
+          description: "Shell command to run, e.g. pnpm dev"
+        },
+        readyPattern: {
+          type: "string",
+          description: "Optional regex; when matched in logs, status becomes READY"
+        },
+        portsHint: {
+          type: "array",
+          items: { type: "number" },
+          description: "Optional expected listen ports"
+        }
+      },
+      required: ["key", "cwd", "command"]
+    },
+    execute: async (args) => {
+      const key = asString3(args.key);
+      const cwd = asString3(args.cwd) || workdir;
+      const command = asString3(args.command);
+      if (!key || !command) {
+        return {
+          content: [{ type: "text", text: "key / command \u4E0D\u80FD\u4E3A\u7A7A" }],
+          isError: true
+        };
+      }
+      try {
+        const result = rpc ? await rpc.start({
+          taskId,
+          key,
+          name: asString3(args.name) || void 0,
+          cwd,
+          command,
+          readyPattern: asString3(args.readyPattern) || void 0,
+          portsHint: asPorts(args.portsHint)
+        }) : await (async () => {
+          throw new Error("Terminal RPC \u4E0D\u53EF\u7528\uFF08\u9700\u5728 connect \u4E3B\u8FDB\u7A0B\uFF09");
+        })();
+        return JSON.stringify(result, null, 2);
+      } catch (err) {
+        const detail = err instanceof Error ? err.message : String(err);
+        return {
+          content: [{ type: "text", text: `\u542F\u52A8\u7EC8\u7AEF\u5931\u8D25: ${detail}` }],
+          isError: true
+        };
+      }
+    }
+  };
+  const StopWebIdeTerminal = {
+    description: "Stop a WebIDE terminal and kill its process tree. Soft-terminates (status EXITED, record kept).",
+    inputSchema: {
+      type: "object",
+      properties: {
+        key: { type: "string", description: "Terminal key" },
+        terminalId: { type: "string", description: "Server terminal id" }
+      }
+    },
+    execute: async (args) => {
+      const key = asString3(args.key) || void 0;
+      const terminalId = asString3(args.terminalId) || void 0;
+      if (!key && !terminalId) {
+        return {
+          content: [{ type: "text", text: "\u9700\u8981 key \u6216 terminalId" }],
+          isError: true
+        };
+      }
+      try {
+        const result = rpc ? await rpc.stop({ taskId, key, terminalId }) : await (async () => {
+          throw new Error("Terminal RPC \u4E0D\u53EF\u7528\uFF08\u9700\u5728 connect \u4E3B\u8FDB\u7A0B\uFF09");
+        })();
+        return JSON.stringify(result, null, 2);
+      } catch (err) {
+        const detail = err instanceof Error ? err.message : String(err);
+        return {
+          content: [{ type: "text", text: `\u505C\u6B62\u7EC8\u7AEF\u5931\u8D25: ${detail}` }],
+          isError: true
+        };
+      }
+    }
+  };
+  const StopAllWebIdeTerminals = {
+    description: "Stop all living WebIDE terminals for the current task (kill process trees). Use before re-running local dev to avoid port conflicts. Soft-terminates records.",
+    inputSchema: {
+      type: "object",
+      properties: {}
+    },
+    execute: async () => {
+      try {
+        const result = rpc ? await rpc.stopAll({ taskId }) : await (async () => {
+          throw new Error("Terminal RPC \u4E0D\u53EF\u7528\uFF08\u9700\u5728 connect \u4E3B\u8FDB\u7A0B\uFF09");
+        })();
+        return JSON.stringify(result, null, 2);
+      } catch (err) {
+        const detail = err instanceof Error ? err.message : String(err);
+        return {
+          content: [{ type: "text", text: `\u5168\u90E8\u505C\u6B62\u5931\u8D25: ${detail}` }],
+          isError: true
+        };
+      }
+    }
+  };
+  const ListWebIdeTerminals = {
+    description: "List living WebIDE terminals for the current task (STARTING/RUNNING/READY/STOPPING only). Does NOT include EXITED/FAILED. Returns id, key, status, pid, ports.",
+    inputSchema: {
+      type: "object",
+      properties: {}
+    },
+    execute: async () => {
+      try {
+        if (rpc) {
+          const result2 = await rpc.list({ taskId });
+          return JSON.stringify(result2, null, 2);
+        }
+        const api = createApmApiClient(cfg);
+        const result = await api.cli.webideListTerminals({ taskId });
+        return JSON.stringify(result, null, 2);
+      } catch (err) {
+        const detail = err instanceof Error ? err.message : String(err);
+        return {
+          content: [{ type: "text", text: `\u5217\u51FA\u7EC8\u7AEF\u5931\u8D25: ${detail}` }],
+          isError: true
+        };
+      }
+    }
+  };
+  return {
+    StartWebIdeTerminal,
+    StopWebIdeTerminal,
+    StopAllWebIdeTerminals,
+    ListWebIdeTerminals
+  };
+}
+
 // src/commands/connect/cursor-custom-tools.ts
 var PLAN_MODE_ASK_QUESTION_HINT = `[SDK \u73AF\u5883\u8BF4\u660E]
 AskQuestion \u5DF2\u901A\u8FC7 MCP \u670D\u52A1\u5668 custom-user-tools \u6CE8\u518C\uFF0C\u5DE5\u5177\u540D\u4E3A AskQuestion\u3002
@@ -1712,6 +1945,21 @@ function createCursorCustomTools(cfg, messageId, options) {
       cfg,
       taskId: options.taskId
     });
+    tools.MergeWebIdePullRequests = createMergeWebIdePullRequestsTool({
+      cfg,
+      taskId: options.taskId
+    });
+    if (options.workdir) {
+      Object.assign(
+        tools,
+        createWebIdeTerminalTools({
+          cfg,
+          taskId: options.taskId,
+          workdir: options.workdir,
+          rpc: options.terminalRpc
+        })
+      );
+    }
   }
   return tools;
 }
@@ -1835,7 +2083,9 @@ async function runCursorAgent(cfg, ctx, options) {
     appendMessageContent: options?.appendMessageContent,
     askQuestionExecute: options?.askQuestionExecute,
     enableWebIdePlanTools: options?.enableWebIdePlanTools,
-    taskId: options?.taskId
+    taskId: options?.taskId,
+    workdir,
+    terminalRpc: options?.terminalRpc
   });
   const enableSandbox = Boolean(options?.enableSandbox);
   let prompt = withPlanModeToolHint(ctx.prompt, ctx.mode);
@@ -2018,11 +2268,11 @@ function clearWebIdeAgentId(workdir, taskId) {
 // src/commands/connect/webide-ask-question.ts
 import { setTimeout as delay } from "node:timers/promises";
 var POLL_INTERVAL_MS = 2e3;
-function asString3(value) {
+function asString4(value) {
   return typeof value === "string" ? value.trim() : "";
 }
 function parseQuestions(args) {
-  const title = asString3(args.title) || void 0;
+  const title = asString4(args.title) || void 0;
   const raw = args.questions;
   if (!Array.isArray(raw) || raw.length === 0) {
     throw new Error("AskQuestion \u7F3A\u5C11 questions");
@@ -2031,16 +2281,16 @@ function parseQuestions(args) {
   for (const item of raw) {
     if (!item || typeof item !== "object" || Array.isArray(item)) continue;
     const row = item;
-    const id = asString3(row.id);
-    const prompt = asString3(row.prompt);
+    const id = asString4(row.id);
+    const prompt = asString4(row.prompt);
     const optionsRaw = row.options;
     if (!id || !prompt || !Array.isArray(optionsRaw)) continue;
     const options = [];
     for (const opt of optionsRaw) {
       if (!opt || typeof opt !== "object" || Array.isArray(opt)) continue;
       const o = opt;
-      const oid = asString3(o.id);
-      const label = asString3(o.label);
+      const oid = asString4(o.id);
+      const label = asString4(o.label);
       if (oid && label) options.push({ id: oid, label });
     }
     if (options.length < 2) {
@@ -2074,11 +2324,11 @@ function createWebIdeAskQuestionExecute(options) {
       const byId = new Map(
         list.assumptions.map((a) => [a.questionId, a])
       );
-      const pending = parsed.questions.filter((q) => {
+      const pending2 = parsed.questions.filter((q) => {
         const row = byId.get(q.id);
         return !row || row.status !== "RESOLVED";
       });
-      if (pending.length === 0) {
+      if (pending2.length === 0) {
         const answers = parsed.questions.map((q) => {
           const row = byId.get(q.id);
           return {
@@ -2559,12 +2809,18 @@ function markBranchDone(sessionId, workdir) {
   lastBranchKey = sessionWorkdirKey(sessionId, workdir);
 }
 
-// src/commands/connect/webide-draft-prs.ts
-var DEVELOP_ACTIONS = /* @__PURE__ */ new Set(["start-develop", "skip-plan"]);
-function shouldEnsureWebIdeDraftPullRequests(action) {
-  return DEVELOP_ACTIONS.has(action);
+// src/commands/connect/webide-pull-requests.ts
+var TEST_START_ACTIONS = /* @__PURE__ */ new Set([
+  "generate-cases",
+  "run-auto-test",
+  // 跳过/直接进手工测试不发 Cursor，PR 延后到部署或验收
+  "deploy",
+  "accept"
+]);
+function shouldEnsureWebIdePullRequests(action) {
+  return TEST_START_ACTIONS.has(action);
 }
-async function ensureWebIdeDraftPullRequests(cfg, taskId, workdir) {
+async function ensureWebIdePullRequests(cfg, taskId, workdir) {
   const api = createApmApiClient(cfg);
   let repoRoots;
   try {
@@ -2572,29 +2828,27 @@ async function ensureWebIdeDraftPullRequests(cfg, taskId, workdir) {
     repoRoots = resolveWorkspaceRepoAbsolutePaths(manifest);
   } catch (err) {
     console.warn(
-      "[apm] WebIDE \u8349\u7A3F PR\uFF1A\u8BFB\u53D6\u4ED3\u5E93\u6E05\u5355\u5931\u8D25:",
+      "[apm] WebIDE PR\uFF1A\u8BFB\u53D6\u4ED3\u5E93\u6E05\u5355\u5931\u8D25:",
       err instanceof Error ? err.message : err
     );
     return;
   }
   console.log(
-    `[apm] WebIDE \u8349\u7A3F PR\uFF1A\u51C6\u5907\u4E3A ${repoRoots.length} \u4E2A\u4ED3\u5E93\u521B\u5EFA feat/task-${taskId}`
+    `[apm] WebIDE PR\uFF1A\u51C6\u5907\u4E3A ${repoRoots.length} \u4E2A\u4ED3\u5E93\u521B\u5EFA feat/task-${taskId}`
   );
   for (const gitRoot of repoRoots) {
     const label = formatRepoLabel(workdir, gitRoot);
     try {
       const originUrl = await tryReadGitOriginUrl(gitRoot);
       if (!originUrl) {
-        console.warn(
-          `[apm] WebIDE \u8349\u7A3F PR\uFF1A\u8DF3\u8FC7 ${label}\uFF08\u65E0 remote.origin.url\uFF09`
-        );
+        console.warn(`[apm] WebIDE PR\uFF1A\u8DF3\u8FC7 ${label}\uFF08\u65E0 remote.origin.url\uFF09`);
         continue;
       }
       const matched = await api.cli.matchRepository({ url: originUrl });
       const repositoryId = matched.repositoryId?.trim();
       if (!repositoryId) {
         console.warn(
-          `[apm] WebIDE \u8349\u7A3F PR\uFF1A\u8DF3\u8FC7 ${label}\uFF08\u5E73\u53F0\u672A\u767B\u8BB0\u4ED3\u5E93 ${originUrl}\uFF09`
+          `[apm] WebIDE PR\uFF1A\u8DF3\u8FC7 ${label}\uFF08\u5E73\u53F0\u672A\u767B\u8BB0\u4ED3\u5E93 ${originUrl}\uFF09`
         );
         continue;
       }
@@ -2603,11 +2857,11 @@ async function ensureWebIdeDraftPullRequests(cfg, taskId, workdir) {
         repositoryId
       });
       console.log(
-        `[apm] WebIDE \u8349\u7A3F PR\uFF1A${label} \u2192 #${pr.number} ${pr.state} ${pr.url || ""}`
+        `[apm] WebIDE PR\uFF1A${label} \u2192 #${pr.number} ${pr.state} ${pr.url || ""}`
       );
     } catch (err) {
       console.warn(
-        `[apm] WebIDE \u8349\u7A3F PR\uFF1A${label} \u5931\u8D25:`,
+        `[apm] WebIDE PR\uFF1A${label} \u5931\u8D25:`,
         err instanceof Error ? err.message : err
       );
     }
@@ -2824,7 +3078,9 @@ function markSkillsSyncedForCliVersion(workdir, cliVersion) {
 var WEBIDE_CODE_CHANGE_ACTIONS = /* @__PURE__ */ new Set([
   "skip-plan",
   "start-develop",
-  "fix-and-retest"
+  "fix-and-retest",
+  "report-defect",
+  "deploy"
 ]);
 function shouldCommitAfterWebIdeMessage(action) {
   return WEBIDE_CODE_CHANGE_ACTIONS.has(action);
@@ -2841,7 +3097,7 @@ async function appendContent(cfg, messageId, content) {
   const api = createApmApiClient(cfg);
   await api.cli.webideAppendMessageContent({ id: messageId, content });
 }
-async function handleWebIdeInboundMessage(cfg, msg, signal) {
+async function handleWebIdeInboundMessage(cfg, msg, signal, options) {
   const workdir = requireRemoteWorkdir(msg.workdir);
   const messageId = msg.messageId;
   const taskId = msg.taskId;
@@ -2878,9 +3134,14 @@ async function handleWebIdeInboundMessage(cfg, msg, signal) {
         `[apm] step=branch skipped taskId=${taskId} workdir=${workdir}`
       );
     }
-    if (shouldEnsureWebIdeDraftPullRequests(msg.action)) {
+    if (shouldEnsureWebIdePullRequests(msg.action)) {
       if (signal.aborted) throw new Error("\u4EFB\u52A1\u5DF2\u53D6\u6D88");
-      await ensureWebIdeDraftPullRequests(cfg, taskId, workdir);
+      const pushed = await pushWorkspaceRepos(workdir);
+      console.log(
+        `[apm] webide \u6D4B\u8BD5\u524D push action=${msg.action} repos=${pushed}`
+      );
+      if (signal.aborted) throw new Error("\u4EFB\u52A1\u5DF2\u53D6\u6D88");
+      await ensureWebIdePullRequests(cfg, taskId, workdir);
     }
     const savedAgentId = loadWebIdeAgentId(workdir, taskId);
     const logSyncRef = { current: null };
@@ -2908,6 +3169,7 @@ async function handleWebIdeInboundMessage(cfg, msg, signal) {
         // 本地 SDK sandbox 会拦截 custom-user-tools MCP，WebIDE 先关闭
         enableSandbox: false,
         taskId,
+        terminalRpc: options?.terminalRpc,
         createRemoteLogSync: (agentId) => {
           saveWebIdeAgentId(workdir, taskId, agentId);
           logSyncRef.current = createThrottledWebIdeMessageLogSync(
@@ -2974,6 +3236,11 @@ async function handleWebIdeInboundMessage(cfg, msg, signal) {
       console.log(
         `[apm] webide \u515C\u5E95 commit action=${msg.action} repos=${committed}`
       );
+      if (signal.aborted) throw new Error("\u4EFB\u52A1\u5DF2\u53D6\u6D88");
+      const pushed = await pushWorkspaceRepos(workdir);
+      console.log(
+        `[apm] webide \u81EA\u52A8 push action=${msg.action} repos=${pushed}`
+      );
     }
     await logSyncRef.current?.markRun(outcome.runId, "finished");
     await updateStatus(cfg, messageId, "SUCCESS");
@@ -2997,19 +3264,68 @@ async function handleWebIdeInboundMessage(cfg, msg, signal) {
   }
 }
 
+// src/commands/connect/webide-terminal-rpc.ts
+import { parentPort } from "node:worker_threads";
+var nextId = 1;
+var pending = /* @__PURE__ */ new Map();
+function installTerminalRpcListener() {
+  parentPort?.on("message", (raw) => {
+    if (!raw || raw.type !== "terminal-rpc-result") return;
+    const p = pending.get(raw.id);
+    if (!p) return;
+    pending.delete(raw.id);
+    if (raw.ok) p.resolve(raw.result);
+    else p.reject(new Error(raw.error || "terminal rpc failed"));
+  });
+}
+function call(op, args) {
+  const id = nextId++;
+  return new Promise((resolve6, reject) => {
+    if (!parentPort) {
+      reject(new Error("parentPort \u4E0D\u53EF\u7528"));
+      return;
+    }
+    pending.set(id, { resolve: resolve6, reject });
+    parentPort.postMessage({
+      type: "terminal-rpc",
+      id,
+      op,
+      args
+    });
+    setTimeout(() => {
+      if (pending.has(id)) {
+        pending.delete(id);
+        reject(new Error(`terminal rpc timeout op=${op}`));
+      }
+    }, 12e4);
+  });
+}
+function createWorkerTerminalRpc() {
+  return {
+    start: (args) => call("start", args),
+    stop: (args) => call("stop", args),
+    stopAll: (args) => call("stopAll", args),
+    list: (args) => call("list", args)
+  };
+}
+
 // src/commands/connect/webide-message-worker.ts
 var controllers = /* @__PURE__ */ new Map();
+installTerminalRpcListener();
+var terminalRpc = createWorkerTerminalRpc();
 async function runJob(cfg, msg) {
   const controller = new AbortController();
   controllers.set(msg.messageId, controller);
   try {
-    await handleWebIdeInboundMessage(cfg, msg, controller.signal);
-    parentPort?.postMessage({
+    await handleWebIdeInboundMessage(cfg, msg, controller.signal, {
+      terminalRpc
+    });
+    parentPort2?.postMessage({
       type: "done",
       messageId: msg.messageId
     });
   } catch (err) {
-    parentPort?.postMessage({
+    parentPort2?.postMessage({
       type: "error",
       messageId: msg.messageId,
       error: err instanceof Error ? err.message : String(err)
@@ -3018,7 +3334,7 @@ async function runJob(cfg, msg) {
     controllers.delete(msg.messageId);
   }
 }
-parentPort?.on("message", (raw) => {
+parentPort2?.on("message", (raw) => {
   if (raw.type === "cancel") {
     controllers.get(raw.messageId)?.abort();
     return;

package/package.json

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

package/template/AGENTS.md

@@ -29,8 +29,9 @@
   - 规则: `.apm/rules/*`
     - reply.md：当需要回复消息时需要读取这个文档，记住回复规则
     - write_doc.md：当需要写文档时需要读取这个文档，记住写文档的规则
-    - webide_git_commit.md：WebIDE 开发/修码时读取，按规范分轮 commit
+    - webide_git_commit.md：WebIDE 开发/修码时读取，按规范分轮 commit，结束前 push
     - webide_testcase.md：WebIDE 生成测试用例时读取，按规范编写并提交用例
+    - webide_merge.md：WebIDE 验收通过后读取；直接调用 MergeWebIdePullRequests 合并代码
 
 - 仓库项目上下文（`.apm/project/`）:
 

package/template/rules/webide_git_commit.md

@@ -10,4 +10,7 @@
 
 ### 结束前检查
 
-本轮全部工作结束前，确认工作区干净（`git status` 无未提交变更）；若仍有残留改动，补一次 commit。
+本轮全部工作结束前：
+
+1. 确认工作区干净（`git status` 无未提交变更）；若仍有残留改动，补一次 commit。
+2. 将当前分支推送到远程：已有 upstream 用 `git push`，否则 `git push -u origin HEAD`。多仓工作区时，只 push 实际有新 commit 的仓库。

package/template/rules/webide_merge.md

@@ -0,0 +1,16 @@
+## WebIDE 合并规范
+
+适用场景：WebIDE 验收通过（`accept`）后合并本任务 PR。
+
+### 目标
+
+将本任务各仓库特性分支上的变更合并进基线分支（通常为 `main`）。
+
+### 步骤
+
+1. 调用一次 `MergeWebIdePullRequests`（`confirmedConflictFree=true`），由平台合并本任务全部 OPEN PR。
+2. 用 `AppendMessage` 汇总合并结果（PR 编号、仓库）。
+
+### 禁止
+
+- 在合并之外自行执行同步基线、代码审核、部署等额外流程

package/template/rules/webide_terminal.md

@@ -0,0 +1,35 @@
+# WebIDE 长驻终端
+
+长驻进程（如前后端 `dev`）必须用自定义工具管理，**禁止**用 Shell 启动会长期占用的 dev server。
+
+## 工具
+
+- `StartWebIdeTerminal`：`{ key, name?, cwd, command, readyPattern?, portsHint? }`
+  - `key` 稳定标识，如 `frontend` / `backend`；同 key 已在跑（RUNNING/READY）则幂等返回
+  - 进程挂在 CLI 主进程，跨多轮消息存活
+- `StopWebIdeTerminal`：`{ key }` 或 `{ terminalId }`；杀进程树，状态改为 EXITED（不删记录）
+- `StopAllWebIdeTerminals`：停掉本 task 全部仍存活的终端（重跑本地环境前使用）
+- `ListWebIdeTerminals`：列出**存活**终端（STARTING / RUNNING / READY / STOPPING），**不含** EXITED / FAILED
+
+## 启动命令来源
+
+必须 Read `.apm/project/deploy.md`，按文档中的 cwd / command / 服务划分调用 `StartWebIdeTerminal`。
+
+- 文档不存在或未写明启动方式 → 用 AppendMessage 说明无法启动本地环境，**禁止猜测命令**。
+
+## 时机
+
+1. **首次**（`start-develop` / 跳过计划后的开发轮次）：实现完成后需要本地环境时
+   - 先 `ListWebIdeTerminals`
+   - 若无活终端 → Read `deploy.md` → 按前后端分别 `StartWebIdeTerminal`
+   - 等待 READY / 端口出现后，告知用户可在 WebIDE「终端」面板观察日志（勿粘贴整段 stdout）
+2. **后续改码**（热更新）：有活终端则**复用，不重起**
+3. **显式重跑**（端口冲突、命令变更、或平台「重跑本地环境」指令）：  
+   `StopAllWebIdeTerminals` → 再 Read `deploy.md` → 重新 Start  
+   不要在已死进程上糊弄；需要换命令时也是先停再建
+
+## 规范
+
+1. 禁止用 Shell / 后台进程方式起 `dev` / `serve` 等长驻命令。
+2. 观察日志请用户看 WebIDE「终端」面板。
+3. 任务结束或不再需要时可 Stop；不要留下孤儿进程。