aui-agent-builder 0.3.99 → 0.3.101

package/dist/commands/pull-agent.js

@@ -10,6 +10,7 @@ import { AuthenticationError } from "../errors/index.js";
 import { KBViewClient } from "../api-client/kb-view-client.js";
 import { exportToFolder, buildScope, } from "../services/kb-view.service.js";
 import { fetchSchemas } from "../services/pull-schema.service.js";
+import { toolDirName, integrationFileName, toolFileName, widgetFileName, } from "../utils/index.js";
 import { initAndCommitBaseline } from "../utils/git.js";
 import { Header, StatusLine, Spinner, ErrorDisplay, Hint, } from "../ui/components/index.js";
 import { ImportWarnings } from "../ui/views/ImportAgentView.js";
@@ -79,11 +80,47 @@ function cleanAgentFiles(dir) {
         const full = path.join(dir, entry);
         if (entry.endsWith(".aui.json")) {
             fs.unlinkSync(full);
+            continue;
         }
-        else if (entry === "tools" && fs.statSync(full).isDirectory()) {
-            for (const tool of fs.readdirSync(full)) {
-                if (tool.endsWith(".aui.json")) {
-                    fs.unlinkSync(path.join(full, tool));
+        let stat;
+        try {
+            stat = fs.statSync(full);
+        }
+        catch {
+            continue;
+        }
+        if (!stat.isDirectory())
+            continue;
+        if (entry === "tools") {
+            for (const inner of fs.readdirSync(full)) {
+                const innerPath = path.join(full, inner);
+                if (inner.endsWith(".aui.json")) {
+                    fs.unlinkSync(innerPath);
+                    continue;
+                }
+                let innerStat;
+                try {
+                    innerStat = fs.statSync(innerPath);
+                }
+                catch {
+                    continue;
+                }
+                if (!innerStat.isDirectory())
+                    continue;
+                for (const f of fs.readdirSync(innerPath)) {
+                    if (f.endsWith(".aui.json")) {
+                        fs.unlinkSync(path.join(innerPath, f));
+                    }
+                }
+                if (fs.readdirSync(innerPath).length === 0) {
+                    fs.rmdirSync(innerPath);
+                }
+            }
+        }
+        else if (entry === "integrations") {
+            for (const f of fs.readdirSync(full)) {
+                if (f.endsWith(".aui.json")) {
+                    fs.unlinkSync(path.join(full, f));
                 }
             }
         }
@@ -330,12 +367,7 @@ async function _pullAgent(parentSpan, options = {}) {
         else {
             spinner.succeed("Agent configuration fetched (all 6 endpoints OK)");
         }
-        // Clean existing agent files before writing new ones
         cleanAgentFiles(projectRoot);
-        const toolsDir = path.join(projectRoot, "tools");
-        if (!fs.existsSync(toolsDir)) {
-            fs.mkdirSync(toolsDir, { recursive: true });
-        }
         const writtenFiles = [];
         writeJson(path.join(projectRoot, "agent.aui.json"), generalSettings);
         writtenFiles.push("agent.aui.json");
@@ -343,28 +375,56 @@ async function _pullAgent(parentSpan, options = {}) {
         writtenFiles.push("parameters.aui.json");
         writeJson(path.join(projectRoot, "entities.aui.json"), entities);
         writtenFiles.push("entities.aui.json");
-        writeJson(path.join(projectRoot, "integrations.aui.json"), integrations);
-        writtenFiles.push("integrations.aui.json");
         writeJson(path.join(projectRoot, "rules.aui.json"), rules);
         writtenFiles.push("rules.aui.json");
+        const integrationsData = integrations;
+        const integrationList = Array.isArray(integrationsData.integrations)
+            ? integrationsData.integrations
+            : [];
+        if (integrationList.length > 0) {
+            const integrationsDir = path.join(projectRoot, "integrations");
+            if (!fs.existsSync(integrationsDir)) {
+                fs.mkdirSync(integrationsDir, { recursive: true });
+            }
+            for (const integration of integrationList) {
+                const code = String(integration.code || "unknown");
+                const fileName = integrationFileName(code);
+                writeJson(path.join(integrationsDir, fileName), { integration });
+                writtenFiles.push(`integrations/${fileName}`);
+            }
+        }
         const toolsData = tools;
         if (toolsData.tools &&
             Array.isArray(toolsData.tools) &&
             toolsData.tools.length > 0) {
+            const toolsDir = path.join(projectRoot, "tools");
+            if (!fs.existsSync(toolsDir)) {
+                fs.mkdirSync(toolsDir, { recursive: true });
+            }
             for (const tool of toolsData.tools) {
                 const toolCode = (tool.code ||
                     tool.name ||
                     tool.tool_name ||
                     "unknown");
-                const fileName = `${toolCode.toLowerCase().replace(/\s+/g, "_")}.aui.json`;
-                writeJson(path.join(toolsDir, fileName), { tool });
-                writtenFiles.push(`tools/${fileName}`);
+                const dirName = toolDirName(toolCode);
+                const toolDir = path.join(toolsDir, dirName);
+                if (!fs.existsSync(toolDir)) {
+                    fs.mkdirSync(toolDir, { recursive: true });
+                }
+                const { widget, ...toolWithoutWidget } = tool;
+                const toolFile = toolFileName(dirName);
+                writeJson(path.join(toolDir, toolFile), {
+                    tool: toolWithoutWidget,
+                });
+                writtenFiles.push(`tools/${dirName}/${toolFile}`);
+                const widgetPayload = widget && typeof widget === "object" && !Array.isArray(widget)
+                    ? widget
+                    : {};
+                const widgetFile = widgetFileName(dirName);
+                writeJson(path.join(toolDir, widgetFile), widgetPayload);
+                writtenFiles.push(`tools/${dirName}/${widgetFile}`);
             }
         }
-        else {
-            writeJson(path.join(projectRoot, "tools.aui.json"), tools);
-            writtenFiles.push("tools.aui.json");
-        }
         const paramCount = parameters?.parameters?.length || 0;
         const entityCount = entities?.entities?.length || 0;
         const integrationCount = integrations?.integrations?.length || 0;

package/dist/commands/pull-agent.js.map

@@ -1 +1 @@
-{"version":3,"file":"pull-agent.js","sourceRoot":"","sources":["../../src/commands/pull-agent.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"pull-agent.js","sourceRoot":"","sources":["../../src/commands/pull-agent.tsx"],"names":[],"mappings":"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"}

package/dist/commands/push.js

@@ -7,7 +7,7 @@ import inquirer from "inquirer";
 import { getConfig, loadProjectConfig, saveProjectConfig, loadAgentSettingsApiKey, saveAgentSettingsApiKey, } from "../config/index.js";
 import { getValidSession } from "../services/auth.service.js";
 import { AUIClient, applyScopeLevel } from "../api-client/index.js";
-import { findAuiFiles, parseAuiFile } from "../utils/index.js";
+import { findAuiFiles, parseAuiFile, classifyAuiPath } from "../utils/index.js";
 import { validate } from "./validate.js";
 import { getTracer, SpanStatusCode, setUserContext, setAgentContext, } from "../telemetry.js";
 import { trace } from "@opentelemetry/api";
@@ -295,26 +295,84 @@ async function _push(pushSpan, agentCode, options = {}) {
     const fileData = [];
     try {
         const files = await findAuiFiles(projectRoot);
+        // First pass: index sibling widget files by their tool slug so we can
+        // fold them back into the parent tool when we encounter the tool file.
+        // This keeps the in-memory push payload identical to the legacy layout
+        // where `widget` was inline on the tool.
+        const widgetBySlug = new Map();
+        for (const file of files) {
+            const rel = path.relative(projectRoot, file).replace(/\\/g, "/");
+            const cls = classifyAuiPath(rel);
+            if (cls.kind === "tool-widget" && cls.slug) {
+                widgetBySlug.set(cls.slug, file);
+            }
+        }
         for (const file of files) {
             const parsed = parseAuiFile(file);
             if (!parsed)
                 continue;
             const relativePath = path.relative(projectRoot, file);
+            const normalized = relativePath.replace(/\\/g, "/");
+            const cls = classifyAuiPath(normalized);
             let type = "unknown";
-            const isToolPath = relativePath.startsWith("tools/") || relativePath.startsWith("tools\\");
-            if (parsed.general_settings)
-                type = "general_settings";
-            else if (parsed.tool || isToolPath)
-                type = "tool";
-            else if (parsed.parameters)
-                type = "parameters";
-            else if (parsed.entities)
-                type = "entities";
-            else if (parsed.integrations)
-                type = "integrations";
-            else if (parsed.rules)
-                type = "rules";
-            fileData.push({ file: relativePath, type, data: parsed });
+            let data = parsed;
+            switch (cls.kind) {
+                case "agent":
+                    type = "general_settings";
+                    break;
+                case "parameters":
+                    type = "parameters";
+                    break;
+                case "entities":
+                    type = "entities";
+                    break;
+                case "rules":
+                    type = "rules";
+                    break;
+                case "integrations-list":
+                    type = "integrations";
+                    break;
+                case "integration":
+                    type = "integration";
+                    break;
+                case "tool":
+                    type = "tool";
+                    // Fold the sibling widget file (when present) into the tool
+                    // object so downstream task-builders see a "tool with widget"
+                    // shape regardless of how the project is laid out on disk.
+                    if (cls.slug && widgetBySlug.has(cls.slug)) {
+                        const widget = parseAuiFile(widgetBySlug.get(cls.slug));
+                        const toolObj = parsed.tool ??
+                            parsed;
+                        const hasWidget = widget && Object.keys(widget).length > 0 ? widget : null;
+                        const mergedTool = { ...toolObj, widget: hasWidget };
+                        data = { tool: mergedTool };
+                    }
+                    break;
+                case "tool-widget":
+                    // Folded into the parent tool above — don't emit a standalone
+                    // entry. The push machinery treats widget edits as edits to the
+                    // tool (the diff machinery handles file-level change detection).
+                    continue;
+                default: {
+                    // Fall back to the historical "guess by top-level key" behaviour
+                    // so any unusual files keep working.
+                    const isToolPath = normalized.startsWith("tools/") || normalized.startsWith("tools\\");
+                    if (parsed.general_settings)
+                        type = "general_settings";
+                    else if (parsed.tool || isToolPath)
+                        type = "tool";
+                    else if (parsed.parameters)
+                        type = "parameters";
+                    else if (parsed.entities)
+                        type = "entities";
+                    else if (parsed.integrations)
+                        type = "integrations";
+                    else if (parsed.rules)
+                        type = "rules";
+                }
+            }
+            fileData.push({ file: relativePath, type, data });
         }
         if (json)
             stderrLog(`Read ${fileData.length} files`);
@@ -1631,7 +1689,10 @@ function getArrayFileInfoForPush(filePath, dir) {
             return null;
         const content = JSON.parse(fs.readFileSync(fullPath, "utf-8"));
         const isToolPath = filePath.startsWith("tools/") || filePath.startsWith("tools\\");
-        if (content.tool || isToolPath)
+        // Per-tool and per-integration files are single-entity payloads, not
+        // array-of-entities files — they don't need item-level diffing.
+        const isPerIntegration = filePath.startsWith("integrations/") || filePath.startsWith("integrations\\");
+        if (content.tool || isToolPath || content.integration || isPerIntegration)
             return null;
         if (content.parameters)
             return { arrayKey: "parameters", itemKey: "code", label: "Parameters" };
@@ -1793,11 +1854,57 @@ function diffObjects(oldObj, newObj, prefix = "") {
 }
 function buildPushTasks(diff, fileData, projectRoot, getFileDiffFn) {
     const tasks = [];
+    // Up-cast: a change to the sibling widget file is semantically a change
+    // to its parent tool, not a standalone entity. Rewrite each such row so
+    // the downstream task-builder picks up the merged tool from `fileData`.
+    //
+    // We resolve the *actual* on-disk tool file for the slug by consulting
+    // `fileData` (which holds the canonical relative paths emitted by the
+    // file walker), so the up-cast is filename-naming-scheme agnostic — it
+    // works for `<slug>_tool.aui.json`, the prior `tool.aui.json`, and the
+    // pre-split legacy `tools/<slug>.aui.json`.
+    const toolFileBySlug = new Map();
+    for (const fd of fileData) {
+        if (fd.type !== "tool")
+            continue;
+        const normalized = fd.file.replace(/\\/g, "/");
+        const cls = classifyAuiPath(normalized);
+        if (cls.kind === "tool" && cls.slug) {
+            toolFileBySlug.set(cls.slug, normalized);
+        }
+    }
+    const consolidatedFiles = [];
+    const seenToolFiles = new Set();
     for (const change of diff.changedFiles) {
+        const normalized = change.file.replace(/\\/g, "/");
+        const cls = classifyAuiPath(normalized);
+        if (cls.kind === "tool-widget" && cls.slug) {
+            const toolFile = toolFileBySlug.get(cls.slug);
+            // If the tool file isn't on disk anymore (mid-edit, half-written
+            // project), there's nothing for the widget change to attach to.
+            // Drop the row — push will simply not patch this tool.
+            if (!toolFile)
+                continue;
+            if (seenToolFiles.has(toolFile))
+                continue;
+            seenToolFiles.add(toolFile);
+            consolidatedFiles.push({ status: "modified", file: toolFile });
+            continue;
+        }
+        if (cls.kind === "tool" && cls.slug) {
+            seenToolFiles.add(change.file);
+        }
+        consolidatedFiles.push(change);
+    }
+    for (const change of consolidatedFiles) {
+        const normalizedChange = change.file.replace(/\\/g, "/");
+        const changeCls = classifyAuiPath(normalizedChange);
         if (change.status === "deleted") {
-            const isToolFile = change.file.includes("tools/") && change.file.endsWith(".aui.json");
+            const isToolFile = changeCls.kind === "tool" ||
+                (change.file.includes("tools/") && change.file.endsWith(".aui.json"));
             if (isToolFile) {
-                const basename = change.file.split("/").pop().replace(".aui.json", "");
+                const basename = (changeCls.slug ??
+                    change.file.split("/").pop().replace(".aui.json", ""));
                 const toolName = basename.toUpperCase().replace(/-/g, "_");
                 tasks.push({
                     type: "delete-tool",
@@ -1806,6 +1913,17 @@ function buildPushTasks(diff, fileData, projectRoot, getFileDiffFn) {
                     file: change.file,
                     body: {},
                 });
+                continue;
+            }
+            if (changeCls.kind === "integration") {
+                const code = changeCls.slug;
+                tasks.push({
+                    type: "delete-integration",
+                    label: `Delete integration: ${code}`,
+                    file: change.file,
+                    body: {},
+                    itemCode: code,
+                });
             }
             continue;
         }
@@ -1814,6 +1932,33 @@ function buildPushTasks(diff, fileData, projectRoot, getFileDiffFn) {
             f.file.endsWith("/" + change.file));
         if (!fd)
             continue;
+        // ── Per-file integration change (new layout) ──
+        if (fd.type === "integration") {
+            const integrationObj = (fd.data.integration ??
+                fd.data);
+            const code = integrationObj.code ?? changeCls.slug ?? "";
+            if (!code)
+                continue;
+            if (change.status === "added") {
+                tasks.push({
+                    type: "create-integration",
+                    label: `Create integration: ${code}`,
+                    file: change.file,
+                    body: integrationObj,
+                    itemCode: code,
+                });
+            }
+            else if (change.status === "modified") {
+                tasks.push({
+                    type: "patch-integration",
+                    label: `Update integration: ${code}`,
+                    file: change.file,
+                    body: integrationObj,
+                    itemCode: code,
+                });
+            }
+            continue;
+        }
         if (fd.type === "tool") {
             const toolData = fd.data?.tool || fd.data;
             if (!toolData || !toolData.code)
@@ -1829,9 +1974,14 @@ function buildPushTasks(diff, fileData, projectRoot, getFileDiffFn) {
                 });
             }
             else if (change.status === "modified") {
+                // A change that came from a sibling `widget.aui.json` got re-pointed
+                // at the tool file above. Its field diff against the tool file
+                // itself may be empty (only the widget changed) — we must still
+                // PATCH the tool with the full merged body so the new widget lands.
                 const fieldDiffs = getFileDiffFn(projectRoot, change.file);
                 const patchBody = buildToolPatchBody(fieldDiffs);
-                if (Object.keys(patchBody).length > 0) {
+                const widgetOnlyChange = fieldDiffs.length === 0 && Object.keys(patchBody).length === 0;
+                if (Object.keys(patchBody).length > 0 || widgetOnlyChange) {
                     tasks.push({
                         type: "patch-tool",
                         label: `Update tool: ${toolCode}`,