@zxh126/pi-qqbot 1.3.0 → 1.3.2

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 reads the **fresh** `customType: "usage-report"` entry — first from `sessionManager.getEntries()`, and if that view has not picked up the append yet, straight from 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/constants.ts

@@ -16,5 +16,7 @@ export const DISPATCH_RETRY_MS = 3000;
 export const CANCEL_SETTLE_GRACE_MS = 8000;
 
 const PI_DIR = path.join(os.homedir(), ".pi", "agent");
+/** pi 的 agent 目录（其他扩展也往里写东西，如 pi-usage-report） */
+export const PI_AGENT_DIR = PI_DIR;
 export const CONFIG_PATH = () => path.join(PI_DIR, "pi-qqbot.json");
 export const LOCK_PATH = (appId: string) => path.join(PI_DIR, `pi-qqbot-${appId}.lock`);

package/docs/README.zh-CN.md

@@ -115,12 +115,12 @@ TUI/RPC 前端。在 QQ 里的表现就是「已派发，然后没下文」。
 
 | 命令 | 现在发生什么 |
 |---|---|
-| `/usage [范围]`、`/cost [范围]` | 改派为 `/qq usage <范围>`：桥接先重跑原 `/usage` 命令，再从 session 里读出新的 `customType: "usage-report"` 条目，渲染成文本回 QQ（请求数/总 token/缓存比/费用/按模型）。**用法不变**，照旧发 `/usage today` |
+| `/usage [范围]`、`/cost [范围]` | 改派为 `/qq usage <范围>`：桥接先重跑原 `/usage` 命令，再取**本次新写入**的 `customType: "usage-report"` 条目（先读 `sessionManager.getEntries()` 的增量；发现另一个扩展的 `appendEntry` 还没反映到该视图时，直接读会话文件尾部），渲染成文本回 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 help` 会改汇率或打印帮助（只在 TUI 可见），桥接会明确告知。
-桥接与 [`pi-usage-report`](https://gitee.com/zxh126/pi-usage-report) 的唯一耦合是 `usage-report` 这个
-custom entry 类型名。
+桥接与 [`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.0",
+  "version": "1.3.2",
   "type": "module",
   "description": "Bridge the Pi coding agent into QQ private chats, with remote tool-call approval",
   "license": "MIT",

package/slash.ts

@@ -26,6 +26,8 @@
 import fs from "node:fs";
 import path from "node:path";
 
+import { PI_AGENT_DIR } from "./constants";
+
 export interface SlashCommandText {
 	/** command name without the leading slash, lower-cased (`skill:name` keeps its colon) */
 	name: string;
@@ -380,6 +382,51 @@ export function pickerExpired(picker: PickerState | null): boolean {
 /** pi-usage-report 写入 session 的 custom entry 类型（耦合点，约定值） */
 const USAGE_ENTRY_TYPE = "usage-report";
 
+/** pi-usage-report 的配置/汇率缓存（读回来确认：命令真的生效了，而不是口头应下） */
+const USAGE_SETTINGS_FILE = "pi-usage-report.json";
+const USAGE_RATE_FILE = "pi-usage-report-rate.json";
+
+const USAGE_HELP = [
+	"/usage（默认 today）",
+	"/usage today | yesterday | week | lastweek | month | lastmonth | all",
+	"/usage 7d | 12h | 2w | 3m | 10天        滚动窗口",
+	"/usage 2026-09-01..2026-09-30       本地日期区间（含首尾）",
+	"/usage 今天 | 昨天 | 本周 | 上周 | 本月 | 上月 | 全部",
+	"/usage rate <值> | rate auto        固定 USD→本币汇率，或恢复自动（会真的写配置）",
+].join("\n");
+
+function readAgentJson(file: string): any {
+	try {
+		return JSON.parse(fs.readFileSync(path.join(PI_AGENT_DIR, file), "utf8"));
+	} catch {
+		return undefined;
+	}
+}
+
+const CURRENCY_SYMBOLS: Record<string, string> = { CNY: "¥", USD: "$", EUR: "€", JPY: "¥", GBP: "£", HKD: "HK$" };
+
+/** 复刻 pi-usage-report 的 readSettings 优先级：fixed(usdRate) > 缓存的发布汇率 > 无 */
+function usageMoney(): { code: string; symbol: string; rate: number | null; source: string } {
+	const raw = readAgentJson(USAGE_SETTINGS_FILE) ?? {};
+	const code = String(raw.currency ?? "CNY").toUpperCase();
+	const symbol = typeof raw.symbol === "string" ? raw.symbol : (CURRENCY_SYMBOLS[code] ?? code);
+	const pinned = typeof raw.usdRate === "number" && raw.usdRate > 0 ? raw.usdRate : undefined;
+	const fixed = raw.rateMode === "auto" ? undefined : pinned;
+	if (fixed !== undefined) return { code, symbol, rate: fixed, source: "fixed，/usage rate 手动固定" };
+	const cache = readAgentJson(USAGE_RATE_FILE);
+	if (cache && cache.code === code && typeof cache.rate === "number" && cache.rate > 0) {
+		const ageMinutes = Math.max(0, Math.round((Date.now() - Number(cache.fetchedAt ?? 0)) / 60000));
+		return { code, symbol, rate: cache.rate, source: `cache，${ageMinutes} 分钟前抓取` };
+	}
+	return { code, symbol, rate: null, source: "无，可用 /usage rate <值>" };
+}
+
+function moneyText(money: { code: string; rate: number | null; source: string }): string {
+	return money.rate === null
+		? `USD/${money.code}：无可用汇率（${money.source}）`
+		: `USD/${money.code} = ${money.rate}（${money.source}）`;
+}
+
 function sessionEntries(ctx: any): any[] {
 	try {
 		return ctx?.sessionManager?.getEntries?.() ?? [];
@@ -388,6 +435,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 (entry?.type !== "custom" || entry?.customType !== USAGE_ENTRY_TYPE) 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";
 
@@ -536,19 +641,45 @@ export async function runBridge(
 		}
 		case "usage": {
 			// /qq usage [...]：重跑原 /usage 命令，再从 session 里读回它写的 custom entry
-			if (first === "rate" || first === "help" || first === "?") {
-				reply(
-					`/usage ${arg} 会修改汇率或打印帮助，那些输出只在主机 TUI 可见；\n发 /usage today|week|month|all|7d 可在 QQ 里看统计。`,
-				);
+			const rest = arg.slice(first.length).trim();
+
+			// help：不执行命令（它在 TUI 打文本），直接回本地帮助
+			if (first === "help" || first === "?") {
+				reply(USAGE_HELP);
 				return;
 			}
+
 			const commands = (pi?.getCommands?.() ?? []) as { name: string }[];
-			if (!commands.some((c) => ["usage", "cost"].includes(String(c.name).toLowerCase()))) {
+			const hasUsage = commands.some((c) => ["usage", "cost"].includes(String(c.name).toLowerCase()));
+			if (!hasUsage) {
 				reply("主机上没有 /usage 命令（需要安装 pi-usage-report），无法统计。");
 				return;
 			}
+
+			// rate：会写配置/联网刷新汇率，必须真的执行，再读回状态确认（不能只回一句“TUI 可见”）
+			if (first === "rate") {
+				if (!rest) {
+					reply(moneyText(usageMoney()));
+					return;
+				}
+				const rateCommand = `/usage rate ${rest}`;
+				try {
+					await pi.sendUserMessage(rateCommand, { expandPromptTemplates: true });
+				} catch (error) {
+					reply(`执行 ${rateCommand} 失败：${String((error as any)?.message ?? error).slice(0, 200)}`);
+					return;
+				}
+				const after = usageMoney();
+				reply(
+					`已执行 ${rateCommand}\n${moneyText(after)}\n（下一步 /usage today 的 ¥/USD 换算就用它；无效值会被忽略）`,
+				);
+				return;
+			}
+
 			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 });
@@ -556,11 +687,14 @@ 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));
+			// 先看 sessionManager 的增量，再退回读会话文件（appendEntry 可能还没同步到视图）
+			const entry =
+				[...sessionEntries(ctx)]
+					.reverse()
+					.find((e: any) => e?.type === "custom" && e?.customType === USAGE_ENTRY_TYPE && !before.has(e?.id)) ??
+				readUsageEntryFromFile(file, since);
 			if (!entry) {
-				reply("没拿到用量报告（命令没有产出数据）。");
+				reply("没拿到用量报告：/usage 已执行但找不到报告数据（可重试一次；若反复出现请把 pi-qqbot.log 尾部发我）。");
 				return;
 			}
 			reply(formatUsage(entry.data));