@anvil-works/anvil-cli 0.3.9 → 0.3.11

package/dist/index.js

@@ -19420,7 +19420,10 @@ var __webpack_exports__ = {};
             const handlers = this.listeners.get(event);
             if (handlers) handlers.forEach((handler)=>{
                 try {
-                    handler(data);
+                    const result = handler(data);
+                    if (result && "function" == typeof result.catch) result.catch((error)=>{
+                        this.onError(String(event), error);
+                    });
                 } catch (error) {
                     this.onError(String(event), error);
                 }
@@ -19762,6 +19765,30 @@ var __webpack_exports__ = {};
                 throw createGitError.commandFailed("checkout", e.message);
             }
         }
+        async stash(message) {
+            try {
+                const args = [
+                    "stash",
+                    "push",
+                    "--include-untracked"
+                ];
+                if (message) args.push("-m", message);
+                const result = await this.git.raw(args);
+                return !result.includes("No local changes to save");
+            } catch (e) {
+                throw createGitError.commandFailed("stash", e.message);
+            }
+        }
+        async stashPop() {
+            try {
+                await this.git.raw([
+                    "stash",
+                    "pop"
+                ]);
+            } catch (e) {
+                throw createGitError.commandFailed("stash pop", e.message);
+            }
+        }
         async clean(files) {
             try {
                 await this.git.clean(CleanOptions.FORCE, files);
@@ -19809,6 +19836,43 @@ var __webpack_exports__ = {};
                 throw createGitError.commandFailed("show", e.message);
             }
         }
+        async push(url, refSpec, force = false) {
+            try {
+                const args = force ? [
+                    "push",
+                    "--force",
+                    url,
+                    refSpec
+                ] : [
+                    "push",
+                    url,
+                    refSpec
+                ];
+                await this.git.raw(args);
+            } catch (e) {
+                throw createGitError.commandFailed("push", e.message);
+            }
+        }
+        async rebase(onto) {
+            try {
+                await this.git.raw([
+                    "rebase",
+                    onto
+                ]);
+            } catch (e) {
+                throw createGitError.commandFailed("rebase", e.message);
+            }
+        }
+        async rebaseAbort() {
+            try {
+                await this.git.raw([
+                    "rebase",
+                    "--abort"
+                ]);
+            } catch (e) {
+                throw createGitError.commandFailed("rebase --abort", e.message);
+            }
+        }
         async deleteRef(ref) {
             try {
                 await this.git.raw([
@@ -21824,7 +21888,13 @@ var __webpack_exports__ = {};
                 if (this.reconnectAttempts < this.MAX_RECONNECT_ATTEMPTS) {
                     this.reconnectAttempts++;
                     logger_logger.verbose(chalk_source.gray(`WebSocket disconnected, reconnecting in ${this.RECONNECT_DELAY / 1000}s (attempt ${this.reconnectAttempts}/${this.MAX_RECONNECT_ATTEMPTS})...`));
-                    this.reconnectTimer = setTimeout(()=>this.connect(), this.RECONNECT_DELAY);
+                    this.reconnectTimer = setTimeout(()=>{
+                        this.connect().catch((error)=>{
+                            this.emit("error", {
+                                error: error instanceof Error ? error : new Error(String(error))
+                            });
+                        });
+                    }, this.RECONNECT_DELAY);
                 } else logger_logger.warn(chalk_source.yellow(` WebSocket reconnection failed after ${this.MAX_RECONNECT_ATTEMPTS} attempts. Real-time sync disabled.`));
             });
             this.ws.on("error", (error)=>{
@@ -23495,7 +23565,11 @@ var __webpack_exports__ = {};
             this.hasPendingChanges = true;
             if (this.debounceTimer) clearTimeout(this.debounceTimer);
             if (isFirstChange) logger_logger.progress("sync", "Change detected");
-            this.debounceTimer = setTimeout(()=>this.processSaveBatchWithEvents(), this.SAVE_DEBOUNCE_MS);
+            this.debounceTimer = setTimeout(()=>{
+                this.processSaveBatchWithEvents().catch((error)=>{
+                    logger_logger.error(`Save failed: ${errors_getErrorMessage(error)}`);
+                });
+            }, this.SAVE_DEBOUNCE_MS);
         }
         async forceSave() {
             if (this.debounceTimer) {
@@ -23862,8 +23936,11 @@ var __webpack_exports__ = {};
         }
         async handleConflict(json_resp, originalFilePaths, retryCount) {
             if (retryCount >= this.MAX_RETRIES) {
-                logger_logger.error(`Save failed after ${this.MAX_RETRIES} retries - version conflict`);
-                logger_logger.warn("Please resolve conflicts manually or restart anvil sync");
+                logger_logger.error(`Save failed after ${this.MAX_RETRIES} retries due to version conflicts.`);
+                logger_logger.warn("This usually means someone else is editing the app at the same time.");
+                this.emit("max-retries-exceeded", {
+                    retries: this.MAX_RETRIES
+                });
                 throw createSaveError.maxRetriesExceeded(this.MAX_RETRIES);
             }
             let conflictReason = "Unknown conflict";
@@ -24198,6 +24275,7 @@ var __webpack_exports__ = {};
             this.saveProcessor.on("save-complete", (data)=>this.emit("save-complete", data));
             this.saveProcessor.on("validation-failed", (data)=>this.emit("validation-failed", data));
             this.saveProcessor.on("sync-conflict", (data)=>this.emit("sync-conflict", data));
+            this.saveProcessor.on("max-retries-exceeded", (data)=>this.emit("max-retries-exceeded", data));
         }
         async connectWebSocket() {
             this.wsClient = new WebSocketClient({
@@ -24270,7 +24348,11 @@ var __webpack_exports__ = {};
                 this.saveProcessor?.queueSave();
             });
             this.fileWatcher.on("file-change", async ({ event, path: filePath, relativePath })=>{
-                await this.handleFileChange(event, filePath, relativePath);
+                try {
+                    await this.handleFileChange(event, filePath, relativePath);
+                } catch (error) {
+                    logger_logger.error(`Error handling file change for ${relativePath}: ${error.message}`);
+                }
             });
             await this.fileWatcher.start(this.currentBranch);
             await new Promise(()=>{});
@@ -24460,7 +24542,12 @@ var __webpack_exports__ = {};
             }
             const allBranches = data.apps?.flatMap((app)=>app.branches || []) || [];
             const branchExistsOnAnvil = allBranches.some((b)=>b === branchName);
-            if (!branchExistsOnAnvil) throw createValidationError.invalidApp(branchName, `Branch '${branchName}' doesn't exist on Anvil yet. Push to Anvil first: git push anvil ${branchName}`);
+            if (!branchExistsOnAnvil) return {
+                behind: 0,
+                ahead: 0,
+                diverged: false,
+                branchMissing: true
+            };
             throw createValidationError.invalidApp(appId, `Anvil server doesn't recognize commit ${commitId.substring(0, 8)} on branch '${branchName}'. Please pull the latest changes from Anvil before starting sync.`);
         } catch (e) {
             if (e.type) throw e;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anvil-works/anvil-cli",
-  "version": "0.3.9",
+  "version": "0.3.11",
   "description": "CLI tool for developing Anvil apps locally",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,6 +15,7 @@
   },
   "keywords": [
     "anvil",
+    "watch",
     "sync",
     "cli",
     "git",