chatccc 0.2.198 → 0.2.200

package/src/orchestrator.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 "";
 }

package/src/privacy.ts

@@ -1,118 +1,118 @@
-import { existsSync, readFileSync, statSync } from "node:fs";
-import { join } from "node:path";
-import { USER_DATA_DIR } from "./config.ts";
-
-interface PrivacyRules {
-  [key: string]: string;
-}
-
-interface PrivacyConfig {
-  enabled: boolean;
-  rules: PrivacyRules;
-}
-
-let config: PrivacyConfig | null = null;
-let loadedStamp: string | null | undefined;
-
-function privacyFilePath(): string {
-  return join(USER_DATA_DIR, "privacy.json");
-}
-
-function privacyFileStamp(): string | null {
-  const filePath = privacyFilePath();
-  if (!existsSync(filePath)) return null;
-  try {
-    const s = statSync(filePath);
-    return `${s.mtimeMs}:${s.size}`;
-  } catch {
-    return null;
-  }
-}
-
-function sanitizeRules(raw: Record<string, unknown>): PrivacyRules {
-  const result: PrivacyRules = {};
-  for (const [from, to] of Object.entries(raw)) {
-    if (!from) {
-      console.error("[PRIVACY] privacy.json rule key cannot be empty, skipped");
-      continue;
-    }
-    if (typeof to !== "string") {
-      console.error(`[PRIVACY] privacy.json value must be a string, skipped "${from}"`);
-      continue;
-    }
-    result[from] = to;
-  }
-  return result;
-}
-
-function normalizeConfig(parsed: Record<string, unknown>): PrivacyConfig {
-  const hasNewSchema = Object.prototype.hasOwnProperty.call(parsed, "enabled") ||
-    Object.prototype.hasOwnProperty.call(parsed, "rules");
-
-  if (!hasNewSchema) {
-    return { enabled: true, rules: sanitizeRules(parsed) };
-  }
-
-  const enabledRaw = parsed.enabled;
-  const enabled = enabledRaw === undefined ? true : enabledRaw !== false;
-  if (enabledRaw !== undefined && typeof enabledRaw !== "boolean") {
-    console.error("[PRIVACY] privacy.json enabled must be a boolean, using true");
-  }
-
-  const rulesRaw = parsed.rules;
-  if (rulesRaw === undefined) return { enabled, rules: {} };
-  if (typeof rulesRaw !== "object" || rulesRaw === null || Array.isArray(rulesRaw)) {
-    console.error("[PRIVACY] privacy.json rules must be an object");
-    return { enabled, rules: {} };
-  }
-  return { enabled, rules: sanitizeRules(rulesRaw as Record<string, unknown>) };
-}
-
-function loadConfig(): PrivacyConfig {
-  const filePath = privacyFilePath();
-  if (!existsSync(filePath)) {
-    return { enabled: true, rules: {} };
-  }
-  try {
-    const raw = readFileSync(filePath, "utf-8").replace(/^\uFEFF/, "");
-    const parsed = JSON.parse(raw);
-    if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
-      console.error("[PRIVACY] privacy.json must be an object");
-      return { enabled: true, rules: {} };
-    }
-    return normalizeConfig(parsed as Record<string, unknown>);
-  } catch (err) {
-    console.error(`[PRIVACY] failed to read privacy.json: ${(err as Error).message}`);
-    return { enabled: true, rules: {} };
-  }
-}
-
-export function getPrivacyConfig(): PrivacyConfig {
-  const stamp = privacyFileStamp();
-  if (!config || stamp !== loadedStamp) {
-    config = loadConfig();
-    loadedStamp = stamp;
-  }
-  return config;
-}
-
-export function getPrivacyRules(): PrivacyRules {
-  return getPrivacyConfig().rules;
-}
-
-export function reloadPrivacyRules(): void {
-  config = null;
-  loadedStamp = undefined;
-}
-
-export function applyPrivacy(text: string): string {
-  const { enabled, rules } = getPrivacyConfig();
-  if (!enabled || Object.keys(rules).length === 0 || !text) return text;
-
-  let result = text;
-  for (const [from, to] of Object.entries(rules)) {
-    // Use split+join instead of regex replacement so rule keys stay literal.
-    result = result.split(from).join(to);
-  }
-  return result;
-}
+import { existsSync, readFileSync, statSync } from "node:fs";
+import { join } from "node:path";
+import { USER_DATA_DIR } from "./config.ts";
+
+interface PrivacyRules {
+  [key: string]: string;
+}
+
+interface PrivacyConfig {
+  enabled: boolean;
+  rules: PrivacyRules;
+}
+
+let config: PrivacyConfig | null = null;
+let loadedStamp: string | null | undefined;
+
+function privacyFilePath(): string {
+  return join(USER_DATA_DIR, "privacy.json");
+}
+
+function privacyFileStamp(): string | null {
+  const filePath = privacyFilePath();
+  if (!existsSync(filePath)) return null;
+  try {
+    const s = statSync(filePath);
+    return `${s.mtimeMs}:${s.size}`;
+  } catch {
+    return null;
+  }
+}
+
+function sanitizeRules(raw: Record<string, unknown>): PrivacyRules {
+  const result: PrivacyRules = {};
+  for (const [from, to] of Object.entries(raw)) {
+    if (!from) {
+      console.error("[PRIVACY] privacy.json rule key cannot be empty, skipped");
+      continue;
+    }
+    if (typeof to !== "string") {
+      console.error(`[PRIVACY] privacy.json value must be a string, skipped "${from}"`);
+      continue;
+    }
+    result[from] = to;
+  }
+  return result;
+}
+
+function normalizeConfig(parsed: Record<string, unknown>): PrivacyConfig {
+  const hasNewSchema = Object.prototype.hasOwnProperty.call(parsed, "enabled") ||
+    Object.prototype.hasOwnProperty.call(parsed, "rules");
+
+  if (!hasNewSchema) {
+    return { enabled: true, rules: sanitizeRules(parsed) };
+  }
+
+  const enabledRaw = parsed.enabled;
+  const enabled = enabledRaw === undefined ? true : enabledRaw !== false;
+  if (enabledRaw !== undefined && typeof enabledRaw !== "boolean") {
+    console.error("[PRIVACY] privacy.json enabled must be a boolean, using true");
+  }
+
+  const rulesRaw = parsed.rules;
+  if (rulesRaw === undefined) return { enabled, rules: {} };
+  if (typeof rulesRaw !== "object" || rulesRaw === null || Array.isArray(rulesRaw)) {
+    console.error("[PRIVACY] privacy.json rules must be an object");
+    return { enabled, rules: {} };
+  }
+  return { enabled, rules: sanitizeRules(rulesRaw as Record<string, unknown>) };
+}
+
+function loadConfig(): PrivacyConfig {
+  const filePath = privacyFilePath();
+  if (!existsSync(filePath)) {
+    return { enabled: true, rules: {} };
+  }
+  try {
+    const raw = readFileSync(filePath, "utf-8").replace(/^\uFEFF/, "");
+    const parsed = JSON.parse(raw);
+    if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
+      console.error("[PRIVACY] privacy.json must be an object");
+      return { enabled: true, rules: {} };
+    }
+    return normalizeConfig(parsed as Record<string, unknown>);
+  } catch (err) {
+    console.error(`[PRIVACY] failed to read privacy.json: ${(err as Error).message}`);
+    return { enabled: true, rules: {} };
+  }
+}
+
+export function getPrivacyConfig(): PrivacyConfig {
+  const stamp = privacyFileStamp();
+  if (!config || stamp !== loadedStamp) {
+    config = loadConfig();
+    loadedStamp = stamp;
+  }
+  return config;
+}
+
+export function getPrivacyRules(): PrivacyRules {
+  return getPrivacyConfig().rules;
+}
+
+export function reloadPrivacyRules(): void {
+  config = null;
+  loadedStamp = undefined;
+}
+
+export function applyPrivacy(text: string): string {
+  const { enabled, rules } = getPrivacyConfig();
+  if (!enabled || Object.keys(rules).length === 0 || !text) return text;
+
+  let result = text;
+  for (const [from, to] of Object.entries(rules)) {
+    // Use split+join instead of regex replacement so rule keys stay literal.
+    result = result.split(from).join(to);
+  }
+  return result;
+}

package/src/session-chat-binding.ts

@@ -71,11 +71,11 @@ export interface ActivePrompt {
   /** Set when the watchdog detects that the CLI process disappeared before stream finalization. */
   abnormalExit?: boolean;
   abnormalExitNotified?: boolean;
-  /** Set when the resource monitor detects CPU + memory unchanged for 3 minutes. */
-  resourceStuck?: boolean;
-  /** Adapter-provided callback to close the underlying SDK session / subprocess.
-   *  Called by stop-stuck-loop before controller.abort() to terminate the CLI
-   *  process immediately, rather than waiting for the async generator to unblock. */
+  /** Set when the resource monitor detects CPU + memory unchanged for 3 minutes. */
+  resourceStuck?: boolean;
+  /** Adapter-provided callback to close the underlying SDK session / subprocess.
+   *  Called by stop-stuck-loop before controller.abort() to terminate the CLI
+   *  process immediately, rather than waiting for the async generator to unblock. */
   closeSession?: () => void;
 }
 
@@ -228,4 +228,4 @@ export function resetBindingState(): void {
     clearInterval(unifiedDisplayLoopHandle);
     unifiedDisplayLoopHandle = null;
   }
-}
+}

package/src/session-name.ts

@@ -1,8 +1,8 @@
-export function cwdDisplayName(cwd: string): string {
-  const trimmed = cwd.trim().replace(/[\\/]+$/, "");
-  return trimmed.split(/[\\/]/).filter(Boolean).pop() || trimmed || "cwd";
-}
-
-export function sessionChatName(left: string, cwd: string): string {
-  return `${left}-${cwdDisplayName(cwd)}`;
-}
+export function cwdDisplayName(cwd: string): string {
+  const trimmed = cwd.trim().replace(/[\\/]+$/, "");
+  return trimmed.split(/[\\/]/).filter(Boolean).pop() || trimmed || "cwd";
+}
+
+export function sessionChatName(left: string, cwd: string): string {
+  return `${left}-${cwdDisplayName(cwd)}`;
+}

package/src/shared-prefix.ts

@@ -1,29 +1,29 @@
-export const ABD_PREFIX = "/abd";
-
-export const ABD_APPEND_PROMPT =
-  "请从第一性原理出发挖掘我的真实需求。你觉得我的需求合理吗？开始实现之前有什么问题要问我的？";
-
-export const ABD_HELP_LINE =
-  `发送 **${ABD_PREFIX}** 前缀消息，将以第一性原理追问真实需求、合理性和实现前问题`;
-
-export interface SharedPrefixResult {
-  matched: boolean;
-  text: string;
-  body: string;
-  prefix?: typeof ABD_PREFIX;
-}
-
-export function applySharedPrefix(text: string): SharedPrefixResult {
-  if (!text.toLowerCase().startsWith(ABD_PREFIX)) {
-    return { matched: false, text, body: text };
-  }
-
-  const body = text.slice(ABD_PREFIX.length).replace(/^\s+/, "");
-  const appendix = ["---", ABD_APPEND_PROMPT].join("\n");
-  return {
-    matched: true,
-    prefix: ABD_PREFIX,
-    body,
-    text: body ? [body, appendix].join("\n\n") : appendix,
-  };
-}
+export const ABD_PREFIX = "/abd";
+
+export const ABD_APPEND_PROMPT =
+  "请从第一性原理出发挖掘我的真实需求。你觉得我的需求合理吗？开始实现之前有什么问题要问我的？";
+
+export const ABD_HELP_LINE =
+  `发送 **${ABD_PREFIX}** 前缀消息，将以第一性原理追问真实需求、合理性和实现前问题`;
+
+export interface SharedPrefixResult {
+  matched: boolean;
+  text: string;
+  body: string;
+  prefix?: typeof ABD_PREFIX;
+}
+
+export function applySharedPrefix(text: string): SharedPrefixResult {
+  if (!text.toLowerCase().startsWith(ABD_PREFIX)) {
+    return { matched: false, text, body: text };
+  }
+
+  const body = text.slice(ABD_PREFIX.length).replace(/^\s+/, "");
+  const appendix = ["---", ABD_APPEND_PROMPT].join("\n");
+  return {
+    matched: true,
+    prefix: ABD_PREFIX,
+    body,
+    text: body ? [body, appendix].join("\n\n") : appendix,
+  };
+}

package/src/sim-platform.ts

@@ -123,25 +123,25 @@ export const SimulatedPlatform: FeishuPlatform = {
   },
 
   // ---- 头像 ----
-  async setChatAvatar(_token, _chatId, _tool, _status) {
-    // 模拟模式不需要头像
-  },
-
-  async getCodexUsageSummary() {
-    return {
-      fiveHour: { usedPercent: 0, remainingPercent: 100, resetAtEpochSeconds: null, resetAfterSeconds: null },
-      weekly: { usedPercent: 0, remainingPercent: 100, resetAtEpochSeconds: null, resetAfterSeconds: null },
-      rateLimitResetCreditsAvailable: null,
-      rateLimitResetCredits: null,
-    };
-  },
-
-  async consumeCodexRateLimitResetCredit(_redeemRequestId) {
-    return { code: "no_credit" as const, windowsReset: 0 };
-  },
-
-  // ---- 图片下载 ----
-  async getOrDownloadImage(_token, _messageId, fileKey) {
+  async setChatAvatar(_token, _chatId, _tool, _status) {
+    // 模拟模式不需要头像
+  },
+
+  async getCodexUsageSummary() {
+    return {
+      fiveHour: { usedPercent: 0, remainingPercent: 100, resetAtEpochSeconds: null, resetAfterSeconds: null },
+      weekly: { usedPercent: 0, remainingPercent: 100, resetAtEpochSeconds: null, resetAfterSeconds: null },
+      rateLimitResetCreditsAvailable: null,
+      rateLimitResetCredits: null,
+    };
+  },
+
+  async consumeCodexRateLimitResetCredit(_redeemRequestId) {
+    return { code: "no_credit" as const, windowsReset: 0 };
+  },
+
+  // ---- 图片下载 ----
+  async getOrDownloadImage(_token, _messageId, fileKey) {
     return join(SIM_DIR, "images", fileKey);
   },
 
@@ -174,4 +174,4 @@ export const SimulatedPlatform: FeishuPlatform = {
 };
 
 /** 模拟模式下的默认 chat_id（重新导出以保持向后兼容） */
-export { SIM_DEFAULT_CHAT_ID } from "./sim-store.ts";
+export { SIM_DEFAULT_CHAT_ID } from "./sim-store.ts";

package/src/turn-cards.ts

@@ -1,118 +1,118 @@
-import { readFile, writeFile, mkdir } from "node:fs/promises";
-import { dirname, join } from "node:path";
-
-import { USER_DATA_DIR, ts } from "./config.ts";
-
-// ---------------------------------------------------------------------------
-// turn-cards.json — 每个 session 的卡片归属持久化
-// 记录每个 turn 有哪些卡片（轮转会产生多张），以及每张卡片的状态
-// ---------------------------------------------------------------------------
-
-export const TURNS_DIR = join(USER_DATA_DIR, "state", "turns");
-
-export interface TurnCardEntry {
-  cardId: string;
-  status: "active" | "done" | "stopped";
-  createdAt: number;
-}
-
-export interface TurnCardsFile {
-  sessionId: string;
-  turns: { turnCount: number; cards: TurnCardEntry[] }[];
-}
-
-function getTurnCardsPath(sessionId: string): string {
-  return join(TURNS_DIR, `${sessionId}.json`);
-}
-
-export function createEmptyTurnCards(sessionId: string): TurnCardsFile {
-  return { sessionId, turns: [] };
-}
-
-export async function readTurnCards(sessionId: string): Promise<TurnCardsFile | null> {
-  try {
-    const raw = await readFile(getTurnCardsPath(sessionId), "utf-8");
-    const parsed = JSON.parse(raw) as TurnCardsFile;
-    if (parsed && typeof parsed.sessionId === "string" && Array.isArray(parsed.turns)) {
-      return parsed;
-    }
-    return null;
-  } catch {
-    return null;
-  }
-}
-
-export async function writeTurnCards(sessionId: string, data: TurnCardsFile): Promise<void> {
-  try {
-    const filePath = getTurnCardsPath(sessionId);
-    await mkdir(dirname(filePath), { recursive: true });
-    await writeFile(filePath, JSON.stringify(data, null, 2), "utf-8");
-  } catch (err) {
-    console.error(`[${ts()}] Failed to write turn-cards for ${sessionId}: ${(err as Error).message}`);
-  }
-}
-
-/** 向指定 turn 追加一张卡片并持久化。若 turn 不存在则创建。 */
-export async function addCardToTurn(
-  sessionId: string,
-  turnCount: number,
-  cardId: string,
-): Promise<void> {
-  const data = (await readTurnCards(sessionId)) ?? createEmptyTurnCards(sessionId);
-  let turn = data.turns.find(t => t.turnCount === turnCount);
-  if (!turn) {
-    turn = { turnCount, cards: [] };
-    data.turns.push(turn);
-  }
-  turn.cards.push({ cardId, status: "active", createdAt: Date.now() });
-  await writeTurnCards(sessionId, data);
-}
-
-/** 将指定 turn 的所有 active 卡片标记为终态并持久化。返回被标记的 cardId 列表。 */
-export async function finalizeTurnCards(
-  sessionId: string,
-  turnCount: number,
-  finalStatus: "done" | "stopped",
-): Promise<string[]> {
-  const data = await readTurnCards(sessionId);
-  if (!data) return [];
-  const turn = data.turns.find(t => t.turnCount === turnCount);
-  if (!turn) return [];
-  const finalized: string[] = [];
-  for (const card of turn.cards) {
-    if (card.status === "active") {
-      card.status = finalStatus;
-      finalized.push(card.cardId);
-    }
-  }
-  if (finalized.length > 0) {
-    await writeTurnCards(sessionId, data);
-  }
-  return finalized;
-}
-
-/** 将指定 turn 中的一张 active 卡片标记为 done（轮转时用），并持久化。 */
-export async function markCardDone(
-  sessionId: string,
-  turnCount: number,
-  cardId: string,
-): Promise<void> {
-  const data = await readTurnCards(sessionId);
-  if (!data) return;
-  const turn = data.turns.find(t => t.turnCount === turnCount);
-  if (!turn) return;
-  const card = turn.cards.find(c => c.cardId === cardId && c.status === "active");
-  if (!card) return;
-  card.status = "done";
-  await writeTurnCards(sessionId, data);
-}
-
-/** 清理 session 的 turn-cards 文件 */
-export async function removeTurnCards(sessionId: string): Promise<void> {
-  try {
-    const { unlink } = await import("node:fs/promises");
-    await unlink(getTurnCardsPath(sessionId));
-  } catch {
-    // 文件不存在，忽略
-  }
+import { readFile, writeFile, mkdir } from "node:fs/promises";
+import { dirname, join } from "node:path";
+
+import { USER_DATA_DIR, ts } from "./config.ts";
+
+// ---------------------------------------------------------------------------
+// turn-cards.json — 每个 session 的卡片归属持久化
+// 记录每个 turn 有哪些卡片（轮转会产生多张），以及每张卡片的状态
+// ---------------------------------------------------------------------------
+
+export const TURNS_DIR = join(USER_DATA_DIR, "state", "turns");
+
+export interface TurnCardEntry {
+  cardId: string;
+  status: "active" | "done" | "stopped";
+  createdAt: number;
+}
+
+export interface TurnCardsFile {
+  sessionId: string;
+  turns: { turnCount: number; cards: TurnCardEntry[] }[];
+}
+
+function getTurnCardsPath(sessionId: string): string {
+  return join(TURNS_DIR, `${sessionId}.json`);
+}
+
+export function createEmptyTurnCards(sessionId: string): TurnCardsFile {
+  return { sessionId, turns: [] };
+}
+
+export async function readTurnCards(sessionId: string): Promise<TurnCardsFile | null> {
+  try {
+    const raw = await readFile(getTurnCardsPath(sessionId), "utf-8");
+    const parsed = JSON.parse(raw) as TurnCardsFile;
+    if (parsed && typeof parsed.sessionId === "string" && Array.isArray(parsed.turns)) {
+      return parsed;
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
+
+export async function writeTurnCards(sessionId: string, data: TurnCardsFile): Promise<void> {
+  try {
+    const filePath = getTurnCardsPath(sessionId);
+    await mkdir(dirname(filePath), { recursive: true });
+    await writeFile(filePath, JSON.stringify(data, null, 2), "utf-8");
+  } catch (err) {
+    console.error(`[${ts()}] Failed to write turn-cards for ${sessionId}: ${(err as Error).message}`);
+  }
+}
+
+/** 向指定 turn 追加一张卡片并持久化。若 turn 不存在则创建。 */
+export async function addCardToTurn(
+  sessionId: string,
+  turnCount: number,
+  cardId: string,
+): Promise<void> {
+  const data = (await readTurnCards(sessionId)) ?? createEmptyTurnCards(sessionId);
+  let turn = data.turns.find(t => t.turnCount === turnCount);
+  if (!turn) {
+    turn = { turnCount, cards: [] };
+    data.turns.push(turn);
+  }
+  turn.cards.push({ cardId, status: "active", createdAt: Date.now() });
+  await writeTurnCards(sessionId, data);
+}
+
+/** 将指定 turn 的所有 active 卡片标记为终态并持久化。返回被标记的 cardId 列表。 */
+export async function finalizeTurnCards(
+  sessionId: string,
+  turnCount: number,
+  finalStatus: "done" | "stopped",
+): Promise<string[]> {
+  const data = await readTurnCards(sessionId);
+  if (!data) return [];
+  const turn = data.turns.find(t => t.turnCount === turnCount);
+  if (!turn) return [];
+  const finalized: string[] = [];
+  for (const card of turn.cards) {
+    if (card.status === "active") {
+      card.status = finalStatus;
+      finalized.push(card.cardId);
+    }
+  }
+  if (finalized.length > 0) {
+    await writeTurnCards(sessionId, data);
+  }
+  return finalized;
+}
+
+/** 将指定 turn 中的一张 active 卡片标记为 done（轮转时用），并持久化。 */
+export async function markCardDone(
+  sessionId: string,
+  turnCount: number,
+  cardId: string,
+): Promise<void> {
+  const data = await readTurnCards(sessionId);
+  if (!data) return;
+  const turn = data.turns.find(t => t.turnCount === turnCount);
+  if (!turn) return;
+  const card = turn.cards.find(c => c.cardId === cardId && c.status === "active");
+  if (!card) return;
+  card.status = "done";
+  await writeTurnCards(sessionId, data);
+}
+
+/** 清理 session 的 turn-cards 文件 */
+export async function removeTurnCards(sessionId: string): Promise<void> {
+  try {
+    const { unlink } = await import("node:fs/promises");
+    await unlink(getTurnCardsPath(sessionId));
+  } catch {
+    // 文件不存在，忽略
+  }
 }