weacpx 0.1.4 → 0.1.6

package/README.md

@@ -155,14 +155,21 @@ bun run dev
 | `/ss attach <alias> -a <name> --ws <name> --name <transport-session>` | 恢复已存在的会话 |
 | `/use <alias>` | 切换当前会话 |
 | `/status` | 查看当前会话状态 |
+| `/mode` | 查看当前会话已保存的 mode |
+| `/mode <id>` | 设置当前会话 mode，例如 `/mode plan` |
+| `/session reset` | 重置当前会话上下文，保留 alias/agent/workspace，但重新绑定到一个新的后端 session |
+| `/clear` | `/session reset` 的快捷别名 |
 | `/cancel` | 取消当前会话 |
-| `/stop` | 停止当前会话 |
+| `/stop` | `/cancel` 的别名，用于取消当前会话 |
 
 说明：
 
 - `/ss <agent> -d <path>` 是最常用入口，会自动按目录名推导并创建或复用 workspace，再创建或复用 session
 - `/ss new <agent> -d <path>` 表示强制新建 session
 - `/use <alias>` 用来切换当前会话
+- `/mode` 会显示当前逻辑会话里保存的 mode；如果还没设置过，会显示“未设置”
+- `/mode <id>` 会把 mode 透传给底层 `acpx set-mode`，成功后再写回当前逻辑会话
+- `/session reset` 和 `/clear` 会保留当前逻辑会话名，但重新创建一个新的后端 session，从空上下文重新开始
 - 非 `/` 开头的文本会发送到当前 session
 
 ### 权限策略
@@ -221,7 +228,7 @@ bun run dev
 
 | 命令 | 说明 |
 |------|------|
-| `/clear` | 清除当前聊天会话，上下文重新开始 |
+| `/clear` | 重置当前聊天绑定的会话上下文，效果等同于 `/session reset` |
 | `/logout` | 清除当前机器上已保存的所有微信账号凭证 |
 
 说明：
@@ -327,6 +334,26 @@ bun run dry-run --chat-key wx:test -- \
 /ss attach demo -a codex --ws backend --name existing-demo
 ```
 
+### Adapter mode 参考
+
+`acpx set-mode` / 计划中的 `/mode <id>` 本质上都是给底层 ACP session 发送 `session/set_mode`。
+这里的 `<id>` 不是 `weacpx` 或 `acpx` 统一规定的枚举，而是**各 adapter 自己定义**的值；填错时通常会收到 adapter 返回的 `Invalid params` 一类错误。
+
+基于 `acpx` 内置 adapter 文档和各上游公开文档，当前能确认的信息如下：
+
+| adapter | 已确认可用的 mode id | 说明 |
+|------|------|------|
+| `codex` | `plan` | `acpx` 自身示例明确使用过 `acpx codex set-mode plan`。`codex-acp` 还暴露了 `mode` 运行时配置项，但上游目前没有公开一份完整、稳定的 mode id 列表。 |
+| `cursor` | `agent`、`plan`、`ask` | Cursor 官方文档/更新日志公开提到 `Plan mode`、`Ask mode`；Cursor 官方论坛在 ACP `session/configure` 示例中展示过 `availableModes` 为 `agent` / `plan` / `ask`。 |
+| 其他内置 adapter | 暂无公开、稳定的 mode id 列表 | 包括 `claude`、`copilot`、`gemini`、`qoder`、`qwen`、`kimi`、`kiro`、`iflow`、`opencode`、`trae`、`droid`、`kilocode` 等。即使某些产品本身有“Ask / Agent / Plan”之类概念，其 ACP `set-mode` 可接受的精确字符串也往往没有在官方文档中写死。 |
+
+建议：
+
+- 对 `codex`，优先把 `plan` 当作已知可用值。
+- 对 `cursor`，优先使用 `agent`、`plan`、`ask`。
+- 对其他 adapter，不要在 `weacpx` 里写死候选值；最好把 `/mode <id>` 设计成透传，由 adapter 自己决定是否接受。
+- 如果某个 adapter 后续补充了官方 mode 文档，再把它们补进这里。
+
 ## 更多文档
 
 - 配置参考：[docs/config-reference.md](./docs/config-reference.md)

package/config.example.json

@@ -1,7 +1,9 @@
 {
   "transport": {
     "type": "acpx-bridge",
-    "sessionInitTimeoutMs": 120000
+    "sessionInitTimeoutMs": 120000,
+    "permissionMode": "approve-all",
+    "nonInteractivePermissions": "fail"
   },
   "logging": {
     "level": "info",

package/dist/bridge/bridge-main.js

@@ -4,25 +4,43 @@ var __getProtoOf = Object.getPrototypeOf;
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+function __accessProp(key) {
+  return this[key];
+}
+var __toESMCache_node;
+var __toESMCache_esm;
 var __toESM = (mod, isNodeMode, target) => {
+  var canCache = mod != null && typeof mod === "object";
+  if (canCache) {
+    var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
+    var cached = cache.get(mod);
+    if (cached)
+      return cached;
+  }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
   const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
   for (let key of __getOwnPropNames(mod))
     if (!__hasOwnProp.call(to, key))
       __defProp(to, key, {
-        get: () => mod[key],
+        get: __accessProp.bind(mod, key),
         enumerable: true
       });
+  if (canCache)
+    cache.set(mod, to);
   return to;
 };
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
+var __returnValue = (v) => v;
+function __exportSetter(name, newValue) {
+  this[name] = __returnValue.bind(null, newValue);
+}
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: (newValue) => all[name] = () => newValue
+      set: __exportSetter.bind(all, name)
     });
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
@@ -244,6 +262,14 @@ class BridgeServer {
           name: String(params.name),
           text: String(params.text)
         });
+      case "setMode":
+        return await this.runtime.setMode({
+          agent: String(params.agent),
+          agentCommand: asOptionalString(params.agentCommand),
+          cwd: String(params.cwd),
+          name: String(params.name),
+          modeId: String(params.modeId)
+        });
       case "cancel":
         return await this.runtime.cancel({
           agent: String(params.agent),
@@ -322,6 +348,19 @@ class BridgeRuntime {
     const result = await this.run(spawnSpec.command, spawnSpec.args);
     return { text: getPromptText(result) };
   }
+  async setMode(input) {
+    const spawnSpec = resolveSpawnCommand(this.command, this.buildSessionArgs(input, [
+      "set-mode",
+      "-s",
+      input.name,
+      input.modeId
+    ]));
+    const result = await this.run(spawnSpec.command, spawnSpec.args);
+    if (result.code !== 0) {
+      throw new Error(result.stderr || result.stdout || "set-mode failed");
+    }
+    return {};
+  }
   async cancel(input) {
     const spawnSpec = resolveSpawnCommand(this.command, this.buildSessionArgs(input, [
       "cancel",

package/dist/cli.js

@@ -5,25 +5,43 @@ var __getProtoOf = Object.getPrototypeOf;
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+function __accessProp(key) {
+  return this[key];
+}
+var __toESMCache_node;
+var __toESMCache_esm;
 var __toESM = (mod, isNodeMode, target) => {
+  var canCache = mod != null && typeof mod === "object";
+  if (canCache) {
+    var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
+    var cached = cache.get(mod);
+    if (cached)
+      return cached;
+  }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
   const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
   for (let key of __getOwnPropNames(mod))
     if (!__hasOwnProp.call(to, key))
       __defProp(to, key, {
-        get: () => mod[key],
+        get: __accessProp.bind(mod, key),
         enumerable: true
       });
+  if (canCache)
+    cache.set(mod, to);
   return to;
 };
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
+var __returnValue = (v) => v;
+function __exportSetter(name, newValue) {
+  this[name] = __returnValue.bind(null, newValue);
+}
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: (newValue) => all[name] = () => newValue
+      set: __exportSetter.bind(all, name)
     });
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
@@ -2777,7 +2795,7 @@ async function handleSlashCommand(content, ctx, receivedAt, eventTimestamp) {
         return { handled: true };
       }
       case "/clear": {
-        ctx.onClear?.();
+        await ctx.onClear?.();
         await sendReply(ctx, "✅ 会话已清除，重新开始对话");
         return { handled: true };
       }
@@ -3338,25 +3356,41 @@ var init_agent_templates = __esm(() => {
 function renderHelpText() {
   return [
     "可用命令：",
-    "/agents",
-    "/agent add <codex|claude>",
-    "/agent rm <name>",
-    "/workspaces",
-    "/workspace 或 /ws",
-    "/ws new <name> -d <path>",
-    "/workspace rm <name>",
-    "/sessions",
-    "/session 或 /ss",
-    "/ss <agent> -d <path>",
-    "/ss new <agent> -d <path>",
-    "/ss new <alias> -a <name> --ws <name>",
-    "/ss attach <alias> -a <name> --ws <name> --name <transport-session>",
-    "/pm 或 /permission",
-    "/pm set <allow|read|deny>",
-    "/pm auto [allow|deny|fail]",
-    "/use <alias>",
-    "/status",
-    "/cancel 或 /stop"
+    "",
+    "先看这 3 个：",
+    "/ss new <agent> -d <path> - 新建会话",
+    "/use <alias> - 切会话",
+    "/status - 看状态",
+    "",
+    "Agent：",
+    "/agents - 看 Agent",
+    "/agent add <codex|claude> - 加 Agent",
+    "/agent rm <name> - 删 Agent",
+    "",
+    "工作区：",
+    "/workspaces - 看工作区",
+    "/workspace 或 /ws - 工作区命令",
+    "/ws new <name> -d <path> - 加工作区",
+    "/workspace rm <name> - 删工作区",
+    "",
+    "会话：",
+    "/sessions - 看会话",
+    "/session 或 /ss - 会话命令",
+    "/ss <agent> -d <path> - 快速新建",
+    "/ss new <agent> -d <path> - 新建会话",
+    "/ss new <alias> -a <name> --ws <name> - 指定配置新建",
+    "/ss attach <alias> -a <name> --ws <name> --name <transport-session> - 挂已有会话",
+    "/use <alias> - 切会话",
+    "/session reset 或 /clear - 清上下文",
+    "",
+    "权限：",
+    "/pm 或 /permission - 权限设置",
+    "/pm set <allow|read|deny> - 设审批级别",
+    "/pm auto [allow|deny|fail] - 设自动处理",
+    "",
+    "常用：",
+    "/status - 看状态",
+    "/cancel 或 /stop - 停当前任务"
   ].join(`
 `);
 }
@@ -3497,6 +3531,27 @@ var init_app_logger = __esm(() => {
   };
 });
 
+// src/transport/acpx-session-index.ts
+import { readFile as readFile3 } from "node:fs/promises";
+import { homedir } from "node:os";
+import { resolve } from "node:path";
+async function resolveSessionAgentCommandFromIndex(session) {
+  const home = process.env.HOME ?? homedir();
+  if (!home) {
+    return;
+  }
+  try {
+    const raw = await readFile3(resolve(home, ".acpx", "sessions", "index.json"), "utf8");
+    const parsed = JSON.parse(raw);
+    const targetCwd = resolve(session.cwd);
+    const match = parsed.entries?.find((entry) => entry.name === session.transportSession && entry.cwd === targetCwd && typeof entry.agentCommand === "string" && entry.agentCommand.trim().length > 0);
+    return match?.agentCommand?.trim();
+  } catch {
+    return;
+  }
+}
+var init_acpx_session_index = () => {};
+
 // src/transport/prompt-output.ts
 function getPromptText(result) {
   const stdoutOutput = extractPromptOutput(result.stdout);
@@ -3649,12 +3704,18 @@ function parseCommand(input) {
     return { kind: "status" };
   if (command === "/cancel")
     return { kind: "cancel" };
+  if (command === "/clear")
+    return { kind: "session.reset" };
+  if (command === "/mode" && parts.length === 1)
+    return { kind: "mode.show" };
   if (command === "/permission" && parts.length === 1)
     return { kind: "permission.status" };
   if (command === "/session" && parts.length === 1)
     return { kind: "sessions" };
   if (command === "/workspace" && parts.length === 1)
     return { kind: "workspaces" };
+  if (command === "/session" && parts[1] === "reset" && parts.length === 2)
+    return { kind: "session.reset" };
   if (command === "/permission" && parts[1] === "set") {
     const mode = toPermissionMode(parts[2] ?? "");
     if (mode) {
@@ -3673,6 +3734,9 @@ function parseCommand(input) {
   if (command === "/use" && parts[1]) {
     return { kind: "session.use", alias: parts[1] };
   }
+  if (command === "/mode" && parts[1]) {
+    return { kind: "mode.set", modeId: parts[1] };
+  }
   if (command === "/agent" && parts[1] === "add" && parts[2]) {
     return { kind: "agent.add", template: parts[2] };
   }
@@ -3714,7 +3778,7 @@ function parseCommand(input) {
       return { kind: "session.shortcut.new", agent: parts[2], cwd };
     }
   }
-  if (command === "/session" && parts[1] && parts[1] !== "new" && parts[1] !== "attach") {
+  if (command === "/session" && parts[1] && parts[1] !== "new" && parts[1] !== "attach" && parts[1] !== "reset") {
     const cwd = readFlagValue(parts, ["--cwd", "-d"]);
     if (cwd) {
       return { kind: "session.shortcut", agent: parts[1], cwd };
@@ -3824,6 +3888,8 @@ var init_parse_command = __esm(() => {
     "/sessions",
     "/status",
     "/cancel",
+    "/clear",
+    "/mode",
     "/permission",
     "/session",
     "/workspace",
@@ -3835,19 +3901,21 @@ var init_parse_command = __esm(() => {
 // src/commands/command-router.ts
 import { access } from "node:fs/promises";
 import { basename as basename2, normalize } from "node:path";
-import { homedir } from "node:os";
+import { homedir as homedir2 } from "node:os";
 
 class CommandRouter {
   sessions;
   transport;
   config;
   configStore;
+  resolveSessionAgentCommand;
   logger;
-  constructor(sessions, transport, config, configStore, logger2) {
+  constructor(sessions, transport, config, configStore, logger2, resolveSessionAgentCommand = resolveSessionAgentCommandFromIndex) {
     this.sessions = sessions;
     this.transport = transport;
     this.config = config;
     this.configStore = configStore;
+    this.resolveSessionAgentCommand = resolveSessionAgentCommand;
     this.logger = logger2 ?? createNoopAppLogger();
   }
   async handle(chatKey, input, reply) {
@@ -3970,6 +4038,7 @@ class CommandRouter {
             return this.renderSessionCreationError(session, error);
           }
           await this.sessions.attachSession(command.alias, command.agent, command.workspace, session.transportSession);
+          await this.refreshSessionTransportAgentCommand(command.alias);
           await this.sessions.useSession(chatKey, command.alias);
           await this.logger.info("session.created", "created and selected logical session", {
             alias: command.alias,
@@ -3995,6 +4064,7 @@ class CommandRouter {
             };
           }
           await this.sessions.attachSession(command.alias, command.agent, command.workspace, command.transportSession);
+          await this.refreshSessionTransportAgentCommand(command.alias);
           await this.sessions.useSession(chatKey, command.alias);
           await this.logger.info("session.attached", "attached existing transport session", {
             alias: command.alias,
@@ -4011,6 +4081,29 @@ class CommandRouter {
             chatKey
           });
           return { text: `已切换到会话「${command.alias}」` };
+        case "mode.show": {
+          const session = await this.sessions.getCurrentSession(chatKey);
+          if (!session) {
+            return { text: "当前还没有选中的会话。请先执行 /session new ... 或 /use <alias>。" };
+          }
+          return {
+            text: [
+              "当前 mode：",
+              `- 会话：${session.alias}`,
+              `- mode：${session.modeId ?? "未设置"}`
+            ].join(`
+`)
+          };
+        }
+        case "mode.set": {
+          const session = await this.sessions.getCurrentSession(chatKey);
+          if (!session) {
+            return { text: "当前还没有选中的会话。请先执行 /session new ... 或 /use <alias>。" };
+          }
+          await this.setModeTransportSession(session, command.modeId);
+          await this.sessions.setCurrentSessionMode(chatKey, command.modeId);
+          return { text: `已设置当前会话 mode：${command.modeId}` };
+        }
         case "status": {
           const session = await this.sessions.getCurrentSession(chatKey);
           if (!session) {
@@ -4038,6 +4131,8 @@ class CommandRouter {
             return this.renderTransportError(session, error);
           }
         }
+        case "session.reset":
+          return await this.resetCurrentSession(chatKey);
         case "prompt": {
           const session = await this.sessions.getCurrentSession(chatKey);
           if (!session) {
@@ -4047,12 +4142,20 @@ class CommandRouter {
             const result = await this.promptTransportSession(session, command.text, reply);
             return { text: result.text };
           } catch (error) {
+            const recovered = await this.tryRecoverMissingSession(session, error);
+            if (recovered) {
+              const result = await this.promptTransportSession(recovered, command.text, reply);
+              return { text: result.text };
+            }
             return this.renderTransportError(session, error);
           }
         }
       }
     });
   }
+  async clearSession(chatKey) {
+    await this.resetCurrentSession(chatKey);
+  }
   async handleSessionShortcut(chatKey, agent, cwdInput, createNew) {
     if (!this.config || !this.configStore) {
       return { text: "当前没有加载可写入的配置。" };
@@ -4096,6 +4199,7 @@ class CommandRouter {
       return this.renderShortcutSessionCreationError(workspace, alias);
     }
     await this.sessions.attachSession(alias, agent, workspace.name, session.transportSession);
+    await this.refreshSessionTransportAgentCommand(alias);
     await this.sessions.useSession(chatKey, alias);
     await this.logger.info("session.shortcut.created", "created new logical session from shortcut", {
       alias,
@@ -4241,15 +4345,77 @@ class CommandRouter {
   async ensureTransportSession(session) {
     await this.measureTransportCall("ensure_session", session, () => this.transport.ensureSession(session));
   }
+  async resetCurrentSession(chatKey) {
+    const session = await this.sessions.getCurrentSession(chatKey);
+    if (!session) {
+      return { text: "当前还没有选中的会话。请先执行 /session new ... 或 /use <alias>。" };
+    }
+    const resetSession = this.sessions.resolveSession(session.alias, session.agent, session.workspace, this.buildResetTransportSessionName(session));
+    try {
+      await this.ensureTransportSession(resetSession);
+      const exists = await this.checkTransportSession(resetSession);
+      if (!exists) {
+        return {
+          text: [
+            `会话「${session.alias}」重置失败。`,
+            "新的后端会话未创建成功，请稍后重试。"
+          ].join(`
+`)
+        };
+      }
+    } catch (error) {
+      return this.renderTransportError(resetSession, error);
+    }
+    await this.sessions.attachSession(resetSession.alias, resetSession.agent, resetSession.workspace, resetSession.transportSession);
+    await this.refreshSessionTransportAgentCommand(resetSession.alias);
+    await this.sessions.useSession(chatKey, resetSession.alias);
+    await this.logger.info("session.reset", "reset current logical session", {
+      alias: resetSession.alias,
+      agent: resetSession.agent,
+      workspace: resetSession.workspace,
+      transportSession: resetSession.transportSession,
+      chatKey
+    });
+    return { text: `会话「${resetSession.alias}」已重置` };
+  }
+  buildResetTransportSessionName(session) {
+    return `${session.workspace}:${session.alias}:reset-${Date.now()}`;
+  }
   async checkTransportSession(session) {
     return await this.measureTransportCall("has_session", session, () => this.transport.hasSession(session));
   }
   async promptTransportSession(session, text, reply) {
     return await this.measureTransportCall("prompt", session, () => this.transport.prompt(session, text, reply));
   }
+  async setModeTransportSession(session, modeId) {
+    return await this.measureTransportCall("set_mode", session, () => this.transport.setMode(session, modeId));
+  }
   async cancelTransportSession(session) {
     return await this.measureTransportCall("cancel", session, () => this.transport.cancel(session));
   }
+  async refreshSessionTransportAgentCommand(alias) {
+    const session = await this.sessions.getSession(alias);
+    if (!session) {
+      return;
+    }
+    const transportAgentCommand = await this.resolveSessionAgentCommand(session);
+    if (!transportAgentCommand) {
+      return;
+    }
+    await this.sessions.setSessionTransportAgentCommand(alias, transportAgentCommand);
+  }
+  async tryRecoverMissingSession(session, error) {
+    const message = error instanceof Error ? error.message : String(error);
+    if (!message.includes("No acpx session found")) {
+      return null;
+    }
+    const transportAgentCommand = await this.resolveSessionAgentCommand(session);
+    if (!transportAgentCommand || transportAgentCommand === session.agentCommand) {
+      return null;
+    }
+    await this.sessions.setSessionTransportAgentCommand(session.alias, transportAgentCommand);
+    return await this.sessions.getSession(session.alias);
+  }
   async measureTransportCall(operation, session, callback) {
     const startedAt = Date.now();
     try {
@@ -4296,7 +4462,7 @@ async function pathExists(path11) {
   }
 }
 function normalizePathForWorkspace(path11) {
-  const expanded = path11.startsWith("~") ? homedir() + path11.slice(1) : path11;
+  const expanded = path11.startsWith("~") ? homedir2() + path11.slice(1) : path11;
   return normalize(expanded);
 }
 function sameWorkspacePath(left, right) {
@@ -4369,6 +4535,7 @@ function isPartialPromptOutputError(message) {
 var init_command_router = __esm(() => {
   init_agent_templates();
   init_app_logger();
+  init_acpx_session_index();
   init_prompt_output();
   init_parse_command();
 });
@@ -4389,12 +4556,12 @@ function isLegacyCodexCommand(command) {
 }
 
 // src/config/load-config.ts
-import { readFile as readFile3 } from "node:fs/promises";
+import { readFile as readFile4 } from "node:fs/promises";
 function isRecord(value) {
   return typeof value === "object" && value !== null;
 }
 async function loadConfig(path11, options = {}) {
-  const raw = JSON.parse(await readFile3(path11, "utf8"));
+  const raw = JSON.parse(await readFile4(path11, "utf8"));
   return parseConfig(raw, options);
 }
 function parseConfig(raw, options = {}) {
@@ -4562,7 +4729,7 @@ var init_config_store = __esm(() => {
 });
 
 // src/config/ensure-config.ts
-import { readFile as readFile4 } from "node:fs/promises";
+import { readFile as readFile5 } from "node:fs/promises";
 async function ensureConfigExists(path11) {
   try {
     await loadConfig(path11);
@@ -4576,7 +4743,7 @@ async function ensureConfigExists(path11) {
 }
 async function loadDefaultConfigTemplate() {
   const templatePath = new URL("../../config.example.json", import.meta.url);
-  const template = JSON.parse(await readFile4(templatePath, "utf8"));
+  const template = JSON.parse(await readFile5(templatePath, "utf8"));
   return {
     ...template,
     agents: Object.fromEntries(Object.entries(template.agents).map(([name, agent]) => [
@@ -4644,6 +4811,9 @@ class ConsoleAgent {
     });
     return await this.router.handle(request.conversationId, request.text, request.reply);
   }
+  async clearSession(conversationId) {
+    await this.router.clearSession?.(conversationId);
+  }
 }
 function summarizeText(text) {
   const trimmed = text.trim();
@@ -4676,12 +4846,20 @@ class SessionService {
       agent,
       workspace,
       transport_session: transportSession,
+      transport_agent_command: this.state.sessions[alias]?.transport_agent_command,
       created_at: this.state.sessions[alias]?.created_at ?? new Date().toISOString(),
       last_used_at: new Date().toISOString()
     });
   }
-  async attachSession(alias, agent, workspace, transportSession) {
-    return await this.createLogicalSession(alias, agent, workspace, transportSession);
+  async attachSession(alias, agent, workspace, transportSession, transportAgentCommand) {
+    return await this.createLogicalSession(alias, agent, workspace, transportSession, transportAgentCommand);
+  }
+  async getSession(alias) {
+    const session = this.state.sessions[alias];
+    if (!session) {
+      return null;
+    }
+    return this.toResolvedSession(session);
   }
   async useSession(chatKey, alias) {
     const session = this.state.sessions[alias];
@@ -4692,6 +4870,24 @@ class SessionService {
     this.state.chat_contexts[chatKey] = { current_session: alias };
     await this.persist();
   }
+  async setCurrentSessionMode(chatKey, modeId) {
+    const currentAlias = this.state.chat_contexts[chatKey]?.current_session;
+    if (!currentAlias) {
+      throw new Error("no current session selected");
+    }
+    const session = this.state.sessions[currentAlias];
+    if (!session) {
+      throw new Error("no current session selected");
+    }
+    const normalizedModeId = modeId?.trim();
+    if (normalizedModeId) {
+      session.mode_id = normalizedModeId;
+    } else {
+      delete session.mode_id;
+    }
+    session.last_used_at = new Date().toISOString();
+    await this.persist();
+  }
   async getCurrentSession(chatKey) {
     const currentAlias = this.state.chat_contexts[chatKey]?.current_session;
     if (!currentAlias) {
@@ -4719,24 +4915,42 @@ class SessionService {
     return {
       alias: session.alias,
       agent: session.agent,
-      agentCommand: resolveAgentCommand(agentConfig.driver, agentConfig.command),
+      agentCommand: session.transport_agent_command ?? resolveAgentCommand(agentConfig.driver, agentConfig.command),
       workspace: session.workspace,
       transportSession: session.transport_session,
+      modeId: session.mode_id,
       cwd: this.config.workspaces[session.workspace].cwd
     };
   }
+  async setSessionTransportAgentCommand(alias, transportAgentCommand) {
+    const session = this.state.sessions[alias];
+    if (!session) {
+      throw new Error(`session "${alias}" does not exist`);
+    }
+    const normalized = transportAgentCommand?.trim();
+    if (normalized) {
+      session.transport_agent_command = normalized;
+    } else {
+      delete session.transport_agent_command;
+    }
+    session.last_used_at = new Date().toISOString();
+    await this.persist();
+  }
   async persist() {
     await this.stateStore.save(this.state);
   }
-  async createLogicalSession(alias, agent, workspace, transportSession) {
+  async createLogicalSession(alias, agent, workspace, transportSession, transportAgentCommand) {
     this.validateSession(alias, agent, workspace);
     const existingSession = this.state.sessions[alias];
     const now = new Date().toISOString();
+    const normalizedTransportAgentCommand = transportAgentCommand?.trim();
     const session = {
       alias,
       agent,
       workspace,
       transport_session: transportSession,
+      ...normalizedTransportAgentCommand ? { transport_agent_command: normalizedTransportAgentCommand } : existingSession?.transport_agent_command ? { transport_agent_command: existingSession.transport_agent_command } : {},
+      mode_id: existingSession?.mode_id,
       created_at: existingSession?.created_at ?? now,
       last_used_at: now
     };
@@ -4764,7 +4978,7 @@ function createEmptyState() {
 }
 
 // src/state/state-store.ts
-import { mkdir as mkdir7, readFile as readFile5, writeFile as writeFile5 } from "node:fs/promises";
+import { mkdir as mkdir7, readFile as readFile6, writeFile as writeFile5 } from "node:fs/promises";
 import { dirname as dirname6 } from "node:path";
 
 class StateStore {
@@ -4774,7 +4988,7 @@ class StateStore {
   }
   async load() {
     try {
-      const content = await readFile5(this.path, "utf8");
+      const content = await readFile6(this.path, "utf8");
       if (content.trim() === "") {
         return createEmptyState();
       }
@@ -4803,7 +5017,15 @@ async function runConsole(paths, deps) {
   const sdk = await deps.loadWeixinSdk();
   const setIntervalFn = deps.setInterval ?? ((fn, delay) => setInterval(fn, delay));
   const clearIntervalFn = deps.clearInterval ?? ((timer) => clearInterval(timer));
+  const addProcessListener = deps.addProcessListener ?? ((signal, handler) => process.on(signal, handler));
+  const removeProcessListener = deps.removeProcessListener ?? ((signal, handler) => process.off(signal, handler));
   let heartbeatTimer = null;
+  const shutdownController = new AbortController;
+  const signalHandler = () => {
+    shutdownController.abort();
+  };
+  addProcessListener("SIGINT", signalHandler);
+  addProcessListener("SIGTERM", signalHandler);
   try {
     if (deps.daemonRuntime) {
       await deps.daemonRuntime.start({
@@ -4818,9 +5040,11 @@ async function runConsole(paths, deps) {
       console.log("[weacpx] 未检测到登录凭证，正在启动扫码登录...");
       await sdk.login();
     }
-    await sdk.start(runtime.agent);
+    await sdk.start(runtime.agent, { abortSignal: shutdownController.signal });
   } finally {
     let disposeError = null;
+    removeProcessListener("SIGINT", signalHandler);
+    removeProcessListener("SIGTERM", signalHandler);
     if (heartbeatTimer !== null) {
       clearIntervalFn(heartbeatTimer);
     }
@@ -4859,9 +5083,9 @@ class AcpxBridgeClient {
   request(method, params) {
     const id = String(this.nextId);
     this.nextId += 1;
-    return awaitable((resolve, reject) => {
+    return awaitable((resolve2, reject) => {
       this.pending.set(id, {
-        resolve: (value) => resolve(value),
+        resolve: (value) => resolve2(value),
         reject
       });
       this.writeLine(encodeBridgeRequest({
@@ -4960,8 +5184,8 @@ async function spawnAcpxBridgeClient(options = {}) {
   return client;
 }
 function awaitable(executor) {
-  return new Promise((resolve, reject) => {
-    executor(resolve, reject);
+  return new Promise((resolve2, reject) => {
+    executor(resolve2, reject);
   });
 }
 var init_acpx_bridge_client = __esm(() => {
@@ -4983,6 +5207,12 @@ class AcpxBridgeTransport {
       text
     });
   }
+  async setMode(session, modeId) {
+    await this.client.request("setMode", {
+      ...this.toParams(session),
+      modeId
+    });
+  }
   async cancel(session) {
     return await this.client.request("cancel", this.toParams(session));
   }
@@ -5108,7 +5338,7 @@ 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((resolve, reject) => {
+  return await new Promise((resolve2, reject) => {
     const spawnSpec = resolveSpawnCommand(command, args);
     const child = spawn3(spawnSpec.command, spawnSpec.args, { stdio: ["ignore", "pipe", "pipe"] });
     let stdout = "";
@@ -5131,14 +5361,14 @@ async function defaultRunner(command, args, options) {
     child.on("close", (code) => {
       if (timeoutId)
         clearTimeout(timeoutId);
-      resolve({ code: code ?? 1, stdout, stderr });
+      resolve2({ 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((resolve, reject) => {
+  return await new Promise((resolve2, reject) => {
     const spawnSpec = resolveSpawnCommand(command, args);
     const child = spawnPty(spawnSpec.command, spawnSpec.args, {
       name: "xterm-color",
@@ -5158,7 +5388,7 @@ async function defaultPtyRunner(command, args, options) {
     child.onExit(({ exitCode }) => {
       if (timeoutId)
         clearTimeout(timeoutId);
-      resolve({ code: exitCode, stdout: output, stderr: "" });
+      resolve2({ code: exitCode, stdout: output, stderr: "" });
     });
   });
 }
@@ -5199,6 +5429,14 @@ class AcpxCliTransport {
     const result = await this.runCommand(this.command, args);
     return { text: getPromptText(result) };
   }
+  async setMode(session, modeId) {
+    await this.run(this.buildArgs(session, [
+      "set-mode",
+      "-s",
+      session.transportSession,
+      modeId
+    ]));
+  }
   async cancel(session) {
     const output = await this.run(this.buildArgs(session, [
       "cancel",
@@ -5256,7 +5494,7 @@ class AcpxCliTransport {
     ]);
   }
   async runStreamingPrompt(command, args, reply, maxSegmentWaitMs = 30000) {
-    return await new Promise((resolve, reject) => {
+    return await new Promise((resolve2, reject) => {
       const spawnSpec = resolveSpawnCommand(command, args);
       const child = spawn3(spawnSpec.command, spawnSpec.args, { stdio: ["ignore", "pipe", "pipe"] });
       let stdout = "";
@@ -5298,7 +5536,7 @@ class AcpxCliTransport {
         if (remaining.length > 0) {
           reply(remaining).catch(() => {});
         }
-        resolve({ code: code ?? 1, stdout, stderr });
+        resolve2({ code: code ?? 1, stdout, stderr });
       });
     });
   }
@@ -5369,7 +5607,7 @@ __export(exports_main, {
   main: () => main2,
   buildApp: () => buildApp
 });
-import { homedir as homedir2 } from "node:os";
+import { homedir as homedir3 } from "node:os";
 import { dirname as dirname8, join as join4 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 async function buildApp(paths, deps = {}) {
@@ -5432,7 +5670,7 @@ async function main2() {
   }
 }
 function resolveRuntimePaths() {
-  const home = process.env.HOME ?? homedir2();
+  const home = process.env.HOME ?? homedir3();
   if (!home) {
     throw new Error("Unable to resolve the current user home directory");
   }
@@ -5469,7 +5707,7 @@ var init_main = __esm(async () => {
 });
 
 // src/cli.ts
-import { homedir as homedir3 } from "node:os";
+import { homedir as homedir4 } from "node:os";
 import { sep } from "node:path";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
 
@@ -5521,15 +5759,23 @@ class DaemonController {
   startupPollIntervalMs;
   startupTimeoutMs;
   onStartupPoll;
+  shutdownPollIntervalMs;
+  shutdownTimeoutMs;
+  onShutdownPoll;
   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.shutdownPollIntervalMs = deps.shutdownPollIntervalMs ?? 50;
+    this.shutdownTimeoutMs = deps.shutdownTimeoutMs ?? 5000;
     this.onStartupPoll = deps.onStartupPoll ?? (async () => {
       await new Promise((resolve) => setTimeout(resolve, this.startupPollIntervalMs));
     });
+    this.onShutdownPoll = deps.onShutdownPoll ?? (async () => {
+      await new Promise((resolve) => setTimeout(resolve, this.shutdownPollIntervalMs));
+    });
   }
   async getStatus() {
     const pid = await this.loadPid();
@@ -5568,6 +5814,7 @@ class DaemonController {
     }
     if (this.deps.isProcessRunning(pid)) {
       await this.deps.terminateProcess(pid);
+      await this.waitForShutdown(pid);
     }
     await this.clearRuntimeFiles();
     return { state: "stopped", detail: "stopped" };
@@ -5608,6 +5855,19 @@ class DaemonController {
     }
     throw new Error(`weacpx daemon did not report ready state within ${this.startupTimeoutMs}ms (pid ${pid})`);
   }
+  async waitForShutdown(pid) {
+    const deadline = Date.now() + this.shutdownTimeoutMs;
+    while (Date.now() < deadline) {
+      if (!this.deps.isProcessRunning(pid)) {
+        return;
+      }
+      await this.onShutdownPoll();
+    }
+    if (!this.deps.isProcessRunning(pid)) {
+      return;
+    }
+    throw new Error(`weacpx daemon did not exit within ${this.shutdownTimeoutMs}ms (pid ${pid})`);
+  }
 }
 
 // src/daemon/create-daemon-controller.ts
@@ -5843,7 +6103,15 @@ class DaemonRuntime {
 }
 
 // src/cli.ts
-var HELP_LINES = ["用法：", "weacpx login", "weacpx logout", "weacpx run", "weacpx start", "weacpx status", "weacpx stop"];
+var HELP_LINES = [
+  "用法：",
+  "weacpx login  - 微信登录",
+  "weacpx logout - 退出登录",
+  "weacpx run    - 前台运行",
+  "weacpx start  - 后台启动",
+  "weacpx status - 查看状态",
+  "weacpx stop   - 停止服务"
+];
 async function runCli(args, deps = {}) {
   const command = args[0];
   const print = deps.print ?? ((line) => console.log(line));
@@ -5937,7 +6205,7 @@ function createDefaultController() {
   });
 }
 function requireHome() {
-  const home = process.env.HOME ?? homedir3();
+  const home = process.env.HOME ?? homedir4();
   if (!home) {
     throw new Error("Unable to resolve the current user home directory");
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weacpx",
   "description": "用微信远程控制 `acpx` 会话的控制台, 底层基于 `weixin-agent-sdk` 与 `acpx`",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "main": "index.js",
   "directories": {
     "doc": "docs",
@@ -46,7 +46,7 @@
     "test:smoke": "node ./scripts/run-tests.mjs tests/smoke"
   },
   "dependencies": {
-    "acpx": "^0.3.1",
+    "acpx": "^0.4.0",
     "node-pty": "^1.1.0",
     "qrcode-terminal": "^0.12.0"
   },
@@ -55,5 +55,10 @@
   },
   "engines": {
     "node": ">=22"
+  },
+  "devDependencies": {
+    "@types/bun": "^1.3.11",
+    "bun-types": "^1.3.11",
+    "typescript": "^6.0.2"
   }
 }