@anvil-works/anvil-cli 0.5.10 → 0.5.11

package/dist/cli.js

@@ -50998,6 +50998,16 @@ var __webpack_exports__ = {};
         const selectedUrl = await logger_logger.select("Multiple logged-in Anvil URLs found. Which one would you like to use?", choices, decision.urls[0]);
         return selectedUrl;
     }
+    const defaultConfigureWatchGitAuthDeps = {
+        configureCredentialHelperForUrl: configureCredentialHelperForUrl,
+        setAppAuthBinding: setAppAuthBinding
+    };
+    const defaultSyncStartDeps = {
+        pushToAnvil,
+        recreateSessionAndValidate,
+        recheckSyncStatus,
+        startWatchingWithEventHandlers
+    };
     function resolveWatchOpenPath(repoPath) {
         return external_path_default().resolve(repoPath);
     }
@@ -51007,6 +51017,17 @@ var __webpack_exports__ = {};
         await openPathInEditorOrDefault(targetPath, preferredEditorCommand, deps);
         logger_logger.info(chalk_source.gray(`Opened ${targetPath}`));
     }
+    async function configureWatchGitAuth(options, deps = defaultConfigureWatchGitAuthDeps) {
+        await deps.configureCredentialHelperForUrl(options.repoPath, options.anvilUrl);
+        await deps.setAppAuthBinding(options.repoPath, options.appId, {
+            url: options.anvilUrl,
+            username: options.username
+        });
+    }
+    function isStaleRemotePushError(message) {
+        const normalized = message.toLowerCase();
+        return normalized.includes("fetch first") || normalized.includes("non-fast-forward") || normalized.includes("failed to push some refs") || normalized.includes("remote contains work that you do") || normalized.includes("[rejected]");
+    }
     async function selectAppId(candidates) {
         if (0 === candidates.length) {
             logger_logger.warn("Could not auto-detect app ID from repository.");
@@ -51093,11 +51114,19 @@ var __webpack_exports__ = {};
             logger_logger.progress("push", "Pushing to Anvil...");
             await git.push(pushUrl, refSpec, options.force ?? false);
             logger_logger.progressEnd("push", "Pushed to Anvil");
-            return true;
+            return {
+                success: true,
+                staleRemote: false
+            };
         } catch (e) {
+            const errorMessage = errors_getErrorMessage(e);
             logger_logger.progressEnd("push", "Push failed");
-            logger_logger.error(`Failed to push: ${errors_getErrorMessage(e)}`);
-            return false;
+            logger_logger.error(`Failed to push: ${errorMessage}`);
+            return {
+                success: false,
+                staleRemote: isStaleRemotePushError(errorMessage),
+                errorMessage
+            };
         }
     }
     async function fetchAndRebaseFromAnvil(options) {
@@ -51223,7 +51252,7 @@ var __webpack_exports__ = {};
             return false;
         }
     }
-    async function checkSyncStatusAndStart(session, options) {
+    async function checkSyncStatusAndStart(session, options, deps = defaultSyncStartDeps) {
         const syncStatus = session.syncStatus;
         const branchName = session.getBranchName() || "master";
         const hasUncommitted = session.hasUncommittedChanges;
@@ -51236,8 +51265,8 @@ var __webpack_exports__ = {};
             else {
                 shouldPush = await logger_logger.confirm("Would you like to push this branch to Anvil?", true);
                 if (shouldPush) {
-                    const changed = await recheckSyncStatus(stateCategory, branchName, options);
-                    if (changed) return await checkSyncStatusAndStart(changed, options);
+                    const changed = await deps.recheckSyncStatus(stateCategory, branchName, options);
+                    if (changed) return await checkSyncStatusAndStart(changed, options, deps);
                 }
             }
             if (!shouldPush) {
@@ -51246,15 +51275,21 @@ var __webpack_exports__ = {};
                 return false;
             }
             session.cleanup();
-            const pushed = await pushToAnvil({
+            const pushed = await deps.pushToAnvil({
                 repoPath: options.repoPath,
                 appId: options.appId,
                 anvilUrl: options.anvilUrl,
                 branchName,
                 username: options.username
             });
-            if (!pushed) return false;
-            return await recreateSessionAndValidate(options);
+            if (!pushed.success) {
+                if (pushed.staleRemote) {
+                    logger_logger.warn("Branch appeared on Anvil while pushing. Re-checking sync status...");
+                    return await deps.recreateSessionAndValidate(options);
+                }
+                return false;
+            }
+            return await deps.recreateSessionAndValidate(options);
         }
         if (syncStatus?.behind || syncStatus?.ahead) if (syncStatus.ahead && !syncStatus.behind) {
             logger_logger.warn(`Your local repository is ${syncStatus.ahead} commit(s) ahead of Anvil.`);
@@ -51274,8 +51309,8 @@ var __webpack_exports__ = {};
                 ], "push");
                 shouldPush = "push" === action;
                 if (shouldPush) {
-                    const changed = await recheckSyncStatus(stateCategory, branchName, options);
-                    if (changed) return await checkSyncStatusAndStart(changed, options);
+                    const changed = await deps.recheckSyncStatus(stateCategory, branchName, options);
+                    if (changed) return await checkSyncStatusAndStart(changed, options, deps);
                 }
             }
             if (!shouldPush) {
@@ -51284,15 +51319,15 @@ var __webpack_exports__ = {};
                 return false;
             }
             session.cleanup();
-            const pushed = await pushToAnvil({
+            const pushed = await deps.pushToAnvil({
                 repoPath: options.repoPath,
                 appId: options.appId,
                 anvilUrl: options.anvilUrl,
                 branchName,
                 username: options.username
             });
-            if (!pushed) return false;
-            return await recreateSessionAndValidate(options);
+            if (!pushed.success) return false;
+            return await deps.recreateSessionAndValidate(options);
         } else if (syncStatus.diverged) {
             logger_logger.warn("Your local repository has diverged from Anvil.");
             logger_logger.info(chalk_source.gray(`   You are ${syncStatus.ahead} commit(s) ahead and ${syncStatus.behind} commit(s) behind.`));
@@ -51315,7 +51350,7 @@ var __webpack_exports__ = {};
                     return false;
                 }
                 if (!result.success) return false;
-                return await recreateSessionAndValidate(options);
+                return await deps.recreateSessionAndValidate(options);
             }
             const action = await logger_logger.select("How would you like to resolve this?", [
                 {
@@ -51339,8 +51374,8 @@ var __webpack_exports__ = {};
                 logger_logger.warn("Watch cancelled.");
                 return false;
             }
-            const changed = await recheckSyncStatus(stateCategory, branchName, options);
-            if (changed) return await checkSyncStatusAndStart(changed, options);
+            const changed = await deps.recheckSyncStatus(stateCategory, branchName, options);
+            if (changed) return await checkSyncStatusAndStart(changed, options, deps);
             if ("rebase" === action) {
                 const result = await fetchAndRebaseFromAnvil({
                     repoPath: options.repoPath,
@@ -51357,7 +51392,7 @@ var __webpack_exports__ = {};
                     return false;
                 }
                 if (!result.success) return false;
-                return await recreateSessionAndValidate(options);
+                return await deps.recreateSessionAndValidate(options);
             }
             if ("reset" === action) {
                 const resetWarning = hasUncommitted ? `This will discard ${syncStatus.ahead} local commit(s) and your uncommitted changes. Are you sure?` : `This will discard ${syncStatus.ahead} local commit(s). Are you sure?`;
@@ -51374,7 +51409,7 @@ var __webpack_exports__ = {};
                     username: options.username
                 });
                 if (!reset) return false;
-                return await recreateSessionAndValidate(options);
+                return await deps.recreateSessionAndValidate(options);
             }
             if ("push" === action) {
                 const confirmed = await logger_logger.confirm("This will overwrite Anvil's version. Are you sure?", false);
@@ -51382,7 +51417,7 @@ var __webpack_exports__ = {};
                     logger_logger.warn("Watch cancelled.");
                     return false;
                 }
-                const pushed = await pushToAnvil({
+                const pushed = await deps.pushToAnvil({
                     repoPath: options.repoPath,
                     appId: options.appId,
                     anvilUrl: options.anvilUrl,
@@ -51390,8 +51425,8 @@ var __webpack_exports__ = {};
                     username: options.username,
                     force: true
                 });
-                if (!pushed) return false;
-                return await recreateSessionAndValidate(options);
+                if (!pushed.success) return false;
+                return await deps.recreateSessionAndValidate(options);
             }
         } else {
             logger_logger.warn(`Your local repository is ${syncStatus.behind} commit(s) behind Anvil.`);
@@ -51402,8 +51437,8 @@ var __webpack_exports__ = {};
             else {
                 shouldSync = await logger_logger.confirm("Would you like to sync to the latest version from Anvil now?", true);
                 if (shouldSync) {
-                    const changed = await recheckSyncStatus(stateCategory, branchName, options);
-                    if (changed) return await checkSyncStatusAndStart(changed, options);
+                    const changed = await deps.recheckSyncStatus(stateCategory, branchName, options);
+                    if (changed) return await checkSyncStatusAndStart(changed, options, deps);
                 }
             }
             if (!shouldSync) {
@@ -51428,9 +51463,9 @@ var __webpack_exports__ = {};
                 logger_logger.error(`Failed to sync: ${errors_getErrorMessage(e)}`);
                 process.exit(1);
             }
-            return await recreateSessionAndValidate(options);
+            return await deps.recreateSessionAndValidate(options);
         }
-        await startWatchingWithEventHandlers(session, options);
+        await deps.startWatchingWithEventHandlers(session, options);
         return true;
     }
     async function startWatchingWithEventHandlers(session, options) {
@@ -51639,6 +51674,12 @@ var __webpack_exports__ = {};
                 process.exit(1);
             }
             logger_logger.verbose(chalk_source.green("✓ Authentication tokens found"));
+            await configureWatchGitAuth({
+                repoPath,
+                appId: finalAppId,
+                anvilUrl,
+                username
+            });
             logger_logger.progress("validate", `Validating app ID: ${finalAppId}`);
             const appIdValidation = await validateAppId(finalAppId, anvilUrl, username);
             logger_logger.progressEnd("validate");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anvil-works/anvil-cli",
-  "version": "0.5.10",
+  "version": "0.5.11",
   "description": "CLI tool for developing Anvil apps locally",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",