chatccc 0.2.63 → 0.2.64

package/src/simplify.ts

@@ -1,120 +1,120 @@
-import { existsSync, readFileSync } from "node:fs";
-import { resolve as resolvePath } from "node:path";
-import { PROJECT_ROOT } from "./config.ts";
-
-// ---------------------------------------------------------------------------
-// 消息简化规则 —— 数据驱动，在 simplify.json 中配置
-// ---------------------------------------------------------------------------
-
-interface ToolRule {
-  template: string;
-  maxLength: number;
-}
-
-interface SimplifyConfig {
-  tool_use?: Record<string, ToolRule>;
-  tool_result?: Record<string, ToolRule>;
-}
-
-let config: SimplifyConfig | null = null;
-let loaded = false;
-
-function loadConfig(): SimplifyConfig {
-  const filePath = resolvePath(PROJECT_ROOT, "simplify.json");
-  if (!existsSync(filePath)) return {};
-  try {
-    const raw = readFileSync(filePath, "utf-8");
-    const parsed = JSON.parse(raw);
-    if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
-      console.error("[SIMPLIFY] simplify.json 格式错误：应为对象");
-      return {};
-    }
-    return parsed as SimplifyConfig;
-  } catch (err) {
-    console.error(`[SIMPLIFY] 读取 simplify.json 失败: ${(err as Error).message}`);
-    return {};
-  }
-}
-
-function getConfig(): SimplifyConfig {
-  if (!loaded) {
-    config = loadConfig();
-    loaded = true;
-  }
-  return config!;
-}
-
-/** 热重载 */
-export function reloadSimplifyConfig(): void {
-  loaded = false;
-  config = null;
-}
-
-/**
- * 对模板字符串中的 {field} 占位符做替换。
- * fields 为可用字段映射，extra 是额外的上下文（如 tool_use_id 的 id）。
- */
-function resolveTemplate(template: string, fields: Record<string, unknown>, extra?: Record<string, string>): string {
-  let result = template;
-  if (extra) {
-    for (const [k, v] of Object.entries(extra)) {
-      result = result.split(`{${k}}`).join(v);
-    }
-  }
-  for (const [k, v] of Object.entries(fields)) {
-    const strVal = typeof v === "string" ? v : JSON.stringify(v);
-    result = result.split(`{${k}}`).join(strVal);
-  }
-  return result;
-}
-
-/**
- * 简化 tool_use 展示。
- * 返回 null 表示无规则，调用方应回退到默认格式化。
- */
-export function simplifyToolUse(name: string, input: unknown): string | null {
-  const cfg = getConfig();
-  const rules = cfg.tool_use;
-  if (!rules) return null;
-  const rule = rules[name];
-  if (!rule) return null;
-
-  const fields = typeof input === "object" && input !== null
-    ? input as Record<string, unknown>
-    : {};
-  let result = resolveTemplate(rule.template, fields);
-  if (result.length > rule.maxLength) {
-    result = result.slice(0, rule.maxLength) + "...";
-  }
-  return result;
-}
-
-/**
- * 简化 tool_result 展示。
- * 返回 null 表示无规则，调用方应回退到默认格式化。
- * toolCallInput 为对应的 tool_use 输入（可选），用于在 result 模板中引用输入字段。
- */
-export function simplifyToolResult(
-  name: string,
-  toolUseId: string,
-  isError: boolean,
-  toolCallInput?: unknown,
-): string | null {
-  const cfg = getConfig();
-  const rules = cfg.tool_result;
-  if (!rules) return null;
-  const rule = rules[name];
-  if (!rule) return null;
-
-  const id = toolUseId.slice(-6);
-  const extra = { id };
-  const fields = toolCallInput && typeof toolCallInput === "object"
-    ? toolCallInput as Record<string, unknown>
-    : {};
-  let result = resolveTemplate(rule.template, fields, extra);
-  if (isError) result = "❌ " + result;
-  if (result.length > rule.maxLength) {
-    result = result.slice(0, rule.maxLength) + "...";
-  }
-  return result;
+import { existsSync, readFileSync } from "node:fs";
+import { resolve as resolvePath } from "node:path";
+import { PROJECT_ROOT } from "./config.ts";
+
+// ---------------------------------------------------------------------------
+// 消息简化规则 —— 数据驱动，在 simplify.json 中配置
+// ---------------------------------------------------------------------------
+
+interface ToolRule {
+  template: string;
+  maxLength: number;
+}
+
+interface SimplifyConfig {
+  tool_use?: Record<string, ToolRule>;
+  tool_result?: Record<string, ToolRule>;
+}
+
+let config: SimplifyConfig | null = null;
+let loaded = false;
+
+function loadConfig(): SimplifyConfig {
+  const filePath = resolvePath(PROJECT_ROOT, "simplify.json");
+  if (!existsSync(filePath)) return {};
+  try {
+    const raw = readFileSync(filePath, "utf-8");
+    const parsed = JSON.parse(raw);
+    if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
+      console.error("[SIMPLIFY] simplify.json 格式错误：应为对象");
+      return {};
+    }
+    return parsed as SimplifyConfig;
+  } catch (err) {
+    console.error(`[SIMPLIFY] 读取 simplify.json 失败: ${(err as Error).message}`);
+    return {};
+  }
+}
+
+function getConfig(): SimplifyConfig {
+  if (!loaded) {
+    config = loadConfig();
+    loaded = true;
+  }
+  return config!;
+}
+
+/** 热重载 */
+export function reloadSimplifyConfig(): void {
+  loaded = false;
+  config = null;
+}
+
+/**
+ * 对模板字符串中的 {field} 占位符做替换。
+ * fields 为可用字段映射，extra 是额外的上下文（如 tool_use_id 的 id）。
+ */
+function resolveTemplate(template: string, fields: Record<string, unknown>, extra?: Record<string, string>): string {
+  let result = template;
+  if (extra) {
+    for (const [k, v] of Object.entries(extra)) {
+      result = result.split(`{${k}}`).join(v);
+    }
+  }
+  for (const [k, v] of Object.entries(fields)) {
+    const strVal = typeof v === "string" ? v : JSON.stringify(v);
+    result = result.split(`{${k}}`).join(strVal);
+  }
+  return result;
+}
+
+/**
+ * 简化 tool_use 展示。
+ * 返回 null 表示无规则，调用方应回退到默认格式化。
+ */
+export function simplifyToolUse(name: string, input: unknown): string | null {
+  const cfg = getConfig();
+  const rules = cfg.tool_use;
+  if (!rules) return null;
+  const rule = rules[name];
+  if (!rule) return null;
+
+  const fields = typeof input === "object" && input !== null
+    ? input as Record<string, unknown>
+    : {};
+  let result = resolveTemplate(rule.template, fields);
+  if (result.length > rule.maxLength) {
+    result = result.slice(0, rule.maxLength) + "...";
+  }
+  return result;
+}
+
+/**
+ * 简化 tool_result 展示。
+ * 返回 null 表示无规则，调用方应回退到默认格式化。
+ * toolCallInput 为对应的 tool_use 输入（可选），用于在 result 模板中引用输入字段。
+ */
+export function simplifyToolResult(
+  name: string,
+  toolUseId: string,
+  isError: boolean,
+  toolCallInput?: unknown,
+): string | null {
+  const cfg = getConfig();
+  const rules = cfg.tool_result;
+  if (!rules) return null;
+  const rule = rules[name];
+  if (!rule) return null;
+
+  const id = toolUseId.slice(-6);
+  const extra = { id };
+  const fields = toolCallInput && typeof toolCallInput === "object"
+    ? toolCallInput as Record<string, unknown>
+    : {};
+  let result = resolveTemplate(rule.template, fields, extra);
+  if (isError) result = "❌ " + result;
+  if (result.length > rule.maxLength) {
+    result = result.slice(0, rule.maxLength) + "...";
+  }
+  return result;
 }

package/src/web-ui.ts

@@ -342,9 +342,6 @@ export function unflattenConfig(flat: Record<string, unknown>): Record<string, u
     } else if (key === "CHATCCC_APP_SECRET") {
       result.feishu = result.feishu || {};
       (result.feishu as Record<string, unknown>).appSecret = val;
-    } else if (key === "CHATCCC_FEISHU_DOMAIN") {
-      result.feishu = result.feishu || {};
-      (result.feishu as Record<string, unknown>).domain = val;
     } else if (key === "CHATCCC_FEISHU_ENABLED") {
       result.platforms = result.platforms || {};
       (result.platforms as Record<string, unknown>).feishu = (result.platforms as Record<string, unknown>).feishu || {};
@@ -642,14 +639,6 @@ header .badge{font-size:13px;padding:4px 12px;border-radius:12px;font-weight:500
             <input type="password" id="field-CHATCCC_APP_SECRET" placeholder="...">
             <div class="hint">飞书开放平台「凭证与基础信息」→ App Secret</div>
           </div>
-          <div class="form-group">
-            <label>平台域名</label>
-            <select id="field-CHATCCC_FEISHU_DOMAIN">
-              <option value="feishu">飞书 (open.feishu.cn)</option>
-              <option value="lark">Lark (open.larksuite.com)</option>
-            </select>
-            <div class="hint">国际版 Lark 用户请选择 Lark</div>
-          </div>
         </div>
       </div>
 
@@ -837,7 +826,6 @@ header .badge{font-size:13px;padding:4px 12px;border-radius:12px;font-weight:500
         </div>
         <div class="config-row"><span class="key">App ID</span><span class="val" id="cfg-APP_ID">-</span></div>
         <div class="config-row"><span class="key">App Secret</span><span class="val" id="cfg-APP_SECRET">-</span></div>
-        <div class="config-row"><span class="key">平台域名</span><span class="val" id="cfg-FEISHU_DOMAIN">-</span></div>
         <button class="btn btn-outline" style="margin-top:8px" onclick="editSection('feishu')">编辑</button>
       </div>
     </details>
@@ -938,7 +926,7 @@ const AGENT_FIELDS = {
   cursor: ['CHATCCC_CURSOR_PATH','CHATCCC_CURSOR_MODEL'],
   codex: ['CHATCCC_CODEX_PATH','CHATCCC_CODEX_MODEL','CHATCCC_CODEX_EFFORT']
 };
-const FEISHU_FIELDS = ['CHATCCC_APP_ID','CHATCCC_APP_SECRET','CHATCCC_FEISHU_DOMAIN'];
+const FEISHU_FIELDS = ['CHATCCC_APP_ID','CHATCCC_APP_SECRET'];
 
 // 当前选中的 Claude API 模式（"official" / "thirdparty"）
 // Wizard / Dashboard 都通过这个变量驱动 UI 显隐和提交时的 mode 字段
@@ -1209,7 +1197,6 @@ function renderStep1() {
   var f = c.feishu || {};
   prefillNested('field-CHATCCC_APP_ID', f.appId);
   prefillNested('field-CHATCCC_APP_SECRET', f.appSecret);
-  prefillNested('field-CHATCCC_FEISHU_DOMAIN', f.domain || 'feishu');
   // 平台开关：按已有 config 回填；首次配置（无飞书凭证）时默认关闭飞书、开启微信
   var hasExistingCreds = Boolean(c.feishu?.appId?.trim() && c.feishu?.appSecret?.trim());
   var feishuEnabled = hasExistingCreds
@@ -1362,7 +1349,6 @@ function renderStep3() {
   if (state.platformsEnabled.feishu) {
     lines.push('<div class="config-row"><span class="key">CHATCCC_APP_ID</span><span class="val">' + (vars.CHATCCC_APP_ID || '<span style="color:#ef4444">未填写</span>') + '</span></div>');
     lines.push('<div class="config-row"><span class="key">CHATCCC_APP_SECRET</span><span class="val">' + (vars.CHATCCC_APP_SECRET ? '***已设置***' : '<span style="color:#ef4444">未填写</span>') + '</span></div>');
-    lines.push('<div class="config-row"><span class="key">平台域名</span><span class="val">' + ((vars.CHATCCC_FEISHU_DOMAIN === 'lark') ? 'Lark (open.larksuite.com)' : '飞书 (open.feishu.cn)') + '</span></div>');
   }
 
   lines.push('<h3 style="margin:16px 0 8px">微信 iLink</h3>');
@@ -1548,7 +1534,6 @@ function updateDashboardUI() {
   state.platformsEnabled.feishu = feishuEnabled;
   document.getElementById('cfg-APP_ID').textContent = c.feishu && c.feishu.appId ? c.feishu.appId.slice(0,8) + '...' + c.feishu.appId.slice(-4) : '-';
   document.getElementById('cfg-APP_SECRET').textContent = c.feishu && c.feishu.appSecret ? '***已设置***' : '-';
-  document.getElementById('cfg-FEISHU_DOMAIN').textContent = (c.feishu && c.feishu.domain === 'lark') ? 'Lark (open.larksuite.com)' : '飞书 (open.feishu.cn)';
 
   // 只显示已启用的 Agent 卡片（按 enabled 字段；缺省时退回到"任一字段非空"兼容旧 config）
   var claudeOn = isAgentEnabled(c.claude, CLAUDE_FALLBACK_KEYS);
@@ -1651,7 +1636,7 @@ function editSection(section) {
 
   var html = '';
   var labelMap = {
-    'CHATCCC_APP_ID': 'App ID', 'CHATCCC_APP_SECRET': 'App Secret', 'CHATCCC_FEISHU_DOMAIN': '平台域名',
+    'CHATCCC_APP_ID': 'App ID', 'CHATCCC_APP_SECRET': 'App Secret',
     'CLAUDE_API_KEY': 'API Key', 'CLAUDE_BASE_URL': 'Base URL',
     'CHATCCC_ANTHROPIC_MODEL': '模型', 'CHATCCC_ANTHROPIC_SUBAGENT_MODEL': 'Subagent 模型', 'CHATCCC_ANTHROPIC_EFFORT': 'Effort',
     'CHATCCC_CURSOR_PATH': 'CLI 路径', 'CHATCCC_CURSOR_MODEL': '模型',
@@ -1688,7 +1673,6 @@ function editSection(section) {
       if (section === 'feishu') {
         if (key === 'CHATCCC_APP_ID' && state.config.feishu) val = state.config.feishu.appId || '';
         else if (key === 'CHATCCC_APP_SECRET' && state.config.feishu) val = state.config.feishu.appSecret || '';
-        else if (key === 'CHATCCC_FEISHU_DOMAIN' && state.config.feishu) val = state.config.feishu.domain || 'feishu';
       } else if (section === 'claude' && state.config.claude) {
         if (key === 'CLAUDE_API_KEY') val = state.config.claude.apiKey || '';
         else if (key === 'CLAUDE_BASE_URL') val = state.config.claude.baseUrl || '';
@@ -1723,14 +1707,7 @@ function editSection(section) {
     var groupClass = 'form-group' + (isClaudeSubagentField && claudeApiMode !== 'thirdparty' ? ' hidden' : '');
     var subagentAttr = isClaudeSubagentField ? ' data-claude-subagent-field="1"' : '';
     html += '<div class="' + groupClass + '"' + subagentAttr + '><label>' + (labelMap[key] || key) + '</label>';
-    if (key === 'CHATCCC_FEISHU_DOMAIN') {
-      html += '<select id="edit-' + key + '">';
-      html += '<option value="feishu"' + (val === 'lark' ? '' : ' selected') + '>飞书 (open.feishu.cn)</option>';
-      html += '<option value="lark"' + (val === 'lark' ? ' selected' : '') + '>Lark (open.larksuite.com)</option>';
-      html += '</select>';
-    } else {
-      html += '<input type="' + (isSecret ? 'password' : 'text') + '" id="edit-' + key + '" value="' + String(val).replace(/"/g,'&quot;') + '">';
-    }
+    html += '<input type="' + (isSecret ? 'password' : 'text') + '" id="edit-' + key + '" value="' + String(val).replace(/"/g,'&quot;') + '">';
     html += '</div>';
   });