@anvil-works/anvil-cli 0.5.5 → 0.5.7

package/dist/cli.js

@@ -47629,12 +47629,14 @@ var __webpack_exports__ = {};
         editSession;
         username;
         reconnectAttempts = 0;
+        connectAttempts = 0;
         reconnectTimer = null;
         heartbeatTimer = null;
         pongTimeoutTimer = null;
         reconnectDelayMs;
         isClosing = false;
         sessionId;
+        lastDisconnectSummary = null;
         RECONNECT_DELAY_BASE_MS = 5000;
         RECONNECT_DELAY_MAX_MS = 60000;
         HEARTBEAT_INTERVAL_MS = 30000;
@@ -47652,6 +47654,7 @@ var __webpack_exports__ = {};
         }
         async connect() {
             this.isClosing = false;
+            this.connectAttempts++;
             if (this.ws?.readyState === ws_wrapper.OPEN) return void logger_logger.debug(`[WebSocket ${this.sessionId}]`, "WebSocket already open, skipping connection");
             if (this.ws) {
                 logger_logger.debug(`[WebSocket ${this.sessionId}]`, "Closing existing WebSocket before reconnecting");
@@ -47660,6 +47663,7 @@ var __webpack_exports__ = {};
             this.authToken = await auth_getValidAuthToken(this.anvilUrl, this.username);
             const wsUrl = getWebSocketUrl(this.appId, this.authToken, this.anvilUrl);
             logger_logger.debug(`[WebSocket ${this.sessionId}]`, `Connecting to: ${wsUrl.replace(this.authToken, "[TOKEN]")}`);
+            logger_logger.verbose(chalk_source.gray(`WebSocket connecting to ${this.getConnectionTarget(wsUrl)} (app ${this.appId}, branch ${this.currentBranch}, session ${this.sessionId}, connect attempt ${this.connectAttempts})`));
             this.ws = new ws_wrapper(wsUrl);
             this.ws.on("open", ()=>{
                 logger_logger.verbose(chalk_source.green("🔌 Connected to Anvil WebSocket"));
@@ -47676,6 +47680,21 @@ var __webpack_exports__ = {};
                 this.ws?.send(JSON.stringify(subscribeMsg));
                 this.emit("connected", void 0);
             });
+            this.ws.on("unexpected-response", (request, response)=>{
+                const summary = this.summarizeUnexpectedResponse(response, wsUrl);
+                this.lastDisconnectSummary = summary;
+                logger_logger.error(chalk_source.red(summary));
+                response.resume();
+                request.destroy();
+                if (this.isClosing) return;
+                this.stopHeartbeat();
+                this.ws = null;
+                this.emit("disconnected", {
+                    code: 1006,
+                    reason: summary
+                });
+                this.scheduleReconnect();
+            });
             this.ws.on("message", (data)=>{
                 this.markSocketResponsive();
                 try {
@@ -47700,6 +47719,7 @@ var __webpack_exports__ = {};
                     return;
                 }
                 if (this.isClosing) return;
+                this.lastDisconnectSummary = this.lastDisconnectSummary ?? this.formatCloseSummary(code, reason.toString());
                 this.emit("disconnected", {
                     code,
                     reason: reason.toString()
@@ -47709,8 +47729,13 @@ var __webpack_exports__ = {};
             this.ws.on("error", (error)=>{
                 logger_logger.debug(`[WebSocket ${this.sessionId}]`, `Error: ${error.message}`);
                 if (this.isClosing) return;
-                if (error.message.includes("502")) logger_logger.error(chalk_source.red("WebSocket connection failed (502 Bad Gateway) - likely a temporary server issue"));
-                else logger_logger.error(chalk_source.red(`WebSocket error: ${error.message}`));
+                if (error.message.includes("Unexpected server response")) return;
+                if (error.message.includes("502")) logger_logger.error(chalk_source.red(`WebSocket connection failed (502 Bad Gateway) - the server could not open the live update connection (${this.getConnectionContext()})`));
+                else {
+                    const details = this.getConnectionContext();
+                    logger_logger.error(chalk_source.red(`WebSocket error: ${error.message} (${details})`));
+                }
+                this.lastDisconnectSummary = `WebSocket error: ${error.message}`;
                 this.emit("error", {
                     error
                 });
@@ -47765,7 +47790,7 @@ var __webpack_exports__ = {};
             if (this.reconnectTimer || this.isClosing) return;
             this.reconnectAttempts++;
             const delayMs = this.reconnectDelayMs;
-            logger_logger.verbose(chalk_source.gray(`WebSocket disconnected, reconnecting in ${Math.round(delayMs / 1000)}s (attempt ${this.reconnectAttempts})...`));
+            logger_logger.verbose(chalk_source.gray(`WebSocket disconnected (${this.lastDisconnectSummary ?? "unknown cause"}), reconnecting in ${Math.round(delayMs / 1000)}s (${this.getConnectionContext()}, next connect attempt ${this.connectAttempts + 1})...`));
             this.reconnectTimer = setTimeout(()=>{
                 this.reconnectTimer = null;
                 this.connect().catch((error)=>{
@@ -47774,8 +47799,47 @@ var __webpack_exports__ = {};
                     });
                 });
             }, delayMs);
+            this.lastDisconnectSummary = null;
             this.reconnectDelayMs = Math.min(Math.round(1.5 * this.reconnectDelayMs), this.RECONNECT_DELAY_MAX_MS);
         }
+        getConnectionContext() {
+            return `app ${this.appId}, branch ${this.currentBranch}, session ${this.sessionId}`;
+        }
+        getConnectionTarget(wsUrl) {
+            const url = new URL(wsUrl);
+            return `${url.origin}${url.pathname}`;
+        }
+        formatCloseSummary(code, reason) {
+            const suffix = reason ? `, reason=${reason}` : "";
+            return `close code=${code}${suffix}`;
+        }
+        summarizeUnexpectedResponse(response, wsUrl) {
+            const statusCode = response.statusCode ?? "unknown";
+            const statusMessage = response.statusMessage ?? "Unknown";
+            const details = [
+                `target ${this.getConnectionTarget(wsUrl)}`,
+                this.getConnectionContext(),
+                this.getHandshakeMetadata(response)
+            ].filter(Boolean).join(", ");
+            return `WebSocket handshake failed (${statusCode} ${statusMessage}; ${details})`;
+        }
+        getHandshakeMetadata(response) {
+            const headers = response.headers;
+            const detailParts = [];
+            const requestId = this.getHeaderValue(headers["x-request-id"]) || this.getHeaderValue(headers["x-amzn-requestid"]) || this.getHeaderValue(headers["cf-ray"]);
+            const retryAfter = this.getHeaderValue(headers["retry-after"]);
+            const server = this.getHeaderValue(headers["server"]);
+            const via = this.getHeaderValue(headers["via"]);
+            if (requestId) detailParts.push(`request-id ${requestId}`);
+            if (retryAfter) detailParts.push(`retry-after ${retryAfter}`);
+            if (server) detailParts.push(`server ${server}`);
+            if (via) detailParts.push(`via ${via}`);
+            return detailParts.join(", ");
+        }
+        getHeaderValue(header) {
+            if (Array.isArray(header)) return header[0] ?? null;
+            return header ?? null;
+        }
         startHeartbeat() {
             this.stopHeartbeat();
             this.heartbeatTimer = setInterval(()=>{
@@ -47917,9 +47981,9 @@ var __webpack_exports__ = {};
             result.localOnlyChanges.forEach((c)=>logger_logger.verbose(chalk_source.gray(`     ${c.path}`)));
         }
     }
-    async function deleteFilesRemovedOnAnvil(gitService, unstagedFiles) {
+    async function deleteFilesRemovedOnAnvil(gitService, unstagedFiles, remotelyChangedFiles) {
         const filesToRemove = [];
-        for (const file of unstagedFiles)try {
+        for (const file of unstagedFiles)if (remotelyChangedFiles.has(file)) try {
             await gitService.show(`HEAD:${file}`);
         } catch (e) {
             filesToRemove.push(file);
@@ -48023,6 +48087,16 @@ var __webpack_exports__ = {};
     function normalizeClientCodePath(relativePath) {
         return relativePath.replace(/\\/g, "/");
     }
+    function isServerRequirementsPath(relativePath) {
+        return "server_code/requirements.txt" === relativePath.replace(/\\/g, "/");
+    }
+    async function readServerRequirements(repoPath) {
+        try {
+            return await external_fs_.promises.readFile(external_path_default().join(repoPath, "server_code", "requirements.txt"), "utf8");
+        } catch (error) {
+            return;
+        }
+    }
     function detectFormTemplate(relativePath) {
         const normalized = normalizeClientCodePath(relativePath);
         if (!normalized.startsWith("client_code/")) return null;
@@ -48486,6 +48560,44 @@ var __webpack_exports__ = {};
             type: "ignore",
             reason: "anvil.yaml handled specially (multiple save paths)"
         };
+        if (isServerRequirementsPath(relativePath)) {
+            if ("unlink" === changeType) {
+                const anvilYamlContent = await readFileContent(repoPath, "anvil.yaml", stagedOnly);
+                const anvilConfig = jsYaml.load(anvilYamlContent) ?? {};
+                const runtimeOptions = {
+                    ...anvilConfig.runtime_options ?? {}
+                };
+                const serverSpec = {
+                    ...runtimeOptions.server_spec ?? {}
+                };
+                delete serverSpec.requirements;
+                if (Object.keys(serverSpec).length > 0) return {
+                    type: "save",
+                    savePath: [
+                        "runtime_options",
+                        "server_spec"
+                    ],
+                    content: serverSpec
+                };
+                delete runtimeOptions.server_spec;
+                return {
+                    type: "save",
+                    savePath: [
+                        "runtime_options"
+                    ],
+                    content: runtimeOptions
+                };
+            }
+            return {
+                type: "save",
+                savePath: [
+                    "runtime_options",
+                    "server_spec",
+                    "requirements"
+                ],
+                content: await readFileContent(repoPath, relativePath, stagedOnly)
+            };
+        }
         if ("unlink" === changeType) return await handleFileDeletion(repoPath, relativePath, editorYaml);
         for (const route of ROUTES)if (route.matches(relativePath)) return await route.handle(repoPath, relativePath, changeType, editorYaml, stagedOnly);
         return {
@@ -48892,6 +49004,14 @@ var __webpack_exports__ = {};
             throw new Error(`Failed to parse anvil.yaml: ${error.message}. File may be in an invalid state.`);
         }
         if (!parsedYaml || "object" != typeof parsedYaml) throw new Error("anvil.yaml is not a valid YAML object");
+        const currentRequirements = await readServerRequirements(repoPath);
+        if (void 0 !== currentRequirements) parsedYaml.runtime_options = {
+            ...parsedYaml.runtime_options ?? {},
+            server_spec: {
+                ...parsedYaml.runtime_options?.server_spec ?? {},
+                requirements: currentRequirements
+            }
+        };
         if (!validateAnvilYaml(yamlContent)) throw new Error("anvil.yaml validation failed - see errors above");
         const changes = [];
         for (const [key, value] of Object.entries(parsedYaml))if (!previousYaml || !deepEqual(previousYaml[key], value)) changes.push({
@@ -49135,7 +49255,19 @@ var __webpack_exports__ = {};
         async getHeadAnvilYaml() {
             try {
                 const content = await this.config.gitService.show("HEAD:anvil.yaml");
-                return js_yaml_load(content);
+                const parsedYaml = js_yaml_load(content);
+                if (!parsedYaml || "object" != typeof parsedYaml) return null;
+                try {
+                    const requirements = await this.config.gitService.show("HEAD:server_code/requirements.txt");
+                    parsedYaml.runtime_options = {
+                        ...parsedYaml.runtime_options ?? {},
+                        server_spec: {
+                            ...parsedYaml.runtime_options?.server_spec ?? {},
+                            requirements
+                        }
+                    };
+                } catch (e) {}
+                return parsedYaml;
             } catch (e) {
                 return null;
             }
@@ -49429,21 +49561,24 @@ var __webpack_exports__ = {};
             const httpUrl = getGitFetchUrl(this.config.appId, this.config.getAuthToken(), this.config.anvilUrl);
             const currentBranch = this.config.getCurrentBranch();
             const tempRef = `anvil-sync-temp-${Date.now()}`;
+            const oldCommitId = this.config.getCommitId();
             await this.config.gitService.fetch(httpUrl, `+${currentBranch}:${tempRef}`);
             await this.config.gitService.reset(tempRef, "mixed");
             await this.config.gitService.deleteRef(`refs/heads/${tempRef}`);
+            const newCommitId = await this.config.gitService.getCommitId();
             await this.config.gitService.checkout([
                 ".anvil_editor.yaml",
                 "anvil.yaml"
             ]);
             await this.config.editorYaml.reload();
-            await this.deleteFilesRemovedOnAnvilLocally();
+            await this.deleteFilesRemovedOnAnvilLocally(oldCommitId, newCommitId);
             await this.discardFormattingOnlyYamlChanges();
         }
-        async deleteFilesRemovedOnAnvilLocally() {
+        async deleteFilesRemovedOnAnvilLocally(oldCommitId, newCommitId) {
             try {
                 const status = await this.config.gitService.getStatus();
-                await deleteFilesRemovedOnAnvil(this.config.gitService, status.notAdded);
+                const remotelyChangedFiles = await detectRemoteChanges(this.config.gitService, oldCommitId, newCommitId);
+                await deleteFilesRemovedOnAnvil(this.config.gitService, status.notAdded, remotelyChangedFiles);
             } catch (e) {
                 logger_logger.verbose(chalk_source.gray(`  Failed to check git status: ${errors_getErrorMessage(e)}`));
             }
@@ -50807,7 +50942,7 @@ var __webpack_exports__ = {};
     async function confirmReverseLookupWithResolvedUser(anvilUrl, username) {
         const resolvedUsername = await resolveUsernameForUrl(anvilUrl, username, `Multiple accounts found for ${anvilUrl}. Which account should be used for app lookup?`);
         if (null === resolvedUsername) return null;
-        const shouldContinue = await logger_logger.confirm(`Search ${anvilUrl} ${resolvedUsername ? `for ${resolvedUsername}` : ""} for matching app IDs? (slower)`, true);
+        const shouldContinue = await logger_logger.confirm(`Search ${anvilUrl} ${resolvedUsername ? `for ${resolvedUsername}` : ""} for matching app IDs? This is slower than detecting the app ID from local git remotes.`, true);
         return {
             username: resolvedUsername,
             shouldContinue
@@ -50864,6 +50999,11 @@ var __webpack_exports__ = {};
             };
             return null;
         }
+        if (1 === candidates.length) {
+            const [candidate] = candidates;
+            logger_logger.success("Auto-selected detected app ID: " + chalk_source.bold(candidate.appId));
+            return candidate;
+        }
         const choices = candidates.map((candidate, index)=>({
                 name: formatCandidateLabel(candidate),
                 value: index
@@ -50873,12 +51013,11 @@ var __webpack_exports__ = {};
             value: null
         });
         try {
-            const promptText = 1 === candidates.length ? "Confirm the detected app ID:" : "Select an app ID:";
             const answer = await logger_logger.prompt([
                 {
                     type: "list",
                     name: "appId",
-                    message: promptText,
+                    message: "Select an app ID:",
                     choices: choices,
                     pageSize: 10
                 }

package/dist/index.js

@@ -22643,12 +22643,14 @@ var __webpack_exports__ = {};
         editSession;
         username;
         reconnectAttempts = 0;
+        connectAttempts = 0;
         reconnectTimer = null;
         heartbeatTimer = null;
         pongTimeoutTimer = null;
         reconnectDelayMs;
         isClosing = false;
         sessionId;
+        lastDisconnectSummary = null;
         RECONNECT_DELAY_BASE_MS = 5000;
         RECONNECT_DELAY_MAX_MS = 60000;
         HEARTBEAT_INTERVAL_MS = 30000;
@@ -22666,6 +22668,7 @@ var __webpack_exports__ = {};
         }
         async connect() {
             this.isClosing = false;
+            this.connectAttempts++;
             if (this.ws?.readyState === ws_wrapper.OPEN) return void logger_logger.debug(`[WebSocket ${this.sessionId}]`, "WebSocket already open, skipping connection");
             if (this.ws) {
                 logger_logger.debug(`[WebSocket ${this.sessionId}]`, "Closing existing WebSocket before reconnecting");
@@ -22674,6 +22677,7 @@ var __webpack_exports__ = {};
             this.authToken = await auth_getValidAuthToken(this.anvilUrl, this.username);
             const wsUrl = getWebSocketUrl(this.appId, this.authToken, this.anvilUrl);
             logger_logger.debug(`[WebSocket ${this.sessionId}]`, `Connecting to: ${wsUrl.replace(this.authToken, "[TOKEN]")}`);
+            logger_logger.verbose(chalk_source.gray(`WebSocket connecting to ${this.getConnectionTarget(wsUrl)} (app ${this.appId}, branch ${this.currentBranch}, session ${this.sessionId}, connect attempt ${this.connectAttempts})`));
             this.ws = new ws_wrapper(wsUrl);
             this.ws.on("open", ()=>{
                 logger_logger.verbose(chalk_source.green("🔌 Connected to Anvil WebSocket"));
@@ -22690,6 +22694,21 @@ var __webpack_exports__ = {};
                 this.ws?.send(JSON.stringify(subscribeMsg));
                 this.emit("connected", void 0);
             });
+            this.ws.on("unexpected-response", (request, response)=>{
+                const summary = this.summarizeUnexpectedResponse(response, wsUrl);
+                this.lastDisconnectSummary = summary;
+                logger_logger.error(chalk_source.red(summary));
+                response.resume();
+                request.destroy();
+                if (this.isClosing) return;
+                this.stopHeartbeat();
+                this.ws = null;
+                this.emit("disconnected", {
+                    code: 1006,
+                    reason: summary
+                });
+                this.scheduleReconnect();
+            });
             this.ws.on("message", (data)=>{
                 this.markSocketResponsive();
                 try {
@@ -22714,6 +22733,7 @@ var __webpack_exports__ = {};
                     return;
                 }
                 if (this.isClosing) return;
+                this.lastDisconnectSummary = this.lastDisconnectSummary ?? this.formatCloseSummary(code, reason.toString());
                 this.emit("disconnected", {
                     code,
                     reason: reason.toString()
@@ -22723,8 +22743,13 @@ var __webpack_exports__ = {};
             this.ws.on("error", (error)=>{
                 logger_logger.debug(`[WebSocket ${this.sessionId}]`, `Error: ${error.message}`);
                 if (this.isClosing) return;
-                if (error.message.includes("502")) logger_logger.error(chalk_source.red("WebSocket connection failed (502 Bad Gateway) - likely a temporary server issue"));
-                else logger_logger.error(chalk_source.red(`WebSocket error: ${error.message}`));
+                if (error.message.includes("Unexpected server response")) return;
+                if (error.message.includes("502")) logger_logger.error(chalk_source.red(`WebSocket connection failed (502 Bad Gateway) - the server could not open the live update connection (${this.getConnectionContext()})`));
+                else {
+                    const details = this.getConnectionContext();
+                    logger_logger.error(chalk_source.red(`WebSocket error: ${error.message} (${details})`));
+                }
+                this.lastDisconnectSummary = `WebSocket error: ${error.message}`;
                 this.emit("error", {
                     error
                 });
@@ -22779,7 +22804,7 @@ var __webpack_exports__ = {};
             if (this.reconnectTimer || this.isClosing) return;
             this.reconnectAttempts++;
             const delayMs = this.reconnectDelayMs;
-            logger_logger.verbose(chalk_source.gray(`WebSocket disconnected, reconnecting in ${Math.round(delayMs / 1000)}s (attempt ${this.reconnectAttempts})...`));
+            logger_logger.verbose(chalk_source.gray(`WebSocket disconnected (${this.lastDisconnectSummary ?? "unknown cause"}), reconnecting in ${Math.round(delayMs / 1000)}s (${this.getConnectionContext()}, next connect attempt ${this.connectAttempts + 1})...`));
             this.reconnectTimer = setTimeout(()=>{
                 this.reconnectTimer = null;
                 this.connect().catch((error)=>{
@@ -22788,8 +22813,47 @@ var __webpack_exports__ = {};
                     });
                 });
             }, delayMs);
+            this.lastDisconnectSummary = null;
             this.reconnectDelayMs = Math.min(Math.round(1.5 * this.reconnectDelayMs), this.RECONNECT_DELAY_MAX_MS);
         }
+        getConnectionContext() {
+            return `app ${this.appId}, branch ${this.currentBranch}, session ${this.sessionId}`;
+        }
+        getConnectionTarget(wsUrl) {
+            const url = new URL(wsUrl);
+            return `${url.origin}${url.pathname}`;
+        }
+        formatCloseSummary(code, reason) {
+            const suffix = reason ? `, reason=${reason}` : "";
+            return `close code=${code}${suffix}`;
+        }
+        summarizeUnexpectedResponse(response, wsUrl) {
+            const statusCode = response.statusCode ?? "unknown";
+            const statusMessage = response.statusMessage ?? "Unknown";
+            const details = [
+                `target ${this.getConnectionTarget(wsUrl)}`,
+                this.getConnectionContext(),
+                this.getHandshakeMetadata(response)
+            ].filter(Boolean).join(", ");
+            return `WebSocket handshake failed (${statusCode} ${statusMessage}; ${details})`;
+        }
+        getHandshakeMetadata(response) {
+            const headers = response.headers;
+            const detailParts = [];
+            const requestId = this.getHeaderValue(headers["x-request-id"]) || this.getHeaderValue(headers["x-amzn-requestid"]) || this.getHeaderValue(headers["cf-ray"]);
+            const retryAfter = this.getHeaderValue(headers["retry-after"]);
+            const server = this.getHeaderValue(headers["server"]);
+            const via = this.getHeaderValue(headers["via"]);
+            if (requestId) detailParts.push(`request-id ${requestId}`);
+            if (retryAfter) detailParts.push(`retry-after ${retryAfter}`);
+            if (server) detailParts.push(`server ${server}`);
+            if (via) detailParts.push(`via ${via}`);
+            return detailParts.join(", ");
+        }
+        getHeaderValue(header) {
+            if (Array.isArray(header)) return header[0] ?? null;
+            return header ?? null;
+        }
         startHeartbeat() {
             this.stopHeartbeat();
             this.heartbeatTimer = setInterval(()=>{
@@ -22931,9 +22995,9 @@ var __webpack_exports__ = {};
             result.localOnlyChanges.forEach((c)=>logger_logger.verbose(chalk_source.gray(`     ${c.path}`)));
         }
     }
-    async function deleteFilesRemovedOnAnvil(gitService, unstagedFiles) {
+    async function deleteFilesRemovedOnAnvil(gitService, unstagedFiles, remotelyChangedFiles) {
         const filesToRemove = [];
-        for (const file of unstagedFiles)try {
+        for (const file of unstagedFiles)if (remotelyChangedFiles.has(file)) try {
             await gitService.show(`HEAD:${file}`);
         } catch (e) {
             filesToRemove.push(file);
@@ -23536,6 +23600,16 @@ var __webpack_exports__ = {};
     function normalizeClientCodePath(relativePath) {
         return relativePath.replace(/\\/g, "/");
     }
+    function isServerRequirementsPath(relativePath) {
+        return "server_code/requirements.txt" === relativePath.replace(/\\/g, "/");
+    }
+    async function readServerRequirements(repoPath) {
+        try {
+            return await external_fs_.promises.readFile(external_path_default().join(repoPath, "server_code", "requirements.txt"), "utf8");
+        } catch (error) {
+            return;
+        }
+    }
     function detectFormTemplate(relativePath) {
         const normalized = normalizeClientCodePath(relativePath);
         if (!normalized.startsWith("client_code/")) return null;
@@ -23999,6 +24073,44 @@ var __webpack_exports__ = {};
             type: "ignore",
             reason: "anvil.yaml handled specially (multiple save paths)"
         };
+        if (isServerRequirementsPath(relativePath)) {
+            if ("unlink" === changeType) {
+                const anvilYamlContent = await readFileContent(repoPath, "anvil.yaml", stagedOnly);
+                const anvilConfig = jsYaml.load(anvilYamlContent) ?? {};
+                const runtimeOptions = {
+                    ...anvilConfig.runtime_options ?? {}
+                };
+                const serverSpec = {
+                    ...runtimeOptions.server_spec ?? {}
+                };
+                delete serverSpec.requirements;
+                if (Object.keys(serverSpec).length > 0) return {
+                    type: "save",
+                    savePath: [
+                        "runtime_options",
+                        "server_spec"
+                    ],
+                    content: serverSpec
+                };
+                delete runtimeOptions.server_spec;
+                return {
+                    type: "save",
+                    savePath: [
+                        "runtime_options"
+                    ],
+                    content: runtimeOptions
+                };
+            }
+            return {
+                type: "save",
+                savePath: [
+                    "runtime_options",
+                    "server_spec",
+                    "requirements"
+                ],
+                content: await readFileContent(repoPath, relativePath, stagedOnly)
+            };
+        }
         if ("unlink" === changeType) return await handleFileDeletion(repoPath, relativePath, editorYaml);
         for (const route of ROUTES)if (route.matches(relativePath)) return await route.handle(repoPath, relativePath, changeType, editorYaml, stagedOnly);
         return {
@@ -24405,6 +24517,14 @@ var __webpack_exports__ = {};
             throw new Error(`Failed to parse anvil.yaml: ${error.message}. File may be in an invalid state.`);
         }
         if (!parsedYaml || "object" != typeof parsedYaml) throw new Error("anvil.yaml is not a valid YAML object");
+        const currentRequirements = await readServerRequirements(repoPath);
+        if (void 0 !== currentRequirements) parsedYaml.runtime_options = {
+            ...parsedYaml.runtime_options ?? {},
+            server_spec: {
+                ...parsedYaml.runtime_options?.server_spec ?? {},
+                requirements: currentRequirements
+            }
+        };
         if (!validateAnvilYaml(yamlContent)) throw new Error("anvil.yaml validation failed - see errors above");
         const changes = [];
         for (const [key, value] of Object.entries(parsedYaml))if (!previousYaml || !deepEqual(previousYaml[key], value)) changes.push({
@@ -24648,7 +24768,19 @@ var __webpack_exports__ = {};
         async getHeadAnvilYaml() {
             try {
                 const content = await this.config.gitService.show("HEAD:anvil.yaml");
-                return load(content);
+                const parsedYaml = load(content);
+                if (!parsedYaml || "object" != typeof parsedYaml) return null;
+                try {
+                    const requirements = await this.config.gitService.show("HEAD:server_code/requirements.txt");
+                    parsedYaml.runtime_options = {
+                        ...parsedYaml.runtime_options ?? {},
+                        server_spec: {
+                            ...parsedYaml.runtime_options?.server_spec ?? {},
+                            requirements
+                        }
+                    };
+                } catch (e) {}
+                return parsedYaml;
             } catch (e) {
                 return null;
             }
@@ -24942,21 +25074,24 @@ var __webpack_exports__ = {};
             const httpUrl = getGitFetchUrl(this.config.appId, this.config.getAuthToken(), this.config.anvilUrl);
             const currentBranch = this.config.getCurrentBranch();
             const tempRef = `anvil-sync-temp-${Date.now()}`;
+            const oldCommitId = this.config.getCommitId();
             await this.config.gitService.fetch(httpUrl, `+${currentBranch}:${tempRef}`);
             await this.config.gitService.reset(tempRef, "mixed");
             await this.config.gitService.deleteRef(`refs/heads/${tempRef}`);
+            const newCommitId = await this.config.gitService.getCommitId();
             await this.config.gitService.checkout([
                 ".anvil_editor.yaml",
                 "anvil.yaml"
             ]);
             await this.config.editorYaml.reload();
-            await this.deleteFilesRemovedOnAnvilLocally();
+            await this.deleteFilesRemovedOnAnvilLocally(oldCommitId, newCommitId);
             await this.discardFormattingOnlyYamlChanges();
         }
-        async deleteFilesRemovedOnAnvilLocally() {
+        async deleteFilesRemovedOnAnvilLocally(oldCommitId, newCommitId) {
             try {
                 const status = await this.config.gitService.getStatus();
-                await deleteFilesRemovedOnAnvil(this.config.gitService, status.notAdded);
+                const remotelyChangedFiles = await detectRemoteChanges(this.config.gitService, oldCommitId, newCommitId);
+                await deleteFilesRemovedOnAnvil(this.config.gitService, status.notAdded, remotelyChangedFiles);
             } catch (e) {
                 logger_logger.verbose(chalk_source.gray(`  Failed to check git status: ${errors_getErrorMessage(e)}`));
             }

package/package.json

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