weacpx 0.1.1 → 0.1.2

package/README.md

@@ -1,31 +1,17 @@
 # weacpx 
 
-通过微信 ClawBot 远程控制通过 `acpx` 控制 Claude Code、Codex 等 Agents。
-
-## weacpx 是什么
-
-`weacpx` 基于以下组件工作：
-
-- `weixin-agent-sdk`
-- `acpx`
-- `acpx` 已支持的 agent driver，或自定义 ACP agent
-
-它适合这样的场景：
-
-- 你已经在本机使用 `acpx`
-- 你希望通过微信远程发起或继续一个 agent 会话
-- 你希望在手机上完成常见的会话切换、目录切换和对话操作
+使用微信 ClawBot 随时随地通过 `acpx` 控制 Claude Code、Codex 等 Agents。
 
 ## 安装前准备
 
 开始前，至少需要：
 
-- Node.js 22+
-- Bun
+- Node.js 22+ 或 Bun
 - 一个可用的微信登录环境
-- 本机可以运行 `acpx` 及其目标 agent
+- Claude Code 或 Codex
 
-正常情况下，不需要再额外全局安装 `acpx`。
+> `weacpx` 基于 `weixin-agent-sdk` 与 `acpx` 实现。
+> 正常情况下，不需要再额外全局安装 `acpx`。
 
 ## 安装
 
@@ -34,17 +20,10 @@
 ```bash
 # 使用 NPM 全局安装
 npm install -g weacpx
-# 或使用 bun 全局安装
+# 或使用 Bun 全局安装
 bun add -g weacpx
 ```
 
-如果你是从源码仓库直接使用，请先安装依赖并构建：
-
-```bash
-bun install
-bun run dev
-```
-
 ## 快速开始
 
 第一次使用建议按这个顺序：
@@ -58,19 +37,9 @@ bun run dev
 ```bash
 weacpx login
 weacpx start
-weacpx status
 ```
 
-如果你是在仓库里本地运行：
-
-```bash
-bun run login
-bun run dev
-```
-
-`weacpx login` 和 `bun run login` 都会在终端里显示二维码。
-
-启动后，在微信里先发：
+`weacpx login` 会在终端里显示二维码，使用微信扫描登录。`weacpx start` 启动后，在微信里发：
 
 ```text
 /ss codex -d /absolute/path/to/your/repo
@@ -78,8 +47,9 @@ bun run dev
 /help
 ```
 
-第一行的意思是：开启或挂在一个会话，并切换到该会话。使用 Codex，并指定工作目录为 `/absolute/path/to/your/repo`。
-第二行的意思是：查看帮助信息。
+`/ss codex -d /absolute/path/to/your/repo`：开启或挂在一个会话，并切换到该会话。使用 Codex，并指定工作目录为 `/absolute/path/to/your/repo`。
+
+`/help` 查看帮助信息。
 
 然后就可以直接发普通消息，例如：
 
@@ -87,6 +57,17 @@ bun run dev
 hello
 ```
 
+如果你是从源码仓库直接使用：
+
+```bash
+# 先安装依赖
+bun install
+# 登录微信
+bun run login
+# 启动服务
+bun run dev
+```
+
 普通文本会默认发送到当前选中的 session。
 
 ## CLI 命令
@@ -106,27 +87,55 @@ hello
 - `status` 查看后台状态、PID、配置路径和日志路径
 - `stop` 停止后台实例
 
-## 微信中如何使用
+## 微信中使用说明
 
-### Agent
+### 管理 Agent
 
-内置 `codex` 与 `claude` 两个常见模板，也支持添加你自己的 agent。
+内置 `codex` 与 `claude` 两个常见 agent，也支持添加你自己的 agents。
 
-- `/agents` 查看当前已添加的 agent
-- `/agent add codex` 添加 codex agent
-- `/agent add claude` 添加 claude agent
-- `/agent rm <name>` 删除 agent
+| 命令 | 说明 |
+|------|------|
+| `/agents` | 查看当前已添加的 agent |
+| `/agent add codex` | 添加 codex agent |
+| `/agent add claude` | 添加 claude agent |
+| `/agent rm <name>` | 删除 agent |
 
 说明：
 
 - 内置 `codex` 和 `claude` 走 `acpx` 的 driver alias，通常不需要额外写 `agent.command`
 - 如果你接入的是自定义 agent，再考虑显式配置 `agent.command`
 
+`config.json` 中的 `agent.command` 用于显式指定 agent 的原始启动命令，完整字段如下：
+
+| 字段 | 类型 | 必填 | 说明 |
+|------|------|------|------|
+| `driver` | `string` | 是 | agent 驱动类型，传递给 acpx 的第一位置参数 |
+| `command` | `string` | 否 | 显式指定自定义 agent 的原始命令。不填则使用 acpx 默认行为 |
+
+示例 — 配置一个自定义 agent：
+
+```json
+{
+  "agents": {
+    "my-agent": {
+      "driver": "codex",
+      "command": "/path/to/acpx codex --arg1 value1"
+    }
+  }
+}
+```
+
+- 内置 `codex` 和 `claude` 建议只写 `driver`，让 `acpx` 自己解析对应 alias
+- `command` 主要用于自定义 agent，不建议给内置 driver 手写原始命令
+- 旧版 `codex` raw command 配置会被自动忽略，回退为 `acpx codex ...`
+
 ### Workspace 工作目录
 
-- `/workspaces` 或 `/workspace` 或 `/ws` 可查看当前已添加的工作目录
-- `/ws new <name> -d <path>` 添加工作目录，`-d` 后面接的是目录在电脑的绝对路径
-- `/workspace rm <name>` 删除工作目录
+| 命令 | 说明 |
+|------|------|
+| `/workspaces` / `/workspace` / `/ws` | 查看当前已添加的工作目录 |
+| `/ws new <name> -d <path>` | 添加工作目录，`-d` 后面接的是目录在电脑的绝对路径 |
+| `/workspace rm <name>` | 删除工作目录 |
 
 说明：
 
@@ -135,15 +144,17 @@ hello
 
 ### Session 会话
 
-- `/sessions` 或 `/session` 或 `/ss` 可查看当前已添加的会话
-- `/ss <agent> -d <path>` 新建会话，会自动按目录名推导并创建或复用 workspace，再创建或复用 session
-- `/ss new <agent> -d <path>` 强制新建会话
-- `/ss new <alias> -a <name> --ws <name>` 强制新建会话，并指定 agent 和 workspace
-- `/ss attach <alias> -a <name> --ws <name> --name <transport-session>` 恢复已存在的会话
-- `/use <alias>` 切换当前会话
-- `/status` 查看当前会话状态
-- `/cancel` 取消当前会话
-- `/stop` 停止当前会话
+| 命令 | 说明 |
+|------|------|
+| `/sessions` / `/session` / `/ss` | 查看当前已添加的会话 |
+| `/ss <agent> -d <path>` | 新建会话（自动按目录名推导并创建或复用 workspace，再创建或复用 session） |
+| `/ss new <agent> -d <path>` | 强制新建会话 |
+| `/ss new <alias> -a <name> --ws <name>` | 强制新建会话，并指定 agent 和 workspace |
+| `/ss attach <alias> -a <name> --ws <name> --name <transport-session>` | 恢复已存在的会话 |
+| `/use <alias>` | 切换当前会话 |
+| `/status` | 查看当前会话状态 |
+| `/cancel` | 取消当前会话 |
+| `/stop` | 停止当前会话 |
 
 说明：
 

package/dist/bridge/bridge-main.js

@@ -28,6 +28,21 @@ var __export = (target, all) => {
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
+// src/process/spawn-command.ts
+function resolveSpawnCommand(command, args) {
+  if (SCRIPT_FILE_PATTERN.test(command)) {
+    return {
+      command: process.execPath,
+      args: [command, ...args]
+    };
+  }
+  return { command, args };
+}
+var SCRIPT_FILE_PATTERN;
+var init_spawn_command = __esm(() => {
+  SCRIPT_FILE_PATTERN = /\.(c|m)?js$/i;
+});
+
 // src/bridge/bridge-main.ts
 import { createInterface } from "node:readline";
 
@@ -108,6 +123,7 @@ function asOptionalString(value) {
 }
 
 // src/bridge/bridge-runtime.ts
+init_spawn_command();
 import { spawn } from "node:child_process";
 import { fileURLToPath } from "node:url";
 
@@ -121,46 +137,57 @@ class BridgeRuntime {
     this.runSessionCreate = runSessionCreate;
   }
   async hasSession(input) {
-    const result = await this.run(this.command, this.buildSessionArgs(input, [
+    const spawnSpec = resolveSpawnCommand(this.command, this.buildSessionArgs(input, [
       "sessions",
       "show",
       input.name
     ]));
+    const result = await this.run(spawnSpec.command, spawnSpec.args);
     return { exists: result.code === 0 };
   }
   async ensureSession(input) {
-    const ensured = await this.run(this.command, this.buildSessionArgs(input, ["sessions", "ensure", "--name", input.name]));
+    const ensuredSpec = resolveSpawnCommand(this.command, this.buildSessionArgs(input, [
+      "sessions",
+      "ensure",
+      "--name",
+      input.name
+    ]));
+    const ensured = await this.run(ensuredSpec.command, ensuredSpec.args);
     if (ensured.code === 0) {
       return {};
     }
-    const existing = await this.run(this.command, this.buildSessionArgs(input, ["sessions", "show", input.name]));
+    const existingSpec = resolveSpawnCommand(this.command, this.buildSessionArgs(input, ["sessions", "show", input.name]));
+    const existing = await this.run(existingSpec.command, existingSpec.args);
     if (existing.code === 0) {
       return {};
     }
-    const createdWithHelper = await this.runSessionCreate(this.command, this.buildSessionArgs(input, ["sessions", "new", "--name", input.name]), input.cwd);
+    const createSpec = resolveSpawnCommand(this.command, this.buildSessionArgs(input, ["sessions", "new", "--name", input.name]));
+    const createdWithHelper = await this.runSessionCreate(createSpec.command, createSpec.args, input.cwd);
     if (createdWithHelper.code !== 0) {
       throw new Error(createdWithHelper.stderr || createdWithHelper.stdout || ensured.stderr || ensured.stdout || "failed to create session");
     }
     return {};
   }
   async prompt(input) {
-    const result = await this.run(this.command, this.buildSessionArgs(input, [
+    const spawnSpec = resolveSpawnCommand(this.command, this.buildSessionArgs(input, [
       "prompt",
       "-s",
       input.name,
       input.text
     ]));
+    const result = await this.run(spawnSpec.command, spawnSpec.args);
     if (result.code !== 0) {
       throw new Error(result.stderr || result.stdout || "prompt failed");
     }
     return { text: result.stdout.trim() };
   }
   async cancel(input) {
-    const result = await this.run(this.command, this.buildSessionArgs(input, [
+    const spawnSpec = resolveSpawnCommand(this.command, this.buildSessionArgs(input, [
       "cancel",
       "-s",
       input.name
     ]));
+    const result = await this.run(spawnSpec.command, spawnSpec.args);
     if (result.code !== 0) {
       throw new Error(result.stderr || result.stdout || "cancel failed");
     }

package/dist/cli.js

@@ -2108,7 +2108,7 @@ var init_ensure_config = __esm(() => {
 
 // src/config/resolve-acpx-command.ts
 import { readFileSync } from "node:fs";
-import { dirname as dirname6, resolve } from "node:path";
+import { posix, win32 } from "node:path";
 import { createRequire as createRequire2 } from "node:module";
 function resolveAcpxCommand(options = {}) {
   if (options.configuredCommand) {
@@ -2120,12 +2120,11 @@ function resolveAcpxCommand(options = {}) {
   try {
     const packageJsonPath = resolvePackageJson("acpx/package.json");
     const pkg = readPackageJson(packageJsonPath);
+    const pathApi = platform === "win32" ? win32 : posix;
+    const packageDir = pathApi.dirname(packageJsonPath);
     const binPath = typeof pkg.bin === "string" ? pkg.bin : pkg.bin && typeof pkg.bin.acpx === "string" ? pkg.bin.acpx : null;
     if (binPath) {
-      if (platform === "win32") {
-        return resolve(dirname6(packageJsonPath), "../.bin/acpx.exe");
-      }
-      return resolve(dirname6(packageJsonPath), binPath);
+      return pathApi.resolve(packageDir, binPath);
     }
   } catch {}
   return "acpx";
@@ -2275,7 +2274,7 @@ function createEmptyState() {
 
 // src/state/state-store.ts
 import { mkdir as mkdir7, readFile as readFile5, writeFile as writeFile5 } from "node:fs/promises";
-import { dirname as dirname7 } from "node:path";
+import { dirname as dirname6 } from "node:path";
 
 class StateStore {
   path;
@@ -2297,7 +2296,7 @@ class StateStore {
     }
   }
   async save(state) {
-    await mkdir7(dirname7(this.path), { recursive: true });
+    await mkdir7(dirname6(this.path), { recursive: true });
     await writeFile5(this.path, JSON.stringify(state, null, 2));
   }
 }
@@ -2355,8 +2354,8 @@ class AcpxBridgeClient {
   request(method, params) {
     const id = String(this.nextId);
     this.nextId += 1;
-    return awaitable((resolve2, reject) => {
-      this.pending.set(id, { resolve: resolve2, reject });
+    return awaitable((resolve, reject) => {
+      this.pending.set(id, { resolve, reject });
       this.writeLine(encodeBridgeRequest({
         id,
         method,
@@ -2432,8 +2431,8 @@ async function spawnAcpxBridgeClient(options = {}) {
   return client;
 }
 function awaitable(executor) {
-  return new Promise((resolve2, reject) => {
-    executor(resolve2, reject);
+  return new Promise((resolve, reject) => {
+    executor(resolve, reject);
   });
 }
 var init_acpx_bridge_client = () => {};
@@ -2476,14 +2475,29 @@ class AcpxBridgeTransport {
   }
 }
 
+// src/process/spawn-command.ts
+function resolveSpawnCommand(command, args) {
+  if (SCRIPT_FILE_PATTERN.test(command)) {
+    return {
+      command: process.execPath,
+      args: [command, ...args]
+    };
+  }
+  return { command, args };
+}
+var SCRIPT_FILE_PATTERN;
+var init_spawn_command = __esm(() => {
+  SCRIPT_FILE_PATTERN = /\.(c|m)?js$/i;
+});
+
 // src/transport/acpx-cli/node-pty-helper.ts
 import { chmod as chmodFs } from "node:fs/promises";
-import { dirname as dirname8, join as join3 } from "node:path";
+import { dirname as dirname7, join as join3 } from "node:path";
 function resolveNodePtyHelperPath(packageJsonPath, platform, arch) {
   if (platform === "win32") {
     return null;
   }
-  return join3(dirname8(packageJsonPath), "prebuilds", `${platform}-${arch}`, "spawn-helper");
+  return join3(dirname7(packageJsonPath), "prebuilds", `${platform}-${arch}`, "spawn-helper");
 }
 async function ensureNodePtyHelperExecutable(helperPath, chmod = chmodFs) {
   if (!helperPath) {
@@ -2505,8 +2519,9 @@ import { createRequire as createRequire3 } from "node:module";
 import { spawn as spawn3 } from "node:child_process";
 import { spawn as spawnPty } from "node-pty";
 async function defaultRunner(command, args, options) {
-  return await new Promise((resolve2, reject) => {
-    const child = spawn3(command, args, { stdio: ["ignore", "pipe", "pipe"] });
+  return await new Promise((resolve, reject) => {
+    const spawnSpec = resolveSpawnCommand(command, args);
+    const child = spawn3(spawnSpec.command, spawnSpec.args, { stdio: ["ignore", "pipe", "pipe"] });
     let stdout = "";
     let stderr = "";
     const timeoutId = options?.timeoutMs ? setTimeout(() => {
@@ -2527,15 +2542,16 @@ async function defaultRunner(command, args, options) {
     child.on("close", (code) => {
       if (timeoutId)
         clearTimeout(timeoutId);
-      resolve2({ code: code ?? 1, stdout, stderr });
+      resolve({ code: code ?? 1, stdout, stderr });
     });
   });
 }
 async function defaultPtyRunner(command, args, options) {
   const helperPath = resolveNodePtyHelperPath(require3.resolve("node-pty/package.json"), process.platform, process.arch);
   await ensureNodePtyHelperExecutable(helperPath);
-  return await new Promise((resolve2, reject) => {
-    const child = spawnPty(command, args, {
+  return await new Promise((resolve, reject) => {
+    const spawnSpec = resolveSpawnCommand(command, args);
+    const child = spawnPty(spawnSpec.command, spawnSpec.args, {
       name: "xterm-color",
       cols: 80,
       rows: 24,
@@ -2553,7 +2569,7 @@ async function defaultPtyRunner(command, args, options) {
     child.onExit(({ exitCode }) => {
       if (timeoutId)
         clearTimeout(timeoutId);
-      resolve2({ code: exitCode, stdout: output, stderr: "" });
+      resolve({ code: exitCode, stdout: output, stderr: "" });
     });
   });
 }
@@ -2624,12 +2640,13 @@ class AcpxCliTransport {
     return result.stdout;
   }
   async runCommandWithTimeout(runner, args, options) {
+    const spawnSpec = resolveSpawnCommand(this.command, args);
     if (!options?.timeoutMs) {
-      return await runner(this.command, args, undefined);
+      return await runner(spawnSpec.command, spawnSpec.args, undefined);
     }
     let timeoutId;
     return await Promise.race([
-      runner(this.command, args, options).finally(() => {
+      runner(spawnSpec.command, spawnSpec.args, options).finally(() => {
         if (timeoutId)
           clearTimeout(timeoutId);
       }),
@@ -2754,6 +2771,7 @@ function extractJsonRpcErrorMessages(output) {
 }
 var require3;
 var init_acpx_cli_transport = __esm(() => {
+  init_spawn_command();
   init_node_pty_helper();
   require3 = createRequire3(import.meta.url);
 });
@@ -2766,7 +2784,7 @@ __export(exports_main, {
   buildApp: () => buildApp
 });
 import { homedir } from "node:os";
-import { dirname as dirname9, join as join4 } from "node:path";
+import { dirname as dirname8, join as join4 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 async function buildApp(paths, deps = {}) {
   await ensureConfigExists(paths.configPath);
@@ -2842,7 +2860,7 @@ function resolveBridgeEntryPath() {
   return fileURLToPath2(new URL("./bridge/bridge-main.ts", import.meta.url));
 }
 function resolveAppLogPath(configPath) {
-  const rootDir = dirname9(configPath);
+  const rootDir = dirname8(configPath);
   const runtimeDir = join4(rootDir, "runtime");
   return join4(runtimeDir, "app.log");
 }
@@ -2911,18 +2929,10 @@ class DaemonController {
   paths;
   deps;
   statusStore;
-  startupPollIntervalMs;
-  startupTimeoutMs;
-  onStartupPoll;
   constructor(paths, deps) {
     this.paths = paths;
     this.deps = deps;
     this.statusStore = new DaemonStatusStore(paths.statusFile);
-    this.startupPollIntervalMs = deps.startupPollIntervalMs ?? 50;
-    this.startupTimeoutMs = deps.startupTimeoutMs ?? 5000;
-    this.onStartupPoll = deps.onStartupPoll ?? (async () => {
-      await new Promise((resolve) => setTimeout(resolve, this.startupPollIntervalMs));
-    });
   }
   async getStatus() {
     const pid = await this.loadPid();
@@ -2948,10 +2958,8 @@ class DaemonController {
     if (current.state === "running") {
       return { state: "already-running", pid: current.pid };
     }
-    await this.statusStore.clear();
     const pid = await this.deps.spawnDetached();
     await this.writePid(pid);
-    await this.waitForStartupMetadata(pid);
     return { state: "started", pid };
   }
   async stop() {
@@ -2986,21 +2994,6 @@ class DaemonController {
     await rm2(this.paths.pidFile, { force: true });
     await this.statusStore.clear();
   }
-  async waitForStartupMetadata(pid) {
-    const deadline = Date.now() + this.startupTimeoutMs;
-    while (Date.now() < deadline) {
-      const status = await this.statusStore.load();
-      if (status?.pid === pid) {
-        return;
-      }
-      if (!this.deps.isProcessRunning(pid)) {
-        await this.clearRuntimeFiles();
-        throw new Error(`weacpx daemon exited before reporting ready state (pid ${pid})`);
-      }
-      await this.onStartupPoll();
-    }
-    throw new Error(`weacpx daemon did not report ready state within ${this.startupTimeoutMs}ms (pid ${pid})`);
-  }
 }
 
 // src/daemon/create-daemon-controller.ts

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weacpx",
   "description": "用微信远程控制 `acpx` 会话的控制台, 底层基于 `weixin-agent-sdk` 与 `acpx`",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "main": "index.js",
   "directories": {
     "doc": "docs",