chatccc 0.2.175 → 0.2.176

package/src/orchestrator.ts

@@ -78,10 +78,10 @@ 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";
+export { type PlatformAdapter } from "./platform-adapter.ts";
+import type { PlatformAdapter } from "./platform-adapter.ts";
+import type { CodexUsageSummary } from "./feishu-api.ts";
 
 // ---------------------------------------------------------------------------
 // 辅助函数
@@ -97,7 +97,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 +109,72 @@ 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 codexUsageHelpLine(tool: string): string {
+  return tool === "codex"
+    ? "\n发送 **/usage** 查看 Codex 5h 和周用量。"
+    : "";
+}
+
+function isUntitledSessionChatName(name: string): boolean {
+  return name === "新会话" || name.startsWith("新会话-");
+}
 
 function shouldSendWechatProcessingAck(
   platform: PlatformAdapter,
@@ -354,7 +354,7 @@ export async function handleCommand(
     return;
   }
 
-  if (textLower === "/updateg") {
+  if (textLower === "/updateg") {
     logTrace(tid, "BRANCH", { cmd: "/updateg" });
     const isGlobal = isRunningFromGlobalNpm();
     appendStartupTrace("updateg: command received", { isGlobal, chatId });
@@ -368,32 +368,32 @@ export async function handleCommand(
     appendStartupTrace("updateg: 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") {
+    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 ")) {
     logTrace(tid, "BRANCH", {
       cmd: "/cd",
       arg: text.slice(3).trim() || "(none)",
@@ -612,13 +612,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\`。` +
+          codexUsageHelpLine(tool),
+        "green",
+      );
       console.log(
         `[${ts()}] [NEW] P2P session created: ${sessionId} (${toolLabel})`,
       );
@@ -699,13 +699,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\`。` +
+        codexUsageHelpLine(tool),
+      "green",
+    );
 
     console.log(`[${ts()}] [STEP 4/4] Replied to new group → OK`);
     logTrace(tid, "DONE", {

package/src/privacy.ts

@@ -1,68 +1,118 @@
-import { existsSync, readFileSync } from "node:fs";
+import { existsSync, readFileSync, statSync } from "node:fs";
 import { join } from "node:path";
 import { USER_DATA_DIR } from "./config.ts";
 
-// ---------------------------------------------------------------------------
-// 隐私替换规则
-// ---------------------------------------------------------------------------
-
 interface PrivacyRules {
   [key: string]: string;
 }
 
-let rules: PrivacyRules | null = null;
-let loaded = false;
+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 loadRules(): PrivacyRules {
-  const filePath = join(USER_DATA_DIR, "privacy.json");
+function loadConfig(): PrivacyConfig {
+  const filePath = privacyFilePath();
   if (!existsSync(filePath)) {
-    return {};
+    return { enabled: true, rules: {} };
   }
   try {
-    const raw = readFileSync(filePath, "utf-8");
+    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 格式错误：应为对象`);
-      return {};
+      console.error("[PRIVACY] privacy.json must be an object");
+      return { enabled: true, rules: {} };
     }
-    for (const [k, v] of Object.entries(parsed)) {
-      if (typeof v !== "string") {
-        console.error(`[PRIVACY] privacy.json 值必须为字符串，跳过 "${k}"`);
-        delete (parsed as Record<string, unknown>)[k];
-      }
-    }
-    return parsed as PrivacyRules;
+    return normalizeConfig(parsed as Record<string, unknown>);
   } catch (err) {
-    console.error(`[PRIVACY] 读取 privacy.json 失败: ${(err as Error).message}`);
-    return {};
+    console.error(`[PRIVACY] failed to read privacy.json: ${(err as Error).message}`);
+    return { enabled: true, rules: {} };
   }
 }
 
-export function getPrivacyRules(): PrivacyRules {
-  if (!loaded) {
-    rules = loadRules();
-    loaded = true;
+export function getPrivacyConfig(): PrivacyConfig {
+  const stamp = privacyFileStamp();
+  if (!config || stamp !== loadedStamp) {
+    config = loadConfig();
+    loadedStamp = stamp;
   }
-  return rules!;
+  return config;
+}
+
+export function getPrivacyRules(): PrivacyRules {
+  return getPrivacyConfig().rules;
 }
 
-/** 重新加载规则（热更新用） */
 export function reloadPrivacyRules(): void {
-  loaded = false;
-  rules = null;
+  config = null;
+  loadedStamp = undefined;
 }
 
-/**
- * 对文本应用隐私替换规则。
- * 若无规则或文本为空，直接返回原文。
- */
 export function applyPrivacy(text: string): string {
-  const r = getPrivacyRules();
-  if (Object.keys(r).length === 0 || !text) return text;
+  const { enabled, rules } = getPrivacyConfig();
+  if (!enabled || Object.keys(rules).length === 0 || !text) return text;
+
   let result = text;
-  for (const [from, to] of Object.entries(r)) {
-    // 用 split+join 替代 replaceAll，避免正则特殊字符问题
+  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/sim-platform.ts

@@ -123,19 +123,19 @@ 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 },
-    };
-  },
-
-  // ---- 图片下载 ----
-  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 },
+    };
+  },
+
+  // ---- 图片下载 ----
+  async getOrDownloadImage(_token, _messageId, fileKey) {
     return join(SIM_DIR, "images", fileKey);
   },
 
@@ -168,4 +168,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/web-ui.ts

@@ -480,7 +480,7 @@ async function handleForgetIlink(_req: IncomingMessage, res: ServerResponse): Pr
 // HTML page (embedded template)
 // ---------------------------------------------------------------------------
 
-export const PAGE_HTML = `<!DOCTYPE html>
+export const PAGE_HTML = `<!DOCTYPE html>
 <html lang="zh-CN">
 <head>
 <meta charset="UTF-8">
@@ -1539,11 +1539,11 @@ function editSection(section) {
     html += '<option value="feishu"' + (ptVal === 'feishu' ? ' selected' : '') + '>飞书 (open.feishu.cn)</option>';
     html += '<option value="lark"' + (ptVal === 'lark' ? ' selected' : '') + '>Lark (open.larksuite.com)</option>';
     html += '</select></div>';
-  }
-  document.getElementById('edit-modal-fields').innerHTML = html;
-  document.getElementById('edit-modal').classList.remove('hidden');
-  document.getElementById('edit-overlay').classList.remove('hidden');
-}
+  }
+  document.getElementById('edit-modal-fields').innerHTML = html;
+  document.getElementById('edit-modal').classList.remove('hidden');
+  document.getElementById('edit-overlay').classList.remove('hidden');
+}
 
 function closeEditModal() {
   document.getElementById('edit-modal').classList.add('hidden');