chatccc 0.2.178 → 0.2.180

package/src/__tests__/orchestrator.test.ts

@@ -6,8 +6,9 @@ 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 mockGetCodexUsageSummary = vi.hoisted(() => vi.fn());
+const mockStreamStates = new Map<string, { status: "running" | "done" | "stopped"; finalReply: string }>();
+const mockGetCodexUsageSummary = vi.hoisted(() => vi.fn());
+const mockGetCursorUsageSummary = vi.hoisted(() => vi.fn());
 
 vi.mock("../im-skills.ts", () => ({
   buildImSkillsPrompt: async () => "",
@@ -15,7 +16,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;
@@ -50,18 +51,22 @@ vi.mock("../stream-state.ts", () => ({
     cwd,
     tool,
   }),
-  fixStaleStreamStates: async () => {},
-}));
-
-vi.mock("../feishu-platform.ts", () => ({
-  getCodexUsageSummary: mockGetCodexUsageSummary,
-  getTenantAccessToken: vi.fn(async () => "tenant-token"),
-  sendPostMessage: vi.fn(async () => true),
-}));
+  fixStaleStreamStates: async () => {},
+}));
+
+vi.mock("../feishu-platform.ts", () => ({
+  getCodexUsageSummary: mockGetCodexUsageSummary,
+  getTenantAccessToken: vi.fn(async () => "tenant-token"),
+  sendPostMessage: vi.fn(async () => true),
+}));
+
+vi.mock("../cursor-usage.ts", () => ({
+  getCursorUsageSummary: mockGetCursorUsageSummary,
+}));
 
 import { handleCommand } from "../orchestrator.ts";
-import {
-  _clearAdapterCacheForTest,
+import {
+  _clearAdapterCacheForTest,
   _resetSessionRegistryFileForTest,
   _resetSessionToolsFileForTest,
   _setAdapterForToolForTest,
@@ -69,9 +74,10 @@ import {
   _setSessionToolsFileForTest,
   loadSessionRegistryForBinding,
   recordSessionRegistry,
-  resetState,
-} from "../session.ts";
-import { activePrompts, resetBindingState } from "../session-chat-binding.ts";
+  resetState,
+} from "../session.ts";
+import { activePrompts, resetBindingState } from "../session-chat-binding.ts";
+import { ABD_APPEND_PROMPT } from "../shared-prefix.ts";
 
 function mockPlatform(kind: "wechat" | "feishu" = "wechat"): PlatformAdapter {
   return {
@@ -120,14 +126,40 @@ describe("handleCommand WeChat processing ack", () => {
     _setSessionToolsFileForTest(join(tempDir, "sessions.json"));
     resetState();
     resetBindingState();
-    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());
-  });
+    mockStreamStates.clear();
+    mockGetCodexUsageSummary.mockReset();
+    mockGetCursorUsageSummary.mockReset();
+    mockGetCodexUsageSummary.mockResolvedValue({
+      fiveHour: { usedPercent: 0, remainingPercent: 100, resetAtEpochSeconds: null, resetAfterSeconds: null },
+      weekly: { usedPercent: 0, remainingPercent: 100, resetAtEpochSeconds: null, resetAfterSeconds: null },
+    });
+    mockGetCursorUsageSummary.mockResolvedValue({
+      billingCycleStart: "1779357999000",
+      billingCycleEnd: "1782036399000",
+      planUsage: {
+        totalSpend: 8159,
+        includedSpend: 2000,
+        bonusSpend: 6159,
+        limit: 2000,
+        remainingBonus: false,
+        autoPercentUsed: 0,
+        apiPercentUsed: 100,
+        totalPercentUsed: 100,
+      },
+      spendLimitUsage: {
+        pooledLimit: 48950000,
+        pooledUsed: 31808224,
+        pooledRemaining: 17141776,
+        individualUsed: 101252,
+        limitType: "team",
+      },
+      displayThreshold: 200,
+      enabled: true,
+      displayMessage: "You've hit your usage limit",
+      autoBucketModels: ["default"],
+    });
+    _setAdapterForToolForTest("claude", mockAdapter());
+  });
 
   afterEach(async () => {
     resetState();
@@ -166,8 +198,8 @@ describe("handleCommand WeChat processing ack", () => {
     expect(platform.sendCard).not.toHaveBeenCalled();
   });
 
-  it("sends the WeChat processing ack after the busy check for normal prompts", async () => {
-    const platform = mockPlatform();
+  it("sends the WeChat processing ack after the busy check for normal prompts", async () => {
+    const platform = mockPlatform();
     await recordSessionRegistry({
       chatId: "wx-chat",
       sessionId: "sid-wechat",
@@ -177,9 +209,44 @@ describe("handleCommand WeChat processing ack", () => {
     });
 
     await handleCommand(platform, "继续说明", "wx-chat", "wx-user", Date.now(), "p2p");
-
-    expect(platform.sendText).toHaveBeenCalledWith("wx-chat", "生成中...");
-  });
+
+    expect(platform.sendText).toHaveBeenCalledWith("wx-chat", "生成中...");
+  });
+
+  it("treats /abd as a shared prompt prefix in an existing session", async () => {
+    const platform = mockPlatform();
+    const prompt = vi.fn(async function* (_sessionId: string, userText: string) {
+      yield {
+        type: "assistant" as const,
+        blocks: [{ type: "text" as const, text: "done" }],
+      };
+    });
+    _setAdapterForToolForTest("claude", {
+      displayName: "Claude",
+      sessionDescPrefix: "Claude Session:",
+      createSession: vi.fn(async () => ({ sessionId: "sid-wechat" })),
+      prompt,
+      getSessionInfo: async (sessionId: string): Promise<SessionInfo> => ({
+        sessionId,
+        cwd: "F:\\repo",
+      }),
+      closeSession: async () => {},
+    });
+    await recordSessionRegistry({
+      chatId: "wx-chat",
+      sessionId: "sid-wechat",
+      tool: "claude",
+      chatName: "ready-session",
+      running: false,
+    });
+
+    await handleCommand(platform, "/abd帮我分析", "wx-chat", "wx-user", Date.now(), "p2p");
+
+    expect(platform.sendText).toHaveBeenCalledWith("wx-chat", "生成中...");
+    const userText = prompt.mock.calls[0][1];
+    expect(userText).toContain(`[User message]\n帮我分析\n\n---\n${ABD_APPEND_PROMPT}\n[/User message]`);
+    expect(userText).not.toContain("/abd");
+  });
 
   it("does not send the stopped success text until the running prompt really exits", async () => {
     const platform = mockPlatform();
@@ -201,7 +268,7 @@ describe("handleCommand WeChat processing ack", () => {
     expect(platform.sendText).not.toHaveBeenCalledWith("wx-chat", "会话已停止。");
   });
 
-  it("cleans stale Feishu p2p binding, creates a group, and sends the private message as first prompt", async () => {
+  it("cleans stale Feishu p2p binding, creates a group, and sends the private message as first prompt", async () => {
     const platform = mockPlatform("feishu");
     const prompt = vi.fn(async function* (_sessionId: string, userText: string) {
       yield {
@@ -246,10 +313,42 @@ describe("handleCommand WeChat processing ack", () => {
 
     const registry = await loadSessionRegistryForBinding();
     expect(registry["feishu-p2p"]).toBeUndefined();
-    expect(registry["feishu-group"]?.sessionId).toBe("sid-feishu-new");
-  });
+    expect(registry["feishu-group"]?.sessionId).toBe("sid-feishu-new");
+  });
+
+  it("auto-creates a Feishu group for /abd private messages and sends the transformed prompt", async () => {
+    const platform = mockPlatform("feishu");
+    const prompt = vi.fn(async function* (_sessionId: string, userText: string) {
+      yield {
+        type: "assistant" as const,
+        blocks: [{ type: "text" as const, text: "done" }],
+      };
+    });
+    _setAdapterForToolForTest("claude", {
+      displayName: "Claude",
+      sessionDescPrefix: "Claude Session:",
+      createSession: vi.fn(async () => ({ sessionId: "sid-feishu-abd" })),
+      prompt,
+      getSessionInfo: async (sessionId: string): Promise<SessionInfo> => ({
+        sessionId,
+        cwd: "F:\\repo",
+      }),
+      closeSession: async () => {},
+    });
+
+    await handleCommand(platform, "/abd帮我看一下日志", "feishu-p2p", "ou-user", Date.now(), "p2p");
+
+    expect(platform.createGroup).toHaveBeenCalledWith(expect.stringContaining("帮我看一下日志"), ["ou-user"]);
+    expect(platform.createGroup).not.toHaveBeenCalledWith(expect.stringContaining("---"), expect.anything());
+    const updateCall = vi.mocked(platform.updateChatInfo).mock.calls[0];
+    expect(updateCall[1]).not.toContain("---");
+    expect(updateCall[1]).not.toContain(ABD_APPEND_PROMPT);
+    const userText = prompt.mock.calls[0][1];
+    expect(userText).toContain(`[User message]\n帮我看一下日志\n\n---\n${ABD_APPEND_PROMPT}\n[/User message]`);
+    expect(userText).not.toContain("/abd");
+  });
 
-  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",
@@ -264,76 +363,115 @@ 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({
-      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");
-  });
-});
+    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("handles /usage as Cursor usage in Cursor chats", async () => {
+    const platform = mockPlatform("feishu");
+    await recordSessionRegistry({
+      chatId: "cursor-chat",
+      sessionId: "sid-cursor",
+      tool: "cursor",
+      chatName: "cursor-session",
+      running: false,
+    });
+
+    await handleCommand(platform, "/usage", "cursor-chat", "ou-user", Date.now(), "group");
+
+    expect(platform.createGroup).not.toHaveBeenCalled();
+    expect(mockGetCodexUsageSummary).not.toHaveBeenCalled();
+    expect(mockGetCursorUsageSummary).toHaveBeenCalled();
+    expect(platform.sendCard).toHaveBeenCalledWith(
+      "cursor-chat",
+      "Cursor Usage",
+      expect.stringContaining("Individual used: $1012.52"),
+      "blue",
+    );
+    expect(platform.sendCard).toHaveBeenCalledWith(
+      "cursor-chat",
+      "Cursor Usage",
+      expect.stringContaining("Pool remaining: $171417.76"),
+      "blue",
+    );
+  });
+
+  it("advertises /usage in new Codex and Cursor 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 cursorPlatform = mockPlatform("feishu");
+    _setAdapterForToolForTest("cursor", mockAdapter("sid-cursor"));
+
+    await handleCommand(cursorPlatform, "/new cursor", "feishu-p2p-cursor", "ou-user", Date.now(), "p2p");
+
+    const cursorReadyCall = vi.mocked(cursorPlatform.sendCard).mock.calls.find(
+      ([chatId, title]) => chatId === "feishu-group" && title === "Cursor Session Ready",
+    );
+    expect(cursorReadyCall?.[2]).toContain("/usage");
+
+    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__/shared-prefix.test.ts

@@ -0,0 +1,36 @@
+import { describe, expect, it } from "vitest";
+
+import {
+  ABD_APPEND_PROMPT,
+  applySharedPrefix,
+} from "../shared-prefix.ts";
+
+describe("applySharedPrefix", () => {
+  it("leaves normal messages unchanged", () => {
+    expect(applySharedPrefix("帮我分析")).toEqual({
+      matched: false,
+      text: "帮我分析",
+      body: "帮我分析",
+    });
+  });
+
+  it("removes /abd without requiring a space", () => {
+    const result = applySharedPrefix("/abd帮我分析");
+
+    expect(result.matched).toBe(true);
+    expect(result.body).toBe("帮我分析");
+    expect(result.text).toBe(`帮我分析\n\n---\n${ABD_APPEND_PROMPT}`);
+  });
+
+  it("removes whitespace after /abd", () => {
+    const result = applySharedPrefix("/abd   帮我分析");
+
+    expect(result.text).toBe(`帮我分析\n\n---\n${ABD_APPEND_PROMPT}`);
+  });
+
+  it("keeps the appendix when the user body is empty", () => {
+    const result = applySharedPrefix("/abd   ");
+
+    expect(result.text).toBe(`---\n${ABD_APPEND_PROMPT}`);
+  });
+});

package/src/cards.ts

@@ -1,8 +1,10 @@
-// ---------------------------------------------------------------------------
-// Button helpers
-// ---------------------------------------------------------------------------
-
-export interface ButtonDef {
+// ---------------------------------------------------------------------------
+// Button helpers
+// ---------------------------------------------------------------------------
+
+import { ABD_HELP_LINE } from "./shared-prefix.ts";
+
+export interface ButtonDef {
   text: string;
   value: string;
   type?: "primary" | "default" | "danger";
@@ -133,12 +135,13 @@ export function buildHelpCard(
     "发送 **/new cursor** 创建新 Cursor 会话",
     "发送 **/new codex** 创建新 Codex 会话",
     "发送 **/newh** 重置当前会话（沿用当前工作目录，不切换）",
-    "发送 **/plan** 以规划模式提问（只读，不执行写操作）",
-    "发送 **/ask** 以问答模式提问（只读，不执行写操作）",
+    "发送 **/plan** 以规划模式提问（只读，不执行写操作）",
+    "发送 **/ask** 以问答模式提问（只读，不执行写操作）",
     "发送 **/usage** 查看 Codex 5h 和周用量",
     "发送 **/restart** 重启 ChatCCC 进程",
-    "发送 **/updateg** 更新并重启（仅 npm 全局安装可用）",
-  ].join("\n");
+    "发送 **/update** 更新并重启（仅 npm 全局安装可用）",
+    ABD_HELP_LINE,
+  ].join("\n");
   return JSON.stringify({
     config: { wide_screen_mode: true },
     header: { template: "blue", title: { content: "ChatCCC", tag: "plain_text" } },
@@ -151,7 +154,7 @@ export function buildHelpCard(
         { text: "新建 Cursor 会话（/new cursor）", value: JSON.stringify({ cmd: "new cursor" }), type: "primary" },
         { text: "新建 Codex 会话（/new codex）", value: JSON.stringify({ cmd: "new codex" }), type: "primary" },
         { text: "重启 ChatCCC（/restart）", value: JSON.stringify({ cmd: "restart" }), type: "danger" },
-        { text: "更新并重启（/updateg）", value: JSON.stringify({ cmd: "updateg" }), type: "danger" },
+        { text: "更新并重启（/update）", value: JSON.stringify({ cmd: "update" }), type: "danger" },
         { text: "切换工作路径（/cd）", value: JSON.stringify({ cmd: "cd" }), type: "default" },
       ]),
     ],

package/src/config.ts

@@ -81,6 +81,8 @@ export interface CursorConfig {
   /** Cursor Agent CLI 可执行文件绝对路径；留空时由运行时按 LocalAppData / PATH 兜底 */
   path: string;
   model: string;
+  avatarBatteryMode: CursorAvatarBatteryMode;
+  onDemandMonthlyBudget: number;
 }
 
 export interface CodexConfig {
@@ -125,6 +127,7 @@ export interface AppConfig {
 
 export type AgentTool = "claude" | "cursor" | "codex";
 export const AGENT_TOOLS: AgentTool[] = ["claude", "cursor", "codex"];
+export type CursorAvatarBatteryMode = "apiPercent" | "onDemandUse";
 
 /** 获取指定 agent 配置中所有模型相关的值（最多 100 个，去重） */
 export function getAllModelsForTool(tool: AgentTool, cfg: AppConfig = config): string[] {
@@ -326,6 +329,15 @@ function normalizePlatformType(raw: string): "feishu" | "lark" {
   return "feishu";
 }
 
+function normalizeCursorAvatarBatteryMode(raw: unknown): CursorAvatarBatteryMode {
+  return raw === "onDemandUse" ? "onDemandUse" : "apiPercent";
+}
+
+function normalizeCursorOnDemandMonthlyBudget(raw: unknown): number {
+  const value = typeof raw === "string" ? Number(raw.trim()) : Number(raw);
+  return Number.isFinite(value) && value > 0 ? value : 1000;
+}
+
 function loadConfig(): AppConfig {
   const defaults: AppConfig = {
     feishu: { appId: "", appSecret: "" },
@@ -334,7 +346,14 @@ function loadConfig(): AppConfig {
     gitTimeoutSeconds: 180,
     allowInterrupt: false,
     claude: { enabled: false, defaultAgent: true, model: "", subagentModel: "", effort: "", apiKey: "", baseUrl: "", maxTurn: 0 },
-    cursor: { enabled: false, defaultAgent: false, path: "", model: "claude-opus-4-7-max" },
+    cursor: {
+      enabled: false,
+      defaultAgent: false,
+      path: "",
+      model: "claude-opus-4-7-max",
+      avatarBatteryMode: "apiPercent",
+      onDemandMonthlyBudget: 1000,
+    },
     codex: { enabled: false, defaultAgent: false, path: "", model: "", effort: "" },
   };
 
@@ -377,7 +396,15 @@ function loadConfig(): AppConfig {
 
   let parsed: Partial<AppConfig> & {
     claude?: Partial<ClaudeConfig> & { enabled?: unknown };
-    cursor?: { enabled?: unknown; defaultAgent?: unknown; path?: unknown; command?: unknown; model?: unknown };
+    cursor?: {
+      enabled?: unknown;
+      defaultAgent?: unknown;
+      path?: unknown;
+      command?: unknown;
+      model?: unknown;
+      avatarBatteryMode?: unknown;
+      onDemandMonthlyBudget?: unknown;
+    };
     codex?: { enabled?: unknown; defaultAgent?: unknown; path?: unknown; command?: unknown; model?: unknown; effort?: unknown };
   };
   try {
@@ -491,6 +518,8 @@ function loadConfig(): AppConfig {
       defaultAgent: defaultTool === "cursor",
       path: readToolCliPath(cursorRaw, { label: "cursor", onLegacyField }),
       model: normalizeOptionalConfigField(cursorRaw.model, { label: "cursor.model", fallback: "claude-opus-4-7-max" }),
+      avatarBatteryMode: normalizeCursorAvatarBatteryMode(cursorRaw.avatarBatteryMode),
+      onDemandMonthlyBudget: normalizeCursorOnDemandMonthlyBudget(cursorRaw.onDemandMonthlyBudget),
     },
     codex: {
       enabled: codexEnabled,