chatccc 0.2.199 → 0.2.200

package/src/orchestrator.ts

@@ -22,24 +22,24 @@ import {
   PROJECT_ROOT,
   anthropicConfigDisplay,
   config,
-  fileLog,
-  getAllEffortsForTool,
-  getAllModelsForTool,
-  getDefaultEffortForTool,
-  getDefaultCwd,
+  fileLog,
+  getAllEffortsForTool,
+  getAllModelsForTool,
+  getDefaultEffortForTool,
+  getDefaultCwd,
   setDefaultCwd,
   getRecentDirs,
   addRecentDir,
   resolveDefaultAgentTool,
-  sessionPrefixForTool,
-  toolDisplayName,
-  ts,
-  type AgentTool,
-} from "./config.ts";
+  sessionPrefixForTool,
+  toolDisplayName,
+  ts,
+  type AgentTool,
+} from "./config.ts";
 import {
-  buildHelpCard,
-  buildEffortCard,
-  buildModelCard,
+  buildHelpCard,
+  buildEffortCard,
+  buildModelCard,
   buildStatusCard,
   buildCdContent,
   buildCdCard,
@@ -54,21 +54,21 @@ import {
   runGitCommand,
 } from "./git-command.ts";
 import {
-  clearSessionModelOverride,
-  clearSessionEffortOverride,
+  clearSessionModelOverride,
+  clearSessionEffortOverride,
   getSessionStatus,
   getAllSessionsStatus,
   initClaudeSession,
   lastMsgTimestamps,
   resumeAndPrompt,
   sessionInfoMap,
-  setSessionModelOverride,
-  setSessionEffortOverride,
+  setSessionModelOverride,
+  setSessionEffortOverride,
   switchChatBinding,
   recordSessionRegistry,
   getAdapterForTool,
-  getEffectiveModelForTool,
-  getEffectiveEffortForTool,
+  getEffectiveModelForTool,
+  getEffectiveEffortForTool,
   stopSession,
   loadSessionRegistryForBinding,
   removeSessionRegistryRecord,
@@ -87,11 +87,11 @@ import {
 import { getCodexUsageSummary, getTenantAccessToken, sendPostMessage } from "./feishu-platform.ts";
 import { getCursorUsageSummary, type CursorUsageSummary } from "./cursor-usage.ts";
 import { getChatGptSubscriptionStatus, type ChatGptSubscriptionResult } from "./chatgpt-subscription.ts";
-import { delegateAgentTask } from "./agent-delegate-task.ts";
-import { applySharedPrefix } from "./shared-prefix.ts";
-import { cwdDisplayName, sessionChatName } from "./session-name.ts";
-import { reloadRuntimeConfig } from "./runtime-reload.ts";
-export { type PlatformAdapter } from "./platform-adapter.ts";
+import { delegateAgentTask } from "./agent-delegate-task.ts";
+import { applySharedPrefix } from "./shared-prefix.ts";
+import { cwdDisplayName, sessionChatName } from "./session-name.ts";
+import { reloadRuntimeConfig } from "./runtime-reload.ts";
+export { type PlatformAdapter } from "./platform-adapter.ts";
 import type { ChatAvatarUsageHints, PlatformAdapter } from "./platform-adapter.ts";
 import type { CodexUsageSummary } from "./feishu-api.ts";
 
@@ -135,7 +135,7 @@ function formatCodexUsageSummary(usage: CodexUsageSummary, chatGptSubscription:
     return `（约 ${parts.join("")}后）`;
   };
 
-  const formatResetTime = (balance: CodexUsageSummary["fiveHour"]) => {
+  const formatResetTime = (balance: NonNullable<CodexUsageSummary["fiveHour"]>) => {
     if (balance.resetAtEpochSeconds === null) return "暂无数据";
     const date = new Date(balance.resetAtEpochSeconds * 1000);
     const pad = (value: number) => String(value).padStart(2, "0");
@@ -263,8 +263,8 @@ function formatCodexUsageSummary(usage: CodexUsageSummary, chatGptSubscription:
     formatChatGptSubscriptionFailure(),
     formatResetCredits(),
     "",
-    formatWindow("5h", usage.fiveHour),
-    formatWindow("周", usage.weekly),
+    usage.fiveHour ? formatWindow("5h", usage.fiveHour) : "",
+    usage.weekly ? formatWindow("7天", usage.weekly) : "",
   ].filter((line, index, arr) => line !== "" || (index > 0 && arr[index - 1] !== "")).join("\n");
 }
 
@@ -325,7 +325,7 @@ function formatCursorUsageSummary(usage: CursorUsageSummary): string {
 }
 
 function usageHelpLine(tool: string): string {
-  if (tool === "codex") return "\n发送 **/usage** 查看 Codex 5h/周用量，以及查询/使用主动重置卡。";
+  if (tool === "codex") return "\n发送 **/usage** 查看 Codex 实际存在的 5h/7天用量窗口，以及查询/使用主动重置卡。";
   if (tool === "cursor") return "\n发送 **/usage** 查看 Cursor 用量。";
   return "";
 }
@@ -545,31 +545,31 @@ export async function handleCommand(
   text = sharedPrefix.body;
   const textLower = text.toLowerCase();
   const isCommandText = !sharedPrefix.matched && textLower.startsWith("/");
-  recordChatPlatform(chatId, platform);
-  await cleanupNonWechatP2pBinding(platform, chatId, chatType, tid);
-
-  if (isCommandText && textLower === "/reload") {
-    logTrace(tid, "BRANCH", { cmd: "/reload" });
-    try {
-      const result = await reloadRuntimeConfig("chat-command");
-      await platform.sendText(
-        chatId,
-        [
-          "配置已重新加载。",
-          `默认 Agent: ${toolDisplayName(result.defaultAgent)}`,
-          `配置文件: ${result.configPath}`,
-          "后续新会话会使用最新配置；正在生成的会话不会被中断。",
-        ].join("\n"),
-      ).catch(() => {});
-      logTrace(tid, "DONE", { outcome: "reload", defaultAgent: result.defaultAgent });
-    } catch (err) {
-      await platform.sendText(chatId, `配置重载失败：${(err as Error).message}`).catch(() => {});
-      logTrace(tid, "DONE", { outcome: "reload_fail", error: (err as Error).message });
-    }
-    return;
-  }
-
-  if (isCommandText && textLower === "/restart") {
+  recordChatPlatform(chatId, platform);
+  await cleanupNonWechatP2pBinding(platform, chatId, chatType, tid);
+
+  if (isCommandText && textLower === "/reload") {
+    logTrace(tid, "BRANCH", { cmd: "/reload" });
+    try {
+      const result = await reloadRuntimeConfig("chat-command");
+      await platform.sendText(
+        chatId,
+        [
+          "配置已重新加载。",
+          `默认 Agent: ${toolDisplayName(result.defaultAgent)}`,
+          `配置文件: ${result.configPath}`,
+          "后续新会话会使用最新配置；正在生成的会话不会被中断。",
+        ].join("\n"),
+      ).catch(() => {});
+      logTrace(tid, "DONE", { outcome: "reload", defaultAgent: result.defaultAgent });
+    } catch (err) {
+      await platform.sendText(chatId, `配置重载失败：${(err as Error).message}`).catch(() => {});
+      logTrace(tid, "DONE", { outcome: "reload_fail", error: (err as Error).message });
+    }
+    return;
+  }
+
+  if (isCommandText && textLower === "/restart") {
     logTrace(tid, "BRANCH", { cmd: "/restart" });
     await platform.sendText(chatId, "重启中...请几秒后发消息唤醒我").catch(() => {});
     logTrace(tid, "DONE", { outcome: "restart" });
@@ -763,7 +763,7 @@ export async function handleCommand(
     const toolArg = text.slice(5).trim().toLowerCase();
     const tool = toolArg || resolveDefaultAgentTool();
     logTrace(tid, "BRANCH", { cmd: "/new", tool });
-    const validTools = ["claude", "cursor", "codex", "ccc"];
+    const validTools = ["claude", "cursor", "codex", "ccc"];
     if (!validTools.includes(tool)) {
       logTrace(tid, "DONE", { outcome: "new_invalid_tool", tool });
       await platform.sendCard(
@@ -1555,96 +1555,96 @@ export async function handleCommand(
     }
 
     // /git <args>：在「当前会话工作目录」执行 git 命令
-    if (isCommandText && textLower === "/effort clear") {
-      logTrace(tid, "BRANCH", { cmd: "/effort clear", sessionId, tool: descriptionTool });
-      const efforts = getAllEffortsForTool(descriptionTool as AgentTool);
-      const toolLabel = toolDisplayName(descriptionTool);
-      if (efforts.length === 0) {
-        const msg = `当前 ${toolLabel} 不支持 effort 切换。`;
-        await (platform.kind === "wechat"
-          ? platform.sendText(chatId, msg)
-          : platform.sendCard(chatId, "Effort 切换", msg, "red")
-        ).catch(() => {});
-        logTrace(tid, "DONE", { outcome: "effort_unsupported", tool: descriptionTool });
-        return;
-      }
-
-      clearSessionEffortOverride(sessionId);
-      const defaultEffort = getDefaultEffortForTool(descriptionTool as AgentTool);
-      const msg = `已清除当前 ${toolLabel} 会话的 effort 覆盖，恢复使用: \`${defaultEffort || "(未指定)"}\``;
-      await (platform.kind === "wechat"
-        ? platform.sendText(chatId, msg)
-        : platform.sendCard(chatId, "Effort 切换", msg, "green")
-      ).catch(() => {});
-      logTrace(tid, "DONE", { outcome: "effort_cleared", sessionId, tool: descriptionTool });
-      return;
-    }
-
-    if (isCommandText && textLower.startsWith("/effort ")) {
-      const effortArg = text.slice(8).trim();
-      if (!effortArg) return;
-      logTrace(tid, "BRANCH", { cmd: "/effort", arg: effortArg, sessionId, tool: descriptionTool });
-
-      const efforts = getAllEffortsForTool(descriptionTool as AgentTool);
-      const toolLabel = toolDisplayName(descriptionTool);
-      if (efforts.length === 0) {
-        const msg = `当前 ${toolLabel} 不支持 effort 切换。`;
-        await (platform.kind === "wechat"
-          ? platform.sendText(chatId, msg)
-          : platform.sendCard(chatId, "Effort 切换", msg, "red")
-        ).catch(() => {});
-        logTrace(tid, "DONE", { outcome: "effort_unsupported", tool: descriptionTool });
-        return;
-      }
-
-      const target = findModelMatch(effortArg, efforts);
-      if (!target) {
-        const msg = `未找到匹配 "${effortArg}" 的 effort。当前 ${toolLabel} 可选 effort:\n${efforts.map(e => `  \`${e}\``).join("\n")}`;
-        await (platform.kind === "wechat"
-          ? platform.sendText(chatId, msg)
-          : platform.sendCard(chatId, "Effort 切换", msg, "red")
-        ).catch(() => {});
-        logTrace(tid, "DONE", { outcome: "effort_not_found", arg: effortArg, tool: descriptionTool });
-        return;
-      }
-
-      setSessionEffortOverride(sessionId, target);
-      const msg = `已切换当前 ${toolLabel} 会话 effort 为: \`${target}\``;
-      await (platform.kind === "wechat"
-        ? platform.sendText(chatId, msg)
-        : platform.sendCard(chatId, "Effort 切换", msg, "green")
-      ).catch(() => {});
-      logTrace(tid, "DONE", { outcome: "effort_switched", arg: effortArg, target, sessionId, tool: descriptionTool });
-      return;
-    }
-
-    if (isCommandText && textLower === "/effort") {
-      logTrace(tid, "BRANCH", { cmd: "/effort", sessionId, tool: descriptionTool });
-      const efforts = getAllEffortsForTool(descriptionTool as AgentTool);
-      const currentEffort = getEffectiveEffortForTool(descriptionTool, sessionId);
-      const toolLabel = toolDisplayName(descriptionTool);
-
-      if (efforts.length === 0) {
-        const msg = `当前 ${toolLabel} 不支持 effort 切换。`;
-        await (platform.kind === "wechat"
-          ? platform.sendText(chatId, msg)
-          : platform.sendCard(chatId, "Effort 切换", msg, "red")
-        ).catch(() => {});
-      } else if (platform.kind === "wechat") {
-        const lines = [currentEffort ? `当前 effort (${toolLabel}): ${currentEffort}` : `当前 effort (${toolLabel}): 未指定`];
-        lines.push("", "可切换 effort:");
-        for (const e of efforts) lines.push(`  ${e}`);
-        lines.push("", "输入 /effort <effort> 切换 effort");
-        await platform.sendText(chatId, lines.join("\n")).catch(() => {});
-      } else {
-        const card = buildEffortCard(currentEffort, efforts, descriptionTool);
-        await platform.sendRawCard(chatId, card);
-      }
-      logTrace(tid, "DONE", { outcome: "effort_query", tool: descriptionTool });
-      return;
-    }
-
-    if (isCommandText && (textLower.startsWith("/git ") || textLower === "/git")) {
+    if (isCommandText && textLower === "/effort clear") {
+      logTrace(tid, "BRANCH", { cmd: "/effort clear", sessionId, tool: descriptionTool });
+      const efforts = getAllEffortsForTool(descriptionTool as AgentTool);
+      const toolLabel = toolDisplayName(descriptionTool);
+      if (efforts.length === 0) {
+        const msg = `当前 ${toolLabel} 不支持 effort 切换。`;
+        await (platform.kind === "wechat"
+          ? platform.sendText(chatId, msg)
+          : platform.sendCard(chatId, "Effort 切换", msg, "red")
+        ).catch(() => {});
+        logTrace(tid, "DONE", { outcome: "effort_unsupported", tool: descriptionTool });
+        return;
+      }
+
+      clearSessionEffortOverride(sessionId);
+      const defaultEffort = getDefaultEffortForTool(descriptionTool as AgentTool);
+      const msg = `已清除当前 ${toolLabel} 会话的 effort 覆盖，恢复使用: \`${defaultEffort || "(未指定)"}\``;
+      await (platform.kind === "wechat"
+        ? platform.sendText(chatId, msg)
+        : platform.sendCard(chatId, "Effort 切换", msg, "green")
+      ).catch(() => {});
+      logTrace(tid, "DONE", { outcome: "effort_cleared", sessionId, tool: descriptionTool });
+      return;
+    }
+
+    if (isCommandText && textLower.startsWith("/effort ")) {
+      const effortArg = text.slice(8).trim();
+      if (!effortArg) return;
+      logTrace(tid, "BRANCH", { cmd: "/effort", arg: effortArg, sessionId, tool: descriptionTool });
+
+      const efforts = getAllEffortsForTool(descriptionTool as AgentTool);
+      const toolLabel = toolDisplayName(descriptionTool);
+      if (efforts.length === 0) {
+        const msg = `当前 ${toolLabel} 不支持 effort 切换。`;
+        await (platform.kind === "wechat"
+          ? platform.sendText(chatId, msg)
+          : platform.sendCard(chatId, "Effort 切换", msg, "red")
+        ).catch(() => {});
+        logTrace(tid, "DONE", { outcome: "effort_unsupported", tool: descriptionTool });
+        return;
+      }
+
+      const target = findModelMatch(effortArg, efforts);
+      if (!target) {
+        const msg = `未找到匹配 "${effortArg}" 的 effort。当前 ${toolLabel} 可选 effort:\n${efforts.map(e => `  \`${e}\``).join("\n")}`;
+        await (platform.kind === "wechat"
+          ? platform.sendText(chatId, msg)
+          : platform.sendCard(chatId, "Effort 切换", msg, "red")
+        ).catch(() => {});
+        logTrace(tid, "DONE", { outcome: "effort_not_found", arg: effortArg, tool: descriptionTool });
+        return;
+      }
+
+      setSessionEffortOverride(sessionId, target);
+      const msg = `已切换当前 ${toolLabel} 会话 effort 为: \`${target}\``;
+      await (platform.kind === "wechat"
+        ? platform.sendText(chatId, msg)
+        : platform.sendCard(chatId, "Effort 切换", msg, "green")
+      ).catch(() => {});
+      logTrace(tid, "DONE", { outcome: "effort_switched", arg: effortArg, target, sessionId, tool: descriptionTool });
+      return;
+    }
+
+    if (isCommandText && textLower === "/effort") {
+      logTrace(tid, "BRANCH", { cmd: "/effort", sessionId, tool: descriptionTool });
+      const efforts = getAllEffortsForTool(descriptionTool as AgentTool);
+      const currentEffort = getEffectiveEffortForTool(descriptionTool, sessionId);
+      const toolLabel = toolDisplayName(descriptionTool);
+
+      if (efforts.length === 0) {
+        const msg = `当前 ${toolLabel} 不支持 effort 切换。`;
+        await (platform.kind === "wechat"
+          ? platform.sendText(chatId, msg)
+          : platform.sendCard(chatId, "Effort 切换", msg, "red")
+        ).catch(() => {});
+      } else if (platform.kind === "wechat") {
+        const lines = [currentEffort ? `当前 effort (${toolLabel}): ${currentEffort}` : `当前 effort (${toolLabel}): 未指定`];
+        lines.push("", "可切换 effort:");
+        for (const e of efforts) lines.push(`  ${e}`);
+        lines.push("", "输入 /effort <effort> 切换 effort");
+        await platform.sendText(chatId, lines.join("\n")).catch(() => {});
+      } else {
+        const card = buildEffortCard(currentEffort, efforts, descriptionTool);
+        await platform.sendRawCard(chatId, card);
+      }
+      logTrace(tid, "DONE", { outcome: "effort_query", tool: descriptionTool });
+      return;
+    }
+
+    if (isCommandText && (textLower.startsWith("/git ") || textLower === "/git")) {
       const args = text === "/git" ? "" : text.slice(5).trim();
       logTrace(tid, "BRANCH", { cmd: "/git", args: args || "(none)" });
       if (!args) {
@@ -1802,45 +1802,45 @@ export async function handleCommand(
   }
 
   // 无会话上下文 → /sessions 仍是有效指令，不触发飞书私聊自动建群。
-  if (isCommandText && textLower === "/effort") {
-    const defaultTool = resolveDefaultAgentTool();
-    const efforts = getAllEffortsForTool(defaultTool);
-    const currentEffort = getDefaultEffortForTool(defaultTool);
-    const toolLabel = toolDisplayName(defaultTool);
-
-    if (efforts.length === 0) {
-      const msg = `当前默认 agent (${toolLabel}) 不支持 effort 切换。`;
-      await (platform.kind === "wechat"
-        ? platform.sendText(chatId, msg)
-        : platform.sendCard(chatId, "Effort 切换", msg, "red")
-      ).catch(() => {});
-    } else if (platform.kind === "wechat") {
-      const lines = [currentEffort ? `当前默认 effort (${toolLabel}): ${currentEffort}` : `当前默认 effort (${toolLabel}): 未指定`];
-      lines.push("", "可切换 effort:");
-      for (const e of efforts) lines.push(`  ${e}`);
-      lines.push("", "在会话中输入 /effort <effort> 切换 effort");
-      await platform.sendText(chatId, lines.join("\n")).catch(() => {});
-    } else {
-      const card = buildEffortCard(currentEffort, efforts, defaultTool);
-      await platform.sendRawCard(chatId, card);
-    }
-    logTrace(tid, "DONE", { outcome: "effort_query", defaultTool });
-    return;
-  }
-
-  if (isCommandText && textLower.startsWith("/effort ")) {
-    const defaultTool = resolveDefaultAgentTool();
-    const toolLabel = toolDisplayName(defaultTool);
-    const msg = `当前没有绑定会话。请先进入 Claude/Codex 会话，再输入 /effort <effort> 切换当前会话的 effort。当前默认 agent: ${toolLabel}`;
-    await (platform.kind === "wechat"
-      ? platform.sendText(chatId, msg)
-      : platform.sendCard(chatId, "Effort 切换", msg, "yellow")
-    ).catch(() => {});
-    logTrace(tid, "DONE", { outcome: "effort_no_session", defaultTool });
-    return;
-  }
-
-  if (isCommandText && textLower === "/sessions") {
+  if (isCommandText && textLower === "/effort") {
+    const defaultTool = resolveDefaultAgentTool();
+    const efforts = getAllEffortsForTool(defaultTool);
+    const currentEffort = getDefaultEffortForTool(defaultTool);
+    const toolLabel = toolDisplayName(defaultTool);
+
+    if (efforts.length === 0) {
+      const msg = `当前默认 agent (${toolLabel}) 不支持 effort 切换。`;
+      await (platform.kind === "wechat"
+        ? platform.sendText(chatId, msg)
+        : platform.sendCard(chatId, "Effort 切换", msg, "red")
+      ).catch(() => {});
+    } else if (platform.kind === "wechat") {
+      const lines = [currentEffort ? `当前默认 effort (${toolLabel}): ${currentEffort}` : `当前默认 effort (${toolLabel}): 未指定`];
+      lines.push("", "可切换 effort:");
+      for (const e of efforts) lines.push(`  ${e}`);
+      lines.push("", "在会话中输入 /effort <effort> 切换 effort");
+      await platform.sendText(chatId, lines.join("\n")).catch(() => {});
+    } else {
+      const card = buildEffortCard(currentEffort, efforts, defaultTool);
+      await platform.sendRawCard(chatId, card);
+    }
+    logTrace(tid, "DONE", { outcome: "effort_query", defaultTool });
+    return;
+  }
+
+  if (isCommandText && textLower.startsWith("/effort ")) {
+    const defaultTool = resolveDefaultAgentTool();
+    const toolLabel = toolDisplayName(defaultTool);
+    const msg = `当前没有绑定会话。请先进入 Claude/Codex 会话，再输入 /effort <effort> 切换当前会话的 effort。当前默认 agent: ${toolLabel}`;
+    await (platform.kind === "wechat"
+      ? platform.sendText(chatId, msg)
+      : platform.sendCard(chatId, "Effort 切换", msg, "yellow")
+    ).catch(() => {});
+    logTrace(tid, "DONE", { outcome: "effort_no_session", defaultTool });
+    return;
+  }
+
+  if (isCommandText && textLower === "/sessions") {
     logTrace(tid, "BRANCH", { cmd: "/sessions", scope: "global" });
     const allSessions = await getAllSessionsStatus();
     const now = Date.now();