@anvil-works/anvil-cli 0.7.0-canary.17 → 0.7.0-canary.19

package/README.md

@@ -170,17 +170,18 @@ Useful options:
 
 ### `anvil validate`
 
-Check an Anvil app file before syncing, or when the CLI reports a validation error.
+Check an Anvil app file or directory before syncing, or when the CLI reports a validation error.
 
 ```bash
-anvil validate <file>
+anvil validate <path>
 ```
 
-The command chooses the validator from the file path. It supports:
+When given a file, the command chooses the validator from the file path. When given a directory, it recursively validates supported files under that directory. It supports:
 
 - `anvil.yaml`
 - `.yaml` files under `client_code/`, including `client_code/**/form_template.yaml`
 - `.html` files under `client_code/`, including `client_code/**/form_template.html` and module-form `client_code/<Form>.html`
+- `.py` files under `client_code/` and `server_code/`
 
 Common examples:
 
@@ -190,10 +191,15 @@ anvil validate client_code/Form1/form_template.yaml
 anvil validate client_code/Form1.yaml
 anvil validate client_code/Form1/form_template.html
 anvil validate client_code/Form1.html
+anvil validate client_code/Helpers.py
+anvil validate server_code/ServerModule.py
+anvil validate .
 ```
 
 HTML validation parses the template with `@anvil-works/form-template-parser`, checks optional YAML frontmatter, and reports semantic issues such as duplicate explicit component names or invalid component types.
 
+Python validation checks syntax using a local Python interpreter (`ANVIL_PYTHON`, `python3`, or `python`). Form Python under `client_code/` also checks for the matching designer-template import and form class inheritance when a sibling form template exists.
+
 When the file is valid, the command prints a success message and exits with status `0`. When the file is invalid, it prints path-specific validation issues and exits with a non-zero status.
 
 Use `--json` with `anvil validate` to emit structured NDJSON output for scripts or LLM tooling.

package/dist/WatchSession.d.ts

@@ -7,6 +7,10 @@ export interface WatchSessionEvents {
         oldBranch: string;
         newBranch: string;
     };
+    "external-branch-changed": {
+        oldBranch: string;
+        newBranch: string;
+    };
     "env-branch-switch-started": {
         envPid: string;
         oldBranch: string;
@@ -113,6 +117,7 @@ export declare class WatchSession extends Emitter<WatchSessionEvents> {
     private environment?;
     private envBranchChangeMode;
     private isSwitchingForEnvironment;
+    private environmentSwitchTargetBranch;
     private dependencyWatchEnabled;
     private isRefreshingDependencies;
     private hasPendingDependencyRefresh;
@@ -158,6 +163,7 @@ export declare class WatchSession extends Emitter<WatchSessionEvents> {
     }>;
     cleanup(): void;
     startWatching(): Promise<void>;
+    private handleFileWatcherBranchChange;
     startWatchingInBackground(onError?: (error: unknown) => void): void;
     private initializeLocalChangeFingerprint;
     private startLocalChangeFallbackPolling;

package/dist/WatchSession.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WatchSession.d.ts","sourceRoot":"","sources":["../src/WatchSession.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"WatchSession.d.ts","sourceRoot":"","sources":["../src/WatchSession.ts"],"names":[],"mappings":"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"}

package/dist/cli.js

@@ -16288,6 +16288,167 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             ok: true
         };
     }
+    const PYTHON_VALIDATOR_SCRIPT = String.raw`
+import ast
+import json
+import sys
+
+
+def issue_path(error):
+    if getattr(error, "lineno", None) is None:
+        return "root"
+    if getattr(error, "offset", None) is None:
+        return f"line {error.lineno}"
+    return f"line {error.lineno}, column {error.offset}"
+
+
+def base_name(node):
+    if isinstance(node, ast.Name):
+        return node.id
+    if isinstance(node, ast.Attribute):
+        return node.attr
+    return None
+
+
+def imports_template_from_anvil_designer(node, template_name):
+    if node.level < 1:
+        return False
+    if node.module not in ("_anvil_designer", None):
+        return False
+    return any(alias.name == template_name for alias in node.names)
+
+
+file_path = sys.argv[1]
+class_name = sys.argv[2]
+template_name = f"{class_name}Template" if class_name else ""
+source = sys.stdin.read()
+issues = []
+
+try:
+    compile(source, file_path, "exec")
+except SyntaxError as error:
+    issues.append({"path": issue_path(error), "message": error.msg})
+    print(json.dumps({"issues": issues}))
+    sys.exit(0)
+
+if class_name:
+    tree = ast.parse(source, filename=file_path)
+    has_template_import = False
+    has_form_class = False
+
+    for node in ast.walk(tree):
+        if isinstance(node, ast.ImportFrom) and imports_template_from_anvil_designer(node, template_name):
+            has_template_import = True
+        elif isinstance(node, ast.ClassDef) and node.name == class_name:
+            if any(base_name(base) == template_name for base in node.bases):
+                has_form_class = True
+
+    if not has_template_import:
+        issues.append({
+            "path": "root",
+            "message": f"missing {chr(96)}from ._anvil_designer import {template_name}{chr(96)}",
+        })
+    if not has_form_class:
+        issues.append({
+            "path": "root",
+            "message": f"missing class {chr(96)}{class_name}{chr(96)} inheriting from {chr(96)}{template_name}{chr(96)}",
+        })
+
+print(json.dumps({"issues": issues}))
+`;
+    function findPythonInterpreter() {
+        const candidates = [
+            process.env.ANVIL_PYTHON,
+            "python3",
+            "python"
+        ].filter((candidate)=>"string" == typeof candidate && candidate.length > 0);
+        for (const candidate of candidates){
+            const result = (0, external_child_process_namespaceObject.spawnSync)(candidate, [
+                "--version"
+            ], {
+                encoding: "utf8"
+            });
+            if (!result.error && 0 === result.status) return candidate;
+        }
+        return null;
+    }
+    function isClientFormPython(filePath) {
+        if ("__init__.py" === external_path_default().basename(filePath)) {
+            const formDir = external_path_default().dirname(filePath);
+            return external_fs_.existsSync(external_path_default().join(formDir, "form_template.html")) || external_fs_.existsSync(external_path_default().join(formDir, "form_template.yaml"));
+        }
+        const parsed = external_path_default().parse(filePath);
+        return external_fs_.existsSync(external_path_default().join(parsed.dir, `${parsed.name}.html`)) || external_fs_.existsSync(external_path_default().join(parsed.dir, `${parsed.name}.yaml`));
+    }
+    function expectedFormClassName(filePath) {
+        if (!isClientFormPython(filePath)) return null;
+        if ("__init__.py" === external_path_default().basename(filePath)) return external_path_default().basename(external_path_default().dirname(filePath));
+        return external_path_default().basename(filePath, ".py");
+    }
+    function isUnderDirectory(filePath, directoryPath) {
+        const relativePath = external_path_default().relative(directoryPath, filePath);
+        return relativePath.length > 0 && !relativePath.startsWith("..") && !external_path_default().isAbsolute(relativePath);
+    }
+    function validatePython(filePath, fileContent, appRoot) {
+        const interpreter = findPythonInterpreter();
+        if (!interpreter) return {
+            ok: false,
+            message: "Python file could not be validated",
+            issues: [
+                {
+                    path: "root",
+                    message: "Python validation requires python3 or python on PATH, or ANVIL_PYTHON to be set"
+                }
+            ]
+        };
+        const absolutePath = external_path_default().resolve(filePath);
+        const clientCodeRoot = appRoot ? external_path_default().join(appRoot, "client_code") : null;
+        const formClassName = clientCodeRoot && isUnderDirectory(absolutePath, clientCodeRoot) ? expectedFormClassName(absolutePath) : null;
+        const result = (0, external_child_process_namespaceObject.spawnSync)(interpreter, [
+            "-c",
+            PYTHON_VALIDATOR_SCRIPT,
+            filePath,
+            formClassName ?? ""
+        ], {
+            encoding: "utf8",
+            input: fileContent,
+            maxBuffer: 1048576
+        });
+        if (result.error || 0 !== result.status) return {
+            ok: false,
+            message: "Python file could not be validated",
+            issues: [
+                {
+                    path: "root",
+                    message: result.error?.message ?? (result.stderr.trim() || "Python validator failed")
+                }
+            ]
+        };
+        let parsed;
+        try {
+            parsed = JSON.parse(result.stdout);
+        } catch (error) {
+            return {
+                ok: false,
+                message: "Python file could not be validated",
+                issues: [
+                    {
+                        path: "root",
+                        message: error instanceof Error ? error.message : String(error)
+                    }
+                ]
+            };
+        }
+        const issues = parsed.issues ?? [];
+        if (issues.length > 0) return {
+            ok: false,
+            message: "Python file is invalid for Anvil",
+            issues
+        };
+        return {
+            ok: true
+        };
+    }
     const validators_IDENTIFIER_RE = /^[A-Za-z_][A-Za-z0-9_]*$/;
     const DB_ACCESS_LEVELS = new Set([
         "none",
@@ -16685,6 +16846,13 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             const relativeToClientCode = normalizedPath.slice(startIndex + clientCodePrefix.length);
             if (relativeToClientCode.endsWith(".yaml")) return "form_template.yaml";
             if (relativeToClientCode.endsWith(".html")) return "form_template.html";
+            if (relativeToClientCode.endsWith(".py")) return "python";
+        }
+        const serverCodePrefix = "server_code/";
+        if (normalizedPath.startsWith(serverCodePrefix) || normalizedPath.includes(`/${serverCodePrefix}`)) {
+            const startIndex = normalizedPath.lastIndexOf(serverCodePrefix);
+            const relativeToServerCode = normalizedPath.slice(startIndex + serverCodePrefix.length);
+            if (relativeToServerCode.endsWith(".py")) return "python";
         }
         return null;
     }
@@ -16792,6 +16960,35 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
                 target
             };
         }
+        if ("python" === target) {
+            if (existingPath && appRoot) {
+                const clientCodeRoot = external_path_default().join(appRoot, "client_code");
+                const serverCodeRoot = external_path_default().join(appRoot, "server_code");
+                const relativeToClientCode = external_path_default().relative(clientCodeRoot, existingPath);
+                const relativeToServerCode = external_path_default().relative(serverCodeRoot, existingPath);
+                const isInsideClientCode = relativeToClientCode.length > 0 && !relativeToClientCode.startsWith("..") && !external_path_default().isAbsolute(relativeToClientCode);
+                const isInsideServerCode = relativeToServerCode.length > 0 && !relativeToServerCode.startsWith("..") && !external_path_default().isAbsolute(relativeToServerCode);
+                if (!isInsideClientCode && !isInsideServerCode || !existingPath.endsWith(".py")) return {
+                    ok: false,
+                    target,
+                    message: "File is not an Anvil app Python file",
+                    issues: [
+                        {
+                            path: "",
+                            message: `expected a .py file under ${clientCodeRoot} or ${serverCodeRoot}`
+                        }
+                    ]
+                };
+            }
+            const result = validatePython(filePath, fileContent, appRoot);
+            return result.ok ? {
+                ok: true,
+                target
+            } : {
+                ...result,
+                target
+            };
+        }
         return {
             ok: false,
             target: "unknown",
@@ -16799,7 +16996,7 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             issues: [
                 {
                     path: "",
-                    message: "supported paths are anvil.yaml, client_code/**/form_template.yaml, client_code/**/*.yaml, and client_code/**/*.html"
+                    message: "supported paths are anvil.yaml, client_code/**/form_template.yaml, client_code/**/*.yaml, client_code/**/*.html, client_code/**/*.py, and server_code/**/*.py"
                 }
             ]
         };
@@ -18746,6 +18943,7 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
         environment;
         envBranchChangeMode;
         isSwitchingForEnvironment = false;
+        environmentSwitchTargetBranch = null;
         dependencyWatchEnabled;
         isRefreshingDependencies = false;
         hasPendingDependencyRefresh = false;
@@ -18970,6 +19168,7 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
         async switchToEnvironmentBranch(targetBranch, source) {
             if (this.isCleanedUp) return;
             this.isSwitchingForEnvironment = true;
+            this.environmentSwitchTargetBranch = targetBranch;
             const oldPausedState = this.isPausedForUserInput;
             try {
                 const status = await this.gitService.getStatus();
@@ -19031,6 +19230,7 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             } finally{
                 this.isPausedForUserInput = oldPausedState;
                 this.isSwitchingForEnvironment = false;
+                this.environmentSwitchTargetBranch = null;
             }
             const pendingSwitch = this.pendingEnvironmentBranchSwitch;
             this.pendingEnvironmentBranchSwitch = null;
@@ -19118,16 +19318,7 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
                 getCurrentBranch: async ()=>this.gitService.getCurrentBranch()
             });
             this.fileWatcher.on("branch-change", ({ newBranch })=>{
-                const oldBranch = this.currentBranch;
-                logger_logger.verbose(external_chalk_default().gray("   Pausing sync for 2 seconds to allow branch to settle..."));
-                this.currentBranch = newBranch;
-                this.lastBranchChangeTime = Date.now();
-                this.wsClient?.updateBranch(newBranch);
-                this.queueDependencyRefresh("branch changed");
-                this.emit("branch-changed", {
-                    oldBranch,
-                    newBranch
-                });
+                this.handleFileWatcherBranchChange(newBranch);
             });
             this.fileWatcher.on("index-change", ()=>{
                 this.saveProcessor?.queueSave();
@@ -19144,6 +19335,23 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             this.startLocalChangeFallbackPolling();
             await new Promise(()=>{});
         }
+        handleFileWatcherBranchChange(newBranch) {
+            if (this.isSwitchingForEnvironment && newBranch === this.environmentSwitchTargetBranch) return void logger_logger.debug(`Ignoring FileWatcher branch-change during environment switch: ${newBranch}`);
+            const oldBranch = this.currentBranch;
+            logger_logger.verbose(external_chalk_default().gray("   Pausing sync for 2 seconds to allow branch to settle..."));
+            this.currentBranch = newBranch;
+            this.lastBranchChangeTime = Date.now();
+            this.wsClient?.updateBranch(newBranch);
+            this.queueDependencyRefresh("branch changed");
+            this.emit("external-branch-changed", {
+                oldBranch,
+                newBranch
+            });
+            this.emit("branch-changed", {
+                oldBranch,
+                newBranch
+            });
+        }
         startWatchingInBackground(onError) {
             this.startWatching().catch((error)=>{
                 this.cleanup();
@@ -22921,6 +23129,123 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             }
         }).catch(()=>{});
     }
+    function collectValidationFiles(dir) {
+        const files = [];
+        const ignoredDirectories = new Set([
+            ".anvil",
+            ".git",
+            "node_modules",
+            "__pycache__"
+        ]);
+        function walk(currentDir) {
+            for (const entry of (0, external_fs_.readdirSync)(currentDir, {
+                withFileTypes: true
+            })){
+                const entryPath = (0, external_path_namespaceObject.join)(currentDir, entry.name);
+                if (entry.isDirectory()) {
+                    if (!ignoredDirectories.has(entry.name)) walk(entryPath);
+                    continue;
+                }
+                if (entry.isFile() && inferValidationTarget(entryPath)) files.push(entryPath);
+            }
+        }
+        walk(dir);
+        return files.sort();
+    }
+    function validateSingleFile(file) {
+        let fileContent;
+        try {
+            fileContent = (0, external_fs_.readFileSync)(file, "utf8");
+        } catch (error) {
+            return {
+                file,
+                type: "unknown",
+                valid: false,
+                error: `Failed to read ${file}: ${error.message}`,
+                issues: [
+                    {
+                        path: "",
+                        message: error.message
+                    }
+                ]
+            };
+        }
+        const result = validatePath(file, fileContent);
+        if (result.ok) return {
+            file,
+            type: result.target,
+            valid: true
+        };
+        return {
+            file,
+            type: result.target,
+            valid: false,
+            error: result.message,
+            issues: result.issues
+        };
+    }
+    function logValidationFailure(fileResult) {
+        logger_logger.error(`${fileResult.file} failed validation: ${fileResult.error ?? "Validation failed"}`);
+        for (const issue of fileResult.issues ?? []){
+            const issuePath = issue.path.length > 0 ? issue.path : "root";
+            logger_logger.error(`  - ${issuePath}: ${issue.message}`);
+        }
+    }
+    function handleValidateFile(file) {
+        const fileResult = validateSingleFile(file);
+        if (fileResult.valid) {
+            if (getGlobalOutputConfig().jsonMode) logJsonResult(true, {
+                data: {
+                    file: fileResult.file,
+                    type: fileResult.type,
+                    valid: true
+                }
+            });
+            else logger_logger.success(`${fileResult.file} is valid (${fileResult.type})`);
+            return;
+        }
+        if (getGlobalOutputConfig().jsonMode) logJsonResult(false, {
+            error: fileResult.error,
+            data: {
+                file: fileResult.file,
+                type: fileResult.type,
+                issues: fileResult.issues ?? []
+            }
+        });
+        else logValidationFailure(fileResult);
+        process.exitCode = 1;
+    }
+    function handleValidateDirectory(dir) {
+        const files = collectValidationFiles(dir);
+        if (0 === files.length) {
+            const error = `No supported files found under ${dir}`;
+            if (getGlobalOutputConfig().jsonMode) logJsonResult(false, {
+                error,
+                data: {
+                    file: dir,
+                    valid: false,
+                    files: []
+                }
+            });
+            else logger_logger.error(error);
+            process.exitCode = 1;
+            return;
+        }
+        const fileResults = files.map(validateSingleFile);
+        const failedResults = fileResults.filter((result)=>!result.valid);
+        if (getGlobalOutputConfig().jsonMode) logJsonResult(0 === failedResults.length, {
+            error: failedResults.length > 0 ? "Validation failed" : void 0,
+            data: {
+                file: dir,
+                valid: 0 === failedResults.length,
+                count: fileResults.length,
+                files: fileResults
+            }
+        });
+        else for (const fileResult of fileResults)if (fileResult.valid) logger_logger.success(`${fileResult.file} is valid (${fileResult.type})`);
+        else logValidationFailure(fileResult);
+        if (failedResults.length > 0) process.exitCode = 1;
+    }
     function getUpdateInstructions(platform) {
         if ("win32" === platform) return [
             "try { irm https://anvil.works/install-cli.ps1 | iex } catch { npm install -g @anvil-works/anvil-cli@latest }",
@@ -23034,43 +23359,17 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
         program.command("update").description("Update anvil to the latest version").alias("u").action(async ()=>{
             await handleUpdateCommand();
         });
-        program.command("validate").description("Validate an Anvil app file by path (anvil.yaml, client_code/**/*.yaml, or client_code/**/*.html)").argument("<file>", "Path to file").action((file)=>{
-            let fileContent;
+        program.command("validate").description("Validate Anvil app files by path or directory (anvil.yaml, client_code/**/*.yaml, client_code/**/*.html, client_code/**/*.py, or server_code/**/*.py)").argument("<path>", "Path to file or directory").action((file)=>{
+            let pathStat;
             try {
-                fileContent = (0, external_fs_.readFileSync)(file, "utf8");
+                pathStat = (0, external_fs_.statSync)(file);
             } catch (error) {
-                logger_logger.error(`Failed to read ${file}: ${error.message}`);
+                logger_logger.error(`Failed to access ${file}: ${error.message}`);
                 process.exitCode = 1;
                 return;
             }
-            const result = validatePath(file, fileContent);
-            if (result.ok) {
-                if (getGlobalOutputConfig().jsonMode) logJsonResult(true, {
-                    data: {
-                        file,
-                        type: result.target,
-                        valid: true
-                    }
-                });
-                else logger_logger.success(`${file} is valid (${result.target})`);
-                return;
-            }
-            if (getGlobalOutputConfig().jsonMode) logJsonResult(false, {
-                error: result.message,
-                data: {
-                    file,
-                    type: result.target,
-                    issues: result.issues
-                }
-            });
-            else {
-                logger_logger.error(`${file} failed validation: ${result.message}`);
-                for (const issue of result.issues){
-                    const issuePath = issue.path.length > 0 ? issue.path : "root";
-                    logger_logger.error(`  - ${issuePath}: ${issue.message}`);
-                }
-            }
-            process.exitCode = 1;
+            if (pathStat.isDirectory()) return void handleValidateDirectory(file);
+            handleValidateFile(file);
         });
         if (watchCommand) {
             const watchOptions = watchCommand.options.map((opt)=>{

package/dist/index.js

@@ -16317,6 +16317,167 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             ok: true
         };
     }
+    const PYTHON_VALIDATOR_SCRIPT = String.raw`
+import ast
+import json
+import sys
+
+
+def issue_path(error):
+    if getattr(error, "lineno", None) is None:
+        return "root"
+    if getattr(error, "offset", None) is None:
+        return f"line {error.lineno}"
+    return f"line {error.lineno}, column {error.offset}"
+
+
+def base_name(node):
+    if isinstance(node, ast.Name):
+        return node.id
+    if isinstance(node, ast.Attribute):
+        return node.attr
+    return None
+
+
+def imports_template_from_anvil_designer(node, template_name):
+    if node.level < 1:
+        return False
+    if node.module not in ("_anvil_designer", None):
+        return False
+    return any(alias.name == template_name for alias in node.names)
+
+
+file_path = sys.argv[1]
+class_name = sys.argv[2]
+template_name = f"{class_name}Template" if class_name else ""
+source = sys.stdin.read()
+issues = []
+
+try:
+    compile(source, file_path, "exec")
+except SyntaxError as error:
+    issues.append({"path": issue_path(error), "message": error.msg})
+    print(json.dumps({"issues": issues}))
+    sys.exit(0)
+
+if class_name:
+    tree = ast.parse(source, filename=file_path)
+    has_template_import = False
+    has_form_class = False
+
+    for node in ast.walk(tree):
+        if isinstance(node, ast.ImportFrom) and imports_template_from_anvil_designer(node, template_name):
+            has_template_import = True
+        elif isinstance(node, ast.ClassDef) and node.name == class_name:
+            if any(base_name(base) == template_name for base in node.bases):
+                has_form_class = True
+
+    if not has_template_import:
+        issues.append({
+            "path": "root",
+            "message": f"missing {chr(96)}from ._anvil_designer import {template_name}{chr(96)}",
+        })
+    if not has_form_class:
+        issues.append({
+            "path": "root",
+            "message": f"missing class {chr(96)}{class_name}{chr(96)} inheriting from {chr(96)}{template_name}{chr(96)}",
+        })
+
+print(json.dumps({"issues": issues}))
+`;
+    function findPythonInterpreter() {
+        const candidates = [
+            process.env.ANVIL_PYTHON,
+            "python3",
+            "python"
+        ].filter((candidate)=>"string" == typeof candidate && candidate.length > 0);
+        for (const candidate of candidates){
+            const result = (0, external_child_process_namespaceObject.spawnSync)(candidate, [
+                "--version"
+            ], {
+                encoding: "utf8"
+            });
+            if (!result.error && 0 === result.status) return candidate;
+        }
+        return null;
+    }
+    function isClientFormPython(filePath) {
+        if ("__init__.py" === external_path_default().basename(filePath)) {
+            const formDir = external_path_default().dirname(filePath);
+            return external_fs_.existsSync(external_path_default().join(formDir, "form_template.html")) || external_fs_.existsSync(external_path_default().join(formDir, "form_template.yaml"));
+        }
+        const parsed = external_path_default().parse(filePath);
+        return external_fs_.existsSync(external_path_default().join(parsed.dir, `${parsed.name}.html`)) || external_fs_.existsSync(external_path_default().join(parsed.dir, `${parsed.name}.yaml`));
+    }
+    function expectedFormClassName(filePath) {
+        if (!isClientFormPython(filePath)) return null;
+        if ("__init__.py" === external_path_default().basename(filePath)) return external_path_default().basename(external_path_default().dirname(filePath));
+        return external_path_default().basename(filePath, ".py");
+    }
+    function isUnderDirectory(filePath, directoryPath) {
+        const relativePath = external_path_default().relative(directoryPath, filePath);
+        return relativePath.length > 0 && !relativePath.startsWith("..") && !external_path_default().isAbsolute(relativePath);
+    }
+    function validatePython(filePath, fileContent, appRoot) {
+        const interpreter = findPythonInterpreter();
+        if (!interpreter) return {
+            ok: false,
+            message: "Python file could not be validated",
+            issues: [
+                {
+                    path: "root",
+                    message: "Python validation requires python3 or python on PATH, or ANVIL_PYTHON to be set"
+                }
+            ]
+        };
+        const absolutePath = external_path_default().resolve(filePath);
+        const clientCodeRoot = appRoot ? external_path_default().join(appRoot, "client_code") : null;
+        const formClassName = clientCodeRoot && isUnderDirectory(absolutePath, clientCodeRoot) ? expectedFormClassName(absolutePath) : null;
+        const result = (0, external_child_process_namespaceObject.spawnSync)(interpreter, [
+            "-c",
+            PYTHON_VALIDATOR_SCRIPT,
+            filePath,
+            formClassName ?? ""
+        ], {
+            encoding: "utf8",
+            input: fileContent,
+            maxBuffer: 1048576
+        });
+        if (result.error || 0 !== result.status) return {
+            ok: false,
+            message: "Python file could not be validated",
+            issues: [
+                {
+                    path: "root",
+                    message: result.error?.message ?? (result.stderr.trim() || "Python validator failed")
+                }
+            ]
+        };
+        let parsed;
+        try {
+            parsed = JSON.parse(result.stdout);
+        } catch (error) {
+            return {
+                ok: false,
+                message: "Python file could not be validated",
+                issues: [
+                    {
+                        path: "root",
+                        message: error instanceof Error ? error.message : String(error)
+                    }
+                ]
+            };
+        }
+        const issues = parsed.issues ?? [];
+        if (issues.length > 0) return {
+            ok: false,
+            message: "Python file is invalid for Anvil",
+            issues
+        };
+        return {
+            ok: true
+        };
+    }
     const validators_IDENTIFIER_RE = /^[A-Za-z_][A-Za-z0-9_]*$/;
     const DB_ACCESS_LEVELS = new Set([
         "none",
@@ -16714,6 +16875,13 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             const relativeToClientCode = normalizedPath.slice(startIndex + clientCodePrefix.length);
             if (relativeToClientCode.endsWith(".yaml")) return "form_template.yaml";
             if (relativeToClientCode.endsWith(".html")) return "form_template.html";
+            if (relativeToClientCode.endsWith(".py")) return "python";
+        }
+        const serverCodePrefix = "server_code/";
+        if (normalizedPath.startsWith(serverCodePrefix) || normalizedPath.includes(`/${serverCodePrefix}`)) {
+            const startIndex = normalizedPath.lastIndexOf(serverCodePrefix);
+            const relativeToServerCode = normalizedPath.slice(startIndex + serverCodePrefix.length);
+            if (relativeToServerCode.endsWith(".py")) return "python";
         }
         return null;
     }
@@ -16821,6 +16989,35 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
                 target
             };
         }
+        if ("python" === target) {
+            if (existingPath && appRoot) {
+                const clientCodeRoot = external_path_default().join(appRoot, "client_code");
+                const serverCodeRoot = external_path_default().join(appRoot, "server_code");
+                const relativeToClientCode = external_path_default().relative(clientCodeRoot, existingPath);
+                const relativeToServerCode = external_path_default().relative(serverCodeRoot, existingPath);
+                const isInsideClientCode = relativeToClientCode.length > 0 && !relativeToClientCode.startsWith("..") && !external_path_default().isAbsolute(relativeToClientCode);
+                const isInsideServerCode = relativeToServerCode.length > 0 && !relativeToServerCode.startsWith("..") && !external_path_default().isAbsolute(relativeToServerCode);
+                if (!isInsideClientCode && !isInsideServerCode || !existingPath.endsWith(".py")) return {
+                    ok: false,
+                    target,
+                    message: "File is not an Anvil app Python file",
+                    issues: [
+                        {
+                            path: "",
+                            message: `expected a .py file under ${clientCodeRoot} or ${serverCodeRoot}`
+                        }
+                    ]
+                };
+            }
+            const result = validatePython(filePath, fileContent, appRoot);
+            return result.ok ? {
+                ok: true,
+                target
+            } : {
+                ...result,
+                target
+            };
+        }
         return {
             ok: false,
             target: "unknown",
@@ -16828,7 +17025,7 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             issues: [
                 {
                     path: "",
-                    message: "supported paths are anvil.yaml, client_code/**/form_template.yaml, client_code/**/*.yaml, and client_code/**/*.html"
+                    message: "supported paths are anvil.yaml, client_code/**/form_template.yaml, client_code/**/*.yaml, client_code/**/*.html, client_code/**/*.py, and server_code/**/*.py"
                 }
             ]
         };
@@ -18775,6 +18972,7 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
         environment;
         envBranchChangeMode;
         isSwitchingForEnvironment = false;
+        environmentSwitchTargetBranch = null;
         dependencyWatchEnabled;
         isRefreshingDependencies = false;
         hasPendingDependencyRefresh = false;
@@ -18999,6 +19197,7 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
         async switchToEnvironmentBranch(targetBranch, source) {
             if (this.isCleanedUp) return;
             this.isSwitchingForEnvironment = true;
+            this.environmentSwitchTargetBranch = targetBranch;
             const oldPausedState = this.isPausedForUserInput;
             try {
                 const status = await this.gitService.getStatus();
@@ -19060,6 +19259,7 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             } finally{
                 this.isPausedForUserInput = oldPausedState;
                 this.isSwitchingForEnvironment = false;
+                this.environmentSwitchTargetBranch = null;
             }
             const pendingSwitch = this.pendingEnvironmentBranchSwitch;
             this.pendingEnvironmentBranchSwitch = null;
@@ -19147,16 +19347,7 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
                 getCurrentBranch: async ()=>this.gitService.getCurrentBranch()
             });
             this.fileWatcher.on("branch-change", ({ newBranch })=>{
-                const oldBranch = this.currentBranch;
-                logger_logger.verbose(external_chalk_default().gray("   Pausing sync for 2 seconds to allow branch to settle..."));
-                this.currentBranch = newBranch;
-                this.lastBranchChangeTime = Date.now();
-                this.wsClient?.updateBranch(newBranch);
-                this.queueDependencyRefresh("branch changed");
-                this.emit("branch-changed", {
-                    oldBranch,
-                    newBranch
-                });
+                this.handleFileWatcherBranchChange(newBranch);
             });
             this.fileWatcher.on("index-change", ()=>{
                 this.saveProcessor?.queueSave();
@@ -19173,6 +19364,23 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             this.startLocalChangeFallbackPolling();
             await new Promise(()=>{});
         }
+        handleFileWatcherBranchChange(newBranch) {
+            if (this.isSwitchingForEnvironment && newBranch === this.environmentSwitchTargetBranch) return void logger_logger.debug(`Ignoring FileWatcher branch-change during environment switch: ${newBranch}`);
+            const oldBranch = this.currentBranch;
+            logger_logger.verbose(external_chalk_default().gray("   Pausing sync for 2 seconds to allow branch to settle..."));
+            this.currentBranch = newBranch;
+            this.lastBranchChangeTime = Date.now();
+            this.wsClient?.updateBranch(newBranch);
+            this.queueDependencyRefresh("branch changed");
+            this.emit("external-branch-changed", {
+                oldBranch,
+                newBranch
+            });
+            this.emit("branch-changed", {
+                oldBranch,
+                newBranch
+            });
+        }
         startWatchingInBackground(onError) {
             this.startWatching().catch((error)=>{
                 this.cleanup();

package/dist/program.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"program.d.ts","sourceRoot":"","sources":["../src/program.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAuDpC,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,GAAG,MAAM,EAAE,CAezE;AAED,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CAwFzD;AAiBD,wBAAgB,YAAY,IAAI,OAAO,CAmHtC"}
+{"version":3,"file":"program.d.ts","sourceRoot":"","sources":["../src/program.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA2LpC,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,GAAG,MAAM,EAAE,CAezE;AAED,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CAwFzD;AAiBD,wBAAgB,YAAY,IAAI,OAAO,CAkGtC"}

package/dist/validatePython.d.ts

@@ -0,0 +1,10 @@
+import type { ValidationIssue } from "./validators";
+export type PythonValidationResult = {
+    ok: true;
+} | {
+    ok: false;
+    message: string;
+    issues: ValidationIssue[];
+};
+export declare function validatePython(filePath: string, fileContent: string, appRoot: string | null): PythonValidationResult;
+//# sourceMappingURL=validatePython.d.ts.map

package/dist/validatePython.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"validatePython.d.ts","sourceRoot":"","sources":["../src/validatePython.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAEpD,MAAM,MAAM,sBAAsB,GAC5B;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,GACZ;IACI,EAAE,EAAE,KAAK,CAAC;IACV,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,eAAe,EAAE,CAAC;CAC7B,CAAC;AAqHR,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,sBAAsB,CAiEpH"}

package/dist/validators.d.ts

@@ -16,7 +16,7 @@ export type AnvilYamlValidationResult = {
     message: string;
     issues: ValidationIssue[];
 };
-export type ValidationTarget = "anvil.yaml" | "form_template.yaml" | "form_template.html";
+export type ValidationTarget = "anvil.yaml" | "form_template.yaml" | "form_template.html" | "python";
 export type ValidatePathResult = {
     ok: true;
     target: ValidationTarget;
@@ -43,6 +43,7 @@ export declare function findAnvilAppRoot(filePath: string): string | null;
  * - `anvil.yaml`
  * - any form YAML under `client_code/` with a `.yaml` suffix
  * - any form HTML under `client_code/` with a `.html` suffix
+ * - any Python file under `client_code/` or `server_code/`
  */
 export declare function validatePath(filePath: string, fileContent: string): ValidatePathResult;
 //# sourceMappingURL=validators.d.ts.map

package/dist/validators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validators.d.ts","sourceRoot":"","sources":["../src/validators.ts"],"names":[],"mappings":"AAWA,MAAM,MAAM,eAAe,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAClC;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,GACZ;IACI,EAAE,EAAE,KAAK,CAAC;IACV,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,eAAe,EAAE,CAAC;CAC7B,CAAC;AAER,MAAM,MAAM,yBAAyB,GAC/B;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,GACZ;IACI,EAAE,EAAE,KAAK,CAAC;IACV,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,eAAe,EAAE,CAAC;CAC7B,CAAC;AAER,MAAM,MAAM,gBAAgB,GAAG,YAAY,GAAG,oBAAoB,GAAG,oBAAoB,CAAC;AAE1F,MAAM,MAAM,kBAAkB,GACxB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,gBAAgB,CAAA;CAAE,GACtC;IACI,EAAE,EAAE,KAAK,CAAC;IACV,MAAM,EAAE,gBAAgB,GAAG,SAAS,CAAC;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,eAAe,EAAE,CAAC;CAC7B,CAAC;AAoER,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,UAEhD;AAgBD;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,4BAA4B,CA0BtF;AAuZD;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,yBAAyB,CAkFhF;AAED,iBAAS,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CAiBxE;AAED,OAAO,EAAE,qBAAqB,EAAE,CAAC;AAOjC,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAkBhE;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,kBAAkB,CAoGtF"}
+{"version":3,"file":"validators.d.ts","sourceRoot":"","sources":["../src/validators.ts"],"names":[],"mappings":"AAYA,MAAM,MAAM,eAAe,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAClC;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,GACZ;IACI,EAAE,EAAE,KAAK,CAAC;IACV,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,eAAe,EAAE,CAAC;CAC7B,CAAC;AAER,MAAM,MAAM,yBAAyB,GAC/B;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,GACZ;IACI,EAAE,EAAE,KAAK,CAAC;IACV,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,eAAe,EAAE,CAAC;CAC7B,CAAC;AAER,MAAM,MAAM,gBAAgB,GAAG,YAAY,GAAG,oBAAoB,GAAG,oBAAoB,GAAG,QAAQ,CAAC;AAErG,MAAM,MAAM,kBAAkB,GACxB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,gBAAgB,CAAA;CAAE,GACtC;IACI,EAAE,EAAE,KAAK,CAAC;IACV,MAAM,EAAE,gBAAgB,GAAG,SAAS,CAAC;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,eAAe,EAAE,CAAC;CAC7B,CAAC;AAoER,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,UAEhD;AAgBD;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,4BAA4B,CA0BtF;AAuZD;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,yBAAyB,CAkFhF;AAED,iBAAS,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CA4BxE;AAED,OAAO,EAAE,qBAAqB,EAAE,CAAC;AAOjC,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAkBhE;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,kBAAkB,CAoItF"}

package/package.json

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