@anvil-works/anvil-cli 0.8.0-canary.2 → 0.8.0-canary.21

package/dist/cli.js

@@ -13384,9 +13384,10 @@ var __webpack_exports__ = {};
                 type: "auth_invalid",
                 message
             }),
-        refreshFailed: (message)=>({
+        refreshFailed: (message, status)=>({
                 type: "token_refresh_failed",
-                message
+                message,
+                status
             })
     };
     const createAppError = {
@@ -13600,8 +13601,23 @@ var __webpack_exports__ = {};
                 return "An unknown error occurred";
         }
     }
+    function getErrorCauseMessage(error) {
+        if ("object" != typeof error || null === error || !("cause" in error)) return null;
+        const cause = error.cause;
+        if (null == cause) return null;
+        const message = errors_getErrorMessage(cause);
+        const code = "object" == typeof cause && null !== cause && "code" in cause && "string" == typeof cause.code ? cause.code : null;
+        if (code && !message.includes(code)) return `${message} (${code})`;
+        return message;
+    }
+    function logErrorCause(error, ui) {
+        const causeMessage = getErrorCauseMessage(error);
+        if (causeMessage) ui.verbose(`Cause: ${causeMessage}`);
+    }
     const external_module_namespaceObject = require("module");
     const requireFromHere = (0, external_module_namespaceObject.createRequire)(__filename);
+    const GIT_CREDENTIAL_HELPER_FILENAME = "anvil-credential-helper.cjs";
+    const GIT_CREDENTIAL_HELPER_LOCATOR = `$(git rev-parse --git-common-dir)/${GIT_CREDENTIAL_HELPER_FILENAME}`;
     function getUrlConfigKey(appId) {
         return `anvil.auth.${appId}.url`;
     }
@@ -13618,12 +13634,14 @@ var __webpack_exports__ = {};
         const platform = options?.platform ?? process.platform;
         const execPath = options?.execPath ?? process.execPath;
         const helperPath = options.helperPath;
+        const dynamicHelperPath = `"${GIT_CREDENTIAL_HELPER_LOCATOR}"`;
         if ("win32" === platform) {
             const resolvedExecPath = external_path_default().win32.resolve(execPath);
-            const resolvedHelperPath = external_path_default().win32.resolve(helperPath);
-            return `!${shellQuoteDouble(resolvedExecPath)} ${shellQuoteDouble(resolvedHelperPath)}`;
+            const helperArgument = helperPath ? shellQuoteDouble(external_path_default().win32.resolve(helperPath)) : dynamicHelperPath;
+            return `!${shellQuoteDouble(resolvedExecPath)} ${helperArgument}`;
         }
-        return `!${shellQuote(external_path_default().resolve(execPath))} ${shellQuote(external_path_default().resolve(helperPath))}`;
+        const helperArgument = helperPath ? shellQuote(external_path_default().resolve(helperPath)) : dynamicHelperPath;
+        return `!${shellQuote(external_path_default().resolve(execPath))} ${helperArgument}`;
     }
     async function getLocalConfigValue(repoPath, key) {
         try {
@@ -13672,21 +13690,14 @@ var __webpack_exports__ = {};
         return `#!/usr/bin/env node
 "use strict";
 
-const fs = require("fs");
-const path = require("path");
+const { execFileSync } = require("child_process");
 const { executeGitCredentialOperation } = require(${JSON.stringify(modulePath)});
 
 function resolveRepoPath() {
-    // Git's credential-helper stdin only includes the remote URL path
-    // (/git/APP.git), not the local checkout path. Repo-local auth lives under
-    // this checkout's git dir, so derive the repo path from the generated helper
-    // location instead of the credential request.
-    const gitDir = __dirname;
-    const linkedWorktreeGitdir = path.join(gitDir, "gitdir");
-    if (fs.existsSync(linkedWorktreeGitdir)) {
-        return path.dirname(path.resolve(gitDir, fs.readFileSync(linkedWorktreeGitdir, "utf8").trim()));
-    }
-    return path.dirname(gitDir);
+    return execFileSync("git", ["rev-parse", "--show-toplevel"], {
+        cwd: process.cwd(),
+        encoding: "utf8",
+    }).trim();
 }
 
 Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
@@ -13721,16 +13732,22 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
         if (isAnvilCliPackageFile(currentModulePath) && "cli.js" !== external_path_default().basename(currentModulePath)) return currentModulePath;
         return (options?.resolvePackageEntry ?? (()=>requireFromHere.resolve("@anvil-works/anvil-cli")))();
     }
-    async function getRepositoryGitDir(repoPath, git = esm_default(repoPath)) {
-        const rawGitDir = (await git.raw([
+    async function getRepositoryGitPath(repoPath, revParseArg, git = esm_default(repoPath)) {
+        const rawGitPath = (await git.raw([
             "rev-parse",
-            "--git-dir"
+            revParseArg
         ])).trim();
-        return external_path_default().isAbsolute(rawGitDir) ? rawGitDir : external_path_default().resolve(repoPath, rawGitDir);
+        return external_path_default().isAbsolute(rawGitPath) ? rawGitPath : external_path_default().resolve(repoPath, rawGitPath);
+    }
+    async function getRepositoryGitDir(repoPath, git = esm_default(repoPath)) {
+        return getRepositoryGitPath(repoPath, "--git-dir", git);
+    }
+    async function getRepositoryCommonGitDir(repoPath, git = esm_default(repoPath)) {
+        return getRepositoryGitPath(repoPath, "--git-common-dir", git);
     }
     async function writeCredentialHelperScript(options) {
-        const gitDir = await getRepositoryGitDir(options.repoPath, options.git);
-        const helperPath = external_path_default().join(gitDir, "anvil-credential-helper.cjs");
+        const gitCommonDir = await getRepositoryCommonGitDir(options.repoPath, options.git);
+        const helperPath = external_path_default().join(gitCommonDir, GIT_CREDENTIAL_HELPER_FILENAME);
         await external_fs_.promises.mkdir(external_path_default().dirname(helperPath), {
             recursive: true
         });
@@ -13745,7 +13762,7 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
         const url = new URL(normalized);
         const scope = `${url.protocol}//${url.host}`;
         const git = esm_default(repoPath);
-        const helperPath = await writeCredentialHelperScript({
+        await writeCredentialHelperScript({
             repoPath,
             git,
             modulePath: options?.modulePath
@@ -13772,7 +13789,6 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             `credential.${scope}.helper`,
             getGitCredentialHelperCommand({
                 execPath: options?.execPath,
-                helperPath,
                 platform: options?.platform
             })
         ]);
@@ -13818,6 +13834,76 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
     function getAuthFilePath(gitDir) {
         return external_path_default().join(gitDir, "anvil-auth.json");
     }
+    const AUTH_FILE_LOCK_DEFAULTS = {
+        staleMs: 30000,
+        timeoutMs: 60000,
+        retryDelayMs: 100,
+        heartbeatMs: 5000
+    };
+    function git_auth_delay(ms) {
+        return new Promise((resolve)=>setTimeout(resolve, ms));
+    }
+    async function acquireAuthFileLock(lockPath, options) {
+        const deadline = Date.now() + options.timeoutMs;
+        while(true){
+            try {
+                const handle = await external_fs_.promises.open(lockPath, "wx", 384);
+                try {
+                    await handle.writeFile(JSON.stringify({
+                        pid: process.pid,
+                        acquiredAt: new Date().toISOString()
+                    }));
+                } finally{
+                    await handle.close();
+                }
+                return;
+            } catch (e) {
+                if ("EEXIST" !== e.code) throw e;
+            }
+            try {
+                const lockStat = await external_fs_.promises.stat(lockPath);
+                if (Date.now() - lockStat.mtimeMs > options.staleMs) {
+                    await external_fs_.promises.rm(lockPath, {
+                        force: true
+                    });
+                    continue;
+                }
+            } catch  {
+                continue;
+            }
+            if (Date.now() >= deadline) throw new Error(`Timed out waiting for the Anvil auth file lock at ${lockPath}`);
+            await git_auth_delay(options.retryDelayMs);
+        }
+    }
+    async function withRepoAuthFileLock(repoPath, fn, options) {
+        const gitDir = await getRepositoryGitDir(repoPath);
+        const lockPath = `${getAuthFilePath(gitDir)}.lock`;
+        const lockOptions = {
+            ...AUTH_FILE_LOCK_DEFAULTS,
+            ...options
+        };
+        await external_fs_.promises.mkdir(external_path_default().dirname(lockPath), {
+            recursive: true
+        });
+        await acquireAuthFileLock(lockPath, lockOptions);
+        const heartbeat = startAuthFileLockHeartbeat(lockPath, lockOptions.heartbeatMs);
+        try {
+            return await fn();
+        } finally{
+            clearInterval(heartbeat);
+            await external_fs_.promises.rm(lockPath, {
+                force: true
+            });
+        }
+    }
+    function startAuthFileLockHeartbeat(lockPath, heartbeatMs) {
+        const heartbeat = setInterval(()=>{
+            const now = new Date();
+            external_fs_.promises.utimes(lockPath, now, now).catch(()=>{});
+        }, heartbeatMs);
+        heartbeat.unref();
+        return heartbeat;
+    }
     function decodeKey(b64key) {
         const key = Buffer.from(b64key, "base64");
         if (32 !== key.length) throw new Error("Encryption key must be a base64-encoded 32-byte key");
@@ -13862,10 +13948,19 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             recursive: true
         });
         const authJson = JSON.stringify(auth, null, 2);
-        await external_fs_.promises.writeFile(authFilePath, encrypt(authJson, encryptionKey), {
-            mode: 384
-        });
-        await external_fs_.promises.chmod(authFilePath, 448);
+        const tempFilePath = `${authFilePath}.tmp-${external_node_crypto_default().randomBytes(6).toString("hex")}`;
+        try {
+            await external_fs_.promises.writeFile(tempFilePath, encrypt(authJson, encryptionKey), {
+                mode: 384
+            });
+            await external_fs_.promises.chmod(tempFilePath, 448);
+            await external_fs_.promises.rename(tempFilePath, authFilePath);
+        } catch (e) {
+            await external_fs_.promises.rm(tempFilePath, {
+                force: true
+            });
+            throw e;
+        }
         await git.raw([
             "config",
             "--local",
@@ -13874,8 +13969,9 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
         ]);
         return authFilePath;
     }
-    const readAuthFromRepo = async (repoPath)=>{
+    const git_auth_readAuthFromRepo = async (repoPath)=>{
         const git = esm_default(repoPath);
+        if (!await git.checkIsRepo()) return;
         const gitDir = await getRepositoryGitDir(repoPath, git);
         const authFilePath = getAuthFilePath(gitDir);
         if (!external_fs_default().existsSync(authFilePath)) return;
@@ -13887,14 +13983,20 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
         return resolveAnvilUrl();
     }
     const ANVIL_SYNC_CLIENT_ID = "anvil-sync";
+    const REFRESH_REQUEST_TIMEOUT_MS = 12000;
     let inMemoryAuth = null;
     function authMatches(auth, anvilUrl, username) {
         return auth.anvilUrl === normalizeAnvilUrl(anvilUrl) && (!username || auth.username === username);
     }
     let repoContext = null;
-    function setRepoContext(repoPath) {
+    function auth_setRepoContext(repoPath) {
         repoContext = repoPath;
     }
+    async function resolveAuthAnvilUrl() {
+        if (inMemoryAuth) return inMemoryAuth.anvilUrl;
+        const repoAuth = repoContext ? await git_auth_readAuthFromRepo(repoContext) : void 0;
+        return repoAuth?.anvilUrl ?? resolveAnvilUrl();
+    }
     const inFlightRefreshes = new Map();
     async function verifyAuth(authToken, anvilUrl = getDefaultAnvilUrl()) {
         try {
@@ -13915,7 +14017,7 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             throw errors_createAuthError.invalid(`Network error: ${e.message}`);
         }
     }
-    async function refreshAccessToken(refreshToken, anvilUrl = getDefaultAnvilUrl(), clientId = ANVIL_SYNC_CLIENT_ID) {
+    async function refreshAccessToken(refreshToken, anvilUrl = getDefaultAnvilUrl(), clientId = ANVIL_SYNC_CLIENT_ID, options) {
         try {
             const tokenResponse = await fetch(`${anvilUrl}/oauth/token`, {
                 method: "POST",
@@ -13926,11 +14028,12 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
                     grant_type: "refresh_token",
                     refresh_token: refreshToken,
                     client_id: clientId
-                })
+                }),
+                signal: AbortSignal.timeout(options?.timeoutMs ?? REFRESH_REQUEST_TIMEOUT_MS)
             });
             if (!tokenResponse.ok) {
                 const errorText = await tokenResponse.text();
-                throw errors_createAuthError.refreshFailed(`Failed to refresh token: ${tokenResponse.status} ${errorText}`);
+                throw errors_createAuthError.refreshFailed(`Failed to refresh token: ${tokenResponse.status} ${errorText}`, tokenResponse.status);
             }
             const tokenData = await tokenResponse.json();
             return tokenData;
@@ -13942,22 +14045,21 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
     async function hasTokensForUrl(anvilUrl, username) {
         if (inMemoryAuth) return authMatches(inMemoryAuth, anvilUrl, username);
         {
-            const repoAuth = repoContext ? await readAuthFromRepo(repoContext) : void 0;
+            const repoAuth = repoContext ? await git_auth_readAuthFromRepo(repoContext) : void 0;
             if (repoAuth && authMatches(repoAuth, anvilUrl, username)) return true;
             return hasTokens(anvilUrl, username);
         }
     }
-    async function auth_getValidAuthToken(anvilUrl = getDefaultAnvilUrl(), username) {
+    async function auth_getValidAuthToken(anvilUrl = getDefaultAnvilUrl(), username, options) {
         const normalized = normalizeAnvilUrl(anvilUrl);
         const source = await resolveTokenSource(normalized, username);
         const tokens = getSourceTokens(source);
         if (!tokens.authToken && !tokens.refreshToken) throw errors_createAuthError.required("Not logged in. Please log in first.");
-        const isExpired = null !== tokens.authTokenExpiresAt && tokens.authTokenExpiresAt <= Math.floor(Date.now() / 1000) + 60;
-        if (tokens.refreshToken && isExpired) {
+        if (tokens.refreshToken && isAccessTokenExpired(tokens)) {
             const refreshKey = getRefreshKey(normalized, username, source, tokens.refreshToken);
             const existingRefresh = inFlightRefreshes.get(refreshKey);
             if (existingRefresh) return existingRefresh;
-            const refreshPromise = refreshAndStoreAccessToken(normalized, username, source, tokens.refreshToken).finally(()=>{
+            const refreshPromise = refreshAndStoreAccessToken(normalized, username, source, tokens.refreshToken, options).finally(()=>{
                 inFlightRefreshes.delete(refreshKey);
             });
             inFlightRefreshes.set(refreshKey, refreshPromise);
@@ -13971,7 +14073,7 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             type: "memory",
             auth: inMemoryAuth
         };
-        const repoAuth = repoContext ? await readAuthFromRepo(repoContext) : void 0;
+        const repoAuth = repoContext ? await git_auth_readAuthFromRepo(repoContext) : void 0;
         if (repoAuth && authMatches(repoAuth, normalizedUrl, username)) return {
             type: "repo",
             auth: repoAuth,
@@ -13987,6 +14089,9 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
     function getSourceTokens(source) {
         return "store" === source.type ? source.tokens : source.auth.tokens;
     }
+    function isAccessTokenExpired(tokens) {
+        return null !== tokens.authTokenExpiresAt && tokens.authTokenExpiresAt <= Math.floor(Date.now() / 1000) + 60;
+    }
     function getStoreAccountUsername(normalizedUrl, username, refreshToken) {
         if (username) return username;
         const urlTokens = getUrlTokens(normalizedUrl);
@@ -14005,11 +14110,43 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
                 return `store:${normalizedUrl}:${source.accountUsername ?? username ?? refreshToken}`;
         }
     }
-    async function refreshAndStoreAccessToken(normalizedUrl, username, source, refreshToken) {
+    async function refreshAndStoreAccessToken(normalizedUrl, username, source, refreshToken, options) {
+        if ("repo" === source.type) return refreshRepoAuthTokens(source.repoPath, {
+            anvilUrl: normalizedUrl,
+            username,
+            auth: source.auth,
+            refreshToken,
+            lock: options?.lock,
+            requestTimeoutMs: options?.requestTimeoutMs
+        });
+        return performTokenRefresh(normalizedUrl, username, source, refreshToken, options?.requestTimeoutMs);
+    }
+    async function refreshRepoAuthTokens(repoPath, options) {
+        const normalizedUrl = normalizeAnvilUrl(options.anvilUrl);
+        return withRepoAuthFileLock(repoPath, async ()=>{
+            let auth = options.auth;
+            let refreshToken = options.refreshToken;
+            const current = await git_auth_readAuthFromRepo(repoPath);
+            if (current && authMatches(current, normalizedUrl, options.username)) {
+                if (current.tokens.authToken && !isAccessTokenExpired(current.tokens)) return current.tokens.authToken;
+                auth = current;
+                refreshToken = current.tokens.refreshToken ?? refreshToken;
+            }
+            if (!auth || !refreshToken) throw errors_createAuthError.required("No repo auth tokens available to refresh.");
+            return performTokenRefresh(normalizedUrl, options.username, {
+                type: "repo",
+                auth,
+                repoPath
+            }, refreshToken, options.requestTimeoutMs);
+        }, options.lock);
+    }
+    async function performTokenRefresh(normalizedUrl, username, source, refreshToken, requestTimeoutMs) {
         try {
             const tokens = getSourceTokens(source);
             const clientId = tokens.clientId ?? ANVIL_SYNC_CLIENT_ID;
-            const tokenData = await refreshAccessToken(refreshToken, normalizedUrl, clientId);
+            const tokenData = await refreshAccessToken(refreshToken, normalizedUrl, clientId, {
+                timeoutMs: requestTimeoutMs
+            });
             const newTokens = {
                 authToken: tokenData.access_token,
                 refreshToken: tokenData.refresh_token,
@@ -14031,12 +14168,28 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             }
             return tokenData.access_token;
         } catch (e) {
+            if ("repo" === source.type && isRefreshTokenRejection(e)) await clearRepoAuthTokens(source.repoPath, source.auth).catch(()=>{});
             await clearTokensForAccount(normalizedUrl, username, refreshToken);
             throw e;
         }
     }
+    function isRefreshTokenRejection(e) {
+        const error = e;
+        return error?.type === "token_refresh_failed" && (400 === error.status || 401 === error.status);
+    }
+    async function clearRepoAuthTokens(repoPath, auth) {
+        const encryptionKey = process.env["ANVIL_AUTH_FILE_ENCRYPTION_KEY"];
+        if (!encryptionKey) return;
+        auth.tokens = {
+            authToken: null,
+            refreshToken: null,
+            authTokenExpiresAt: null,
+            clientId: auth.tokens.clientId
+        };
+        await writeAuthToFile(repoPath, auth, encryptionKey);
+    }
     async function clearTokensForAccount(url, username, refreshToken) {
-        if (inMemoryAuth || repoContext && await readAuthFromRepo(repoContext)) return;
+        if (inMemoryAuth || repoContext && await git_auth_readAuthFromRepo(repoContext)) return;
         {
             const normalized = normalizeAnvilUrl(url);
             if (username) deleteAccountTokens(normalized, username);
@@ -14066,7 +14219,7 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             loggedOut: false,
             message: "Cannot log out when using in-memory auth tokens"
         };
-        if (repoContext && await readAuthFromRepo(repoContext)) return {
+        if (repoContext && await git_auth_readAuthFromRepo(repoContext)) return {
             loggedOut: false,
             message: "Cannot log out when using auth tokens stored in the local git config."
         };
@@ -14097,7 +14250,7 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             inMemoryAuth.username
         ] : [];
         {
-            const repoAuth = repoContext ? await readAuthFromRepo(repoContext) : void 0;
+            const repoAuth = repoContext ? await git_auth_readAuthFromRepo(repoContext) : void 0;
             if (repoAuth && authMatches(repoAuth, url)) return [
                 repoAuth.username
             ];
@@ -14109,587 +14262,61 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             inMemoryAuth.anvilUrl
         ];
         {
-            const repoAuth = repoContext ? await readAuthFromRepo(repoContext) : void 0;
+            const repoAuth = repoContext ? await git_auth_readAuthFromRepo(repoContext) : void 0;
             if (repoAuth) return [
                 repoAuth.anvilUrl
             ];
             return getAvailableUrls();
         }
     }
-    function anvil_api_getDefaultAnvilUrl() {
-        return resolveAnvilUrl();
+    const promises_namespaceObject = require("timers/promises");
+    const WANT_NOT_VALID_RE = /\bwant\s+[0-9a-f]{7,40}\s+not valid\b/i;
+    const FETCH_RETRY_DELAY_MS = 200;
+    function isWantNotValidError(error) {
+        return WANT_NOT_VALID_RE.test(error.message || "");
     }
-    async function validateAppId(appId, anvilUrl = anvil_api_getDefaultAnvilUrl(), username) {
-        const authToken = await auth_getValidAuthToken(anvilUrl, username);
-        try {
-            const resp = await fetch(`${anvilUrl}/ide/api/_/apps/validate-app-id`, {
-                method: "POST",
-                headers: {
-                    Authorization: `Bearer ${authToken}`,
-                    "Content-Type": "application/json"
-                },
-                body: JSON.stringify({
-                    app_id: appId
-                })
-            });
-            const data = await resp.json();
-            if (resp.ok) return {
-                valid: data.valid ?? false,
-                app_name: data.app_name
-            };
-            if (401 === resp.status) throw errors_createAuthError.invalid("Authentication failed");
-            if (403 === resp.status) throw createAppError.accessDenied(appId);
-            if (404 === resp.status) throw createAppError.notFound(appId);
-            logger_logger.debug(`validate-app-id failed: ${resp.status} ${resp.statusText}`);
-            return {
-                valid: false,
-                error: data.error || `Server error: ${resp.status}`
-            };
-        } catch (error) {
-            if (error.type) throw error;
-            throw errors_createNetworkError.network(error.message);
+    class GitService extends Emitter {
+        git;
+        repoPath;
+        static INDEX_LOCK_RETRY_DELAYS_MS = [
+            25,
+            50,
+            100,
+            200
+        ];
+        constructor(repoPath){
+            super();
+            this.repoPath = external_path_default().resolve(repoPath);
+            this.git = esm_default(this.repoPath);
         }
-    }
-    async function listAppsForCheckout(options = {}) {
-        const anvilUrl = options.anvilUrl ?? anvil_api_getDefaultAnvilUrl();
-        const authToken = await auth_getValidAuthToken(anvilUrl, options.username);
-        const params = new URLSearchParams();
-        if ("number" == typeof options.limit) params.set("limit", String(options.limit));
-        if (options.cursor) params.set("cursor", options.cursor);
-        if (options.q && options.q.trim()) params.set("q", options.q.trim());
-        const query = params.toString();
-        const url = `${anvilUrl}/ide/api/_/apps${query ? `?${query}` : ""}`;
-        try {
-            const resp = await fetch(url, {
-                method: "GET",
-                headers: {
-                    Authorization: `Bearer ${authToken}`
-                },
-                signal: options.signal
-            });
-            if (!resp.ok) {
-                if (401 === resp.status) throw errors_createAuthError.invalid("Authentication failed");
-                throw errors_createNetworkError.server(resp.status, resp.statusText);
-            }
-            const data = await resp.json();
-            return {
-                apps: Array.isArray(data.apps) ? data.apps : [],
-                next_cursor: "string" == typeof data.next_cursor ? data.next_cursor : null
-            };
-        } catch (error) {
-            if (error.type) throw error;
-            throw errors_createNetworkError.network(error.message);
+        getGit() {
+            return this.git;
         }
-    }
-    function getGitFetchUrl(appId, authToken, gitUrl = anvil_api_getDefaultAnvilUrl()) {
-        const url = new URL(gitUrl);
-        const encodedToken = encodeURIComponent(authToken);
-        return `${url.protocol}//git:${encodedToken}@${url.hostname}${url.port ? ":" + url.port : ""}/git/${appId}.git?no_freeze=true&q=`;
-    }
-    function getGitPushUrl(appId, authToken, anvilUrl = anvil_api_getDefaultAnvilUrl()) {
-        const url = new URL(anvilUrl);
-        const encodedToken = encodeURIComponent(authToken);
-        return `${url.protocol}//git:${encodedToken}@${url.hostname}${url.port ? ":" + url.port : ""}/git/${appId}.git`;
-    }
-    function getWebSocketUrl(appId, authToken, anvilUrl = anvil_api_getDefaultAnvilUrl()) {
-        return anvilUrl.replace(/^http/, "ws") + `/ide/api/_/apps/${appId}/ws?access_token=${authToken}`;
-    }
-    async function getLatestVersion() {
-        try {
-            const response = await fetch("https://registry.npmjs.org/@anvil-works/anvil-cli/latest");
-            if (!response.ok) return null;
-            const data = await response.json();
-            return data.version;
-        } catch (e) {
-            return null;
+        getRepoPath() {
+            return this.repoPath;
         }
-    }
-    function filterCandidates(candidates, explicitUrl, explicitUsername) {
-        let filtered = candidates;
-        if (explicitUrl) {
-            const normalizedExplicit = normalizeAnvilUrl(explicitUrl);
-            filtered = filtered.filter((c)=>c.detectedUrl && normalizeAnvilUrl(c.detectedUrl) === normalizedExplicit);
+        async getGitDir() {
+            try {
+                const gitDir = (await this.git.revparse([
+                    "--git-dir"
+                ])).trim();
+                if (!external_path_default().isAbsolute(gitDir)) return external_path_default().resolve(this.repoPath, gitDir);
+                return gitDir;
+            } catch (e) {
+                throw errors_createGitError.commandFailed("rev-parse --git-dir", e.message);
+            }
         }
-        if (explicitUsername) filtered = filtered.filter((c)=>!c.detectedUsername || c.detectedUsername === explicitUsername);
-        return filtered;
-    }
-    function formatCandidateLabel(candidate) {
-        const parts = [
-            candidate.appId
-        ];
-        if (candidate.detectedUrl) if (candidate.detectedUsername) parts.push(`(${candidate.detectedUsername} on ${candidate.detectedUrl})`);
-        else parts.push(`(${candidate.detectedUrl})`);
-        parts.push(`- ${candidate.description}`);
-        return parts.join(" ");
-    }
-    function lookupRemoteInfoForAppId(appId, detectedRemotes) {
-        const matches = detectedRemotes.filter((c)=>c.appId === appId);
-        if (0 === matches.length) return {};
-        const withUsername = matches.find((c)=>c.detectedUsername);
-        if (withUsername) return {
-            detectedUrl: withUsername.detectedUrl,
-            detectedUsername: withUsername.detectedUsername
-        };
-        return {
-            detectedUrl: matches[0].detectedUrl,
-            detectedUsername: matches[0].detectedUsername
-        };
-    }
-    async function detectAppIdsFromAllRemotes(repoPath) {
-        const git = esm_default(repoPath);
-        const out = [];
-        try {
-            const remotes = await git.getRemotes(true);
-            for (const remote of remotes){
-                const httpMatch = remote.refs.fetch?.match(/(?:http|https):\/\/(?:[^@]+@)?([^:\/]+)(?::\d+)?\/git\/([A-Z0-9]+)\.git/);
-                if (httpMatch) {
-                    const [, host, detectedAppId] = httpMatch;
-                    out.push({
-                        appId: detectedAppId,
-                        source: "remote",
-                        description: `Git remote '${remote.name}'`,
-                        detectedUrl: normalizeAnvilUrl(host)
-                    });
-                    continue;
-                }
-                const sshMatch = remote.refs.fetch?.match(/ssh:\/\/([^@]+)@([^:]+):(\d+)\/(?:git\/)?([A-Z0-9]+)\.git/);
-                if (sshMatch) {
-                    const [, usernamePart, host, , detectedAppId] = sshMatch;
-                    const detectedUsername = usernamePart.includes("%") ? decodeURIComponent(usernamePart) : usernamePart;
-                    const finalUsername = "git" !== detectedUsername ? detectedUsername : void 0;
-                    out.push({
-                        appId: detectedAppId,
-                        source: "remote",
-                        description: `Git remote '${remote.name}' (SSH)`,
-                        detectedUrl: normalizeAnvilUrl(host),
-                        detectedUsername: finalUsername
-                    });
-                }
-            }
-        } catch (_e) {}
-        return out;
-    }
-    async function detectAppIdsByCommitLookup(repoPath, options) {
-        const anvilUrl = options.anvilUrl || resolveAnvilUrl();
-        const username = options.username;
-        const git = esm_default(repoPath);
-        const out = [];
-        try {
-            const authToken = await auth_getValidAuthToken(anvilUrl, username);
-            const branchRef = await git.revparse([
-                "--abbrev-ref",
-                "HEAD"
-            ]);
-            const currentBranch = "HEAD" === branchRef ? "master" : branchRef;
-            const commitId = (await git.revparse([
-                "HEAD"
-            ]))?.trim();
-            if (!commitId) return out;
-            const resp = await fetch(`${anvilUrl}/ide/api/_/apps/lookup-by-commit`, {
-                method: "POST",
-                headers: {
-                    Authorization: `Bearer ${authToken}`,
-                    "Content-Type": "application/json"
-                },
-                body: JSON.stringify({
-                    commit_id: commitId,
-                    branch_name: currentBranch
-                })
-            });
-            logger_logger.debug(`Reverse lookup by commit ${commitId} on branch ${currentBranch} returned ${resp.status}`);
-            if (!resp.ok) {
-                const errorBody = await resp.text();
-                logger_logger.debug(`lookup-by-commit error: ${errorBody}`);
-            }
-            if (resp.ok) {
-                const data = await resp.json();
-                logger_logger.debug(`data ${JSON.stringify(data)}`);
-                const apps = data?.apps ?? [];
-                for (const app of apps)if (app?.app_id) out.push({
-                    appId: app.app_id,
-                    source: "remote",
-                    description: `Reverse lookup by commit${app.branch ? ` on branch '${app.branch}'` : ""}`
-                });
-            }
-        } catch (_e) {}
-        return out;
-    }
-    const promises_namespaceObject = require("fs/promises");
-    var promises_default = /*#__PURE__*/ __webpack_require__.n(promises_namespaceObject);
-    function normalizeLineEndings(content) {
-        return content.replace(/\r\n/g, "\n");
-    }
-    function pythonifyName(name) {
-        return name.replace(/[^A-z0-9]/g, "_").replace(/^[0-9]/, "_$&");
-    }
-    function extractPythonName(relativePath, skipParts = 1) {
-        const parts = relativePath.slice(0, -3).split("/");
-        const isPackage = relativePath.endsWith("__init__.py");
-        const relevantParts = isPackage ? parts.slice(skipParts, -1) : parts.slice(skipParts);
-        return relevantParts.map(pythonifyName).join(".");
-    }
-    function deepEqual(a, b) {
-        if (a === b) return true;
-        if (null == a || null == b) return false;
-        if (typeof a !== typeof b) return false;
-        if ("object" != typeof a) return a === b;
-        if (Array.isArray(a) !== Array.isArray(b)) return false;
-        if (Array.isArray(a)) {
-            if (a.length !== b.length) return false;
-            return a.every((item, index)=>deepEqual(item, b[index]));
-        }
-        const keysA = Object.keys(a);
-        const keysB = Object.keys(b);
-        if (keysA.length !== keysB.length) return false;
-        return keysA.every((key)=>deepEqual(a[key], b[key]));
-    }
-    function parseHtmlWithFrontmatter(htmlContent) {
-        const frontmatterPattern = /^---\s*\n([\s\S]*?)\n---\s*\n([\s\S]*)$/;
-        const match = htmlContent.match(frontmatterPattern);
-        if (match) {
-            const yamlStr = match[1];
-            const html = match[2];
-            const frontmatter = yamlStr ? external_js_yaml_default().load(yamlStr) ?? {} : {};
-            return {
-                frontmatter,
-                html
-            };
-        }
-        return {
-            frontmatter: {},
-            html: htmlContent
-        };
-    }
-    const ANVIL_GITIGNORE_ENTRY = "/.anvil/";
-    async function ensureProjectGitignoreIgnoresAnvilDir(projectRoot) {
-        const rootGitignorePath = external_path_default().join(projectRoot, ".gitignore");
-        try {
-            const existing = await external_fs_.promises.readFile(rootGitignorePath, "utf8");
-            if (existing.includes(ANVIL_GITIGNORE_ENTRY)) return false;
-            const prefix = existing.endsWith("\n") || 0 === existing.length ? "" : "\n";
-            await external_fs_.promises.writeFile(rootGitignorePath, `${existing}${prefix}${ANVIL_GITIGNORE_ENTRY}\n`, "utf8");
-            return true;
-        } catch (error) {
-            if ("ENOENT" !== error.code) throw error;
-            await external_fs_.promises.writeFile(rootGitignorePath, `${ANVIL_GITIGNORE_ENTRY}\n`, "utf8");
-            return true;
-        }
-    }
-    const ANVIL_DEPS_DIR = ".anvil/deps";
-    const ANVIL_DEPS_MANIFEST = "manifest.json";
-    const DEPS_MANIFEST_VERSION = 1;
-    function formatFetchError(prefix, status, errorBody) {
-        if (!errorBody) return `${prefix}: ${status}`;
-        try {
-            const parsed = JSON.parse(errorBody);
-            if ("string" == typeof parsed.error && parsed.error.trim()) return `${prefix}: ${parsed.error} (${status})`;
-        } catch  {}
-        return `${prefix}: ${status} ${errorBody}`;
-    }
-    async function fetchAllDependencies(appId, anvilUrl = resolveAnvilUrl(), options = {}) {
-        const { commit, includeDocs = true, knownDependencies = [] } = options;
-        const token = await auth_getValidAuthToken(anvilUrl);
-        const body = {
-            include_docs: includeDocs,
-            known_dependencies: knownDependencies
-        };
-        if (commit) body.commit = commit;
-        const resp = await fetch(`${anvilUrl}/ide/api/_/apps/${appId}/resolved-dependencies`, {
-            method: "POST",
-            headers: {
-                Authorization: `Bearer ${token}`,
-                "Content-Type": "application/json"
-            },
-            body: JSON.stringify(body)
-        });
-        if (!resp.ok) {
-            const errorBody = await resp.text();
-            throw new Error(formatFetchError("Failed to fetch dependencies", resp.status, errorBody));
-        }
-        return await resp.json();
-    }
-    async function refreshDependencyCache(projectRoot, appId, anvilUrl = resolveAnvilUrl(), options = {}) {
-        const includeDocs = options.includeDocs ?? true;
-        const knownDependencies = await getKnownDependenciesForCache(projectRoot, includeDocs);
-        const response = await fetchAllDependencies(appId, anvilUrl, {
-            commit: options.commit,
-            includeDocs,
-            knownDependencies
-        });
-        if (!response.resolved_dependencies.length) {
-            await clearDepsCache(projectRoot);
-            return {
-                response,
-                addedGitignoreEntry: false
-            };
-        }
-        const addedGitignoreEntry = await ensureProjectGitignoreIgnoresAnvilDir(projectRoot);
-        await writeAllDepsToCache(projectRoot, response, {
-            includeDocs
-        });
-        return {
-            response,
-            addedGitignoreEntry
-        };
-    }
-    function depsDir(projectRoot) {
-        return external_path_default().join(projectRoot, ANVIL_DEPS_DIR);
-    }
-    function depsManifestPath(projectRoot) {
-        return external_path_default().join(depsDir(projectRoot), ANVIL_DEPS_MANIFEST);
-    }
-    function isResolvedDependencyManifestEntry(value) {
-        if (!value || "object" != typeof value) return false;
-        const entry = value;
-        return "string" == typeof entry.app_id && entry.app_id.length > 0 && "string" == typeof entry.commit_id && entry.commit_id.length > 0 && (void 0 === entry.branch || "string" == typeof entry.branch);
-    }
-    function isCachedDependencyManifestEntry(value) {
-        if (!isResolvedDependencyManifestEntry(value)) return false;
-        const entry = value;
-        return "string" == typeof entry.package_name && entry.package_name.length > 0;
-    }
-    function isDepsCacheManifest(value) {
-        if (!value || "object" != typeof value) return false;
-        const manifest = value;
-        return manifest.version === DEPS_MANIFEST_VERSION && "boolean" == typeof manifest.includeDocs && Array.isArray(manifest.resolved_dependencies) && manifest.resolved_dependencies.every(isResolvedDependencyManifestEntry) && Array.isArray(manifest.cached_dependencies) && manifest.cached_dependencies.every(isCachedDependencyManifestEntry);
-    }
-    async function readDepsCacheManifest(projectRoot) {
-        try {
-            const raw = await promises_default().readFile(depsManifestPath(projectRoot), "utf-8");
-            const parsed = JSON.parse(raw);
-            return isDepsCacheManifest(parsed) ? parsed : void 0;
-        } catch  {
-            return;
-        }
-    }
-    async function getKnownDependenciesForCache(projectRoot, includeDocs) {
-        const manifest = await readDepsCacheManifest(projectRoot);
-        if (!manifest || manifest.includeDocs !== includeDocs) return [];
-        return manifest.resolved_dependencies.map(({ app_id, commit_id })=>({
-                app_id,
-                commit_id
-            }));
-    }
-    function getDependencyWatchSubscriptionsFromManifest(manifest) {
-        if (!manifest) return [];
-        const cachedByAppId = new Map(manifest.cached_dependencies.map((dep)=>[
-                dep.app_id,
-                dep
-            ]));
-        return manifest.resolved_dependencies.flatMap((dep)=>{
-            if (!dep.branch) return [];
-            return [
-                {
-                    appId: dep.app_id,
-                    branch: dep.branch,
-                    packageName: cachedByAppId.get(dep.app_id)?.package_name
-                }
-            ];
-        });
-    }
-    function normalizeAnvilYamlDependenciesFromContent(content) {
-        const parsed = external_js_yaml_default().load(content);
-        if (!parsed || "object" != typeof parsed || !Array.isArray(parsed.dependencies)) return [];
-        return normalizeAnvilYamlDependenciesValue(parsed.dependencies);
-    }
-    function normalizeAnvilYamlDependenciesValue(value) {
-        if (!Array.isArray(value)) return [];
-        return normalizeForComparison(value);
-    }
-    async function readAnvilYamlDependencies(projectRoot) {
-        try {
-            const content = await promises_default().readFile(external_path_default().join(projectRoot, "anvil.yaml"), "utf-8");
-            return normalizeAnvilYamlDependenciesFromContent(content);
-        } catch  {
-            return [];
-        }
-    }
-    function anvilYamlDependenciesEqual(left, right) {
-        return deepEqual(left, right);
-    }
-    function normalizeForComparison(value) {
-        if (Array.isArray(value)) return value.map(normalizeForComparison);
-        if (value && "object" == typeof value) return Object.fromEntries(Object.entries(value).sort(([left], [right])=>left.localeCompare(right)).map(([key, entryValue])=>[
-                key,
-                normalizeForComparison(entryValue)
-            ]));
-        return value;
-    }
-    function cachedManifestEntry(dep, packageName) {
-        return {
-            app_id: dep.app_id,
-            commit_id: dep.commit_id,
-            ...dep.branch ? {
-                branch: dep.branch
-            } : {},
-            package_name: packageName
-        };
-    }
-    function safeDependencyPath(filePath, kind) {
-        const normalizedPath = external_path_default().normalize(filePath);
-        if (external_path_default().isAbsolute(normalizedPath) || normalizedPath.startsWith("..")) throw new Error(`Invalid dependency ${kind} path: ${filePath}`);
-        return normalizedPath;
-    }
-    async function writeDepToCache(projectRoot, dep) {
-        const depDir = external_path_default().join(projectRoot, ANVIL_DEPS_DIR, dep.package_name);
-        await promises_default().rm(depDir, {
-            recursive: true,
-            force: true
-        });
-        await promises_default().mkdir(external_path_default().join(depDir, "client_code"), {
-            recursive: true
-        });
-        await promises_default().mkdir(external_path_default().join(depDir, "server_code"), {
-            recursive: true
-        });
-        await promises_default().writeFile(external_path_default().join(depDir, "anvil.yaml"), external_js_yaml_default().dump({
-            package_name: dep.package_name
-        }));
-        for (const mod of dep.modules ?? [])if (mod.is_package) {
-            const modDir = external_path_default().join(depDir, "client_code", mod.name);
-            await promises_default().mkdir(modDir, {
-                recursive: true
-            });
-            await promises_default().writeFile(external_path_default().join(modDir, "__init__.py"), mod.code);
-        } else await promises_default().writeFile(external_path_default().join(depDir, "client_code", `${mod.name}.py`), mod.code);
-        for (const form of dep.forms ?? []){
-            const { code, class_name, is_package, ...formTemplate } = form;
-            if (is_package) {
-                const formDir = external_path_default().join(depDir, "client_code", class_name);
-                await promises_default().mkdir(formDir, {
-                    recursive: true
-                });
-                await promises_default().writeFile(external_path_default().join(formDir, "__init__.py"), code);
-                await promises_default().writeFile(external_path_default().join(formDir, "form_template.yaml"), external_js_yaml_default().dump(formTemplate));
-            } else {
-                await promises_default().writeFile(external_path_default().join(depDir, "client_code", `${class_name}.py`), code);
-                await promises_default().writeFile(external_path_default().join(depDir, "client_code", `${class_name}.yaml`), external_js_yaml_default().dump(formTemplate));
-            }
-        }
-        for (const mod of dep.server_modules ?? [])if (mod.is_package) {
-            const modDir = external_path_default().join(depDir, "server_code", mod.name);
-            await promises_default().mkdir(modDir, {
-                recursive: true
-            });
-            await promises_default().writeFile(external_path_default().join(modDir, "__init__.py"), mod.code);
-        } else await promises_default().writeFile(external_path_default().join(depDir, "server_code", `${mod.name}.py`), mod.code);
-        for (const asset of dep.assets ?? []){
-            const targetPath = external_path_default().join(depDir, "theme", "assets", safeDependencyPath(asset.name, "asset"));
-            await promises_default().mkdir(external_path_default().dirname(targetPath), {
-                recursive: true
-            });
-            await promises_default().writeFile(targetPath, Buffer.from(asset.content, "base64"));
-        }
-        for (const doc of dep.docs ?? []){
-            const targetPath = external_path_default().join(depDir, safeDependencyPath(doc.path, "doc"));
-            await promises_default().mkdir(external_path_default().dirname(targetPath), {
-                recursive: true
-            });
-            await promises_default().writeFile(targetPath, doc.content);
-        }
-    }
-    async function writeAllDepsToCache(projectRoot, response, options = {}) {
-        const includeDocs = options.includeDocs ?? true;
-        const manifest = await readDepsCacheManifest(projectRoot);
-        const canReuseExistingCache = manifest?.includeDocs === includeDocs;
-        if (!canReuseExistingCache) await clearDepsCache(projectRoot);
-        const previousCached = canReuseExistingCache ? manifest.cached_dependencies : [];
-        const resolvedAppIds = new Set(response.resolved_dependencies.map((dep)=>dep.app_id));
-        for (const dep of previousCached)if (!resolvedAppIds.has(dep.app_id)) await promises_default().rm(external_path_default().join(projectRoot, ANVIL_DEPS_DIR, dep.package_name), {
-            recursive: true,
-            force: true
-        });
-        for (const dep of response.dependencies)await writeDepToCache(projectRoot, dep);
-        const returnedByAppId = new Map(response.dependencies.map((dep)=>[
-                dep.app_id,
-                dep
-            ]));
-        const previousByAppId = new Map(previousCached.map((dep)=>[
-                dep.app_id,
-                dep
-            ]));
-        const cachedDependencies = response.resolved_dependencies.map((dep)=>{
-            const returned = returnedByAppId.get(dep.app_id);
-            if (returned) return cachedManifestEntry(returned, returned.package_name);
-            const previous = previousByAppId.get(dep.app_id);
-            if (!previous) return;
-            return cachedManifestEntry(dep, previous.package_name);
-        }).filter((dep)=>void 0 !== dep);
-        const newManifest = {
-            version: DEPS_MANIFEST_VERSION,
-            includeDocs,
-            resolved_dependencies: response.resolved_dependencies,
-            cached_dependencies: cachedDependencies
-        };
-        await promises_default().mkdir(depsDir(projectRoot), {
-            recursive: true
-        });
-        await promises_default().writeFile(depsManifestPath(projectRoot), `${JSON.stringify(newManifest, null, 2)}\n`);
-    }
-    async function clearDepsCache(projectRoot) {
-        await promises_default().rm(depsDir(projectRoot), {
-            recursive: true,
-            force: true
-        });
-    }
-    async function getCachedPackages(projectRoot) {
-        try {
-            const entries = await promises_default().readdir(depsDir(projectRoot), {
-                withFileTypes: true
-            });
-            return entries.filter((entry)=>entry.isDirectory()).map((entry)=>entry.name);
-        } catch  {
-            return [];
-        }
-    }
-    const external_timers_promises_namespaceObject = require("timers/promises");
-    const WANT_NOT_VALID_RE = /\bwant\s+[0-9a-f]{7,40}\s+not valid\b/i;
-    const FETCH_RETRY_DELAY_MS = 200;
-    function isWantNotValidError(error) {
-        return WANT_NOT_VALID_RE.test(error.message || "");
-    }
-    class GitService extends Emitter {
-        git;
-        repoPath;
-        static INDEX_LOCK_RETRY_DELAYS_MS = [
-            25,
-            50,
-            100,
-            200
-        ];
-        constructor(repoPath){
-            super();
-            this.repoPath = external_path_default().resolve(repoPath);
-            this.git = esm_default(this.repoPath);
-        }
-        getGit() {
-            return this.git;
-        }
-        getRepoPath() {
-            return this.repoPath;
-        }
-        async getGitDir() {
-            try {
-                const gitDir = (await this.git.revparse([
-                    "--git-dir"
-                ])).trim();
-                if (!external_path_default().isAbsolute(gitDir)) return external_path_default().resolve(this.repoPath, gitDir);
-                return gitDir;
-            } catch (e) {
-                throw errors_createGitError.commandFailed("rev-parse --git-dir", e.message);
-            }
-        }
-        async getCurrentBranch() {
-            try {
-                const branchRef = await this.git.revparse([
-                    "--abbrev-ref",
-                    "HEAD"
-                ]);
-                if ("HEAD" === branchRef) throw createSyncError.detachedHead();
-                return branchRef;
-            } catch (e) {
-                if ("detached_head" === e.type) throw e;
-                throw createSyncError.detachedHead();
+        async getCurrentBranch() {
+            try {
+                const branchRef = await this.git.revparse([
+                    "--abbrev-ref",
+                    "HEAD"
+                ]);
+                if ("HEAD" === branchRef) throw createSyncError.detachedHead();
+                return branchRef;
+            } catch (e) {
+                if ("detached_head" === e.type) throw e;
+                throw createSyncError.detachedHead();
             }
         }
         async getCommitId() {
@@ -14755,341 +14382,951 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             }
             return discarded;
         }
-        async discardStagedModeOnlyChanges(paths) {
-            const discarded = [];
-            for (const relativePath of paths)try {
-                const headMode = await this.getHeadFileMode(relativePath);
-                if ("100644" !== headMode && "100755" !== headMode) continue;
-                const indexContentUnchanged = await this.hasSameIndexContentAsHead(relativePath);
-                if (!indexContentUnchanged) continue;
+        async discardStagedModeOnlyChanges(paths) {
+            const discarded = [];
+            for (const relativePath of paths)try {
+                const headMode = await this.getHeadFileMode(relativePath);
+                if ("100644" !== headMode && "100755" !== headMode) continue;
+                const indexContentUnchanged = await this.hasSameIndexContentAsHead(relativePath);
+                if (!indexContentUnchanged) continue;
+                await this.git.raw([
+                    "reset",
+                    "-q",
+                    "HEAD",
+                    "--",
+                    relativePath
+                ]);
+                await this.restoreExecutableBit(relativePath, "100755" === headMode);
+                discarded.push(relativePath);
+            } catch (e) {
+                throw errors_createGitError.commandFailed("discard staged mode-only changes", e.message);
+            }
+            return discarded;
+        }
+        async getHeadFileMode(relativePath) {
+            const output = await this.git.raw([
+                "ls-tree",
+                "HEAD",
+                "--",
+                relativePath
+            ]);
+            const match = output.match(/^(\d{6})\s/);
+            return match?.[1] ?? null;
+        }
+        async hasSameContentAsHead(relativePath) {
+            const headHash = (await this.git.revparse([
+                `HEAD:${relativePath}`
+            ])).trim();
+            const worktreeHash = (await this.git.raw([
+                "hash-object",
+                "--",
+                relativePath
+            ])).trim();
+            return headHash === worktreeHash;
+        }
+        async hasSameIndexContentAsHead(relativePath) {
+            const headHash = (await this.git.revparse([
+                `HEAD:${relativePath}`
+            ])).trim();
+            const indexHash = (await this.git.revparse([
+                `:${relativePath}`
+            ])).trim();
+            return headHash === indexHash;
+        }
+        async restoreExecutableBit(relativePath, executable) {
+            const filePath = external_path_default().join(this.repoPath, relativePath);
+            const stat = await external_fs_.promises.stat(filePath);
+            const mode = executable ? 73 | stat.mode : -74 & stat.mode;
+            if ((511 & stat.mode) !== (511 & mode)) await external_fs_.promises.chmod(filePath, mode);
+        }
+        async hasUncommittedChanges() {
+            const status = await this.getStatus();
+            return !status.isClean;
+        }
+        async fetch(url, refSpec) {
+            let attempt = 0;
+            while(true)try {
+                await this.git.fetch([
+                    url,
+                    refSpec
+                ]);
+                if (attempt > 0) this.emit("fetch-retry-resolved", {
+                    attempts: attempt,
+                    outcome: "succeeded"
+                });
+                return;
+            } catch (e) {
+                const err = e;
+                if (!isWantNotValidError(err)) {
+                    if (attempt > 0) this.emit("fetch-retry-resolved", {
+                        attempts: attempt,
+                        outcome: "failed"
+                    });
+                    throw errors_createGitError.fetchFailed(err.message);
+                }
+                attempt++;
+                this.emit("fetch-retry", {
+                    attempt,
+                    delayMs: FETCH_RETRY_DELAY_MS,
+                    error: err.message
+                });
+                logger_logger.verbose(`git fetch race (attempt ${attempt}, sleeping ${FETCH_RETRY_DELAY_MS}ms): ${err.message}`);
+                await (0, promises_namespaceObject.setTimeout)(FETCH_RETRY_DELAY_MS);
+            }
+        }
+        async reset(ref, mode = "mixed") {
+            await this.runGitCommandWithIndexLockRetry("reset", ()=>this.git.reset([
+                    `--${mode}`,
+                    ref
+                ]));
+        }
+        async checkout(paths) {
+            await this.runGitCommandWithIndexLockRetry("checkout", ()=>this.git.checkout(paths));
+        }
+        async runGitCommandWithIndexLockRetry(command, operation) {
+            let lastError;
+            for(let attempt = 0; attempt <= GitService.INDEX_LOCK_RETRY_DELAYS_MS.length; attempt += 1)try {
+                await operation();
+                return;
+            } catch (e) {
+                lastError = e;
+                if (!this.isIndexLockError(e) || attempt === GitService.INDEX_LOCK_RETRY_DELAYS_MS.length) throw errors_createGitError.commandFailed(command, e.message);
+                await (0, promises_namespaceObject.setTimeout)(GitService.INDEX_LOCK_RETRY_DELAYS_MS[attempt]);
+            }
+            throw errors_createGitError.commandFailed(command, lastError.message);
+        }
+        isIndexLockError(error) {
+            const message = error.message ?? "";
+            return message.includes("Unable to create") && message.includes("index.lock") && message.includes("File exists");
+        }
+        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 errors_createGitError.commandFailed("stash", e.message);
+            }
+        }
+        async stashPop() {
+            try {
+                await this.git.raw([
+                    "stash",
+                    "pop"
+                ]);
+            } catch (e) {
+                throw errors_createGitError.commandFailed("stash pop", e.message);
+            }
+        }
+        async clean(files) {
+            try {
+                await this.git.clean(CleanOptions.FORCE, files);
+            } catch (e) {
+                throw errors_createGitError.commandFailed("clean", e.message);
+            }
+        }
+        async diffNames(fromCommit, toCommit) {
+            try {
+                const diffResult = await this.git.diff([
+                    fromCommit,
+                    toCommit,
+                    "--name-only"
+                ]);
+                const files = diffResult.split("\n").filter((f)=>f.trim());
+                return files;
+            } catch (e) {
+                throw errors_createGitError.commandFailed("diff", e.message);
+            }
+        }
+        async getAheadBehind(localRef, remoteRef) {
+            try {
+                const result = await this.git.raw([
+                    "rev-list",
+                    "--left-right",
+                    "--count",
+                    `${remoteRef}...${localRef}`
+                ]);
+                const [behind, ahead] = result.trim().split("\t").map(Number);
+                return {
+                    ahead,
+                    behind
+                };
+            } catch (e) {
+                throw errors_createGitError.commandFailed("rev-list", e.message);
+            }
+        }
+        async show(refPath) {
+            try {
+                const content = await this.git.show([
+                    refPath
+                ]);
+                return content;
+            } catch (e) {
+                throw errors_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 errors_createGitError.commandFailed("push", e.message);
+            }
+        }
+        async rebase(onto) {
+            try {
+                await this.git.raw([
+                    "rebase",
+                    onto
+                ]);
+            } catch (e) {
+                throw errors_createGitError.commandFailed("rebase", e.message);
+            }
+        }
+        async rebaseAbort() {
+            try {
+                await this.git.raw([
+                    "rebase",
+                    "--abort"
+                ]);
+            } catch (e) {
+                throw errors_createGitError.commandFailed("rebase --abort", e.message);
+            }
+        }
+        async isAncestor(ancestorRef, descendantRef) {
+            try {
+                const mergeBase = (await this.git.raw([
+                    "merge-base",
+                    ancestorRef,
+                    descendantRef
+                ])).trim();
+                const ancestorCommit = (await this.git.revparse([
+                    ancestorRef
+                ])).trim();
+                return mergeBase === ancestorCommit;
+            } catch  {
+                return false;
+            }
+        }
+        async mergeFastForward(ref) {
+            await this.runGitCommandWithIndexLockRetry("merge --ff-only", ()=>this.git.raw([
+                    "merge",
+                    "--ff-only",
+                    ref
+                ]));
+        }
+        async deleteRef(ref) {
+            try {
                 await this.git.raw([
-                    "reset",
-                    "-q",
-                    "HEAD",
-                    "--",
-                    relativePath
+                    "update-ref",
+                    "-d",
+                    ref
                 ]);
-                await this.restoreExecutableBit(relativePath, "100755" === headMode);
-                discarded.push(relativePath);
+            } catch (e) {}
+        }
+        async getRemotes() {
+            try {
+                const remotes = await this.git.getRemotes(true);
+                return remotes.map((r)=>({
+                        name: r.name,
+                        fetchUrl: r.refs.fetch
+                    }));
             } catch (e) {
-                throw errors_createGitError.commandFailed("discard staged mode-only changes", e.message);
+                throw errors_createGitError.commandFailed("remote", e.message);
             }
-            return discarded;
-        }
-        async getHeadFileMode(relativePath) {
-            const output = await this.git.raw([
-                "ls-tree",
-                "HEAD",
-                "--",
-                relativePath
-            ]);
-            const match = output.match(/^(\d{6})\s/);
-            return match?.[1] ?? null;
-        }
-        async hasSameContentAsHead(relativePath) {
-            const headHash = (await this.git.revparse([
-                `HEAD:${relativePath}`
-            ])).trim();
-            const worktreeHash = (await this.git.raw([
-                "hash-object",
-                "--",
-                relativePath
-            ])).trim();
-            return headHash === worktreeHash;
-        }
-        async hasSameIndexContentAsHead(relativePath) {
-            const headHash = (await this.git.revparse([
-                `HEAD:${relativePath}`
-            ])).trim();
-            const indexHash = (await this.git.revparse([
-                `:${relativePath}`
-            ])).trim();
-            return headHash === indexHash;
         }
-        async restoreExecutableBit(relativePath, executable) {
-            const filePath = external_path_default().join(this.repoPath, relativePath);
-            const stat = await external_fs_.promises.stat(filePath);
-            const mode = executable ? 73 | stat.mode : -74 & stat.mode;
-            if ((511 & stat.mode) !== (511 & mode)) await external_fs_.promises.chmod(filePath, mode);
+        async isGitInitialized() {
+            const gitPath = external_path_default().join(this.repoPath, ".git");
+            return external_fs_.existsSync(gitPath);
         }
-        async hasUncommittedChanges() {
-            const status = await this.getStatus();
-            return !status.isClean;
+        async removeEmptyDirectories(removedFiles) {
+            const directoriesToCheck = new Set();
+            for (const file of removedFiles){
+                let dir = external_path_default().dirname(file);
+                while(dir && "." !== dir){
+                    directoriesToCheck.add(dir);
+                    const parentDir = external_path_default().dirname(dir);
+                    if (parentDir === dir) break;
+                    dir = parentDir;
+                }
+            }
+            const sortedDirs = Array.from(directoriesToCheck).sort((a, b)=>b.split("/").length - a.split("/").length);
+            for (const dir of sortedDirs)try {
+                const dirPath = external_path_default().join(this.repoPath, dir);
+                if (!external_fs_.existsSync(dirPath)) continue;
+                const entries = await external_fs_.promises.readdir(dirPath);
+                if (0 === entries.length) await external_fs_.promises.rmdir(dirPath);
+            } catch (error) {}
         }
-        async fetch(url, refSpec) {
-            let attempt = 0;
-            while(true)try {
-                await this.git.fetch([
-                    url,
-                    refSpec
-                ]);
-                if (attempt > 0) this.emit("fetch-retry-resolved", {
-                    attempts: attempt,
-                    outcome: "succeeded"
+    }
+    async function getStagedFileChanges(git, gitService) {
+        try {
+            const status = await git.status();
+            const renames = status.renamed || [];
+            const stagedFiles = status.files.filter((f)=>" " !== f.index && "?" !== f.index);
+            const stagedModeOnlyPaths = new Set(gitService ? await gitService.discardStagedModeOnlyChanges(stagedFiles.filter((f)=>"R" !== f.index && "D" !== f.index).map((f)=>f.path)) : []);
+            const stagedRenames = [];
+            for (const f of stagedFiles)if ("R" === f.index) {
+                const rename = renames.find((r)=>r.to === f.path);
+                if (rename) stagedRenames.push({
+                    path: rename.to,
+                    type: "rename",
+                    from: rename.from
                 });
-                return;
-            } catch (e) {
-                const err = e;
-                if (!isWantNotValidError(err)) {
-                    if (attempt > 0) this.emit("fetch-retry-resolved", {
-                        attempts: attempt,
-                        outcome: "failed"
-                    });
-                    throw errors_createGitError.fetchFailed(err.message);
+            }
+            const stagedRenamedFromPaths = new Set(stagedRenames.map((r)=>r.from));
+            const stagedRenamedToPaths = new Set(stagedRenames.map((r)=>r.path));
+            const changes = [];
+            for (const f of stagedFiles){
+                if ("R" !== f.index) {
+                    if (!stagedModeOnlyPaths.has(f.path)) {
+                        if (!(stagedRenamedFromPaths.has(f.path) || stagedRenamedToPaths.has(f.path))) if ("D" === f.index) changes.push({
+                            path: f.path,
+                            type: "unlink"
+                        });
+                        else if ("A" === f.index || "?" === f.index) changes.push({
+                            path: f.path,
+                            type: "add"
+                        });
+                        else changes.push({
+                            path: f.path,
+                            type: "change"
+                        });
+                    }
                 }
-                attempt++;
-                this.emit("fetch-retry", {
-                    attempt,
-                    delayMs: FETCH_RETRY_DELAY_MS,
-                    error: err.message
-                });
-                logger_logger.verbose(`git fetch race (attempt ${attempt}, sleeping ${FETCH_RETRY_DELAY_MS}ms): ${err.message}`);
-                await (0, external_timers_promises_namespaceObject.setTimeout)(FETCH_RETRY_DELAY_MS);
             }
+            changes.push(...stagedRenames);
+            return changes;
+        } catch (e) {
+            throw errors_createGitError.commandFailed("status", e.message);
         }
-        async reset(ref, mode = "mixed") {
-            await this.runGitCommandWithIndexLockRetry("reset", ()=>this.git.reset([
-                    `--${mode}`,
-                    ref
-                ]));
-        }
-        async checkout(paths) {
-            await this.runGitCommandWithIndexLockRetry("checkout", ()=>this.git.checkout(paths));
+    }
+    async function getCurrentOrFallbackBranchName(git) {
+        const branchRef = (await git.revparse([
+            "--abbrev-ref",
+            "HEAD"
+        ])).trim();
+        if ("HEAD" !== branchRef) return branchRef;
+        const [localBranches, remoteBranches] = await Promise.all([
+            git.raw([
+                "branch",
+                "--format=%(refname:short)",
+                "--contains",
+                "HEAD"
+            ]),
+            git.raw([
+                "branch",
+                "-r",
+                "--format=%(refname:short)",
+                "--contains",
+                "HEAD"
+            ])
+        ]);
+        const branchNames = [
+            ...parseBranchList(localBranches),
+            ...parseBranchList(remoteBranches).filter((branchName)=>!branchName.endsWith("/HEAD")).map((branchName)=>branchName.replace(/^[^/]+\//, ""))
+        ];
+        const branchSet = new Set(branchNames);
+        if (branchSet.has("master")) return "master";
+        if (branchSet.has("main")) return "main";
+        return "master";
+    }
+    function parseBranchList(output) {
+        return output.split(/\r?\n/).map((line)=>line.trim()).filter(Boolean);
+    }
+    function anvil_api_getDefaultAnvilUrl() {
+        return resolveAnvilUrl();
+    }
+    async function validateAppId(appId, anvilUrl = anvil_api_getDefaultAnvilUrl(), username) {
+        const authToken = await auth_getValidAuthToken(anvilUrl, username);
+        try {
+            const resp = await fetch(`${anvilUrl}/ide/api/_/apps/validate-app-id`, {
+                method: "POST",
+                headers: {
+                    Authorization: `Bearer ${authToken}`,
+                    "Content-Type": "application/json"
+                },
+                body: JSON.stringify({
+                    app_id: appId
+                })
+            });
+            const data = await resp.json();
+            if (resp.ok) return {
+                valid: data.valid ?? false,
+                app_name: data.app_name
+            };
+            if (401 === resp.status) throw errors_createAuthError.invalid("Authentication failed");
+            if (403 === resp.status) throw createAppError.accessDenied(appId);
+            if (404 === resp.status) throw createAppError.notFound(appId);
+            logger_logger.debug(`validate-app-id failed: ${resp.status} ${resp.statusText}`);
+            return {
+                valid: false,
+                error: data.error || `Server error: ${resp.status}`
+            };
+        } catch (error) {
+            if (error.type) throw error;
+            throw errors_createNetworkError.network(error.message);
         }
-        async runGitCommandWithIndexLockRetry(command, operation) {
-            let lastError;
-            for(let attempt = 0; attempt <= GitService.INDEX_LOCK_RETRY_DELAYS_MS.length; attempt += 1)try {
-                await operation();
-                return;
-            } catch (e) {
-                lastError = e;
-                if (!this.isIndexLockError(e) || attempt === GitService.INDEX_LOCK_RETRY_DELAYS_MS.length) throw errors_createGitError.commandFailed(command, e.message);
-                await (0, external_timers_promises_namespaceObject.setTimeout)(GitService.INDEX_LOCK_RETRY_DELAYS_MS[attempt]);
+    }
+    async function listAppsForCheckout(options = {}) {
+        const anvilUrl = options.anvilUrl ?? anvil_api_getDefaultAnvilUrl();
+        const authToken = await auth_getValidAuthToken(anvilUrl, options.username);
+        const params = new URLSearchParams();
+        if ("number" == typeof options.limit) params.set("limit", String(options.limit));
+        if (options.cursor) params.set("cursor", options.cursor);
+        if (options.q && options.q.trim()) params.set("q", options.q.trim());
+        const query = params.toString();
+        const url = `${anvilUrl}/ide/api/_/apps${query ? `?${query}` : ""}`;
+        try {
+            const resp = await fetch(url, {
+                method: "GET",
+                headers: {
+                    Authorization: `Bearer ${authToken}`
+                },
+                signal: options.signal
+            });
+            if (!resp.ok) {
+                if (401 === resp.status) throw errors_createAuthError.invalid("Authentication failed");
+                throw errors_createNetworkError.server(resp.status, resp.statusText);
             }
-            throw errors_createGitError.commandFailed(command, lastError.message);
+            const data = await resp.json();
+            return {
+                apps: Array.isArray(data.apps) ? data.apps : [],
+                next_cursor: "string" == typeof data.next_cursor ? data.next_cursor : null
+            };
+        } catch (error) {
+            if (error.type) throw error;
+            throw errors_createNetworkError.network(error.message);
+        }
+    }
+    function getGitFetchUrl(appId, authToken, gitUrl = anvil_api_getDefaultAnvilUrl()) {
+        const url = new URL(gitUrl);
+        const encodedToken = encodeURIComponent(authToken);
+        return `${url.protocol}//git:${encodedToken}@${url.hostname}${url.port ? ":" + url.port : ""}/git/${appId}.git?no_freeze=true&q=`;
+    }
+    function getGitPushUrl(appId, authToken, anvilUrl = anvil_api_getDefaultAnvilUrl()) {
+        const url = new URL(anvilUrl);
+        const encodedToken = encodeURIComponent(authToken);
+        return `${url.protocol}//git:${encodedToken}@${url.hostname}${url.port ? ":" + url.port : ""}/git/${appId}.git`;
+    }
+    function getWebSocketUrl(appId, authToken, anvilUrl = anvil_api_getDefaultAnvilUrl()) {
+        return anvilUrl.replace(/^http/, "ws") + `/ide/api/_/apps/${appId}/ws?access_token=${authToken}`;
+    }
+    async function getLatestVersion() {
+        try {
+            const response = await fetch("https://registry.npmjs.org/@anvil-works/anvil-cli/latest");
+            if (!response.ok) return null;
+            const data = await response.json();
+            return data.version;
+        } catch (e) {
+            return null;
         }
-        isIndexLockError(error) {
-            const message = error.message ?? "";
-            return message.includes("Unable to create") && message.includes("index.lock") && message.includes("File exists");
+    }
+    function filterCandidates(candidates, explicitUrl, explicitUsername) {
+        let filtered = candidates;
+        if (explicitUrl) {
+            const normalizedExplicit = normalizeAnvilUrl(explicitUrl);
+            filtered = filtered.filter((c)=>c.detectedUrl && normalizeAnvilUrl(c.detectedUrl) === normalizedExplicit);
         }
-        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 errors_createGitError.commandFailed("stash", e.message);
+        if (explicitUsername) filtered = filtered.filter((c)=>!c.detectedUsername || c.detectedUsername === explicitUsername);
+        return filtered;
+    }
+    function formatCandidateLabel(candidate) {
+        const parts = [
+            candidate.appId
+        ];
+        if (candidate.detectedUrl) if (candidate.detectedUsername) parts.push(`(${candidate.detectedUsername} on ${candidate.detectedUrl})`);
+        else parts.push(`(${candidate.detectedUrl})`);
+        parts.push(`- ${candidate.description}`);
+        return parts.join(" ");
+    }
+    function lookupRemoteInfoForAppId(appId, detectedRemotes) {
+        const matches = detectedRemotes.filter((c)=>c.appId === appId);
+        if (0 === matches.length) return {};
+        const withUsername = matches.find((c)=>c.detectedUsername);
+        if (withUsername) return {
+            detectedUrl: withUsername.detectedUrl,
+            detectedUsername: withUsername.detectedUsername
+        };
+        return {
+            detectedUrl: matches[0].detectedUrl,
+            detectedUsername: matches[0].detectedUsername
+        };
+    }
+    async function detectAppIdsFromAllRemotes(repoPath) {
+        const git = esm_default(repoPath);
+        const out = [];
+        try {
+            const remotes = await git.getRemotes(true);
+            for (const remote of remotes){
+                const httpMatch = remote.refs.fetch?.match(/(?:http|https):\/\/(?:[^@]+@)?([^:\/]+)(?::\d+)?\/git\/([A-Z0-9]+)\.git/);
+                if (httpMatch) {
+                    const [, host, detectedAppId] = httpMatch;
+                    out.push({
+                        appId: detectedAppId,
+                        source: "remote",
+                        description: `Git remote '${remote.name}'`,
+                        detectedUrl: normalizeAnvilUrl(host)
+                    });
+                    continue;
+                }
+                const sshMatch = remote.refs.fetch?.match(/ssh:\/\/([^@]+)@([^:]+):(\d+)\/(?:git\/)?([A-Z0-9]+)\.git/);
+                if (sshMatch) {
+                    const [, usernamePart, host, , detectedAppId] = sshMatch;
+                    const detectedUsername = usernamePart.includes("%") ? decodeURIComponent(usernamePart) : usernamePart;
+                    const finalUsername = "git" !== detectedUsername ? detectedUsername : void 0;
+                    out.push({
+                        appId: detectedAppId,
+                        source: "remote",
+                        description: `Git remote '${remote.name}' (SSH)`,
+                        detectedUrl: normalizeAnvilUrl(host),
+                        detectedUsername: finalUsername
+                    });
+                }
             }
-        }
-        async stashPop() {
-            try {
-                await this.git.raw([
-                    "stash",
-                    "pop"
-                ]);
-            } catch (e) {
-                throw errors_createGitError.commandFailed("stash pop", e.message);
+        } catch (_e) {}
+        return out;
+    }
+    async function detectAppIdsByCommitLookup(repoPath, options) {
+        const anvilUrl = options.anvilUrl || resolveAnvilUrl();
+        const username = options.username;
+        const git = esm_default(repoPath);
+        const out = [];
+        try {
+            const authToken = await auth_getValidAuthToken(anvilUrl, username);
+            const commitId = (await git.revparse([
+                "HEAD"
+            ]))?.trim();
+            if (!commitId) return out;
+            const branchName = await getCurrentOrFallbackBranchName(git);
+            const resp = await fetch(`${anvilUrl}/ide/api/_/apps/lookup-by-commit`, {
+                method: "POST",
+                headers: {
+                    Authorization: `Bearer ${authToken}`,
+                    "Content-Type": "application/json"
+                },
+                body: JSON.stringify({
+                    commit_id: commitId,
+                    branch_name: branchName
+                })
+            });
+            logger_logger.debug(`Reverse lookup by commit ${commitId} on branch ${branchName} returned ${resp.status}`);
+            if (!resp.ok) {
+                const errorBody = await resp.text();
+                logger_logger.debug(`lookup-by-commit error: ${errorBody}`);
             }
-        }
-        async clean(files) {
-            try {
-                await this.git.clean(CleanOptions.FORCE, files);
-            } catch (e) {
-                throw errors_createGitError.commandFailed("clean", e.message);
+            if (resp.ok) {
+                const data = await resp.json();
+                logger_logger.debug(`data ${JSON.stringify(data)}`);
+                const apps = data?.apps ?? [];
+                for (const app of apps)if (app?.app_id) out.push({
+                    appId: app.app_id,
+                    source: "remote",
+                    description: `Reverse lookup by commit${app.branch ? ` on branch '${app.branch}'` : ""}`
+                });
             }
+        } catch (_e) {}
+        return out;
+    }
+    const external_fs_promises_namespaceObject = require("fs/promises");
+    var external_fs_promises_default = /*#__PURE__*/ __webpack_require__.n(external_fs_promises_namespaceObject);
+    function normalizeLineEndings(content) {
+        return content.replace(/\r\n/g, "\n");
+    }
+    function pythonifyName(name) {
+        return name.replace(/[^A-z0-9]/g, "_").replace(/^[0-9]/, "_$&");
+    }
+    function extractPythonName(relativePath, skipParts = 1) {
+        const parts = relativePath.slice(0, -3).split("/");
+        const isPackage = relativePath.endsWith("__init__.py");
+        const relevantParts = isPackage ? parts.slice(skipParts, -1) : parts.slice(skipParts);
+        return relevantParts.map(pythonifyName).join(".");
+    }
+    function deepEqual(a, b) {
+        if (a === b) return true;
+        if (null == a || null == b) return false;
+        if (typeof a !== typeof b) return false;
+        if ("object" != typeof a) return a === b;
+        if (Array.isArray(a) !== Array.isArray(b)) return false;
+        if (Array.isArray(a)) {
+            if (a.length !== b.length) return false;
+            return a.every((item, index)=>deepEqual(item, b[index]));
         }
-        async diffNames(fromCommit, toCommit) {
-            try {
-                const diffResult = await this.git.diff([
-                    fromCommit,
-                    toCommit,
-                    "--name-only"
-                ]);
-                const files = diffResult.split("\n").filter((f)=>f.trim());
-                return files;
-            } catch (e) {
-                throw errors_createGitError.commandFailed("diff", e.message);
-            }
+        const keysA = Object.keys(a);
+        const keysB = Object.keys(b);
+        if (keysA.length !== keysB.length) return false;
+        return keysA.every((key)=>deepEqual(a[key], b[key]));
+    }
+    function parseHtmlWithFrontmatter(htmlContent) {
+        const frontmatterPattern = /^---\s*\n([\s\S]*?)\n---\s*\n([\s\S]*)$/;
+        const match = htmlContent.match(frontmatterPattern);
+        if (match) {
+            const yamlStr = match[1];
+            const html = match[2];
+            const frontmatter = yamlStr ? external_js_yaml_default().load(yamlStr) ?? {} : {};
+            return {
+                frontmatter,
+                html
+            };
         }
-        async getAheadBehind(localRef, remoteRef) {
-            try {
-                const result = await this.git.raw([
-                    "rev-list",
-                    "--left-right",
-                    "--count",
-                    `${remoteRef}...${localRef}`
-                ]);
-                const [behind, ahead] = result.trim().split("\t").map(Number);
-                return {
-                    ahead,
-                    behind
-                };
-            } catch (e) {
-                throw errors_createGitError.commandFailed("rev-list", e.message);
-            }
+        return {
+            frontmatter: {},
+            html: htmlContent
+        };
+    }
+    function formatHttpError(prefix, status, body) {
+        if (!body) return `${prefix}: ${status}`;
+        try {
+            const parsed = JSON.parse(body);
+            if ("string" == typeof parsed.error && parsed.error.trim()) return `${prefix}: ${parsed.error} (${status})`;
+        } catch  {}
+        return `${prefix}: ${status} ${body}`;
+    }
+    const ANVIL_GITIGNORE_ENTRY = "/.anvil/";
+    async function ensureProjectGitignoreIgnoresAnvilDir(projectRoot) {
+        const rootGitignorePath = external_path_default().join(projectRoot, ".gitignore");
+        try {
+            const existing = await external_fs_.promises.readFile(rootGitignorePath, "utf8");
+            if (existing.includes(ANVIL_GITIGNORE_ENTRY)) return false;
+            const prefix = existing.endsWith("\n") || 0 === existing.length ? "" : "\n";
+            await external_fs_.promises.writeFile(rootGitignorePath, `${existing}${prefix}${ANVIL_GITIGNORE_ENTRY}\n`, "utf8");
+            return true;
+        } catch (error) {
+            if ("ENOENT" !== error.code) throw error;
+            await external_fs_.promises.writeFile(rootGitignorePath, `${ANVIL_GITIGNORE_ENTRY}\n`, "utf8");
+            return true;
         }
-        async show(refPath) {
-            try {
-                const content = await this.git.show([
-                    refPath
-                ]);
-                return content;
-            } catch (e) {
-                throw errors_createGitError.commandFailed("show", e.message);
-            }
+    }
+    const ANVIL_DEPS_DIR = ".anvil/deps";
+    const ANVIL_DEPS_MANIFEST = "manifest.json";
+    const DEPS_MANIFEST_VERSION = 3;
+    const DEPENDENCY_CACHE_WARNING = "Dependency cache is missing or stale. Run `anvil deps fetch` before validation.";
+    async function fetchAllDependencies(appId, anvilUrl, options = {}) {
+        const { commit, includeDocs = true, knownDependencies = [] } = options;
+        anvilUrl ??= await resolveAuthAnvilUrl();
+        const token = await auth_getValidAuthToken(anvilUrl, options.username);
+        const body = {
+            include_docs: includeDocs,
+            known_dependencies: knownDependencies
+        };
+        if (commit) body.commit = commit;
+        const resp = await fetch(`${anvilUrl}/ide/api/_/apps/${appId}/resolved-dependencies`, {
+            method: "POST",
+            headers: {
+                Authorization: `Bearer ${token}`,
+                "Content-Type": "application/json"
+            },
+            body: JSON.stringify(body)
+        });
+        if (!resp.ok) {
+            const errorBody = await resp.text();
+            throw new Error(formatHttpError("Failed to fetch dependencies", resp.status, errorBody));
         }
-        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 errors_createGitError.commandFailed("push", e.message);
-            }
+        return await resp.json();
+    }
+    async function refreshDependencyCache(projectRoot, appId, anvilUrl, options = {}) {
+        auth_setRepoContext(projectRoot);
+        anvilUrl ??= await resolveAuthAnvilUrl();
+        const includeDocs = options.includeDocs ?? true;
+        const git = new GitService(projectRoot);
+        const commit = options.commit ?? await git.getCommitId();
+        const sourceYaml = await git.show(`${commit}:anvil.yaml`).catch((error)=>{
+            if (options.commit) return null;
+            throw error;
+        });
+        const sourceDependencies = null === sourceYaml ? null : normalizeAnvilYamlDependenciesFromContent(sourceYaml);
+        const knownDependencies = await getKnownDependenciesForCache(projectRoot, includeDocs);
+        const response = await fetchAllDependencies(appId, anvilUrl, {
+            username: options.username,
+            commit,
+            includeDocs,
+            knownDependencies
+        });
+        if (!response.resolved_dependencies.length) {
+            await clearDepsCache(projectRoot);
+            return {
+                response,
+                addedGitignoreEntry: false
+            };
         }
-        async rebase(onto) {
-            try {
-                await this.git.raw([
-                    "rebase",
-                    onto
-                ]);
-            } catch (e) {
-                throw errors_createGitError.commandFailed("rebase", e.message);
-            }
+        const addedGitignoreEntry = await ensureProjectGitignoreIgnoresAnvilDir(projectRoot);
+        await writeAllDepsToCache(projectRoot, response, {
+            includeDocs,
+            sourceDependencies
+        });
+        return {
+            response,
+            addedGitignoreEntry
+        };
+    }
+    function depsDir(projectRoot) {
+        return external_path_default().join(projectRoot, ANVIL_DEPS_DIR);
+    }
+    function depsManifestPath(projectRoot) {
+        return external_path_default().join(depsDir(projectRoot), ANVIL_DEPS_MANIFEST);
+    }
+    function isResolvedDependencyManifestEntry(value) {
+        if (!value || "object" != typeof value) return false;
+        const entry = value;
+        return "string" == typeof entry.app_id && entry.app_id.length > 0 && "string" == typeof entry.commit_id && entry.commit_id.length > 0 && (void 0 === entry.branch || "string" == typeof entry.branch);
+    }
+    function isCachedDependencyManifestEntry(value) {
+        if (!isResolvedDependencyManifestEntry(value)) return false;
+        const entry = value;
+        return "string" == typeof entry.package_name && entry.package_name.length > 0;
+    }
+    function isDepsCacheManifest(value) {
+        if (!value || "object" != typeof value) return false;
+        const manifest = value;
+        return manifest.version === DEPS_MANIFEST_VERSION && "boolean" == typeof manifest.includeDocs && (null === manifest.source_dependencies || Array.isArray(manifest.source_dependencies)) && Array.isArray(manifest.resolved_dependencies) && manifest.resolved_dependencies.every(isResolvedDependencyManifestEntry) && Array.isArray(manifest.cached_dependencies) && manifest.cached_dependencies.every(isCachedDependencyManifestEntry);
+    }
+    async function readDepsCacheManifest(projectRoot) {
+        try {
+            const raw = await external_fs_promises_default().readFile(depsManifestPath(projectRoot), "utf-8");
+            const parsed = JSON.parse(raw);
+            return isDepsCacheManifest(parsed) ? parsed : void 0;
+        } catch  {
+            return;
         }
-        async rebaseAbort() {
-            try {
-                await this.git.raw([
-                    "rebase",
-                    "--abort"
-                ]);
-            } catch (e) {
-                throw errors_createGitError.commandFailed("rebase --abort", e.message);
-            }
+    }
+    async function getKnownDependenciesForCache(projectRoot, includeDocs) {
+        const manifest = await readDepsCacheManifest(projectRoot);
+        if (!manifest || manifest.includeDocs !== includeDocs) return [];
+        return manifest.resolved_dependencies.map(({ app_id, commit_id })=>({
+                app_id,
+                commit_id
+            }));
+    }
+    function getDependencyWatchSubscriptionsFromManifest(manifest) {
+        if (!manifest) return [];
+        const cachedByAppId = new Map(manifest.cached_dependencies.map((dep)=>[
+                dep.app_id,
+                dep
+            ]));
+        return manifest.resolved_dependencies.flatMap((dep)=>{
+            if (!dep.branch) return [];
+            return [
+                {
+                    appId: dep.app_id,
+                    branch: dep.branch,
+                    packageName: cachedByAppId.get(dep.app_id)?.package_name
+                }
+            ];
+        });
+    }
+    function normalizeAnvilYamlDependenciesFromContent(content) {
+        const parsed = external_js_yaml_default().load(content);
+        if (!parsed || "object" != typeof parsed || !Array.isArray(parsed.dependencies)) return [];
+        return normalizeAnvilYamlDependenciesValue(parsed.dependencies);
+    }
+    function normalizeAnvilYamlDependenciesValue(value) {
+        if (!Array.isArray(value)) return [];
+        return value.map(normalizeForComparison);
+    }
+    async function readAnvilYamlDependencies(projectRoot) {
+        try {
+            const content = await external_fs_promises_default().readFile(external_path_default().join(projectRoot, "anvil.yaml"), "utf-8");
+            return normalizeAnvilYamlDependenciesFromContent(content);
+        } catch  {
+            return [];
         }
-        async isAncestor(ancestorRef, descendantRef) {
+    }
+    async function getDependencyCacheWarning(projectRoot) {
+        const sourceDependencies = await readAnvilYamlDependencies(projectRoot);
+        if (!Array.isArray(sourceDependencies) || 0 === sourceDependencies.length) return;
+        const manifest = await readDepsCacheManifest(projectRoot);
+        if (!manifest || !anvilYamlDependenciesEqual(sourceDependencies, manifest.source_dependencies)) return DEPENDENCY_CACHE_WARNING;
+        if (0 === manifest.resolved_dependencies.length) return DEPENDENCY_CACHE_WARNING;
+        const cachedByAppId = new Map(manifest.cached_dependencies.map((dependency)=>[
+                dependency.app_id,
+                dependency
+            ]));
+        for (const dependency of manifest.resolved_dependencies){
+            const cached = cachedByAppId.get(dependency.app_id);
+            if (!cached || cached.commit_id !== dependency.commit_id) return DEPENDENCY_CACHE_WARNING;
             try {
-                const mergeBase = (await this.git.raw([
-                    "merge-base",
-                    ancestorRef,
-                    descendantRef
-                ])).trim();
-                const ancestorCommit = (await this.git.revparse([
-                    ancestorRef
-                ])).trim();
-                return mergeBase === ancestorCommit;
+                await external_fs_promises_default().access(external_path_default().join(depsDir(projectRoot), cached.package_name, "anvil.yaml"));
             } catch  {
-                return false;
+                return DEPENDENCY_CACHE_WARNING;
             }
         }
-        async mergeFastForward(ref) {
-            try {
-                await this.git.raw([
-                    "merge",
-                    "--ff-only",
-                    ref
-                ]);
-            } catch (e) {
-                throw errors_createGitError.commandFailed("merge --ff-only", e.message);
+    }
+    function anvilYamlDependenciesEqual(left, right) {
+        return deepEqual(left, right);
+    }
+    function normalizeForComparison(value) {
+        if (Array.isArray(value)) return value.map(normalizeForComparison);
+        if (value && "object" == typeof value) return Object.fromEntries(Object.entries(value).sort(([left], [right])=>left.localeCompare(right)).map(([key, entryValue])=>[
+                key,
+                normalizeForComparison(entryValue)
+            ]));
+        return value;
+    }
+    function cachedManifestEntry(dep, packageName) {
+        return {
+            app_id: dep.app_id,
+            commit_id: dep.commit_id,
+            ...dep.branch ? {
+                branch: dep.branch
+            } : {},
+            package_name: packageName
+        };
+    }
+    function safeDependencyPath(filePath, kind) {
+        const normalizedPath = external_path_default().normalize(filePath);
+        if (external_path_default().isAbsolute(normalizedPath) || normalizedPath.startsWith("..")) throw new Error(`Invalid dependency ${kind} path: ${filePath}`);
+        return normalizedPath;
+    }
+    function dependencyPythonPath(name, kind) {
+        const parts = name.split(".");
+        if (0 === parts.length || parts.some((part)=>!part || "." === part || ".." === part || part.includes("/") || part.includes("\\"))) throw new Error(`Invalid dependency ${kind} name: ${name}`);
+        return external_path_default().join(...parts);
+    }
+    async function writeDepToCache(projectRoot, dep) {
+        const depDir = external_path_default().join(projectRoot, ANVIL_DEPS_DIR, dep.package_name);
+        await external_fs_promises_default().rm(depDir, {
+            recursive: true,
+            force: true
+        });
+        await external_fs_promises_default().mkdir(external_path_default().join(depDir, "client_code"), {
+            recursive: true
+        });
+        await external_fs_promises_default().mkdir(external_path_default().join(depDir, "server_code"), {
+            recursive: true
+        });
+        await external_fs_promises_default().writeFile(external_path_default().join(depDir, "anvil.yaml"), external_js_yaml_default().dump({
+            package_name: dep.package_name
+        }));
+        for (const mod of dep.modules ?? []){
+            const modulePath = external_path_default().join(depDir, "client_code", dependencyPythonPath(mod.name, "module"));
+            if (mod.is_package) {
+                await external_fs_promises_default().mkdir(modulePath, {
+                    recursive: true
+                });
+                await external_fs_promises_default().writeFile(external_path_default().join(modulePath, "__init__.py"), mod.code);
+            } else {
+                const moduleFile = `${modulePath}.py`;
+                await external_fs_promises_default().mkdir(external_path_default().dirname(moduleFile), {
+                    recursive: true
+                });
+                await external_fs_promises_default().writeFile(moduleFile, mod.code);
             }
         }
-        async deleteRef(ref) {
-            try {
-                await this.git.raw([
-                    "update-ref",
-                    "-d",
-                    ref
-                ]);
-            } catch (e) {}
+        for (const form of dep.forms ?? []){
+            const { code, class_name, is_package, ...formTemplate } = form;
+            const formPath = external_path_default().join(depDir, "client_code", dependencyPythonPath(class_name, "form"));
+            if (is_package) {
+                await external_fs_promises_default().mkdir(formPath, {
+                    recursive: true
+                });
+                await external_fs_promises_default().writeFile(external_path_default().join(formPath, "__init__.py"), code);
+                await external_fs_promises_default().writeFile(external_path_default().join(formPath, "form_template.yaml"), external_js_yaml_default().dump(formTemplate));
+            } else {
+                const formCodeFile = `${formPath}.py`;
+                await external_fs_promises_default().mkdir(external_path_default().dirname(formCodeFile), {
+                    recursive: true
+                });
+                await external_fs_promises_default().writeFile(formCodeFile, code);
+                await external_fs_promises_default().writeFile(`${formPath}.yaml`, external_js_yaml_default().dump(formTemplate));
+            }
         }
-        async getRemotes() {
-            try {
-                const remotes = await this.git.getRemotes(true);
-                return remotes.map((r)=>({
-                        name: r.name,
-                        fetchUrl: r.refs.fetch
-                    }));
-            } catch (e) {
-                throw errors_createGitError.commandFailed("remote", e.message);
+        for (const mod of dep.server_modules ?? []){
+            const modulePath = external_path_default().join(depDir, "server_code", dependencyPythonPath(mod.name, "server module"));
+            if (mod.is_package) {
+                await external_fs_promises_default().mkdir(modulePath, {
+                    recursive: true
+                });
+                await external_fs_promises_default().writeFile(external_path_default().join(modulePath, "__init__.py"), mod.code);
+            } else {
+                const moduleFile = `${modulePath}.py`;
+                await external_fs_promises_default().mkdir(external_path_default().dirname(moduleFile), {
+                    recursive: true
+                });
+                await external_fs_promises_default().writeFile(moduleFile, mod.code);
             }
         }
-        async isGitInitialized() {
-            const gitPath = external_path_default().join(this.repoPath, ".git");
-            return external_fs_.existsSync(gitPath);
+        for (const asset of dep.assets ?? []){
+            const targetPath = external_path_default().join(depDir, "theme", "assets", safeDependencyPath(asset.name, "asset"));
+            await external_fs_promises_default().mkdir(external_path_default().dirname(targetPath), {
+                recursive: true
+            });
+            await external_fs_promises_default().writeFile(targetPath, Buffer.from(asset.content, "base64"));
         }
-        async removeEmptyDirectories(removedFiles) {
-            const directoriesToCheck = new Set();
-            for (const file of removedFiles){
-                let dir = external_path_default().dirname(file);
-                while(dir && "." !== dir){
-                    directoriesToCheck.add(dir);
-                    const parentDir = external_path_default().dirname(dir);
-                    if (parentDir === dir) break;
-                    dir = parentDir;
-                }
-            }
-            const sortedDirs = Array.from(directoriesToCheck).sort((a, b)=>b.split("/").length - a.split("/").length);
-            for (const dir of sortedDirs)try {
-                const dirPath = external_path_default().join(this.repoPath, dir);
-                if (!external_fs_.existsSync(dirPath)) continue;
-                const entries = await external_fs_.promises.readdir(dirPath);
-                if (0 === entries.length) await external_fs_.promises.rmdir(dirPath);
-            } catch (error) {}
+        for (const doc of dep.docs ?? []){
+            const targetPath = external_path_default().join(depDir, safeDependencyPath(doc.path, "doc"));
+            await external_fs_promises_default().mkdir(external_path_default().dirname(targetPath), {
+                recursive: true
+            });
+            await external_fs_promises_default().writeFile(targetPath, doc.content);
         }
     }
-    async function getStagedFileChanges(git, gitService) {
+    async function writeAllDepsToCache(projectRoot, response, options = {}) {
+        const includeDocs = options.includeDocs ?? true;
+        const manifest = await readDepsCacheManifest(projectRoot);
+        const canReuseExistingCache = manifest?.includeDocs === includeDocs;
+        if (!canReuseExistingCache) await clearDepsCache(projectRoot);
+        const previousCached = canReuseExistingCache ? manifest.cached_dependencies : [];
+        const resolvedAppIds = new Set(response.resolved_dependencies.map((dep)=>dep.app_id));
+        for (const dep of previousCached)if (!resolvedAppIds.has(dep.app_id)) await external_fs_promises_default().rm(external_path_default().join(projectRoot, ANVIL_DEPS_DIR, dep.package_name), {
+            recursive: true,
+            force: true
+        });
+        for (const dep of response.dependencies)await writeDepToCache(projectRoot, dep);
+        const returnedByAppId = new Map(response.dependencies.map((dep)=>[
+                dep.app_id,
+                dep
+            ]));
+        const previousByAppId = new Map(previousCached.map((dep)=>[
+                dep.app_id,
+                dep
+            ]));
+        const cachedDependencies = response.resolved_dependencies.map((dep)=>{
+            const returned = returnedByAppId.get(dep.app_id);
+            if (returned) return cachedManifestEntry(returned, returned.package_name);
+            const previous = previousByAppId.get(dep.app_id);
+            if (!previous) return;
+            return cachedManifestEntry(dep, previous.package_name);
+        }).filter((dep)=>void 0 !== dep);
+        const newManifest = {
+            version: DEPS_MANIFEST_VERSION,
+            includeDocs,
+            source_dependencies: void 0 === options.sourceDependencies ? await readAnvilYamlDependencies(projectRoot) : options.sourceDependencies,
+            resolved_dependencies: response.resolved_dependencies,
+            cached_dependencies: cachedDependencies
+        };
+        await external_fs_promises_default().mkdir(depsDir(projectRoot), {
+            recursive: true
+        });
+        await external_fs_promises_default().writeFile(depsManifestPath(projectRoot), `${JSON.stringify(newManifest, null, 2)}\n`);
+    }
+    async function clearDepsCache(projectRoot) {
+        await external_fs_promises_default().rm(depsDir(projectRoot), {
+            recursive: true,
+            force: true
+        });
+    }
+    async function getCachedPackages(projectRoot) {
         try {
-            const status = await git.status();
-            const renames = status.renamed || [];
-            const stagedFiles = status.files.filter((f)=>" " !== f.index && "?" !== f.index);
-            const stagedModeOnlyPaths = new Set(gitService ? await gitService.discardStagedModeOnlyChanges(stagedFiles.filter((f)=>"R" !== f.index && "D" !== f.index).map((f)=>f.path)) : []);
-            const stagedRenames = [];
-            for (const f of stagedFiles)if ("R" === f.index) {
-                const rename = renames.find((r)=>r.to === f.path);
-                if (rename) stagedRenames.push({
-                    path: rename.to,
-                    type: "rename",
-                    from: rename.from
-                });
-            }
-            const stagedRenamedFromPaths = new Set(stagedRenames.map((r)=>r.from));
-            const stagedRenamedToPaths = new Set(stagedRenames.map((r)=>r.path));
-            const changes = [];
-            for (const f of stagedFiles){
-                if ("R" !== f.index) {
-                    if (!stagedModeOnlyPaths.has(f.path)) {
-                        if (!(stagedRenamedFromPaths.has(f.path) || stagedRenamedToPaths.has(f.path))) if ("D" === f.index) changes.push({
-                            path: f.path,
-                            type: "unlink"
-                        });
-                        else if ("A" === f.index || "?" === f.index) changes.push({
-                            path: f.path,
-                            type: "add"
-                        });
-                        else changes.push({
-                            path: f.path,
-                            type: "change"
-                        });
-                    }
-                }
-            }
-            changes.push(...stagedRenames);
-            return changes;
-        } catch (e) {
-            throw errors_createGitError.commandFailed("status", e.message);
+            const entries = await external_fs_promises_default().readdir(depsDir(projectRoot), {
+                withFileTypes: true
+            });
+            return entries.filter((entry)=>entry.isDirectory()).map((entry)=>entry.name);
+        } catch  {
+            return [];
         }
     }
     const external_chokidar_namespaceObject = require("chokidar");
@@ -15863,7 +16100,8 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
         if (PYTHON_KEYWORDS.has(value)) pushIssue(issues, path, "must be a valid Python identifier (not a keyword)");
     }
     const componentTypeSpec_IDENTIFIER_RE = /^[A-Za-z_][A-Za-z0-9_]*$/;
-    const DEP_ID_RE = /^dep_[A-Za-z0-9]+$/;
+    const LEGACY_CUSTOM_COMPONENT_SPEC_RE = /^form:(?:([^:]+):)?(.+)$/;
+    const PACKAGE_QUALIFIED_FORM_NAME_RE = /^([^.]+)\.(.+)$/;
     const componentTypeSpec_PYTHON_KEYWORDS = new Set([
         "False",
         "None",
@@ -15903,32 +16141,17 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
         "match",
         "case"
     ]);
-    const LEGACY_FORM_TYPE_REFERENCE_MESSAGE = "must be a valid form: reference (form:Module.Form, form:dep_xxx:Package.Form)";
+    const LEGACY_FORM_TYPE_REFERENCE_MESSAGE = "must be a valid form: reference (form:Module.Form, form:dep_xxx:Package.Form, form:APP_ID:Package.Form)";
     const COMPONENT_TYPE_REFERENCE_MESSAGE = "must be a known Anvil component type (see componentIcons.ts), a form: reference, or a package-qualified form reference (Package.Form)";
     function isValidIdentifierSegment(value) {
         return value.length > 0 && componentTypeSpec_IDENTIFIER_RE.test(value) && !componentTypeSpec_PYTHON_KEYWORDS.has(value);
     }
     function isValidLegacyFormTypeReference(typeName) {
-        if (!typeName.startsWith("form:")) return false;
-        const rest = typeName.slice(5);
-        if (0 === rest.length) return false;
-        let classPath = rest;
-        if (rest.startsWith("dep_")) {
-            const splitIndex = rest.indexOf(":");
-            if (splitIndex <= 0) return false;
-            const depId = rest.slice(0, splitIndex);
-            if (!DEP_ID_RE.test(depId)) return false;
-            classPath = rest.slice(splitIndex + 1);
-        }
-        if (0 === classPath.length) return false;
-        return classPath.split(".").every((part)=>isValidIdentifierSegment(part));
+        return LEGACY_CUSTOM_COMPONENT_SPEC_RE.test(typeName);
     }
     function isValidPackageQualifiedComponentType(typeName) {
         if (typeName.startsWith("anvil.")) return false;
-        if (!typeName.includes(".")) return false;
-        const parts = typeName.split(".");
-        if (parts.length < 2) return false;
-        return parts.every((part)=>isValidIdentifierSegment(part));
+        return PACKAGE_QUALIFIED_FORM_NAME_RE.test(typeName);
     }
     function componentTypeSpec_pushIssue(issues, path, message) {
         issues.push({
@@ -16011,8 +16234,15 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             message
         });
     }
+    function validateNonEmptyString(value, path, issues) {
+        if ("string" != typeof value || 0 === value.length) {
+            formTemplateValidation_pushIssue(issues, path, "must be a non-empty string");
+            return false;
+        }
+        return true;
+    }
     function validateIdentifier(value, path, issues) {
-        if ("string" != typeof value || 0 === value.length) return void formTemplateValidation_pushIssue(issues, path, "must be a non-empty string");
+        if (!validateNonEmptyString(value, path, issues)) return;
         if (!formTemplateValidation_IDENTIFIER_RE.test(value)) return void formTemplateValidation_pushIssue(issues, path, "must be a valid identifier");
         if (formTemplateValidation_PYTHON_KEYWORDS.has(value)) formTemplateValidation_pushIssue(issues, path, "must be a valid Python identifier (not a keyword)");
     }
@@ -16037,7 +16267,7 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             const bindingPath = `${path}[${index}]`;
             if (!isPlainObject(binding)) return void formTemplateValidation_pushIssue(issues, bindingPath, "must be an object");
             if ("string" != typeof binding.property || 0 === binding.property.length) formTemplateValidation_pushIssue(issues, `${bindingPath}.property`, "must be a non-empty string");
-            if ("string" != typeof binding.code || 0 === binding.code.length) formTemplateValidation_pushIssue(issues, `${bindingPath}.code`, "must be a non-empty string");
+            if ("string" != typeof binding.code) formTemplateValidation_pushIssue(issues, `${bindingPath}.code`, "must be a string");
             if (void 0 !== binding.writeback && "boolean" != typeof binding.writeback) formTemplateValidation_pushIssue(issues, `${bindingPath}.writeback`, "must be a boolean");
         });
     }
@@ -16095,7 +16325,8 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
         validatePropertiesObject(value.set_layout_properties, `${path}.set_layout_properties`, issues);
         if (isPlainObject(value.target)) {
             if ("container" !== value.target.type && "slot" !== value.target.type) formTemplateValidation_pushIssue(issues, `${path}.target.type`, "must be 'container' or 'slot'");
-            if ("container" !== value.target.type || "" !== value.target.name) validateIdentifier(value.target.name, `${path}.target.name`, issues);
+            if ("slot" === value.target.type) validateNonEmptyString(value.target.name, `${path}.target.name`, issues);
+            else if ("container" !== value.target.type || "" !== value.target.name) validateIdentifier(value.target.name, `${path}.target.name`, issues);
         } else formTemplateValidation_pushIssue(issues, `${path}.target`, "must be an object");
         if (void 0 !== value.template) validateComponentNode(value.template, `${path}.template`, issues, seenNames);
     }
@@ -16152,7 +16383,7 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             } else {
                 const componentNames = options.componentNames ?? new Set();
                 for (const [slotName, slotDef] of Object.entries(value.slots)){
-                    validateIdentifier(slotName, path(`slots.${slotName}.name`), issues);
+                    validateNonEmptyString(slotName, path(`slots.${slotName}.name`), issues);
                     validateSlotDefinition(slotDef, path(`slots.${slotName}`), issues, componentNames);
                 }
             }
@@ -16160,6 +16391,7 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
         }
         if (void 0 !== value.toolbox_item && !isPlainObject(value.toolbox_item)) formTemplateValidation_pushIssue(issues, path("toolbox_item"), "must be an object");
         if (void 0 !== value.layout_metadata && !isPlainObject(value.layout_metadata)) formTemplateValidation_pushIssue(issues, path("layout_metadata"), "must be an object");
+        if (void 0 !== value.help_text && "string" != typeof value.help_text) formTemplateValidation_pushIssue(issues, path("help_text"), "must be a string");
         if (void 0 !== value.item_type) if (isPlainObject(value.item_type)) {
             if ("number" != typeof value.item_type.table_id) formTemplateValidation_pushIssue(issues, path("item_type.table_id"), "must be a number");
         } else formTemplateValidation_pushIssue(issues, path("item_type"), "must be an object");
@@ -16234,7 +16466,8 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
         "toolbox_item",
         "layout_metadata",
         "item_type",
-        "slots"
+        "slots",
+        "help_text"
     ]);
     const FRONTMATTER_DISALLOWED_KEYS = new Set([
         "container",
@@ -16353,7 +16586,7 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
     function validateParsedHtmlTemplate(parsed) {
         return validateFormTemplateData(parsed);
     }
-    function validateFormTemplateHtml(htmlContent, parseHtml = form_template_parser_namespaceObject.parseSerializedHtml) {
+    function validateFormTemplateHtml(htmlContent, parseHtml = form_template_parser_namespaceObject.parseSerializedHtml, options = {}) {
         const { frontmatter, body, bodyStartOffset } = splitHtmlFormTemplateFrontmatter(htmlContent);
         if (null !== frontmatter) {
             const frontmatterIssues = validateHtmlFrontmatter(frontmatter);
@@ -16366,7 +16599,10 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
         let parsed;
         try {
             parsed = parseHtml(body, {
-                warnings: true
+                warnings: true,
+                ...options.formSpecPackageContext ? {
+                    formSpecPackageContext: options.formSpecPackageContext
+                } : {}
             });
         } catch (error) {
             return {
@@ -16397,6 +16633,58 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             ok: true
         };
     }
+    const validatePython_requireFromHere = (0, external_module_namespaceObject.createRequire)(__filename);
+    const DEFAULT_PYRIGHT_MAX_OLD_SPACE_MB = 768;
+    const DEFAULT_PYRIGHT_TIMEOUT_MS = 300000;
+    function parsePositiveIntegerEnv(env, name, defaultValue) {
+        const rawValue = env[name];
+        if (void 0 === rawValue || "" === rawValue) return {
+            value: defaultValue
+        };
+        if (!/^\d+$/.test(rawValue) || Number(rawValue) <= 0 || !Number.isSafeInteger(Number(rawValue))) return {
+            error: `${name} must be a positive integer`
+        };
+        return {
+            value: Number(rawValue)
+        };
+    }
+    function pyrightChildNodeOptions(nodeOptions, maxOldSpaceMb) {
+        const maxOldSpaceFlag = "--max[-_]old[-_]space[-_]size";
+        const withoutEqualsForm = (nodeOptions ?? "").replace(new RegExp(`(^|\\s)${maxOldSpaceFlag}=\\S+`, "g"), "$1");
+        const withoutSeparateForm = withoutEqualsForm.replace(new RegExp(`(^|\\s)${maxOldSpaceFlag}\\s+\\S+`, "g"), "$1");
+        return [
+            withoutSeparateForm.trim(),
+            `--max-old-space-size=${maxOldSpaceMb}`
+        ].filter(Boolean).join(" ");
+    }
+    function semanticProcessFailure(message) {
+        return {
+            ok: false,
+            message: "Python semantic validation could not be run",
+            issues: [
+                {
+                    path: "root",
+                    message,
+                    severity: "error"
+                }
+            ]
+        };
+    }
+    function isV8HeapOutOfMemory(stderr) {
+        return /(?:JavaScript heap out of memory|Reached heap limit|Ineffective mark-compacts near heap limit)/i.test(stderr);
+    }
+    function resolveBundledAnvilPyright() {
+        try {
+            return {
+                command: process.execPath,
+                args: [
+                    validatePython_requireFromHere.resolve("@anvil-works/anvil-pyright")
+                ]
+            };
+        } catch  {
+            return null;
+        }
+    }
     const PYTHON_VALIDATOR_SCRIPT = String.raw`
 import ast
 import json
@@ -16502,6 +16790,36 @@ print(json.dumps({"issues": issues}))
         }
         return null;
     }
+    function findAnvilPyright(options = {}) {
+        const env = options.env ?? process.env;
+        const probe = options.probe ?? external_child_process_namespaceObject.spawnSync;
+        const bundled = resolveBundledAnvilPyright();
+        const candidates = [
+            ..."string" == typeof env.ANVIL_PYRIGHT && env.ANVIL_PYRIGHT.length > 0 ? [
+                {
+                    command: env.ANVIL_PYRIGHT,
+                    args: []
+                }
+            ] : [],
+            ...bundled ? [
+                bundled
+            ] : [],
+            {
+                command: "anvil-pyright",
+                args: []
+            }
+        ];
+        for (const candidate of candidates){
+            const result = probe(candidate.command, [
+                ...candidate.args,
+                "--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);
@@ -16580,6 +16898,126 @@ print(json.dumps({"issues": issues}))
             ok: true
         };
     }
+    function pyrightIssuePath(diagnostic) {
+        const line = diagnostic.range?.start?.line;
+        const character = diagnostic.range?.start?.character;
+        if ("number" != typeof line) return "root";
+        if ("number" != typeof character) return `line ${line + 1}`;
+        return `line ${line + 1}, column ${character + 1}`;
+    }
+    function pyrightIssueMessage(diagnostic) {
+        if ("string" == typeof diagnostic.message && diagnostic.message.length > 0) return diagnostic.message;
+        return "Python semantic validation failed";
+    }
+    function pyrightDiagnosticIssue(diagnostic, severity) {
+        const line = diagnostic.range?.start?.line;
+        const column = diagnostic.range?.start?.character;
+        const endLine = diagnostic.range?.end?.line;
+        const endColumn = diagnostic.range?.end?.character;
+        return {
+            ...diagnostic.file ? {
+                file: external_path_default().resolve(diagnostic.file)
+            } : {},
+            path: pyrightIssuePath(diagnostic),
+            message: pyrightIssueMessage(diagnostic),
+            ...diagnostic.rule ? {
+                code: diagnostic.rule,
+                rule: diagnostic.rule
+            } : {},
+            severity,
+            ..."number" == typeof line ? {
+                line: line + 1
+            } : {},
+            ..."number" == typeof column ? {
+                column: column + 1
+            } : {},
+            ..."number" == typeof endLine ? {
+                endLine: endLine + 1
+            } : {},
+            ..."number" == typeof endColumn ? {
+                endColumn: endColumn + 1
+            } : {}
+        };
+    }
+    function validatePythonWithPyright(appRoot, options = {}) {
+        const env = options.env ?? process.env;
+        const maxOldSpace = parsePositiveIntegerEnv(env, "ANVIL_PYRIGHT_MAX_OLD_SPACE_MB", DEFAULT_PYRIGHT_MAX_OLD_SPACE_MB);
+        if ("error" in maxOldSpace) return semanticProcessFailure(maxOldSpace.error);
+        const timeout = parsePositiveIntegerEnv(env, "ANVIL_PYRIGHT_TIMEOUT_MS", DEFAULT_PYRIGHT_TIMEOUT_MS);
+        if ("error" in timeout) return semanticProcessFailure(timeout.error);
+        const pyright = void 0 === options.pyright ? findAnvilPyright({
+            env
+        }) : options.pyright;
+        if (!pyright) return {
+            ok: false,
+            message: "Python semantic validation could not be run",
+            issues: [
+                {
+                    path: "root",
+                    message: "Python semantic validation requires the bundled @anvil-works/anvil-pyright package, anvil-pyright on PATH, or ANVIL_PYRIGHT to be set.",
+                    severity: "error"
+                }
+            ]
+        };
+        const result = (0, external_child_process_namespaceObject.spawnSync)(pyright.command, [
+            ...pyright.args,
+            "--outputjson",
+            "--level",
+            "warning",
+            "--project",
+            appRoot,
+            ...options.files ?? []
+        ], {
+            encoding: "utf8",
+            env: {
+                ...env,
+                NODE_OPTIONS: pyrightChildNodeOptions(env.NODE_OPTIONS, maxOldSpace.value)
+            },
+            maxBuffer: 10485760,
+            timeout: timeout.value
+        });
+        if (result.error) {
+            if ("ETIMEDOUT" === result.error.code) return semanticProcessFailure(`anvil-pyright exceeded the ${timeout.value} ms timeout. Increase ANVIL_PYRIGHT_TIMEOUT_MS or validate a smaller target.`);
+            return semanticProcessFailure(result.error.message);
+        }
+        if (isV8HeapOutOfMemory(result.stderr)) return semanticProcessFailure(`anvil-pyright ran out of memory with a ${maxOldSpace.value} MB heap. Increase ANVIL_PYRIGHT_MAX_OLD_SPACE_MB or validate a smaller target.`);
+        if (0 !== result.status && 1 !== result.status) return semanticProcessFailure(result.stderr.trim() || `anvil-pyright exited with status ${result.status}`);
+        let parsed;
+        try {
+            parsed = JSON.parse(result.stdout.trim());
+        } catch (error) {
+            const detail = result.stderr.trim() || result.stdout.trim();
+            return {
+                ok: false,
+                message: "Python semantic validation could not be read",
+                issues: [
+                    {
+                        path: "root",
+                        message: detail || (error instanceof Error ? error.message : String(error)),
+                        severity: "error"
+                    }
+                ]
+            };
+        }
+        const issues = (parsed.generalDiagnostics ?? []).filter((diagnostic)=>"error" === diagnostic.severity).map((diagnostic)=>pyrightDiagnosticIssue(diagnostic, "error"));
+        const warnings = (parsed.generalDiagnostics ?? []).filter((diagnostic)=>"warning" === diagnostic.severity).map((diagnostic)=>pyrightDiagnosticIssue(diagnostic, "warning"));
+        if (issues.length > 0) return {
+            ok: false,
+            message: "Python semantic validation failed",
+            issues,
+            ...warnings.length > 0 ? {
+                warnings
+            } : {}
+        };
+        return warnings.length > 0 ? {
+            ok: true,
+            issues: [],
+            warnings
+        } : {
+            ok: true,
+            issues: []
+        };
+    }
     const validators_IDENTIFIER_RE = /^[A-Za-z_][A-Za-z0-9_]*$/;
     const DB_ACCESS_LEVELS = new Set([
         "none",
@@ -16860,7 +17298,7 @@ print(json.dumps({"issues": issues}))
     }
     function validateScheduledTasks(value, path) {
         const issues = [];
-        if (void 0 === value) return issues;
+        if (null == value) return issues;
         if (!Array.isArray(value)) {
             validators_pushIssue(issues, path, "must be an array");
             return issues;
@@ -17008,15 +17446,25 @@ print(json.dumps({"issues": issues}))
         const existingPath = resolveExistingPath(filePath);
         if (!existingPath) return null;
         let currentDir = external_fs_.statSync(existingPath).isDirectory() ? existingPath : external_path_default().dirname(existingPath);
-        let appRoot = null;
+        const candidates = [];
         while(true){
-            if (external_fs_.existsSync(external_path_default().join(currentDir, "anvil.yaml"))) appRoot = currentDir;
+            if (external_fs_.existsSync(external_path_default().join(currentDir, "anvil.yaml"))) candidates.push(currentDir);
             const parentDir = external_path_default().dirname(currentDir);
-            if (parentDir === currentDir) return appRoot;
+            if (parentDir === currentDir) break;
             currentDir = parentDir;
         }
+        return candidates.find((candidate)=>!candidates.some((outerCandidate)=>{
+                if (candidate === outerCandidate) return false;
+                return [
+                    "client_code",
+                    "server_code"
+                ].some((codeDir)=>{
+                    const relativePath = external_path_default().relative(external_path_default().join(outerCandidate, codeDir), candidate);
+                    return !external_path_default().isAbsolute(relativePath) && ".." !== relativePath && !relativePath.startsWith(`..${external_path_default().sep}`);
+                });
+            })) ?? null;
     }
-    function validatePath(filePath, fileContent) {
+    function validatePath(filePath, fileContent, options = {}) {
         const target = inferValidationTarget(filePath);
         const existingPath = resolveExistingPath(filePath);
         const appRoot = findAnvilAppRoot(filePath);
@@ -17089,7 +17537,9 @@ print(json.dumps({"issues": issues}))
                     ]
                 };
             }
-            const result = validateFormTemplateHtml(fileContent);
+            const result = validateFormTemplateHtml(fileContent, void 0, {
+                formSpecPackageContext: options.formSpecPackageContext
+            });
             return result.ok ? validPathResult(target, result.warnings) : {
                 ...result,
                 target
@@ -17906,7 +18356,7 @@ print(json.dumps({"issues": issues}))
             ]
         });
     }
-    async function buildFormTemplateData(relativePath, templateInfo, context) {
+    async function buildFormTemplateData(relativePath, templateInfo, context, missingCodeBehavior = "error") {
         const { repoPath, stagedOnly = false } = context;
         const { kind } = templateInfo;
         const loadResult = await loadFormTemplateData(relativePath, templateInfo, context);
@@ -17920,15 +18370,28 @@ print(json.dumps({"issues": issues}))
         };
         const codeRelativePath = "package" === kind ? relativePath.replace(/form_template\.(yaml|html)$/i, "__init__.py") : relativePath.replace(/\.(yaml|html)$/i, ".py");
         const className = extractPythonName(codeRelativePath);
-        const codeContent = await readFileContent(repoPath, codeRelativePath, stagedOnly);
-        if (!codeContent) return {
-            formData: {},
-            className: "",
-            ignoreResult: {
-                type: "ignore",
-                reason: "package" === kind ? "Form __init__.py file not found - cannot save template without code" : "Form .py file not found - cannot save template without code"
+        let codeContent;
+        try {
+            codeContent = await readFileContent(repoPath, codeRelativePath, stagedOnly);
+        } catch (error) {
+            if (stagedOnly || !isFileNotFoundError(error) || "error" === missingCodeBehavior) throw error;
+            const missingCodeReason = `Form code file ${codeRelativePath} is not present yet`;
+            const knownForm = context.editorYaml.hasId("forms", className);
+            if ("defer" === missingCodeBehavior || knownForm) {
+                const action = knownForm ? `not saving existing form ${className}` : `deferring form ${className}`;
+                logger_logger.warn(external_chalk_default().yellow(`Form template ${relativePath} has no code file ${codeRelativePath} yet; ${action}.`));
+                return {
+                    formData: {},
+                    className: "",
+                    ignoreResult: {
+                        type: "ignore",
+                        reason: missingCodeReason
+                    }
+                };
             }
-        };
+            codeContent = "";
+            logger_logger.warn(external_chalk_default().yellow(`Form template ${relativePath} has no code file ${codeRelativePath} yet; creating ${className} with empty code.`));
+        }
         const formData = (0, form_template_parser_namespaceObject.buildFormTemplateSavePayload)(loadResult.source, {
             className,
             code: codeContent,
@@ -17940,6 +18403,9 @@ print(json.dumps({"issues": issues}))
             ignoreResult: null
         };
     }
+    function isFileNotFoundError(error) {
+        return "object" == typeof error && null !== error && "ENOENT" === error.code;
+    }
     async function handleFormTemplateChange(change, context) {
         const { editorYaml } = context;
         const { relativePath, changeType } = change;
@@ -17950,10 +18416,11 @@ print(json.dumps({"issues": issues}))
         };
         const kind = templateInfo.kind;
         const format = templateInfo.format;
+        const missingCodeBehavior = "add" === changeType ? "create-new-form-if-unknown" : "defer";
         const result = await buildFormTemplateData(relativePath, {
             kind,
             format
-        }, context);
+        }, context, missingCodeBehavior);
         if (result.ignoreResult) return result.ignoreResult;
         const { formData, className } = result;
         return handleIdBasedOperation({
@@ -18239,10 +18706,13 @@ print(json.dumps({"issues": issues}))
             code: error.type,
             recoverability: "requires_user_action",
             requiresUserAction: true,
-            suggestedAction: "Inspect the repository state and resolve the Git error before retrying.",
+            suggestedAction: isIndexLockFailure(error) ? "Confirm no Git process is running for this repository, then remove the stale .git/index.lock file and retry." : "Inspect the repository state and resolve the Git error before retrying.",
             gitCommand: "git_command_failed" === error.type ? error.command : void 0
         };
     }
+    function isIndexLockFailure(error) {
+        return "git_command_failed" === error.type && error.message.includes("Unable to create") && error.message.includes("index.lock") && error.message.includes("File exists");
+    }
     function networkDiagnostic(error) {
         return {
             code: error.type,
@@ -18327,6 +18797,15 @@ print(json.dumps({"issues": issues}))
             this.hasPendingChanges = true;
             await this.processSaveBatchWithEvents();
         }
+        async flush() {
+            const requireReady = ()=>{
+                if (this.config.isPaused() || this.config.isCleanedUp() || !this.config.isSettlePeriodOver()) throw new Error("Cannot flush saves while watching is paused, closed, or changing branch");
+            };
+            requireReady();
+            await this.forceSave();
+            requireReady();
+            if (this.hasPendingChanges) throw new Error("Saves remain pending");
+        }
         cleanup() {
             if (this.hasPendingChanges) {
                 logger_logger.progressEnd("sync");
@@ -18423,10 +18902,7 @@ print(json.dumps({"issues": issues}))
                 status = await this.config.gitService.getStatus();
             } catch (e) {
                 logger_logger.error(external_chalk_default().red(`Error reading git status: ${errors_getErrorMessage(e)}`));
-                return {
-                    skipped: true,
-                    reason: "Git status error"
-                };
+                throw e;
             }
             let allChanges;
             if (this.config.stagedOnly) {
@@ -19272,6 +19748,7 @@ print(json.dumps({"issues": issues}))
             try {
                 const previousSubscriptions = this.wsClient?.getDependencySubscriptions() ?? [];
                 const { response, addedGitignoreEntry } = await refreshDependencyCache(this.repoPath, this.appId, this.anvilUrl, {
+                    username: this.username,
                     includeDocs: true
                 });
                 if (addedGitignoreEntry) logger_logger.info("Added /.anvil/ to .gitignore");
@@ -19583,6 +20060,12 @@ print(json.dumps({"issues": issues}))
             if (!this.saveProcessor) return;
             return this.saveProcessor.forceSave();
         }
+        async flushSaves() {
+            if (!this.saveProcessor || this.isSwitchingForEnvironment) throw new Error("App synchronization is not ready");
+            const branch = this.currentBranch;
+            await this.saveProcessor.flush();
+            if (this.isSwitchingForEnvironment || this.currentBranch !== branch || await this.gitService.getCurrentBranch() !== branch) throw new Error("App branch changed while flushing saves");
+        }
         async getSuccessMessage() {
             try {
                 const info = await this.gitService.getCommitInfo();
@@ -21117,29 +21600,30 @@ print(json.dumps({"issues": issues}))
             return;
         }
     }
-    function inspectCredentialHelperCommand(raw) {
+    function inspectCredentialHelperCommand(raw, options = {}) {
         const details = {
             raw
         };
         try {
             const parsed = parseCredentialHelperCommand(raw);
             details.execPath = parsed.execPath;
-            details.helperPath = parsed.helperPath;
+            details.helperPath = parsed.helperPath === GIT_CREDENTIAL_HELPER_LOCATOR && options.gitCommonDir ? external_path_default().join(options.gitCommonDir, GIT_CREDENTIAL_HELPER_FILENAME) : parsed.helperPath;
         } catch (e) {
             details.parseError = e.message;
             return details;
         }
         if (details.execPath) details.execExists = external_fs_default().existsSync(details.execPath);
-        if (details.helperPath) {
-            details.helperExists = external_fs_default().existsSync(details.helperPath);
+        const helperPath = details.helperPath;
+        if (helperPath && helperPath !== GIT_CREDENTIAL_HELPER_LOCATOR) {
+            details.helperExists = external_fs_default().existsSync(helperPath);
             if (details.helperExists) {
                 try {
-                    const stat = external_fs_default().statSync(details.helperPath);
+                    const stat = external_fs_default().statSync(helperPath);
                     details.helperExecutable = (73 & stat.mode) !== 0;
                 } catch  {
                     details.helperExecutable = false;
                 }
-                details.modulePath = readHelperModulePath(details.helperPath);
+                details.modulePath = readHelperModulePath(helperPath);
                 if (details.modulePath) details.moduleExists = external_fs_default().existsSync(details.modulePath);
             }
         }
@@ -21238,7 +21722,7 @@ print(json.dumps({"issues": issues}))
             child.stdin.end(input);
         });
     }
-    async function buildAppReport(repoPath, remote, deps) {
+    async function buildAppReport(repoPath, gitCommonDir, remote, deps) {
         const appId = remote.appId;
         const anvilUrl = remote.anvilUrl;
         const url = new URL(anvilUrl);
@@ -21246,7 +21730,9 @@ print(json.dumps({"issues": issues}))
         const helperConfigKey = `credential.${credentialScope}.helper`;
         const helperValues = await getLocalConfigValues(repoPath, helperConfigKey);
         const nonEmptyHelperValues = helperValues.filter((value)=>"" !== value.trim());
-        const helperDetails = nonEmptyHelperValues.map(inspectCredentialHelperCommand);
+        const helperDetails = nonEmptyHelperValues.map((value)=>inspectCredentialHelperCommand(value, {
+                gitCommonDir
+            }));
         const findings = [];
         if (0 === helperValues.length) findings.push(finding("error", "missing_helper_config", `No local ${helperConfigKey} entries found.`));
         else if (0 === nonEmptyHelperValues.length) findings.push(finding("error", "missing_helper_command", `${helperConfigKey} only resets helpers; no Anvil helper command is configured.`));
@@ -21325,12 +21811,18 @@ print(json.dumps({"issues": issues}))
             "--git-dir"
         ])).trim();
         const gitDir = external_path_default().isAbsolute(rawGitDir) ? rawGitDir : external_path_default().resolve(inputPath, rawGitDir);
-        setRepoContext(repoPath);
+        const rawGitCommonDir = (await git.raw([
+            "rev-parse",
+            "--git-common-dir"
+        ])).trim();
+        const resolvedGitCommonDir = external_path_default().isAbsolute(rawGitCommonDir) ? rawGitCommonDir : external_path_default().resolve(inputPath, rawGitCommonDir);
+        const gitCommonDir = external_fs_default().realpathSync(resolvedGitCommonDir);
+        auth_setRepoContext(repoPath);
         const remotes = (await git.getRemotes(true)).map(detectAnvilRemote);
         const anvilRemotes = remotes.filter((remote)=>remote.appId && remote.anvilUrl && "https" === remote.transport);
         const findings = [];
         if (0 === anvilRemotes.length) findings.push(finding("error", "missing_anvil_https_remote", "No HTTPS Anvil git remotes were detected."));
-        const apps = await Promise.all(anvilRemotes.map((remote)=>buildAppReport(repoPath, remote, deps)));
+        const apps = await Promise.all(anvilRemotes.map((remote)=>buildAppReport(repoPath, gitCommonDir, remote, deps)));
         const status = getHighestStatus([
             ...findings.map((item)=>item.status),
             ...apps.flatMap((app)=>app.findings.map((item)=>item.status))
@@ -21338,6 +21830,7 @@ print(json.dumps({"issues": issues}))
         return {
             repoPath,
             gitDir,
+            gitCommonDir,
             remotes,
             apps,
             findings,
@@ -21354,6 +21847,7 @@ print(json.dumps({"issues": issues}))
         lines.push(external_chalk_default().bold("Git auth doctor"));
         lines.push(`Repository: ${report.repoPath}`);
         lines.push(`Git dir: ${report.gitDir}`);
+        lines.push(`Git common dir: ${report.gitCommonDir}`);
         lines.push(`Overall: ${formatStatus(report.status)}`);
         lines.push("");
         lines.push(external_chalk_default().bold("Detected remotes:"));
@@ -21449,7 +21943,7 @@ print(json.dumps({"issues": issues}))
         const repoPath = options.repoPath ?? deps.cwd();
         if ("get" !== operation) return null;
         if (!request.protocol || !request.host) return null;
-        setRepoContext(repoPath);
+        auth_setRepoContext(repoPath);
         const appId = parseAppIdFromGitPath(request.path);
         if (!appId) return null;
         const requestUrl = normalizeAnvilUrl(`${request.protocol}://${request.host}`);
@@ -21500,7 +21994,6 @@ print(json.dumps({"issues": issues}))
             }
         });
     }
-    const DEFAULT_ANVIL_URL = resolveAnvilUrl();
     async function syncToLatest(repoPath, appId, options) {
         const { anvilUrl, gitUrl = anvilUrl, authToken, currentBranch, username } = options;
         try {
@@ -21529,9 +22022,10 @@ print(json.dumps({"issues": issues}))
         }
     }
     async function watch(repoPath, appId, options = {}) {
-        const { anvilUrl = DEFAULT_ANVIL_URL, gitUrl = anvilUrl, stagedOnly = false, username } = options;
         repoPath = external_path_default().resolve(repoPath);
-        setRepoContext(repoPath);
+        auth_setRepoContext(repoPath);
+        const anvilUrl = options.anvilUrl ?? await resolveAuthAnvilUrl();
+        const { gitUrl = anvilUrl, stagedOnly = false, username } = options;
         const storedEnvPid = options.environment?.envPid ? void 0 : await readEnvironmentPid(repoPath);
         const environment = options.environment ?? (storedEnvPid ? {
             envPid: storedEnvPid
@@ -21959,7 +22453,7 @@ print(json.dumps({"issues": issues}))
             });
             logger_logger.progressEnd("verify");
             const currentCategory = getSyncStateCategory(freshSession.syncStatus);
-            const currentBranch = freshSession.getBranchName() || "master";
+            const currentBranch = freshSession.getBranchName() || await getFallbackBranchName(options.repoPath);
             if (currentCategory !== previousCategory || currentBranch !== previousBranch) {
                 logger_logger.warn("Repository status has changed. Re-evaluating...");
                 return freshSession;
@@ -21992,7 +22486,7 @@ print(json.dumps({"issues": issues}))
     }
     async function checkSyncStatusAndStart(session, options, deps = defaultSyncStartDeps) {
         const syncStatus = session.syncStatus;
-        const branchName = session.getBranchName() || "master";
+        const branchName = session.getBranchName() || await getFallbackBranchName(options.repoPath);
         const hasUncommitted = session.hasUncommittedChanges;
         const stateCategory = getSyncStateCategory(syncStatus);
         if (syncStatus?.branchMissing) {
@@ -22312,6 +22806,9 @@ print(json.dumps({"issues": issues}))
         const suggestedAction = error.suggestedAction;
         if ("string" == typeof suggestedAction && suggestedAction.length > 0) logger_logger.warn(suggestedAction);
     }
+    async function getFallbackBranchName(repoPath) {
+        return getCurrentOrFallbackBranchName(esm_default(repoPath));
+    }
     async function handleWatchCommand(options) {
         const invoked = process.argv[2];
         if ("sync" === invoked) {
@@ -22319,7 +22816,7 @@ print(json.dumps({"issues": issues}))
             process.exit(1);
         }
         const { path: repoPath = process.cwd(), appid: explicitAppId, useFirst = false, stagedOnly = false, dependencyWatch = true, autoMode = false, url: explicitUrl, user: explicitUsername, open: openAfterValidation = false } = options;
-        setRepoContext(repoPath);
+        auth_setRepoContext(repoPath);
         try {
             const validationResult = await validateAnvilApp(repoPath);
             if (validationResult.appName) logger_logger.info(external_chalk_default().green("Anvil app: ") + external_chalk_default().bold(validationResult.appName));
@@ -22526,6 +23023,7 @@ print(json.dumps({"issues": issues}))
                 logger_logger.success("Logged in as " + external_chalk_default().bold(result.email));
             } catch (e) {
                 logger_logger.error("Error: " + e.message);
+                logErrorCause(e, logger_logger);
                 process.exit(1);
             }
         });
@@ -23104,6 +23602,7 @@ print(json.dumps({"issues": issues}))
                 await runConfigureFlow(version, configure_defaultDeps);
             } catch (e) {
                 logger_logger.error("Error: " + errors_getErrorMessage(e));
+                logErrorCause(e, logger_logger);
                 process.exit(1);
             }
         });
@@ -23119,10 +23618,11 @@ print(json.dumps({"issues": issues}))
     }
     function registerDepsCommand(program) {
         const deps = program.command("deps").description("Manage app dependencies");
-        deps.command("fetch").description("Fetch dependencies into .anvil/deps/").option("--commit <commit>", "Fetch deps at specific commit").option("--exclude-docs", "Exclude dependency docs from .anvil/deps/").action(async (options)=>{
+        deps.command("fetch").description("Fetch dependencies for checkout HEAD into .anvil/deps/").option("--commit <commit>", "Fetch deps at a specific app commit instead of checkout HEAD").option("--exclude-docs", "Exclude dependency docs from .anvil/deps/").action(async (options)=>{
             try {
                 const projectRoot = process.cwd();
-                const anvilUrl = resolveAnvilUrl();
+                auth_setRepoContext(projectRoot);
+                const anvilUrl = await resolveAuthAnvilUrl();
                 const mainAppId = await resolvePrimaryAppId(projectRoot, anvilUrl);
                 if (!mainAppId) {
                     logger_logger.error("No Anvil app found in current directory");
@@ -23134,6 +23634,7 @@ print(json.dumps({"issues": issues}))
                     commit: options.commit,
                     includeDocs: !options.excludeDocs
                 });
+                if (await getDependencyCacheWarning(projectRoot)) logger_logger.warn("Dependency cache does not match local anvil.yaml. Fetch uses committed dependency declarations; sync dependency changes to Anvil before fetching again.");
                 if (!response.resolved_dependencies.length) return void logger_logger.info("No dependencies to fetch");
                 if (addedGitignoreEntry) logger_logger.info("Added /.anvil/ to .gitignore");
                 if (!response.dependencies.length) return void logger_logger.success(`Dependencies already up to date (${response.resolved_dependencies.length} cached)`);
@@ -23144,124 +23645,643 @@ print(json.dumps({"issues": issues}))
                 process.exit(1);
             }
         });
-        deps.command("status").description("Show cached dependencies").action(async ()=>{
+        deps.command("status").description("Show cached dependencies").action(async ()=>{
+            try {
+                const cached = await getCachedPackages(process.cwd());
+                if (!cached.length) return void logger_logger.info("No cached dependencies (run 'anvil deps fetch')");
+                logger_logger.info("Cached dependencies:");
+                for (const pkg of cached)logger_logger.info(`  - ${pkg}`);
+            } catch (e) {
+                logger_logger.error(e.message);
+                process.exit(1);
+            }
+        });
+        deps.command("clear").description("Clear cached dependencies").action(async ()=>{
+            try {
+                await clearDepsCache(process.cwd());
+                logger_logger.success("Cleared .anvil/deps/");
+            } catch (e) {
+                logger_logger.error(e.message);
+                process.exit(1);
+            }
+        });
+    }
+    async function applyDatabaseSchema(appId, options = {}) {
+        const projectRoot = options.projectRoot ?? process.cwd();
+        auth_setRepoContext(projectRoot);
+        const anvilUrl = options.anvilUrl ?? await resolveAuthAnvilUrl();
+        const appYaml = external_js_yaml_default().load(await external_fs_.promises.readFile(external_path_default().join(projectRoot, "anvil.yaml"), "utf8"));
+        const token = await auth_getValidAuthToken(anvilUrl);
+        const response = await fetch(`${anvilUrl}/ide/api/_/apps/${appId}/db/infer-from-env/apply-schema`, {
+            method: "PUT",
+            headers: {
+                Authorization: `Bearer ${token}`,
+                "Content-Type": "application/json"
+            },
+            body: JSON.stringify({
+                schema: appYaml?.db_schema ?? {},
+                table_id_hints: appYaml?.table_id_hints
+            })
+        });
+        if (!response.ok) throw new Error(formatHttpError("Failed to apply database schema", response.status, await response.text()));
+        return await response.json();
+    }
+    async function confirmSchemaApplication(force = false) {
+        if (force) return true;
+        assertCanPrompt("Applying database schema", "Pass --force to apply without prompting.");
+        return logger_logger.confirm("Apply the app environment's schema to its database? This may delete tables, columns, or data.", true);
+    }
+    function registerDbCommand(program) {
+        if ("1" !== process.env.ANVIL_AGENT_HOST) return;
+        const db = program.command("db").description("Manage app databases");
+        db.command("apply-schema").description("Apply the app schema to the database for the current environment").option("-f, --force", "Apply the schema without asking for confirmation").action(async (options)=>{
+            try {
+                const projectRoot = process.cwd();
+                auth_setRepoContext(projectRoot);
+                const anvilUrl = await resolveAuthAnvilUrl();
+                const appId = await resolvePrimaryAppId(projectRoot, anvilUrl);
+                if (!appId) throw new Error("No Anvil app found in current directory. Make sure you're in a directory with an Anvil app git remote.");
+                if (!await confirmSchemaApplication(options.force)) return void logger_logger.info("Schema application cancelled.");
+                const response = await applyDatabaseSchema(appId, {
+                    anvilUrl,
+                    projectRoot
+                });
+                if (getGlobalOutputConfig().jsonMode) logJsonResult(true, {
+                    data: response
+                });
+                else logger_logger.success("Database schema applied.");
+            } catch (error) {
+                const message = errors_getErrorMessage(error);
+                if (getGlobalOutputConfig().jsonMode) logJsonResult(false, {
+                    error: message
+                });
+                else logger_logger.error(message);
+                process.exit(1);
+            }
+        });
+    }
+    async function ensureEnvironmentUrl(appId, envPid, options = {}) {
+        const anvilUrl = options.anvilUrl ?? await resolveAuthAnvilUrl();
+        const token = await auth_getValidAuthToken(anvilUrl);
+        const response = await fetch(`${anvilUrl}/ide/api/_/apps/${encodeURIComponent(appId)}/environments/${encodeURIComponent(envPid)}/temporary-url`, {
+            method: "POST",
+            headers: {
+                Authorization: `Bearer ${token}`
+            }
+        });
+        if (!response.ok) throw new Error(formatHttpError("Failed to get environment URL", response.status, await response.text()));
+        const { url, expires_at } = await response.json();
+        return {
+            url,
+            expires_at
+        };
+    }
+    async function getTemporaryUplinkKey(appId, envPid, options = {}) {
+        const anvilUrl = options.anvilUrl ?? await resolveAuthAnvilUrl();
+        const token = await auth_getValidAuthToken(anvilUrl);
+        const response = await fetch(`${anvilUrl}/ide/api/_/apps/${encodeURIComponent(appId)}/environments/${encodeURIComponent(envPid)}/temporary-uplink-key`, {
+            method: "POST",
+            headers: {
+                Authorization: `Bearer ${token}`
+            }
+        });
+        if (!response.ok) throw new Error(formatHttpError("Failed to get temporary uplink key", response.status, await response.text()));
+        const { key, url, expires_at } = await response.json();
+        return {
+            key,
+            url,
+            expires_at
+        };
+    }
+    async function resolveEnvironmentContext() {
+        const projectRoot = process.cwd();
+        const envPid = await readEnvironmentPid(projectRoot);
+        if (!envPid) throw new Error("No app environment associated with the current directory.");
+        auth_setRepoContext(projectRoot);
+        const anvilUrl = await resolveAuthAnvilUrl();
+        const appId = await resolvePrimaryAppId(projectRoot, anvilUrl);
+        if (!appId) throw new Error("No Anvil app found in current directory. Make sure you're in a directory with an Anvil app git remote.");
+        return {
+            envPid,
+            anvilUrl,
+            appId
+        };
+    }
+    function registerEnvCommand(program) {
+        if ("1" !== process.env.ANVIL_AGENT_HOST) return;
+        const env = program.command("env").description("Manage app environments");
+        env.command("url").description("Get a temporary private app URL for the current environment").action(async ()=>{
             try {
-                const cached = await getCachedPackages(process.cwd());
-                if (!cached.length) return void logger_logger.info("No cached dependencies (run 'anvil deps fetch')");
-                logger_logger.info("Cached dependencies:");
-                for (const pkg of cached)logger_logger.info(`  - ${pkg}`);
-            } catch (e) {
-                logger_logger.error(e.message);
+                const { appId, envPid, anvilUrl } = await resolveEnvironmentContext();
+                const { url, expires_at } = await ensureEnvironmentUrl(appId, envPid, {
+                    anvilUrl
+                });
+                if (getGlobalOutputConfig().jsonMode) logJsonResult(true, {
+                    data: {
+                        url,
+                        expires_at
+                    }
+                });
+                else logger_logger.info(`URL: ${url}\nExpires at: ${expires_at}`);
+            } catch (error) {
+                const message = errors_getErrorMessage(error);
+                if (getGlobalOutputConfig().jsonMode) logJsonResult(false, {
+                    error: message
+                });
+                else logger_logger.error(message);
                 process.exit(1);
             }
         });
-        deps.command("clear").description("Clear cached dependencies").action(async ()=>{
+        env.command("uplink").description("Get a temporary uplink key for the current environment").action(async ()=>{
             try {
-                await clearDepsCache(process.cwd());
-                logger_logger.success("Cleared .anvil/deps/");
-            } catch (e) {
-                logger_logger.error(e.message);
+                const { appId, envPid, anvilUrl } = await resolveEnvironmentContext();
+                const { key, url, expires_at } = await getTemporaryUplinkKey(appId, envPid, {
+                    anvilUrl
+                });
+                if (getGlobalOutputConfig().jsonMode) logJsonResult(true, {
+                    data: {
+                        key,
+                        url,
+                        expires_at
+                    }
+                });
+                else logger_logger.info(`Key: ${key}\nURL: ${url}\nExpires at: ${expires_at}`);
+            } catch (error) {
+                const message = errors_getErrorMessage(error);
+                if (getGlobalOutputConfig().jsonMode) logJsonResult(false, {
+                    error: message
+                });
+                else logger_logger.error(message);
                 process.exit(1);
             }
         });
     }
-    const TABLE_MAPPINGS_PATH = ".anvil/table-mappings.json";
-    function tables_formatFetchError(prefix, status, errorBody) {
-        if (!errorBody) return `${prefix}: ${status}`;
-        try {
-            const parsed = JSON.parse(errorBody);
-            if ("string" == typeof parsed.error && parsed.error.trim()) return `${prefix}: ${parsed.error} (${status})`;
-        } catch  {}
-        return `${prefix}: ${status} ${errorBody}`;
+    const external_events_namespaceObject = require("events");
+    function replError(error) {
+        if ("string" == typeof error) return {
+            message: error
+        };
+        if (error && "object" == typeof error) {
+            const value = error;
+            return {
+                message: String(value.message ?? value["anvil/server-error"] ?? JSON.stringify(value)),
+                ..."string" == typeof value.type ? {
+                    type: value.type
+                } : {},
+                ...Array.isArray(value.trace) ? {
+                    trace: value.trace.filter((frame)=>Array.isArray(frame) && "string" == typeof frame[0] && "number" == typeof frame[1])
+                } : {}
+            };
+        }
+        return {
+            message: String(error)
+        };
     }
-    async function fetchTableMappings(appId, anvilUrl = resolveAnvilUrl()) {
+    class ReplServerError extends Error {
+        detail;
+        constructor(detail){
+            super(detail.message), this.detail = detail;
+        }
+    }
+    async function runRepl(appId, envPid, options) {
+        const interrupted = ()=>new Error("REPL interrupted.");
+        const anvilUrl = options.anvilUrl ?? await resolveAuthAnvilUrl();
         const token = await auth_getValidAuthToken(anvilUrl);
-        const resp = await fetch(`${anvilUrl}/ide/api/_/apps/${appId}/db`, {
+        const url = new URL(`${anvilUrl.replace(/\/$/, "")}/ide/api/_/apps/${encodeURIComponent(appId)}/environments/${encodeURIComponent(envPid)}/ws`);
+        url.protocol = "https:" === url.protocol ? "wss:" : "ws:";
+        if (options.signal?.aborted) throw interrupted();
+        const ws = new (external_ws_default())(url, {
             headers: {
                 Authorization: `Bearer ${token}`
-            }
+            },
+            handshakeTimeout: 30000
         });
-        if (!resp.ok) {
-            const errorBody = await resp.text();
-            throw new Error(tables_formatFetchError("Failed to fetch table mappings", resp.status, errorBody));
+        const controller = new AbortController();
+        let repl;
+        let nextId = 1;
+        let output = "";
+        let keepalive;
+        let pongTimeout;
+        let closeTimeout;
+        const startupTimeout = setTimeout(()=>{
+            controller.abort(new Error("Timed out waiting for the REPL to start."));
+        }, 30000);
+        const onAbort = ()=>controller.abort(interrupted());
+        const markResponsive = ()=>{
+            clearTimeout(pongTimeout);
+            pongTimeout = void 0;
+        };
+        options.signal?.addEventListener("abort", onAbort, {
+            once: true
+        });
+        ws.on("pong", markResponsive);
+        ws.on("unexpected-response", (request, response)=>{
+            response.resume();
+            controller.abort(new Error(`REPL websocket handshake failed (${response.statusCode} ${response.statusMessage}).`));
+            request.destroy();
+        });
+        ws.on("error", (error)=>controller.abort(new Error(`REPL websocket connection failed: ${error.message}`)));
+        ws.on("close", (code, reason)=>{
+            clearTimeout(closeTimeout);
+            controller.abort(new Error(`REPL websocket disconnected unexpectedly (code ${code}${reason.length ? `: ${reason}` : ""}).`));
+        });
+        const messages = (0, external_events_namespaceObject.on)(ws, "message", {
+            signal: controller.signal
+        });
+        function send(message) {
+            const id = nextId++;
+            ws.send(JSON.stringify({
+                ...message,
+                id
+            }), (error)=>{
+                if (error) controller.abort(new Error(`REPL websocket send failed: ${error.message}`));
+            });
+            return id;
+        }
+        async function readUntil(matches) {
+            while(true){
+                const { value, done } = await messages.next();
+                options.signal?.throwIfAborted();
+                if (done) throw new Error("REPL websocket message stream ended unexpectedly.");
+                markResponsive();
+                let message;
+                try {
+                    message = JSON.parse(value[0].toString());
+                    if (!message || "object" != typeof message || Array.isArray(message)) throw new Error("Expected an object");
+                } catch  {
+                    throw new Error("Invalid REPL websocket message.");
+                }
+                if ("REPL_UPDATE" === message.event) {
+                    if (!repl || message.repl !== repl) continue;
+                    if ("string" == typeof message.output) {
+                        output += message.output;
+                        options.onOutput?.(message.output);
+                        options.signal?.throwIfAborted();
+                    }
+                }
+                if (message.error) throw new ReplServerError(replError(message.error));
+                if ("REPL_UPDATE" === message.event && message.terminated) throw new Error("REPL terminated unexpectedly.");
+                if (matches(message)) return message;
+            }
         }
-        const databases = await resp.json();
-        const allTables = [];
-        for (const db of databases)for (const table of db.tables || [])allTables.push({
-            table_id: table.id,
-            python_name: table.python_name,
-            name: table.name
+        try {
+            await (0, external_events_namespaceObject.once)(ws, "open", {
+                signal: controller.signal
+            });
+            const launchId = send({
+                cmd: "LAUNCH_REPL"
+            });
+            const launched = await readUntil((message)=>message.id === launchId);
+            if ("string" != typeof launched.repl || !launched.repl) throw new Error("Invalid REPL launch response: missing REPL ID.");
+            repl = launched.repl;
+            keepalive = setInterval(()=>{
+                try {
+                    send({
+                        cmd: "REPL_KEEPALIVE",
+                        repl
+                    });
+                    pongTimeout = setTimeout(()=>controller.abort(new Error("REPL websocket heartbeat timed out.")), 10000);
+                    ws.ping();
+                } catch (error) {
+                    controller.abort(error);
+                }
+            }, 20000);
+            const isReady = (message)=>"REPL_UPDATE" === message.event && true === message.ready;
+            await readUntil(isReady);
+            clearTimeout(startupTimeout);
+            send({
+                cmd: "REPL_COMMAND",
+                repl,
+                command: options.code
+            });
+            await readUntil(isReady);
+            return {
+                output
+            };
+        } catch (error) {
+            if (error instanceof ReplServerError) return {
+                output,
+                error: error.detail
+            };
+            const failure = controller.signal.aborted ? controller.signal.reason : error;
+            throw failure instanceof Error ? failure : new Error(String(failure));
+        } finally{
+            clearTimeout(startupTimeout);
+            clearInterval(keepalive);
+            clearTimeout(pongTimeout);
+            options.signal?.removeEventListener("abort", onAbort);
+            controller.abort();
+            await messages.return?.();
+            if (ws.readyState === external_ws_default().OPEN) {
+                if (repl) ws.send(JSON.stringify({
+                    id: nextId++,
+                    cmd: "TERMINATE_REPL",
+                    repl
+                }), ()=>{});
+                ws.close();
+            } else if (ws.readyState === external_ws_default().CONNECTING) ws.terminate();
+            if (ws.readyState !== external_ws_default().CLOSED) {
+                closeTimeout = setTimeout(()=>ws.terminate(), 1000);
+                closeTimeout.unref();
+            }
+        }
+    }
+    function writeJsonReplOutput(output) {
+        process.stdout.write(JSON.stringify({
+            type: "repl_output",
+            output,
+            timestamp: new Date().toISOString()
+        }) + "\n");
+    }
+    function registerReplCommand(program) {
+        if ("1" !== process.env.ANVIL_AGENT_HOST) return;
+        program.command("repl <code>").description("Run Python in a fresh server REPL for the current environment; use - to read stdin").addHelpText("after", `
+Examples:
+  anvil repl '1 + 2'
+  anvil --json repl '1 + 2'
+  anvil repl - < script.py
+`).action(async (code)=>{
+            const controller = new AbortController();
+            const onInterrupt = ()=>controller.abort();
+            try {
+                const { appId, envPid, anvilUrl } = await resolveEnvironmentContext();
+                if ("-" === code) {
+                    const chunks = [];
+                    for await (const chunk of process.stdin)chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+                    code = Buffer.concat(chunks).toString("utf8");
+                }
+                process.on("SIGINT", onInterrupt);
+                const response = await runRepl(appId, envPid, {
+                    code,
+                    anvilUrl,
+                    signal: controller.signal,
+                    onOutput: getGlobalOutputConfig().jsonMode ? writeJsonReplOutput : (output)=>{
+                        process.stdout.write(output);
+                    }
+                });
+                const error = response.error;
+                const message = error ? `${error.type ? `${error.type}: ` : ""}${error.message}` : void 0;
+                if (getGlobalOutputConfig().jsonMode) logJsonResult(!error, {
+                    data: response,
+                    error: message
+                });
+                else if (error) {
+                    process.stderr.write(`${message}\n`);
+                    for (const [file, line] of error.trace ?? [])process.stderr.write(`  at ${file}:${line}\n`);
+                }
+                if (error) process.exitCode = 1;
+            } catch (error) {
+                const message = errors_getErrorMessage(error);
+                if (getGlobalOutputConfig().jsonMode) logJsonResult(false, {
+                    error: message
+                });
+                else logger_logger.error(message);
+                process.exitCode = controller.signal.aborted ? 130 : 1;
+            } finally{
+                process.removeListener("SIGINT", onInterrupt);
+            }
         });
-        return {
-            tables: allTables
-        };
     }
-    async function writeTableMappings(projectRoot, mappings) {
-        const filePath = external_path_default().join(projectRoot, TABLE_MAPPINGS_PATH);
-        await promises_default().mkdir(external_path_default().dirname(filePath), {
-            recursive: true
+    const external_yaml_namespaceObject = require("yaml");
+    async function encryptSecret(appId, secretName, options = {}) {
+        const anvilUrl = options.anvilUrl ?? await resolveAuthAnvilUrl();
+        const token = await auth_getValidAuthToken(anvilUrl);
+        const response = await fetch(`${anvilUrl}/ide/api/_/apps/${encodeURIComponent(appId)}/secrets/encrypt`, {
+            method: "POST",
+            headers: {
+                Authorization: `Bearer ${token}`,
+                "Content-Type": "application/json"
+            },
+            body: JSON.stringify({
+                name: secretName,
+                ...void 0 === options.secret ? {} : {
+                    secret: options.secret
+                }
+            })
         });
-        await promises_default().writeFile(filePath, JSON.stringify(mappings, null, 2));
-    }
-    async function readTableMappings(projectRoot) {
-        const filePath = external_path_default().join(projectRoot, TABLE_MAPPINGS_PATH);
-        try {
-            const content = await promises_default().readFile(filePath, "utf-8");
-            return JSON.parse(content);
-        } catch  {
-            return null;
-        }
+        if (!response.ok) throw new Error(formatHttpError("Failed to set secret", response.status, await response.text()));
+        return await response.json();
     }
-    async function clearTableMappings(projectRoot) {
-        const filePath = external_path_default().join(projectRoot, TABLE_MAPPINGS_PATH);
-        await promises_default().rm(filePath, {
-            force: true
+    async function generateSecretKey(appId, keyName, options = {}) {
+        const anvilUrl = options.anvilUrl ?? await resolveAuthAnvilUrl();
+        const token = await auth_getValidAuthToken(anvilUrl);
+        const response = await fetch(`${anvilUrl}/ide/api/_/apps/${encodeURIComponent(appId)}/secrets/generate-key`, {
+            method: "POST",
+            headers: {
+                Authorization: `Bearer ${token}`,
+                "Content-Type": "application/json"
+            },
+            body: JSON.stringify({
+                name: keyName
+            })
         });
+        if (!response.ok) throw new Error(formatHttpError("Failed to generate key", response.status, await response.text()));
+        return await response.json();
+    }
+    function secret_anvilYamlPath(projectRoot) {
+        return external_path_default().join(projectRoot, "anvil.yaml");
+    }
+    function checkSecretTypeInDoc(doc, secretName, type) {
+        const existingType = doc.getIn([
+            "secrets",
+            secretName,
+            "type"
+        ]);
+        if (void 0 !== existingType && existingType !== type) throw new Error(`'${secretName}' is a ${existingType} in anvil.yaml, not a ${type}`);
+    }
+    function secretExistsInDoc(doc, secretName, appId) {
+        return doc.hasIn([
+            "secrets",
+            secretName,
+            "value",
+            appId
+        ]);
+    }
+    async function findSecretInAnvilYaml(projectRoot, secretName, appId) {
+        const doc = (0, external_yaml_namespaceObject.parseDocument)(await external_fs_.promises.readFile(secret_anvilYamlPath(projectRoot), "utf8"));
+        if (!doc.hasIn([
+            "secrets",
+            secretName
+        ])) return;
+        return {
+            type: doc.getIn([
+                "secrets",
+                secretName,
+                "type"
+            ]),
+            existsForApp: secretExistsInDoc(doc, secretName, appId)
+        };
+    }
+    async function writeSecretToAnvilYaml(projectRoot, secretName, options) {
+        const { appId, encrypted, overwrite, type } = options;
+        const filePath = secret_anvilYamlPath(projectRoot);
+        const doc = (0, external_yaml_namespaceObject.parseDocument)(await external_fs_.promises.readFile(filePath, "utf8"));
+        checkSecretTypeInDoc(doc, secretName, type);
+        if (secretExistsInDoc(doc, secretName, appId)) {
+            if (!overwrite) throw new Error(`'${secretName}' already exists for app ${appId} in anvil.yaml`);
+            if (!doc.hasIn([
+                "secrets",
+                secretName,
+                "value",
+                appId,
+                "all"
+            ])) throw new Error(`'${secretName}' for app ${appId} in anvil.yaml cannot be overridden`);
+        }
+        if (doc.hasIn([
+            "secrets",
+            secretName
+        ])) {
+            if (!(0, external_yaml_namespaceObject.isMap)(doc.getIn([
+                "secrets",
+                secretName,
+                "value"
+            ]))) doc.setIn([
+                "secrets",
+                secretName,
+                "value"
+            ], doc.createNode({}));
+        } else doc.setIn([
+            "secrets",
+            secretName
+        ], doc.createNode({
+            type,
+            value: {}
+        }));
+        const value = new external_yaml_namespaceObject.Scalar(encrypted);
+        value.type = external_yaml_namespaceObject.Scalar.QUOTE_DOUBLE;
+        if ((0, external_yaml_namespaceObject.isMap)(doc.getIn([
+            "secrets",
+            secretName,
+            "value",
+            appId
+        ]))) doc.setIn([
+            "secrets",
+            secretName,
+            "value",
+            appId,
+            "all"
+        ], value);
+        else doc.setIn([
+            "secrets",
+            secretName,
+            "value",
+            appId
+        ], doc.createNode({
+            all: value
+        }, {
+            flow: true
+        }));
+        await external_fs_.promises.writeFile(filePath, doc.toString(), "utf8");
     }
-    function registerTablesCommand(program) {
-        const tables = program.command("tables").description("Manage table mappings");
-        tables.command("fetch").description("Fetch table mappings into .anvil/table-mappings.json").action(async ()=>{
+    function registerSecretCommand(program) {
+        if ("1" !== process.env.ANVIL_AGENT_HOST) return;
+        const secret = program.command("secret").description("Manage app secrets");
+        secret.command("set").description("Set an app secret. The value is read from stdin, or prompted for if stdin is a terminal.").argument("<name>", "Name of the secret").option("--generate", "Have the server autogenerate the secret value instead of reading it").option("-f, --force", "Overwrite the secret if it is already set for this app").action(async (name, options)=>{
             try {
                 const projectRoot = process.cwd();
-                const anvilUrl = resolveAnvilUrl();
-                const mainAppId = await resolvePrimaryAppId(projectRoot, anvilUrl);
-                if (!mainAppId) {
-                    logger_logger.error("No Anvil app found in current directory");
-                    logger_logger.info("Make sure you're in a directory with an Anvil app git remote.");
-                    process.exit(1);
-                }
-                logger_logger.info("Fetching table mappings...");
-                const response = await fetchTableMappings(mainAppId, anvilUrl);
-                if (!response.tables.length) return void logger_logger.info("No tables found");
-                if (await ensureProjectGitignoreIgnoresAnvilDir(projectRoot)) logger_logger.info("Added /.anvil/ to .gitignore");
-                await writeTableMappings(projectRoot, response);
-                logger_logger.success(`Fetched ${response.tables.length} table mappings`);
-            } catch (e) {
-                logger_logger.error(e.message);
-                process.exit(1);
-            }
-        });
-        tables.command("status").description("Show cached table mappings").action(async ()=>{
-            try {
-                const mappings = await readTableMappings(process.cwd());
-                if (!mappings || !mappings.tables.length) return void logger_logger.info("No cached table mappings (run 'anvil tables fetch')");
-                logger_logger.info("Cached table mappings:");
-                for (const t of mappings.tables)logger_logger.info(`  ${t.python_name} (${t.name}) - ID: ${t.table_id}`);
-            } catch (e) {
-                logger_logger.error(e.message);
+                auth_setRepoContext(projectRoot);
+                const anvilUrl = await resolveAuthAnvilUrl();
+                const appId = await resolvePrimaryAppId(projectRoot, anvilUrl);
+                if (!appId) throw new Error("No Anvil app found in current directory. Make sure you're in a directory with an Anvil app git remote.");
+                const overwrite = await confirmOverwriteIfExists(projectRoot, name, {
+                    appId,
+                    type: "secret",
+                    force: options.force
+                });
+                const value = options.generate ? void 0 : await readSecretValue(name);
+                const response = await encryptSecret(appId, name, {
+                    anvilUrl,
+                    secret: value
+                });
+                await writeSecretToAnvilYaml(projectRoot, name, {
+                    appId,
+                    encrypted: response.encrypted,
+                    overwrite,
+                    type: "secret"
+                });
+                if (getGlobalOutputConfig().jsonMode) logJsonResult(true, {
+                    data: {
+                        encrypted: response.encrypted
+                    }
+                });
+                else logger_logger.info(`Secret '${name}' written to anvil.yaml`);
+            } catch (error) {
+                const message = errors_getErrorMessage(error);
+                if (getGlobalOutputConfig().jsonMode) logJsonResult(false, {
+                    error: message
+                });
+                else logger_logger.error(message);
                 process.exit(1);
             }
         });
-        tables.command("clear").description("Clear cached table mappings").action(async ()=>{
+        secret.command("generate-key").description("Generate an app encryption key. The key is always generated by the server, and its value is never shown.").argument("<name>", "Name of the key").option("-f, --force", "Replace the key if it is already set for this app").action(async (name, options)=>{
             try {
-                await clearTableMappings(process.cwd());
-                logger_logger.success("Cleared .anvil/table-mappings.json");
-            } catch (e) {
-                logger_logger.error(e.message);
+                const projectRoot = process.cwd();
+                auth_setRepoContext(projectRoot);
+                const anvilUrl = await resolveAuthAnvilUrl();
+                const appId = await resolvePrimaryAppId(projectRoot, anvilUrl);
+                if (!appId) throw new Error("No Anvil app found in current directory. Make sure you're in a directory with an Anvil app git remote.");
+                const overwrite = await confirmOverwriteIfExists(projectRoot, name, {
+                    appId,
+                    type: "key",
+                    force: options.force
+                });
+                const response = await generateSecretKey(appId, name, {
+                    anvilUrl
+                });
+                await writeSecretToAnvilYaml(projectRoot, name, {
+                    appId,
+                    encrypted: response.encrypted,
+                    overwrite,
+                    type: "key"
+                });
+                if (getGlobalOutputConfig().jsonMode) logJsonResult(true, {
+                    data: {
+                        encrypted: response.encrypted
+                    }
+                });
+                else logger_logger.info(`Key '${name}' written to anvil.yaml`);
+            } catch (error) {
+                const message = errors_getErrorMessage(error);
+                if (getGlobalOutputConfig().jsonMode) logJsonResult(false, {
+                    error: message
+                });
+                else logger_logger.error(message);
                 process.exit(1);
             }
         });
     }
+    async function confirmOverwriteIfExists(projectRoot, name, options) {
+        const { appId, type, force = false } = options;
+        const existing = await findSecretInAnvilYaml(projectRoot, name, appId);
+        if (existing?.type && existing.type !== type) throw new Error(`'${name}' is a ${existing.type} in anvil.yaml, not a ${type}`);
+        if (!existing?.existsForApp) return false;
+        if (force) return true;
+        const message = `'${name}' already exists for app ${appId} in anvil.yaml`;
+        if (!process.stdin.isTTY) throw new Error(`${message}. Use --force to overwrite it.`);
+        if (!await logger_logger.confirm(`${message}. Overwrite it?`, false)) throw new Error(`Not overwriting '${name}'`);
+        return true;
+    }
+    async function readSecretValue(name) {
+        if (process.stdin.isTTY) {
+            const { secret } = await logger_logger.prompt([
+                {
+                    type: "password",
+                    name: "secret",
+                    message: `Value for secret '${name}':`
+                }
+            ]);
+            if (!secret) throw new Error("No secret value entered");
+            return secret;
+        }
+        {
+            const chunks = [];
+            for await (const chunk of process.stdin)chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+            const secret = Buffer.concat(chunks).toString("utf8").replace(/\r?\n$/, "");
+            if (!secret) throw new Error("No secret value received on stdin");
+            return secret;
+        }
+    }
     const program_packageJson = JSON.parse((0, external_fs_.readFileSync)((0, external_path_namespaceObject.join)(__dirname, "../package.json"), "utf-8"));
     const VERSION = program_packageJson.version;
     setLogger(new CLILogger({
@@ -23302,7 +24322,7 @@ print(json.dumps({"issues": issues}))
         walk(dir);
         return files.sort();
     }
-    function validateSingleFile(file) {
+    async function validateSingleFileBasic(file) {
         let fileContent;
         try {
             fileContent = (0, external_fs_.readFileSync)(file, "utf8");
@@ -23320,7 +24340,10 @@ print(json.dumps({"issues": issues}))
                 ]
             };
         }
-        const result = validatePath(file, fileContent);
+        const formSpecPackageContext = "form_template.html" === inferValidationTarget(file) ? await buildFormSpecPackageContext(file) : void 0;
+        const result = validatePath(file, fileContent, {
+            formSpecPackageContext
+        });
         if (result.ok) return {
             file,
             type: result.target,
@@ -23340,6 +24363,74 @@ print(json.dumps({"issues": issues}))
             } : {}
         };
     }
+    function diagnosticsForFile(file, diagnostics, options = {}) {
+        const absoluteFile = external_path_default().resolve(file);
+        const globalDiagnostics = false === options.includeGlobalDiagnostics ? [] : diagnostics.filter((diagnostic)=>!diagnostic.file);
+        const fileDiagnostics = diagnostics.filter((diagnostic)=>diagnostic.file && external_path_default().resolve(diagnostic.file) === absoluteFile);
+        return [
+            ...fileDiagnostics,
+            ...globalDiagnostics
+        ];
+    }
+    function pythonFileResult(file, result, options = {}) {
+        const issues = result.ok ? [] : diagnosticsForFile(file, result.issues, options);
+        const warnings = diagnosticsForFile(file, result.warnings ?? [], options);
+        if (result.ok || 0 === issues.length) return {
+            file,
+            type: "python",
+            valid: true,
+            ...warnings.length > 0 ? {
+                warnings
+            } : {}
+        };
+        return {
+            file,
+            type: "python",
+            valid: false,
+            error: result.message,
+            issues,
+            ...warnings.length > 0 ? {
+                warnings
+            } : {}
+        };
+    }
+    function groupProjectDiagnostics(diagnostics) {
+        const grouped = new Map();
+        for (const diagnostic of diagnostics){
+            const appDiagnostics = grouped.get(diagnostic.appRoot) ?? [];
+            appDiagnostics.push(diagnostic);
+            grouped.set(diagnostic.appRoot, appDiagnostics);
+        }
+        return grouped;
+    }
+    async function dependencyCacheDiagnostic(appRoot) {
+        const message = await getDependencyCacheWarning(appRoot);
+        if (!message) return;
+        return {
+            path: "root",
+            message,
+            code: "reportAnvilDependencyCache",
+            rule: "reportAnvilDependencyCache",
+            severity: "warning"
+        };
+    }
+    async function validateSingleFile(file) {
+        const appRoot = findAnvilAppRoot(file);
+        const result = "python" === inferValidationTarget(file) && appRoot ? pythonFileResult(file, validatePythonWithPyright(appRoot, {
+            files: [
+                external_path_default().resolve(file)
+            ]
+        })) : await validateSingleFileBasic(file);
+        if (!appRoot) return result;
+        const cacheDiagnostic = await dependencyCacheDiagnostic(appRoot);
+        return cacheDiagnostic ? {
+            ...result,
+            warnings: [
+                ...result.warnings ?? [],
+                cacheDiagnostic
+            ]
+        } : result;
+    }
     function logValidationFailure(fileResult) {
         logger_logger.error(`${fileResult.file} failed validation: ${fileResult.error ?? "Validation failed"}`);
         for (const issue of fileResult.issues ?? []){
@@ -23355,8 +24446,8 @@ print(json.dumps({"issues": issues}))
     function logValidationWarnings(fileResult) {
         for (const warning of fileResult.warnings ?? [])logger_logger.warn(formatValidationWarning(fileResult.file, warning));
     }
-    function handleValidateFile(file) {
-        const fileResult = validateSingleFile(file);
+    async function handleValidateFile(file) {
+        const fileResult = await validateSingleFile(file);
         if (fileResult.valid) {
             if (getGlobalOutputConfig().jsonMode) logJsonResult(true, {
                 data: {
@@ -23391,7 +24482,7 @@ print(json.dumps({"issues": issues}))
         }
         process.exitCode = 1;
     }
-    function handleValidateDirectory(dir) {
+    async function handleValidateDirectory(dir) {
         const files = collectValidationFiles(dir);
         if (0 === files.length) {
             const error = `No supported files found under ${dir}`;
@@ -23407,25 +24498,100 @@ print(json.dumps({"issues": issues}))
             process.exitCode = 1;
             return;
         }
-        const fileResults = files.map(validateSingleFile);
+        const pythonFiles = files.filter((file)=>"python" === inferValidationTarget(file));
+        const nonPythonResults = new Map(await Promise.all(files.filter((file)=>"python" !== inferValidationTarget(file)).map(async (file)=>[
+                file,
+                await validateSingleFileBasic(file)
+            ])));
+        const pythonResults = new Map();
+        let globalPythonIssues = [];
+        let globalPythonWarnings = [];
+        if (pythonFiles.length > 0) {
+            const pyright = findAnvilPyright();
+            const filesByAppRoot = new Map();
+            const filesWithoutAppRoot = [];
+            for (const file of pythonFiles){
+                const appRoot = findAnvilAppRoot(file);
+                if (!appRoot) {
+                    filesWithoutAppRoot.push(file);
+                    continue;
+                }
+                const appFiles = filesByAppRoot.get(appRoot) ?? [];
+                appFiles.push(file);
+                filesByAppRoot.set(appRoot, appFiles);
+            }
+            for (const [appRoot, appFiles] of filesByAppRoot){
+                const relativeAppRoot = external_path_default().relative(external_path_default().resolve(dir), external_path_default().resolve(appRoot));
+                const includesWholeApp = "" === relativeAppRoot || !external_path_default().isAbsolute(relativeAppRoot) && ".." !== relativeAppRoot && !relativeAppRoot.startsWith(`..${external_path_default().sep}`);
+                const result = validatePythonWithPyright(appRoot, {
+                    ...includesWholeApp ? {} : {
+                        files: appFiles.map((file)=>external_path_default().resolve(file))
+                    },
+                    pyright
+                });
+                if (!result.ok) globalPythonIssues.push(...result.issues.filter((diagnostic)=>!diagnostic.file).map((diagnostic)=>({
+                        ...diagnostic,
+                        appRoot
+                    })));
+                globalPythonWarnings.push(...(result.warnings ?? []).filter((diagnostic)=>!diagnostic.file).map((diagnostic)=>({
+                        ...diagnostic,
+                        appRoot
+                    })));
+                for (const file of appFiles)pythonResults.set(file, pythonFileResult(file, result, {
+                    includeGlobalDiagnostics: false
+                }));
+            }
+            for (const file of filesWithoutAppRoot)pythonResults.set(file, await validateSingleFileBasic(file));
+        }
+        const appRoots = new Set(files.map((file)=>findAnvilAppRoot(file)).filter((appRoot)=>null !== appRoot));
+        for (const appRoot of appRoots){
+            const cacheDiagnostic = await dependencyCacheDiagnostic(appRoot);
+            if (cacheDiagnostic) globalPythonWarnings.push({
+                ...cacheDiagnostic,
+                appRoot
+            });
+        }
+        const fileResults = files.map((file)=>pythonResults.get(file) ?? nonPythonResults.get(file));
         const failedResults = fileResults.filter((result)=>!result.valid);
-        if (getGlobalOutputConfig().jsonMode) logJsonResult(0 === failedResults.length, {
-            error: failedResults.length > 0 ? "Validation failed" : void 0,
+        const valid = 0 === failedResults.length && 0 === globalPythonIssues.length;
+        if (getGlobalOutputConfig().jsonMode) logJsonResult(valid, {
+            error: valid ? void 0 : "Validation failed",
             data: {
                 file: dir,
-                valid: 0 === failedResults.length,
+                valid,
                 count: fileResults.length,
-                files: fileResults
+                files: fileResults,
+                ...globalPythonIssues.length > 0 ? {
+                    issues: globalPythonIssues
+                } : {},
+                ...globalPythonWarnings.length > 0 ? {
+                    warnings: globalPythonWarnings
+                } : {}
             }
         });
-        else for (const fileResult of fileResults)if (fileResult.valid) {
-            logger_logger.success(`${fileResult.file} is valid (${fileResult.type})`);
-            logValidationWarnings(fileResult);
-        } else {
-            logValidationFailure(fileResult);
-            logValidationWarnings(fileResult);
+        else {
+            for (const [appRoot, issues] of groupProjectDiagnostics(globalPythonIssues))logValidationFailure({
+                file: appRoot,
+                type: "python",
+                valid: false,
+                error: "Python semantic validation failed",
+                issues
+            });
+            for (const [appRoot, warnings] of groupProjectDiagnostics(globalPythonWarnings))logValidationWarnings({
+                file: appRoot,
+                type: "python",
+                valid: true,
+                warnings
+            });
+            for (const fileResult of fileResults)if (fileResult.valid) {
+                logger_logger.success(`${fileResult.file} is valid (${fileResult.type})`);
+                logValidationWarnings(fileResult);
+            } else {
+                logValidationFailure(fileResult);
+                logValidationWarnings(fileResult);
+            }
         }
-        if (failedResults.length > 0) process.exitCode = 1;
+        if (!valid) process.exitCode = 1;
     }
     function getUpdateInstructions(platform) {
         if ("win32" === platform) return [
@@ -23536,11 +24702,14 @@ print(json.dumps({"issues": issues}))
         registerVersionCommand(program, VERSION);
         registerConfigureCommand(program, VERSION);
         registerDepsCommand(program);
-        registerTablesCommand(program);
+        registerDbCommand(program);
+        registerEnvCommand(program);
+        registerReplCommand(program);
+        registerSecretCommand(program);
         program.command("update").description("Update anvil to the latest version").alias("u").action(async ()=>{
             await handleUpdateCommand();
         });
-        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)=>{
+        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(async (file)=>{
             let pathStat;
             try {
                 pathStat = (0, external_fs_.statSync)(file);
@@ -23549,8 +24718,8 @@ print(json.dumps({"issues": issues}))
                 process.exitCode = 1;
                 return;
             }
-            if (pathStat.isDirectory()) return void handleValidateDirectory(file);
-            handleValidateFile(file);
+            if (pathStat.isDirectory()) return void await handleValidateDirectory(file);
+            await handleValidateFile(file);
         });
         if (watchCommand) {
             const watchOptions = watchCommand.options.map((opt)=>{