Merge branch 'kennethkutyn:main' into main

Author: kennethkutyn

assets/favicon.svg

@@ -75,20 +75,40 @@ function normalizeLayer(layer) {
     return VALID_LAYERS.has(lower) ? lower : null;
 }
 
-function upsertCustomEntry({ id, label, layer, icon = 'custom' }) {
+function ensureCategoryContainers(category) {
+    if (!category) return;
+    if (!customEntries[category]) customEntries[category] = [];
+    if (!addedItems[category]) addedItems[category] = new Set();
+}
+
+function isItemAlreadyAdded(itemId) {
+    return Object.values(addedItems).some(set => set.has(itemId));
+}
+
+function guessLayerFromKind(kind) {
+    const lower = (kind || '').toString().trim().toLowerCase();
+    if (!lower) return null;
+    if (lower === 'activation') return 'activation';
+    if (lower === 'warehouse' || lower === 'analysis') return 'analysis';
+    if (lower === 'amplitude') return 'analysis';
+    if (lower === 'datasource' || lower === 'source') return 'sources';
+    return null;
+}
+
+function upsertCustomEntry({ id, label, layer, kind, icon = 'custom' }) {
     const safeId = id || slugify(label);
     const name = label || safeId;
 
     const existingCategory = itemCategoryIndex[safeId];
     const normalizedLayer = normalizeLayer(layer);
+    const kindLayer = guessLayerFromKind(kind);
     const defaultLayer = AI_NODE_DEFAULTS[safeId]?.layer;
-    const category = normalizedLayer || existingCategory || defaultLayer;
+    // Prefer the catalog category if it exists; otherwise use AI layer, kind hint, then defaults.
+    const category = existingCategory || normalizedLayer || kindLayer || defaultLayer;
     const resolvedIcon = AI_NODE_DEFAULTS[safeId]?.icon || icon;
 
-    if (existingCategory && category && existingCategory !== category) {
-        return null;
-    }
     if (!category) return null;
+    ensureCategoryContainers(category);
 
     // If this is a known, pre-defined item (e.g., amplitude-sdk, s3), just add it.
     if (existingCategory) {
@@ -126,13 +146,38 @@ function applyDiagramFromAi(result) {
             id: node?.id,
             label: node?.label || node?.name,
             layer: node?.layer,
+            kind: node?.kind,
             icon: 'custom'
         });
         if (id) {
             createdIds.add(id);
         }
     });
 
+    // Safety net: if any node failed to add (missing category resolution, etc.), try once more with a fallback.
+    nodes.forEach(node => {
+        const nodeId = node?.id;
+        if (!nodeId || isItemAlreadyAdded(nodeId)) return;
+        const normalizedLayer = normalizeLayer(node?.layer);
+        const kindLayer = guessLayerFromKind(node?.kind);
+        const defaultLayer = AI_NODE_DEFAULTS[nodeId]?.layer || AI_NODE_DEFAULTS[slugify(node?.label)]?.layer;
+        const category = itemCategoryIndex[nodeId] || normalizedLayer || kindLayer || defaultLayer || 'analysis';
+        ensureCategoryContainers(category);
+        const existsInCustom = customEntries[category].some(entry => entry.id === nodeId);
+        if (!existsInCustom) {
+            customEntries[category].push({
+                id: nodeId,
+                name: node?.label || nodeId,
+                icon: AI_NODE_DEFAULTS[nodeId]?.icon || 'custom',
+                isCustom: true
+            });
+        }
+        itemCategoryIndex[nodeId] = category;
+        if (!addedItems[category].has(nodeId)) {
+            addItemToLayer(nodeId, node?.label || nodeId, AI_NODE_DEFAULTS[nodeId]?.icon || 'custom', category);
+        }
+    });
+
     edges.forEach(edge => {
         const sourceId = edge?.sourceId;
         const targetId = edge?.targetId;

js/ai.js

@@ -31,7 +31,8 @@ const defaultAllowed = [
   'http://127.0.0.1:5500',
   // Hosted client (custom domain + GH Pages fallback)
   'https://amplistack.amplitude.com',
-  'https://amplitude.github.io'
+  'https://amplitude.github.io',
+  'https://kennethkutyn.github.io'
 ];
 
 const envAllowed = (ALLOWED_ORIGINS || '')
@@ -55,15 +56,9 @@ You are an Amplitude analytics solutions architect. Given a call transcript, ext
 Return ONLY valid JSON with this shape:
 {
   "architecture": { "goal": string, "scope": string },
-  "entities": [
-    { "name": string, "type": "product|datasource|activation|warehouse|pipeline|other", "layer": "marketing|experiences|sources|analysis|activation", "notes": string }
-  ],
   "events": [
     { "name": string, "properties": [string], "notes": string }
   ],
-  "flows": [
-    { "from": string, "to": string, "description": string, "direction": "uni|bi" }
-  ],
   "risks": [string],
   "assumptions": [string],
   "diagramNodes": [
@@ -82,7 +77,7 @@ Rules:
 - Pay special attention to mention of Amplitude SDK. If they mention Mobile or Web app, assume an AMplitude SDK will be present unless the specifically say otherwise or mention a CDP. 
 - Prefer concise labels; derive stable ids from names (lowercase, dashes).
 - Map AmpliStack layers: marketing, experiences (owned surfaces/apps), sources (ingest), analysis (warehouse/BI/Amplitude), activation (destinations/engagement).
-- For flows, keep edge labels descriptive (e.g., "track events", "sync audiences").
+- For diagramEdges, keep labels descriptive (e.g., "track events", "sync audiences").
 - If there is a mention of push, email, ads or similar, make sure to add the appropriate node to the "marketing channesl" layer
 - If something is unknown, use an empty array or empty string rather than guessing.
 `;