airgen-cli 0.17.1 → 0.18.0

package/dist/commands/diagrams.js

@@ -18,15 +18,14 @@ function sanitizeId(id) {
 }
 function mermaidNodeShape(block) {
     const id = sanitizeId(block.id);
-    const label = block.name.replace(/"/g, "'");
-    const stereo = block.stereotype?.replace(/[«»<>]/g, "") ?? block.kind ?? "block";
-    const display = `"<<${stereo}>><br/>${label}"`;
+    const label = block.name.replace(/"/g, "'").replace(/[<>]/g, "");
+    const stereo = block.stereotype?.replace(/[«»<>]/g, "") ?? block.kind ?? "";
+    // Use Mermaid-safe label: stereotype on separate line via <br>, no << >> delimiters
+    const display = stereo ? `"${stereo}<br>${label}"` : `"${label}"`;
+    // Use only universally supported shapes: [] for most, {} for interface
     switch (block.kind) {
-        case "system": return `${id}[${display}]`;
-        case "subsystem": return `${id}[${display}]`;
-        case "actor": return `${id}([${display}])`;
-        case "external": return `${id}[${display}]`;
-        case "interface": return `${id}{{${display}}}`;
+        case "actor": return `${id}[${display}]`;
+        case "interface": return `${id}[${display}]`;
         default: return `${id}[${display}]`;
     }
 }
@@ -177,17 +176,20 @@ function renderTerminal(blocks, connectors) {
 function renderMermaid(blocks, connectors, direction) {
     resetMermaidIds();
     const lines = [`flowchart ${direction}`];
+    const blockIds = new Set(blocks.map(b => b.id));
     // Nodes
     for (const b of blocks) {
         lines.push(`  ${mermaidNodeShape(b)}`);
     }
-    // Edges
+    // Edges (skip orphan connectors whose source or target block is missing)
     for (const c of connectors) {
+        if (!blockIds.has(c.source) || !blockIds.has(c.target))
+            continue;
         const src = sanitizeId(c.source);
         const tgt = sanitizeId(c.target);
         const arrow = mermaidArrow(c.kind);
         if (c.label) {
-            const edgeLabel = c.label.replace(/"/g, "'");
+            const edgeLabel = c.label.replace(/"/g, "'").replace(/[<>|]/g, "");
             lines.push(`  ${src} ${arrow}|${edgeLabel}| ${tgt}`);
         }
         else {
@@ -289,8 +291,14 @@ export function registerDiagramCommands(program, client) {
             if (opts.clean) {
                 rendered = rendered
                     .split("\n")
-                    .filter(l => !l.trim().startsWith("classDef ") && !l.trim().startsWith("class ") && !l.trim().startsWith("style "))
-                    .map(l => l.replace(/<<[^>]+>><br\/>/g, "")) // Strip <<stereotype>><br/> from node labels
+                    .filter(l => {
+                    const t = l.trim();
+                    return !t.startsWith("classDef ") && !t.startsWith("class ") && !t.startsWith("style ") && t !== "";
+                })
+                    .map(l => l
+                    .replace(/<<[^>]+>><br\/?>/g, "") // Strip <<stereotype>><br> or <<stereotype>><br/>
+                    .replace(/[a-z]+<br>/gi, (m) => m) // Keep stereo<br>label (valid Mermaid)
+                )
                     .join("\n");
             }
             if (isJsonMode()) {
@@ -457,7 +465,7 @@ export function registerDiagramCommands(program, client) {
     });
     blocks
         .command("create")
-        .description("Create a new block")
+        .description("Create a new block (use --upsert to return existing if name matches)")
         .argument("<tenant>", "Tenant slug")
         .argument("<project-key>", "Project key")
         .requiredOption("--diagram <id>", "Diagram ID")
@@ -469,7 +477,22 @@ export function registerDiagramCommands(program, client) {
         .option("--height <n>", "Height")
         .option("--stereotype <s>", "Stereotype")
         .option("--description <desc>", "Description")
+        .option("--upsert", "Return existing block if name matches on this diagram instead of creating duplicate")
         .action(async (tenant, projectKey, opts) => {
+        // Upsert: check for existing block with same name on this diagram
+        if (opts.upsert) {
+            const existing = await client.get(`/architecture/blocks/${tenant}/${projectKey}/${opts.diagram}`);
+            const match = (existing.blocks ?? []).find(b => b.name.toLowerCase() === opts.name.toLowerCase());
+            if (match) {
+                if (isJsonMode()) {
+                    output({ block: match, deduplicated: true });
+                }
+                else {
+                    console.log(`Block already exists: ${match.id} (${match.name})`);
+                }
+                return;
+            }
+        }
         const data = await client.post("/architecture/blocks", {
             tenant,
             projectKey,
@@ -491,6 +514,85 @@ export function registerDiagramCommands(program, client) {
             output(data);
         }
     });
+    blocks
+        .command("deduplicate")
+        .description("Find and remove duplicate-named blocks on a diagram")
+        .argument("<tenant>", "Tenant slug")
+        .argument("<project>", "Project slug")
+        .option("--diagram <id>", "Specific diagram ID (otherwise checks all)")
+        .option("--dry-run", "Show duplicates without deleting (default)")
+        .option("--apply", "Actually delete duplicates")
+        .action(async (tenant, project, opts) => {
+        const diagramIds = [];
+        if (opts.diagram) {
+            diagramIds.push(opts.diagram);
+        }
+        else {
+            const data = await client.get(`/architecture/diagrams/${tenant}/${project}`);
+            diagramIds.push(...(data.diagrams ?? []).map(d => d.id));
+        }
+        let totalRemoved = 0;
+        for (const diagId of diagramIds) {
+            const data = await client.get(`/architecture/blocks/${tenant}/${project}/${diagId}`);
+            const allBlocks = data.blocks ?? [];
+            const byName = new Map();
+            for (const b of allBlocks) {
+                const name = b.name.toLowerCase().trim();
+                const group = byName.get(name) ?? [];
+                group.push(b);
+                byName.set(name, group);
+            }
+            for (const [, group] of byName) {
+                if (group.length <= 1)
+                    continue;
+                // Keep oldest (first created)
+                const sorted = group.sort((a, b) => (a.id < b.id ? -1 : 1));
+                const keep = sorted[0];
+                const dupes = sorted.slice(1);
+                console.log(`  "${keep.name}" on ${diagId}: keeping ${keep.id}, ${dupes.length} duplicate(s)`);
+                if (opts.apply) {
+                    for (const dup of dupes) {
+                        await client.delete(`/architecture/blocks/${tenant}/${project}/${dup.id}`);
+                        totalRemoved++;
+                    }
+                }
+                else {
+                    for (const dup of dupes) {
+                        console.log(`    [dry-run] would remove ${dup.id}`);
+                    }
+                    totalRemoved += dupes.length;
+                }
+            }
+        }
+        console.log(`${opts.apply ? "Removed" : "Would remove"} ${totalRemoved} duplicate block(s).`);
+    });
+    blocks
+        .command("find")
+        .description("Search blocks by name across project or diagram")
+        .argument("<tenant>", "Tenant slug")
+        .argument("<project>", "Project slug")
+        .requiredOption("--name <name>", "Block name to search (case-insensitive substring)")
+        .option("--diagram <id>", "Limit to specific diagram")
+        .action(async (tenant, project, opts) => {
+        if (opts.diagram) {
+            const data = await client.get(`/architecture/blocks/${tenant}/${project}/${opts.diagram}`);
+            const matches = (data.blocks ?? []).filter(b => b.name.toLowerCase().includes(opts.name.toLowerCase()));
+            if (isJsonMode()) {
+                output(matches);
+                return;
+            }
+            printTable(["ID", "Name", "Kind"], matches.map(b => [b.id, b.name, b.kind ?? ""]));
+        }
+        else {
+            const libData = await client.get(`/architecture/block-library/${tenant}/${project}`);
+            const matches = (libData.blocks ?? []).filter(b => b.name.toLowerCase().includes(opts.name.toLowerCase()));
+            if (isJsonMode()) {
+                output(matches);
+                return;
+            }
+            printTable(["ID", "Name", "Kind"], matches.map(b => [b.id, b.name, b.kind ?? ""]));
+        }
+    });
     blocks
         .command("delete")
         .description("Delete a block from the project")
@@ -503,6 +605,65 @@ export function registerDiagramCommands(program, client) {
     });
     // Connectors sub-group
     const connectors = cmd.command("connectors").alias("conn").description("Manage connectors");
+    connectors
+        .command("list")
+        .description("List connectors in a diagram")
+        .argument("<tenant>", "Tenant slug")
+        .argument("<project>", "Project slug")
+        .argument("<diagram-id>", "Diagram ID")
+        .action(async (tenant, project, diagramId) => {
+        const data = await client.get(`/architecture/connectors/${tenant}/${project}/${diagramId}`);
+        const list = data.connectors ?? [];
+        if (isJsonMode()) {
+            output(list);
+        }
+        else {
+            if (list.length === 0) {
+                console.log("No connectors in this diagram.");
+                return;
+            }
+            printTable(["ID", "Source", "Target", "Kind", "Label"], list.map(c => [c.id, c.source, c.target, c.kind ?? "", c.label ?? ""]));
+        }
+    });
+    connectors
+        .command("cleanup")
+        .description("Find and remove orphan connectors (source or target block missing)")
+        .argument("<tenant>", "Tenant slug")
+        .argument("<project>", "Project slug")
+        .option("--diagram <id>", "Specific diagram ID (otherwise checks all)")
+        .option("--apply", "Actually delete orphans (default is dry-run)")
+        .action(async (tenant, project, opts) => {
+        const diagramIds = [];
+        if (opts.diagram) {
+            diagramIds.push(opts.diagram);
+        }
+        else {
+            const data = await client.get(`/architecture/diagrams/${tenant}/${project}`);
+            diagramIds.push(...(data.diagrams ?? []).map(d => d.id));
+        }
+        let totalOrphans = 0;
+        for (const diagId of diagramIds) {
+            const [blockData, connData] = await Promise.all([
+                client.get(`/architecture/blocks/${tenant}/${project}/${diagId}`),
+                client.get(`/architecture/connectors/${tenant}/${project}/${diagId}`),
+            ]);
+            const blockIds = new Set((blockData.blocks ?? []).map(b => b.id));
+            const orphans = (connData.connectors ?? []).filter(c => !blockIds.has(c.source) || !blockIds.has(c.target));
+            if (orphans.length === 0)
+                continue;
+            console.log(`  ${diagId}: ${orphans.length} orphan connector(s)`);
+            for (const c of orphans) {
+                if (opts.apply) {
+                    await client.delete(`/architecture/connectors/${tenant}/${project}/${c.id}?diagramId=${diagId}`);
+                }
+                else {
+                    console.log(`    [dry-run] ${c.id}: ${c.source} → ${c.target} (${c.kind ?? "?"})`);
+                }
+            }
+            totalOrphans += orphans.length;
+        }
+        console.log(`${opts.apply ? "Removed" : "Would remove"} ${totalOrphans} orphan connector(s).`);
+    });
     connectors
         .command("create")
         .description("Create a connector between blocks")
@@ -516,7 +677,21 @@ export function registerDiagramCommands(program, client) {
         .option("--source-port <id>", "Source port ID")
         .option("--target-port <id>", "Target port ID")
         .option("--line-style <style>", "Line style: straight, smoothstep, step, polyline, bezier")
+        .option("--upsert", "Return existing connector if source+target+diagram matches")
         .action(async (tenant, projectKey, opts) => {
+        if (opts.upsert) {
+            const existing = await client.get(`/architecture/connectors/${tenant}/${projectKey}/${opts.diagram}`);
+            const match = (existing.connectors ?? []).find(c => c.source === opts.source && c.target === opts.target);
+            if (match) {
+                if (isJsonMode()) {
+                    output({ connector: match, deduplicated: true });
+                }
+                else {
+                    console.log(`Connector already exists: ${match.id} (${match.source} → ${match.target})`);
+                }
+                return;
+            }
+        }
         const data = await client.post("/architecture/connectors", {
             tenant,
             projectKey,

package/dist/commands/projects.js

@@ -147,7 +147,7 @@ export function registerProjectCommands(program, client) {
     });
     cmd
         .command("delete")
-        .description("Delete a project")
+        .description("Delete a project by slug")
         .argument("<tenant>", "Tenant slug")
         .argument("<project>", "Project slug")
         .action(async (tenant, project) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "airgen-cli",
-  "version": "0.17.1",
+  "version": "0.18.0",
   "description": "AIRGen CLI — requirements engineering from the command line",
   "type": "module",
   "main": "dist/index.js",