chatccc 0.2.173 → 0.2.174

package/README.md

@@ -308,8 +308,9 @@ Codex 的默认模型和推理强度可继续由 `~/.codex/config.toml` 管理
 | `/stop` | 停止当前回复 |
 | `/state` | 查看当前会话状态 |
 | `/cd` | 查看或设置当前会话工作目录 |
-| `/sessions` | 查看所有会话状态 |
-| `/git <子命令>` | 在当前会话工作目录执行 `git ...` 并回传输出 |
+| `/sessions` | 查看所有会话状态 |
+| `/usage` | 查看 Codex 5h 用量和周用量 |
+| `/git <子命令>` | 在当前会话工作目录执行 `git ...` 并回传输出 |
 | `/plan <内容>` | 只读计划模式：仅允许读文件和 stop-stuck-loop 请求，不执行任何写操作 |
 | `/ask <内容>` | 只读问答模式：与 /plan 相同，仅允许读文件和 stop-stuck-loop 请求 |
 | `/restart` | 重启机器人进程 |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatccc",
-  "version": "0.2.173",
+  "version": "0.2.174",
   "description": "Feishu bot bridge for Claude Code",
   "license": "Apache-2.0",
   "type": "module",

package/src/__tests__/feishu-avatar.test.ts

@@ -61,20 +61,47 @@ describe("Codex avatar usage battery", () => {
     vi.restoreAllMocks();
   });
 
-  it("adds the 5h remaining percent to Codex avatar uploads when usage lookup succeeds", async () => {
+  it("adds weekly battery and 5h ring percentages to Codex avatar uploads when usage lookup succeeds", async () => {
     const homeDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-home-"));
     const userDataDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-data-"));
     const uploadedNames: string[] = [];
     await writeCodexAuth(homeDir);
     mockAvatarFetch(uploadedNames, new Response(JSON.stringify({
-      rate_limit: { primary_window: { used_percent: 37 } },
+      rate_limit: {
+        primary_window: { used_percent: 37 },
+        secondary_window: { used_percent: 12 },
+      },
     }), { status: 200 }));
 
     try {
       const { setChatAvatar } = await loadFeishuApiWithHome(homeDir, userDataDir);
       await setChatAvatar("tenant-token", "chat_1", "codex", "busy");
 
-      expect(uploadedNames).toEqual(["avatar_codex_busy_usage_63.jpg"]);
+      expect(uploadedNames).toEqual(["avatar_codex_busy_week_88_5h_63.jpg"]);
+    } finally {
+      await rm(homeDir, { recursive: true, force: true });
+      await rm(userDataDir, { recursive: true, force: true });
+    }
+  });
+
+  it("returns both 5h and weekly Codex usage windows", async () => {
+    const homeDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-home-"));
+    const userDataDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-data-"));
+    const uploadedNames: string[] = [];
+    await writeCodexAuth(homeDir);
+    mockAvatarFetch(uploadedNames, new Response(JSON.stringify({
+      rate_limit: {
+        primary_window: { used_percent: 37, reset_after_seconds: 10349, reset_at: 1781528212 },
+        secondary_window: { used_percent: 12, reset_after_seconds: 325063, reset_at: 1781842926 },
+      },
+    }), { status: 200 }));
+
+    try {
+      const { getCodexUsageSummary } = await loadFeishuApiWithHome(homeDir, userDataDir);
+      await expect(getCodexUsageSummary()).resolves.toEqual({
+        fiveHour: { usedPercent: 37, remainingPercent: 63, resetAfterSeconds: 10349, resetAtEpochSeconds: 1781528212 },
+        weekly: { usedPercent: 12, remainingPercent: 88, resetAfterSeconds: 325063, resetAtEpochSeconds: 1781842926 },
+      });
     } finally {
       await rm(homeDir, { recursive: true, force: true });
       await rm(userDataDir, { recursive: true, force: true });

package/src/__tests__/feishu-platform.test.ts

@@ -1,5 +1,5 @@
 import { describe, it, expect, beforeAll, afterAll } from "vitest";
-import { getPlatform, setPlatform, getTenantAccessToken, getChatInfo, createGroupChat, updateChatInfo, sendTextReply, sendCardReply, sendRawCard, sendPostMessage, extractSessionInfo, formatDelayNotice, reportPermissionResults, verifyAllPermissions, addReaction, recallMessage, updateCardMessage, setChatAvatar, disbandChat, sendRestartCard, getMergeForwardMessages } from "../feishu-platform.ts";
+import { getPlatform, setPlatform, getTenantAccessToken, getChatInfo, createGroupChat, updateChatInfo, sendTextReply, sendCardReply, sendRawCard, sendPostMessage, extractSessionInfo, formatDelayNotice, reportPermissionResults, verifyAllPermissions, addReaction, recallMessage, updateCardMessage, setChatAvatar, getCodexUsageSummary, disbandChat, sendRestartCard, getMergeForwardMessages } from "../feishu-platform.ts";
 import type { FeishuPlatform } from "../feishu-platform.ts";
 
 const realPlatform = getPlatform();
@@ -26,9 +26,13 @@ describe("feishu-platform", () => {
       createGroupChat: async () => "mock_chat",
       updateChatInfo: async () => {},
       getChatInfo: async () => ({ name: "x", description: "y" }),
-      disbandChat: async () => {},
-      setChatAvatar: async () => {},
-      getOrDownloadImage: async () => "/tmp/img.png",
+      disbandChat: async () => {},
+      setChatAvatar: async () => {},
+      getCodexUsageSummary: async () => ({
+        fiveHour: { usedPercent: 10, remainingPercent: 90, resetAtEpochSeconds: 1781528212, resetAfterSeconds: 10349 },
+        weekly: { usedPercent: 20, remainingPercent: 80, resetAtEpochSeconds: 1781842926, resetAfterSeconds: 325063 },
+      }),
+      getOrDownloadImage: async () => "/tmp/img.png",
       verifyAllPermissions: async () => [],
       reportPermissionResults: realPlatform.reportPermissionResults,
       extractSessionInfo: realPlatform.extractSessionInfo,
@@ -46,9 +50,13 @@ describe("feishu-platform", () => {
       expect(await getChatInfo("t", "mock_chat")).toEqual({ name: "x", description: "y" });
       const perms = await verifyAllPermissions("t");
       expect(perms).toEqual([]);
-      const mergeMsgs = await getMergeForwardMessages("t", "om_test");
-      expect(mergeMsgs).toEqual([]);
-    } finally {
+      const mergeMsgs = await getMergeForwardMessages("t", "om_test");
+      expect(mergeMsgs).toEqual([]);
+      expect(await getCodexUsageSummary()).toEqual({
+        fiveHour: { usedPercent: 10, remainingPercent: 90, resetAtEpochSeconds: 1781528212, resetAfterSeconds: 10349 },
+        weekly: { usedPercent: 20, remainingPercent: 80, resetAtEpochSeconds: 1781842926, resetAfterSeconds: 325063 },
+      });
+    } finally {
       // 恢复到真实实现，避免影响后续测试
       setPlatform(realPlatform);
     }
@@ -58,4 +66,4 @@ describe("feishu-platform", () => {
     setPlatform(realPlatform);
     expect(getPlatform()).toBe(realPlatform);
   });
-});
+});

package/src/__tests__/orchestrator.test.ts

@@ -6,7 +6,8 @@ import { join } from "node:path";
 import type { PlatformAdapter } from "../platform-adapter.ts";
 import type { SessionInfo, ToolAdapter } from "../adapters/adapter-interface.ts";
 
-const mockStreamStates = new Map<string, { status: "running" | "done" | "stopped"; finalReply: string }>();
+const mockStreamStates = new Map<string, { status: "running" | "done" | "stopped"; finalReply: string }>();
+const mockGetCodexUsageSummary = vi.hoisted(() => vi.fn());
 
 vi.mock("../im-skills.ts", () => ({
   buildImSkillsPrompt: async () => "",
@@ -14,7 +15,7 @@ vi.mock("../im-skills.ts", () => ({
   exportSkillSubDocs: async () => {},
 }));
 
-vi.mock("../stream-state.ts", () => ({
+vi.mock("../stream-state.ts", () => ({
   readStreamState: async (sessionId: string) => {
     const state = mockStreamStates.get(sessionId);
     if (!state) return null;
@@ -49,8 +50,14 @@ vi.mock("../stream-state.ts", () => ({
     cwd,
     tool,
   }),
-  fixStaleStreamStates: async () => {},
-}));
+  fixStaleStreamStates: async () => {},
+}));
+
+vi.mock("../feishu-platform.ts", () => ({
+  getCodexUsageSummary: mockGetCodexUsageSummary,
+  getTenantAccessToken: vi.fn(async () => "tenant-token"),
+  sendPostMessage: vi.fn(async () => true),
+}));
 
 import { handleCommand } from "../orchestrator.ts";
 import {
@@ -113,9 +120,14 @@ describe("handleCommand WeChat processing ack", () => {
     _setSessionToolsFileForTest(join(tempDir, "sessions.json"));
     resetState();
     resetBindingState();
-    mockStreamStates.clear();
-    _setAdapterForToolForTest("claude", mockAdapter());
-  });
+    mockStreamStates.clear();
+    mockGetCodexUsageSummary.mockReset();
+    mockGetCodexUsageSummary.mockResolvedValue({
+      fiveHour: { usedPercent: 0, remainingPercent: 100, resetAtEpochSeconds: null, resetAfterSeconds: null },
+      weekly: { usedPercent: 0, remainingPercent: 100, resetAtEpochSeconds: null, resetAfterSeconds: null },
+    });
+    _setAdapterForToolForTest("claude", mockAdapter());
+  });
 
   afterEach(async () => {
     resetState();
@@ -237,7 +249,7 @@ describe("handleCommand WeChat processing ack", () => {
     expect(registry["feishu-group"]?.sessionId).toBe("sid-feishu-new");
   });
 
-  it("cleans stale Feishu p2p binding but keeps valid commands from auto-creating a group", async () => {
+  it("cleans stale Feishu p2p binding but keeps valid commands from auto-creating a group", async () => {
     const platform = mockPlatform("feishu");
     await recordSessionRegistry({
       chatId: "feishu-p2p",
@@ -252,6 +264,76 @@ describe("handleCommand WeChat processing ack", () => {
     expect(platform.createGroup).not.toHaveBeenCalled();
     expect(platform.sendRawCard).toHaveBeenCalled();
     const registry = await loadSessionRegistryForBinding();
-    expect(registry["feishu-p2p"]).toBeUndefined();
-  });
-});
+    expect(registry["feishu-p2p"]).toBeUndefined();
+  });
+
+  it("handles /usage without creating a new Feishu group", async () => {
+    const platform = mockPlatform("feishu");
+    mockGetCodexUsageSummary.mockResolvedValue({
+      fiveHour: { usedPercent: 37, remainingPercent: 63, resetAtEpochSeconds: 1781528212, resetAfterSeconds: 10349 },
+      weekly: { usedPercent: 12, remainingPercent: 88, resetAtEpochSeconds: 1781842926, resetAfterSeconds: 325063 },
+    });
+
+    await handleCommand(platform, "/usage", "feishu-p2p", "ou-user", Date.now(), "p2p");
+
+    expect(platform.createGroup).not.toHaveBeenCalled();
+    expect(platform.sendCard).toHaveBeenCalledWith(
+      "feishu-p2p",
+      "Codex Usage",
+      expect.stringContaining("**5h:** 已用 37%，剩余 63%，重置:"),
+      "blue",
+    );
+    expect(platform.sendCard).toHaveBeenCalledWith(
+      "feishu-p2p",
+      "Codex Usage",
+      expect.stringContaining("约 2小时52分钟后"),
+      "blue",
+    );
+    expect(platform.sendCard).toHaveBeenCalledWith(
+      "feishu-p2p",
+      "Codex Usage",
+      expect.stringContaining("[███████░░░░░░░░░░░░░]"),
+      "blue",
+    );
+    expect(platform.sendCard).toHaveBeenCalledWith(
+      "feishu-p2p",
+      "Codex Usage",
+      expect.stringContaining("**周:** 已用 12%，剩余 88%，重置:"),
+      "blue",
+    );
+    expect(platform.sendCard).toHaveBeenCalledWith(
+      "feishu-p2p",
+      "Codex Usage",
+      expect.stringContaining("约 3天18小时17分钟后"),
+      "blue",
+    );
+    expect(platform.sendCard).toHaveBeenCalledWith(
+      "feishu-p2p",
+      "Codex Usage",
+      expect.stringContaining("[██░░░░░░░░░░░░░░░░░░]"),
+      "blue",
+    );
+  });
+
+  it("only advertises /usage in new Codex session ready messages", async () => {
+    const codexPlatform = mockPlatform("feishu");
+    _setAdapterForToolForTest("codex", mockAdapter("sid-codex"));
+
+    await handleCommand(codexPlatform, "/new codex", "feishu-p2p", "ou-user", Date.now(), "p2p");
+
+    expect(codexPlatform.sendCard).toHaveBeenCalledWith(
+      "feishu-group",
+      "Codex Session Ready",
+      expect.stringContaining("发送 **/usage** 查看 Codex 5h 和周用量。"),
+      "green",
+    );
+
+    const claudePlatform = mockPlatform("feishu");
+    await handleCommand(claudePlatform, "/new claude", "feishu-p2p-2", "ou-user", Date.now(), "p2p");
+
+    const claudeReadyCall = vi.mocked(claudePlatform.sendCard).mock.calls.find(
+      ([chatId, title]) => chatId === "feishu-group" && title === "Claude Code Session Ready",
+    );
+    expect(claudeReadyCall?.[2]).not.toContain("/usage");
+  });
+});

package/src/__tests__/web-ui.test.ts

@@ -1,5 +1,6 @@
 import { describe, it, expect } from "vitest";
 import {
+  PAGE_HTML,
   chooseStartPath,
   unflattenConfig,
 } from "../web-ui.ts";
@@ -34,6 +35,14 @@ describe("unflattenConfig", () => {
   });
 });
 
+describe("dashboard edit modal", () => {
+  it("shows the edit modal and overlay when a section edit button is clicked", () => {
+    expect(PAGE_HTML).toContain("function editSection(section)");
+    expect(PAGE_HTML).toContain("document.getElementById('edit-modal').classList.remove('hidden');");
+    expect(PAGE_HTML).toContain("document.getElementById('edit-overlay').classList.remove('hidden');");
+  });
+});
+
 // ---------------------------------------------------------------------------
 // chooseStartPath — /api/start 的路径选择
 // 关键护栏：
@@ -80,4 +89,4 @@ describe("chooseStartPath", () => {
       }),
     ).toBe("spawn");
   });
-});
+});

package/src/cards.ts

@@ -133,9 +133,10 @@ export function buildHelpCard(
     "发送 **/new cursor** 创建新 Cursor 会话",
     "发送 **/new codex** 创建新 Codex 会话",
     "发送 **/newh** 重置当前会话（沿用当前工作目录，不切换）",
-    "发送 **/plan** 以规划模式提问（只读，不执行写操作）",
-    "发送 **/ask** 以问答模式提问（只读，不执行写操作）",
-  "发送 **/restart** 重启 ChatCCC 进程",
+    "发送 **/plan** 以规划模式提问（只读，不执行写操作）",
+    "发送 **/ask** 以问答模式提问（只读，不执行写操作）",
+    "发送 **/usage** 查看 Codex 5h 和周用量",
+    "发送 **/restart** 重启 ChatCCC 进程",
     "发送 **/updateg** 更新并重启（仅 npm 全局安装可用）",
   ].join("\n");
   return JSON.stringify({

package/src/feishu-api.ts

@@ -307,20 +307,30 @@ const AVATAR_SOURCES: Record<string, string> = {
   busy: resolvePath(AVATAR_DIR, "status_busy.png"),
   idle: resolvePath(AVATAR_DIR, "status_idle.png"),
 };
-const AVATAR_BADGES: Record<string, string> = {
-  claude: resolvePath(AVATAR_BADGE_DIR, "badge_claude.png"),
-  cursor: resolvePath(AVATAR_BADGE_DIR, "badge_cursor.png"),
-  codex: resolvePath(AVATAR_BADGE_DIR, "badge_codex.png"),
-};
-const AVATAR_SIZE = 256;
-
-interface CodexUsageBalance {
-  usedPercent: number;
-  remainingPercent: number;
-}
-
-const avatarKeyCache = new Map<string, string>();
-let avatarKeyCacheLoaded = false;
+const AVATAR_BADGES: Record<string, string> = {
+  claude: resolvePath(AVATAR_BADGE_DIR, "badge_claude.png"),
+  cursor: resolvePath(AVATAR_BADGE_DIR, "badge_cursor.png"),
+  codex: resolvePath(AVATAR_BADGE_DIR, "badge_codex.png"),
+};
+const AVATAR_SIZE = 256;
+const AVATAR_BADGE_SIZE = 92;
+const AVATAR_BADGE_MARGIN = 10;
+const CODEX_AVATAR_USAGE_STYLE_VERSION = "usage-ring-gray-consumed-v1";
+
+export interface CodexUsageBalance {
+  usedPercent: number;
+  remainingPercent: number;
+  resetAtEpochSeconds: number | null;
+  resetAfterSeconds: number | null;
+}
+
+export interface CodexUsageSummary {
+  fiveHour: CodexUsageBalance;
+  weekly: CodexUsageBalance | null;
+}
+
+const avatarKeyCache = new Map<string, string>();
+let avatarKeyCacheLoaded = false;
 
 function normalizeAvatarTool(tool: string): string {
   return AVATAR_BADGES[tool] ? tool : "claude";
@@ -334,16 +344,16 @@ function avatarCombinationPath(tool: string, status: string): string {
   return resolvePath(AVATAR_COMBINATIONS_DIR, `avatar_${normalizeAvatarTool(tool)}_${normalizeAvatarStatus(status)}.png`);
 }
 
-function avatarCacheKey(tool: string, status: string, codexUsage: CodexUsageBalance | null = null): string {
-  const normalizedTool = normalizeAvatarTool(tool);
-  const normalizedStatus = normalizeAvatarStatus(status);
-  if (normalizedTool === "codex") {
-    return codexUsage
-      ? `${normalizedTool}:${normalizedStatus}:battery:${codexUsage.remainingPercent}`
-      : `${normalizedTool}:${normalizedStatus}:plain`;
-  }
-  return `${normalizedTool}:${normalizedStatus}`;
-}
+function avatarCacheKey(tool: string, status: string, codexUsage: CodexUsageSummary | null = null): string {
+  const normalizedTool = normalizeAvatarTool(tool);
+  const normalizedStatus = normalizeAvatarStatus(status);
+  if (normalizedTool === "codex") {
+    return codexUsage
+      ? `${normalizedTool}:${normalizedStatus}:${CODEX_AVATAR_USAGE_STYLE_VERSION}:week-battery:${codexUsage.weekly?.remainingPercent}:5h-ring:${codexUsage.fiveHour.remainingPercent}`
+      : `${normalizedTool}:${normalizedStatus}:plain`;
+  }
+  return `${normalizedTool}:${normalizedStatus}`;
+}
 
 async function loadAvatarKeyCache(): Promise<void> {
   if (avatarKeyCacheLoaded) return;
@@ -368,12 +378,37 @@ async function persistAvatarKeyCache(): Promise<void> {
   );
 }
 
-function clampPercent(value: number): number {
-  if (!Number.isFinite(value)) return 0;
-  return Math.max(0, Math.min(100, Math.round(value)));
-}
-
-async function getCodexAccessToken(): Promise<string | null> {
+function clampPercent(value: number): number {
+  if (!Number.isFinite(value)) return 0;
+  return Math.max(0, Math.min(100, Math.round(value)));
+}
+
+function usageBalanceFromWindow(raw: Record<string, unknown>, fieldName: string): CodexUsageBalance {
+  const value = raw.used_percent;
+  const usedPercent = Number(value);
+  if (!Number.isFinite(usedPercent)) throw new Error(`missing ${fieldName}.used_percent`);
+  const used = clampPercent(usedPercent);
+  const resetAt = Number(raw.reset_at);
+  const resetAfter = Number(raw.reset_after_seconds);
+  return {
+    usedPercent: used,
+    remainingPercent: clampPercent(100 - used),
+    resetAtEpochSeconds: Number.isFinite(resetAt) ? resetAt : null,
+    resetAfterSeconds: Number.isFinite(resetAfter) ? resetAfter : null,
+  };
+}
+
+function parseOptionalUsageWindow(rateLimit: Record<string, unknown>, keys: string[]): CodexUsageBalance | null {
+  for (const key of keys) {
+    const raw = rateLimit[key];
+    if (!raw || typeof raw !== "object") continue;
+    if ((raw as { used_percent?: unknown }).used_percent === undefined) continue;
+    return usageBalanceFromWindow(raw as Record<string, unknown>, `rate_limit.${key}`);
+  }
+  return null;
+}
+
+async function getCodexAccessToken(): Promise<string | null> {
   try {
     const raw = await readFile(CODEX_AUTH_FILE, "utf-8");
     const parsed = JSON.parse(raw) as { tokens?: { access_token?: unknown } };
@@ -381,36 +416,49 @@ async function getCodexAccessToken(): Promise<string | null> {
     return typeof token === "string" && token.trim() ? token : null;
   } catch {
     return null;
-  }
-}
-
-async function fetchCodexUsageBalance(): Promise<CodexUsageBalance | null> {
-  try {
-    const token = await getCodexAccessToken();
-    if (!token) throw new Error("missing ~/.codex/auth.json access token");
-
-    const resp = await fetch(CODEX_USAGE_URL, {
-      headers: { Authorization: `Bearer ${token}` },
-    });
-    const text = await resp.text();
-    if (!resp.ok) throw new Error(`HTTP ${resp.status}: ${text.slice(0, 160)}`);
-
-    const data = JSON.parse(text) as {
-      rate_limit?: { primary_window?: { used_percent?: unknown } };
-    };
-    const usedPercent = Number(data.rate_limit?.primary_window?.used_percent);
-    if (!Number.isFinite(usedPercent)) throw new Error("missing rate_limit.primary_window.used_percent");
-
-    const used = clampPercent(usedPercent);
-    return {
-      usedPercent: used,
-      remainingPercent: clampPercent(100 - used),
-    };
-  } catch (err) {
-    console.warn(`[${ts()}] [AVATAR] Codex usage unavailable, using plain avatar: ${(err as Error).message}`);
-    return null;
-  }
-}
+  }
+}
+
+export async function getCodexUsageSummary(): Promise<CodexUsageSummary> {
+  const token = await getCodexAccessToken();
+  if (!token) throw new Error("missing ~/.codex/auth.json access token");
+
+  const resp = await fetch(CODEX_USAGE_URL, {
+    headers: { Authorization: `Bearer ${token}` },
+  });
+  const text = await resp.text();
+  if (!resp.ok) throw new Error(`HTTP ${resp.status}: ${text.slice(0, 160)}`);
+
+  const data = JSON.parse(text) as {
+    rate_limit?: Record<string, unknown>;
+  };
+  const rateLimit = data.rate_limit;
+  if (!rateLimit || typeof rateLimit !== "object") throw new Error("missing rate_limit");
+
+  const fiveHour = parseOptionalUsageWindow(rateLimit, ["primary_window"]);
+  if (!fiveHour) throw new Error("missing rate_limit.primary_window.used_percent");
+
+  return {
+    fiveHour,
+    weekly: parseOptionalUsageWindow(rateLimit, [
+      "secondary_window",
+      "weekly_window",
+      "week_window",
+      "long_window",
+    ]),
+  };
+}
+
+async function fetchCodexAvatarUsage(): Promise<CodexUsageSummary | null> {
+  try {
+    const summary = await getCodexUsageSummary();
+    if (!summary.weekly) throw new Error("missing weekly usage window");
+    return summary;
+  } catch (err) {
+    console.warn(`[${ts()}] [AVATAR] Codex usage unavailable, using plain avatar: ${(err as Error).message}`);
+    return null;
+  }
+}
 
 function codexUsagePalette(remainingPercent: number): { start: string; end: string; glow: string } {
   if (remainingPercent <= 25) return { start: "#ef4444", end: "#fb923c", glow: "#fed7aa" };
@@ -418,7 +466,7 @@ function codexUsagePalette(remainingPercent: number): { start: string; end: stri
   return { start: "#16a34a", end: "#34d399", glow: "#bbf7d0" };
 }
 
-function buildCodexUsageBatterySvg(remainingPercent: number): Buffer {
+function buildCodexUsageBatterySvg(remainingPercent: number): Buffer {
   const remaining = clampPercent(remainingPercent);
   const label = `${remaining}%`;
   const palette = codexUsagePalette(remaining);
@@ -462,23 +510,90 @@ function buildCodexUsageBatterySvg(remainingPercent: number): Buffer {
     <rect x="${bodyX}" y="${bodyY}" width="${bodyW}" height="${bodyH}" rx="15" fill="none" stroke="#f8fafc" stroke-opacity="0.82" stroke-width="3.2"/>
     <text x="${bodyX + bodyW / 2}" y="${bodyY + 32}" text-anchor="middle" font-family="Arial, Helvetica, sans-serif" font-size="27" font-weight="900" letter-spacing="0" stroke="#0b1220" stroke-width="5" paint-order="stroke" stroke-linejoin="round" fill="#ffffff">${label}</text>
   </g>
-</svg>`);
-}
-
-async function renderAvatar(tool: string, status: string, codexUsage: CodexUsageBalance | null = null): Promise<{ buffer: Buffer; contentType: string; filename: string }> {
-  const normalizedTool = normalizeAvatarTool(tool);
-  const normalizedStatus = normalizeAvatarStatus(status);
-  const composites: sharp.OverlayOptions[] = [];
-
-  if (normalizedTool === "codex" && codexUsage) {
-    composites.push({ input: buildCodexUsageBatterySvg(codexUsage.remainingPercent), left: 0, top: 0 });
-  }
-
-  let pipeline = sharp(await readFile(avatarCombinationPath(normalizedTool, normalizedStatus)))
-    .resize(AVATAR_SIZE, AVATAR_SIZE, { fit: "cover", position: "center" });
-  if (composites.length > 0) {
-    pipeline = pipeline.composite(composites);
-  }
+</svg>`);
+}
+
+function buildCodexUsageRingSvg(remainingPercent: number): Buffer {
+  const remaining = clampPercent(remainingPercent);
+  const palette = codexUsagePalette(remaining);
+  const cx = 128;
+  const cy = 128;
+  const r = 118;
+  const strokeWidth = 13;
+  const used = clampPercent(100 - remaining);
+  const polar = (angleDegrees: number) => {
+    const angle = (angleDegrees * Math.PI) / 180;
+    return {
+      x: cx + r * Math.cos(angle),
+      y: cy + r * Math.sin(angle),
+    };
+  };
+  const startAngle = -90 + (used / 100) * 360;
+  const sweepAngle = (remaining / 100) * 360;
+  const start = polar(startAngle);
+  const end = polar(startAngle + Math.min(sweepAngle, 359.99));
+  const largeArcFlag = sweepAngle > 180 ? 1 : 0;
+  const progressPath = remaining >= 100
+    ? `<circle cx="${cx}" cy="${cy}" r="${r}" fill="none" stroke="url(#ring)" stroke-width="${strokeWidth}" stroke-linecap="round" filter="url(#ringShadow)"/>`
+    : remaining <= 0
+      ? ""
+      : `<path d="M ${start.x.toFixed(3)} ${start.y.toFixed(3)} A ${r} ${r} 0 ${largeArcFlag} 1 ${end.x.toFixed(3)} ${end.y.toFixed(3)}" fill="none" stroke="url(#ring)" stroke-width="${strokeWidth}" stroke-linecap="round" filter="url(#ringShadow)"/>`;
+
+  return Buffer.from(`
+<svg width="256" height="256" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <linearGradient id="ring" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0" stop-color="${palette.start}"/>
+      <stop offset="1" stop-color="${palette.end}"/>
+    </linearGradient>
+    <filter id="ringShadow" x="-10%" y="-10%" width="120%" height="120%">
+      <feDropShadow dx="0" dy="2" stdDeviation="2.4" flood-color="#0f172a" flood-opacity="0.25"/>
+    </filter>
+  </defs>
+  <circle cx="${cx}" cy="${cy}" r="${r}" fill="none" stroke="#cbd5e1" stroke-width="${strokeWidth}"/>
+  ${progressPath}
+</svg>`);
+}
+
+async function buildAgentBadgeOverlay(tool: string): Promise<sharp.OverlayOptions> {
+  const badge = await sharp(AVATAR_BADGES[tool])
+    .resize(AVATAR_BADGE_SIZE, AVATAR_BADGE_SIZE, {
+      fit: "contain",
+      kernel: sharp.kernel.lanczos3,
+      background: { r: 0, g: 0, b: 0, alpha: 0 },
+    })
+    .png()
+    .toBuffer();
+  return {
+    input: badge,
+    left: AVATAR_SIZE - AVATAR_BADGE_SIZE - AVATAR_BADGE_MARGIN,
+    top: AVATAR_SIZE - AVATAR_BADGE_SIZE - AVATAR_BADGE_MARGIN,
+  };
+}
+
+async function renderAvatar(tool: string, status: string, codexUsage: CodexUsageSummary | null = null): Promise<{ buffer: Buffer; contentType: string; filename: string }> {
+  const normalizedTool = normalizeAvatarTool(tool);
+  const normalizedStatus = normalizeAvatarStatus(status);
+  const composites: sharp.OverlayOptions[] = [];
+
+  const useDynamicCodexAvatar = normalizedTool === "codex" && codexUsage?.weekly;
+  const basePath = useDynamicCodexAvatar
+    ? AVATAR_SOURCES[normalizedStatus]
+    : avatarCombinationPath(normalizedTool, normalizedStatus);
+
+  if (useDynamicCodexAvatar) {
+    composites.push(
+      { input: buildCodexUsageRingSvg(codexUsage.fiveHour.remainingPercent), left: 0, top: 0 },
+      { input: buildCodexUsageBatterySvg(codexUsage.weekly.remainingPercent), left: 0, top: 0 },
+      await buildAgentBadgeOverlay(normalizedTool),
+    );
+  }
+
+  let pipeline = sharp(await readFile(basePath))
+    .resize(AVATAR_SIZE, AVATAR_SIZE, { fit: "cover", position: "center" });
+  if (composites.length > 0) {
+    pipeline = pipeline.composite(composites);
+  }
 
   const jpeg = await pipeline
     .flatten({ background: "#ffffff" })
@@ -486,16 +601,16 @@ async function renderAvatar(tool: string, status: string, codexUsage: CodexUsage
     .jpeg({ quality: 95, progressive: false })
     .toBuffer();
 
-  return {
-    buffer: jpeg,
-    contentType: "image/jpeg",
-    filename: codexUsage
-      ? `avatar_${normalizedTool}_${normalizedStatus}_usage_${codexUsage.remainingPercent}.jpg`
-      : `avatar_${normalizedTool}_${normalizedStatus}.jpg`,
-  };
-}
-
-async function uploadImage(token: string, tool: string, status: string, codexUsage: CodexUsageBalance | null = null): Promise<string> {
+  return {
+    buffer: jpeg,
+    contentType: "image/jpeg",
+    filename: codexUsage?.weekly
+      ? `avatar_${normalizedTool}_${normalizedStatus}_week_${codexUsage.weekly.remainingPercent}_5h_${codexUsage.fiveHour.remainingPercent}.jpg`
+      : `avatar_${normalizedTool}_${normalizedStatus}.jpg`,
+  };
+}
+
+async function uploadImage(token: string, tool: string, status: string, codexUsage: CodexUsageSummary | null = null): Promise<string> {
   const image = await renderAvatar(tool, status, codexUsage);
   const blob = new Blob([new Uint8Array(image.buffer)], { type: image.contentType });
   const form = new FormData();
@@ -518,10 +633,10 @@ async function uploadImage(token: string, tool: string, status: string, codexUsa
 }
 
 async function getOrUploadAvatarKey(token: string, tool: string, status: string): Promise<string> {
-  await loadAvatarKeyCache();
-  const normalizedTool = normalizeAvatarTool(tool);
-  const normalizedStatus = normalizeAvatarStatus(status);
-  const codexUsage = normalizedTool === "codex" ? await fetchCodexUsageBalance() : null;
+  await loadAvatarKeyCache();
+  const normalizedTool = normalizeAvatarTool(tool);
+  const normalizedStatus = normalizeAvatarStatus(status);
+  const codexUsage = normalizedTool === "codex" ? await fetchCodexAvatarUsage() : null;
   const keyName = avatarCacheKey(normalizedTool, normalizedStatus, codexUsage);
   const cached = avatarKeyCache.get(keyName);
   if (cached) return cached;

package/src/feishu-platform.ts

@@ -29,8 +29,9 @@ export interface FeishuPlatform {
   updateChatInfo: typeof realApi.updateChatInfo;
   getChatInfo: typeof realApi.getChatInfo;
   disbandChat: typeof realApi.disbandChat;
-  setChatAvatar: typeof realApi.setChatAvatar;
-  getOrDownloadImage: typeof realApi.getOrDownloadImage;
+  setChatAvatar: typeof realApi.setChatAvatar;
+  getCodexUsageSummary: typeof realApi.getCodexUsageSummary;
+  getOrDownloadImage: typeof realApi.getOrDownloadImage;
   verifyAllPermissions: typeof realApi.verifyAllPermissions;
   reportPermissionResults: typeof realApi.reportPermissionResults;
   extractSessionInfo: typeof realApi.extractSessionInfo;
@@ -108,13 +109,17 @@ export function disbandChat(...args: Parameters<typeof realApi.disbandChat>): Re
   return _impl.disbandChat(...args);
 }
 
-export function setChatAvatar(...args: Parameters<typeof realApi.setChatAvatar>): ReturnType<typeof realApi.setChatAvatar> {
-  return _impl.setChatAvatar(...args);
-}
-
-export function getOrDownloadImage(...args: Parameters<typeof realApi.getOrDownloadImage>): ReturnType<typeof realApi.getOrDownloadImage> {
-  return _impl.getOrDownloadImage(...args);
-}
+export function setChatAvatar(...args: Parameters<typeof realApi.setChatAvatar>): ReturnType<typeof realApi.setChatAvatar> {
+  return _impl.setChatAvatar(...args);
+}
+
+export function getCodexUsageSummary(...args: Parameters<typeof realApi.getCodexUsageSummary>): ReturnType<typeof realApi.getCodexUsageSummary> {
+  return _impl.getCodexUsageSummary(...args);
+}
+
+export function getOrDownloadImage(...args: Parameters<typeof realApi.getOrDownloadImage>): ReturnType<typeof realApi.getOrDownloadImage> {
+  return _impl.getOrDownloadImage(...args);
+}
 
 export function verifyAllPermissions(...args: Parameters<typeof realApi.verifyAllPermissions>): ReturnType<typeof realApi.verifyAllPermissions> {
   return _impl.verifyAllPermissions(...args);
@@ -146,4 +151,4 @@ export function sendRestartCard(...args: Parameters<typeof realApi.sendRestartCa
 
 export function getMergeForwardMessages(...args: Parameters<typeof realApi.getMergeForwardMessages>): ReturnType<typeof realApi.getMergeForwardMessages> {
   return _impl.getMergeForwardMessages(...args);
-}
+}

package/src/orchestrator.ts

@@ -78,9 +78,10 @@ import {
   enqueueMessage,
   cancelQueuedMessage,
 } from "./session-chat-binding.ts";
-import { getTenantAccessToken, sendPostMessage } from "./feishu-platform.ts";
-export { type PlatformAdapter } from "./platform-adapter.ts";
-import type { PlatformAdapter } from "./platform-adapter.ts";
+import { getCodexUsageSummary, getTenantAccessToken, sendPostMessage } from "./feishu-platform.ts";
+export { type PlatformAdapter } from "./platform-adapter.ts";
+import type { PlatformAdapter } from "./platform-adapter.ts";
+import type { CodexUsageSummary } from "./feishu-api.ts";
 
 // ---------------------------------------------------------------------------
 // 辅助函数
@@ -96,7 +97,7 @@ export function sessionChatName(left: string, cwd: string): string {
 }
 
 /** 模型模糊匹配：精确匹配优先，否则找子串匹配（模型名越短越优先） */
-function findModelMatch(input: string, models: string[]): string | null {
+function findModelMatch(input: string, models: string[]): string | null {
   if (models.length === 0) return null;
   const inputLower = input.toLowerCase();
   // 1) 精确匹配（忽略大小写）
@@ -108,11 +109,72 @@ function findModelMatch(input: string, models: string[]): string | null {
     .filter(m => m.toLowerCase().includes(inputLower))
     .sort((a, b) => a.length - b.length);
   return candidates[0] ?? null;
-}
-
-function isUntitledSessionChatName(name: string): boolean {
-  return name === "新会话" || name.startsWith("新会话-");
-}
+}
+
+function formatCodexUsageSummary(usage: CodexUsageSummary): string {
+  const progressBar = (usedPercent: number) => {
+    const width = 20;
+    const usedBlocks = Math.max(0, Math.min(width, Math.round((usedPercent / 100) * width)));
+    return `[${"█".repeat(usedBlocks)}${"░".repeat(width - usedBlocks)}]`;
+  };
+
+  const formatDuration = (seconds: number | null) => {
+    if (seconds === null) return "";
+    if (seconds <= 0) return "（已到重置时间）";
+    const totalMinutes = Math.max(1, Math.floor(seconds / 60));
+    const days = Math.floor(totalMinutes / 1440);
+    const hours = Math.floor((totalMinutes % 1440) / 60);
+    const minutes = totalMinutes % 60;
+    const parts: string[] = [];
+    if (days > 0) parts.push(`${days}天`);
+    if (hours > 0) parts.push(`${hours}小时`);
+    if (minutes > 0 || parts.length === 0) parts.push(`${minutes}分钟`);
+    return `（约 ${parts.join("")}后）`;
+  };
+
+  const formatResetTime = (balance: CodexUsageSummary["fiveHour"]) => {
+    if (balance.resetAtEpochSeconds === null) return "暂无数据";
+    const date = new Date(balance.resetAtEpochSeconds * 1000);
+    const pad = (value: number) => String(value).padStart(2, "0");
+    const absolute = [
+      date.getFullYear(),
+      "-",
+      pad(date.getMonth() + 1),
+      "-",
+      pad(date.getDate()),
+      " ",
+      pad(date.getHours()),
+      ":",
+      pad(date.getMinutes()),
+    ].join("");
+    return `${absolute}${formatDuration(balance.resetAfterSeconds)}`;
+  };
+
+  const formatWindow = (label: string, balance: CodexUsageSummary["fiveHour"] | null) => {
+    if (!balance) return `**${label}:** 暂无数据`;
+    return [
+      `**${label}:** 已用 ${balance.usedPercent}%，剩余 ${balance.remainingPercent}%，重置: ${formatResetTime(balance)}`,
+      progressBar(balance.usedPercent),
+    ].join("\n");
+  };
+
+  return [
+    "Codex 用量：",
+    "",
+    formatWindow("5h", usage.fiveHour),
+    formatWindow("周", usage.weekly),
+  ].join("\n");
+}
+
+function codexUsageHelpLine(tool: string): string {
+  return tool === "codex"
+    ? "\n发送 **/usage** 查看 Codex 5h 和周用量。"
+    : "";
+}
+
+function isUntitledSessionChatName(name: string): boolean {
+  return name === "新会话" || name.startsWith("新会话-");
+}
 
 function shouldSendWechatProcessingAck(
   platform: PlatformAdapter,
@@ -292,7 +354,7 @@ export async function handleCommand(
     return;
   }
 
-  if (textLower === "/updateg") {
+  if (textLower === "/updateg") {
     logTrace(tid, "BRANCH", { cmd: "/updateg" });
     const isGlobal = isRunningFromGlobalNpm();
     appendStartupTrace("updateg: command received", { isGlobal, chatId });
@@ -306,10 +368,32 @@ export async function handleCommand(
     appendStartupTrace("updateg: sync update begin", { fromPid: process.pid });
     syncUpdateAndRestart();
     setTimeout(() => process.exit(0), 2000);
-    return;
-  }
-
-  if (textLower === "/cd" || textLower.startsWith("/cd ")) {
+    return;
+  }
+
+  if (textLower === "/usage") {
+    logTrace(tid, "BRANCH", { cmd: "/usage", tool: "codex" });
+    try {
+      const content = formatCodexUsageSummary(await getCodexUsageSummary());
+      if (platform.kind === "wechat") {
+        await platform.sendText(chatId, content).catch(() => {});
+      } else {
+        await platform.sendCard(chatId, "Codex Usage", content, "blue");
+      }
+      logTrace(tid, "DONE", { outcome: "usage" });
+    } catch (err) {
+      const message = `无法获取 Codex 用量：${(err as Error).message}`;
+      if (platform.kind === "wechat") {
+        await platform.sendText(chatId, message).catch(() => {});
+      } else {
+        await platform.sendCard(chatId, "Codex Usage", message, "red");
+      }
+      logTrace(tid, "DONE", { outcome: "usage_fail", error: (err as Error).message });
+    }
+    return;
+  }
+
+  if (textLower === "/cd" || textLower.startsWith("/cd ")) {
     logTrace(tid, "BRANCH", {
       cmd: "/cd",
       arg: text.slice(3).trim() || "(none)",
@@ -528,12 +612,13 @@ export async function handleCommand(
           `**工作目录:** \`${cwd}\`\n\n` +
           `直接在这里发消息即可与 ${toolLabel} 对话。\n\n` +
           `发送 **/cd** 切换新建会话的默认目录。\n` +
-          `发送 **/model** 查看或切换当前会话的模型。\n` +
-          `发送 **/new** 创建新会话，**/newh** 重置当前会话（沿用工作目录）。\n` +
-          `发送 **/sessions** 查看所有会话状态。\n` +
-          `发送 \`/git <子命令>\` 在本会话工作目录执行 git，例如 \`/git status\`、\`/git log --oneline -n 5\`。`,
-        "green",
-      );
+          `发送 **/model** 查看或切换当前会话的模型。\n` +
+          `发送 **/new** 创建新会话，**/newh** 重置当前会话（沿用工作目录）。\n` +
+          `发送 **/sessions** 查看所有会话状态。\n` +
+          `发送 \`/git <子命令>\` 在本会话工作目录执行 git，例如 \`/git status\`、\`/git log --oneline -n 5\`。` +
+          codexUsageHelpLine(tool),
+        "green",
+      );
       console.log(
         `[${ts()}] [NEW] P2P session created: ${sessionId} (${toolLabel})`,
       );
@@ -614,12 +699,13 @@ export async function handleCommand(
         `**工作目录:** \`${cwd}\`\n\n` +
         `直接在这里发消息即可与 ${toolLabel} 对话。\n\n` +
         `发送 **/cd** 切换新建会话的默认目录。\n` +
-        `发送 **/model** 查看或切换当前会话的模型。\n` +
-        `发送 **/new** 创建新会话，**/newh** 重置当前会话（沿用工作目录）。\n` +
-        `发送 **/sessions** 查看所有会话状态。\n` +
-        `发送 \`/git <子命令>\` 在本会话工作目录执行 git，例如 \`/git status\`、\`/git log --oneline -n 5\`。`,
-      "green",
-    );
+        `发送 **/model** 查看或切换当前会话的模型。\n` +
+        `发送 **/new** 创建新会话，**/newh** 重置当前会话（沿用工作目录）。\n` +
+        `发送 **/sessions** 查看所有会话状态。\n` +
+        `发送 \`/git <子命令>\` 在本会话工作目录执行 git，例如 \`/git status\`、\`/git log --oneline -n 5\`。` +
+        codexUsageHelpLine(tool),
+      "green",
+    );
 
     console.log(`[${ts()}] [STEP 4/4] Replied to new group → OK`);
     logTrace(tid, "DONE", {

package/src/sim-platform.ts

@@ -123,12 +123,19 @@ export const SimulatedPlatform: FeishuPlatform = {
   },
 
   // ---- 头像 ----
-  async setChatAvatar(_token, _chatId, _tool, _status) {
-    // 模拟模式不需要头像
-  },
-
-  // ---- 图片下载 ----
-  async getOrDownloadImage(_token, _messageId, fileKey) {
+  async setChatAvatar(_token, _chatId, _tool, _status) {
+    // 模拟模式不需要头像
+  },
+
+  async getCodexUsageSummary() {
+    return {
+      fiveHour: { usedPercent: 0, remainingPercent: 100, resetAtEpochSeconds: null, resetAfterSeconds: null },
+      weekly: { usedPercent: 0, remainingPercent: 100, resetAtEpochSeconds: null, resetAfterSeconds: null },
+    };
+  },
+
+  // ---- 图片下载 ----
+  async getOrDownloadImage(_token, _messageId, fileKey) {
     return join(SIM_DIR, "images", fileKey);
   },
 
@@ -161,4 +168,4 @@ export const SimulatedPlatform: FeishuPlatform = {
 };
 
 /** 模拟模式下的默认 chat_id（重新导出以保持向后兼容） */
-export { SIM_DEFAULT_CHAT_ID } from "./sim-store.ts";
+export { SIM_DEFAULT_CHAT_ID } from "./sim-store.ts";

package/src/web-ui.ts

@@ -480,7 +480,7 @@ async function handleForgetIlink(_req: IncomingMessage, res: ServerResponse): Pr
 // HTML page (embedded template)
 // ---------------------------------------------------------------------------
 
-const PAGE_HTML = `<!DOCTYPE html>
+export const PAGE_HTML = `<!DOCTYPE html>
 <html lang="zh-CN">
 <head>
 <meta charset="UTF-8">
@@ -1539,9 +1539,11 @@ function editSection(section) {
     html += '<option value="feishu"' + (ptVal === 'feishu' ? ' selected' : '') + '>飞书 (open.feishu.cn)</option>';
     html += '<option value="lark"' + (ptVal === 'lark' ? ' selected' : '') + '>Lark (open.larksuite.com)</option>';
     html += '</select></div>';
-  }
-  document.getElementById('edit-modal-fields').innerHTML = html;
-}
+  }
+  document.getElementById('edit-modal-fields').innerHTML = html;
+  document.getElementById('edit-modal').classList.remove('hidden');
+  document.getElementById('edit-overlay').classList.remove('hidden');
+}
 
 function closeEditModal() {
   document.getElementById('edit-modal').classList.add('hidden');