@zxh126/pi-qqbot 1.3.1 → 1.3.3

package/README.md

@@ -117,12 +117,13 @@ Some extension commands never print into the conversation — they call `ctx.ui.
 
 | Command | What happens |
 |---|---|
-| `/usage [range]`, `/cost [range]` | re-dispatched as `/qq usage <range>`: the bridge runs the original `/usage` command, then reads the fresh `customType: "usage-report"` entry from the session and renders it as text (requests, tokens, cache ratio, cost, per-model). **Usage unchanged** — keep sending `/usage today`. |
+| `/usage [range]`, `/cost [range]` | re-dispatched as `/qq usage <range>`: the bridge runs the original `/usage` command, then **polls** for the fresh `customType: "usage-report"` entry for up to 2 s (the append lands ~100 ms *after* `sendUserMessage()` resolves, so a single read always misses it), falling back to the tail of the session file, and renders it as text (requests, tokens, cache ratio, cost, per-model). **Usage unchanged** — keep sending `/usage today`. |
+| `/usage rate <value>`, `/usage rate auto` | really executed (they write `~/.pi/agent/pi-usage-report.json` / refresh the cached rate); the bridge then reads those files back and reports the resulting rate, so an invalid value shows up as "unchanged" |
 | `/mcp`, `/llama` | answered: they need host-TUI selection dialogs / browser login, so nothing is dispatched |
 
-`/usage rate ...` and `/usage help` change settings or print help on the TUI; the bridge tells you
-that instead of silently doing nothing. The `usage-report` entry type is the only coupling point with
-[`pi-usage-report`](https://gitee.com/zxh126/pi-usage-report).
+A bare `/usage rate` and `/usage help` are answered locally, without running the command. Coupling with
+[`pi-usage-report`](https://gitee.com/zxh126/pi-usage-report) is limited to the `usage-report` entry type
+plus the two files it keeps in `~/.pi/agent/`.
 
 Guards:
 

package/docs/README.zh-CN.md

@@ -115,11 +115,11 @@ TUI/RPC 前端。在 QQ 里的表现就是「已派发，然后没下文」。
 
 | 命令 | 现在发生什么 |
 |---|---|
-| `/usage [范围]`、`/cost [范围]` | 改派为 `/qq usage <范围>`：桥接先重跑原 `/usage` 命令，再从 session 里读出新的 `customType: "usage-report"` 条目，渲染成文本回 QQ（请求数/总 token/缓存比/费用/按模型）。**用法不变**，照旧发 `/usage today` |
+| `/usage [范围]`、`/cost [范围]` | 改派为 `/qq usage <范围>`：桥接先重跑原 `/usage` 命令，再**轮询等待**本次新写入的 `customType: "usage-report"` 条目（`appendEntry` 比 `sendUserMessage()` 返回晚约 100 ms，只读一次必然落空），最多等 2 秒，仍未命中才退回读会话文件尾部；然后渲染成文本回 QQ（请求数/总 token/缓存比/费用/按模型）。**用法不变**，照旧发 `/usage today` |
 | `/mcp`、`/llama` | 直接回执：它们需要主机 TUI 的选择框 / 浏览器登录，不会派发 |
-| `/usage rate <值>`、`/usage rate auto` | 会真的执行（写 `~/.pi/agent/pi-usage-report.json` / 刷新汇率缓存），桥接再读回该文件确认新汇率；只发 `/usage rate` 与 `/usage help` 则本地直接回执 |
+| `/usage rate <值>`、`/usage rate auto` | 会真的执行（写 `~/.pi/agent/pi-usage-report.json` / 刷新汇率缓存），桥接再读回文件确认新汇率，无效值会体现在“汇率未变”上；只发 `/usage rate` 与 `/usage help` 则本地直接回执，不执行命令 |
 
-桥接与 [`pi-usage-report`](https://gitee.com/zxh126/pi-usage-report) 的耦合只有两处：`usage-report` 这个
+桥接与 [`pi-usage-report`](https://gitee.com/zxh126/pi-usage-report) 的耦合只有三处：`usage-report` 这个
 custom entry 类型名，以及它写在 `~/.pi/agent/` 下的两个配置文件。
 
 约束：

package/package.json

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

package/slash.ts

@@ -382,6 +382,13 @@ export function pickerExpired(picker: PickerState | null): boolean {
 /** pi-usage-report 写入 session 的 custom entry 类型（耦合点，约定值） */
 const USAGE_ENTRY_TYPE = "usage-report";
 
+/**
+ * appendEntry 的写入比 `sendUserMessage` 的 resolve 晚（实测 promise 183ms 返回，
+ * entry 在之后 ~100ms 才出现在 getEntries 里），所以必须轮询而不是只读一次。
+ */
+const USAGE_WAIT_TIMEOUT_MS = 2000;
+const USAGE_POLL_INTERVAL_MS = 100;
+
 /** pi-usage-report 的配置/汇率缓存（读回来确认：命令真的生效了，而不是口头应下） */
 const USAGE_SETTINGS_FILE = "pi-usage-report.json";
 const USAGE_RATE_FILE = "pi-usage-report-rate.json";
@@ -435,6 +442,64 @@ function sessionEntries(ctx: any): any[] {
 	}
 }
 
+function sessionFile(ctx: any): string | undefined {
+	try {
+		return ctx?.sessionManager?.getSessionFile?.() ?? undefined;
+	} catch {
+		return undefined;
+	}
+}
+
+/** 兼容三种时间形态：毫秒数字（pi.appendEntry 实际写的就是它）/ ISO 字符串 / Date */
+function entryTime(value: unknown): number {
+	if (typeof value === "number") return Number.isFinite(value) ? value : NaN;
+	if (value instanceof Date) return value.getTime();
+	if (typeof value === "string" && value) return Date.parse(value);
+	return NaN;
+}
+
+/**
+ * 从会话文件尾部找最近一条 usage-report（generatedAt 不早于 since）。
+ *
+ * 为什么需要这条路：appendEntry 是**另一个扩展**写的，命令上下文里的
+ * `sessionManager.getEntries()` 不一定即时反映（实测 `/usage today` 已经写入了
+ * 会话文件，但 getEntries 看不到新增项）。数据库不会骗人，文件会。
+ */
+function readUsageEntryFromFile(file: string | undefined, since: number): any | undefined {
+	if (!file) return undefined;
+	try {
+		const size = fs.statSync(file).size;
+		const chunk = Math.min(size, 512 * 1024);
+		if (chunk <= 0) return undefined;
+		const fd = fs.openSync(file, "r");
+		let text = "";
+		try {
+			const buf = Buffer.alloc(chunk);
+			fs.readSync(fd, buf, 0, chunk, size - chunk);
+			text = buf.toString("utf8");
+		} finally {
+			fs.closeSync(fd);
+		}
+		const lines = text.split("\n");
+		for (let i = lines.length - 1; i >= 0; i--) {
+			const line = lines[i].trim();
+			if (!line.startsWith("{")) continue;
+			let entry: any;
+			try {
+				entry = JSON.parse(line);
+			} catch {
+				continue;
+			}
+			if (!isUsageEntry(entry)) continue;
+			const when = entryTime(entry?.data?.generatedAt ?? entry?.timestamp);
+			return Number.isFinite(when) && when >= since ? entry : undefined;
+		}
+	} catch {
+		return undefined;
+	}
+	return undefined;
+}
+
 const intText = (value: unknown): string =>
 	typeof value === "number" && Number.isFinite(value) ? Math.round(value).toLocaleString("en-US") : "0";
 
@@ -446,6 +511,28 @@ function localStamp(value: unknown): string {
 	return `${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}`;
 }
 
+const isUsageEntry = (entry: any): boolean =>
+	entry?.type === "custom" && entry?.customType === USAGE_ENTRY_TYPE;
+
+const sleep = (ms: number) => new Promise<void>((resolve) => setTimeout(resolve, ms));
+
+/**
+ * 等本次 /usage 写的报告出现：每 100ms 查一次 getEntries（最多 2s），
+ * 全程未命中再试一次会话文件（custom entry 可能很晚才落盘）。
+ */
+async function waitForUsageEntry(
+	ctx: any,
+	opts: { before: Set<unknown>; since: number; file?: string },
+): Promise<any | undefined> {
+	const deadline = Date.now() + USAGE_WAIT_TIMEOUT_MS;
+	while (Date.now() < deadline) {
+		const fresh = [...sessionEntries(ctx)].reverse().find((entry: any) => isUsageEntry(entry) && !opts.before.has(entry?.id));
+		if (fresh) return fresh;
+		await sleep(USAGE_POLL_INTERVAL_MS);
+	}
+	return readUsageEntryFromFile(opts.file, opts.since);
+}
+
 /** 把 pi-usage-report 的 ReportData 渲染成 QQ 可读的纯文本 */
 function formatUsage(data: any): string {
 	if (!data?.totals) return "用量报告为空。";
@@ -619,7 +706,9 @@ export async function runBridge(
 			}
 
 			const command = `/usage${arg ? ` ${arg}` : ""}`;
+			const since = Date.now();
 			const before = new Set(sessionEntries(ctx).map((entry: any) => entry?.id));
+			const file = sessionFile(ctx);
 			reply(`正在统计用量（${command}）…`);
 			try {
 				await pi.sendUserMessage(command, { expandPromptTemplates: true });
@@ -627,11 +716,10 @@ export async function runBridge(
 				reply(`统计失败：${String((error as any)?.message ?? error).slice(0, 200)}`);
 				return;
 			}
-			const entry = [...sessionEntries(ctx)]
-				.reverse()
-				.find((e: any) => e?.type === "custom" && e?.customType === USAGE_ENTRY_TYPE && !before.has(e?.id));
+			// 先轮询 getEntries 的增量（appendEntry 晚于 await 返回），超时再退回读会话文件
+			const entry = await waitForUsageEntry(ctx, { before, since, file });
 			if (!entry) {
-				reply("没拿到用量报告（命令没有产出数据）。");
+				reply("没拿到用量报告：/usage 已执行但找不到报告数据（可重试一次；若反复出现请把 pi-qqbot.log 尾部发我）。");
 				return;
 			}
 			reply(formatUsage(entry.data));