aui-agent-builder 0.3.101 → 0.3.103

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, classifyAuiPath } from "../utils/index.js";
+import { findAuiFiles, parseAuiFile } from "../utils/index.js";
 import { validate } from "./validate.js";
 import { getTracer, SpanStatusCode, setUserContext, setAgentContext, } from "../telemetry.js";
 import { trace } from "@opentelemetry/api";
@@ -295,84 +295,35 @@ 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";
-            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 });
+            const isToolPath = relativePath.startsWith("tools/") || relativePath.startsWith("tools\\");
+            // Recognize agent.aui.json by filename (not just by the wrapper key),
+            // mirroring `validate.tsx:222` which accepts both
+            //   { "general_settings": {...} }   (wrapped — `aui pull` writes this)
+            //   {...top-level fields...}        (flat — Agent Builder skills write this)
+            // Without this, a flat agent.aui.json fell through to type "unknown"
+            // and `buildPushTasks` never had a chance to emit a
+            // patch-general-settings task — same "silently dropped" class of bug
+            // the tool-modify branch had.
+            const isSettingsPath = relativePath === "agent.aui.json";
+            if (parsed.general_settings || isSettingsPath)
+                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 });
         }
         if (json)
             stderrLog(`Read ${fileData.length} files`);
@@ -611,12 +562,18 @@ async function _push(pushSpan, agentCode, options = {}) {
             pushSpan.setAttribute("push.diff.modified", diff.totalModified);
             pushSpan.setAttribute("push.diff.deleted", diff.totalDeleted);
         }
-        if (pushTasks.length === 0) {
+        // pushKnowledgeHubs runs as a separate step; short-circuiting on
+        // pushTasks alone would silently no-op KB-only pushes.
+        const hasKbChanges = diff?.changedFiles?.some((c) => c.file.startsWith("knowledge-hubs/")) ??
+            false;
+        if (pushTasks.length === 0 && !hasKbChanges) {
             pushSpan.setAttribute("push.exit_reason", "no_pushable_tasks");
             log(_jsx(Box, { paddingX: 1, children: _jsx(StatusLine, { kind: "success", label: "No pushable changes detected." }) }));
             return;
         }
-        log(_jsx(Box, { paddingX: 1, children: _jsx(StatusLine, { kind: "info", label: `Pushing ${pushTasks.length} change(s)...` }) }));
+        if (pushTasks.length > 0) {
+            log(_jsx(Box, { paddingX: 1, children: _jsx(StatusLine, { kind: "info", label: `Pushing ${pushTasks.length} change(s)...` }) }));
+        }
         let succeeded = 0;
         let failed = 0;
         let authFailed = false;
@@ -1592,7 +1549,7 @@ async function pushKnowledgeHubs(projectRoot, projectConfig) {
                                 scope,
                                 created_by: userId,
                                 knowledge_base_name: kbData.name,
-                                knowledge_base_description: kbData.description,
+                                knowledge_base_description: kbData.description ?? undefined,
                             });
                             span.setStatus({ code: SpanStatusCode.OK });
                             if (importResult.knowledge_base_id) {
@@ -1635,6 +1592,69 @@ async function pushKnowledgeHubs(projectRoot, projectConfig) {
                         }
                     });
                 }
+                // importFiles ingests binaries only; sidecar edits + non-file
+                // Resources reach the server through importJson. After importFiles
+                // so binary re-extracts don't clobber manifest edits.
+                const hasJsonPayload = kbData.tabular_files.length > 0 || kbData.markdown_files.length > 0;
+                if (hasJsonPayload) {
+                    const kbJsonTracer = getTracer();
+                    await kbJsonTracer.startActiveSpan("aui.push.task.kb-import-json", async (span) => {
+                        span.setAttribute("push.task.type", "kb-import-json");
+                        span.setAttribute("push.task.label", `Sync knowledge base manifest: ${kbData.name || kbDirName}`);
+                        span.setAttribute("push.task.file", `knowledge-hubs/${kbDirName}/kb.json`);
+                        span.setAttribute("push.task.kb_name", kbData.name || kbDirName);
+                        span.setAttribute("push.task.tabular_count", kbData.tabular_files.length);
+                        span.setAttribute("push.task.markdown_count", kbData.markdown_files.length);
+                        await setUserContext(span);
+                        await setAgentContext(span, {
+                            agentId: projectConfig.agent_management_id,
+                            agentCode: projectConfig.agent_code,
+                            versionId: projectConfig.version_id,
+                            versionLabel: projectConfig.version_label,
+                            networkId: kbNetworkId,
+                            accountId: projectConfig.account_id,
+                            organizationId: projectConfig.organization_id,
+                            networkCategoryId: projectConfig.network_category_id,
+                        });
+                        try {
+                            await kbViewClient.importJson({
+                                scope,
+                                knowledge_bases: [
+                                    {
+                                        name: kbData.name,
+                                        description: kbData.description,
+                                        tabular_files: kbData.tabular_files,
+                                        markdown_files: kbData.markdown_files,
+                                    },
+                                ],
+                                created_by: userId,
+                                network_id: scope.network_id,
+                            });
+                            span.setStatus({ code: SpanStatusCode.OK });
+                        }
+                        catch (importErr) {
+                            hadUploadFailure = true;
+                            const errMsg = importErr instanceof Error
+                                ? importErr.message
+                                : String(importErr);
+                            span.setStatus({ code: SpanStatusCode.ERROR, message: errMsg });
+                            span.recordException(importErr instanceof Error ? importErr : new Error(errMsg));
+                            span.setAttribute("push.task.error", errMsg);
+                            if (importErr.statusCode) {
+                                span.setAttribute("push.task.error_status_code", importErr.statusCode);
+                            }
+                            failures.push({
+                                label: `Sync knowledge base manifest: ${kbData.name || kbDirName}`,
+                                file: `knowledge-hubs/${kbDirName}/kb.json`,
+                                error: errMsg,
+                            });
+                            log(_jsx(Box, { paddingX: 1, children: _jsx(StatusLine, { kind: "error", label: `Failed to sync manifest for "${kbData.name || kbDirName}": ${errMsg}` }) }));
+                        }
+                        finally {
+                            span.end();
+                        }
+                    });
+                }
             }
             if (hadUploadFailure) {
                 kbSpinner.fail(`Knowledge base push completed with errors`);
@@ -1689,10 +1709,7 @@ function getArrayFileInfoForPush(filePath, dir) {
             return null;
         const content = JSON.parse(fs.readFileSync(fullPath, "utf-8"));
         const isToolPath = filePath.startsWith("tools/") || filePath.startsWith("tools\\");
-        // 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)
+        if (content.tool || isToolPath)
             return null;
         if (content.parameters)
             return { arrayKey: "parameters", itemKey: "code", label: "Parameters" };
@@ -1852,59 +1869,28 @@ function diffObjects(oldObj, newObj, prefix = "") {
     }
     return diffs;
 }
-function buildPushTasks(diff, fileData, projectRoot, getFileDiffFn) {
+/**
+ * Build the ordered list of API tasks the push will execute, given a git
+ * diff summary, the parsed file contents, and an injectable per-file diff
+ * function.
+ *
+ * `getFileDiffFn` is parameterized so tests can stub out `git show` without
+ * a real git repo. `getItemLevelDiffFn` is optional and defaults to the
+ * production implementation; tests inject it so the array-keyed branches
+ * (parameters, entities, integrations) are exercisable without git too.
+ *
+ * Exported for unit-test access only — production callers should keep
+ * going through `_push`, which threads in the real `getFileDiff` and
+ * `getItemLevelDiff` from `../utils/git.js`.
+ */
+export function buildPushTasks(diff, fileData, projectRoot, getFileDiffFn, getItemLevelDiffFn) {
+    const getItems = getItemLevelDiffFn ?? getItemLevelDiff;
     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 = changeCls.kind === "tool" ||
-                (change.file.includes("tools/") && change.file.endsWith(".aui.json"));
+            const isToolFile = change.file.includes("tools/") && change.file.endsWith(".aui.json");
             if (isToolFile) {
-                const basename = (changeCls.slug ??
-                    change.file.split("/").pop().replace(".aui.json", ""));
+                const basename = change.file.split("/").pop().replace(".aui.json", "");
                 const toolName = basename.toUpperCase().replace(/-/g, "_");
                 tasks.push({
                     type: "delete-tool",
@@ -1913,17 +1899,6 @@ 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;
         }
@@ -1932,33 +1907,6 @@ 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)
@@ -1974,22 +1922,29 @@ 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);
-                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}`,
-                        toolName,
-                        file: change.file,
-                        body: toolData,
-                    });
-                }
+                // `change.status === "modified"` comes from `getDiffSummary` (git
+                // status). That alone is the source of truth that the file content
+                // diverged from the baseline; always push the patch. The full
+                // `toolData` body is sent (consistent with the create-tool branch
+                // immediately above); the platform PATCH is idempotent for fields
+                // whose value didn't actually change, so this is safe.
+                //
+                // Pre-fix this branch routed the changes through a
+                // `buildToolPatchBody` gate that only matched diff paths starting
+                // with the wrapped-shape `tool.` prefix. Tool files written in flat
+                // shape (no `{ "tool": {...} }` wrapper — accepted by the loader at
+                // ~L2675 and by `aui validate`) diffed to top-level paths
+                // (`response_type`, `widget`, `goal`, …), the gate returned an
+                // empty body, and the `patch-tool` task was silently dropped.
+                // Symptom users hit: `aui diff` showed the change, `aui push`
+                // printed "No pushable changes detected" and exited 0.
+                tasks.push({
+                    type: "patch-tool",
+                    label: `Update tool: ${toolCode}`,
+                    toolName,
+                    file: change.file,
+                    body: toolData,
+                });
             }
         }
         else if (fd.type === "general_settings") {
@@ -2006,7 +1961,14 @@ function buildPushTasks(diff, fileData, projectRoot, getFileDiffFn) {
                 }
             }
             else if (change.status === "added") {
-                const settings = fd.data?.general_settings;
+                // Mirror the tool loader's `(fd.data as any)?.tool || fd.data`
+                // tolerance: accept both `{ "general_settings": {...} }` (wrapped)
+                // and `{...}` (flat). `normalizeGeneralSettings` in
+                // `pull-agent.tsx` / `import-agent.tsx` and `aui validate`
+                // (`commands/validate.tsx:222`) already permit both layouts —
+                // staying in lockstep with them here prevents the same
+                // "silently dropped" class of bug the tool-modify branch had.
+                const settings = fd.data?.general_settings ?? fd.data;
                 if (settings) {
                     tasks.push({
                         type: "patch-general-settings",
@@ -2018,7 +1980,7 @@ function buildPushTasks(diff, fileData, projectRoot, getFileDiffFn) {
             }
         }
         else if (fd.type === "parameters") {
-            const itemDiffs = getItemLevelDiff(projectRoot, change.file, "parameters", "code");
+            const itemDiffs = getItems(projectRoot, change.file, "parameters", "code");
             for (const item of itemDiffs) {
                 if (item.status === "added") {
                     tasks.push({
@@ -2050,7 +2012,7 @@ function buildPushTasks(diff, fileData, projectRoot, getFileDiffFn) {
             }
         }
         else if (fd.type === "entities") {
-            const itemDiffs = getItemLevelDiff(projectRoot, change.file, "entities", "name");
+            const itemDiffs = getItems(projectRoot, change.file, "entities", "name");
             for (const item of itemDiffs) {
                 if (item.status === "added") {
                     tasks.push({
@@ -2082,7 +2044,7 @@ function buildPushTasks(diff, fileData, projectRoot, getFileDiffFn) {
             }
         }
         else if (fd.type === "integrations") {
-            const itemDiffs = getItemLevelDiff(projectRoot, change.file, "integrations", "code");
+            const itemDiffs = getItems(projectRoot, change.file, "integrations", "code");
             for (const item of itemDiffs) {
                 if (item.status === "added") {
                     tasks.push({
@@ -2125,29 +2087,34 @@ function buildPushTasks(diff, fileData, projectRoot, getFileDiffFn) {
     }
     return tasks;
 }
-function buildToolPatchBody(fieldDiffs) {
+// NOTE: `buildToolPatchBody` was removed when the tool-modify branch above
+// switched to pushing on any `change.status === "modified"`. Its sole job
+// had been to gate the patch-tool task on a `tool.<field>` diff-path prefix,
+// which silently dropped every edit on flat-shape (no-wrapper) tool files.
+// See the inline comment in the modify branch (~L2688) for the full history.
+export function buildSettingsPatchBody(fieldDiffs) {
     const body = {};
     for (const fd of fieldDiffs) {
         if (fd.operation === "removed")
             continue;
         const parts = fd.path.split(".");
-        if (parts[0] === "tool" && parts.length >= 2) {
-            const topLevelKey = parts[1];
-            body[topLevelKey] = fd.newValue;
-        }
-    }
-    return body;
-}
-function buildSettingsPatchBody(fieldDiffs) {
-    const body = {};
-    for (const fd of fieldDiffs) {
-        if (fd.operation === "removed")
+        if (parts.length === 0 || !parts[0])
             continue;
-        const parts = fd.path.split(".");
-        if (parts[0] === "general_settings" && parts.length >= 2) {
-            const topLevelKey = parts[1];
-            body[topLevelKey] = fd.newValue;
-        }
+        // general_settings (agent.aui.json) files come in two equally-supported
+        // shapes:
+        //   wrapped: { "general_settings": { ...fields... } } → paths look like
+        //            `general_settings.<field>...`
+        //   flat:    { ...fields... }                          → paths look like
+        //            `<field>...`
+        // `aui validate` (`commands/validate.tsx:222`) and
+        // `normalizeGeneralSettings` in `import-agent.tsx` / `pull-agent.tsx`
+        // already accept both layouts. Pre-fix this body builder only matched
+        // the wrapped form, which silently dropped edits to flat-shape files.
+        // Match the loader behavior here so every change reaches the platform.
+        const topLevelKey = parts[0] === "general_settings" && parts.length >= 2
+            ? parts[1]
+            : parts[0];
+        body[topLevelKey] = fd.newValue;
     }
     return body;
 }