weacpx 0.1.4 → 0.1.5

package/README.md

@@ -155,14 +155,17 @@ bun run dev
 | `/ss attach <alias> -a <name> --ws <name> --name <transport-session>` | 恢复已存在的会话 |
 | `/use <alias>` | 切换当前会话 |
 | `/status` | 查看当前会话状态 |
+| `/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>` 用来切换当前会话
+- `/session reset` 和 `/clear` 会保留当前逻辑会话名，但重新创建一个新的后端 session，从空上下文重新开始
 - 非 `/` 开头的文本会发送到当前 session
 
 ### 权限策略
@@ -221,7 +224,7 @@ bun run dev
 
 | 命令 | 说明 |
 |------|------|
-| `/clear` | 清除当前聊天会话，上下文重新开始 |
+| `/clear` | 重置当前聊天绑定的会话上下文，效果等同于 `/session reset` |
 | `/logout` | 清除当前机器上已保存的所有微信账号凭证 |
 
 说明：

package/dist/cli.js

@@ -2777,7 +2777,7 @@ async function handleSlashCommand(content, ctx, receivedAt, eventTimestamp) {
         return { handled: true };
       }
       case "/clear": {
-        ctx.onClear?.();
+        await ctx.onClear?.();
         await sendReply(ctx, "✅ 会话已清除，重新开始对话");
         return { handled: true };
       }
@@ -3356,7 +3356,8 @@ function renderHelpText() {
     "/pm auto [allow|deny|fail]",
     "/use <alias>",
     "/status",
-    "/cancel 或 /stop"
+    "/cancel 或 /stop",
+    "/session reset 或 /clear"
   ].join(`
 `);
 }
@@ -3649,12 +3650,16 @@ function parseCommand(input) {
     return { kind: "status" };
   if (command === "/cancel")
     return { kind: "cancel" };
+  if (command === "/clear")
+    return { kind: "session.reset" };
   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) {
@@ -3714,7 +3719,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 +3829,7 @@ var init_parse_command = __esm(() => {
     "/sessions",
     "/status",
     "/cancel",
+    "/clear",
     "/permission",
     "/session",
     "/workspace",
@@ -4038,6 +4044,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) {
@@ -4053,6 +4061,9 @@ class CommandRouter {
       }
     });
   }
+  async clearSession(chatKey) {
+    await this.resetCurrentSession(chatKey);
+  }
   async handleSessionShortcut(chatKey, agent, cwdInput, createNew) {
     if (!this.config || !this.configStore) {
       return { text: "当前没有加载可写入的配置。" };
@@ -4241,6 +4252,41 @@ 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.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));
   }
@@ -4644,6 +4690,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();
@@ -4803,7 +4852,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 +4875,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);
     }
@@ -5521,15 +5580,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 +5635,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 +5676,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

package/package.json

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