ework-qq-bridge 0.3.0 → 0.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ework-qq-bridge",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "QQ group <-> ework issue bridge (OneBot 11 reverse WebSocket)",
   "type": "module",
   "main": "src/index.ts",

package/src/config.ts

@@ -41,14 +41,6 @@ const Schema = z.object({
 
   DB_PATH: z.string().default(""),
 
-  // Chat mode (instant Q&A). When WORK_CHAT_API is set, @bot messages without
-  // a recognized command are answered directly by the LLM instead of usage
-  // help. Empty = chat mode disabled.
-  WORK_CHAT_API: z.string().default(""),
-  WORK_CHAT_API_KEY: z.string().default("sk-vllm"),
-  WORK_CHAT_MODEL: z.string().default("qwen3.8-27b"),
-  WORK_CHAT_TIMEOUT_MS: z.coerce.number().int().positive().default(90_000),
-  WORK_CHAT_MAX_HISTORY: z.coerce.number().int().positive().default(20),
 
   VERBOSE: z.coerce.boolean().default(false),
 

package/src/router.ts

@@ -3,7 +3,6 @@ import type { EworkClient } from "./ework";
 import type { GroupMessageEvent } from "./onebot";
 import type { BridgeStore } from "./db";
 import type { BindingStore } from "./bindings";
-import { buildChatMessages, chatComplete, splitForQQ, type ChatTurn } from "./chat";
 
 const HELP_TEXT = [
   "用法：",
@@ -12,7 +11,7 @@ const HELP_TEXT = [
   "  绑定 #<编号> —— 把本群绑定到该 issue（长记忆模式：此后发言都进这个 issue）",
   "  解绑 —— 恢复为项目模式（接收整个项目的回复）",
   "  查询 —— 列出最近 issue",
-  "  @我 + 任意问题 —— 即时问答（不建 issue、不留痕）",
+  "  （绑定后：@我 和普通发言等效，都进入绑定的 issue，AI 回复自动回群）",
 ].join("\n");
 
 export interface RouterDeps {
@@ -47,24 +46,6 @@ export function parseCommand(raw: string): ParsedCommand | null {
 
 export function createRouter(deps: RouterDeps) {
   const { cfg, bindings, wakeList, ework, store } = deps;
-  const chatHistory = new Map<number, ChatTurn[]>();
-
-  async function answerChat(ev: GroupMessageEvent, question: string): Promise<void> {
-    const turn: ChatTurn = { role: "user", name: ev.nickname, content: question };
-    const history = chatHistory.get(ev.groupId) ?? [];
-    const messages = buildChatMessages(history, turn, cfg.WORK_CHAT_MAX_HISTORY);
-    const answer = await chatComplete(cfg.WORK_CHAT_API, cfg.WORK_CHAT_API_KEY, cfg.WORK_CHAT_MODEL, messages, cfg.WORK_CHAT_TIMEOUT_MS);
-    history.push(turn, { role: "assistant", name: "bot", content: answer });
-    if (history.length > cfg.WORK_CHAT_MAX_HISTORY * 2) {
-      chatHistory.set(ev.groupId, history.slice(-cfg.WORK_CHAT_MAX_HISTORY * 2));
-    } else {
-      chatHistory.set(ev.groupId, history);
-    }
-    for (const part of splitForQQ(answer)) {
-      await deps.reply(ev.groupId, part);
-    }
-  }
-
   async function handleGroupMessage(ev: GroupMessageEvent): Promise<void> {
     if (store.seenPost(ev.postId)) return;
     const binding = bindings.resolve(ev.groupId);
@@ -77,26 +58,19 @@ export function createRouter(deps: RouterDeps) {
 
     const atBot = ev.rawMessage.includes("[CQ:at,qq=") || /^\s*(任务|task|新任务|#|绑定|解绑|帮助|help|查询)/.test(ev.rawMessage);
     const cmd = parseCommand(ev.rawMessage);
-    if (!cmd && !atBot && binding.issue === undefined) {
-      if (cfg.VERBOSE) console.log(`[qq-bridge] unrecognized message from ${ev.userId}: ${ev.rawMessage.slice(0, 80)}`);
-      return;
-    }
     if (!cmd) {
-      const question = ev.rawMessage.replace(/\[CQ:[^\]]*\]/g, "").trim();
-      if (binding.issue !== undefined && !atBot) {
-        await ework.addComment(binding.owner, binding.repo, binding.issue, `> 来自 QQ 群用户 **${ev.nickname}** (${ev.userId})\n\n${question}`);
+      if (binding.issue !== undefined) {
+        const text = ev.rawMessage.replace(/\[CQ:[^\]]*\]/g, "").trim();
+        if (text) {
+          await ework.addComment(binding.owner, binding.repo, binding.issue, `> 来自 QQ 群用户 **${ev.nickname}** (${ev.userId})\n\n${text}`);
+        }
         return;
       }
-      if (cfg.WORK_CHAT_API && question) {
-        try {
-          await answerChat(ev, question);
-        } catch (err) {
-          console.error(`[qq-bridge] chat failed: ${err instanceof Error ? err.message : err}`);
-          await deps.reply(ev.groupId, "🤖 回答失败了，稍后再试一次。");
-        }
+      if (atBot) {
+        await deps.reply(ev.groupId, "本群还没绑定 issue。发「绑定 #<编号>」绑定已有任务，或「任务 <标题>」新建并自动绑定。");
         return;
       }
-      await deps.reply(ev.groupId, "没看懂指令。\n" + HELP_TEXT);
+      if (cfg.VERBOSE) console.log(`[qq-bridge] ignore non-command message from ${ev.userId}`);
       return;
     }
     if (cmd.kind === "help") {

package/tests/bridge.test.ts

@@ -80,72 +80,52 @@ test("helps when @bot without verb", () => {
   expect(parseCommand("[CQ:at,qq=2661222094] 测试2")).toBeNull();
 });
 
-describe("chat mode", () => {
-  const { buildChatMessages, splitForQQ, CHAT_SYSTEM_PROMPT } = require("../src/chat");
-
-  test("buildChatMessages: system + capped history + new turn", () => {
-    const hist = Array.from({ length: 30 }, (_, i) => ({ role: "user" as const, name: `u${i}`, content: `m${i}` }));
-    const msgs = buildChatMessages(hist, { role: "user", name: "dog", content: "q" }, 20);
-    expect(msgs[0].role).toBe("system");
-    expect(msgs[0].content).toBe(CHAT_SYSTEM_PROMPT);
-    expect(msgs).toHaveLength(22);
-    expect(msgs[1].name).toBe("u10");
-    expect(msgs[msgs.length - 1]).toEqual({ role: "user", name: "dog", content: "q" });
-  });
-
-  test("splitForQQ keeps <=1500 chunks and prefers newline cuts", () => {
-    const short = splitForQQ("hello");
-    expect(short).toEqual(["hello"]);
-    const long = "line\n".repeat(600);
-    const parts = splitForQQ(long);
-    expect(parts.length).toBeGreaterThan(1);
-    for (const p of parts) expect(p.length).toBeLessThanOrEqual(1500);
-    expect(parts.join("\n")).toBe(long);
-  });
-
-  test("router: @bot + question hits chat when configured, help when not", async () => {
-    const { createRouter } = require("../src/router");
-    const replies: string[] = [];
-    const chatCalls: string[] = [];
-    const baseDeps = (chatApi: string) => ({
-      cfg: {
-        VERBOSE: false,
-        WORK_CHAT_API: chatApi,
-        WORK_CHAT_API_KEY: "k",
-        WORK_CHAT_MODEL: "m",
-        WORK_CHAT_TIMEOUT_MS: 1000,
-        WORK_CHAT_MAX_HISTORY: 20,
-      },
-      bindings: new BindingStore([{ groupId: 1, owner: "o", repo: "r" }], pinFile()),
-      wakeList: new Set(["1403558951"]),
-      ework: { createIssue: async () => 1, addComment: async () => {} },
-      store: { seenPost: () => false },
-      reply: async (_g: number, text: string) => { replies.push(text); },
-    });
-    // chat disabled → usage help
-    let router = createRouter(baseDeps(""));
-    await router.handleGroupMessage({ groupId: 1, userId: 1403558951, nickname: "dog", postId: "p1", rawMessage: "[CQ:at,qq=2661222094] 你好呀" });
-    expect(replies[0]).toContain("没看懂指令");
-    // chat enabled → mocked LLM answer (patch chatComplete via env endpoint failure is overkill; test buildChatMessages path instead)
-    replies.length = 0;
-    router = createRouter(baseDeps("http://invalid.test/v1"));
-    await router.handleGroupMessage({ groupId: 1, userId: 1403558951, nickname: "dog", postId: "p2", rawMessage: "[CQ:at,qq=2661222094] 你好呀" });
-    expect(replies[0]).toContain("回答失败");
-  });
-
-  test("router: @bot with CQ-only payload (no text) still gets help", async () => {
+describe("@bot unified routing", () => {
+  const mk = (bs: BindingStore) => {
     const { createRouter } = require("../src/router");
     const replies: string[] = [];
+    const comments: Array<[string, string, number, string]> = [];
     const router = createRouter({
-      cfg: { VERBOSE: false, WORK_CHAT_API: "http://x/v1", WORK_CHAT_API_KEY: "k", WORK_CHAT_MODEL: "m", WORK_CHAT_TIMEOUT_MS: 1000, WORK_CHAT_MAX_HISTORY: 20 },
-      bindings: new BindingStore([{ groupId: 1, owner: "o", repo: "r" }], pinFile()),
+      cfg: { VERBOSE: false },
+      bindings: bs,
       wakeList: new Set(["1"]),
-      ework: { createIssue: async () => 1, addComment: async () => {} },
+      ework: { createIssue: async () => 9, addComment: async (o: string, r: string, n: number, b: string) => { comments.push([o, r, n, b]); } },
       store: { seenPost: () => false },
-      reply: async (_g: number, text: string) => { replies.push(text); },
+      reply: async (_g: number, x: string) => { replies.push(x); },
     });
-    await router.handleGroupMessage({ groupId: 1, userId: 1, nickname: "u", postId: "p3", rawMessage: "[CQ:at,qq=2661222094]" });
-    expect(replies[0]).toContain("没看懂指令");
+    return { router, replies, comments };
+  };
+  const ev = (postId: string, raw: string) => ({ groupId: 1, userId: 1, nickname: "u", postId, rawMessage: raw });
+
+  test("pinned: @bot question goes to bound issue like plain messages", async () => {
+    const { router, replies, comments } = mk(new BindingStore([{ groupId: 1, owner: "o", repo: "r", issue: 7 }], pinFile()));
+    await router.handleGroupMessage(ev("p1", "[CQ:at,qq=2661222094] 这个报错啥意思"));
+    expect(comments.length).toBe(1);
+    expect(comments[0][2]).toBe(7);
+    expect(comments[0][3]).toContain("这个报错啥意思");
+    expect(comments[0][3]).not.toContain("CQ:at");
+    expect(replies).toEqual([]);
+  });
+
+  test("pinned: @bot CQ-only payload silently dropped", async () => {
+    const { router, replies, comments } = mk(new BindingStore([{ groupId: 1, owner: "o", repo: "r", issue: 7 }], pinFile()));
+    await router.handleGroupMessage(ev("p2", "[CQ:at,qq=2661222094]"));
+    expect(comments).toEqual([]);
+    expect(replies).toEqual([]);
+  });
+
+  test("unpinned: @bot question gets bind guidance", async () => {
+    const { router, replies, comments } = mk(new BindingStore([{ groupId: 1, owner: "o", repo: "r" }], pinFile()));
+    await router.handleGroupMessage(ev("p3", "[CQ:at,qq=2661222094] 你好呀"));
+    expect(comments).toEqual([]);
+    expect(replies[0]).toContain("绑定");
+  });
+
+  test("unpinned: plain chatter stays silent", async () => {
+    const { router, replies, comments } = mk(new BindingStore([{ groupId: 1, owner: "o", repo: "r" }], pinFile()));
+    await router.handleGroupMessage(ev("p4", "今天天气不错"));
+    expect(comments).toEqual([]);
+    expect(replies).toEqual([]);
   });
 });
 
@@ -198,7 +178,7 @@ describe("issue pinning", () => {
     const replies: string[] = [];
     const comments: Array<[string, string, number, string]> = [];
     const router = createRouter({
-      cfg: { VERBOSE: false, WORK_CHAT_API: "http://x/v1", WORK_CHAT_API_KEY: "k", WORK_CHAT_MODEL: "m", WORK_CHAT_TIMEOUT_MS: 1000, WORK_CHAT_MAX_HISTORY: 20 },
+      cfg: { VERBOSE: false },
       bindings: new BindingStore([{ groupId: 1, owner: "o", repo: "r", issue: 7 }], pinFile()),
       wakeList: new Set(["1"]),
       ework: { createIssue: async () => 9, addComment: async (o: string, r: string, n: number, b: string) => { comments.push([o, r, n, b]); } },
@@ -218,7 +198,7 @@ describe("issue pinning", () => {
     const comments: Array<number, any> = [];
     const bs = new BindingStore([{ groupId: 1, owner: "o", repo: "r" }], pinFile());
     const router = createRouter({
-      cfg: { VERBOSE: false, WORK_CHAT_API: "", WORK_CHAT_API_KEY: "k", WORK_CHAT_MODEL: "m", WORK_CHAT_TIMEOUT_MS: 1000, WORK_CHAT_MAX_HISTORY: 20 },
+      cfg: { VERBOSE: false },
       bindings: bs,
       wakeList: new Set(["1"]),
       ework: { createIssue: async () => 9, addComment: async (_o: any, _r: any, n: number) => { comments.push(n); } },
@@ -236,7 +216,7 @@ describe("issue pinning", () => {
     const replies: string[] = [];
     const bs = new BindingStore([{ groupId: 1, owner: "o", repo: "r", issue: 3 }], pinFile());
     const router = createRouter({
-      cfg: { VERBOSE: false, WORK_CHAT_API: "", WORK_CHAT_API_KEY: "k", WORK_CHAT_MODEL: "m", WORK_CHAT_TIMEOUT_MS: 1000, WORK_CHAT_MAX_HISTORY: 20 },
+      cfg: { VERBOSE: false },
       bindings: bs,
       wakeList: new Set(["1"]),
       ework: { createIssue: async () => 12, addComment: async () => {} },

package/src/chat.ts

@@ -1,72 +0,0 @@
-// Chat mode: instant Q&A directly against the OpenAI-compatible endpoint.
-// Issue mode (任务/#N) stays the path for long agent work — chat is for the
-// conversational 90% of group traffic that never needs a session.
-
-export interface ChatTurn {
-  role: "user" | "assistant";
-  name: string;
-  content: string;
-}
-
-export const CHAT_SYSTEM_PROMPT = [
-  "你是 QQ 群里的即时问答助手，背后是 ework 开发平台。",
-  "风格：简短直接，能用一两句话说清的就别铺开；技术问题给结论和关键理由，需要展开再展开。",
-  "群里成员通过 @你 提问。你看到的多轮对话里每条 user 消息前缀了提问者的昵称，注意区分不同人。",
-  "如果请求明显是需要长时间执行的开发任务（改代码、查仓库、提交 PR），不要假装去做——建议对方发「任务 <标题>」创建 issue，AI agent 会接单处理。",
-  "不知道就直说，不要编造。",
-].join("\n");
-
-export function buildChatMessages(
-  history: ChatTurn[],
-  question: ChatTurn,
-  maxHistory: number,
-): { role: string; name?: string; content: string }[] {
-  const kept = history.slice(-maxHistory);
-  return [
-    { role: "system", content: CHAT_SYSTEM_PROMPT },
-    ...kept.map((t) => ({ role: t.role, name: t.name, content: t.content })),
-    { role: question.role, name: question.name, content: question.content },
-  ];
-}
-
-export async function chatComplete(
-  apiBase: string,
-  apiKey: string,
-  model: string,
-  messages: { role: string; name?: string; content: string }[],
-  timeoutMs: number,
-): Promise<string> {
-  const ctrl = new AbortController();
-  const timer = setTimeout(() => ctrl.abort(), timeoutMs);
-  try {
-    const res = await fetch(`${apiBase.replace(/\/+$/, "")}/chat/completions`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json", Authorization: `Bearer ${apiKey}` },
-      body: JSON.stringify({ model, messages, max_tokens: 1024, temperature: 0.4 }),
-      signal: ctrl.signal,
-    });
-    if (!res.ok) {
-      throw new Error(`LLM ${res.status}: ${(await res.text()).slice(0, 120)}`);
-    }
-    const data = (await res.json()) as { choices?: { message?: { content?: string } }[] };
-    const text = data.choices?.[0]?.message?.content?.trim();
-    if (!text) throw new Error("LLM returned empty content");
-    return text;
-  } finally {
-    clearTimeout(timer);
-  }
-}
-
-export function splitForQQ(text: string, maxLen = 1500): string[] {
-  if (text.length <= maxLen) return [text];
-  const parts: string[] = [];
-  let rest = text;
-  while (rest.length > maxLen) {
-    let cut = rest.lastIndexOf("\n", maxLen);
-    if (cut < maxLen * 0.5) cut = maxLen;
-    parts.push(rest.slice(0, cut));
-    rest = rest.slice(cut).replace(/^\n+/, "");
-  }
-  if (rest) parts.push(rest);
-  return parts;
-}