ai-project-manage-cli 7.1.12 → 7.1.15

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,10 +100,34 @@ 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"
+    }),
+    acquireSteelBrowser: defineEndpoint({
+      method: "POST",
+      path: "/cli/steel-browser/acquire"
+    }),
     branchBaseline: defineEndpoint({
       method: "GET",
       path: "/cli/tasks/branch-baseline"
     }),
+    projectBaseBranch: defineEndpoint({
+      method: "GET",
+      path: "/cli/tasks/project-base-branch"
+    }),
     listSessionsForBranchCleanup: defineEndpoint({
       method: "GET",
       path: "/cli/sessions/branch-cleanup"
@@ -140,21 +164,21 @@ var requestConfig = {
       method: "POST",
       path: "/cli/webide/pull-requests/merge"
     }),
-    getRepositoryProjectDocumentManifest: defineEndpoint({
+    getProjectDocumentManifest: defineEndpoint({
       method: "GET",
-      path: "/cli/repository-project-documents/manifest"
+      path: "/cli/project-documents/manifest"
     }),
-    listRepositoryProjectDocuments: defineEndpoint({
+    listProjectDocuments: defineEndpoint({
       method: "GET",
-      path: "/cli/repository-project-documents"
+      path: "/cli/project-documents"
     }),
-    upsertRepositoryProjectDocument: defineEndpoint({
+    upsertProjectDocument: defineEndpoint({
       method: "PUT",
-      path: "/cli/repository-project-documents/upsert"
+      path: "/cli/project-documents/upsert"
     }),
-    removeRepositoryProjectDocument: defineEndpoint({
+    removeProjectDocument: defineEndpoint({
       method: "DELETE",
-      path: "/cli/repository-project-documents"
+      path: "/cli/project-documents"
     }),
     createTaskDeployment: defineEndpoint({
       method: "POST",
@@ -191,6 +215,7 @@ import { homedir } from "os";
 import { join } from "path";
 var APM_CONFIG_DIR = join(homedir(), ".config", "apm");
 var APM_CONFIG_PATH = join(APM_CONFIG_DIR, "config.json");
+var DEFAULT_BASE_URL = "http://127.0.0.1:3000";
 function resolveClientMachineId(cfg) {
   return (cfg.clientMachineId ?? cfg.userId ?? "").trim();
 }
@@ -221,6 +246,33 @@ async function tryReadApmConfig() {
     return null;
   }
 }
+function defaultApmConfig() {
+  return {
+    baseUrl: DEFAULT_BASE_URL,
+    clientMachineId: "",
+    apiKey: ""
+  };
+}
+async function ensureApmConfig() {
+  const existing = await tryReadApmConfig();
+  if (existing) return existing;
+  const defaults = defaultApmConfig();
+  await writeApmConfig(defaults);
+  return defaults;
+}
+async function writeApmConfig(cfg) {
+  const clientMachineId = resolveClientMachineId(cfg);
+  const apiKey = resolveApiKey(cfg);
+  const normalized = {
+    baseUrl: cfg.baseUrl.trim().replace(/\/+$/, ""),
+    apiKey,
+    ...clientMachineId ? { clientMachineId } : {}
+  };
+  mkdirSync(APM_CONFIG_DIR, { recursive: true });
+  writeFileSync(APM_CONFIG_PATH, JSON.stringify(normalized, null, 2) + "\n", {
+    mode: 384
+  });
+}
 
 // src/api/client.ts
 function createApmApiClient(cfg) {
@@ -359,24 +411,6 @@ async function ensureRemoteBaselineBranch(cwd, baselineBranch) {
     `[apm] \u8FDC\u7A0B\u4E0D\u5B58\u5728\u57FA\u7EBF\u5206\u652F origin/${baselineBranch}\uFF0C\u8BF7\u786E\u8BA4\u4ED3\u5E93\u9ED8\u8BA4\u5206\u652F\u5DF2\u63A8\u9001\u5230 origin`
   );
 }
-async function resolveDefaultRemoteBranch(cwd) {
-  try {
-    const ref = (await execGit(cwd, ["symbolic-ref", "refs/remotes/origin/HEAD"], true)).trim();
-    const match = ref.match(/^refs\/remotes\/origin\/(.+)$/);
-    if (match?.[1]) {
-      return match[1];
-    }
-  } catch {
-  }
-  for (const candidate of ["main", "master"]) {
-    if (await remoteBranchExists(cwd, candidate)) {
-      return candidate;
-    }
-  }
-  throw new Error(
-    "[apm] \u65E0\u6CD5\u786E\u5B9A\u8FDC\u7A0B\u9ED8\u8BA4\u5206\u652F\uFF08origin/HEAD\u3001main\u3001master \u5747\u4E0D\u53EF\u7528\uFF09"
-  );
-}
 async function hasUpstream(cwd) {
   try {
     await execGit(cwd, ["rev-parse", "--abbrev-ref", "@{upstream}"], true);
@@ -557,6 +591,16 @@ function assertApmGitignoredInRepo(workdir) {
     );
   }
 }
+async function ensureLoggedConfig() {
+  const cfg = await ensureApmConfig();
+  if (!resolveApiKey(cfg)) {
+    console.error(
+      "[apm] \u672A\u68C0\u6D4B\u5230 API Key\uFF0C\u8BF7\u5148\u6267\u884C: apm login --api-key cm_xxx"
+    );
+    process.exit(1);
+  }
+  return cfg;
+}
 async function ensureDirExists(dir) {
   mkdirSync2(dir, { recursive: true });
 }
@@ -961,6 +1005,17 @@ async function runTaskBranch(taskId, options = {}) {
   if (!trimmedTaskId) {
     throw new Error("[apm] taskId \u4E0D\u80FD\u4E3A\u7A7A");
   }
+  const cfg = await ensureLoggedConfig();
+  const api = createApmApiClient(cfg);
+  const projectBaseline = await api.cli.projectBaseBranch({
+    taskId: trimmedTaskId
+  });
+  const baselineBranch = projectBaseline.baseBranch?.trim() ?? "";
+  if (!baselineBranch) {
+    throw new Error(
+      "[apm] \u9879\u76EE\u672A\u914D\u7F6E\u57FA\u7840\u5206\u652F\uFF0C\u65E0\u6CD5\u521B\u5EFA WebIDE \u7279\u6027\u5206\u652F"
+    );
+  }
   const cwd = options.cwd ?? process.cwd();
   const workdirPath = resolveWorkdirPath(cwd);
   const manifest = loadWorkspaceReposCache(workdirPath);
@@ -968,9 +1023,8 @@ async function runTaskBranch(taskId, options = {}) {
   const branch = branchNameForTask(trimmedTaskId);
   for (const gitRoot of repoRoots) {
     const label = formatRepoLabel(workdirPath, gitRoot);
-    const baselineBranch = await resolveDefaultRemoteBranch(gitRoot);
     console.log(
-      `[apm] \u4EFB\u52A1\u5206\u652F ${branch} @ ${label} (baseline=${baselineBranch})`
+      `[apm] \u4EFB\u52A1\u5206\u652F ${branch} @ ${label} (project baseline=${baselineBranch})`
     );
     await ensureFeatureBranch(branch, baselineBranch, {
       ...options,
@@ -1559,13 +1613,13 @@ ${payload}`;
 function createMergeWebIdePullRequestsTool(options) {
   const { cfg, taskId } = options;
   return {
-    description: "Merge all open pull requests for this WebIDE task after conflicts are resolved locally and pushed. Call once with no arguments. Do NOT call if conflicts contradict the task requirements \u2014 report the conflict and fail instead.",
+    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: you have checked each repo, resolved mergeable conflicts consistently with requirements, and pushed. If conflicts contradict requirements, do not call this tool."
+          description: "Must be true to confirm you intend to merge this task's open PRs now."
         }
       },
       required: ["confirmedConflictFree"]
@@ -1573,7 +1627,7 @@ function createMergeWebIdePullRequestsTool(options) {
     execute: async (args) => {
       if (args.confirmedConflictFree !== true) {
         throw new Error(
-          "MergeWebIdePullRequests \u8981\u6C42 confirmedConflictFree=true\u3002\u82E5\u5B58\u5728\u4E0E\u9700\u6C42\u76F8\u6096\u7684\u51B2\u7A81\uFF0C\u8BF7\u52FF\u8C03\u7528\u672C\u5DE5\u5177\uFF0C\u7528 AppendMessage \u8BF4\u660E\u5E76\u5931\u8D25\u7ED3\u675F\u3002"
+          "MergeWebIdePullRequests \u8981\u6C42 confirmedConflictFree=true\u3002"
         );
       }
       const api = createApmApiClient(cfg);
@@ -1627,7 +1681,7 @@ function createRecommendPlanTool(options) {
 function createUpsertWebIdePlanTool(options) {
   const { cfg, taskId } = options;
   return {
-    description: "Persist the implementation plan markdown for this WebIDE task and mark the plan as ready for human confirmation. Call once with the full plan document.",
+    description: "Persist or replace the implementation plan markdown for this WebIDE task and mark it ready for human confirmation. Call with the full plan document (not a diff). Use after generating or revising the plan.",
     inputSchema: {
       type: "object",
       properties: {
@@ -1738,6 +1792,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
@@ -1775,6 +1987,17 @@ function createCursorCustomTools(cfg, messageId, options) {
       cfg,
       taskId: options.taskId
     });
+    if (options.workdir) {
+      Object.assign(
+        tools,
+        createWebIdeTerminalTools({
+          cfg,
+          taskId: options.taskId,
+          workdir: options.workdir,
+          rpc: options.terminalRpc
+        })
+      );
+    }
   }
   return tools;
 }
@@ -1843,8 +2066,8 @@ async function obtainAgent(ctx) {
         settingSources: ["project"]
       } : {}
     },
-    ...ctx.mode ? { mode: ctx.mode } : {}
-    // mcpServers: createPlaywrightMcpServers(),
+    ...ctx.mode ? { mode: ctx.mode } : {},
+    ...ctx.mcpServers ? { mcpServers: ctx.mcpServers } : {}
   };
   const explicitAgentId = ctx.resumeAgentId?.trim();
   const savedAgentId = explicitAgentId || (ctx.user ? loadSessionAgentId(ctx.workdir, ctx.sessionId, ctx.user) : void 0);
@@ -1898,7 +2121,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);
@@ -1939,7 +2164,6 @@ async function runCursorAgent(cfg, ctx, options) {
   try {
     const run = await agent.send(prompt, {
       ...ctx.mode ? { mode: ctx.mode } : {},
-      // mcpServers: createPlaywrightMcpServers(),
       local: {
         ...options?.forceSend ? { force: true } : {},
         customTools
@@ -2081,11 +2305,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");
@@ -2094,16 +2318,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) {
@@ -2137,11 +2361,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 {
@@ -2435,7 +2659,7 @@ ${diagnostic ?? ""}
   return { synced: true, repositoryId, configName: config.name };
 }
 
-// src/repository-project-documents-sync.ts
+// src/project-documents-sync.ts
 import {
   existsSync as existsSync5,
   readdirSync as readdirSync3,
@@ -2446,7 +2670,7 @@ import {
 import { dirname as dirname4, join as join6, relative as relative2, sep } from "path";
 var MANIFEST_FILE = "manifest.json";
 function projectDocumentsDir(apmRoot) {
-  return join6(apmRoot ?? workspaceApmDir(), "project");
+  return join6(apmRoot ?? workspaceApmDir(), "docs");
 }
 function projectDocumentLocalPath(apmRoot, documentPath) {
   const normalized = normalizeLocalDocumentPath(documentPath);
@@ -2497,41 +2721,65 @@ function diffManifestPaths(remote, local) {
   }
   return { download, deleteLocal };
 }
-async function syncRepositoryProjectDocumentsPull(workdirPath, apmDir) {
+async function resolveProjectIdForSync(api, workdirPath) {
+  try {
+    const baseline = await api.cli.workspaceBaseline({ workdirPath });
+    const projectId = baseline.projectId?.trim() || null;
+    if (projectId) {
+      return { projectId, diagnostic: null };
+    }
+    const projectIds = baseline.projectIds ?? [];
+    if (projectIds.length === 0) {
+      return {
+        projectId: null,
+        diagnostic: baseline.diagnostic?.message ?? `\u5DE5\u4F5C\u7A7A\u95F4\u672A\u5173\u8054\u9879\u76EE\uFF0C\u65E0\u6CD5\u540C\u6B65\u9879\u76EE\u6587\u6863\uFF08\u76EE\u5F55\uFF1A${workdirPath}\uFF09\u3002
+\u8BF7\u5728\u5E73\u53F0\u5C06\u5DE5\u4F5C\u7A7A\u95F4\u5173\u8054\u5230\u552F\u4E00\u9879\u76EE\u3002`
+      };
+    }
+    return {
+      projectId: null,
+      diagnostic: `\u5DE5\u4F5C\u7A7A\u95F4\u5173\u8054\u4E86 ${projectIds.length} \u4E2A\u9879\u76EE\uFF0C\u65E0\u6CD5\u786E\u5B9A\u540C\u6B65\u76EE\u6807\u3002
+\u8BF7\u786E\u4FDD\u8BE5\u5DE5\u4F5C\u7A7A\u95F4\u53EA\u5173\u8054\u4E00\u4E2A\u9879\u76EE\u540E\u518D\u540C\u6B65\u9879\u76EE\u6587\u6863\u3002`
+    };
+  } catch (err) {
+    const detail = err instanceof Error ? err.message : String(err);
+    return {
+      projectId: null,
+      diagnostic: detail.replace(/^\[apm\]\s*/, "")
+    };
+  }
+}
+async function syncProjectDocumentsPull(workdirPath, apmDir) {
   const empty = {
     synced: false,
-    repositoryId: null,
+    projectId: null,
     downloaded: 0,
     deleted: 0
   };
   const cfg = await tryReadApmConfig();
   if (!cfg || !resolveApiKey(cfg)) {
     console.log(
-      "[apm] \u672A\u68C0\u6D4B\u5230\u767B\u5F55\u4FE1\u606F\uFF0C\u8DF3\u8FC7\u4ED3\u5E93\u9879\u76EE\u6587\u6863\u540C\u6B65\u3002\n[apm] \u8BF7\u5148\u6267\u884C apm login\u3002"
+      "[apm] \u672A\u68C0\u6D4B\u5230\u767B\u5F55\u4FE1\u606F\uFF0C\u8DF3\u8FC7\u9879\u76EE\u6587\u6863\u540C\u6B65\u3002\n[apm] \u8BF7\u5148\u6267\u884C apm login\u3002"
     );
     return empty;
   }
   const api = createApmApiClient(cfg);
-  const { repositoryId, diagnostic } = await resolveRepositoryIdForSync(
+  const { projectId, diagnostic } = await resolveProjectIdForSync(
     api,
     workdirPath
   );
-  if (!repositoryId) {
-    console.log(
-      `[apm] \u672A\u80FD\u540C\u6B65\u4ED3\u5E93\u9879\u76EE\u6587\u6863\u3002
-${diagnostic ?? ""}`
-    );
+  if (!projectId) {
+    console.log(`[apm] \u672A\u80FD\u540C\u6B65\u9879\u76EE\u6587\u6863\u3002
+${diagnostic ?? ""}`);
     return empty;
   }
   const targetApmDir = apmDir ?? workspaceApmDir(workdirPath);
-  const projectDir = projectDocumentsDir(targetApmDir);
-  await ensureDirExists(projectDir);
-  const { manifest: remoteManifest } = await api.cli.getRepositoryProjectDocumentManifest({ repositoryId });
+  const docsDir = projectDocumentsDir(targetApmDir);
+  await ensureDirExists(docsDir);
+  const { manifest: remoteManifest } = await api.cli.getProjectDocumentManifest({ projectId });
   if (!remoteManifest) {
-    console.log(
-      `[apm] \u4ED3\u5E93 ${repositoryId} \u65E0\u9879\u76EE\u6587\u6863 manifest\uFF0C\u8DF3\u8FC7\u540C\u6B65\u3002`
-    );
-    return { ...empty, repositoryId };
+    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 { download, deleteLocal } = diffManifestPaths(
@@ -2540,12 +2788,14 @@ ${diagnostic ?? ""}`
   );
   let downloaded = 0;
   if (download.length > 0) {
-    const { list } = await api.cli.listRepositoryProjectDocuments({
-      repositoryId,
+    const { list } = await api.cli.listProjectDocuments({
+      projectId,
       paths: download.join(",")
     });
     for (const doc of list) {
-      const absPath = toFsPath(projectDocumentLocalPath(targetApmDir, doc.path));
+      const absPath = toFsPath(
+        projectDocumentLocalPath(targetApmDir, doc.path)
+      );
       await ensureDirExists(dirname4(absPath));
       writeFileSync7(absPath, doc.content, "utf8");
       downloaded += 1;
@@ -2560,17 +2810,17 @@ ${diagnostic ?? ""}`
     }
   }
   writeFileSync7(
-    toFsPath(join6(projectDir, MANIFEST_FILE)),
+    toFsPath(join6(docsDir, MANIFEST_FILE)),
     `${JSON.stringify(remoteManifest, null, 2)}
 `,
     "utf8"
   );
   console.log(
-    `[apm] \u5DF2\u540C\u6B65\u4ED3\u5E93\u9879\u76EE\u6587\u6863: \u4E0B\u8F7D ${downloaded}\uFF0C\u5220\u9664\u672C\u5730 ${deleted}`
+    `[apm] \u5DF2\u540C\u6B65\u9879\u76EE\u6587\u6863: \u4E0B\u8F7D ${downloaded}\uFF0C\u5220\u9664\u672C\u5730 ${deleted}`
   );
   return {
     synced: true,
-    repositoryId,
+    projectId,
     downloaded,
     deleted
   };
@@ -2592,7 +2842,7 @@ async function ensureWorkspaceInitialized(workdir, options) {
   const apmDir = workspaceApmDir(workdir);
   await copyTemplateFiles(apmDir, workdir);
   const syncResult = await syncRemoteDeploymentConfig(workdir, apmDir);
-  await syncRepositoryProjectDocumentsPull(workdir, apmDir);
+  await syncProjectDocumentsPull(workdir, apmDir);
   const trimmedName = options?.name?.trim();
   if (trimmedName) {
     const apmConfigPath = toFsPath(join7(apmDir, "apm.config.json"));
@@ -2626,8 +2876,9 @@ function markBranchDone(sessionId, workdir) {
 var TEST_START_ACTIONS = /* @__PURE__ */ new Set([
   "generate-cases",
   "run-auto-test",
-  "skip-test",
-  "enter-manual-test"
+  // 跳过/直接进手工测试不发 Cursor，PR 延后到部署或验收
+  "deploy",
+  "accept"
 ]);
 function shouldEnsureWebIdePullRequests(action) {
   return TEST_START_ACTIONS.has(action);
@@ -2680,70 +2931,6 @@ async function ensureWebIdePullRequests(cfg, taskId, workdir) {
   }
 }
 
-// src/commands/connect/webide-baseline-sync.ts
-async function abortMergeOrRebase(cwd) {
-  try {
-    await execGit(cwd, ["merge", "--abort"], true);
-  } catch {
-  }
-  try {
-    await execGit(cwd, ["rebase", "--abort"], true);
-  } catch {
-  }
-}
-async function syncWebIdeBaselineOrFail(workdir) {
-  let repoRoots;
-  try {
-    const manifest = loadWorkspaceReposCache(workdir);
-    repoRoots = resolveWorkspaceRepoAbsolutePaths(manifest);
-  } catch (err) {
-    return {
-      ok: false,
-      error: `\u8BFB\u53D6\u5DE5\u4F5C\u533A\u4ED3\u5E93\u6E05\u5355\u5931\u8D25\uFF1A${err instanceof Error ? err.message : String(err)}`
-    };
-  }
-  const failures = [];
-  for (const repoRoot of repoRoots) {
-    const label = formatRepoLabel(workdir, repoRoot);
-    try {
-      const gitRoot = await resolveGitRepoRoot(repoRoot);
-      const baselineBranch = await resolveDefaultRemoteBranch(gitRoot);
-      await ensureRemoteBaselineBranch(gitRoot, baselineBranch);
-      const currentBranch = await getCurrentBranch(gitRoot);
-      console.log(
-        `[apm] webide accept sync ${label}: ${currentBranch} \u2190 origin/${baselineBranch}`
-      );
-      try {
-        await execGit(
-          gitRoot,
-          ["merge", `origin/${baselineBranch}`, "--no-edit"],
-          true
-        );
-      } catch (mergeErr) {
-        await abortMergeOrRebase(gitRoot);
-        const detail = mergeErr instanceof Error ? mergeErr.message : String(mergeErr);
-        failures.push(
-          `${label}\uFF1A\u5408\u5E76 origin/${baselineBranch} \u51B2\u7A81\uFF0C\u5DF2\u6267\u884C merge --abort \u64A4\u56DE\u672C\u6B21\u540C\u6B65\u3002${detail}`
-        );
-      }
-    } catch (err) {
-      failures.push(
-        `${label}\uFF1A${err instanceof Error ? err.message : String(err)}`
-      );
-    }
-  }
-  if (failures.length > 0) {
-    return {
-      ok: false,
-      error: [
-        "\u62C9\u53D6\u6700\u65B0\u57FA\u7EBF\u5931\u8D25\uFF0C\u5DF2\u64A4\u56DE\u672C\u6B21\u540C\u6B65\u64CD\u4F5C\uFF0C\u8BF7\u4EBA\u5DE5\u5904\u7406\u51B2\u7A81\u540E\u91CD\u8BD5\u9A8C\u6536\u5408\u5E76\u3002",
-        ...failures.map((f) => `- ${f}`)
-      ].join("\n")
-    };
-  }
-  return { ok: true };
-}
-
 // src/version.ts
 import { readFileSync as readFileSync8 } from "fs";
 import { dirname as dirname5, join as join8 } from "path";
@@ -2955,7 +3142,8 @@ var WEBIDE_CODE_CHANGE_ACTIONS = /* @__PURE__ */ new Set([
   "skip-plan",
   "start-develop",
   "fix-and-retest",
-  "report-defect"
+  "report-defect",
+  "deploy"
 ]);
 function shouldCommitAfterWebIdeMessage(action) {
   return WEBIDE_CODE_CHANGE_ACTIONS.has(action);
@@ -2972,7 +3160,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;
@@ -3018,22 +3206,6 @@ async function handleWebIdeInboundMessage(cfg, msg, signal) {
       if (signal.aborted) throw new Error("\u4EFB\u52A1\u5DF2\u53D6\u6D88");
       await ensureWebIdePullRequests(cfg, taskId, workdir);
     }
-    if (msg.action === "accept") {
-      if (signal.aborted) throw new Error("\u4EFB\u52A1\u5DF2\u53D6\u6D88");
-      const sync = await syncWebIdeBaselineOrFail(workdir);
-      if (!sync.ok) {
-        await setError(cfg, messageId, sync.error);
-        return;
-      }
-      try {
-        await pushWorkspaceRepos(workdir);
-      } catch (err) {
-        console.warn(
-          "[apm] webide accept \u540C\u6B65\u540E push \u5931\u8D25:",
-          err instanceof Error ? err.message : err
-        );
-      }
-    }
     const savedAgentId = loadWebIdeAgentId(workdir, taskId);
     const logSyncRef = { current: null };
     const outcome = await runCursorAgent(
@@ -3060,6 +3232,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(
@@ -3104,7 +3277,7 @@ async function handleWebIdeInboundMessage(cfg, msg, signal) {
       id: messageId,
       content: fallback
     });
-    if (msg.action === "write-plan" && outcome.createPlan && outcome.createPlan.trim()) {
+    if ((msg.action === "write-plan" || msg.action === "revise-plan") && outcome.createPlan && outcome.createPlan.trim()) {
       try {
         await api.cli.webideUpsertPlan({
           taskId,
@@ -3112,7 +3285,7 @@ async function handleWebIdeInboundMessage(cfg, msg, signal) {
         });
       } catch (err) {
         console.warn(
-          "[apm] write-plan \u8865\u5199\u8BA1\u5212\u5931\u8D25:",
+          `[apm] ${msg.action} \u8865\u5199\u8BA1\u5212\u5931\u8D25:`,
           err instanceof Error ? err.message : err
         );
       }
@@ -3154,19 +3327,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)
@@ -3175,7 +3397,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;