aui-agent-builder 0.3.77 → 0.3.79

package/dist/commands/push.js

@@ -11,7 +11,7 @@ import { findAuiFiles, parseAuiFile } from "../utils/index.js";
 import { validate } from "./validate.js";
 import { getTracer, SpanStatusCode, setUserContext } from "../telemetry.js";
 import { getItemLevelDiff } from "../utils/git.js";
-import { AuthenticationError, ConfigError, ValidationError } from "../errors/index.js";
+import { AuthenticationError, CLIError, ConfigError, ValidationError } from "../errors/index.js";
 import { StatusLine, Spinner, ErrorDisplay, Hint, } from "../ui/components/index.js";
 import { colors, icons } from "../ui/theme.js";
 import { PushFileSummary, PushChangesView, PushTaskLine, PushFinalSummary, } from "../ui/views/PushView.js";
@@ -439,8 +439,6 @@ async function _push(pushSpan, agentCode, options = {}) {
             log(_jsx(StatusLine, { kind: "info", label: `Scope level: ${effectiveScopeLevel} (from ${options.scopeLevel ? "flag" : ".auirc"})` }));
         }
         const agentSettingsParams = await resolveAgentSettingsParams(config, projectConfig, session, projectRoot, effectiveScopeLevel);
-        if (!agentSettingsParams)
-            return;
         const client = new AUIClient({
             baseUrl: config.apiUrl,
             authToken: config.authToken,
@@ -466,9 +464,6 @@ async function _push(pushSpan, agentCode, options = {}) {
         let prePushDraft = null;
         if (projectConfig.version_id || options.versionId) {
             prePushDraft = await resolveVersionDraft(config, projectConfig, session, options.versionId);
-            if (!prePushDraft) {
-                return;
-            }
             agentSettingsParams.version_id = prePushDraft.versionId;
             log(_jsx(StatusLine, { kind: "info", label: `Pushing into draft version: ${prePushDraft.label}` }));
         }
@@ -584,8 +579,11 @@ async function _push(pushSpan, agentCode, options = {}) {
                 }
                 return stepFailed.length === 0 && !authFailed;
             }
-            catch {
-                return false;
+            catch (err) {
+                // Don't swallow — a thrown error here means the loop body itself
+                // (not a per-task failure) blew up. Letting the original `} catch
+                // { return false; }` swallow it caused exit 0 with no telemetry.
+                throw err;
             }
         };
         const paramTasks = pushTasks.filter((t) => t.type === "put-parameters" ||
@@ -615,6 +613,22 @@ async function _push(pushSpan, agentCode, options = {}) {
         await pushStep(rulesTasks, "Pushing rules", false);
         // Auth fallback
         if (authFailed && authFailedTasks.length > 0 && !savedApiKey) {
+            // The auth fallback prompts for an API key. In a non-TTY environment
+            // (`agent-builder-bff` E2B sandbox, CI, JSON mode being piped) the
+            // inquirer prompt would block forever waiting on stdin and the
+            // sandbox would eventually SIGTERM the process — exactly the silent
+            // failure mode Aviram and Dor were hitting. Detect that up front
+            // and throw a structured AuthenticationError so handleError can
+            // print it, emit the JSON envelope, and exit non-zero.
+            const isInteractive = !json &&
+                process.stdin.isTTY === true &&
+                process.stdout.isTTY === true;
+            if (!isInteractive) {
+                failed += authFailedTasks.length;
+                throw new AuthenticationError(`Authentication failed for ${authFailedTasks.length} push task(s); cannot prompt for an API key (non-interactive session).`, {
+                    suggestion: "Pass --api-key <key>, set AUI_AGENT_TOOLS_API_KEY, or run `aui login` to refresh credentials.",
+                });
+            }
             log(_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsx(StatusLine, { kind: "warning", label: "Authentication failed. Your access token may not have permission." }), _jsx(Hint, { message: "You can provide an API key as a fallback. It will be saved to ~/.aui/agent-settings-key" })] }));
             const { key } = await inquirer.prompt([
                 {
@@ -675,31 +689,79 @@ async function _push(pushSpan, agentCode, options = {}) {
         // source of truth for this push. Runs regardless of entity-push outcomes
         // so the file history is preserved even on partial DB failures.
         // Files = source of truth; DB updates are best-effort.
+        //
+        // IMPORTANT: snapshot failures must be loud — they are NOT counted in
+        // the entity `failed` counter, so without explicit surfacing here and
+        // a thrown CLIError at the end of `_push`, a snapshot failure would
+        // be hidden behind the "All N change(s) pushed successfully" summary
+        // and the process would exit 0.
+        // Retry policy: snapshot upload is the source-of-truth step; transient
+        // failures (network blips, 5xx, timeouts) are common with multipart
+        // uploads, so we retry up to 3 times with exponential backoff (1s, 2s,
+        // 4s) before giving up. 4xx responses are still retried — keeping the
+        // policy dumb here mirrors the single retry already in the api-client
+        // layer for entity pushes.
         let snapshotSucceeded = false;
         let snapshotError;
+        let snapshotAttempts = 0;
         if (prePushDraft) {
-            const snapshotSpinner = startSpinner("Pushing snapshot (file state)...");
-            try {
-                const snapshotResult = await pushSnapshot(client, prePushDraft.agentId, prePushDraft.versionId, projectRoot, fileData);
-                if (snapshotResult.success) {
-                    snapshotSpinner.succeed(`Snapshot pushed (${fileData.length} file(s))`);
-                    snapshotSucceeded = true;
-                    pushSpan.setAttribute("push.snapshot.success", true);
+            const SNAPSHOT_MAX_ATTEMPTS = 4;
+            const SNAPSHOT_RETRY_BASE_MS = 1000;
+            for (let attempt = 1; attempt <= SNAPSHOT_MAX_ATTEMPTS; attempt++) {
+                snapshotAttempts = attempt;
+                const label = attempt === 1
+                    ? "Pushing snapshot (file state)..."
+                    : `Retrying snapshot push (attempt ${attempt}/${SNAPSHOT_MAX_ATTEMPTS})...`;
+                if (json)
+                    stderrLog(label);
+                const snapshotSpinner = json ? null : startSpinner(label);
+                let attemptError;
+                try {
+                    const snapshotResult = await pushSnapshot(client, prePushDraft.agentId, prePushDraft.versionId, projectRoot, fileData);
+                    if (snapshotResult.success) {
+                        const okMsg = attempt === 1
+                            ? `Snapshot pushed (${fileData.length} file(s))`
+                            : `Snapshot pushed (${fileData.length} file(s), attempt ${attempt}/${SNAPSHOT_MAX_ATTEMPTS})`;
+                        if (snapshotSpinner)
+                            snapshotSpinner.succeed(okMsg);
+                        else
+                            stderrLog(okMsg);
+                        snapshotSucceeded = true;
+                        snapshotError = undefined;
+                        break;
+                    }
+                    attemptError = snapshotResult.error || "Unknown snapshot error";
                 }
-                else {
-                    snapshotSpinner.fail("Snapshot push failed");
-                    snapshotError = snapshotResult.error || "Unknown snapshot error";
-                    pushSpan.setAttribute("push.snapshot.success", false);
-                    pushSpan.setAttribute("push.snapshot.error", snapshotError);
+                catch (error) {
+                    attemptError = error instanceof Error ? error.message : String(error);
                 }
+                snapshotError = attemptError;
+                const isLast = attempt === SNAPSHOT_MAX_ATTEMPTS;
+                const failMsg = isLast
+                    ? `Snapshot push failed after ${attempt} attempt(s): ${attemptError}`
+                    : `Snapshot push failed (attempt ${attempt}/${SNAPSHOT_MAX_ATTEMPTS}): ${attemptError}`;
+                if (snapshotSpinner)
+                    snapshotSpinner.fail(failMsg);
+                else
+                    stderrLog(failMsg);
+                if (isLast)
+                    break;
+                const delayMs = SNAPSHOT_RETRY_BASE_MS * Math.pow(2, attempt - 1);
+                if (json)
+                    stderrLog(`Waiting ${delayMs}ms before retry...`);
+                await new Promise((resolve) => setTimeout(resolve, delayMs));
             }
-            catch (error) {
-                snapshotSpinner.fail("Snapshot push failed");
-                snapshotError = error instanceof Error ? error.message : String(error);
-                pushSpan.setAttribute("push.snapshot.success", false);
+            pushSpan.setAttribute("push.snapshot.success", snapshotSucceeded);
+            pushSpan.setAttribute("push.snapshot.attempts", snapshotAttempts);
+            if (!snapshotSucceeded && snapshotError) {
                 pushSpan.setAttribute("push.snapshot.error", snapshotError);
             }
         }
+        const snapshotStatus = prePushDraft
+            ? snapshotSucceeded
+                ? "succeeded"
+                : "failed"
+            : undefined;
         const memoryPath = writePushMemory(projectRoot, agentCodeStr, agentIdStr, pushTasks, succeededFiles, pushFailures);
         // ─── Baseline Update ───
         // Only commit baseline if snapshot succeeded (or no draft = legacy mode).
@@ -720,7 +782,7 @@ async function _push(pushSpan, agentCode, options = {}) {
                 baselineUpdated = true;
             }
         }
-        log(_jsx(PushFinalSummary, { succeeded: succeeded, failed: failed, baselineUpdated: baselineUpdated, logDir: logRelPath, memoryPath: memoryPath }));
+        log(_jsx(PushFinalSummary, { succeeded: succeeded, failed: failed, baselineUpdated: baselineUpdated, logDir: logRelPath, memoryPath: memoryPath, snapshotStatus: snapshotStatus, snapshotError: snapshotError }));
         if (failed > 0) {
             log(_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsx(StatusLine, { kind: "warning", label: `${failed} entity change(s) failed to push to DB.` }), pushFailures.map((f) => (_jsxs(Box, { flexDirection: "column", marginLeft: 2, children: [_jsxs(Text, { color: "red", children: ["  ", icons.error, " ", f.label] }), _jsxs(Text, { color: colors.muted, children: ["    Error: ", f.error] }), f.file && _jsxs(Text, { color: colors.muted, children: ["    File: ", f.file] })] }, f.label))), _jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: colors.info, bold: true, children: "What to do next: " }), _jsxs(Text, { color: colors.muted, children: ["Fix the issues above and re-run ", _jsx(Text, { bold: true, children: "aui push" }), " to retry the failed changes."] })] })] }));
         }
@@ -736,17 +798,77 @@ async function _push(pushSpan, agentCode, options = {}) {
                 log(_jsx(StatusLine, { kind: "warning", label: `Snapshot saved for draft ${prePushDraft.label}, but ${failed} DB update(s) failed. Re-run "aui push" to retry the DB updates before publishing.` }));
             }
         }
+        const snapshotFailed = snapshotStatus === "failed";
         pushSpan.setAttribute("push.exit_reason", failed > 0
             ? succeeded > 0
                 ? "partial_failure"
                 : "failed"
-            : "completed");
+            : snapshotFailed
+                ? "snapshot_failed"
+                : "completed");
         pushSpan.setAttribute("push.succeeded_count", succeeded);
         pushSpan.setAttribute("push.failed_count", failed);
+        // ─── Final structured JSON envelope (success path) ───
+        // The BFF / CI consumes --json output programmatically. On success we
+        // emit a single envelope at the very end so the caller can parse one
+        // top-level JSON document with the full push outcome. Failure paths
+        // are handled by handleError() via outputJsonError().
+        if (json && !snapshotFailed && failed === 0) {
+            outputJson({
+                agent: {
+                    code: agentCodeStr,
+                    id: agentIdStr,
+                },
+                version: prePushDraft
+                    ? { id: prePushDraft.versionId, label: prePushDraft.label }
+                    : undefined,
+                succeeded_count: succeeded,
+                failed_count: 0,
+                succeeded_files: succeededFiles,
+                snapshot: snapshotStatus
+                    ? {
+                        status: snapshotStatus,
+                        attempts: snapshotAttempts,
+                    }
+                    : undefined,
+                baseline_updated: baselineUpdated,
+                log_dir: logRelPath,
+                memory_path: memoryPath,
+            });
+        }
+        // ─── Failure throws (loud + non-zero exit + JSON error envelope) ───
+        // Snapshot failure takes priority because if the snapshot doesn't land
+        // the version's file history is incomplete, even when individual DB
+        // updates succeeded. Falls through to handleError() which prints the
+        // formatted error and exits non-zero.
+        if (snapshotFailed) {
+            throw new CLIError(`Snapshot upload failed${snapshotError ? `: ${snapshotError}` : ""}`, {
+                suggestion: "Re-run `aui push` to retry the snapshot. Your local files are the source of truth — they remain unchanged.",
+            });
+        }
+        // Entity-task partial / total failure. Without this throw, `aui push`
+        // would print "X failed" to stdout and exit 0 — the BFF would have no
+        // way to know the push didn't fully apply, and Logfire would record a
+        // "completed" span. This was Aviram and Dor's reported bug.
+        if (failed > 0) {
+            const labels = pushFailures.map((f) => f.label).join(", ");
+            throw new CLIError(`${failed} entity push task(s) failed: ${labels}`, {
+                suggestion: succeeded > 0
+                    ? `${succeeded} change(s) were saved. Fix the errors above and re-run \`aui push\` to retry the rest.`
+                    : "Fix the errors above and re-run `aui push`.",
+            });
+        }
     }
     catch (error) {
         if (spinner)
             spinner.fail("Push failed");
+        // CLIErrors carry actionable info and a meaningful exit code — let
+        // handleError() format them and exit non-zero. Without this re-throw
+        // a snapshot-failure CLIError thrown above would be swallowed in TUI
+        // mode and the process would exit 0.
+        if (error instanceof CLIError) {
+            throw error;
+        }
         if (!json)
             log(_jsx(ErrorDisplay, { error: error }));
         else
@@ -754,6 +876,10 @@ async function _push(pushSpan, agentCode, options = {}) {
     }
 }
 async function resolveVersionDraft(config, projectConfig, session, explicitVersionId) {
+    // Every error path below MUST throw a typed CLIError (not return null).
+    // Returning null silently exits the CLI with code 0 — the BFF then thinks
+    // the push succeeded when nothing actually happened, and the failure
+    // never reaches Logfire because no exception bubbled to handleError.
     const client = new AUIClient({
         baseUrl: config.apiUrl,
         authToken: config.authToken,
@@ -800,24 +926,29 @@ async function resolveVersionDraft(config, projectConfig, session, explicitVersi
         }
     }
     if (!agentInfo) {
-        log(_jsx(ErrorDisplay, { message: "Could not resolve agent for version management.", suggestion: "Run `aui import-agent` to link an agent, or check your session with `aui status`." }));
-        return null;
+        throw new ConfigError("Could not resolve agent for version management.", {
+            suggestion: "Run `aui import-agent` to link an agent, or check your session with `aui status`.",
+        });
     }
     // If user passed --version-id, validate it's a draft
     if (explicitVersionId) {
+        let ver;
         try {
-            const ver = await client.agentManagement.getVersion(agentInfo.id, explicitVersionId);
-            if (ver.status !== "draft") {
-                log(_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsx(StatusLine, { kind: "error", label: `Version v${ver.version_number} is "${ver.status}" — you can only push to a draft version.` }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { color: colors.info, bold: true, children: "What to do next:" }), _jsxs(Text, { color: colors.muted, children: ["  1. Create a new draft version:  ", _jsx(Text, { bold: true, children: "aui version create" })] }), _jsxs(Text, { color: colors.muted, children: ["  2. Then push with:              ", _jsxs(Text, { bold: true, children: ["aui push --version-id ", '<new-draft-id>'] })] })] })] }));
-                return null;
-            }
-            const label = `v${ver.version_number}`;
-            return { versionId: ver.id, label, agentId: agentInfo.id };
+            ver = await client.agentManagement.getVersion(agentInfo.id, explicitVersionId);
         }
         catch (error) {
-            log(_jsx(ErrorDisplay, { message: `Could not fetch version "${explicitVersionId}": ${error instanceof Error ? error.message : String(error)}`, suggestion: "Check the version ID with `aui version list` and try again." }));
-            return null;
+            throw new CLIError(`Could not fetch version "${explicitVersionId}": ${error instanceof Error ? error.message : String(error)}`, {
+                suggestion: "Check the version ID with `aui version list` and try again.",
+                cause: error,
+            });
         }
+        if (ver.status !== "draft") {
+            throw new ValidationError(`Version v${ver.version_number} is "${ver.status}" — you can only push to a draft version.`, {
+                suggestion: "Create a new draft with `aui version create`, then push with `aui push --version-id <new-draft-id>`.",
+            });
+        }
+        const label = `v${ver.version_number}`;
+        return { versionId: ver.id, label, agentId: agentInfo.id };
     }
     // Resolve from .auirc version_id or auto-detect drafts
     let allVersions = [];
@@ -825,17 +956,20 @@ async function resolveVersionDraft(config, projectConfig, session, explicitVersi
         const versionsResp = await client.agentManagement.listVersions(agentInfo.id, 1, 50);
         allVersions = versionsResp.items;
     }
-    catch {
-        log(_jsx(ErrorDisplay, { message: "Could not fetch versions for this agent.", suggestion: "Check your connection and try again. Use `aui version list` to debug." }));
-        return null;
+    catch (error) {
+        throw new CLIError("Could not fetch versions for this agent.", {
+            suggestion: "Check your connection and try again. Use `aui version list` to debug.",
+            cause: error,
+        });
     }
     // If .auirc has a version_id, validate it's still a draft
     if (projectConfig.version_id) {
         const configVersion = allVersions.find((v) => v.id === projectConfig.version_id);
         if (configVersion) {
             if (configVersion.status !== "draft") {
-                log(_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsx(StatusLine, { kind: "error", label: `The version in your .auirc (v${configVersion.version_number}) is "${configVersion.status}" — you can only push to a draft version.` }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { color: colors.info, bold: true, children: "What to do next:" }), _jsxs(Text, { color: colors.muted, children: ["  1. Create a new draft version:  ", _jsx(Text, { bold: true, children: "aui version create" })] }), _jsxs(Text, { color: colors.muted, children: ["  2. Import the new draft:        ", _jsxs(Text, { bold: true, children: ["aui import-agent --version ", '<new-draft-id>'] })] }), _jsxs(Text, { color: colors.muted, children: ["  3. Then push your changes:      ", _jsx(Text, { bold: true, children: "aui push" })] })] })] }));
-                return null;
+                throw new ValidationError(`The version in your .auirc (v${configVersion.version_number}) is "${configVersion.status}" — you can only push to a draft version.`, {
+                    suggestion: "Create a new draft (`aui version create`), import it (`aui import-agent --version <new-draft-id>`), then `aui push`.",
+                });
             }
             const label = `v${configVersion.version_number}`;
             return { versionId: configVersion.id, label, agentId: agentInfo.id };
@@ -844,8 +978,9 @@ async function resolveVersionDraft(config, projectConfig, session, explicitVersi
     // Auto-detect drafts
     const drafts = allVersions.filter((v) => v.status === "draft");
     if (drafts.length === 0) {
-        log(_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsx(StatusLine, { kind: "error", label: "No draft version found \u2014 you can only push to a draft version." }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { color: colors.info, bold: true, children: "What to do next:" }), _jsxs(Text, { color: colors.muted, children: ["  1. Create a new draft version:  ", _jsx(Text, { bold: true, children: "aui version create" })] }), _jsxs(Text, { color: colors.muted, children: ["  2. Import the draft:            ", _jsxs(Text, { bold: true, children: ["aui import-agent --version ", '<draft-id>'] })] }), _jsxs(Text, { color: colors.muted, children: ["  3. Then push your changes:      ", _jsx(Text, { bold: true, children: "aui push" })] })] })] }));
-        return null;
+        throw new ValidationError("No draft version found — you can only push to a draft version.", {
+            suggestion: "Create a new draft (`aui version create`), import it (`aui import-agent --version <draft-id>`), then `aui push`.",
+        });
     }
     if (drafts.length === 1) {
         const draft = drafts[0];
@@ -894,6 +1029,8 @@ async function pushSnapshot(client, agentId, versionId, projectRoot, fileData) {
 }
 // ─── Agent Settings Params Resolution ───
 async function resolveAgentSettingsParams(config, projectConfig, session, projectRoot, scopeLevel) {
+    // Throws ConfigError on any missing config field — never returns null.
+    // See note on resolveVersionDraft for why silent returns are forbidden.
     const networkId = projectConfig.agent_id || session.network_id;
     const accountId = projectConfig.account_id || config.accountId;
     const organizationId = projectConfig.organization_id || config.organizationId;
@@ -906,8 +1043,9 @@ async function resolveAgentSettingsParams(config, projectConfig, session, projec
             missing.push("account_id (in .auirc or session)");
         if (!organizationId)
             missing.push("organization_id (in .auirc or session)");
-        log(_jsx(ErrorDisplay, { message: `Missing: ${missing.join(", ")}`, suggestion: "Fix: re-import the agent (`aui import`) or re-login (`aui login`)." }));
-        return null;
+        throw new ConfigError(`Missing: ${missing.join(", ")}`, {
+            suggestion: "Re-import the agent (`aui import`) or re-login (`aui login`).",
+        });
     }
     let categoryId = projectConfig.network_category_id;
     if (!categoryId) {
@@ -931,8 +1069,9 @@ async function resolveAgentSettingsParams(config, projectConfig, session, projec
         }
     }
     if (!categoryId) {
-        log(_jsx(ErrorDisplay, { message: "Missing network_category_id.", suggestion: "Re-import the agent to fix." }));
-        return null;
+        throw new ConfigError("Missing network_category_id.", {
+            suggestion: "Re-import the agent (`aui import`) to fix.",
+        });
     }
     const baseParams = {
         updated_by: userId,