archgraph-argo 0.14.0 → 0.15.1

package/argo/scripts/ea-qea-sync-lib.js

@@ -11,8 +11,10 @@
 //     transactions with a bounded busy retry. Keep EA's own SQLite handle open is fine —
 //     SQLite only locks during active transactions, an idle open connection does not block.
 //   - Rows are matched by Alias (schema id) / deterministic ea_guid, update-in-place only;
-//     existing t_diagramobjects/t_diagramlinks geometry is NEVER updated or deleted, only
-//     missing members are INSERTed.
+//     existing t_diagramobjects/t_diagramlinks geometry of STILL-VISIBLE members is never
+//     rewritten; the membership reconcile only INSERTs missing members and PRUNES stale
+//     schema-anchored members whose element/relationship is no longer in the view
+//     (pruneMembership, default true). Human-drawn (un-anchored) shapes are never pruned.
 
 const { DatabaseSync } = require('node:sqlite');
 const DEBUG = !!process.env.EA_QEA_DEBUG;
@@ -20,6 +22,10 @@ const crypto = require('node:crypto');
 
 const SYNC_PACKAGE_NAME = 'ArchGraph Sync';
 const DIAGRAM_TYPE = 'Logical';
+// Attributes/Operations "Show Compartments" (Elements tab) default unchecked: EA stores
+// these in t_diagram.PDATA as HideAtts / HideOps (hide compartment = 1). Projected
+// diagrams hide both compartments by default while preserving EA's other PDATA tokens.
+const DIAGRAM_DISPLAY_DEFAULT = 'HideAtts=1;HideOps=1;';
 const META_TABLE = 'kg_sync_meta'; // {kind,key,sha,payload} — Node export/reconcile store
 const BUSY_TIMEOUT_MS = 15000;
 const CHUNK = 200;
@@ -290,14 +296,21 @@ function setStyleToken(styleEx, key, value) {
 // ---------------------------------------------------------------------------
 // Core sync
 // ---------------------------------------------------------------------------
-// opts: { dryRun, allowDelete, snapshotDir }
+// opts: { dryRun, allowDelete, snapshotDir, pruneMembership }
+//   pruneMembership (default true): the incremental membership reconcile is
+//   authoritative for schema-anchored members — a shape/connector whose canonical
+//   element/relationship is no longer in the view's included_elements/included_relationships
+//   is pruned from that diagram. Human-drawn shapes (no schema_id anchor) are never
+//   pruned, and still-in-view members keep their geometry untouched.
 function syncGraphToQea(graph, qeaPath, opts) {
   const o = opts || {};
+  const pruneMembership = o.pruneMembership !== false;
   const stages = {};
   const stats = {
     added: { elements: 0, relationships: 0, diagrams: 0, diagramObjects: 0, diagramLinks: 0 },
     updated: { elements: 0, relationships: 0, diagrams: 0 },
     skipped: { elements: 0, relationships: 0, diagrams: 0 },
+    removed: { diagramObjects: 0, diagramLinks: 0 },
     deleteCandidates: 0, deleted: 0,
   };
   const t0 = nowMs();
@@ -450,6 +463,7 @@ function syncGraphToQea(graph, qeaPath, opts) {
     const existingRels = db.prepare('SELECT Connector_ID, ea_guid, Name, Connector_Type, Stereotype, Notes, Direction, Start_Object_ID, End_Object_ID FROM t_connector').all();
     for (const r of existingRels) { if (r.ea_guid) { relByGuid.set(String(r.ea_guid), r); } }
     const newRels = [];
+    const relAliasToId = new Map();
     for (const rel of graph.relationships || []) {
       if (!rel || rel.id === undefined || rel.id === null) { continue; }
       const alias = String(rel.id);
@@ -475,6 +489,7 @@ function syncGraphToQea(graph, qeaPath, opts) {
         End_Object_ID: Number(end),
       };
       if (existing) {
+        relAliasToId.set(alias, Number(existing.Connector_ID));
         const changed = intended.Name !== (existing.Name || '') || (intended.Connector_Type || '') !== (existing.Connector_Type || '') ||
           (intended.Stereotype || '') !== (existing.Stereotype || '') || intended.Notes !== (existing.Notes || '') ||
           intended.Direction !== (existing.Direction || '') || Number(intended.Start_Object_ID) !== Number(existing.Start_Object_ID || 0) ||
@@ -488,7 +503,6 @@ function syncGraphToQea(graph, qeaPath, opts) {
         stats.added.relationships++;
       }
     }
-    const relAliasToId = new Map();
     if (!o.dryRun) {
       if (newRels.length > 0) {
         insertMany(db, 't_connector', ['Name', 'Connector_Type', 'Stereotype', 'Notes', 'Direction', 'Start_Object_ID', 'End_Object_ID', 'ea_guid'], newRels);
@@ -528,7 +542,7 @@ function syncGraphToQea(graph, qeaPath, opts) {
     // it touches an open project and DROPS unknown tokens like schema_view_id — if we
     // only matched by the token we would re-INSERT the same deterministic ea_guid and
     // crash on t_diagram's UNIQUE(ea_guid) (projection failure: Neo4j ok, EA stale).
-    const existingDiags = db.prepare('SELECT Diagram_ID, Package_ID, Name, StyleEx, ea_guid FROM t_diagram WHERE Package_ID=?').all(syncId);
+    const existingDiags = db.prepare('SELECT Diagram_ID, Package_ID, Name, StyleEx, PDATA, ea_guid FROM t_diagram WHERE Package_ID=?').all(syncId);
     const diagByView = new Map();
     const diagByGuid = new Map();
     for (const d of existingDiags) {
@@ -557,6 +571,7 @@ function syncGraphToQea(graph, qeaPath, opts) {
         ParentID: parentObjectId,
         Notes: '', // EA .qea 不保留多段 Notes；视图内容经 kg_sync_meta 保真
         StyleEx: styleEx,
+        PDATA: DIAGRAM_DISPLAY_DEFAULT,
       };
       if (existing) {
         diagViewRows.set(viewId, existing);
@@ -567,11 +582,17 @@ function syncGraphToQea(graph, qeaPath, opts) {
           setStyleToken(existing.StyleEx, 'DLKO', '1'),
           'schema_view_id=' + viewId
         );
-        const changed = intended.Name !== (existing.Name || '') || (existing.StyleEx || '') !== anchoredStyleEx;
+        // Default Attributes/Operations compartments unchecked: force HideAtts=1 /
+        // HideOps=1 into PDATA while preserving EA's other display tokens.
+        const anchoredPdata = setStyleToken(
+          setStyleToken(existing.PDATA, 'HideAtts', '1'),
+          'HideOps', '1'
+        );
+        const changed = intended.Name !== (existing.Name || '') || (existing.StyleEx || '') !== anchoredStyleEx || (existing.PDATA || '') !== anchoredPdata;
         if (DEBUG && changed) { console.error('DEBUG diagram chg', viewId, JSON.stringify({n:[intended.Name,(existing.Name||'')], style: !!parseStyleToken(existing.StyleEx,'schema_view_id')})); }
         if (changed && !o.dryRun) {
-          db.prepare('UPDATE t_diagram SET Name=?, StyleEx=? WHERE Diagram_ID=?')
-            .run(intended.Name, anchoredStyleEx, Number(existing.Diagram_ID));
+          db.prepare('UPDATE t_diagram SET Name=?, StyleEx=?, PDATA=? WHERE Diagram_ID=?')
+            .run(intended.Name, anchoredStyleEx, anchoredPdata, Number(existing.Diagram_ID));
         }
         stats[changed ? 'updated' : 'skipped'].diagrams++;
       } else {
@@ -582,7 +603,7 @@ function syncGraphToQea(graph, qeaPath, opts) {
     const diagAliasToId = new Map();
     if (!o.dryRun) {
       if (newDiags.length > 0) {
-        insertMany(db, 't_diagram', ['Name', 'Diagram_Type', 'Package_ID', 'ParentID', 'StyleEx', 'ea_guid'], newDiags);
+        insertMany(db, 't_diagram', ['Name', 'Diagram_Type', 'Package_ID', 'ParentID', 'StyleEx', 'PDATA', 'ea_guid'], newDiags);
       }
       for (let i = 0; i < newDiags.length; i += 200) {
         const part = newDiags.slice(i, i + 200);
@@ -608,18 +629,43 @@ function syncGraphToQea(graph, qeaPath, opts) {
         if (view && view.view_id !== undefined && view.view_id !== null) { upsertMeta(db, 'view', view.view_id, view); }
       }
     }
-    // memberships: only INSERT missing; never touch existing geometry
+    // memberships: insert missing members, and prune stale schema-anchored members
+    // whose element/relationship is no longer in the view (authoritative canonical
+    // membership reconcile). Still-in-view members keep their geometry untouched;
+    // human-drawn shapes (no schema anchor) are never pruned.
+    const canonicalElemObjIds = new Set(
+      [...elemIdByAliasAll.values()].filter((v) => v >= 0).map((v) => Number(v))
+    );
+    const canonicalRelCids = new Set(
+      [...relAliasToId.values()].filter((v) => v >= 0).map((v) => Number(v))
+    );
     for (const view of graph.views || []) {
       if (!view || view.view_id === undefined || view.view_id === null) { continue; }
       const viewId = String(view.view_id);
       const diagramId = diagIdForView(viewId);
       if (diagramId === null) { continue; }
+      const incl = view.included_elements || [];
       const placedObjs = new Set();
       const objs = db.prepare('SELECT Object_ID FROM t_diagramobjects WHERE Diagram_ID=?').all(diagramId);
       for (const r of objs) { placedObjs.add(Number(r.Object_ID)); }
+
+      if (pruneMembership) {
+        const wantedObjs = new Set();
+        for (const elId of incl) {
+          const oid = elemIdByAliasAll.get(String(elId));
+          if (oid !== undefined) { wantedObjs.add(Number(oid)); }
+        }
+        const stale = [...placedObjs].filter((oid) => !wantedObjs.has(oid) && canonicalElemObjIds.has(oid));
+        if (stale.length > 0 && !o.dryRun) {
+          const del = db.prepare('DELETE FROM t_diagramobjects WHERE Diagram_ID=? AND Object_ID=?');
+          for (const oid of stale) { del.run(diagramId, oid); }
+        }
+        stats.removed.diagramObjects += stale.length;
+        for (const oid of stale) { placedObjs.delete(oid); }
+      }
+
       const nextSeq = objs.length;
       const newObjs = [];
-      const incl = view.included_elements || [];
       let seq = nextSeq;
       for (const elId of incl) {
         const oid = elemIdByAliasAll.get(String(elId));
@@ -640,11 +686,28 @@ function syncGraphToQea(graph, qeaPath, opts) {
       }
       stats.added.diagramObjects += newObjs.length;
 
+      const relIncl = view.included_relationships || [];
       const placedLinks = new Set();
       const links = db.prepare('SELECT ConnectorID FROM t_diagramlinks WHERE DiagramID=?').all(diagramId);
       for (const r of links) { placedLinks.add(Number(r.ConnectorID)); }
+
+      if (pruneMembership) {
+        const wantedRelCids = new Set();
+        for (const relId of relIncl) {
+          const cid = relAliasToId.get(String(relId));
+          if (cid !== undefined && cid >= 0) { wantedRelCids.add(Number(cid)); }
+        }
+        const staleLinks = [...placedLinks].filter((cid) => !wantedRelCids.has(cid) && canonicalRelCids.has(cid));
+        if (staleLinks.length > 0 && !o.dryRun) {
+          const del = db.prepare('DELETE FROM t_diagramlinks WHERE DiagramID=? AND ConnectorID=?');
+          for (const cid of staleLinks) { del.run(diagramId, cid); }
+        }
+        stats.removed.diagramLinks += staleLinks.length;
+        for (const cid of staleLinks) { placedLinks.delete(cid); }
+      }
+
       const newLinks = [];
-      for (const relId of view.included_relationships || []) {
+      for (const relId of relIncl) {
         const cid = relAliasToId.get(String(relId));
         if (cid === undefined || cid < 0) { continue; }
         if (placedLinks.has(Number(cid))) { continue; }

package/argo/scripts/ea-qea-sync.js

@@ -17,7 +17,7 @@ const fs = require('node:fs');
 const lib = require(path.join(__dirname, 'ea-qea-sync-lib.js'));
 
 function parseArgs(argv) {
-  const args = { mode: 'sync', graph: '', qea: '', allowDelete: false, deleteConfirmFile: '', dryRun: false, snapshotDir: '', out: '', noBackup: false, intervalMs: 2000 };
+  const args = { mode: 'sync', graph: '', qea: '', allowDelete: false, deleteConfirmFile: '', dryRun: false, snapshotDir: '', out: '', noBackup: false, intervalMs: 2000, pruneMembership: true };
   for (let i = 0; i < argv.length; i++) {
     const a = argv[i];
     const next = () => (i + 1 < argv.length ? argv[++i] : '');
@@ -30,6 +30,7 @@ function parseArgs(argv) {
     else if (a === '--snapshot-dir') { args.snapshotDir = next(); }
     else if (a === '--out') { args.out = next(); }
     else if (a === '--no-backup') { args.noBackup = true; }
+    else if (a === '--no-prune') { args.pruneMembership = false; }
     else if (a === '--interval') { args.intervalMs = Number(next()) || 2000; }
     else if (a.startsWith('-')) { /* ignore unknown */ }
     else if (args.modeSet === undefined) { /* positional not used */ }
@@ -98,7 +99,7 @@ function runOnce(args, graphPath, qeaPath) {
   }
   const res = args.mode === 'full'
     ? lib.fullProjection(graph, qeaPath, { dryRun: args.dryRun })
-    : lib.syncGraphToQea(graph, qeaPath, { dryRun: args.dryRun, allowDelete: confirmDelete(args) });
+    : lib.syncGraphToQea(graph, qeaPath, { dryRun: args.dryRun, allowDelete: confirmDelete(args), pruneMembership: args.pruneMembership });
   const mode = args.dryRun ? 'dry-run' : 'sync';
   console.log(JSON.stringify({ mode, graph: graphPath, qea: qeaPath, snapshot, result: res }, null, 2));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "archgraph-argo",
-  "version": "0.14.0",
+  "version": "0.15.1",
   "description": "Deploy the ArchGraph ARGO toolchain, skills, and rules (schema, scripts, argo-init skill, global rule) with one command.",
   "license": "MIT",
   "bin": {