weacpx 0.3.0 → 0.3.2

package/README.md

@@ -145,6 +145,50 @@ hello
 | `weacpx stop` | 停止后台实例 |
 | `weacpx doctor` | 运行环境诊断 |
 | `weacpx version` | 查看当前版本 |
+| `weacpx workspace list` | 查看本机已注册的 workspace |
+| `weacpx workspace add [name]` | 把当前目录注册成 workspace；不传 `name` 时使用当前目录名 |
+| `weacpx workspace rm <name>` | 删除 workspace |
+
+`workspace` 也可以简写为 `ws`：
+
+```bash
+weacpx ws add
+weacpx ws list
+weacpx ws rm backend
+```
+
+### `workspace` CLI 怎么用
+
+`weacpx workspace` 用来在电脑本机维护 `~/.weacpx/config.json` 里的 `workspaces` 配置。它适合先在终端里注册常用项目目录，然后在微信里用 `--ws <name>` 直接引用。
+
+| 命令 | 说明 |
+|------|------|
+| `weacpx workspace list` | 列出已注册的 workspace 及其路径 |
+| `weacpx workspace add` | 把当前目录注册为 workspace，名称默认取当前目录名 |
+| `weacpx workspace add <name>` | 把当前目录注册为指定名称 |
+| `weacpx workspace rm <name>` | 删除指定 workspace |
+
+常见用法：
+
+```bash
+cd /absolute/path/to/backend
+weacpx workspace add backend
+
+cd /absolute/path/to/frontend
+weacpx ws add frontend
+
+weacpx ws list
+weacpx ws rm frontend
+```
+
+注册后，你可以在微信里直接使用：
+
+```text
+/ss codex --ws backend
+/ss new claude --ws frontend
+```
+
+注意：`workspace add` 总是注册**当前终端所在目录**；如果不传名称，会用当前目录名作为 workspace 名称。
 
 ### `doctor` 怎么用
 
@@ -274,6 +318,55 @@ README 里只保留用户视角的最常用命令。
 
 - [docs/weacpx-group-usage-guide.md](./docs/weacpx-group-usage-guide.md)
 
+
+### MCP 集成：外部 coordinator
+
+如果你想让 Codex、Claude Code 等外部 MCP host 直接使用 weacpx 的多 Agent 编排能力，可以把 `weacpx mcp-stdio` 配成一个 stdio MCP server。
+
+先启动 daemon：
+
+```bash
+weacpx start
+```
+
+MCP 配置推荐保持简单，不要在启动参数里绑定 workspace：
+
+```json
+{
+  "mcpServers": {
+    "weacpx": {
+      "command": "weacpx",
+      "args": ["mcp-stdio"]
+    }
+  }
+}
+```
+
+外部 host 调用 `delegate_request` 时传 `workingDirectory`，weacpx 会让被委派的 worker 在这个目录工作：
+
+```json
+{
+  "targetAgent": "claude",
+  "task": "审查这个改动的风险点",
+  "workingDirectory": "/absolute/path/to/your/repo"
+}
+```
+
+Windows 上如果 MCP host 不会帮你解析带参数的 `command`，把 `node.exe` 放在 `command`，把 weacpx 脚本和参数放在 `args`：
+
+```json
+{
+  "type": "stdio",
+  "command": "D:\\Users\\you\\.nvmd\\versions\\22.19.0\\node.exe",
+  "args": [
+    "E:\\projects\\weacpx\\dist\\cli.js",
+    "mcp-stdio"
+  ]
+}
+```
+
+更多身份规则、`workingDirectory` 语义、工具列表、流程图和故障排查见：[docs/external-mcp.md](./docs/external-mcp.md)。
+
 ## 常见场景
 
 ### 在手机上继续盯一个本地项目

package/dist/bridge/bridge-main.js

@@ -212,6 +212,115 @@ var init_spawn_command = __esm(() => {
   SCRIPT_FILE_PATTERN = /\.(c|m)?js$/i;
 });
 
+// src/transport/prompt-media.ts
+import { mkdtemp, open, rm, writeFile } from "node:fs/promises";
+import { tmpdir as defaultTmpdir } from "node:os";
+import path from "node:path";
+async function createStructuredPromptFile(text, media, deps = defaultStructuredPromptFileDeps) {
+  if (!media) {
+    return null;
+  }
+  if (media.type !== "image") {
+    throw new Error("prompt media type is not supported; only image media is supported");
+  }
+  const imageData = await deps.readImageFile(media.filePath, MAX_STRUCTURED_IMAGE_BYTES);
+  if (imageData.byteLength === 0) {
+    throw new Error("image prompt must not be empty");
+  }
+  if (imageData.byteLength > MAX_STRUCTURED_IMAGE_BYTES) {
+    throw new Error(`image prompt exceeds ${MAX_STRUCTURED_IMAGE_BYTES} bytes`);
+  }
+  const blocks = [];
+  if (text.trim().length > 0) {
+    blocks.push({ type: "text", text });
+  }
+  blocks.push({
+    type: "image",
+    mimeType: resolveImageMimeType(imageData, media.mimeType),
+    data: imageData.toString("base64")
+  });
+  let dir = "";
+  try {
+    dir = await deps.mkdtemp(path.join(deps.tmpdir(), "weacpx-acp-prompt-"));
+    const filePath = path.join(dir, "prompt.json");
+    await deps.writeFile(filePath, JSON.stringify(blocks), "utf8");
+    return {
+      filePath,
+      cleanup: async () => {
+        await deps.rm(dir, { recursive: true, force: true });
+      }
+    };
+  } catch (error) {
+    if (dir) {
+      try {
+        await deps.rm(dir, { recursive: true, force: true });
+      } catch {}
+    }
+    throw error;
+  }
+}
+async function readImageFileBounded(filePath, maxBytes) {
+  const handle = await open(filePath, "r");
+  try {
+    const imageStats = await handle.stat();
+    if (!imageStats.isFile()) {
+      throw new Error("image prompt path must be a regular file");
+    }
+    if (imageStats.size > maxBytes) {
+      throw new Error(`image prompt exceeds ${maxBytes} bytes`);
+    }
+    const chunks = [];
+    let total = 0;
+    let position = 0;
+    const chunkSize = 1024 * 1024;
+    while (total <= maxBytes) {
+      const buffer = Buffer.allocUnsafe(Math.min(chunkSize, maxBytes + 1 - total));
+      const { bytesRead } = await handle.read(buffer, 0, buffer.length, position);
+      if (bytesRead === 0)
+        break;
+      chunks.push(buffer.subarray(0, bytesRead));
+      total += bytesRead;
+      position += bytesRead;
+    }
+    return Buffer.concat(chunks, total);
+  } finally {
+    await handle.close();
+  }
+}
+function resolveImageMimeType(buffer, declaredMimeType) {
+  if (/^image\/[A-Za-z0-9.+-]+$/.test(declaredMimeType) && declaredMimeType !== "image/*") {
+    return declaredMimeType;
+  }
+  if (buffer.subarray(0, 8).equals(Buffer.from("89504e470d0a1a0a", "hex"))) {
+    return "image/png";
+  }
+  if (buffer.length >= 3 && buffer[0] === 255 && buffer[1] === 216 && buffer[2] === 255) {
+    return "image/jpeg";
+  }
+  const header6 = buffer.subarray(0, 6).toString("ascii");
+  if (header6 === "GIF87a" || header6 === "GIF89a") {
+    return "image/gif";
+  }
+  if (buffer.length >= 12 && buffer.subarray(0, 4).toString("ascii") === "RIFF" && buffer.subarray(8, 12).toString("ascii") === "WEBP") {
+    return "image/webp";
+  }
+  if (buffer.length >= 2 && buffer.subarray(0, 2).toString("ascii") === "BM") {
+    return "image/bmp";
+  }
+  return "image/png";
+}
+var MAX_STRUCTURED_IMAGE_BYTES, defaultStructuredPromptFileDeps;
+var init_prompt_media = __esm(() => {
+  MAX_STRUCTURED_IMAGE_BYTES = 100 * 1024 * 1024;
+  defaultStructuredPromptFileDeps = {
+    readImageFile: readImageFileBounded,
+    mkdtemp,
+    writeFile,
+    rm,
+    tmpdir: defaultTmpdir
+  };
+});
+
 // src/transport/streaming-prompt.ts
 function createStreamingPromptState(formatToolCalls = false) {
   return {
@@ -354,6 +463,7 @@ var init_streaming_prompt = __esm(() => {
 
 // src/recovery/discover-parent-package-paths.ts
 import { spawn } from "node:child_process";
+import { createRequire as createRequire2 } from "node:module";
 import { access } from "node:fs/promises";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
@@ -416,9 +526,9 @@ function isUnder(child, parent) {
   const p = parent.replace(/[\\/]+$/, "");
   return c === p || c.startsWith(p + "/") || c.startsWith(p + "\\");
 }
-async function defaultFsExists(path) {
+async function defaultFsExists(path2) {
   try {
-    await access(path);
+    await access(path2);
     return true;
   } catch {
     return false;
@@ -426,8 +536,8 @@ async function defaultFsExists(path) {
 }
 function defaultResolveFromCwd(name, cwd) {
   try {
-    const pkgJson = __require.resolve(`${name}/package.json`, {
-      paths: [cwd, ...__require.resolve.paths(name) ?? []]
+    const pkgJson = require2.resolve(`${name}/package.json`, {
+      paths: [cwd, ...require2.resolve.paths(name) ?? []]
     });
     return dirname(pkgJson);
   } catch {
@@ -480,11 +590,14 @@ async function defaultQueryPackageManagerRoot(tool) {
     });
   });
 }
-var init_discover_parent_package_paths = () => {};
+var require2;
+var init_discover_parent_package_paths = __esm(() => {
+  require2 = createRequire2(import.meta.url);
+});
 
 // src/process/terminate-process-tree.ts
 import { spawn as spawn2 } from "node:child_process";
-async function terminateProcessTree(pid, platform = process.platform, runCommand = defaultRunProcessCommand, killProcess = (targetPid, signal) => {
+async function terminateProcessTree(pid, options = {}, platform = process.platform, runCommand = defaultRunProcessCommand, killProcess = (targetPid, signal) => {
   process.kill(targetPid, signal);
 }, isProcessRunning = defaultIsProcessRunning) {
   if (pid <= 0) {
@@ -496,7 +609,7 @@ async function terminateProcessTree(pid, platform = process.platform, runCommand
     } catch {}
     return;
   }
-  const targetPid = pid > 0 ? -pid : pid;
+  const targetPid = options.detachedProcessGroup ? -pid : pid;
   try {
     killProcess(targetPid, "SIGTERM");
   } catch {
@@ -692,7 +805,7 @@ async function terminateAcpxQueueOwner(sessionId) {
     return;
   }
   if (typeof owner.pid === "number" && Number.isInteger(owner.pid) && owner.pid > 0) {
-    await terminateProcessTree(owner.pid);
+    await terminateProcessTree(owner.pid, { detachedProcessGroup: true });
   }
   await unlink(lockPath).catch(() => {});
 }
@@ -783,6 +896,7 @@ class BridgeRequestScheduler {
 // src/bridge/bridge-runtime.ts
 init_spawn_command();
 init_prompt_output();
+init_prompt_media();
 init_streaming_prompt();
 import { copyFile, readdir } from "node:fs/promises";
 import { homedir as homedir3 } from "node:os";
@@ -929,15 +1043,22 @@ class BridgeRuntime {
   }
   async prompt(input, onEvent) {
     await this.launchMcpQueueOwnerIfNeeded(input);
+    const structuredPrompt = await createStructuredPromptFile(input.text, input.media);
     const spawnSpec = resolveSpawnCommand(this.command, this.buildPromptArgs(input, [
       "prompt",
       "-s",
       input.name,
-      input.text
+      ...structuredPrompt ? ["--file", structuredPrompt.filePath] : [input.text]
     ]));
     const formatToolCalls = input.replyMode === "verbose";
-    const result = onEvent ? await this.runPromptCommand(spawnSpec.command, spawnSpec.args, onEvent, { formatToolCalls }) : await this.run(spawnSpec.command, spawnSpec.args);
-    return { text: getPromptText(result) };
+    try {
+      const result = onEvent ? await this.runPromptCommand(spawnSpec.command, spawnSpec.args, onEvent, { formatToolCalls }) : await this.run(spawnSpec.command, spawnSpec.args);
+      return { text: getPromptText(result) };
+    } finally {
+      try {
+        await structuredPrompt?.cleanup();
+      } catch {}
+    }
   }
   async launchMcpQueueOwnerIfNeeded(input) {
     if (!input.mcpCoordinatorSession) {
@@ -1331,6 +1452,7 @@ class BridgeServer {
           }
         });
       case "prompt":
+        const media = asOptionalPromptMedia(params.media);
         return await this.runtime.prompt({
           agent: requireString(params, "agent"),
           agentCommand: asOptionalString(params.agentCommand),
@@ -1338,8 +1460,9 @@ class BridgeServer {
           name: requireString(params, "name"),
           mcpCoordinatorSession: asOptionalString(params.mcpCoordinatorSession),
           mcpSourceHandle: asOptionalString(params.mcpSourceHandle),
-          text: requireString(params, "text"),
-          replyMode: asOptionalReplyMode(params.replyMode)
+          text: requirePromptText(params, media),
+          replyMode: asOptionalReplyMode(params.replyMode),
+          media
         }, (event) => {
           if (event.type === "prompt.segment") {
             writeLine?.(encodeBridgePromptSegmentEvent({
@@ -1445,6 +1568,16 @@ function requireString(params, key) {
   }
   return value;
 }
+function requirePromptText(params, media) {
+  const value = params.text;
+  if (typeof value !== "string") {
+    throw new BridgeInvalidRequestError("text must be a non-empty string");
+  }
+  if (value.length === 0 && media?.type !== "image") {
+    throw new BridgeInvalidRequestError("text must be a non-empty string unless image media is provided");
+  }
+  return value;
+}
 function requirePermissionMode(params, key) {
   const value = params[key];
   if (value === "approve-all" || value === "approve-reads" || value === "deny-all") {
@@ -1465,6 +1598,33 @@ function asOptionalString(value) {
   }
   return value;
 }
+function asOptionalPromptMedia(value) {
+  if (value === undefined) {
+    return;
+  }
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    throw new BridgeInvalidRequestError("media must be an object when provided");
+  }
+  const record = value;
+  const type = record.type;
+  const filePath = record.filePath;
+  const mimeType = record.mimeType;
+  if (type !== "image") {
+    throw new BridgeInvalidRequestError("media.type must be image");
+  }
+  if (typeof filePath !== "string" || filePath.length === 0) {
+    throw new BridgeInvalidRequestError("media.filePath must be a non-empty string");
+  }
+  if (typeof mimeType !== "string" || mimeType.length === 0) {
+    throw new BridgeInvalidRequestError("media.mimeType must be a non-empty string");
+  }
+  return {
+    type,
+    filePath,
+    mimeType,
+    ...typeof record.fileName === "string" && record.fileName.length > 0 ? { fileName: record.fileName } : {}
+  };
+}
 var VALID_REPLY_MODES = new Set(["stream", "final", "verbose"]);
 function asOptionalReplyMode(value) {
   if (typeof value !== "string" || !VALID_REPLY_MODES.has(value)) {