chatccc 0.2.186 → 0.2.188

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

@@ -39,23 +39,23 @@ async function loadFeishuApiWithHome(homeDir: string, userDataDir: string) {
 async function writeCodexAuth(homeDir: string): Promise<void> {
   const codexDir = join(homeDir, ".codex");
   await mkdir(codexDir, { recursive: true });
-  await writeFile(
-    join(codexDir, "auth.json"),
-    JSON.stringify({ tokens: { access_token: "codex-access-token", account_id: "codex-account-id" } }),
-    "utf-8",
-  );
-}
+  await writeFile(
+    join(codexDir, "auth.json"),
+    JSON.stringify({ tokens: { access_token: "codex-access-token", account_id: "codex-account-id" } }),
+    "utf-8",
+  );
+}
 
 function mockAvatarFetch(uploadedNames: string[], usageResponse: Response): void {
   vi.stubGlobal("fetch", vi.fn(async (url: string | URL | Request, init?: RequestInit) => {
     const urlText = String(url);
-    if (urlText === "https://chatgpt.com/backend-api/wham/usage") {
-      return usageResponse.clone();
-    }
-    if (urlText === "https://chatgpt.com/backend-api/wham/rate-limit-reset-credits") {
-      return new Response(JSON.stringify({ credits: [] }), { status: 200 });
-    }
-    if (urlText === "https://open.feishu.test/im/v1/images") {
+    if (urlText === "https://chatgpt.com/backend-api/wham/usage") {
+      return usageResponse.clone();
+    }
+    if (urlText === "https://chatgpt.com/backend-api/wham/rate-limit-reset-credits") {
+      return new Response(JSON.stringify({ credits: [] }), { status: 200 });
+    }
+    if (urlText === "https://open.feishu.test/im/v1/images") {
       const form = init?.body as FormData;
       const image = form.get("image") as File;
       uploadedNames.push(image.name);
@@ -68,6 +68,24 @@ function mockAvatarFetch(uploadedNames: string[], usageResponse: Response): void
   }));
 }
 
+function mockAvatarUploadOnlyFetch(uploadedNames: string[]): ReturnType<typeof vi.fn> {
+  const fetchMock = vi.fn(async (url: string | URL | Request, init?: RequestInit) => {
+    const urlText = String(url);
+    if (urlText === "https://open.feishu.test/im/v1/images") {
+      const form = init?.body as FormData;
+      const image = form.get("image") as File;
+      uploadedNames.push(image.name);
+      return new Response(JSON.stringify({ code: 0, data: { image_key: "img_test" } }), { status: 200 });
+    }
+    if (urlText === "https://open.feishu.test/im/v1/chats/chat_1") {
+      return new Response(JSON.stringify({ code: 0 }), { status: 200 });
+    }
+    throw new Error(`unexpected fetch: ${urlText}`);
+  });
+  vi.stubGlobal("fetch", fetchMock);
+  return fetchMock;
+}
+
 describe("Codex avatar usage battery", () => {
   afterEach(() => {
     vi.unstubAllGlobals();
@@ -103,109 +121,134 @@ describe("Codex avatar usage battery", () => {
     }
   });
 
-  it("returns both usage windows and available reset credit expiries", async () => {
-    const homeDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-home-"));
-    const userDataDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-data-"));
-    await writeCodexAuth(homeDir);
-    const fetchMock = vi.fn(async (url: string | URL | Request) => {
-      const urlText = String(url);
-      if (urlText === "https://chatgpt.com/backend-api/wham/usage") {
-        return 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 },
-          },
-          rate_limit_reset_credits: { available_count: 1 },
-        }), { status: 200 });
-      }
-      if (urlText === "https://chatgpt.com/backend-api/wham/rate-limit-reset-credits") {
-        return new Response(JSON.stringify({
-          available_count: 2,
-          credits: [
-            {
-              status: "available",
-              granted_at: "2026-06-12T04:01:47.770016Z",
-              expires_at: "2026-07-12T04:01:47.770016Z",
-            },
-            {
-              status: "redeemed",
-              granted_at: "2026-06-13T04:01:47.770016Z",
-              expires_at: "2026-07-13T04:01:47.770016Z",
-            },
-            {
-              status: "available",
-              granted_at: "2026-06-18T00:44:23.904386Z",
-              expires_at: "2026-07-18T00:44:23.904386Z",
-            },
-          ],
-        }), { status: 200 });
-      }
-      throw new Error(`unexpected fetch: ${urlText}`);
-    });
-    vi.stubGlobal("fetch", fetchMock);
-
-    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 },
-        rateLimitResetCreditsAvailable: 2,
-        rateLimitResetCredits: [
-          { grantedAt: "2026-06-12T04:01:47.770016Z", expiresAt: "2026-07-12T04:01:47.770016Z" },
-          { grantedAt: "2026-06-18T00:44:23.904386Z", expiresAt: "2026-07-18T00:44:23.904386Z" },
-        ],
-      });
-      expect(fetchMock).toHaveBeenCalledWith(
-        "https://chatgpt.com/backend-api/wham/rate-limit-reset-credits",
-        expect.objectContaining({
-          headers: expect.objectContaining({
-            Authorization: "Bearer codex-access-token",
-            "ChatGPT-Account-ID": "codex-account-id",
-            "OpenAI-Beta": "codex-1",
-            originator: "Codex Desktop",
-          }),
-        }),
-      );
-    } finally {
-      await rm(homeDir, { recursive: true, force: true });
-      await rm(userDataDir, { recursive: true, force: true });
+  it("uses provided Codex usage without fetching usage again", async () => {
+    const homeDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-home-"));
+    const userDataDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-data-"));
+    const uploadedNames: string[] = [];
+    const fetchMock = mockAvatarUploadOnlyFetch(uploadedNames);
+
+    try {
+      const { setChatAvatar } = await loadFeishuApiWithHome(homeDir, userDataDir);
+      await setChatAvatar("tenant-token", "chat_1", "codex", "busy", {
+        codexUsage: {
+          fiveHour: { usedPercent: 37, remainingPercent: 63, resetAtEpochSeconds: null, resetAfterSeconds: null },
+          weekly: { usedPercent: 12, remainingPercent: 88, resetAtEpochSeconds: null, resetAfterSeconds: null },
+          rateLimitResetCreditsAvailable: null,
+          rateLimitResetCredits: null,
+        },
+      });
+
+      expect(uploadedNames).toEqual(["avatar_codex_busy_week_88_5h_63.jpg"]);
+      expect(fetchMock).not.toHaveBeenCalledWith("https://chatgpt.com/backend-api/wham/usage", expect.anything());
+    } finally {
+      await rm(homeDir, { recursive: true, force: true });
+      await rm(userDataDir, { recursive: true, force: true });
+    }
+  });
+
+  it("returns both usage windows and available reset credit expiries", async () => {
+    const homeDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-home-"));
+    const userDataDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-data-"));
+    await writeCodexAuth(homeDir);
+    const fetchMock = vi.fn(async (url: string | URL | Request) => {
+      const urlText = String(url);
+      if (urlText === "https://chatgpt.com/backend-api/wham/usage") {
+        return 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 },
+          },
+          rate_limit_reset_credits: { available_count: 1 },
+        }), { status: 200 });
+      }
+      if (urlText === "https://chatgpt.com/backend-api/wham/rate-limit-reset-credits") {
+        return new Response(JSON.stringify({
+          available_count: 2,
+          credits: [
+            {
+              status: "available",
+              granted_at: "2026-06-12T04:01:47.770016Z",
+              expires_at: "2026-07-12T04:01:47.770016Z",
+            },
+            {
+              status: "redeemed",
+              granted_at: "2026-06-13T04:01:47.770016Z",
+              expires_at: "2026-07-13T04:01:47.770016Z",
+            },
+            {
+              status: "available",
+              granted_at: "2026-06-18T00:44:23.904386Z",
+              expires_at: "2026-07-18T00:44:23.904386Z",
+            },
+          ],
+        }), { status: 200 });
+      }
+      throw new Error(`unexpected fetch: ${urlText}`);
+    });
+    vi.stubGlobal("fetch", fetchMock);
+
+    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 },
+        rateLimitResetCreditsAvailable: 2,
+        rateLimitResetCredits: [
+          { grantedAt: "2026-06-12T04:01:47.770016Z", expiresAt: "2026-07-12T04:01:47.770016Z" },
+          { grantedAt: "2026-06-18T00:44:23.904386Z", expiresAt: "2026-07-18T00:44:23.904386Z" },
+        ],
+      });
+      expect(fetchMock).toHaveBeenCalledWith(
+        "https://chatgpt.com/backend-api/wham/rate-limit-reset-credits",
+        expect.objectContaining({
+          headers: expect.objectContaining({
+            Authorization: "Bearer codex-access-token",
+            "ChatGPT-Account-ID": "codex-account-id",
+            "OpenAI-Beta": "codex-1",
+            originator: "Codex Desktop",
+          }),
+        }),
+      );
+    } finally {
+      await rm(homeDir, { recursive: true, force: true });
+      await rm(userDataDir, { recursive: true, force: true });
+    }
+  });
+
+  it("consumes a Codex rate-limit reset credit through the WHAM endpoint", async () => {
+    const homeDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-home-"));
+    const userDataDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-data-"));
+    await writeCodexAuth(homeDir);
+    const fetchMock = vi.fn(async () => new Response(JSON.stringify({
+      code: "reset",
+      windows_reset: 2,
+    }), { status: 200 }));
+    vi.stubGlobal("fetch", fetchMock);
+
+    try {
+      const { consumeCodexRateLimitResetCredit } = await loadFeishuApiWithHome(homeDir, userDataDir);
+      await expect(consumeCodexRateLimitResetCredit("request-1")).resolves.toEqual({
+        code: "reset",
+        windowsReset: 2,
+      });
+      expect(fetchMock).toHaveBeenCalledWith(
+        "https://chatgpt.com/backend-api/wham/rate-limit-reset-credits/consume",
+        expect.objectContaining({
+          method: "POST",
+          headers: expect.objectContaining({
+            Authorization: "Bearer codex-access-token",
+            "Content-Type": "application/json",
+          }),
+          body: JSON.stringify({ redeem_request_id: "request-1" }),
+        }),
+      );
+    } finally {
+      await rm(homeDir, { recursive: true, force: true });
+      await rm(userDataDir, { recursive: true, force: true });
     }
-  });
-
-  it("consumes a Codex rate-limit reset credit through the WHAM endpoint", async () => {
-    const homeDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-home-"));
-    const userDataDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-data-"));
-    await writeCodexAuth(homeDir);
-    const fetchMock = vi.fn(async () => new Response(JSON.stringify({
-      code: "reset",
-      windows_reset: 2,
-    }), { status: 200 }));
-    vi.stubGlobal("fetch", fetchMock);
-
-    try {
-      const { consumeCodexRateLimitResetCredit } = await loadFeishuApiWithHome(homeDir, userDataDir);
-      await expect(consumeCodexRateLimitResetCredit("request-1")).resolves.toEqual({
-        code: "reset",
-        windowsReset: 2,
-      });
-      expect(fetchMock).toHaveBeenCalledWith(
-        "https://chatgpt.com/backend-api/wham/rate-limit-reset-credits/consume",
-        expect.objectContaining({
-          method: "POST",
-          headers: expect.objectContaining({
-            Authorization: "Bearer codex-access-token",
-            "Content-Type": "application/json",
-          }),
-          body: JSON.stringify({ redeem_request_id: "request-1" }),
-        }),
-      );
-    } finally {
-      await rm(homeDir, { recursive: true, force: true });
-      await rm(userDataDir, { recursive: true, force: true });
-    }
-  });
-
-  it("falls back to the pre-combined Codex avatar when usage lookup fails", async () => {
+  });
+
+  it("falls back to the pre-combined Codex avatar when usage lookup fails", async () => {
     const homeDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-home-"));
     const userDataDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-data-"));
     const uploadedNames: string[] = [];
@@ -257,6 +300,28 @@ describe("Cursor avatar usage battery", () => {
     }
   });
 
+  it("uses provided Cursor usage without fetching usage again", async () => {
+    const homeDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-home-"));
+    const userDataDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-data-"));
+    const uploadedNames: string[] = [];
+    mockAvatarUploadOnlyFetch(uploadedNames);
+
+    try {
+      const { setChatAvatar } = await loadFeishuApiWithHome(homeDir, userDataDir);
+      await setChatAvatar("tenant-token", "chat_1", "cursor", "idle", {
+        cursorUsage: {
+          planUsage: { apiPercentUsed: 30 },
+        },
+      });
+
+      expect(uploadedNames).toEqual(["avatar_cursor_idle_battery_70.jpg"]);
+      expect(getCursorUsageSummaryMock).not.toHaveBeenCalled();
+    } finally {
+      await rm(homeDir, { recursive: true, force: true });
+      await rm(userDataDir, { recursive: true, force: true });
+    }
+  });
+
   it("uses On-Demand budget for Cursor avatar battery when configured", async () => {
     const homeDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-home-"));
     const userDataDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-data-"));

package/src/__tests__/orchestrator.test.ts

@@ -77,10 +77,11 @@ import {
   _setAdapterForToolForTest,
   _setSessionRegistryFileForTest,
   _setSessionToolsFileForTest,
-  loadSessionRegistryForBinding,
-  recordSessionRegistry,
-  resetState,
-} from "../session.ts";
+  loadSessionRegistryForBinding,
+  recordSessionRegistry,
+  resetState,
+  sessionInfoMap,
+} from "../session.ts";
 import { activePrompts, resetBindingState } from "../session-chat-binding.ts";
 import { ABD_APPEND_PROMPT } from "../shared-prefix.ts";
 
@@ -362,11 +363,11 @@ describe("handleCommand WeChat processing ack", () => {
     expect(userText).not.toContain("/abd");
   });
 
-  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",
-      sessionId: "stale-sid",
+  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",
+      sessionId: "stale-sid",
       tool: "claude",
       chatName: "旧私聊绑定",
       running: false,
@@ -376,13 +377,109 @@ describe("handleCommand WeChat processing ack", () => {
 
     expect(platform.createGroup).not.toHaveBeenCalled();
     expect(platform.sendRawCard).toHaveBeenCalled();
-    const registry = await loadSessionRegistryForBinding();
-    expect(registry["feishu-p2p"]).toBeUndefined();
-  });
-
-  it("handles /usage without creating a new Feishu group", async () => {
-    const platform = mockPlatform("feishu");
-    mockGetCodexUsageSummary.mockResolvedValue({
+    const registry = await loadSessionRegistryForBinding();
+    expect(registry["feishu-p2p"]).toBeUndefined();
+  });
+
+  it("shows Claude effort switch card in an active Feishu session", async () => {
+    const platform = mockPlatform("feishu");
+    vi.mocked(platform.getChatInfo).mockResolvedValue({ name: "claude-session", description: "Claude Session: sid-claude-effort" });
+    vi.mocked(platform.extractSessionInfo).mockReturnValue({ sessionId: "sid-claude-effort", tool: "claude" });
+    await recordSessionRegistry({
+      chatId: "feishu-chat",
+      sessionId: "sid-claude-effort",
+      tool: "claude",
+      chatName: "claude-session",
+      running: false,
+    });
+    sessionInfoMap.set("feishu-chat", {
+      sessionId: "sid-claude-effort",
+      tool: "claude",
+      turnCount: 0,
+      lastContextTokens: 0,
+      startTime: Date.now(),
+    });
+
+    await handleCommand(platform, "/effort", "feishu-chat", "ou-user", Date.now(), "group");
+
+    expect(platform.sendRawCard).toHaveBeenCalled();
+    const card = JSON.parse(vi.mocked(platform.sendRawCard).mock.calls[0][1]);
+    const raw = JSON.stringify(card);
+    expect(raw).toContain("/effort low");
+    expect(raw).toContain("/effort xhigh");
+    expect(raw).toContain("/effort max");
+  });
+
+  it("switches Codex effort for the current session and reflects it in /state", async () => {
+    const platform = mockPlatform("feishu");
+    vi.mocked(platform.getChatInfo).mockResolvedValue({ name: "codex-session", description: "Codex Session: sid-codex-effort" });
+    vi.mocked(platform.extractSessionInfo).mockReturnValue({ sessionId: "sid-codex-effort", tool: "codex" });
+    _setAdapterForToolForTest("codex", mockAdapter("sid-codex-effort"));
+    await recordSessionRegistry({
+      chatId: "codex-chat",
+      sessionId: "sid-codex-effort",
+      tool: "codex",
+      chatName: "codex-session",
+      running: false,
+    });
+    sessionInfoMap.set("codex-chat", {
+      sessionId: "sid-codex-effort",
+      tool: "codex",
+      turnCount: 0,
+      lastContextTokens: 0,
+      startTime: Date.now(),
+    });
+
+    await handleCommand(platform, "/effort xhigh", "codex-chat", "ou-user", Date.now(), "group");
+    expect(platform.sendCard).toHaveBeenCalledWith(
+      "codex-chat",
+      "Effort 切换",
+      expect.stringContaining("xhigh"),
+      "green",
+    );
+
+    vi.mocked(platform.sendCard).mockClear();
+    vi.mocked(platform.sendRawCard).mockClear();
+    await handleCommand(platform, "/state", "codex-chat", "ou-user", Date.now() + 1, "group");
+
+    expect(platform.sendRawCard).toHaveBeenCalled();
+    const card = JSON.parse(vi.mocked(platform.sendRawCard).mock.calls[0][1]);
+    expect(JSON.stringify(card)).toContain("xhigh");
+  });
+
+  it("rejects /effort in Cursor sessions", async () => {
+    const platform = mockPlatform("feishu");
+    vi.mocked(platform.getChatInfo).mockResolvedValue({ name: "cursor-session", description: "Cursor Session: sid-cursor-effort" });
+    vi.mocked(platform.extractSessionInfo).mockReturnValue({ sessionId: "sid-cursor-effort", tool: "cursor" });
+    _setAdapterForToolForTest("cursor", mockAdapter("sid-cursor-effort"));
+    await recordSessionRegistry({
+      chatId: "cursor-chat",
+      sessionId: "sid-cursor-effort",
+      tool: "cursor",
+      chatName: "cursor-session",
+      running: false,
+    });
+    sessionInfoMap.set("cursor-chat", {
+      sessionId: "sid-cursor-effort",
+      tool: "cursor",
+      turnCount: 0,
+      lastContextTokens: 0,
+      startTime: Date.now(),
+    });
+
+    await handleCommand(platform, "/effort high", "cursor-chat", "ou-user", Date.now(), "group");
+
+    expect(platform.sendCard).toHaveBeenCalledWith(
+      "cursor-chat",
+      "Effort 切换",
+      expect.stringContaining("不支持 effort"),
+      "red",
+    );
+  });
+
+  it("handles /usage without creating a new Feishu group", async () => {
+    const platform = mockPlatform("feishu");
+    const usage = {
       fiveHour: { usedPercent: 37, remainingPercent: 63, resetAtEpochSeconds: 1781528212, resetAfterSeconds: 10349 },
       weekly: { usedPercent: 12, remainingPercent: 88, resetAtEpochSeconds: 1781842926, resetAfterSeconds: 325063 },
       rateLimitResetCreditsAvailable: 2,
@@ -390,7 +487,8 @@ describe("handleCommand WeChat processing ack", () => {
         { grantedAt: "2026-06-12T04:01:47.770016Z", expiresAt: "2026-07-12T04:01:47.770016Z" },
         { grantedAt: "2026-06-18T00:44:23.904386Z", expiresAt: "2026-07-18T00:44:23.904386Z" },
       ],
-    });
+    };
+    mockGetCodexUsageSummary.mockResolvedValue(usage);
 
     await handleCommand(platform, "/usage", "feishu-p2p", "ou-user", Date.now(), "p2p");
 
@@ -411,6 +509,7 @@ describe("handleCommand WeChat processing ack", () => {
     expect(card.elements[0].text.content).toContain("[██░░░░░░░░░░░░░░░░░░]");
     expect(card.elements[2].actions[0].text.content).toBe("发起重置");
     expect(card.elements[2].actions[0].value).toEqual({ action: "codex_reset_request", availableCount: 2 });
+    expect(platform.setChatAvatar).toHaveBeenCalledWith("feishu-p2p", "codex", "idle", { codexUsage: usage });
   });
 
   it("adds ChatGPT subscription expiry to Codex /usage when CDP lookup succeeds", async () => {
@@ -445,6 +544,24 @@ describe("handleCommand WeChat processing ack", () => {
     expect(card.elements[0].text.content).toContain("- 自动续费: 否");
   });
 
+  it("shows an actionable ChatGPT subscription failure reason when Chrome CDP is enabled", async () => {
+    const platform = mockPlatform("feishu");
+    mockGetChatGptSubscriptionStatus.mockResolvedValue({
+      ok: false,
+      code: "chatgpt_session_missing",
+      reason: "ChatGPT browser session has no access token.",
+      chromeCdp: { enabled: true, port: 15166, status: "healthy" },
+      chatgpt: { sessionOk: true },
+    });
+
+    await handleCommand(platform, "/usage", "feishu-p2p", "ou-user", Date.now(), "p2p");
+
+    const card = JSON.parse(vi.mocked(platform.sendRawCard).mock.calls[0][1]);
+    expect(card.elements[0].text.content).toContain("**ChatGPT 订阅查询失败:**");
+    expect(card.elements[0].text.content).toContain("请在 15166 端口对应的 Chrome 浏览器中登录 ChatGPT");
+    expect(card.elements[0].text.content).toContain("ChatGPT browser session has no access token.");
+  });
+
   it("handles /usage as Cursor usage in Cursor chats", async () => {
     const platform = mockPlatform("feishu");
     await recordSessionRegistry({
@@ -472,6 +589,37 @@ describe("handleCommand WeChat processing ack", () => {
       expect.stringContaining("Pool remaining: $171417.76"),
       "blue",
     );
+    expect(platform.setChatAvatar).toHaveBeenCalledWith(
+      "cursor-chat",
+      "cursor",
+      "idle",
+      { cursorUsage: expect.objectContaining({ displayMessage: "You've hit your usage limit" }) },
+    );
+  });
+
+  it("keeps the busy avatar status when /usage runs for an active Cursor session", async () => {
+    const platform = mockPlatform("feishu");
+    await recordSessionRegistry({
+      chatId: "cursor-chat",
+      sessionId: "sid-cursor",
+      tool: "cursor",
+      chatName: "cursor-session",
+      running: true,
+    });
+    activePrompts.set("sid-cursor", {
+      controller: new AbortController(),
+      stopped: false,
+      startTime: Date.now(),
+    });
+
+    await handleCommand(platform, "/usage", "cursor-chat", "ou-user", Date.now(), "group");
+
+    expect(platform.setChatAvatar).toHaveBeenCalledWith(
+      "cursor-chat",
+      "cursor",
+      "busy",
+      { cursorUsage: expect.objectContaining({ displayMessage: "You've hit your usage limit" }) },
+    );
   });
 
   it("advertises /usage in new Codex and Cursor session ready messages", async () => {

package/src/__tests__/session.test.ts

@@ -91,11 +91,12 @@ import {
   stopSession,
   startUnifiedDisplayLoop,
   stopUnifiedDisplayLoop,
-  _setProcessAliveForTest,
-  _resetProcessAliveForTest,
-  _setProcessMonitorIntervalForTest,
-  _resetProcessMonitorIntervalForTest,
-} from "../session.ts";
+  _setProcessAliveForTest,
+  _resetProcessAliveForTest,
+  _setProcessMonitorIntervalForTest,
+  _resetProcessMonitorIntervalForTest,
+  setSessionEffortOverride,
+} from "../session.ts";
 import {
   activePrompts,
   bindChatToSession,
@@ -895,8 +896,17 @@ describe("getSessionStatus", () => {
     expect(status!.effort).not.toBeNull();
     // model 必为字符串（留空时显示 '(留空)'，否则为环境变量值）；不应是占位符
     expect(typeof status!.model).toBe("string");
-    expect(status!.model.length).toBeGreaterThan(0);
-  });
+    expect(status!.model.length).toBeGreaterThan(0);
+  });
+
+  it("Codex session status uses the per-session effort override", async () => {
+    mockSessionInfo("chat-codex", { sessionId: "sid-codex-effort", tool: "codex" });
+    setSessionEffortOverride("sid-codex-effort", "xhigh");
+
+    const status = await getSessionStatus("chat-codex");
+
+    expect(status!.effort).toBe("xhigh");
+  });
 
   it("Cursor 会话：effort 恒为 null（卡片渲染时隐藏该行，避免显示无意义的 effort）", async () => {
     mockSessionInfo("chat-cursor", { sessionId: "sid-cur", tool: "cursor" });

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

@@ -34,6 +34,22 @@ describe("unflattenConfig", () => {
     });
   });
 
+  it("maps Cursor and Codex alternative models into agent config", () => {
+    expect(
+      unflattenConfig({
+        CHATCCC_CURSOR_ALTERNATIVE_MODEL: "gpt-5.5-high",
+        CHATCCC_CODEX_ALTERNATIVE_MODEL: "gpt-5.3-codex",
+      }),
+    ).toEqual({
+      cursor: {
+        alternativeModel: "gpt-5.5-high",
+      },
+      codex: {
+        alternativeModel: "gpt-5.3-codex",
+      },
+    });
+  });
+
   it("maps Chrome CDP guard fields into chromeDevtools config", () => {
     expect(
       unflattenConfig({
@@ -57,6 +73,12 @@ describe("dashboard edit modal", () => {
     expect(PAGE_HTML).toContain("document.getElementById('edit-modal').classList.remove('hidden');");
     expect(PAGE_HTML).toContain("document.getElementById('edit-overlay').classList.remove('hidden');");
   });
+
+  it("uses plain alternative model labels for Cursor and Codex", () => {
+    expect(PAGE_HTML).toContain("field-CHATCCC_CURSOR_ALTERNATIVE_MODEL");
+    expect(PAGE_HTML).toContain("field-CHATCCC_CODEX_ALTERNATIVE_MODEL");
+    expect(PAGE_HTML).toContain("备选模型");
+  });
 });
 
 // ---------------------------------------------------------------------------