archgraph-argo 0.22.0 → 0.22.2

package/argo/rules/archgraph.instructions.md

@@ -76,7 +76,7 @@ Never add what the graph already has. Reuse is the default; there is no reject m
 <LosslessWrite>
 Never lose stored content silently. A write must never reduce existing content unless it is lossless (merge/delta) or you explicitly acknowledge the reduction; omission never means deletion.
 1. Structured fields merge: element testcases merge by `name`; view membership accepts a delta `{ add, remove }`; relationship attributes merge by `name`. Omitting an existing entry preserves it. Delete only with an explicit `op: "remove"` or an explicit delta remove.
-2. Scalar text is guarded: `description`, `statement`, `document`, `name`, `view_name` are full-value fields. A *reworded* line is not a loss; dropping prior lines, or losing structured tokens (ids, numbers, commit hashes, paths), is blocked unless you pass `acknowledgeLoss: true` (and `lossJustification` when the loss is major). Read the current value first and edit as a minimal diff.
+2. Scalar text is guarded: `description`, `statement`, `document`, `name`, `view_name` are full-value fields. A reworded line is not a loss; dropping prior lines, or genuinely losing structured tokens (commit hashes, ids, versions, dates, paths — separator/space changes do NOT count), is blocked unless you pass `acknowledgeLoss: true` (and `lossJustification` when the loss is major). Read the current value first and edit as a minimal diff.
 3. Destructive removals (`removeElement` / `removeRelationship` / `removeView`) require `acknowledgeLoss: true` — per mutation, or once for the whole set via the top-level `acknowledgeLoss` on `applySystemArchitectureMutation`; the full removed object is appended to the NDJSON tombstone ledger `design/KG/SystemArchitecture.tombstones.ndjson` (rotated by size) for recovery.
 4. Always read the `lossless` loss report in the response (preview and apply). It lists removed text lines / testcases / members / objects. If it is blocked, fix the mutation—do not retry blindly and do not disable the gate.
 </LosslessWrite>

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

@@ -893,11 +893,42 @@ function fullProjection(graph, qeaPath, opts) {
 // ---------------------------------------------------------------------------
 // Export
 // ---------------------------------------------------------------------------
+// EA stores connector layout in two distinct t_diagramlinks columns, and they mean
+// different things:
+//   - Path     = the connector ROUTE: user-adjusted bend points as "x:y;x:y;" in diagram
+//                coordinates (empty when EA auto-routes a straight/orthogonal line).
+//   - Geometry = the non-route OVERRIDE tokens (SX/SY/EX/EY dock offsets, EDGE route
+//                style and label positions). It never contains bend points.
+// Reading Geometry as if it were the line was the original defect: callers got the
+// override string and could not rebuild the connector. We expose the route under `path`
+// (+ parsed `points`), the route style as `edge`, and keep the override as `geometry`.
+function parseRoutePoints(raw) {
+  const s = String(raw === null || raw === undefined ? '' : raw).trim();
+  if (s === '') { return []; }
+  const points = [];
+  for (const seg of s.split(';')) {
+    const t = seg.trim();
+    if (t === '') { continue; }
+    const parts = t.split(':');
+    if (parts.length < 2) { continue; }
+    const x = Number(parts[0]);
+    const y = Number(parts[1]);
+    if (!Number.isFinite(x) || !Number.isFinite(y)) { continue; }
+    points.push({ x, y });
+  }
+  return points;
+}
+function parseEdgeToken(geometry) {
+  const m = /(?:^|;)EDGE=(-?\d+)(?:;|$)/.exec(String(geometry === null || geometry === undefined ? '' : geometry));
+  return m ? Number(m[1]) : null;
+}
+
 // Read the EA diagram GEOMETRY for one KG view from a .qea model (read-only).
 // The view maps to the diagram anchored by the deterministic ea_guid (diag:<viewId>)
 // or the schema_view_id StyleEx token written by the sync. Returns:
 //   - element boxes  = t_diagramobjects rects joined to t_object.Alias (schema id)
-//   - connector lines = t_diagramlinks rows joined to the connector's schema_id tag
+//   - connector lines = t_diagramlinks rows joined to the connector's schema_id tag,
+//                       with the ROUTE (t_diagramlinks.Path) parsed into `points`
 // Returns null when the view has no matching EA diagram. Never writes EA geometry.
 function readViewDiagramGeometry(qeaPath, viewId) {
   const v = String(viewId === null || viewId === undefined ? '' : viewId).trim();
@@ -920,13 +951,14 @@ function readViewDiagramGeometry(qeaPath, viewId) {
       left: Number(r.left), top: Number(r.top), right: Number(r.right), bottom: Number(r.bottom),
     }));
     const relationships = db.prepare(
-      'SELECT t.VALUE AS id, dl.Geometry AS path ' +
+      'SELECT t.VALUE AS id, dl.Path AS path, dl.Geometry AS geometry ' +
       'FROM t_diagramlinks dl JOIN t_connectortag t ON t.ElementID = dl.ConnectorID AND t.Property = ? ' +
       'WHERE dl.DiagramID = ? ORDER BY dl.ConnectorID'
-    ).all('schema_id', diagramId).map((r) => ({
-      id: String(r.id),
-      path: String(r.path === null || r.path === undefined ? '' : r.path),
-    }));
+    ).all('schema_id', diagramId).map((r) => {
+      const path = String(r.path === null || r.path === undefined ? '' : r.path);
+      const geometry = String(r.geometry === null || r.geometry === undefined ? '' : r.geometry);
+      return { id: String(r.id), path, points: parseRoutePoints(path), edge: parseEdgeToken(geometry), geometry };
+    });
     return { diagramId, elements, relationships };
   } finally {
     try { db.close(); } catch { /* ignore */ }

package/argo/scripts/lossless-write-gate.js

@@ -66,12 +66,38 @@ function normalizeSegments(text) {
 }
 
 function tokenize(segment) {
-  const matches = String(segment === undefined || segment === null ? '' : segment).match(TOKEN_RE);
+  const normalized = String(segment === undefined || segment === null ? '' : segment).normalize('NFKC');
+  const matches = normalized.match(TOKEN_RE);
   return matches ? matches.map(token => token.toLowerCase()) : [];
 }
 
+// A "structured identity" token whose silent loss matters: commit hashes, ids,
+// versions, dates, path-like strings. Bare separators ("/") and short plain
+// numbers are NOT structured — treating them so made benign edits false-block.
 function isStructuredToken(token) {
-  return /[0-9]/.test(token) || /[/\\]/.test(token) || /^[0-9a-f]{7,40}$/i.test(token);
+  if (!token) return false;
+  if (/^[0-9a-f]{7,40}$/i.test(token)) return true; // commit hash / long hex
+  if (/[/\\]/.test(token) && /[a-z]/i.test(token)) return true; // path-like (has a letter)
+  if (/[a-z]/i.test(token) && /\d/.test(token) && /[-_]/.test(token)) return true; // id-like AT-rules-04
+  if (/^[a-z]*\d+(?:\.\d+)+$/i.test(token)) return true; // version-like stix2.1 / v2.1 / 1.2.3
+  if (/^\d{4}-\d{2}(?:-\d{2})?$/.test(token)) return true; // date-like 2026-09-15
+  if (/^\d{5,}$/.test(token)) return true; // long numeric id
+  return false;
+}
+
+// NFKC + strip all whitespace + lowercase: tolerant haystack for the "is this
+// structured token still present anywhere in the new text?" substring check.
+// This drops false positives from separator joins (769465c:bc7f418) and spacing
+// (STIX2.1 -> STIX 2.1) while still catching a genuinely removed token.
+function normalizeForTokenSearch(value) {
+  return String(value === undefined || value === null ? '' : value).normalize('NFKC').replace(/\s+/g, '').toLowerCase();
+}
+
+// Separator-insensitive form: also drop the punctuation that joins structured
+// tokens, so "A/B" -> "A、B" or "v2.1" -> "v2 1" is still recognised as the same
+// token (same content, punctuation changed) and not mistaken for a loss.
+function comparableTokenForm(value) {
+  return normalizeForTokenSearch(value).replace(/[/\\:.\-_]/g, '');
 }
 
 // Sørensen–Dice coefficient over token sets (deterministic, no network).
@@ -97,7 +123,7 @@ function detectTextLoss(oldText, newText) {
   }
   const newSegments = normalizeSegments(newText);
   const newNormalized = normalizeForCompare(newText);
-  const newTokenSet = new Set(newSegments.flatMap(tokenize));
+  const newHaystack = comparableTokenForm(newText);
   const newSegmentTokens = newSegments.map(tokenize);
   const removedSegments = [];
   const modifiedSegments = [];
@@ -105,7 +131,7 @@ function detectTextLoss(oldText, newText) {
   for (const segment of oldSegments) {
     const segmentTokens = tokenize(segment);
     for (const token of segmentTokens) {
-      if (isStructuredToken(token) && !newTokenSet.has(token)) structuredTokensRemoved.push(token);
+      if (isStructuredToken(token) && !newHaystack.includes(comparableTokenForm(token))) structuredTokensRemoved.push(token);
     }
     if (newNormalized.includes(segment)) continue; // kept verbatim
     const best = newSegmentTokens.reduce((max, tokens) => Math.max(max, diceCoefficient(segmentTokens, tokens)), 0);

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

@@ -226,7 +226,7 @@ const TOOLS = [
   },
   {
     name: 'getArchitectureViewContext',
-    description: 'read-only query that resolves one view by view_id into its complete membership: the view object, every member element (from included_elements), every member relationship (from included_relationships), the parent element, and optionally child sub-views declared by member elements. Resolves ids into full canonical objects instead of returning raw id lists. Optional includeEaGeometry (default false) additionally returns the EA diagram geometry of the resolved view.',
+    description: 'read-only query that resolves one view by view_id into its complete membership: the view object, every member element (from included_elements), every member relationship (from included_relationships), the parent element, and optionally child sub-views declared by member elements. Resolves ids into full canonical objects instead of returning raw id lists. Optional includeEaGeometry (default false) additionally returns the EA diagram geometry of the resolved view: element boxes plus each connector ROUTE (t_diagramlinks.Path as `path` + parsed `points`, with the non-route Geometry override kept separately under `geometry`).',
     inputSchema: viewContextInputSchema(),
   },
   {
@@ -475,7 +475,7 @@ function viewContextInputSchema() {
       view_id: { type: 'string', description: 'The id of the view to resolve.' },
       includeParentElement: { type: 'boolean', description: 'Default: true. Resolve the parent element referenced by the view.' },
       includeChildViews: { type: 'boolean', description: 'Default: false. Include child views declared by member elements through subdiagram_views.' },
-      includeEaGeometry: { type: 'boolean', description: 'Default: false (opt-in). When true, additionally resolve the diagram GEOMETRY (element boxes + connector line paths) for this view from the workspace EA model (.qea) and return it under a `geometry` field aligned by schema id with the resolved members. By default the EA model is never touched and no `geometry` field is returned; a missing EA model/diagram yields geometry.present=false, never an error.' },
+      includeEaGeometry: { type: 'boolean', description: 'Default: false (opt-in). When true, additionally resolve the diagram GEOMETRY (element boxes + connector line routes) for this view from the workspace EA model (.qea) and return it under a `geometry` field aligned by schema id with the resolved members. Each geometry relationship carries: `path` (the EA route from t_diagramlinks.Path, "" when EA auto-routes), `points` (the parsed [{x,y}] waypoints), `edge` (the EDGE route-style token or null) and `geometry` (the raw SX/SY/EX/EY override string, which contains NO waypoints). By default the EA model is never touched and no `geometry` field is returned; a missing EA model/diagram yields geometry.present=false, never an error.' },
     },
     additionalProperties: false,
   };
@@ -726,9 +726,11 @@ function buildIntentElementContext(context, args = {}) {
 // model unless the caller explicitly sets includeEaGeometry=true. The workspace's
 // EA model (.qea, the SQLite carrier this toolchain can read) may hold human-laid-out
 // diagram geometry for a view — element boxes (t_diagramobjects rects) and connector
-// line paths (t_diagramlinks). When present it is returned under `geometry`, aligned
+// routes (t_diagramlinks.Path). When present it is returned under `geometry`, aligned
 // by schema id with the resolved members, so an image-capable LLM can redraw the view
-// faithfully. Absent model/diagram → present:false (never an error).
+// faithfully. Each connector also carries the non-route t_diagramlinks.Geometry override
+// string under a distinct `geometry` key, so the route is never confused with the
+// SX/SY/EX/EY/EDGE tokens. Absent model/diagram → present:false (never an error).
 const EA_GEOMETRY_MODEL_EXTENSIONS = new Set(['.qea']);
 function findEaGeometryModelPath(workspaceRoot) {
   try {

package/package.json

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