local-knowledge-graph 1.8.0 → 1.8.1

package/lib/db.js

@@ -484,26 +484,46 @@ function entNameIn(id) {
 
 // 批量应用OpenCode操作（单事务原子提交，任一违规整体回滚，保持上一个合规版本）
 // ref占位符解析：add_entity可带ref，后续关系用ref引用新实体
+// add_relation 支持按名称引用（source_name/target_name）：主名或别名精确匹配，事务内可见同批新建实体
 function applyAgentOps(ops) {
   const applied = [];
   const refMap = {};
   return tx(() => {
-    for (const op of ops) {
-      if (!op || typeof op !== 'object') throw badOp('每个操作必须为JSON对象');
+    for (let opIdx = 0; opIdx < ops.length; opIdx++) {
+      const op = ops[opIdx];
+      try {
+        if (!op || typeof op !== 'object') throw badOp('每个操作必须为JSON对象');
       switch (op.op) {
         case 'add_entity': {
           const row = addEntityCore({ name: op.name, category: op.category, attributes: op.attributes }, 'OpenCode');
+          if (Array.isArray(op.aliases)) {
+            // 同事务内联写别名（addAlias 内部自带事务，嵌套会失败）
+            for (const raw of op.aliases) {
+              const n = cleanAlias(raw);
+              if (!n || n.length > 200 || n === row.name) continue;
+              const dup = db.prepare('SELECT id FROM aliases WHERE entity_id = ? AND alias = ?').get(row.id, n);
+              if (dup) continue;
+              if (aliasConflict(n, row.id)) continue;
+              const info = db.prepare('INSERT INTO aliases (entity_id, alias) VALUES (?, ?)').run(row.id, n);
+              const arow = db.prepare('SELECT id, entity_id, alias, created_at FROM aliases WHERE id = ?').get(Number(info.lastInsertRowid));
+              logOp('ADD_ALIAS', { alias: arow }, 'OpenCode');
+            }
+          }
           if (op.ref !== undefined) {
             if (typeof op.ref !== 'string' || !op.ref.trim()) throw badOp('ref必须为非空字符串');
             refMap[op.ref.trim()] = row.id;
           }
-          applied.push({ op: 'add_entity', id: row.id, name: row.name });
+          applied.push({ op: 'add_entity', id: row.id, name: row.name, aliases_added: Array.isArray(op.aliases) ? op.aliases.length : 0 });
           break;
         }
         case 'add_relation': {
-          const sid = resolveRef(op.source_id, op.source_ref, refMap);
-          const tid = resolveRef(op.target_id, op.target_ref, refMap);
-          const row = addRelationCore({ source_id: sid, target_id: tid, name: op.name, category: op.category }, 'OpenCode');
+          let sid;
+          let tid;
+          if (op.source_name !== undefined && op.source_id === undefined && op.source_ref === undefined) sid = resolveEntityName(op.source_name);
+          else sid = resolveRef(op.source_id, op.source_ref, refMap);
+          if (op.target_name !== undefined && op.target_id === undefined && op.target_ref === undefined) tid = resolveEntityName(op.target_name);
+          else tid = resolveRef(op.target_id, op.target_ref, refMap);
+          const row = addRelationCore({ source_id: sid, target_id: tid, name: op.name, category: op.category, confidence: op.confidence, source_ref: op.evidence_ref }, 'OpenCode');
           applied.push({ op: 'add_relation', id: row.id, name: row.name });
           break;
         }
@@ -521,7 +541,7 @@ function applyAgentOps(ops) {
         }
         case 'update_relation': {
           const patch = {};
-          for (const k of ['source_id', 'target_id', 'name', 'category']) if (op[k] !== undefined) patch[k] = op[k];
+          for (const k of ['source_id', 'target_id', 'name', 'category', 'confidence', 'source_ref']) if (op[k] !== undefined) patch[k] = op[k];
           const row = updateRelationCore(Number(op.id), patch, 'OpenCode');
           applied.push({ op: 'update_relation', id: row.id, name: row.name });
           break;
@@ -534,6 +554,11 @@ function applyAgentOps(ops) {
         default:
           throw badOp(`未知操作类型"${op.op}"，仅支持 add_entity/add_relation/update_entity/delete_entity/update_relation/delete_relation`);
       }
+      } catch (e) {
+        const opKind = (op && op.op) || '未知';
+        e.message = `第${opIdx + 1}条操作(${opKind})失败: ${e.message}`;
+        throw e;
+      }
     }
     return applied;
   });
@@ -548,6 +573,17 @@ function applyAgentOps(ops) {
     if (!Number.isInteger(n) || n <= 0) throw badOp(`source_id/target_id必须为正整数或使用ref占位符`);
     return n;
   }
+  // 按名称解析实体id：主名或别名精确匹配；重名返回候选
+  function resolveEntityName(name) {
+    const hits = findNameConflicts(String(name).trim());
+    if (hits.length === 1) return hits[0].id;
+    if (hits.length > 1) {
+      const e = badOp(`实体名 "${name}" 存在${hits.length}个候选（${hits.map((h) => `id=${h.id}`).join(', ')}），请改用 source_id/target_id`);
+      e.candidates = hits.map((h) => ({ id: h.id, name: h.name, category: h.category, via: h.via }));
+      throw e;
+    }
+    throw badOp(`实体 "${name}" 不存在（本批或库中均未找到）`);
+  }
   function badOp(msg) { const e = new Error('OpenCode操作校验未通过: ' + msg); e.status = 400; return e; }
 }
 

package/mcp/core.js

@@ -32,7 +32,7 @@ const TOOLS = [
   },
   {
     name: 'kg_get_entity',
-    description: '按id或名称获取单个实体详情（含其全部关系）',
+    description: '按id或名称获取单个实体详情（含其全部关系与别名）',
     inputSchema: {
       type: 'object',
       properties: { id: { type: 'number' }, name: { type: 'string' } },
@@ -115,13 +115,22 @@ const TOOLS = [
   },
   {
     name: 'kg_apply_ops',
-    description: '写入图谱操作（kg-ops协议JSON数组）：add_entity/add_relation/update_entity/update_relation/delete_entity/delete_relation。所有写入均记入operation_logs并自动git保存点',
+    description: '写入图谱操作（kg-ops协议JSON数组）：add_entity/add_relation/update_entity/update_relation/delete_entity/delete_relation。add_relation 支持按名称引用（source_name/target_name，含别名，重名时返回候选要求改用id）；实体间同批引用可用 ref 占位符（add_entity 传 ref，add_relation 传 source_ref/target_ref，仅同一次调用内有效）；关系可带 confidence（确证/推测/存疑）与 evidence_ref（来源引用文本）。add_entity 支持 aliases 数组。所有写入均记入operation_logs并自动git保存点',
     inputSchema: {
       type: 'object',
       properties: { ops: { type: 'array', items: { type: 'object' } } },
       required: ['ops'],
     },
   },
+  {
+    name: 'kg_reset',
+    description: '清空图谱全部实体与关系（级联删除，自动保存点）。仅用于重建场景，必须显式传 confirm:true 才会执行',
+    inputSchema: {
+      type: 'object',
+      properties: { confirm: { type: 'boolean', description: '必须为true才执行清空' } },
+      required: ['confirm'],
+    },
+  },
 ];
 
 function createCore({ readonly = false, source = 'MCP' } = {}) {
@@ -133,7 +142,17 @@ function createCore({ readonly = false, source = 'MCP' } = {}) {
       throw new Error(`实体id "${key}" 不存在`);
     }
     const hits = ents.filter((e) => e.name === key);
-    if (hits.length === 0) throw new Error(`实体 "${key}" 不存在`);
+    if (hits.length === 0) {
+      const aliasMap = db.aliasMap();
+      const aliasHits = ents.filter((e) => (aliasMap[e.id] || []).some((a) => a === key));
+      if (aliasHits.length === 1) return { id: aliasHits[0].id };
+      if (aliasHits.length > 1) {
+        const e = new Error(`别名 "${key}" 对应${aliasHits.length}个实体，请改用id`);
+        e.candidates = aliasHits.map((h) => ({ id: h.id, name: h.name, category: h.category }));
+        throw e;
+      }
+      throw new Error(`实体 "${key}" 不存在`);
+    }
     if (hits.length > 1) {
       const e = new Error(`实体名 "${key}" 存在${hits.length}个候选，请改用id`);
       e.candidates = hits.map((h) => ({ id: h.id, name: h.name, category: h.category }));
@@ -142,6 +161,10 @@ function createCore({ readonly = false, source = 'MCP' } = {}) {
     return { id: hits[0].id };
   }
 
+  // add_relation 的名称引用解析已下沉到 db.applyAgentOps（事务内可见同批新建实体）
+
+  const aliasById = () => db.aliasMap();
+
   const HANDLERS = {
     kg_stats: async () => {
       const c = db.counts();
@@ -155,7 +178,9 @@ function createCore({ readonly = false, source = 'MCP' } = {}) {
       const total = ents.length;
       const limit = Math.max(1, Math.min(Number(args.limit) || 100, 500));
       const offset = Math.max(0, Number(args.offset) || 0);
-      return { total, count: Math.min(limit, total - offset), offset, entities: ents.slice(offset, offset + limit) };
+      const amap = aliasById();
+      const page = ents.slice(offset, offset + limit).map((e) => ({ ...e, aliases: amap[e.id] || [] }));
+      return { total, count: Math.min(limit, total - offset), offset, entities: page };
     },
     kg_get_entity: async (args) => {
       let e = null;
@@ -167,7 +192,7 @@ function createCore({ readonly = false, source = 'MCP' } = {}) {
       }
       if (!e) throw new Error('实体不存在（请提供id或name）');
       const rels = db.listRelations().filter((r) => r.source_id === e.id || r.target_id === e.id);
-      return { entity: e, relations: rels };
+      return { entity: { ...e, aliases: aliasById()[e.id] || [] }, relations: rels };
     },
     kg_get_graph: async (args) => {
       const g = db.getGraph();
@@ -219,6 +244,15 @@ function createCore({ readonly = false, source = 'MCP' } = {}) {
       try { git.savepoint(`${source}写入: ${applied.length} 项操作`, source); } catch (_) { /* 数据目录无git时忽略 */ }
       return { applied_count: applied.length, applied };
     },
+    kg_reset: async (args) => {
+      if (readonly) throw new Error('MCP运行于只读模式，清空被拒绝（可在应用设置中关闭只读）');
+      if (args.confirm !== true) throw new Error('清空图谱是危险操作，必须显式传 confirm:true 执行');
+      const ids = db.listEntities().map((e) => e.id);
+      if (!ids.length) return { deleted_entities: 0, message: '图谱已为空' };
+      db.applyAgentOps(ids.map((id) => ({ op: 'delete_entity', id })));
+      try { git.savepoint(`${source}清空: 删除${ids.length}个实体`, source); } catch (_) { /* 忽略 */ }
+      return { deleted_entities: ids.length, message: '图谱已清空，可通过保存点回溯恢复' };
+    },
   };
 
   return { TOOLS, HANDLERS };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "local-knowledge-graph",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "本地知识图谱整合器：3D可视化 + AI对话建图 + 智能检索 + Git回溯 + RDF合规，全流程本地运行",
   "main": "server.js",
   "bin": {

package/server.js

@@ -42,7 +42,9 @@ const mcpHandler = createMcpHandler({
 const PORT = Number(process.env.PORT || 3000);
 const app = express();
 app.use(express.json({ limit: '30mb' }));
-app.use(express.static(path.join(__dirname, 'public')));
+app.use(express.static(path.join(__dirname, 'public'), {
+  setHeaders: (res) => { res.setHeader('Cache-Control', 'no-cache, must-revalidate'); }
+}));
 app.use('/uploads', express.static(path.join(git.DATA_DIR, 'uploads')));
 
 const api = express.Router();