chatccc 0.2.178 → 0.2.179

package/src/index.ts

@@ -213,7 +213,7 @@ function parseCardAction(data: unknown): CardActionResult | null {
   }
   if (!cmd) return null;
 
-  const CMD_MAP: Record<string, string> = { stop: "/stop", cancel: "/cancel", new: "/new", "new claude": "/new claude", "new cursor": "/new cursor", "new codex": "/new codex", restart: "/restart", updateg: "/updateg", state: "/state", cd: "/cd", sessions: "/sessions", newh: "/newh" };
+  const CMD_MAP: Record<string, string> = { stop: "/stop", cancel: "/cancel", new: "/new", "new claude": "/new claude", "new cursor": "/new cursor", "new codex": "/new codex", restart: "/restart", update: "/update", state: "/state", cd: "/cd", sessions: "/sessions", newh: "/newh" };
   let text = CMD_MAP[cmd] ?? "";
   if (cmd === "cd" && typeof action.value === "object" && action.value !== null) {
     const path = (action.value as Record<string, string>).path;

package/src/orchestrator.ts

@@ -78,10 +78,11 @@ import {
   enqueueMessage,
   cancelQueuedMessage,
 } from "./session-chat-binding.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";
+import { getCodexUsageSummary, getTenantAccessToken, sendPostMessage } from "./feishu-platform.ts";
+import { getCursorUsageSummary, type CursorUsageSummary } from "./cursor-usage.ts";
+export { type PlatformAdapter } from "./platform-adapter.ts";
+import type { PlatformAdapter } from "./platform-adapter.ts";
+import type { CodexUsageSummary } from "./feishu-api.ts";
 
 // ---------------------------------------------------------------------------
 // 辅助函数
@@ -97,7 +98,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) 精确匹配（忽略大小写）
@@ -109,72 +110,166 @@ 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 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 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 formatCursorUsageSummary(usage: CursorUsageSummary): string {
+  const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+  const dateFormatter = new Intl.DateTimeFormat("zh-CN", {
+    timeZone,
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+    hour: "2-digit",
+    minute: "2-digit",
+    second: "2-digit",
+    hour12: false,
+    timeZoneName: "shortOffset",
+  });
+  const formatDate = (value: string | undefined) => {
+    const timestamp = Number(value);
+    if (!Number.isFinite(timestamp)) return "暂无数据";
+    return dateFormatter.format(new Date(timestamp));
+  };
+  const formatMoney = (value: number | undefined) => {
+    if (typeof value !== "number" || !Number.isFinite(value)) return "暂无数据";
+    return `$${(value / 100).toFixed(2)}`;
+  };
+  const formatPercent = (value: number | undefined) => {
+    if (typeof value !== "number" || !Number.isFinite(value)) return "暂无数据";
+    return `${value}%`;
+  };
+  const plan = usage.planUsage;
+  const spendLimit = usage.spendLimitUsage;
+
+  return [
+    "Cursor 用量：",
+    "",
+    `**计费周期:** ${formatDate(usage.billingCycleStart)} - ${formatDate(usage.billingCycleEnd)}`,
+    "",
+    "**Included usage:**",
+    `- Total: ${formatMoney(plan?.totalSpend)} / ${formatMoney(plan?.limit)} (${formatPercent(plan?.totalPercentUsed)})`,
+    `- Included: ${formatMoney(plan?.includedSpend)}`,
+    `- Bonus: ${formatMoney(plan?.bonusSpend)}`,
+    `- Auto: ${formatPercent(plan?.autoPercentUsed)}`,
+    `- API: ${formatPercent(plan?.apiPercentUsed)}`,
+    "",
+    "**On-Demand / Spend limit:**",
+    `- Individual used: ${formatMoney(spendLimit?.individualUsed)}`,
+    `- Pool used: ${formatMoney(spendLimit?.pooledUsed)} / ${formatMoney(spendLimit?.pooledLimit)}`,
+    `- Pool remaining: ${formatMoney(spendLimit?.pooledRemaining)}`,
+    `- Limit type: ${spendLimit?.limitType ?? "暂无数据"}`,
+    `- Display threshold: ${formatMoney(usage.displayThreshold)}`,
+    "",
+    `**Enabled:** ${usage.enabled === undefined ? "暂无数据" : String(usage.enabled)}`,
+    usage.displayMessage ? `**Message:** ${usage.displayMessage}` : "",
+    usage.autoModelSelectedDisplayMessage ? `**Auto model:** ${usage.autoModelSelectedDisplayMessage}` : "",
+    usage.namedModelSelectedDisplayMessage ? `**Named model:** ${usage.namedModelSelectedDisplayMessage}` : "",
+    usage.autoBucketModels?.length ? `**Auto bucket models:** ${usage.autoBucketModels.join(", ")}` : "",
+  ].filter(Boolean).join("\n");
+}
+
+function usageHelpLine(tool: string): string {
+  if (tool === "codex") return "\n发送 **/usage** 查看 Codex 5h 和周用量。";
+  if (tool === "cursor") return "\n发送 **/usage** 查看 Cursor 用量。";
+  return "";
+}
+
+async function resolveUsageTool(chatId: string): Promise<"codex" | "cursor"> {
+  try {
+    const registry = await loadSessionRegistryForBinding();
+    return registry[chatId]?.tool === "cursor" ? "cursor" : "codex";
+  } catch {
+    return "codex";
+  }
+}
+
+async function sendUsageSummary(platform: PlatformAdapter, chatId: string, tool: "codex" | "cursor"): Promise<void> {
+  if (tool === "cursor") {
+    const content = formatCursorUsageSummary(await getCursorUsageSummary());
+    if (platform.kind === "wechat") {
+      await platform.sendText(chatId, content).catch(() => {});
+    } else {
+      await platform.sendCard(chatId, "Cursor Usage", content, "blue");
+    }
+    return;
+  }
+
+  const content = formatCodexUsageSummary(await getCodexUsageSummary());
+  if (platform.kind === "wechat") {
+    await platform.sendText(chatId, content).catch(() => {});
+  } else {
+    await platform.sendCard(chatId, "Codex Usage", content, "blue");
+  }
+}
+
+async function sendUsageError(platform: PlatformAdapter, chatId: string, tool: "codex" | "cursor", err: unknown): Promise<void> {
+  const toolLabel = tool === "cursor" ? "Cursor" : "Codex";
+  const message = `${toolLabel} 用量获取失败：${(err as Error).message}`;
+  if (platform.kind === "wechat") {
+    await platform.sendText(chatId, message).catch(() => {});
+  } else {
+    await platform.sendCard(chatId, `${toolLabel} Usage`, message, "red");
+  }
+}
+
+function isUntitledSessionChatName(name: string): boolean {
+  return name === "新会话" || name.startsWith("新会话-");
+}
 
 function shouldSendWechatProcessingAck(
   platform: PlatformAdapter,
@@ -232,49 +327,49 @@ function isRunningFromGlobalNpm(): boolean {
   }
 }
 
-const UPDATEG_LOG = join(homedir(), ".chatccc", "logs", "updateg-watcher.log");
+const UPDATE_LOG = join(homedir(), ".chatccc", "logs", "update-watcher.log");
 
 function updLog(msg: string): void {
   const ts = new Date().toISOString();
-  try { appendFileSync(UPDATEG_LOG, `${ts} [UPG-SYNC] ${msg}\n`, "utf-8"); } catch {}
+  try { appendFileSync(UPDATE_LOG, `${ts} [UPDATE-SYNC] ${msg}\n`, "utf-8"); } catch {}
 }
 
 /** 同步更新 npm 全局包并 spawn 新进程重启。不依赖 systemd 或任何服务管理器。 */
 function syncUpdateAndRestart(): void {
   updLog(`sync update start, pid=${process.pid}`);
-  appendStartupTrace("updateg: sync update start", { pid: process.pid });
+  appendStartupTrace("update: sync update start", { pid: process.pid });
 
   const npmCmd = process.platform === "win32" ? "npm.cmd" : "npm";
 
   // 1. npm update
   updLog(`running: ${npmCmd} update -g chatccc`);
-  appendStartupTrace("updateg: npm update begin", { npmCmd });
+  appendStartupTrace("update: npm update begin", { npmCmd });
   const t0 = Date.now();
   try {
     const out = execSync(`${npmCmd} update -g chatccc 2>&1`, { encoding: "utf8", timeout: 120000, windowsHide: true });
     const elapsed = Date.now() - t0;
     updLog(`npm update OK (${elapsed}ms): ${out.slice(0, 500)}`);
-    appendStartupTrace("updateg: npm update OK", { elapsedMs: elapsed, outputLen: out.length });
+    appendStartupTrace("update: npm update OK", { elapsedMs: elapsed, outputLen: out.length });
   } catch (e) {
     const elapsed = Date.now() - t0;
     const err = e as Error & { stderr?: string; stdout?: string; status?: number };
     updLog(`npm update failed (${elapsed}ms): message=${err.message}, stderr=${(err.stderr || "").slice(0, 500)}, stdout=${(err.stdout || "").slice(0, 200)}`);
-    appendStartupTrace("updateg: npm update failed", { elapsedMs: elapsed, message: err.message, stderrLen: (err.stderr || "").length });
+    appendStartupTrace("update: npm update failed", { elapsedMs: elapsed, message: err.message, stderrLen: (err.stderr || "").length });
 
     // fallback
     updLog(`fallback: ${npmCmd} install -g chatccc@latest`);
-    appendStartupTrace("updateg: npm install fallback begin", { npmCmd });
+    appendStartupTrace("update: npm install fallback begin", { npmCmd });
     const t1 = Date.now();
     try {
       const out2 = execSync(`${npmCmd} install -g chatccc@latest 2>&1`, { encoding: "utf8", timeout: 120000, windowsHide: true });
       const elapsed2 = Date.now() - t1;
       updLog(`npm install fallback OK (${elapsed2}ms): ${out2.slice(0, 500)}`);
-      appendStartupTrace("updateg: npm install fallback OK", { elapsedMs: elapsed2, outputLen: out2.length });
+      appendStartupTrace("update: npm install fallback OK", { elapsedMs: elapsed2, outputLen: out2.length });
     } catch (e2) {
       const elapsed2 = Date.now() - t1;
       const err2 = e2 as Error & { stderr?: string; stdout?: string };
       updLog(`npm install fallback also failed (${elapsed2}ms): message=${err2.message}, stderr=${(err2.stderr || "").slice(0, 500)}`);
-      appendStartupTrace("updateg: npm install fallback failed", { elapsedMs: elapsed2, message: err2.message });
+      appendStartupTrace("update: npm install fallback failed", { elapsedMs: elapsed2, message: err2.message });
     }
   }
 
@@ -283,22 +378,22 @@ function syncUpdateAndRestart(): void {
   const binName = process.platform === "win32" ? "chatccc.cmd" : "chatccc";
   const binPath = npmPrefix ? join(npmPrefix, binName) : "chatccc";
   updLog(`bin path: npmPrefix=${npmPrefix || "(empty)"}, binPath=${binPath}`);
-  appendStartupTrace("updateg: spawn begin", { npmPrefix: npmPrefix || "(empty)", binPath });
+  appendStartupTrace("update: spawn begin", { npmPrefix: npmPrefix || "(empty)", binPath });
 
   // 3. spawn new chatccc
   try {
     const child = spawn(binPath, [], { detached: true, stdio: "ignore", shell: true });
     child.unref();
     updLog(`spawn new chatccc OK, childPid=${child.pid}, bin=${binPath}`);
-    appendStartupTrace("updateg: spawn OK", { childPid: child.pid, binPath });
+    appendStartupTrace("update: spawn OK", { childPid: child.pid, binPath });
   } catch (e) {
     const errMsg = (e as Error).message;
     updLog(`spawn new chatccc failed: ${errMsg}`);
-    appendStartupTrace("updateg: spawn failed", { error: errMsg });
+    appendStartupTrace("update: spawn failed", { error: errMsg });
   }
 
   updLog("sync update done, parent exiting in 2s");
-  appendStartupTrace("updateg: sync update done, exiting", { pid: process.pid });
+  appendStartupTrace("update: sync update done, exiting", { pid: process.pid });
 }
 
 // ---------------------------------------------------------------------------
@@ -354,46 +449,37 @@ export async function handleCommand(
     return;
   }
 
-  if (textLower === "/updateg") {
-    logTrace(tid, "BRANCH", { cmd: "/updateg" });
+  if (textLower === "/update") {
+    logTrace(tid, "BRANCH", { cmd: "/update" });
     const isGlobal = isRunningFromGlobalNpm();
-    appendStartupTrace("updateg: command received", { isGlobal, chatId });
+    appendStartupTrace("update: command received", { isGlobal, chatId });
     if (!isGlobal) {
-      await platform.sendText(chatId, "当前进程非 npm 全局安装，无法使用 /updateg 更新。请通过 npm install -g chatccc 安装后使用。").catch(() => {});
-      logTrace(tid, "DONE", { outcome: "updateg_not_global" });
+      await platform.sendText(chatId, "当前进程非 npm 全局安装，无法使用 /update 更新。请通过 npm install -g chatccc 安装后使用。").catch(() => {});
+      logTrace(tid, "DONE", { outcome: "update_not_global" });
       return;
     }
     await platform.sendText(chatId, "正在更新并重启，请稍候...").catch(() => {});
-    logTrace(tid, "DONE", { outcome: "updateg" });
-    appendStartupTrace("updateg: sync update begin", { fromPid: process.pid });
+    logTrace(tid, "DONE", { outcome: "update" });
+    appendStartupTrace("update: sync update begin", { fromPid: process.pid });
     syncUpdateAndRestart();
     setTimeout(() => process.exit(0), 2000);
-    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 ")) {
+    return;
+  }
+
+  if (textLower === "/usage") {
+    const usageTool = await resolveUsageTool(chatId);
+    logTrace(tid, "BRANCH", { cmd: "/usage", tool: usageTool });
+    try {
+      await sendUsageSummary(platform, chatId, usageTool);
+      logTrace(tid, "DONE", { outcome: "usage", tool: usageTool });
+    } catch (err) {
+      await sendUsageError(platform, chatId, usageTool, err);
+      logTrace(tid, "DONE", { outcome: "usage_fail", tool: usageTool, error: (err as Error).message });
+    }
+    return;
+  }
+
+  if (textLower === "/cd" || textLower.startsWith("/cd ")) {
     logTrace(tid, "BRANCH", {
       cmd: "/cd",
       arg: text.slice(3).trim() || "(none)",
@@ -612,13 +698,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\`。` +
-          codexUsageHelpLine(tool),
-        "green",
-      );
+          `发送 **/model** 查看或切换当前会话的模型。\n` +
+          `发送 **/new** 创建新会话，**/newh** 重置当前会话（沿用工作目录）。\n` +
+          `发送 **/sessions** 查看所有会话状态。\n` +
+          `发送 \`/git <子命令>\` 在本会话工作目录执行 git，例如 \`/git status\`、\`/git log --oneline -n 5\`。` +
+          usageHelpLine(tool),
+        "green",
+      );
       console.log(
         `[${ts()}] [NEW] P2P session created: ${sessionId} (${toolLabel})`,
       );
@@ -699,13 +785,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\`。` +
-        codexUsageHelpLine(tool),
-      "green",
-    );
+        `发送 **/model** 查看或切换当前会话的模型。\n` +
+        `发送 **/new** 创建新会话，**/newh** 重置当前会话（沿用工作目录）。\n` +
+        `发送 **/sessions** 查看所有会话状态。\n` +
+        `发送 \`/git <子命令>\` 在本会话工作目录执行 git，例如 \`/git status\`、\`/git log --oneline -n 5\`。` +
+        usageHelpLine(tool),
+      "green",
+    );
 
     console.log(`[${ts()}] [STEP 4/4] Replied to new group → OK`);
     logTrace(tid, "DONE", {