signetai 0.191.2 → 0.192.0

package/dist/mcp-stdio.js

@@ -45705,10 +45705,7 @@ function mergeEntityAspects(db, agentId, sourceId, targetId) {
   return aspects.length;
 }
 function mergeEntityEdges(db, agentId, sourceId, targetId) {
-  let relationshipChanges = 0;
-  relationshipChanges += db.prepare("UPDATE entity_dependencies SET source_entity_id = ? WHERE source_entity_id = ? AND agent_id = ?").run(targetId, sourceId, agentId).changes;
-  relationshipChanges += db.prepare("UPDATE entity_dependencies SET target_entity_id = ? WHERE target_entity_id = ? AND agent_id = ?").run(targetId, sourceId, agentId).changes;
-  relationshipChanges += db.prepare("DELETE FROM entity_dependencies WHERE source_entity_id = target_entity_id AND agent_id = ?").run(agentId).changes;
+  let relationshipChanges = mergeEntityDependencies(db, agentId, sourceId, targetId);
   relationshipChanges += db.prepare("UPDATE relations SET source_entity_id = ? WHERE source_entity_id = ?").run(targetId, sourceId).changes;
   relationshipChanges += db.prepare("UPDATE relations SET target_entity_id = ? WHERE target_entity_id = ?").run(targetId, sourceId).changes;
   relationshipChanges += db.prepare("DELETE FROM relations WHERE source_entity_id = target_entity_id").run().changes;
@@ -45716,14 +45713,66 @@ function mergeEntityEdges(db, agentId, sourceId, targetId) {
   db.prepare("DELETE FROM memory_entity_mentions WHERE entity_id = ?").run(sourceId);
   return relationshipChanges;
 }
+function mergeEntityDependencies(db, agentId, sourceId, targetId) {
+  const rows = db.prepare(`SELECT id, source_entity_id, target_entity_id, dependency_type
+			 FROM entity_dependencies
+			 WHERE agent_id = ? AND (source_entity_id = ? OR target_entity_id = ?)`).all(agentId, sourceId, sourceId);
+  let changes = 0;
+  for (const row of rows) {
+    const nextSource = row.source_entity_id === sourceId ? targetId : row.source_entity_id;
+    const nextTarget = row.target_entity_id === sourceId ? targetId : row.target_entity_id;
+    if (nextSource === nextTarget) {
+      changes += db.prepare("DELETE FROM entity_dependencies WHERE id = ? AND agent_id = ?").run(row.id, agentId).changes;
+      continue;
+    }
+    const duplicate = db.prepare(`SELECT id FROM entity_dependencies
+				 WHERE agent_id = ? AND id != ?
+				   AND source_entity_id = ? AND target_entity_id = ? AND dependency_type = ?
+				 LIMIT 1`).get(agentId, row.id, nextSource, nextTarget, row.dependency_type);
+    if (duplicate) {
+      changes += db.prepare("DELETE FROM entity_dependencies WHERE id = ? AND agent_id = ?").run(row.id, agentId).changes;
+      continue;
+    }
+    changes += db.prepare(`UPDATE entity_dependencies
+				 SET source_entity_id = ?, target_entity_id = ?, updated_at = datetime('now')
+				 WHERE id = ? AND agent_id = ?`).run(nextSource, nextTarget, row.id, agentId).changes;
+  }
+  return changes;
+}
 function applyMergeEntities(db, agentId, payload) {
   const sources = sourceMergeSpecs(payload);
+  const target2 = resolveMergeEntityRef(db, agentId, "payload.target_entity", readString2(payload, "target_entity") ?? readString2(payload, "target") ?? null, readString2(payload, "target_entity_id") ?? readString2(payload, "target_id") ?? null);
+  const alreadyMerged = sources.filter((source) => {
+    if (source.id !== null) {
+      return getEntityRefById(db, agentId, source.id) === null && wasEntityMergeApplied(db, agentId, source.id, target2.id, source.selector);
+    }
+    if (source.selector === null)
+      return false;
+    try {
+      resolveEntityRefStrict(db, agentId, source.selector);
+      return false;
+    } catch (err) {
+      if (!(err instanceof OntologyProposalError) || err.status !== 404)
+        throw err;
+      return wasEntityMergeApplied(db, agentId, null, target2.id, source.selector);
+    }
+  });
+  const pendingSources = sources.filter((source) => !alreadyMerged.includes(source));
+  if (pendingSources.length === 0 && alreadyMerged.length > 0) {
+    return {
+      targetEntityId: target2.id,
+      targetEntityName: target2.name,
+      mergedEntities: [],
+      alreadyMergedEntities: alreadyMerged.map((source) => source.selector ?? source.id),
+      warnings: [],
+      relationshipsChanged: 0
+    };
+  }
   const plan = buildEntityMergePlan(db, {
     agentId,
-    targetEntity: readString2(payload, "target_entity") ?? readString2(payload, "target") ?? undefined,
-    targetEntityId: readString2(payload, "target_entity_id") ?? readString2(payload, "target_id") ?? undefined,
-    sourceEntities: sources.map((spec) => spec.selector).filter((selector) => selector !== null),
-    sourceEntityIds: sources.map((spec) => spec.id).filter((id) => id !== null),
+    targetEntityId: target2.id,
+    sourceEntities: pendingSources.map((spec) => spec.selector).filter((selector) => selector !== null),
+    sourceEntityIds: pendingSources.map((spec) => spec.id).filter((id) => id !== null),
     force: truthy(payload.force)
   });
   if (plan.blocked)
@@ -45746,6 +45795,7 @@ function applyMergeEntities(db, agentId, payload) {
     targetEntityId: plan.target.id,
     targetEntityName: plan.target.name,
     mergedEntities: merged,
+    alreadyMergedEntities: alreadyMerged.map((source) => source.selector ?? source.id),
     warnings: plan.warnings,
     relationshipsChanged: relationshipChanges
   };
@@ -46068,6 +46118,36 @@ function selectorMatchesEntityRef(selector, entity) {
   const key = canonical(selector);
   return selector === entity.id || key === canonical(entity.name) || key === canonical(entity.canonicalName);
 }
+function wasEntityMergeApplied(db, agentId, sourceId, targetId, sourceSelector) {
+  const needle = sourceId ?? sourceSelector;
+  if (needle === null)
+    return false;
+  const rows = db.prepare(`SELECT result FROM ontology_proposals
+			 WHERE agent_id = ? AND operation = 'merge_entities' AND status = 'applied'
+			   AND result LIKE ?`).all(agentId, `%${needle}%`);
+  for (const row of rows) {
+    if (row.result === null)
+      continue;
+    try {
+      const result = parseJsonRecord(row.result);
+      if (readString2(result, "targetEntityId") !== targetId)
+        continue;
+      const merged = result.mergedEntities;
+      if (!Array.isArray(merged))
+        continue;
+      if (merged.some((item) => {
+        if (!isRecord3(item))
+          return false;
+        if (sourceId !== null)
+          return readString2(item, "entityId") === sourceId;
+        const name = readString2(item, "name");
+        return name !== null && canonical(name) === canonical(sourceSelector ?? "");
+      }))
+        return true;
+    } catch {}
+  }
+  return false;
+}
 function sourceMergeSpecs(payload) {
   const selectors = unique2([
     ...readStringArray(payload, "source_entities"),

package/native-manifest.json

@@ -1,43 +1,43 @@
 {
   "schemaVersion": 1,
-  "version": "0.191.2",
+  "version": "0.192.0",
   "assets": [
     {
       "name": "signet-darwin-arm64",
       "platform": "darwin-arm64",
-      "sha256": "6a571803dc20220132cc7d615a9ea84698f3f0936e5ea6b09cf31fba6fdf8f70",
+      "sha256": "3fb93a1734ce028b0412b2b320c62f1cf329c5f7d8bacde59d6913aea13a2015",
       "size": 117523744
     },
     {
       "name": "signet-darwin-x64",
       "platform": "darwin-x64",
-      "sha256": "3fddbdb4c6792ece033e684409618a984e7c177ceaac2f53f68b3ca6cef1b269",
+      "sha256": "45b9996dccf5f5b49f7d40a3bedca6936c4d415d37efc3768657d8cde5ae53f0",
       "size": 122145344
     },
     {
       "name": "signet-linux-arm64",
       "platform": "linux-arm64",
-      "sha256": "cbc62e5485424bfb94d11017925d4100f5f32bdb7547a40ec606d5f8a1a10d92",
-      "size": 154757037
+      "sha256": "340e2b531a311b8d103a143e454fd2d5c9e9bc3a44083d42dabec843351f74b4",
+      "size": 154761540
     },
     {
       "name": "signet-linux-x64",
       "platform": "linux-x64",
-      "sha256": "a5bd982ff634c6df11ac31f5fdcc94251fe2a89291df5ae0de47a767a0482cb3",
-      "size": 155316022
+      "sha256": "c25577a5dbbd92772459254d0404533dea9217851043d88c2204861a860ed8a7",
+      "size": 155320525
     },
     {
       "name": "signet-win32-x64.exe",
       "platform": "win32-x64",
-      "sha256": "3f382e81f8d947f42664caa084f9e2377f8cd526e709275d71aba9c6847d6f29",
-      "size": 171448320
+      "sha256": "4d2e3ed73f539efc30eef4f16157cdc4110fed3eb801787011670517092f3898",
+      "size": 171452928
     }
   ],
   "components": {
     "connectors": {
-      "url": "signet-connectors-0.191.2.tar.gz",
-      "sha256": "7c1f9d186b7f2c2ab544719e826004871a0e6e06f7076b042076a693261754e4",
-      "size": 16889
+      "url": "signet-connectors-0.192.0.tar.gz",
+      "sha256": "b7dbfccba3642636a83b6b5a1eacd041556649a82b836efd7de13aaa44e47284",
+      "size": 16890
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "signetai",
-  "version": "0.191.2",
+  "version": "0.192.0",
   "description": "Signet native CLI installer wrapper",
   "type": "module",
   "bin": {
@@ -65,10 +65,10 @@
     "access": "public"
   },
   "optionalDependencies": {
-    "signetai-darwin-arm64": "https://github.com/Signet-AI/signetai/releases/download/v0.191.2/signetai-darwin-arm64-0.191.2.tgz",
-    "signetai-darwin-x64": "https://github.com/Signet-AI/signetai/releases/download/v0.191.2/signetai-darwin-x64-0.191.2.tgz",
-    "signetai-linux-arm64": "https://github.com/Signet-AI/signetai/releases/download/v0.191.2/signetai-linux-arm64-0.191.2.tgz",
-    "signetai-linux-x64": "https://github.com/Signet-AI/signetai/releases/download/v0.191.2/signetai-linux-x64-0.191.2.tgz",
-    "signetai-win32-x64": "https://github.com/Signet-AI/signetai/releases/download/v0.191.2/signetai-win32-x64-0.191.2.tgz"
+    "signetai-darwin-arm64": "https://github.com/Signet-AI/signetai/releases/download/v0.192.0/signetai-darwin-arm64-0.192.0.tgz",
+    "signetai-darwin-x64": "https://github.com/Signet-AI/signetai/releases/download/v0.192.0/signetai-darwin-x64-0.192.0.tgz",
+    "signetai-linux-arm64": "https://github.com/Signet-AI/signetai/releases/download/v0.192.0/signetai-linux-arm64-0.192.0.tgz",
+    "signetai-linux-x64": "https://github.com/Signet-AI/signetai/releases/download/v0.192.0/signetai-linux-x64-0.192.0.tgz",
+    "signetai-win32-x64": "https://github.com/Signet-AI/signetai/releases/download/v0.192.0/signetai-win32-x64-0.192.0.tgz"
   }
 }