chatccc 0.2.178 → 0.2.179

package/README.md

@@ -308,13 +308,13 @@ Codex 的默认模型和推理强度可继续由 `~/.codex/config.toml` 管理
 | `/stop` | 停止当前回复 |
 | `/state` | 查看当前会话状态 |
 | `/cd` | 查看或设置当前会话工作目录 |
-| `/sessions` | 查看所有会话状态 |
-| `/usage` | 查看 Codex 5h 用量和周用量 |
-| `/git <子命令>` | 在当前会话工作目录执行 `git ...` 并回传输出 |
+| `/sessions` | 查看所有会话状态 |
+| `/usage` | 查看 Codex 5h 用量和周用量 |
+| `/git <子命令>` | 在当前会话工作目录执行 `git ...` 并回传输出 |
 | `/plan <内容>` | 只读计划模式：仅允许读文件和 stop-stuck-loop 请求，不执行任何写操作 |
 | `/ask <内容>` | 只读问答模式：与 /plan 相同，仅允许读文件和 stop-stuck-loop 请求 |
 | `/restart` | 重启机器人进程 |
-| `/updateg` | 更新 npm 全局包并重启（仅限 `npm install -g chatccc` 安装的全局进程） |
+| `/update` | 更新 npm 全局包并重启（仅限 `npm install -g chatccc` 安装的全局进程） |
 
 > **模型切换**：`/model` 查看可选模型清单，`/model <名称>` 模糊匹配切换，`/model clear` 恢复默认。当前仅 Claude Code 支持模型切换（需同时填写 `claude.model` 和 `claude.subagentModel`），Cursor / Codex 切换正在开发中。
 

package/config.sample.json

@@ -24,7 +24,9 @@
     "enabled": false,
     "defaultAgent": false,
     "path": "",
-    "model": ""
+    "model": "",
+    "avatarBatteryMode": "apiPercent",
+    "onDemandMonthlyBudget": 1000
   },
   "codex": {
     "enabled": false,

package/package.json

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

package/src/__tests__/card-plain-text.test.ts

@@ -17,7 +17,7 @@ describe("cardJsonToPlainText", () => {
     expect(text).toContain("/new cursor");
     expect(text).toContain("/new codex");
     expect(text).toContain("/restart");
-    expect(text).toContain("/updateg");
+    expect(text).toContain("/update");
     expect(text).toContain("/cd");
   });
 

package/src/__tests__/config-reload.test.ts

@@ -8,11 +8,11 @@ import {
   APP_ID,
   APP_SECRET,
   CHATCCC_PORT,
-  CLAUDE_API_KEY,
-  CLAUDE_BASE_URL,
-  CLAUDE_EFFORT,
-  CLAUDE_MAX_TURN,
-  CLAUDE_MODEL,
+  CLAUDE_API_KEY,
+  CLAUDE_BASE_URL,
+  CLAUDE_EFFORT,
+  CLAUDE_MAX_TURN,
+  CLAUDE_MODEL,
   CLAUDE_SUBAGENT_MODEL,
   CURSOR_AGENT_ARGS,
   CURSOR_AGENT_COMMAND,
@@ -53,7 +53,14 @@ const baseAppConfig: AppConfig = {
     baseUrl: "",
     maxTurn: 0,
   },
-  cursor: { enabled: true, defaultAgent: false, path: "/initial/cursor", model: "initial-cursor-model" },
+  cursor: {
+    enabled: true,
+    defaultAgent: false,
+    path: "/initial/cursor",
+    model: "initial-cursor-model",
+    avatarBatteryMode: "apiPercent",
+    onDemandMonthlyBudget: 1000,
+  },
   codex: { enabled: true, defaultAgent: false, path: "/initial/codex", model: "initial-codex-model", effort: "initial-codex-effort" },
 };
 
@@ -82,7 +89,7 @@ describe("applyLoadedConfig — 刷新 export let 常量", () => {
     expect(APP_SECRET).toBe("NEW_APP_SECRET");
   });
 
-  it("更新 Claude 配置（model / subagentModel / effort / maxTurn / apiKey / baseUrl）", () => {
+  it("更新 Claude 配置（model / subagentModel / effort / maxTurn / apiKey / baseUrl）", () => {
     applyLoadedConfig({
       ...structuredClone(baseAppConfig),
       claude: {
@@ -90,18 +97,18 @@ describe("applyLoadedConfig — 刷新 export let 常量", () => {
         defaultAgent: true,
         model: "claude-sonnet-4-6",
         subagentModel: "claude-haiku-4-5-20251001",
-        effort: "high",
-        apiKey: "sk-test",
-        baseUrl: "https://api.example.com",
-        maxTurn: 7,
-      },
-    });
-
-    expect(CLAUDE_MODEL).toBe("claude-sonnet-4-6");
-    expect(CLAUDE_SUBAGENT_MODEL).toBe("claude-haiku-4-5-20251001");
-    expect(CLAUDE_EFFORT).toBe("high");
-    expect(CLAUDE_MAX_TURN).toBe(7);
-    expect(CLAUDE_API_KEY).toBe("sk-test");
+        effort: "high",
+        apiKey: "sk-test",
+        baseUrl: "https://api.example.com",
+        maxTurn: 7,
+      },
+    });
+
+    expect(CLAUDE_MODEL).toBe("claude-sonnet-4-6");
+    expect(CLAUDE_SUBAGENT_MODEL).toBe("claude-haiku-4-5-20251001");
+    expect(CLAUDE_EFFORT).toBe("high");
+    expect(CLAUDE_MAX_TURN).toBe(7);
+    expect(CLAUDE_API_KEY).toBe("sk-test");
     expect(CLAUDE_BASE_URL).toBe("https://api.example.com");
   });
 
@@ -132,7 +139,7 @@ describe("applyLoadedConfig — 刷新 export let 常量", () => {
   it("CURSOR_AGENT_ARGS 跟随 cursor.model 重新解析", () => {
     applyLoadedConfig({
       ...structuredClone(baseAppConfig),
-      cursor: { enabled: true, defaultAgent: false, path: "/x/cursor", model: "claude-3.7-sonnet" },
+      cursor: { enabled: true, defaultAgent: false, path: "/x/cursor", model: "claude-3.7-sonnet", avatarBatteryMode: "apiPercent", onDemandMonthlyBudget: 1000 },
     });
 
     // CURSOR_AGENT_ARGS 是 ['-p', '--force', '--approve-mcps', ..., '--model', 'claude-3.7-sonnet']
@@ -144,7 +151,7 @@ describe("applyLoadedConfig — 刷新 export let 常量", () => {
   it("cursor.model 留空时 CURSOR_AGENT_ARGS 不含 --model", () => {
     applyLoadedConfig({
       ...structuredClone(baseAppConfig),
-      cursor: { enabled: true, defaultAgent: false, path: "/x/cursor", model: "" },
+      cursor: { enabled: true, defaultAgent: false, path: "/x/cursor", model: "", avatarBatteryMode: "apiPercent", onDemandMonthlyBudget: 1000 },
     });
 
     expect(CURSOR_AGENT_ARGS).not.toContain("--model");
@@ -153,7 +160,7 @@ describe("applyLoadedConfig — 刷新 export let 常量", () => {
   it("CURSOR_AGENT_COMMAND 优先取 config.cursor.path", () => {
     applyLoadedConfig({
       ...structuredClone(baseAppConfig),
-      cursor: { enabled: true, defaultAgent: false, path: "C:/custom/cursor.exe", model: "" },
+      cursor: { enabled: true, defaultAgent: false, path: "C:/custom/cursor.exe", model: "", avatarBatteryMode: "apiPercent", onDemandMonthlyBudget: 1000 },
     });
 
     expect(CURSOR_AGENT_COMMAND).toBe("C:/custom/cursor.exe");

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

@@ -1,129 +1,219 @@
-import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-
-import { afterEach, describe, expect, it, vi } from "vitest";
-
-async function loadFeishuApiWithHome(homeDir: string, userDataDir: string) {
-  vi.resetModules();
-  vi.doMock("node:os", () => ({ homedir: () => homeDir }));
-  vi.doMock("../config.ts", () => ({
-    APP_ID: "app_id",
-    APP_SECRET: "app_secret",
-    BASE_URL: "https://open.feishu.test",
-    CHAT_LOGS_DIR: join(userDataDir, "logs"),
-    PROJECT_ROOT: process.cwd(),
-    USER_DATA_DIR: userDataDir,
-    CLAUDE_SESSION_PREFIX: "Claude Code Session:",
-    CURSOR_SESSION_PREFIX: "Cursor Session:",
-    CODEX_SESSION_PREFIX: "Codex Session:",
-    ts: () => "test-ts",
-    resolveDefaultAgentTool: () => "claude",
-    toolDisplayName: (tool: string) => tool,
-  }));
-  return import("../feishu-api.ts");
-}
-
-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" } }),
-    "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://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}`);
-  }));
-}
-
-describe("Codex avatar usage battery", () => {
-  afterEach(() => {
-    vi.unstubAllGlobals();
-    vi.doUnmock("node:os");
-    vi.doUnmock("../config.ts");
-    vi.restoreAllMocks();
-  });
-
-  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 },
-        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_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 });
-    }
-  });
-
-  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[] = [];
-    await writeCodexAuth(homeDir);
-    vi.spyOn(console, "warn").mockImplementation(() => {});
-    mockAvatarFetch(uploadedNames, new Response("fail", { status: 500 }));
-
-    try {
-      const { setChatAvatar } = await loadFeishuApiWithHome(homeDir, userDataDir);
-      await setChatAvatar("tenant-token", "chat_1", "codex", "idle");
-
-      expect(uploadedNames).toEqual(["avatar_codex_idle.jpg"]);
-    } finally {
-      await rm(homeDir, { recursive: true, force: true });
-      await rm(userDataDir, { recursive: true, force: true });
-    }
-  });
-});
+import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+const mockConfig = {
+  cursor: {
+    avatarBatteryMode: "apiPercent",
+    onDemandMonthlyBudget: 1000,
+  },
+};
+const getCursorUsageSummaryMock = vi.fn();
+
+async function loadFeishuApiWithHome(homeDir: string, userDataDir: string) {
+  vi.resetModules();
+  vi.doMock("node:os", () => ({ homedir: () => homeDir }));
+  vi.doMock("../config.ts", () => ({
+    APP_ID: "app_id",
+    APP_SECRET: "app_secret",
+    BASE_URL: "https://open.feishu.test",
+    CHAT_LOGS_DIR: join(userDataDir, "logs"),
+    PROJECT_ROOT: process.cwd(),
+    USER_DATA_DIR: userDataDir,
+    CLAUDE_SESSION_PREFIX: "Claude Code Session:",
+    CURSOR_SESSION_PREFIX: "Cursor Session:",
+    CODEX_SESSION_PREFIX: "Codex Session:",
+    ts: () => "test-ts",
+    resolveDefaultAgentTool: () => "claude",
+    toolDisplayName: (tool: string) => tool,
+    config: mockConfig,
+  }));
+  vi.doMock("../cursor-usage.ts", () => ({
+    getCursorUsageSummary: getCursorUsageSummaryMock,
+  }));
+  return import("../feishu-api.ts");
+}
+
+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" } }),
+    "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://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}`);
+  }));
+}
+
+describe("Codex avatar usage battery", () => {
+  afterEach(() => {
+    vi.unstubAllGlobals();
+    vi.doUnmock("node:os");
+    vi.doUnmock("../config.ts");
+    vi.doUnmock("../cursor-usage.ts");
+    vi.restoreAllMocks();
+    getCursorUsageSummaryMock.mockReset();
+    mockConfig.cursor.avatarBatteryMode = "apiPercent";
+    mockConfig.cursor.onDemandMonthlyBudget = 1000;
+  });
+
+  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 },
+        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_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 });
+    }
+  });
+
+  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[] = [];
+    await writeCodexAuth(homeDir);
+    vi.spyOn(console, "warn").mockImplementation(() => {});
+    mockAvatarFetch(uploadedNames, new Response("fail", { status: 500 }));
+
+    try {
+      const { setChatAvatar } = await loadFeishuApiWithHome(homeDir, userDataDir);
+      await setChatAvatar("tenant-token", "chat_1", "codex", "idle");
+
+      expect(uploadedNames).toEqual(["avatar_codex_idle.jpg"]);
+    } finally {
+      await rm(homeDir, { recursive: true, force: true });
+      await rm(userDataDir, { recursive: true, force: true });
+    }
+  });
+});
+
+describe("Cursor avatar usage battery", () => {
+  afterEach(() => {
+    vi.unstubAllGlobals();
+    vi.doUnmock("node:os");
+    vi.doUnmock("../config.ts");
+    vi.doUnmock("../cursor-usage.ts");
+    vi.restoreAllMocks();
+    getCursorUsageSummaryMock.mockReset();
+    mockConfig.cursor.avatarBatteryMode = "apiPercent";
+    mockConfig.cursor.onDemandMonthlyBudget = 1000;
+  });
+
+  it("uses remaining API percentage for Cursor avatar battery", async () => {
+    const homeDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-home-"));
+    const userDataDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-data-"));
+    const uploadedNames: string[] = [];
+    getCursorUsageSummaryMock.mockResolvedValue({
+      planUsage: { apiPercentUsed: 40 },
+    });
+    mockAvatarFetch(uploadedNames, new Response("unused", { status: 500 }));
+
+    try {
+      const { setChatAvatar } = await loadFeishuApiWithHome(homeDir, userDataDir);
+      await setChatAvatar("tenant-token", "chat_1", "cursor", "busy");
+
+      expect(uploadedNames).toEqual(["avatar_cursor_busy_battery_60.jpg"]);
+    } 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-"));
+    const uploadedNames: string[] = [];
+    mockConfig.cursor.avatarBatteryMode = "onDemandUse";
+    mockConfig.cursor.onDemandMonthlyBudget = 1000;
+    getCursorUsageSummaryMock.mockResolvedValue({
+      spendLimitUsage: { individualUsed: 25000 },
+    });
+    mockAvatarFetch(uploadedNames, new Response("unused", { status: 500 }));
+
+    try {
+      const { setChatAvatar } = await loadFeishuApiWithHome(homeDir, userDataDir);
+      await setChatAvatar("tenant-token", "chat_1", "cursor", "idle");
+
+      expect(uploadedNames).toEqual(["avatar_cursor_idle_battery_75.jpg"]);
+    } finally {
+      await rm(homeDir, { recursive: true, force: true });
+      await rm(userDataDir, { recursive: true, force: true });
+    }
+  });
+
+  it("falls back to the pre-combined Cursor 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[] = [];
+    vi.spyOn(console, "warn").mockImplementation(() => {});
+    getCursorUsageSummaryMock.mockRejectedValue(new Error("cursor unavailable"));
+    mockAvatarFetch(uploadedNames, new Response("unused", { status: 500 }));
+
+    try {
+      const { setChatAvatar } = await loadFeishuApiWithHome(homeDir, userDataDir);
+      await setChatAvatar("tenant-token", "chat_1", "cursor", "busy");
+
+      expect(uploadedNames).toEqual(["avatar_cursor_busy.jpg"]);
+    } finally {
+      await rm(homeDir, { recursive: true, force: true });
+      await rm(userDataDir, { recursive: true, force: true });
+    }
+  });
+});