archgraph-argo 0.15.3 → 0.16.1

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

@@ -740,24 +740,66 @@ function syncGraphToQea(graph, qeaPath, opts) {
     stages.members = nowMs();
 
     // --- deletion reconcile (opt-in) ---------------------------------------
+    // Elements are anchored by t_object.Alias; relationships have NO Alias column — their
+    // canonical id lives in t_connectortag(schema_id). Using row.Alias for relationships made
+    // the candidate check always false, so deleted relationships were never projected out.
     const keepAliases = new Set();
     for (const e of graph.elements || []) { if (e && e.id !== undefined) { keepAliases.add(String(e.id)); } }
     for (const rel of graph.relationships || []) { if (rel && rel.id !== undefined) { keepAliases.add(String(rel.id)); } }
+    // connector id -> canonical relationship id (schema_id tag)
+    const relSchemaById = new Map();
+    try {
+      const relTagRows = db.prepare("SELECT ElementID, VALUE FROM t_connectortag WHERE Property='schema_id'").all();
+      for (const t of relTagRows) { relSchemaById.set(Number(t.ElementID), String(t.VALUE)); }
+    } catch { /* table may be absent on a hand-drawn model */ }
     const candidates = [];
     for (const row of existingElems) {
       if (row.Alias && !keepAliases.has(String(row.Alias))) { candidates.push({ type: 'element', id: Number(row.Object_ID), alias: row.Alias }); }
     }
     for (const row of existingRels) {
-      if (row.Alias && !keepAliases.has(String(row.Alias))) { candidates.push({ type: 'relationship', id: Number(row.Connector_ID), alias: row.Alias }); }
+      const relId = relSchemaById.get(Number(row.Connector_ID));
+      if (relId !== undefined && !keepAliases.has(relId)) { candidates.push({ type: 'relationship', id: Number(row.Connector_ID), alias: relId }); }
+    }
+    // views: a projected diagram is owned by the projector. Identify its canonical view id via
+    // the schema_view_id StyleEx token, or (when EA rewrote StyleEx and dropped the token) by
+    // matching the deterministic diagram ea_guid `diag:<viewId>` against the view-id catalog
+    // that kg_sync_meta retains. A view id no longer in canonical -> delete the diagram.
+    const canonicalViewIds = new Set();
+    for (const v of graph.views || []) { if (v && v.view_id !== undefined && v.view_id !== null) { canonicalViewIds.add(String(v.view_id)); } }
+    const guidToView = new Map();
+    try {
+      const viewMetaRows = db.prepare("SELECT key FROM kg_sync_meta WHERE kind='view'").all();
+      for (const r of viewMetaRows) { guidToView.set(deterministicGuid('diag:' + String(r.key)), String(r.key)); }
+    } catch { /* meta table may be absent */ }
+    for (const d of existingDiags) {
+      let vid = parseStyleToken(d.StyleEx, 'schema_view_id');
+      if (!vid && d.ea_guid) { vid = guidToView.get(String(d.ea_guid)) || ''; }
+      if (vid && !canonicalViewIds.has(String(vid))) { candidates.push({ type: 'diagram', id: Number(d.Diagram_ID), alias: String(vid) }); }
     }
     stats.deleteCandidates = candidates.length;
     if (candidates.length > 0 && o.allowDelete && !o.dryRun) {
       for (const c of candidates) {
         if (c.type === 'relationship') {
+          // SQLite has no FK cascade: clear the connector's tag + diagram-link rows too.
+          db.prepare('DELETE FROM t_connectortag WHERE ElementID=?').run(c.id);
+          db.prepare('DELETE FROM t_diagramlinks WHERE ConnectorID=?').run(c.id);
           db.prepare('DELETE FROM t_connector WHERE Connector_ID=?').run(c.id);
+        } else if (c.type === 'diagram') {
+          db.prepare('DELETE FROM t_diagramobjects WHERE Diagram_ID=?').run(c.id);
+          db.prepare('DELETE FROM t_diagramlinks WHERE DiagramID=?').run(c.id);
+          db.prepare('DELETE FROM t_diagram WHERE Diagram_ID=?').run(c.id);
         } else {
+          // remove connectors attached to this element (start or end) and their children
+          const attached = db.prepare('SELECT Connector_ID FROM t_connector WHERE Start_Object_ID=? OR End_Object_ID=?').all(c.id, c.id);
+          for (const a of attached) {
+            db.prepare('DELETE FROM t_connectortag WHERE ElementID=?').run(Number(a.Connector_ID));
+            db.prepare('DELETE FROM t_diagramlinks WHERE ConnectorID=?').run(Number(a.Connector_ID));
+            db.prepare('DELETE FROM t_connector WHERE Connector_ID=?').run(Number(a.Connector_ID));
+          }
           db.prepare('DELETE FROM t_diagramobjects WHERE Object_ID=?').run(c.id);
           db.prepare('DELETE FROM t_objectproperties WHERE Object_ID=?').run(c.id);
+          db.prepare('DELETE FROM t_attribute WHERE Object_ID=?').run(c.id);
+          db.prepare('DELETE FROM t_objecttests WHERE Object_ID=?').run(c.id);
           db.prepare('DELETE FROM t_object WHERE Object_ID=?').run(c.id);
         }
         stats.deleted++;

package/argo/scripts/systemarchitecture-mcp-server.js

@@ -1948,7 +1948,11 @@ function runQeaProjection(target) {
       return;
     }
     const snapshotDir = path.join(target.workspaceRoot, '.argo', 'temp', 'qea-backups');
-    const args = [script, '--mode', 'sync', '--graph', target.graphPath, '--qea', target.qeaPath, '--snapshot-dir', snapshotDir];
+    // -y enables the projection-owned delete reconcile: objects that carry a schema anchor
+    // (t_object.Alias / t_connectortag schema_id) but are no longer in canonical are removed
+    // from the .qea, so a graph-side deletion actually disappears from EA on the next
+    // projection. Human-drawn (un-anchored) content is never a delete candidate.
+    const args = [script, '--mode', 'sync', '--graph', target.graphPath, '--qea', target.qeaPath, '--snapshot-dir', snapshotDir, '-y'];
     const started = Date.now();
     let stderr = '';
     let child;

package/argo/skills/ea-human-reconcile/SKILL.md

@@ -0,0 +1,39 @@
+---
+name: ea-human-reconcile
+description: "把人类从 EA 提取的 draft 提议（results/human-draft.md，内嵌 JSON 提议集）交给 Agent 后，Agent 结合当前全局（canonical 意图图 design/KG/SystemArchitecture.json + Neo4j 语义检索）逐条/整体分析并给出建议，最终由人类裁决是否写入。它是『人类 EA 草稿 → 语义 diff 提取 → 人类裁决写回』的最后一步：Agent 只做分析+建议，绝不自作主张 apply。Use when the user hands over an EA human-draft proposal set (human-draft.md) and wants the agent to analyze it against the whole architecture and propose, leaving the final decision to the human. Keywords: EA human draft, reconcile, EA 人类草稿裁决, draft review, 语义diff建议, ARGO preview/apply, 人类裁决."
+argument-hint: human-draft
+disable-model-invocation: true
+---
+
+# EA HUMAN DRAFT RECONCILE（EA 人类草稿 → Agent 分析建议 → 人类裁决）
+
+Agent 的职责：结合全局分析 draft 中的每条提议、给出建议与理由、识别风险，把结论呈现给人类，由人类裁决。Agent 不自动执行写入。
+
+## 前置
+
+- [ ] 存在 `results/human-draft.md`（人类从 EA 提取的草稿提议集）。
+- [ ] 工作区有 `design/KG/SystemArchitecture.json`（canonical 意图图）——分析全局的依据。
+- [ ] ARGO MCP 可用。关键查询手段：
+  - 语义/上下文：`getSystemArchitecture`（带 query.purpose + query.intent）、`getIntentElementContext`（看单个元素/关系/视图的依赖与受影响对象）。
+  - 结构/类型：`queryNeo4jGraph`（只读 Cypher，如 `MATCH (e:Element {graphKey: $graphKey, type:'Business Actor'}) ...`；先 `{schema:true}` 查投影 schema）。
+  - 校验：`validateSystemArchitecture`；写图：`previewSystemArchitectureMutation` / `applySystemArchitectureMutation`。
+
+## 原则
+
+- **人类裁决**：Agent 只分析、给建议、识别风险；**MUST NOT 未经人类裁决就 `applySystemArchitectureMutation`（或任何写图）**。人类拍板（采纳/拒绝/修改）后才写。
+- **全局优先**：不只对着 draft 字段，要用查询手段读 canonical 中相关对象及其依赖（被谁引用、级联影响谁、子视图是否悬空、命名/类型是否与全局一致、是否与既有元素重复冲突），再下判断。
+- **删除/破坏性提议单独把关**：对 `removeElement` / `removeRelationship` / `removeView`，必须指出 canonical 里谁引用它、删除会级联影响谁，并给出「保留 / 改挂 / 确认删除」的建议，交由人类确认。
+- **新增/更新提议**：核对 type / name / description / attributes 是否与全局命名与类型一致、是否与既有元素/关系重复冲突、应挂在哪个 parent / 视图下。
+- **视图提议**：核对成员是否落在正确层级（parent_element_id 是否合理）、删视图会否使相关 subdiagram_views 悬空。
+- **只读取、不泄露**：MUST NOT 读取/复述 `.env` 里的 secret 或推断敏感配置值。
+
+## 目标
+
+读 draft → 结合全局逐条分析 → 给出「逐条建议 + 整体结论 + 待人类裁决项」。具体产出：
+
+1. **操作统计**：add/update/remove × element/relationship/view。
+2. **逐条建议**：每条含 `提议`（op + id/名称）、`分析`（全局依赖/冲突/层级）、`建议`（采纳/拒绝/修改后采纳，附理由）、`风险`（若有）。
+3. **整体结论**：这批草稿的整体风险等级、必人工确认的高风险项。
+4. **待裁决**：明确列出需人类拍板的条目，并询问哪些采纳、哪些修改、哪些拒绝。
+
+**等待人类答复之后**才进入写回；若人类同意，才经 `previewSystemArchitectureMutation` →（确认后）`applySystemArchitectureMutation`；拒绝/搁置的不写。

package/install-argo.ps1

@@ -761,6 +761,9 @@ $skillSrc = Join-Path (Join-Path $argoDir 'skills') 'argo-init'
 $skillDest = Join-Path $SkillsRoot 'argo-init'
 Write-Host "[4/22] argo\skills\argo-init -> $skillDest"
 Copy-Tree -Source $skillSrc -Destination $skillDest
+$reconcileSkillSrc = Join-Path (Join-Path $argoDir 'skills') 'ea-human-reconcile'
+Write-Host '  argo\skills\ea-human-reconcile -> $SkillsRoot\ea-human-reconcile (EA human draft reconcile skill)'
+Copy-Tree -Source $reconcileSkillSrc -Destination (Join-Path $SkillsRoot 'ea-human-reconcile')
 
 $ruleSrc = Join-Path (Join-Path $argoDir 'rules') 'archgraph.instructions.md'
 $ruleDest = Join-Path $PromptsRoot 'archgraph.instructions.md'
@@ -776,6 +779,8 @@ Copy-Item -Force -Path $depsSrc -Destination $depsDest
 $cursorSkillDest = Join-Path $CursorSkillsRoot 'argo-init'
 Write-Host "[7/22] argo\skills\argo-init -> $cursorSkillDest (Cursor)"
 Copy-Tree -Source $skillSrc -Destination $cursorSkillDest
+Write-Host '  argo\skills\ea-human-reconcile -> $CursorSkillsRoot\ea-human-reconcile (Cursor)'
+Copy-Tree -Source $reconcileSkillSrc -Destination (Join-Path $CursorSkillsRoot 'ea-human-reconcile')
 
 $mcpBridgeSrc = Join-Path $argoDir 'mcp-bridges'
 $mcpBridgeDest = Join-Path $CursorMcpBridgesRoot ''
@@ -785,6 +790,8 @@ Copy-Tree -Source $mcpBridgeSrc -Destination $mcpBridgeDest
 $openCodeSkillDest = Join-Path $OpenCodeSkillsRoot 'argo-init'
 Write-Host "[8/22] argo\skills\argo-init -> $openCodeSkillDest (OpenCode)"
 Copy-Tree -Source $skillSrc -Destination $openCodeSkillDest
+Write-Host '  argo\skills\ea-human-reconcile -> $OpenCodeSkillsRoot\ea-human-reconcile (OpenCode)'
+Copy-Tree -Source $reconcileSkillSrc -Destination (Join-Path $OpenCodeSkillsRoot 'ea-human-reconcile')
 
 Write-Host "[9/22] argo\rules\archgraph.instructions.md -> $OpenCodeAgentsPath (OpenCode global AGENTS.md)"
 Add-AgentsRule -AgentsPath $OpenCodeAgentsPath -RulePath $ruleSrc
@@ -822,6 +829,8 @@ if ($SkipDsh) {
 
     Write-Host "[16/22] argo\skills\argo-init -> $dshSkillDest (DeepSeek Harness skill)"
     Copy-Tree -Source (Join-Path $argoDir 'skills\argo-init') -Destination $dshSkillDest
+    Write-Host '  argo\skills\ea-human-reconcile -> $DshHome\skills\ea-human-reconcile (DeepSeek Harness skill)'
+    Copy-Tree -Source (Join-Path $argoDir 'skills\ea-human-reconcile') -Destination (Join-Path (Join-Path $DshHome 'skills') 'ea-human-reconcile')
 
     Write-Host "[17/22] argo\rules\<WakeupGuideline> -> $DshHome\plugins\dsh-argo-wakeup\index.js (DeepSeek Harness wakeup plugin)"
     $wakeupDshPath = New-DshWakeupPlugin -DshHome $DshHome -RuleText $ruleSrcContent
@@ -883,6 +892,8 @@ if ($SkipOpenClaw) {
 
     Write-Host "[21/22] argo\skills\argo-init -> $openClawSkillDest (OpenClaw managed skill, all agents)"
     Copy-Tree -Source (Join-Path $argoDir 'skills\argo-init') -Destination $openClawSkillDest
+    Write-Host '  argo\skills\ea-human-reconcile -> $OpenClawHome\skills\ea-human-reconcile (OpenClaw managed skill, all agents)'
+    Copy-Tree -Source (Join-Path $argoDir 'skills\ea-human-reconcile') -Destination (Join-Path (Join-Path $OpenClawHome 'skills') 'ea-human-reconcile')
 
     Write-Host '  OpenClaw injects AGENTS.md into Project Context on every session, so the wakeup'
     Write-Host '  gate (UNCONDITIONAL STARTUP GATE) is active on the next OpenClaw session; restart'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "archgraph-argo",
-  "version": "0.15.3",
+  "version": "0.16.1",
   "description": "Deploy the ArchGraph ARGO toolchain, skills, and rules (schema, scripts, argo-init skill, global rule) with one command.",
   "license": "MIT",
   "bin": {
@@ -14,6 +14,7 @@
     "argo/plugins",
     "argo/mcp-bridges",
     "argo/skills/argo-init",
+    "argo/skills/ea-human-reconcile",
     "argo/rules",
     "argo/package.json",
     "vendor",