chatccc 0.2.224 → 0.2.226

package/src/update-command-guard.ts

@@ -1,165 +1,165 @@
-import {
-  existsSync,
-  mkdirSync,
-  readFileSync,
-  renameSync,
-  rmSync,
-  writeFileSync,
-} from "node:fs";
-import { homedir } from "node:os";
-import { dirname, join } from "node:path";
-
-export const UPDATE_COMMAND_GUARD_FILE = join(
-  homedir(),
-  ".chatccc",
-  "state",
-  "update-command-guard.json",
-);
-
-const UPDATE_COMMAND_GUARD_VERSION = 1;
-const DEFAULT_MAX_PROCESSED_IDS = 100;
-
-interface ProcessedUpdateCommand {
-  id: string;
-  recordedAt: number;
-}
-
-interface UpdateCommandGuardState {
-  version: 1;
-  processed: ProcessedUpdateCommand[];
-}
-
-export type UpdateCommandGuardResult =
-  | { allowed: true; reason: "accepted" | "missing_id" }
-  | { allowed: false; reason: "duplicate_id" | "state_write_failed" };
-
-export interface AcquireUpdateCommandGuardOptions {
-  filePath?: string;
-  commandId?: string;
-  now?: number;
-  maxEntries?: number;
-  warn?: (message: string) => void;
-}
-
-function asRecord(value: unknown): Record<string, unknown> | undefined {
-  return typeof value === "object" && value !== null
-    ? value as Record<string, unknown>
-    : undefined;
-}
-
-/** 从飞书事件信封中读取重投时保持不变的 event_id。 */
-export function extractFeishuEventId(data: unknown): string | undefined {
-  const envelope = asRecord(data);
-  const event = asRecord(envelope?.event);
-  const header = asRecord(envelope?.header) ?? asRecord(event?.header);
-  const context = asRecord(event?.context);
-  const candidates = [header?.event_id, envelope?.event_id, event?.event_id, context?.event_id];
-  for (const candidate of candidates) {
-    if (typeof candidate === "string" && candidate.trim()) return candidate.trim();
-  }
-  return undefined;
-}
-
-/** 分隔文字消息和卡片回调 ID 的命名空间。 */
-export function buildUpdateCommandId(
-  source: "message" | "card",
-  id: string | undefined,
-): string | undefined {
-  const normalized = id?.trim();
-  return normalized ? `${source}:${normalized}` : undefined;
-}
-
-function emptyState(): UpdateCommandGuardState {
-  return { version: UPDATE_COMMAND_GUARD_VERSION, processed: [] };
-}
-
-function parseState(raw: string, maxEntries: number): UpdateCommandGuardState {
-  const parsed = JSON.parse(raw) as Partial<UpdateCommandGuardState>;
-  if (parsed.version !== UPDATE_COMMAND_GUARD_VERSION || !Array.isArray(parsed.processed)) {
-    throw new Error("invalid update command guard schema");
-  }
-
-  const processed = parsed.processed.map((entry) => {
-    if (
-      typeof entry !== "object"
-      || entry === null
-      || typeof entry.id !== "string"
-      || entry.id.length === 0
-      || typeof entry.recordedAt !== "number"
-      || !Number.isFinite(entry.recordedAt)
-      || entry.recordedAt < 0
-    ) {
-      throw new Error("invalid processed update command entry");
-    }
-    return { id: entry.id, recordedAt: entry.recordedAt };
-  });
-
-  return {
-    version: UPDATE_COMMAND_GUARD_VERSION,
-    processed: processed.slice(-maxEntries),
-  };
-}
-
-function loadState(
-  filePath: string,
-  maxEntries: number,
-  warn: (message: string) => void,
-): UpdateCommandGuardState {
-  if (!existsSync(filePath)) return emptyState();
-  try {
-    return parseState(readFileSync(filePath, "utf8"), maxEntries);
-  } catch (err) {
-    warn(`[UPDATE-GUARD] 状态文件损坏，将重建 ${filePath}: ${(err as Error).message}`);
-    return emptyState();
-  }
-}
-
-/**
- * 原子写入更新命令 ID。写失败时调用方必须拒绝更新：只有先落盘，
- * 新进程才能识别飞书在旧进程退出后重投的同一条 `/update`。
- */
-function persistState(filePath: string, state: UpdateCommandGuardState): void {
-  mkdirSync(dirname(filePath), { recursive: true });
-  const tempPath = `${filePath}.${process.pid}.${Date.now()}.tmp`;
-  try {
-    writeFileSync(tempPath, `${JSON.stringify(state, null, 2)}\n`, "utf8");
-    renameSync(tempPath, filePath);
-  } catch (err) {
-    try { rmSync(tempPath, { force: true }); } catch {}
-    throw err;
-  }
-}
-
-/**
- * 获取 `/update` 执行资格。只比较稳定消息/事件 ID，因此用户主动发送的
- * 不同 `/update` 消息仍可立即执行。
- */
-export function acquireUpdateCommandGuard(
-  options: AcquireUpdateCommandGuardOptions = {},
-): UpdateCommandGuardResult {
-  const filePath = options.filePath ?? UPDATE_COMMAND_GUARD_FILE;
-  const commandId = options.commandId?.trim() || undefined;
-  const now = options.now ?? Date.now();
-  const maxEntries = Number.isInteger(options.maxEntries) && (options.maxEntries ?? 0) > 0
-    ? options.maxEntries!
-    : DEFAULT_MAX_PROCESSED_IDS;
-  const warn = options.warn ?? ((message: string) => console.warn(message));
-
-  // 模拟注入等没有稳定事件 ID 的入口无法做跨重启判断，保持原有行为。
-  if (!commandId) return { allowed: true, reason: "missing_id" };
-
-  const state = loadState(filePath, maxEntries, warn);
-  if (state.processed.some((entry) => entry.id === commandId)) {
-    return { allowed: false, reason: "duplicate_id" };
-  }
-
-  state.processed.push({ id: commandId, recordedAt: now });
-  state.processed = state.processed.slice(-maxEntries);
-  try {
-    persistState(filePath, state);
-  } catch (err) {
-    warn(`[UPDATE-GUARD] 无法写入状态文件 ${filePath}: ${(err as Error).message}`);
-    return { allowed: false, reason: "state_write_failed" };
-  }
-  return { allowed: true, reason: "accepted" };
-}
+import {
+  existsSync,
+  mkdirSync,
+  readFileSync,
+  renameSync,
+  rmSync,
+  writeFileSync,
+} from "node:fs";
+import { homedir } from "node:os";
+import { dirname, join } from "node:path";
+
+export const UPDATE_COMMAND_GUARD_FILE = join(
+  homedir(),
+  ".chatccc",
+  "state",
+  "update-command-guard.json",
+);
+
+const UPDATE_COMMAND_GUARD_VERSION = 1;
+const DEFAULT_MAX_PROCESSED_IDS = 100;
+
+interface ProcessedUpdateCommand {
+  id: string;
+  recordedAt: number;
+}
+
+interface UpdateCommandGuardState {
+  version: 1;
+  processed: ProcessedUpdateCommand[];
+}
+
+export type UpdateCommandGuardResult =
+  | { allowed: true; reason: "accepted" | "missing_id" }
+  | { allowed: false; reason: "duplicate_id" | "state_write_failed" };
+
+export interface AcquireUpdateCommandGuardOptions {
+  filePath?: string;
+  commandId?: string;
+  now?: number;
+  maxEntries?: number;
+  warn?: (message: string) => void;
+}
+
+function asRecord(value: unknown): Record<string, unknown> | undefined {
+  return typeof value === "object" && value !== null
+    ? value as Record<string, unknown>
+    : undefined;
+}
+
+/** 从飞书事件信封中读取重投时保持不变的 event_id。 */
+export function extractFeishuEventId(data: unknown): string | undefined {
+  const envelope = asRecord(data);
+  const event = asRecord(envelope?.event);
+  const header = asRecord(envelope?.header) ?? asRecord(event?.header);
+  const context = asRecord(event?.context);
+  const candidates = [header?.event_id, envelope?.event_id, event?.event_id, context?.event_id];
+  for (const candidate of candidates) {
+    if (typeof candidate === "string" && candidate.trim()) return candidate.trim();
+  }
+  return undefined;
+}
+
+/** 分隔文字消息和卡片回调 ID 的命名空间。 */
+export function buildUpdateCommandId(
+  source: "message" | "card",
+  id: string | undefined,
+): string | undefined {
+  const normalized = id?.trim();
+  return normalized ? `${source}:${normalized}` : undefined;
+}
+
+function emptyState(): UpdateCommandGuardState {
+  return { version: UPDATE_COMMAND_GUARD_VERSION, processed: [] };
+}
+
+function parseState(raw: string, maxEntries: number): UpdateCommandGuardState {
+  const parsed = JSON.parse(raw) as Partial<UpdateCommandGuardState>;
+  if (parsed.version !== UPDATE_COMMAND_GUARD_VERSION || !Array.isArray(parsed.processed)) {
+    throw new Error("invalid update command guard schema");
+  }
+
+  const processed = parsed.processed.map((entry) => {
+    if (
+      typeof entry !== "object"
+      || entry === null
+      || typeof entry.id !== "string"
+      || entry.id.length === 0
+      || typeof entry.recordedAt !== "number"
+      || !Number.isFinite(entry.recordedAt)
+      || entry.recordedAt < 0
+    ) {
+      throw new Error("invalid processed update command entry");
+    }
+    return { id: entry.id, recordedAt: entry.recordedAt };
+  });
+
+  return {
+    version: UPDATE_COMMAND_GUARD_VERSION,
+    processed: processed.slice(-maxEntries),
+  };
+}
+
+function loadState(
+  filePath: string,
+  maxEntries: number,
+  warn: (message: string) => void,
+): UpdateCommandGuardState {
+  if (!existsSync(filePath)) return emptyState();
+  try {
+    return parseState(readFileSync(filePath, "utf8"), maxEntries);
+  } catch (err) {
+    warn(`[UPDATE-GUARD] 状态文件损坏，将重建 ${filePath}: ${(err as Error).message}`);
+    return emptyState();
+  }
+}
+
+/**
+ * 原子写入更新命令 ID。写失败时调用方必须拒绝更新：只有先落盘，
+ * 新进程才能识别飞书在旧进程退出后重投的同一条 `/update`。
+ */
+function persistState(filePath: string, state: UpdateCommandGuardState): void {
+  mkdirSync(dirname(filePath), { recursive: true });
+  const tempPath = `${filePath}.${process.pid}.${Date.now()}.tmp`;
+  try {
+    writeFileSync(tempPath, `${JSON.stringify(state, null, 2)}\n`, "utf8");
+    renameSync(tempPath, filePath);
+  } catch (err) {
+    try { rmSync(tempPath, { force: true }); } catch {}
+    throw err;
+  }
+}
+
+/**
+ * 获取 `/update` 执行资格。只比较稳定消息/事件 ID，因此用户主动发送的
+ * 不同 `/update` 消息仍可立即执行。
+ */
+export function acquireUpdateCommandGuard(
+  options: AcquireUpdateCommandGuardOptions = {},
+): UpdateCommandGuardResult {
+  const filePath = options.filePath ?? UPDATE_COMMAND_GUARD_FILE;
+  const commandId = options.commandId?.trim() || undefined;
+  const now = options.now ?? Date.now();
+  const maxEntries = Number.isInteger(options.maxEntries) && (options.maxEntries ?? 0) > 0
+    ? options.maxEntries!
+    : DEFAULT_MAX_PROCESSED_IDS;
+  const warn = options.warn ?? ((message: string) => console.warn(message));
+
+  // 模拟注入等没有稳定事件 ID 的入口无法做跨重启判断，保持原有行为。
+  if (!commandId) return { allowed: true, reason: "missing_id" };
+
+  const state = loadState(filePath, maxEntries, warn);
+  if (state.processed.some((entry) => entry.id === commandId)) {
+    return { allowed: false, reason: "duplicate_id" };
+  }
+
+  state.processed.push({ id: commandId, recordedAt: now });
+  state.processed = state.processed.slice(-maxEntries);
+  try {
+    persistState(filePath, state);
+  } catch (err) {
+    warn(`[UPDATE-GUARD] 无法写入状态文件 ${filePath}: ${(err as Error).message}`);
+    return { allowed: false, reason: "state_write_failed" };
+  }
+  return { allowed: true, reason: "accepted" };
+}

package/src/web-ui.ts

@@ -1004,6 +1004,19 @@ header .badge{font-size:13px;padding:4px 12px;border-radius:12px;font-weight:500
               <label>备选模型（选填）</label>
               <input type="text" id="field-CHATCCC_CCC_ALTERNATIVE_MODEL" placeholder="加入 /model 列表，便于会话内切换">
             </div>
+            <div class="form-group">
+              <label>Effort（推理强度，选填）</label>
+              <select id="field-CHATCCC_CCC_EFFORT">
+                <option value="">(留空/默认，服务端 medium)</option>
+                <option value="none">none - 直接作答，最省 token</option>
+                <option value="minimal">minimal</option>
+                <option value="low">low</option>
+                <option value="medium">medium</option>
+                <option value="high">high</option>
+                <option value="xhigh">xhigh</option>
+                <option value="max">max - 最强推理</option>
+              </select>
+            </div>
           </fieldset>
         </div>
 
@@ -1196,7 +1209,7 @@ const AGENT_FIELDS = {
   claude: ['CHATCCC_ANTHROPIC_MODEL','CHATCCC_ANTHROPIC_SUBAGENT_MODEL','CHATCCC_ANTHROPIC_EFFORT','CHATCCC_ANTHROPIC_API_KEY','CHATCCC_ANTHROPIC_BASE_URL','CHATCCC_ANTHROPIC_MAX_TURN'],
   cursor: ['CHATCCC_CURSOR_PATH','CHATCCC_CURSOR_MODEL','CHATCCC_CURSOR_ALTERNATIVE_MODEL','CHATCCC_CURSOR_AVATAR_BATTERY_MODE','CHATCCC_CURSOR_ON_DEMAND_MONTHLY_BUDGET'],
   codex: ['CHATCCC_CODEX_PATH','CHATCCC_CODEX_MODEL','CHATCCC_CODEX_ALTERNATIVE_MODEL','CHATCCC_CODEX_EFFORT','CHATCCC_CODEX_FAST_MODE'],
-  ccc: ['CHATCCC_CCC_API_KEY','CHATCCC_CCC_BASE_URL','CHATCCC_CCC_MODEL','CHATCCC_CCC_ALTERNATIVE_MODEL']
+  ccc: ['CHATCCC_CCC_API_KEY','CHATCCC_CCC_BASE_URL','CHATCCC_CCC_MODEL','CHATCCC_CCC_ALTERNATIVE_MODEL','CHATCCC_CCC_EFFORT']
 };
 const FEISHU_FIELDS = ['CHATCCC_APP_ID','CHATCCC_APP_SECRET'];
 const WEB_UI_FIELDS = ['CHATCCC_WEB_UI_OPEN_ON_START'];
@@ -1531,6 +1544,7 @@ function renderStep2() {
     prefillNested('field-CHATCCC_CCC_BASE_URL', c.ccc.DEEPSEEK_BASE_URL);
     prefillNested('field-CHATCCC_CCC_MODEL', c.ccc.model);
     prefillNested('field-CHATCCC_CCC_ALTERNATIVE_MODEL', c.ccc.alternativeModel);
+    prefillNested('field-CHATCCC_CCC_EFFORT', c.ccc.effort);
   }
 
   // 按已有 config 决定每个 Agent 默认是否开启：优先 enabled 字段，缺省时按"任一字段非空"
@@ -1706,6 +1720,7 @@ function renderStep3() {
       lines.push('<div class="config-row"><span class="key">Base URL</span><span class="val">' + (vars.CHATCCC_CCC_BASE_URL || '(留空)') + '</span></div>');
       lines.push('<div class="config-row"><span class="key">模型</span><span class="val">' + (vars.CHATCCC_CCC_MODEL || '(留空)') + '</span></div>');
       lines.push('<div class="config-row"><span class="key">备选模型</span><span class="val">' + (vars.CHATCCC_CCC_ALTERNATIVE_MODEL || '(留空)') + '</span></div>');
+      lines.push('<div class="config-row"><span class="key">Effort</span><span class="val">' + (vars.CHATCCC_CCC_EFFORT || '(留空)') + '</span></div>');
     }
   });
   document.getElementById('review-content').innerHTML = lines.join('');
@@ -1999,7 +2014,7 @@ function editSection(section) {
     'CHATCCC_CODEX_PATH': 'CLI 路径', 'CHATCCC_CODEX_MODEL': '模型', 'CHATCCC_CODEX_ALTERNATIVE_MODEL': '备选模型', 'CHATCCC_CODEX_EFFORT': 'Effort',
     'CHATCCC_CODEX_FAST_MODE': 'Fast 模式',
     'CHATCCC_CCC_API_KEY': 'API Key', 'CHATCCC_CCC_BASE_URL': 'Base URL',
-    'CHATCCC_CCC_MODEL': '模型', 'CHATCCC_CCC_ALTERNATIVE_MODEL': '备选模型'
+    'CHATCCC_CCC_MODEL': '模型', 'CHATCCC_CCC_ALTERNATIVE_MODEL': '备选模型', 'CHATCCC_CCC_EFFORT': 'Effort'
   };
   var hintMap = {
     'CHATCCC_WEB_UI_OPEN_ON_START': '关闭后可继续手动访问 http://localhost:<端口>/；/restart、/update 和 Web UI 重启无论此项为何值都不会自动打开。',
@@ -2049,6 +2064,7 @@ function editSection(section) {
         else if (key === 'CHATCCC_CCC_BASE_URL') val = state.config.ccc.DEEPSEEK_BASE_URL || '';
         else if (key === 'CHATCCC_CCC_MODEL') val = state.config.ccc.model || '';
         else if (key === 'CHATCCC_CCC_ALTERNATIVE_MODEL') val = state.config.ccc.alternativeModel || '';
+        else if (key === 'CHATCCC_CCC_EFFORT') val = state.config.ccc.effort || '';
       }
     }
     var isSecret = key.includes('SECRET') || key.includes('API_KEY');