@huicai/cli 2026.711.0 → 2026.711.24617

package/src/kbsync.js

@@ -1,141 +1 @@
-// huicai kb-sync：配合 git diff 检测变更文件，增量同步到平台知识库，让 RAG 随代码保鲜。
-// 检测策略：默认对比工作区与 HEAD（已跟踪改动 + 未跟踪新文件）；给定 ref 则 git diff --name-status <ref>。
-import fs from 'node:fs';
-import path from 'node:path';
-import { execFileSync } from 'node:child_process';
-import { syncKnowledge } from './api.js';
-import { IGNORE, MAX_FILE_BYTES } from './codeindex.js';
-
-const BATCH = 20; // 每批提交的文件数（服务端逐文件分块向量化，分批避免单请求过大/超时）
-
-function git(cwd, args) {
-  return execFileSync('git', args, { cwd, encoding: 'utf8', maxBuffer: 64 * 1024 * 1024 }).trim();
-}
-
-function isGitRepo(cwd) {
-  try {
-    git(cwd, ['rev-parse', '--is-inside-work-tree']);
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-/** 路径是否落在被忽略目录下（node_modules/.git/dist…），避免把依赖/产物灌进知识库。 */
-function inIgnoredDir(rel) {
-  return rel.split('/').some((seg) => IGNORE.has(seg));
-}
-
-/** 空字节嗅探：判定二进制（不入库）。 */
-function isBinary(buf) {
-  const n = Math.min(buf.length, 4096);
-  for (let i = 0; i < n; i++) if (buf[i] === 0) return true;
-  return false;
-}
-
-/**
- * 用 git 检测变更文件。
- * - 指定 base（ref/范围，如 origin/main、HEAD~3、abc123）：git diff --name-status <base>
- * - 不指定：工作区相对 HEAD 的改动（已跟踪 A/M/D/R）+ 未跟踪新文件（视为新增）
- * @returns {{changed:string[], deleted:string[]}}
- */
-export function detectChanges(cwd, base) {
-  const changed = new Set();
-  const deleted = new Set();
-  const parse = (out) => {
-    for (const line of out.split('\n')) {
-      if (!line.trim()) continue;
-      const parts = line.split('\t');
-      const code = parts[0][0];
-      if (code === 'D') {
-        deleted.add(parts[1]);
-      } else if (code === 'R' || code === 'C') {
-        // Rxxx old new：重命名——旧路径删档、新路径入档（复制 C 只入新档）
-        const oldP = parts[1];
-        const newP = parts[2] || parts[1];
-        if (code === 'R') deleted.add(oldP);
-        changed.add(newP);
-      } else {
-        // A/M/T…：取末列为路径
-        changed.add(parts[parts.length - 1]);
-      }
-    }
-  };
-  if (base) {
-    parse(git(cwd, ['diff', '--name-status', base]));
-  } else {
-    parse(git(cwd, ['diff', '--name-status', 'HEAD']));
-    const others = git(cwd, ['ls-files', '--others', '--exclude-standard']);
-    for (const p of others.split('\n')) if (p.trim()) changed.add(p.trim());
-  }
-  // 删除后又重新出现的以变更为准
-  for (const p of changed) deleted.delete(p);
-  return { changed: [...changed], deleted: [...deleted] };
-}
-
-/**
- * 把检测到的变更组装为同步条目（读取内容、过滤忽略目录/二进制/超大文件）。
- * @returns {{files:Array<{path,content?,deleted?}>, skipped:number, skips:string[]}}
- */
-export function buildEntries(cwd, changed, deleted, emit = () => {}) {
-  const files = [];
-  let skipped = 0;
-  for (const rel of changed) {
-    if (inIgnoredDir(rel)) { skipped++; continue; }
-    const abs = path.join(cwd, rel);
-    let st;
-    try {
-      st = fs.statSync(abs);
-    } catch {
-      skipped++; // 已不在（diff 后又被删）
-      continue;
-    }
-    if (!st.isFile()) { skipped++; continue; }
-    if (st.size > MAX_FILE_BYTES) {
-      emit(`跳过（过大 ${(st.size / 1024).toFixed(0)}KB）：${rel}`);
-      skipped++;
-      continue;
-    }
-    const buf = fs.readFileSync(abs);
-    if (isBinary(buf)) { skipped++; continue; }
-    files.push({ path: rel, content: buf.toString('utf8'), deleted: false });
-  }
-  for (const rel of deleted) {
-    if (inIgnoredDir(rel)) continue;
-    files.push({ path: rel, deleted: true });
-  }
-  return { files, skipped };
-}
-
-/**
- * 执行 kb-sync：检测变更 → 组装条目 → 分批调用平台增量同步。
- * @param {{cwd:string, config:{baseUrl:string,apiKey:string}, kbId:string|number, base?:string, dry?:boolean, emit?:(t:string)=>void}} opts
- * @returns {Promise<{ok:boolean, empty?:boolean, dry?:boolean, added:number, removed:number, skipped:number, accepted?:number, message:string, preview?:any[]}>}
- */
-export async function runKbSync({ cwd, config, kbId, base, dry = false, emit = () => {} }) {
-  if (!isGitRepo(cwd)) throw new Error('当前目录不是 git 仓库；kb-sync 依赖 git diff 检测变更');
-  const { changed, deleted } = detectChanges(cwd, base);
-  const { files, skipped } = buildEntries(cwd, changed, deleted, emit);
-
-  const added = files.filter((f) => !f.deleted).length;
-  const removed = files.filter((f) => f.deleted).length;
-  if (!files.length) {
-    return { ok: true, empty: true, added: 0, removed: 0, skipped, message: base ? `相对 ${base} 无可同步的变更文件` : '工作区无可同步的变更文件' };
-  }
-
-  emit(`检测到 ${added} 个新增/修改、${removed} 个删除${skipped ? `（跳过 ${skipped}）` : ''}${base ? `（相对 ${base}）` : ''}`);
-  if (dry) {
-    return { ok: true, dry: true, added, removed, skipped, message: '试运行（未提交）', preview: files.map((f) => ({ path: f.path, deleted: !!f.deleted })) };
-  }
-
-  let accepted = 0;
-  const msgs = [];
-  for (let i = 0; i < files.length; i += BATCH) {
-    const batch = files.slice(i, i + BATCH);
-    if (files.length > BATCH) emit(`同步中… ${Math.min(i + BATCH, files.length)}/${files.length}`);
-    const r = await syncKnowledge(config.baseUrl, config.apiKey, kbId, batch);
-    accepted += r?.accepted || 0;
-    if (r?.message) msgs.push(r.message);
-  }
-  return { ok: true, added, removed, skipped, accepted, message: msgs.join('；') || '同步完成' };
-}
+import e from"node:fs";import t from"node:path";import{execFileSync as n}from"node:child_process";import{syncKnowledge as i}from"./api.js";import{IGNORE as o,MAX_FILE_BYTES as s}from"./codeindex.js";function r(e,t){return n("git",t,{cwd:e,encoding:"utf8",maxBuffer:67108864}).trim()}function d(e){return e.split("/").some(e=>o.has(e))}function c(e){const t=Math.min(e.length,4096);for(let n=0;n<t;n++)if(0===e[n])return!0;return!1}export function detectChanges(e,t){const n=new Set,i=new Set,o=e=>{for(const t of e.split("\n")){if(!t.trim())continue;const e=t.split("\t"),o=e[0][0];if("D"===o)i.add(e[1]);else if("R"===o||"C"===o){const t=e[1],s=e[2]||e[1];"R"===o&&i.add(t),n.add(s)}else n.add(e[e.length-1])}};if(t)o(r(e,["diff","--name-status",t]));else{o(r(e,["diff","--name-status","HEAD"]));const t=r(e,["ls-files","--others","--exclude-standard"]);for(const e of t.split("\n"))e.trim()&&n.add(e.trim())}for(const e of n)i.delete(e);return{changed:[...n],deleted:[...i]}}export function buildEntries(n,i,o,r=()=>{}){const f=[];let a=0;for(const o of i){if(d(o)){a++;continue}const i=t.join(n,o);let l;try{l=e.statSync(i)}catch{a++;continue}if(!l.isFile()){a++;continue}if(l.size>s){r(`跳过（过大 ${(l.size/1024).toFixed(0)}KB）：${o}`),a++;continue}const p=e.readFileSync(i);c(p)?a++:f.push({path:o,content:p.toString("utf8"),deleted:!1})}for(const e of o)d(e)||f.push({path:e,deleted:!0});return{files:f,skipped:a}}export async function runKbSync({cwd:e,config:t,kbId:n,base:o,dry:s=!1,emit:d=()=>{}}){if(!function(e){try{return r(e,["rev-parse","--is-inside-work-tree"]),!0}catch{return!1}}(e))throw new Error("当前目录不是 git 仓库；kb-sync 依赖 git diff 检测变更");const{changed:c,deleted:f}=detectChanges(e,o),{files:a,skipped:l}=buildEntries(e,c,f,d),p=a.filter(e=>!e.deleted).length,u=a.filter(e=>e.deleted).length;if(!a.length)return{ok:!0,empty:!0,added:0,removed:0,skipped:l,message:o?`相对 ${o} 无可同步的变更文件`:"工作区无可同步的变更文件"};if(d(`检测到 ${p} 个新增/修改、${u} 个删除${l?`（跳过 ${l}）`:""}${o?`（相对 ${o}）`:""}`),s)return{ok:!0,dry:!0,added:p,removed:u,skipped:l,message:"试运行（未提交）",preview:a.map(e=>({path:e.path,deleted:!!e.deleted}))};let m=0;const h=[];for(let e=0;e<a.length;e+=20){const o=a.slice(e,e+20);a.length>20&&d(`同步中… ${Math.min(e+20,a.length)}/${a.length}`);const s=await i(t.baseUrl,t.apiKey,n,o);m+=s?.accepted||0,s?.message&&h.push(s.message)}return{ok:!0,added:p,removed:u,skipped:l,accepted:m,message:h.join("；")||"同步完成"}}

package/src/markup-filter.js

@@ -1,85 +1 @@
-// 模型「文本化工具调用」防泄漏过滤器（与平台侧 huicai-agent 的 ToolMarkupFilter 同款状态机）。
-//
-// 部分模型（如 DeepSeek 系）在长上下文/上下文压缩后会格式退化：不走 function calling 特殊通道，
-// 而把工具调用以纯文本标记写进正文（如 <｜｜DSML｜｜tool_calls>…、<｜tool▁calls▁begin｜>…）。
-// 这种「调用」不会出现在 tool_calls 里、也不会被执行；若照原样显示，终端/扩展面板会出现成片协议乱码，
-// 且答非所问。CLI 直连原始模型（平台 /v1 为透明代理，不代过滤），须在客户端做同样的拦截。
-//
-// 流式状态机：正常文本原样放行；遇疑似起始符 <| / <｜ 先持有，在确认窗口内命中工具标记特征
-// （dsml / tool_call / tool▁call / function_call…）→ 进入吞噬模式，本轮剩余内容全部丢弃
-// （此类输出一旦开始，其后即整段协议块，无用户价值）；窗口内未命中 → 原样放行
-// （不误杀正文中的 <|x|> 字面量）。每轮模型输出使用独立实例。
-
-/** 起始符确认窗口：起始符后至多累计这么多字符仍未命中特征则放行。 */
-const CONFIRM_WINDOW = 48;
-
-/** 工具标记特征（起始符后窗口内匹配）：DSML / tool_calls / tool▁calls / function_call 等变体。 */
-const MARKUP_RE = /dsml|tool[_▁]?call|function[_▁]?call/i;
-
-/** 找到最早的疑似起始符（<| 或 <｜）下标，无则 -1。 */
-function markerStart(s) {
-  for (let i = 0; i < s.length - 1; i++) {
-    if (s[i] === '<' && (s[i + 1] === '|' || s[i + 1] === '｜')) return i;
-  }
-  return -1;
-}
-
-export class MarkupFilter {
-  constructor() {
-    this.held = '';
-    this.swallowing = false;
-    /** 本轮是否检出过文本化工具标记。 */
-    this.sawMarkup = false;
-  }
-
-  /** 喂入一段增量，返回可安全下发的文本（可能为空串）。 */
-  feed(delta) {
-    if (!delta || this.swallowing) return '';
-    this.held += delta;
-    let out = '';
-    for (;;) {
-      const idx = markerStart(this.held);
-      if (idx < 0) {
-        // 无疑似起始：保留可能被增量边界截断的尾部 '<'，其余放行
-        const keep = this.held.endsWith('<') ? 1 : 0;
-        out += this.held.slice(0, this.held.length - keep);
-        this.held = keep ? '<' : '';
-        return out;
-      }
-      out += this.held.slice(0, idx);
-      this.held = this.held.slice(idx);
-      // held 现以 <| 或 <｜ 开头：在确认窗口内判定
-      if (MARKUP_RE.test(this.held.slice(0, CONFIRM_WINDOW))) {
-        this.swallowing = true;
-        this.sawMarkup = true;
-        this.held = '';
-        return out;
-      }
-      if (this.held.length < CONFIRM_WINDOW) return out; // 证据不足：持有等待更多增量
-      // 窗口已满仍非标记：放行起始两字符，继续扫描其后内容
-      out += this.held.slice(0, 2);
-      this.held = this.held.slice(2);
-    }
-  }
-
-  /** 流结束：放行仍在持有的未确认内容（吞噬中则丢弃）。 */
-  flush() {
-    if (this.swallowing) {
-      this.held = '';
-      return '';
-    }
-    const rest = this.held;
-    this.held = '';
-    return rest;
-  }
-}
-
-/**
- * 一次性清洗全量文本（等价于流式 feed+flush）。
- * @returns {{text:string, sawMarkup:boolean}} text 为清洗后的安全文本（null/空入参返回空串）
- */
-export function stripMarkup(content) {
-  if (!content) return { text: '', sawMarkup: false };
-  const f = new MarkupFilter();
-  return { text: f.feed(content) + f.flush(), sawMarkup: f.sawMarkup };
-}
+const t=/dsml|tool[_▁]?call|function[_▁]?call/i;function s(t){for(let s=0;s<t.length-1;s++)if("<"===t[s]&&("|"===t[s+1]||"｜"===t[s+1]))return s;return-1}export class MarkupFilter{constructor(){this.held="",this.swallowing=!1,this.sawMarkup=!1}feed(e){if(!e||this.swallowing)return"";this.held+=e;let h="";for(;;){const e=s(this.held);if(e<0){const t=this.held.endsWith("<")?1:0;return h+=this.held.slice(0,this.held.length-t),this.held=t?"<":"",h}if(h+=this.held.slice(0,e),this.held=this.held.slice(e),t.test(this.held.slice(0,48)))return this.swallowing=!0,this.sawMarkup=!0,this.held="",h;if(this.held.length<48)return h;h+=this.held.slice(0,2),this.held=this.held.slice(2)}}flush(){if(this.swallowing)return this.held="","";const t=this.held;return this.held="",t}}export function stripMarkup(t){if(!t)return{text:"",sawMarkup:!1};const s=new MarkupFilter;return{text:s.feed(t)+s.flush(),sawMarkup:s.sawMarkup}}

package/src/mcp.js

@@ -1,207 +1 @@
-// 本地 MCP 客户端（零依赖）：按 ~/.huicai/mcp.json 启动本地 MCP 服务（stdio 传输，JSON-RPC 2.0，
-// 换行分隔），握手后拉取其工具，暴露给 Agent 循环调用。配置形状为通用 mcpServers 格式：
-//   { "mcpServers": { "<名>": { "command": "npx", "args": ["-y","@modelcontextprotocol/server-filesystem","<路径>"], "env": {} } } }
-// 未配置该文件时完全无副作用（返回空工具集）。
-
-import fs from 'node:fs';
-import path from 'node:path';
-import { spawn } from 'node:child_process';
-import { CONFIG_DIR } from './config.js';
-import { c } from './colors.js';
-
-export const MCP_CONFIG_PATH = path.join(CONFIG_DIR, 'mcp.json');
-
-const INIT_TIMEOUT = 20_000;
-const CALL_TIMEOUT = 120_000;
-const PROTOCOL_VERSION = '2024-11-05';
-
-/** 单个 MCP 服务的 stdio JSON-RPC 客户端。 */
-class McpStdioClient {
-  constructor(name, spec) {
-    this.name = name;
-    this.spec = spec;
-    this.child = null;
-    this.buffer = '';
-    this.nextId = 1;
-    this.pending = new Map(); // id -> {resolve, reject, timer}
-    this.closed = false;
-  }
-
-  async start() {
-    const env = { ...process.env, ...(this.spec.env || {}) };
-    this.child = spawn(this.spec.command, this.spec.args || [], {
-      env,
-      stdio: ['pipe', 'pipe', 'pipe'],
-    });
-    this.child.on('error', (e) => this._failAll(new Error(`MCP[${this.name}] 进程错误：${e.message}`)));
-    this.child.on('exit', () => {
-      this.closed = true;
-      this._failAll(new Error(`MCP[${this.name}] 进程已退出`));
-    });
-    this.child.stdout.setEncoding('utf8');
-    this.child.stdout.on('data', (chunk) => this._onData(chunk));
-    // stderr 仅调试用，静默丢弃避免污染 TUI
-    this.child.stderr.on('data', () => {});
-
-    // 握手：initialize -> notifications/initialized
-    await this._request('initialize', {
-      protocolVersion: PROTOCOL_VERSION,
-      capabilities: {},
-      clientInfo: { name: 'huicai-cli', version: '0.2.0' },
-    }, INIT_TIMEOUT);
-    this._notify('notifications/initialized', {});
-  }
-
-  async listTools() {
-    const res = await this._request('tools/list', {}, INIT_TIMEOUT);
-    return Array.isArray(res?.tools) ? res.tools : [];
-  }
-
-  async callTool(toolName, args) {
-    const res = await this._request('tools/call', { name: toolName, arguments: args || {} }, CALL_TIMEOUT);
-    // 结果内容为 content 数组（text/其它）；拼接 text 回填模型
-    const parts = Array.isArray(res?.content) ? res.content : [];
-    const text = parts
-      .map((p) => (p?.type === 'text' ? p.text : p?.text || JSON.stringify(p)))
-      .filter(Boolean)
-      .join('\n');
-    if (res?.isError) return `工具报错：${text || '(无详情)'}`;
-    return text || '(无输出)';
-  }
-
-  close() {
-    this.closed = true;
-    try {
-      this.child?.kill('SIGTERM');
-    } catch {
-      /* ignore */
-    }
-  }
-
-  _onData(chunk) {
-    this.buffer += chunk;
-    let idx;
-    while ((idx = this.buffer.indexOf('\n')) >= 0) {
-      const line = this.buffer.slice(0, idx).trim();
-      this.buffer = this.buffer.slice(idx + 1);
-      if (!line) continue;
-      let msg;
-      try {
-        msg = JSON.parse(line);
-      } catch {
-        continue; // 非 JSON 行（部分服务打印日志到 stdout）忽略
-      }
-      if (msg.id != null && this.pending.has(msg.id)) {
-        const { resolve, reject, timer } = this.pending.get(msg.id);
-        clearTimeout(timer);
-        this.pending.delete(msg.id);
-        if (msg.error) reject(new Error(msg.error.message || 'MCP 错误'));
-        else resolve(msg.result);
-      }
-      // 服务端通知（无匹配 id）忽略
-    }
-  }
-
-  _request(method, params, timeoutMs) {
-    if (this.closed) return Promise.reject(new Error(`MCP[${this.name}] 已关闭`));
-    const id = this.nextId++;
-    const payload = JSON.stringify({ jsonrpc: '2.0', id, method, params }) + '\n';
-    return new Promise((resolve, reject) => {
-      const timer = setTimeout(() => {
-        this.pending.delete(id);
-        reject(new Error(`MCP[${this.name}] ${method} 超时`));
-      }, timeoutMs);
-      this.pending.set(id, { resolve, reject, timer });
-      try {
-        this.child.stdin.write(payload);
-      } catch (e) {
-        clearTimeout(timer);
-        this.pending.delete(id);
-        reject(e);
-      }
-    });
-  }
-
-  _notify(method, params) {
-    try {
-      this.child.stdin.write(JSON.stringify({ jsonrpc: '2.0', method, params }) + '\n');
-    } catch {
-      /* ignore */
-    }
-  }
-
-  _failAll(err) {
-    for (const { reject, timer } of this.pending.values()) {
-      clearTimeout(timer);
-      reject(err);
-    }
-    this.pending.clear();
-  }
-}
-
-/** 规整为合法 OpenAI 函数名。 */
-function sanitize(name) {
-  const s = String(name).replace(/[^a-zA-Z0-9_-]/g, '_');
-  return s.length > 60 ? s.slice(0, 60) : s;
-}
-
-function readConfig() {
-  try {
-    const j = JSON.parse(fs.readFileSync(MCP_CONFIG_PATH, 'utf8'));
-    return j?.mcpServers && typeof j.mcpServers === 'object' ? j.mcpServers : {};
-  } catch {
-    return {};
-  }
-}
-
-/**
- * 启动所有已配置的 MCP 服务并汇集其工具。
- * @returns {Promise<{tools:{spec:object,run:Function,readOnly:boolean}[], clients:McpStdioClient[]}>}
- */
-export async function loadMcpTools() {
-  const servers = readConfig();
-  const names = Object.keys(servers);
-  const tools = [];
-  const clients = [];
-  if (names.length === 0) return { tools, clients };
-
-  for (const name of names) {
-    const spec = servers[name] || {};
-    if (!spec.command) continue;
-    const client = new McpStdioClient(name, spec);
-    try {
-      await client.start();
-      const mcpTools = await client.listTools();
-      clients.push(client);
-      for (const t of mcpTools) {
-        const realName = t.name;
-        const fnName = sanitize(`mcp__${name}__${realName}`);
-        const readOnly = t.annotations?.readOnlyHint === true;
-        tools.push({
-          readOnly,
-          spec: {
-            type: 'function',
-            function: {
-              name: fnName,
-              description: `[MCP:${name}] ${t.description || realName}`,
-              parameters: t.inputSchema && typeof t.inputSchema === 'object'
-                ? t.inputSchema
-                : { type: 'object', properties: {} },
-            },
-          },
-          run: (args) => client.callTool(realName, args),
-        });
-      }
-      process.stdout.write(c.gray(`  · MCP[${name}] 已连接，工具 ${mcpTools.length} 个`) + '\n');
-    } catch (e) {
-      client.close();
-      process.stdout.write(c.yellow(`  · MCP[${name}] 加载失败，已跳过：${e.message}`) + '\n');
-    }
-  }
-  return { tools, clients };
-}
-
-/** 关闭全部 MCP 子进程。 */
-export function closeMcp(clients) {
-  for (const c2 of clients || []) c2.close();
-}
+import t from"node:fs";import e from"node:path";import{spawn as i}from"node:child_process";import{CONFIG_DIR as s}from"./config.js";import{c as n}from"./colors.js";export const MCP_CONFIG_PATH=e.join(s,"mcp.json");class o{constructor(t,e){this.name=t,this.spec=e,this.child=null,this.buffer="",this.nextId=1,this.pending=new Map,this.closed=!1}async start(){const t={...process.env,...this.spec.env||{}};this.child=i(this.spec.command,this.spec.args||[],{env:t,stdio:["pipe","pipe","pipe"]}),this.child.on("error",t=>this._failAll(new Error(`MCP[${this.name}] 进程错误：${t.message}`))),this.child.on("exit",()=>{this.closed=!0,this._failAll(new Error(`MCP[${this.name}] 进程已退出`))}),this.child.stdout.setEncoding("utf8"),this.child.stdout.on("data",t=>this._onData(t)),this.child.stderr.on("data",()=>{}),await this._request("initialize",{protocolVersion:"2024-11-05",capabilities:{},clientInfo:{name:"huicai-cli",version:"0.2.0"}},2e4),this._notify("notifications/initialized",{})}async listTools(){const t=await this._request("tools/list",{},2e4);return Array.isArray(t?.tools)?t.tools:[]}async callTool(t,e){const i=await this._request("tools/call",{name:t,arguments:e||{}},12e4),s=(Array.isArray(i?.content)?i.content:[]).map(t=>"text"===t?.type?t.text:t?.text||JSON.stringify(t)).filter(Boolean).join("\n");return i?.isError?`工具报错：${s||"(无详情)"}`:s||"(无输出)"}close(){this.closed=!0;try{this.child?.kill("SIGTERM")}catch{}}_onData(t){let e;for(this.buffer+=t;(e=this.buffer.indexOf("\n"))>=0;){const t=this.buffer.slice(0,e).trim();if(this.buffer=this.buffer.slice(e+1),!t)continue;let i;try{i=JSON.parse(t)}catch{continue}if(null!=i.id&&this.pending.has(i.id)){const{resolve:t,reject:e,timer:s}=this.pending.get(i.id);clearTimeout(s),this.pending.delete(i.id),i.error?e(new Error(i.error.message||"MCP 错误")):t(i.result)}}}_request(t,e,i){if(this.closed)return Promise.reject(new Error(`MCP[${this.name}] 已关闭`));const s=this.nextId++,n=JSON.stringify({jsonrpc:"2.0",id:s,method:t,params:e})+"\n";return new Promise((e,o)=>{const r=setTimeout(()=>{this.pending.delete(s),o(new Error(`MCP[${this.name}] ${t} 超时`))},i);this.pending.set(s,{resolve:e,reject:o,timer:r});try{this.child.stdin.write(n)}catch(t){clearTimeout(r),this.pending.delete(s),o(t)}})}_notify(t,e){try{this.child.stdin.write(JSON.stringify({jsonrpc:"2.0",method:t,params:e})+"\n")}catch{}}_failAll(t){for(const{reject:e,timer:i}of this.pending.values())clearTimeout(i),e(t);this.pending.clear()}}function r(t){const e=String(t).replace(/[^a-zA-Z0-9_-]/g,"_");return e.length>60?e.slice(0,60):e}export async function loadMcpTools(){const e=function(){try{const e=JSON.parse(t.readFileSync(MCP_CONFIG_PATH,"utf8"));return e?.mcpServers&&"object"==typeof e.mcpServers?e.mcpServers:{}}catch{return{}}}(),i=Object.keys(e),s=[],c=[];if(0===i.length)return{tools:s,clients:c};for(const t of i){const i=e[t]||{};if(!i.command)continue;const a=new o(t,i);try{await a.start();const e=await a.listTools();c.push(a);for(const i of e){const e=i.name,n=r(`mcp__${t}__${e}`),o=!0===i.annotations?.readOnlyHint;s.push({readOnly:o,spec:{type:"function",function:{name:n,description:`[MCP:${t}] ${i.description||e}`,parameters:i.inputSchema&&"object"==typeof i.inputSchema?i.inputSchema:{type:"object",properties:{}}}},run:t=>a.callTool(e,t)})}process.stdout.write(n.gray(`  · MCP[${t}] 已连接，工具 ${e.length} 个`)+"\n")}catch(e){a.close(),process.stdout.write(n.yellow(`  · MCP[${t}] 加载失败，已跳过：${e.message}`)+"\n")}}return{tools:s,clients:c}}export function closeMcp(t){for(const e of t||[])e.close()}

package/src/memory.js

@@ -1,161 +1 @@
-// 长期记忆（跨会话）：按项目目录归属，存于 ~/.huicai/memory/<hash>.md。
-// 模型经内置 memory_write 工具主动记录「值得跨会话记住的事实」（用户偏好、项目结论、约定等），
-// 每次新会话由 context.js 注入系统提示词——即「长期记忆」；「短期记忆」= 会话消息 + 非破坏式上下文压缩摘要。
-// 开关：config.memoryEnabled（默认开，配置 memory:false 或环境变量 HUICAI_MEMORY=0 关闭）。
-
-import fs from 'node:fs';
-import path from 'node:path';
-import crypto from 'node:crypto';
-import { CONFIG_DIR } from './config.js';
-import { tokenize } from './codeindex.js';
-
-export const MEMORY_DIR = path.join(CONFIG_DIR, 'memory');
-const MAX_MEMORY_CHARS = 6000; // 注入系统提示词的上限（超出保留最新条目）
-const MAX_ENTRY_CHARS = 1000;
-
-export function memoryPath(cwd) {
-  const h = crypto.createHash('sha1').update(String(cwd || '')).digest('hex').slice(0, 12);
-  return path.join(MEMORY_DIR, h + '.md');
-}
-
-/** 读取该项目的长期记忆（超限保尾部=最新条目）。无则空串。 */
-export function loadMemory(cwd) {
-  try {
-    const s = fs.readFileSync(memoryPath(cwd), 'utf8');
-    if (s.length <= MAX_MEMORY_CHARS) return s.trim();
-    const tail = s.slice(-MAX_MEMORY_CHARS);
-    const nl = tail.indexOf('\n');
-    return ('…（较早记忆已省略）\n' + (nl >= 0 ? tail.slice(nl + 1) : tail)).trim();
-  } catch {
-    return '';
-  }
-}
-
-/** 追加一条记忆（带日期，best-effort）。返回是否成功。 */
-export function appendMemory(cwd, content) {
-  const t = String(content || '').trim();
-  if (!t) return false;
-  try {
-    fs.mkdirSync(MEMORY_DIR, { recursive: true });
-    const entry = `- [${new Date().toISOString().slice(0, 10)}] ${t.slice(0, MAX_ENTRY_CHARS)}\n`;
-    const p = memoryPath(cwd);
-    if (!fs.existsSync(p)) {
-      fs.writeFileSync(p, `# 长期记忆（${cwd}）\n\n${entry}`, { mode: 0o600 });
-    } else {
-      fs.appendFileSync(p, entry);
-    }
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-/** 整体重写记忆（模型做记忆整理时用）。 */
-export function replaceMemory(cwd, content) {
-  try {
-    fs.mkdirSync(MEMORY_DIR, { recursive: true });
-    fs.writeFileSync(memoryPath(cwd), String(content || '').slice(0, MAX_MEMORY_CHARS * 2), { mode: 0o600 });
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-export function clearMemory(cwd) {
-  try {
-    fs.unlinkSync(memoryPath(cwd));
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-/** 读取完整长期记忆原文（不截断），供 recall_memory 按相关性检索。 */
-export function readMemoryRaw(cwd) {
-  try {
-    return fs.readFileSync(memoryPath(cwd), 'utf8');
-  } catch {
-    return '';
-  }
-}
-
-/**
- * 构造 recall_memory 工具（跨会话经验主动召回）：在本项目长期记忆里按关键词检索相关条目，
- * 连超出常驻注入预算（6k）的历史也能查到。CJK 感知分词（复用 codeindex.tokenize）。
- */
-export function makeRecallTool({ cwd }) {
-  const spec = {
-    type: 'function',
-    function: {
-      name: 'recall_memory',
-      description:
-        '在本项目的长期记忆里按关键词检索相关的过往结论/踩坑/约定（连超出常驻注入预算的历史也能查到）。'
-        + '开始一个任务前，若怀疑「以前处理过类似问题」，可先 recall 一下，少走弯路。',
-      parameters: {
-        type: 'object',
-        properties: { query: { type: 'string', description: '关键词/概念' } },
-        required: ['query'],
-      },
-    },
-  };
-  const run = async (args) => {
-    const q = String(args?.query || '').trim();
-    if (!q) return '缺少 query';
-    const entries = readMemoryRaw(cwd).split('\n').map((l) => l.trim()).filter((l) => l.startsWith('- '));
-    if (!entries.length) return '本项目暂无可检索的长期记忆。';
-    const qt = new Set(tokenize(q));
-    if (!qt.size) return '查询词无有效 token。';
-    const scored = entries
-      .map((e) => {
-        let s = 0;
-        for (const t of new Set(tokenize(e))) if (qt.has(t)) s++;
-        return { e, s };
-      })
-      .filter((x) => x.s > 0)
-      .sort((a, b) => b.s - a.s)
-      .slice(0, 6);
-    if (!scored.length) return `未在长期记忆中找到与「${q}」相关的条目。`;
-    return '相关的历史记忆：\n' + scored.map((x) => x.e).join('\n');
-  };
-  return { readOnly: true, spec, run };
-}
-
-/**
- * 构造 memory_write 内置工具（顶层注入；记忆是机制本身，自动放行）。
- * @param {{cwd:string, emit?:(text:string)=>void}} p
- */
-export function makeMemoryTool({ cwd, emit }) {
-  const spec = {
-    type: 'function',
-    function: {
-      name: 'memory_write',
-      description:
-        '把值得跨会话记住的信息写入本项目的长期记忆（用户偏好、项目关键事实/约定、踩坑结论等）。'
-        + '新会话会自动注入这些记忆。仅记「以后仍然有用」的稳定信息；不要记一次性细节或大段代码。'
-        + 'mode=append 追加一条（默认）；mode=replace 用整理后的全文替换（做记忆瘦身时用）。',
-      parameters: {
-        type: 'object',
-        properties: {
-          content: { type: 'string', description: '要记住的内容（简洁的一条事实/偏好/结论）' },
-          mode: { type: 'string', enum: ['append', 'replace'], description: '追加或整体替换（默认 append）' },
-        },
-        required: ['content'],
-      },
-    },
-  };
-  const run = async (args) => {
-    const content = String(args?.content || '').trim();
-    if (!content) return 'memory_write 需要非空 content';
-    const ok = args?.mode === 'replace' ? replaceMemory(cwd, content) : appendMemory(cwd, content);
-    if (ok) {
-      try {
-        emit?.(content);
-      } catch {
-        /* ignore */
-      }
-      return `已写入长期记忆（${args?.mode === 'replace' ? '整体替换' : '追加'}）。`;
-    }
-    return '长期记忆写入失败（磁盘不可写？），可忽略并继续任务。';
-  };
-  return { readOnly: true, spec, run };
-}
+import e from"node:fs";import r from"node:path";import t from"node:crypto";import{CONFIG_DIR as n}from"./config.js";import{tokenize as o}from"./codeindex.js";export const MEMORY_DIR=r.join(n,"memory");const i=6e3;export function memoryPath(e){const n=t.createHash("sha1").update(String(e||"")).digest("hex").slice(0,12);return r.join(MEMORY_DIR,n+".md")}export function loadMemory(r){try{const t=e.readFileSync(memoryPath(r),"utf8");if(t.length<=i)return t.trim();const n=t.slice(-6e3),o=n.indexOf("\n");return("…（较早记忆已省略）\n"+(o>=0?n.slice(o+1):n)).trim()}catch{return""}}export function appendMemory(r,t){const n=String(t||"").trim();if(!n)return!1;try{e.mkdirSync(MEMORY_DIR,{recursive:!0});const t=`- [${(new Date).toISOString().slice(0,10)}] ${n.slice(0,1e3)}\n`,o=memoryPath(r);return e.existsSync(o)?e.appendFileSync(o,t):e.writeFileSync(o,`# 长期记忆（${r}）\n\n${t}`,{mode:384}),!0}catch{return!1}}export function replaceMemory(r,t){try{return e.mkdirSync(MEMORY_DIR,{recursive:!0}),e.writeFileSync(memoryPath(r),String(t||"").slice(0,12e3),{mode:384}),!0}catch{return!1}}export function clearMemory(r){try{return e.unlinkSync(memoryPath(r)),!0}catch{return!1}}export function readMemoryRaw(r){try{return e.readFileSync(memoryPath(r),"utf8")}catch{return""}}export function makeRecallTool({cwd:e}){return{readOnly:!0,spec:{type:"function",function:{name:"recall_memory",description:"在本项目的长期记忆里按关键词检索相关的过往结论/踩坑/约定（连超出常驻注入预算的历史也能查到）。开始一个任务前，若怀疑「以前处理过类似问题」，可先 recall 一下，少走弯路。",parameters:{type:"object",properties:{query:{type:"string",description:"关键词/概念"}},required:["query"]}}},run:async r=>{const t=String(r?.query||"").trim();if(!t)return"缺少 query";const n=readMemoryRaw(e).split("\n").map(e=>e.trim()).filter(e=>e.startsWith("- "));if(!n.length)return"本项目暂无可检索的长期记忆。";const i=new Set(o(t));if(!i.size)return"查询词无有效 token。";const c=n.map(e=>{let r=0;for(const t of new Set(o(e)))i.has(t)&&r++;return{e:e,s:r}}).filter(e=>e.s>0).sort((e,r)=>r.s-e.s).slice(0,6);return c.length?"相关的历史记忆：\n"+c.map(e=>e.e).join("\n"):`未在长期记忆中找到与「${t}」相关的条目。`}}}export function makeMemoryTool({cwd:e,emit:r}){return{readOnly:!0,spec:{type:"function",function:{name:"memory_write",description:"把值得跨会话记住的信息写入本项目的长期记忆（用户偏好、项目关键事实/约定、踩坑结论等）。新会话会自动注入这些记忆。仅记「以后仍然有用」的稳定信息；不要记一次性细节或大段代码。mode=append 追加一条（默认）；mode=replace 用整理后的全文替换（做记忆瘦身时用）。",parameters:{type:"object",properties:{content:{type:"string",description:"要记住的内容（简洁的一条事实/偏好/结论）"},mode:{type:"string",enum:["append","replace"],description:"追加或整体替换（默认 append）"}},required:["content"]}}},run:async t=>{const n=String(t?.content||"").trim();if(!n)return"memory_write 需要非空 content";if("replace"===t?.mode?replaceMemory(e,n):appendMemory(e,n)){try{r?.(n)}catch{}return`已写入长期记忆（${"replace"===t?.mode?"整体替换":"追加"}）。`}return"长期记忆写入失败（磁盘不可写？），可忽略并继续任务。"}}}