@xano/cli 1.3.1-beta.1 → 1.3.1

package/dist/utils/multidoc-push.js

@@ -1,24 +1,11 @@
-import { Errors, ux } from '@oclif/core';
+import { ux } from '@oclif/core';
 import { minimatch } from 'minimatch';
 import * as fs from 'node:fs';
 import { join, relative } from 'node:path';
 import { buildDocumentKey, findFilesWithGuid, parseDocument } from './document-parser.js';
 import { flattenBundleFile } from './flatten.js';
 import { collectKnowledgeObjects, fetchKnowledge, knowledgePreview, pushKnowledge, syncGuidToFrontmatter, toPushItems, } from './knowledge-sync.js';
-import { policyWeakeningGuidance, WEAKENING_REFUSAL } from './policy/permission.js';
-import { PushPolicyGateError } from './policy/push-gate.js';
 import { checkReferences, checkTableIndexes } from './reference-checker.js';
-/**
- * A push that failed after its multidoc import landed. The import is not rolled back, so the error
- * carries what it did for the calling command to report beside the failure.
- */
-export class FailedAfterImportError extends Errors.CLIError {
-    imported;
-    constructor(message, imported) {
-        super(message);
-        this.imported = imported;
-    }
-}
 /**
  * Filter document entries down to the ones the dry-run preview reports as changed,
  * used to send only the changed documents during a partial (non-`--sync`) push.
@@ -592,9 +579,7 @@ function mergeKnowledgePreview(preview, knowledge) {
  */
 export async function executePush(ctx, target, flags) {
     const { accessToken, command, inputDir, verboseFetch } = ctx;
-    const log = ctx.log ?? command.log.bind(command);
-    let dryRunPreview = null;
-    const stop = (stopped) => ({ knowledge: { deleted: 0, imported: 0 }, preview: dryRunPreview, sent: [], stopped });
+    const log = command.log.bind(command);
     // ── Collect knowledge entries (before file check so knowledge-only push works) ─
     let knowledgeObjects = [];
     if (ctx.knowledge) {
@@ -653,7 +638,7 @@ export async function executePush(ctx, target, flags) {
                 const doFlatten = await confirm('Flatten these file(s) in place and continue the push?');
                 if (!doFlatten) {
                     log('Push cancelled. Run `xano flatten <file>` yourself, or re-run to be prompted again.');
-                    return stop('cancelled');
+                    return;
                 }
             }
             else {
@@ -756,6 +741,7 @@ export async function executePush(ctx, target, flags) {
         'Content-Type': 'text/x-xanoscript',
     };
     // ── Dry-run / Preview ─────────────────────────────────────────────────
+    let dryRunPreview = null;
     const dryRunUrl = knowledgeOnly ? null : target.buildDryRunUrl(queryParams);
     if (dryRunUrl && (flags['dry-run'] || !flags.force)) {
         const dryRunParams = new URLSearchParams(queryParams);
@@ -847,7 +833,7 @@ export async function executePush(ctx, target, flags) {
                         log('');
                         log(ux.colorize('red', `Push blocked: ${criticalOps.length} critical error(s) found.`));
                         if (!flags.force) {
-                            return stop('blocked');
+                            return;
                         }
                         log(ux.colorize('yellow', 'Proceeding anyway due to --force flag.'));
                     }
@@ -877,10 +863,10 @@ export async function executePush(ctx, target, flags) {
                     if (!hasChanges && !hasLocalRecords) {
                         log('');
                         log('No changes to push.');
-                        return stop('no-changes');
+                        return;
                     }
                     if (flags['dry-run']) {
-                        return stop('dry-run');
+                        return;
                     }
                     // Warn when the sandbox currently holds a different source workspace than the one being
                     // pushed. The backend compares the source workspace id we sent against the id stored on
@@ -898,7 +884,7 @@ export async function executePush(ctx, target, flags) {
                             const proceed = await confirm('Continue with push anyway?');
                             if (!proceed) {
                                 log('Push cancelled. Run `xano sandbox reset` then retry.');
-                                return stop('cancelled');
+                                return;
                             }
                             mismatchConfirmed = true;
                         }
@@ -919,7 +905,7 @@ export async function executePush(ctx, target, flags) {
                             const confirmed = await confirm(message);
                             if (!confirmed) {
                                 log('Push cancelled.');
-                                return stop('cancelled');
+                                return;
                             }
                         }
                         else {
@@ -936,17 +922,15 @@ export async function executePush(ctx, target, flags) {
                 }
             }
             else {
-                await handleDryRunError(dryRunResponse, command, target, { log, verbose: flags.verbose });
+                await handleDryRunError(dryRunResponse, command, flags, target);
                 // If we get here, the user confirmed to proceed without preview
             }
         }
         catch (error) {
             // Ctrl+C or SIGINT
-            if (error instanceof PushPolicyGateError)
-                throw error;
             if (error.name === 'AbortError' || error.code === 'ERR_USE_AFTER_CLOSE') {
                 log('\nPush cancelled.');
-                return stop('cancelled');
+                return;
             }
             // Re-throw oclif errors
             if (error instanceof Error && 'oclif' in error) {
@@ -977,16 +961,16 @@ export async function executePush(ctx, target, flags) {
         if (!hasChanges) {
             log('');
             log('No changes to push.');
-            return stop('no-changes');
+            return;
         }
         if (flags['dry-run']) {
-            return stop('dry-run');
+            return;
         }
         if (process.stdin.isTTY) {
             const confirmed = await confirm('Proceed with push?');
             if (!confirmed) {
                 log('Push cancelled.');
-                return stop('cancelled');
+                return;
             }
         }
         else {
@@ -1002,19 +986,17 @@ export async function executePush(ctx, target, flags) {
         }
     }
     // ── Partial push: filter to changed documents only ────────────────────
-    let sent = documentEntries;
     if (!knowledgeOnly && isPartial && dryRunPreview) {
-        sent = filterChangedEntries(documentEntries, dryRunPreview.operations, flags.records);
-        if (sent.length === 0 && knowledgeObjects.length === 0) {
+        const filteredEntries = filterChangedEntries(documentEntries, dryRunPreview.operations, flags.records);
+        if (filteredEntries.length === 0 && knowledgeObjects.length === 0) {
             log('No changes to push.');
-            return stop('no-changes');
+            return;
         }
-        multidoc = sent.map((d) => d.content).join('\n---\n');
+        multidoc = filteredEntries.length > 0 ? filteredEntries.map((d) => d.content).join('\n---\n') : '';
     }
     // ── Execute the actual push ───────────────────────────────────────────
     const startTime = Date.now();
     let pushedDocCount = 0;
-    let pushResponse;
     if (!knowledgeOnly && multidoc) {
         const apiUrl = target.buildPushUrl(queryParams);
         try {
@@ -1024,19 +1006,14 @@ export async function executePush(ctx, target, flags) {
                 method: 'POST',
             }, flags.verbose, accessToken);
             if (!response.ok) {
-                const errorText = await response.text();
-                refuseIfExplained(command, target, response.status, errorText);
-                handlePushError(response, errorText, documentEntries, inputDir, command);
+                handlePushError(response, await response.text(), documentEntries, inputDir, command);
             }
             // Parse response for GUID map
             const responseText = await response.text();
             let guidMap = [];
-            pushResponse = {};
             if (responseText && responseText !== 'null') {
                 try {
                     const responseJson = JSON.parse(responseText);
-                    if (responseJson && typeof responseJson === 'object')
-                        pushResponse = responseJson;
                     if (responseJson?.guid_map && Array.isArray(responseJson.guid_map)) {
                         guidMap = responseJson.guid_map;
                     }
@@ -1062,7 +1039,7 @@ export async function executePush(ctx, target, flags) {
                 let updatedCount = 0;
                 let canonicalCount = 0;
                 for (const entry of guidMap) {
-                    if (!entry.guid || entry.type === 'policy')
+                    if (!entry.guid)
                         continue;
                     const key = buildDocumentKey(entry.type, entry.name, entry.verb, entry.api_group);
                     let filePath = documentFileMap.get(key);
@@ -1108,8 +1085,6 @@ export async function executePush(ctx, target, flags) {
             pushedDocCount = multidoc.split('\n---\n').length;
         }
         catch (error) {
-            if (error instanceof PushPolicyGateError)
-                throw error;
             if (error instanceof Error && 'oclif' in error)
                 throw error;
             const elapsedMs = Date.now() - startTime;
@@ -1119,12 +1094,6 @@ export async function executePush(ctx, target, flags) {
     // ── Push knowledge ────────────────────────────────────────────────────
     let knowledgeImported = 0;
     let knowledgeDeleted = 0;
-    const pushed = () => ({
-        knowledge: { deleted: knowledgeDeleted, imported: knowledgeImported },
-        preview: dryRunPreview,
-        response: pushResponse,
-        sent: pushResponse ? sent : [],
-    });
     if (ctx.knowledge && (knowledgeObjects.length > 0 || shouldDelete)) {
         const listUrl = ctx.knowledge.listUrl();
         try {
@@ -1162,10 +1131,7 @@ export async function executePush(ctx, target, flags) {
             if (error instanceof Error && 'oclif' in error)
                 throw error;
             const elapsedMs = Date.now() - startTime;
-            const message = `Failed to push knowledge: ${describeNetworkError(error, listUrl, elapsedMs)}`;
-            if (pushResponse)
-                throw new FailedAfterImportError(message, pushed());
-            command.error(message);
+            command.error(`Failed to push knowledge: ${describeNetworkError(error, listUrl, elapsedMs)}`);
         }
     }
     const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
@@ -1179,7 +1145,6 @@ export async function executePush(ctx, target, flags) {
         parts.push(kParts.join(', '));
     }
     log(`Pushed ${parts.join(' + ')} to ${target.label} from ${relative(process.cwd(), inputDir) || inputDir} in ${elapsed}s`);
-    return pushed();
 }
 // ── Error Handlers ──────────────────────────────────────────────────────────
 /**
@@ -1258,43 +1223,10 @@ function formatFailureDuration(elapsedMs) {
         ? ` (failed after ~${human}, near a common ${boundaries.find((b) => Math.abs(totalSeconds - b) <= b * 0.05)}s timeout — likely a server or proxy cutoff)`
         : ` (failed after ${human})`;
 }
-/** Stop with the target's own guidance when it recognises this refusal. */
-function refuseIfExplained(command, target, status, body) {
-    let message = body;
-    let payload;
-    try {
-        const parsed = JSON.parse(body);
-        if (typeof parsed?.message === 'string')
-            message = parsed.message;
-        payload = parsed?.payload;
-    }
-    catch {
-        // Not JSON
-    }
-    const refusal = payload;
-    if (status === 403 && refusal?.code === 'policy_gate')
-        throw new PushPolicyGateError(refusal);
-    // Policy files that weaken a mandatory policy of the live branch, from a credential without
-    // workspace:policy update: a permission refusal (exit 1), not a blocking finding. The platform's
-    // sentence already reads "Push refused: … Nothing was imported.", so it is printed as it is.
-    if (status === 403 && refusal?.code === WEAKENING_REFUSAL) {
-        command.error(`${message}${target.explainRefusal?.(status, payload) ?? policyWeakeningGuidance(payload, [], true)}`);
-    }
-    // The plan's policy cap: the platform's message names the plan, its cap and the remedy, and the
-    // push itself would be refused the same way, so the preview stops here rather than skipping.
-    if (status === 403 && refusal?.code === 'policy_plan_limit')
-        command.error(`Push refused (${status}): ${message}`);
-    if (refusal?.code === 'policy_gate_transaction_required') {
-        command.error('Push refused: the live branch policy gate requires a transaction. Remove --no-transaction and retry. Nothing was imported.');
-    }
-    const guidance = target.explainRefusal?.(status, payload);
-    if (guidance)
-        command.error(`Push refused (${status}): ${message}${guidance}`);
-}
-async function handleDryRunError(response, command, target, { log, verbose }) {
-    const errorText = await response.text();
-    refuseIfExplained(command, target, response.status, errorText);
+async function handleDryRunError(response, command, flags, target) {
+    const log = command.log.bind(command);
     if (response.status === 404) {
+        const errorText = await response.text();
         try {
             const errorJson = JSON.parse(errorText);
             if (errorJson.message) {
@@ -1312,6 +1244,7 @@ async function handleDryRunError(response, command, target, { log, verbose }) {
         log('');
     }
     else {
+        const errorText = await response.text();
         // Check if push is disabled
         try {
             const errorJson = JSON.parse(errorText);
@@ -1334,17 +1267,8 @@ async function handleDryRunError(response, command, target, { log, verbose }) {
         catch {
             // Not JSON, fall through
         }
-        let reason = '';
-        try {
-            const errorJson = JSON.parse(errorText);
-            if (typeof errorJson?.message === 'string' && errorJson.message.trim())
-                reason = `: ${errorJson.message.trim().replace(/\.$/, '')}`;
-        }
-        catch {
-            // Not JSON
-        }
-        command.warn(`Push preview failed (${response.status})${reason}. Skipping preview.`);
-        if (verbose) {
+        command.warn(`Push preview failed (${response.status}). Skipping preview.`);
+        if (flags.verbose) {
             log(ux.colorize('dim', errorText));
         }
     }