@zxh126/pi-qqbot 0.2.1 → 0.3.0

package/README.md

@@ -14,7 +14,8 @@ Bridge the **[Pi](https://pi.dev) coding agent** into QQ private (C2C) chats: se
 | **Remote approval** | Before pi runs `bash` / `powershell` / `write` / `edit` — or any tool annotated `destructiveHint` — the bot asks in QQ first. |
 | **Session-scoped "always allow"** | Reply 「以后都同意」 and every approval request in the **current session** is auto-approved, including the one already waiting. |
 | **Single-instance lock** | Only one pi process hosts the QQ gateway; the others stand by and take over automatically when the host exits. |
-| **Built-in commands** | `/new`, `/status`, `/help`. |
+| **Cancel a running task** | Send `/cancel` (or 「取消」/「停止」) and the current run is aborted immediately — the QQ reply, the pending tool calls and the half-written answer are all cleaned up. |
+| **Built-in commands** | `/new`, `/status`, `/cancel`, `/help`. |
 
 ## Install
 
@@ -64,8 +65,25 @@ Start pi, then message the bot in QQ; pi handles it and replies.
 |---|---|
 | `/new` | Reset: clear the reply buffer, approval memory and session-wide auto-approve |
 | `/status` | Show busy/idle state, auto-approve state and pending approval count |
+| `/cancel` | **Interrupt the task that is running right now** (aliases: `/stop`, `/abort`, 「取消」, 「停止」, 「中止」, 「终止」, 「算了」) |
 | `/help` | Show help |
 
+### Cancelling a run
+
+Long tasks started from QQ (installs, builds, a runaway agent loop) can be interrupted without going
+back to the machine:
+
+```
+you: /cancel
+bot: 已取消当前任务，并终止了 1 个待审批请求。可以发送新消息继续。
+```
+
+What it does, in order: terminate every pending approval request, call `ctx.abort()` on the current
+run (the same path as pressing Escape in the TUI), drop the partially streamed answer so it is not
+sent to QQ, clear the busy flag so the next message is accepted immediately, and reply with a
+confirmation. Replies that only *look* like cancelling — 「取消自动同意」, 「恢复审批」 — still go to the
+approval handler, so the auto-approve switch keeps working as before.
+
 Anything else is forwarded to pi as a user message.
 
 ## Remote approval
@@ -82,7 +100,7 @@ Reply vocabulary (approval keywords are Chinese, with English aliases):
 |---|---|
 | Approve one request | `同意 1` / `allow 1` — a bare `同意` / `allow` applies to the oldest pending request |
 | Reject one request | `拒绝 1` / `deny 1` — a bare `拒绝` / `deny` applies to the oldest pending request |
-| Abort the pending requests | `停止` |
+| Abort the pending requests *and* the running task | `停止` / `/cancel` |
 | Allow everything in this session | `以后都同意`, `一直同意`, `全部放行`, `别再问了`, `always allow` |
 | Back to per-request approval | `取消自动同意`, `恢复审批`, `以后都不同意` |
 

package/approver.ts

@@ -29,7 +29,7 @@ const RE_ALWAYS =
 /** 「取消自动同意」类表达（含「以后都不同意」） */
 const RE_REVOKE =
   /(取消|关闭|结束|停止)\s*自动同意|^恢复审批$|(以后|之后|今后|都|全部)\s*不(同意|允许|批准|放行)/;
-/** 「停止」终止本轮 */
+/** 「停止」终止本轮（index.ts 里同时会 abort 当前 run） */
 const RE_TERMINATE = /^停止$/;
 /** 带或不带编号的批准/拒绝 */
 const RE_DECIDE = /^(同意|批准|放行|允许|allow|拒绝|驳回|deny)\s*(\d+)?$/i;
@@ -80,7 +80,7 @@ export class Approver {
     const item = this.pending.get(seq);
     return [
       `[审批 #${seq}] ${item?.summary ?? ""}`,
-      `回复「同意 ${seq}」批准，「拒绝 ${seq}」拒绝，「停止」终止本轮。`,
+      `回复「同意 ${seq}」批准，「拒绝 ${seq}」拒绝，「停止」（/cancel）中断本轮任务。`,
       `要本会话内全部放行，回复「以后都同意」（可用「取消自动同意」关闭）。`,
     ].join("\n");
   }

package/docs/README.zh-CN.md

@@ -14,7 +14,8 @@
 | **远程审批** | pi 执行 `bash` / `powershell` / `write` / `edit`，或任何带 `destructiveHint` 注解的工具前，先在 QQ 里申请审批。 |
 | **会话级「以后都同意」** | 回复「以后都同意」，**当前会话**内所有审批请求直接放行，连已经挂起的那条也一起放行。 |
 | **单实例锁** | 只有一个 pi 进程作为宿主连接 QQ，其余待命，宿主退出后自动接管。 |
-| **内置指令** | `/new`、`/status`、`/help`。 |
+| **中断正在运行的任务** | 发 `/cancel`（或「取消」/「停止」），当前任务立刻中断 —— QQ 回复、待审批工具调用、写到一半的回答一并清理。 |
+| **内置指令** | `/new`、`/status`、`/cancel`、`/help`。 |
 
 ## 安装
 
@@ -64,8 +65,22 @@ pi install ./pi-qqbot
 |---|---|
 | `/new` | 重置：清空回复缓冲、审批记忆与自动同意开关 |
 | `/status` | 查看忙闲状态、自动同意状态、待审批数量 |
+| `/cancel` | **中断当前正在运行的任务**（别名：`/stop`、`/abort`、「取消」、「停止」、「中止」、「终止」、「算了」） |
 | `/help` | 帮助 |
 
+### 取消正在运行的任务
+
+从 QQ 发起的耗时任务（装依赖、编译、agent 跑飞了）不必回到机器上处理：
+
+```
+你：/cancel
+机器人：已取消当前任务，并终止了 1 个待审批请求。可以发送新消息继续。
+```
+
+执行顺序：先终止所有待审批请求，再对当前 run 调用 `ctx.abort()`（和 TUI 里按 Escape 同一条路径），
+丢弃已经流式产生的半截回答（不会发到 QQ），清掉忙碌标记使下一条消息立刻可用，最后回执确认。
+像「取消自动同意」「恢复审批」这类**只是长得像**取消的回复仍然走审批分支，自动同意开关行为不变。
+
 其余文本都作为用户消息交给 pi。
 
 ## 远程审批
@@ -82,7 +97,7 @@ pi install ./pi-qqbot
 |---|---|
 | 批准某条 | `同意 1` / `allow 1`；裸 `同意` / `allow` 作用于最早的一条待审批 |
 | 拒绝某条 | `拒绝 1` / `deny 1`；裸 `拒绝` / `deny` 作用于最早的一条待审批 |
-| 终止当前待审批 | `停止` |
+| 终止待审批 **并中断当前任务** | `停止` / `/cancel` |
 | 本会话全部放行 | `以后都同意`、`一直同意`、`全部放行`、`别再问了`、`always allow` |
 | 恢复逐条审批 | `取消自动同意`、`恢复审批`、`以后都不同意` |
 

package/index.ts

@@ -1,4 +1,4 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { loadConfig, QQBotConfig } from "./config";
 import {
   REST_BASE_PROD,
@@ -28,6 +28,10 @@ interface State {
   stopRetry: (() => void) | null;
   passiveRefs: Map<string, { msgId: string; receivedAt: number }>;
   busy: boolean;
+  /** 当前 run 的上下文（用来 abort）；run 结束或取消后清空 */
+  ctx: ExtensionContext | null;
+  /** 本轮已被用户取消：settle 时丢弃半截回复 */
+  cancelled: boolean;
 }
 
 export default function (pi: ExtensionAPI) {
@@ -42,8 +46,16 @@ export default function (pi: ExtensionAPI) {
     stopRetry: null,
     passiveRefs: new Map(),
     busy: false,
+    ctx: null,
+    cancelled: false,
   };
 
+  // ---- 事件：run 开始，记住 ctx（取消指令要调用 ctx.abort()）----
+  pi.on("agent_start", (_event, ctx) => {
+    state.ctx = ctx;
+    state.cancelled = false;
+  });
+
   // ---- 事件：累积 assistant 文本 ----
   pi.on("message_update", (event) => {
     const ev = event.assistantMessageEvent as any;
@@ -54,10 +66,17 @@ export default function (pi: ExtensionAPI) {
 
   // ---- 事件：run 结束，发回复 ----
   pi.on("agent_settled", async () => {
+    const cancelled = state.cancelled;
     const text = state.replyBuffer.take();
     const openid = state.currentOpenid;
     state.currentOpenid = null;
     state.busy = false;
+    state.ctx = null;
+    state.cancelled = false;
+    if (cancelled) {
+      log("[reply] 本轮已被取消，丢弃半截回复（长度", text.length, "）");
+      return;
+    }
     if (!text || !openid || !state.api) return;
     log("[reply] agent_settled，回复 openid=", openid, "text=", text.slice(0, 80));
     for (const chunk of splitText(text)) {
@@ -187,8 +206,62 @@ export default function (pi: ExtensionAPI) {
   });
 }
 
+/** 取消/停止这类「打断当前任务」的表达 */
+const RE_CANCEL =
+  /^(\/cancel|\/stop|\/abort|取消|停止|中止|终止|算了|cancel|stop|abort)$/i;
+
+function isCancelIntent(text: string): boolean {
+  return RE_CANCEL.test(text.trim());
+}
+
+/**
+ * 用户发来取消指令：终止待审批、abort 当前 run、丢弃半截回复，然后回执。
+ * （「取消自动同意」/「关闭自动同意」不属于取消指令，仍走审批分支。）
+ */
+async function handleCancel(
+  state: State,
+  api: QQApi,
+  openid: string,
+): Promise<void> {
+  const terminated = state.approver.terminateAll();
+  const running = state.busy || Boolean(state.ctx?.signal);
+
+  if (!running) {
+    await replyTo(
+      api,
+      state,
+      openid,
+      terminated > 0
+        ? `已终止 ${terminated} 个待审批请求，当前没有正在运行的任务。`
+        : "当前没有正在运行的任务。",
+    );
+    return;
+  }
+
+  state.cancelled = true;
+  state.busy = false;
+  state.replyBuffer.reset();
+  state.currentOpenid = null; // 被中止的 run 不再往 QQ 发半截回复
+  const ctx = state.ctx;
+  state.ctx = null;
+  try {
+    ctx?.abort();
+    log("[cancel] 已请求中止当前 run，终止待审批", terminated, "个");
+  } catch (e) {
+    log("[cancel] abort 失败:", String(e));
+  }
+  await replyTo(
+    api,
+    state,
+    openid,
+    terminated > 0
+      ? `已取消当前任务，并终止了 ${terminated} 个待审批请求。可以发送新消息继续。`
+      : "已取消当前任务。可以发送新消息继续。",
+  );
+}
+
 // ---- QQ 消息处理 ----
-async function handleMessage(
+export async function handleMessage(
   pi: ExtensionAPI,
   state: State,
   api: QQApi,
@@ -203,6 +276,12 @@ async function handleMessage(
     }
     state.passiveRefs.set(msg.openid, { msgId: msg.msgId, receivedAt: Date.now() });
 
+    // 取消指令优先于审批解析：「取消」不该被当成审批动作
+    if (isCancelIntent(msg.content)) {
+      await handleCancel(state, api, msg.openid);
+      return;
+    }
+
     // 远程审批回复优先
     const parsed = state.approver.parseReply(msg.content.trim());
     if (parsed) {
@@ -263,7 +342,14 @@ async function handleMessage(
         api,
         state,
         msg.openid,
-        ["pi-qqbot 指令:", "/new — 开新会话", "/status — 查看状态", "/help — 帮助", "其余文本交给 pi 处理。"].join("\n"),
+        [
+          "pi-qqbot 指令:",
+          "/new — 开新会话（清空审批记忆/自动同意）",
+          "/status — 查看状态",
+          "/cancel（或「取消」「停止」）— 中断正在运行的任务",
+          "/help — 帮助",
+          "其余文本交给 pi 处理。",
+        ].join("\n"),
       );
       return;
     }
@@ -273,7 +359,7 @@ async function handleMessage(
         state,
         msg.openid,
         [
-          `状态: ${state.busy ? "处理中" : "空闲"}`,
+          `状态: ${state.busy ? "处理中（发送 /cancel 可中断）" : "空闲"}`,
           `自动同意: ${state.approver.autoAllowed ? "已开启（本会话有效）" : "未开启"}`,
           `待审批: ${state.approver.pendingCount}`,
         ].join("\n"),
@@ -298,6 +384,7 @@ async function handleMessage(
 
     state.currentOpenid = msg.openid;
     state.busy = true;
+    state.cancelled = false;
     state.replyBuffer.reset();
 
     // 交给 pi 处理

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zxh126/pi-qqbot",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "type": "module",
   "description": "Bridge the Pi coding agent into QQ private chats, with remote tool-call approval",
   "license": "MIT",