@anvil-works/anvil-cli 0.8.0-dev.0 → 0.8.0-dev.1

package/dist/cli.js

@@ -12875,12 +12875,25 @@ var __webpack_exports__ = {};
         if (!urlInput || "string" != typeof urlInput) return urlInput;
         let url = urlInput.trim();
         url = url.replace(/\/+$/, "");
-        if ("localhost" === url || url.startsWith("localhost:")) return "http://localhost:3000";
-        if ("http://localhost" === url || url.startsWith("http://localhost:")) return "http://localhost:3000";
-        if ("https://localhost" === url || url.startsWith("https://localhost:")) return "http://localhost:3000";
-        if (/^https?:\/\//.test(url)) return url;
+        if ("localhost" === url) return "http://localhost:3000";
+        if (url.startsWith("localhost:")) return `http://${url}`;
+        if (/^https?:\/\//i.test(url)) return url;
         return `https://${url}`;
     }
+    function normalizeAnvilOrigin(input) {
+        try {
+            const raw = input.trim();
+            const normalized = normalizeAnvilUrl(raw);
+            const url = new URL(raw.includes("://") ? raw : normalized);
+            if (![
+                "http:",
+                "https:"
+            ].includes(url.protocol) || url.username || url.password || "/" !== url.pathname || url.search || url.hash) throw new Error("Invalid origin");
+            return normalized;
+        } catch  {
+            throw new Error("Server URL must be an HTTP(S) origin without credentials, a path, query, or fragment.");
+        }
+    }
     function resolveAnvilUrl() {
         const fromConfig = getConfig("anvilUrl");
         if ("string" == typeof fromConfig && fromConfig.trim()) return fromConfig.trim();
@@ -12904,6 +12917,9 @@ var __webpack_exports__ = {};
     function getGlobalOutputConfig() {
         return globalOutputConfig;
     }
+    function canPrompt() {
+        return !globalOutputConfig.jsonMode && !!(process.stdin.isTTY && process.stdout.isTTY);
+    }
     function assertCanPrompt(action = "This command", explicitAlternative = "Pass explicit flags instead.") {
         if (globalOutputConfig.jsonMode) throw new Error(`${action} requires interactive input, but --json disables prompts. ${explicitAlternative}`);
         if (!process.stdin.isTTY || !process.stdout.isTTY) throw new Error(`${action} requires interactive input, but stdin/stdout is not a TTY. ${explicitAlternative}`);
@@ -13214,8 +13230,6 @@ var __webpack_exports__ = {};
             return answer.value;
         }
     }
-    const external_readline_namespaceObject = require("readline");
-    var external_readline_default = /*#__PURE__*/ __webpack_require__.n(external_readline_namespaceObject);
     const external_js_yaml_namespaceObject = require("js-yaml");
     var external_js_yaml_default = /*#__PURE__*/ __webpack_require__.n(external_js_yaml_namespaceObject);
     class EditorYamlManager {
@@ -14748,9 +14762,50 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
     function parseBranchList(output) {
         return output.split(/\r?\n/).map((line)=>line.trim()).filter(Boolean);
     }
+    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}`;
+    }
     function anvil_api_getDefaultAnvilUrl() {
         return resolveAnvilUrl();
     }
+    async function createAnvilApp(options) {
+        let response;
+        try {
+            response = await fetch(`${options.anvilUrl}/ide/api/_/apps`, {
+                method: "POST",
+                headers: {
+                    Authorization: `Bearer ${options.authToken}`,
+                    "Content-Type": "application/json"
+                },
+                body: JSON.stringify({
+                    name: options.name,
+                    tags: options.tags
+                })
+            });
+        } catch (error) {
+            throw errors_createNetworkError.network(error.message);
+        }
+        const data = await response.json().catch(()=>({}));
+        if (!response.ok) {
+            if (401 === response.status || 403 === response.status) throw errors_createAuthError.invalid(data.error || "Not authorized to create an app");
+            throw new Error(data.error || `Failed to create app: ${response.status} ${response.statusText}`);
+        }
+        if ("string" != typeof data.id || !data.id) throw new Error("App creation response did not contain an app ID.");
+        return {
+            id: data.id,
+            ..."string" == typeof data.name ? {
+                name: data.name
+            } : {},
+            ...data.tags ? {
+                tags: data.tags
+            } : {}
+        };
+    }
     async function validateAppId(appId, anvilUrl = anvil_api_getDefaultAnvilUrl(), username) {
         const authToken = await auth_getValidAuthToken(anvilUrl, username);
         try {
@@ -14836,6 +14891,17 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             return null;
         }
     }
+    async function getTestRunSnapshot(appId, runId, options = {}) {
+        const anvilUrl = options.anvilUrl ?? await resolveAuthAnvilUrl();
+        const token = await auth_getValidAuthToken(anvilUrl, options.username);
+        const response = await fetch(`${anvilUrl}/ide/api/_/apps/${encodeURIComponent(appId)}/test-runs/${encodeURIComponent(runId)}`, {
+            headers: {
+                Authorization: `Bearer ${token}`
+            }
+        });
+        if (!response.ok) throw new Error(formatHttpError("Failed to get the test run's results", response.status, await response.text()));
+        return response.json();
+    }
     function filterCandidates(candidates, explicitUrl, explicitUsername) {
         let filtered = candidates;
         if (explicitUrl) {
@@ -14873,14 +14939,15 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
         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/);
+                const httpMatch = remote.refs.fetch?.match(/(https?):\/\/(?:[^@\/]+@)?([^\/]+)\/git\/([A-Z0-9]+)\.git/);
                 if (httpMatch) {
-                    const [, host, detectedAppId] = httpMatch;
+                    const [, scheme, host, detectedAppId] = httpMatch;
+                    const origin = new URL(`${scheme}://${host}`).origin;
                     out.push({
                         appId: detectedAppId,
                         source: "remote",
                         description: `Git remote '${remote.name}'`,
-                        detectedUrl: normalizeAnvilUrl(host)
+                        detectedUrl: normalizeAnvilUrl(origin)
                     });
                     continue;
                 }
@@ -14988,14 +15055,6 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
             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");
@@ -15013,12 +15072,12 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
     }
     const ANVIL_DEPS_DIR = ".anvil/deps";
     const ANVIL_DEPS_MANIFEST = "manifest.json";
-    const DEPS_MANIFEST_VERSION = 2;
+    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);
+        const token = await auth_getValidAuthToken(anvilUrl, options.username);
         const body = {
             include_docs: includeDocs,
             known_dependencies: knownDependencies
@@ -15042,9 +15101,17 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
         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, {
-            commit: options.commit,
+            username: options.username,
+            commit,
             includeDocs,
             knownDependencies
         });
@@ -15057,7 +15124,8 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
         }
         const addedGitignoreEntry = await ensureProjectGitignoreIgnoresAnvilDir(projectRoot);
         await writeAllDepsToCache(projectRoot, response, {
-            includeDocs
+            includeDocs,
+            sourceDependencies
         });
         return {
             response,
@@ -15083,7 +15151,7 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
     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.source_dependencies) && Array.isArray(manifest.resolved_dependencies) && manifest.resolved_dependencies.every(isResolvedDependencyManifestEntry) && Array.isArray(manifest.cached_dependencies) && manifest.cached_dependencies.every(isCachedDependencyManifestEntry);
+        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 {
@@ -15295,7 +15363,7 @@ Promise.resolve(executeGitCredentialOperation(process.argv[2] || "get", {
         const newManifest = {
             version: DEPS_MANIFEST_VERSION,
             includeDocs,
-            source_dependencies: await readAnvilYamlDependencies(projectRoot),
+            source_dependencies: void 0 === options.sourceDependencies ? await readAnvilYamlDependencies(projectRoot) : options.sourceDependencies,
             resolved_dependencies: response.resolved_dependencies,
             cached_dependencies: cachedDependencies
         };
@@ -16382,8 +16450,10 @@ 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");
+            if (void 0 !== value.item_type.table_name) validateNonEmptyString(value.item_type.table_name, path("item_type.table_name"), issues);
+            else 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");
         return issues;
     }
@@ -16456,7 +16526,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",
@@ -19737,6 +19808,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");
@@ -20245,6 +20317,8 @@ print(json.dumps({"issues": issues}))
         }
     }
     const external_http_namespaceObject = require("http");
+    const external_readline_namespaceObject = require("readline");
+    var external_readline_default = /*#__PURE__*/ __webpack_require__.n(external_readline_namespaceObject);
     const external_open_namespaceObject = require("open");
     var external_open_default = /*#__PURE__*/ __webpack_require__.n(external_open_namespaceObject);
     const successPage = `<!DOCTYPE html>
@@ -21276,7 +21350,7 @@ print(json.dumps({"issues": issues}))
             value: null
         });
         return logger_logger.select("Multiple logged-in Anvil URLs found. Which one would you like to use?", choices, decision.urls[0], {
-            action: "`anvil checkout` URL selection",
+            action: "Anvil server selection",
             nonInteractiveHint: `Use --url <ANVIL_URL>. Available URLs: ${decision.urls.join(", ")}.`
         });
     }
@@ -21355,8 +21429,8 @@ print(json.dumps({"issues": issues}))
             name: "Cancel",
             value: null
         });
-        return logger_logger.select(`Multiple accounts found for ${anvilUrl}. Which account should be used for checkout?`, choices, accounts[0], {
-            action: "`anvil checkout` account selection",
+        return logger_logger.select(`Multiple accounts found for ${anvilUrl}. Which account should be used?`, choices, accounts[0], {
+            action: "Anvil account selection",
             nonInteractiveHint: `Use --user <USERNAME>. Available accounts: ${accounts.join(", ")}.`
         });
     }
@@ -21375,7 +21449,7 @@ print(json.dumps({"issues": issues}))
         logger_logger.verbose(external_chalk_default().cyan("Resolved app ID: ") + external_chalk_default().bold(parsed.appId));
         const anvilUrl = await resolveCheckoutUrlForApi(options.anvilUrl, parsed.detectedUrl);
         if (!anvilUrl) throw new Error("Anvil URL is required. Use --url <ANVIL_URL> or pass an input URL containing the host.");
-        const gitUrl = options.gitUrl ?? anvilUrl;
+        const gitUrl = void 0 === options.gitUrl ? anvilUrl : normalizeAnvilOrigin(options.gitUrl);
         const resolvedUsername = await resolveCheckoutUsernameForApi(anvilUrl, options.user);
         if (resolvedUsername) logger_logger.verbose(external_chalk_default().cyan("Using account: ") + external_chalk_default().bold(resolvedUsername));
         else logger_logger.verbose(external_chalk_default().cyan("No account preselected; resolving after auth token lookup."));
@@ -21486,7 +21560,7 @@ print(json.dumps({"issues": issues}))
         await openPathInEditorOrDefault(destinationPath, preferredEditorCommand, deps);
     }
     function registerCheckoutCommand(program) {
-        const checkoutCommand = program.command("checkout [input] [directory]").description("Check out an Anvil app locally from editor URL, git URL, app ID, or interactive selection").alias("co").option("-O, --open", "Open destination after checkout").option("-b, --branch <BRANCH>", "Checkout a specific branch").option("--depth <N>", "Create a shallow clone with history truncated to N commits", (value)=>parseInt(value, 10)).option("--single-branch", "Clone only one branch").option("--origin <NAME>", "Use a custom remote name instead of origin").option("--quiet", "Suppress git clone progress output").option("--verbose", "Enable verbose git clone output").option("-u, --url <ANVIL_URL>", "Specify Anvil server URL").option("-U, --user <USERNAME>", "Specify which user account to use").option("-f, --force", "Override safety checks for destination path").option("-Q, --query <QUERY>", "Initial search query for interactive checkout picker").action(async (input, directory, options, command)=>{
+        const checkoutCommand = program.command("checkout [input] [directory]").description("Check out an Anvil app locally from editor URL, git URL, app ID, or interactive selection").alias("co").option("-O, --open", "Open destination after checkout").option("-b, --branch <BRANCH>", "Checkout a specific branch").option("--depth <N>", "Create a shallow clone with history truncated to N commits", (value)=>parseInt(value, 10)).option("--single-branch", "Clone only one branch").option("--origin <NAME>", "Use a custom remote name instead of origin").option("--quiet", "Suppress git clone progress output").option("--verbose", "Enable verbose git clone output").option("-u, --url <ANVIL_URL>", "Specify Anvil server URL").option("--git-url <GIT_URL>", "Git server URL, if separate from the Anvil server").option("-U, --user <USERNAME>", "Specify which user account to use").option("-f, --force", "Override safety checks for destination path").option("-Q, --query <QUERY>", "Initial search query for interactive checkout picker").action(async (input, directory, options, command)=>{
             try {
                 const globalOptions = command?.optsWithGlobals() || options || {};
                 if ("number" == typeof options?.depth && (!Number.isFinite(options.depth) || options.depth <= 0)) throw new Error("--depth must be a positive integer");
@@ -21501,6 +21575,7 @@ print(json.dumps({"issues": issues}))
                     quiet: options?.quiet,
                     verbose: globalOptions.verbose,
                     anvilUrl: options?.url,
+                    gitUrl: options?.gitUrl,
                     user: options?.user,
                     force: options?.force,
                     query: options?.query
@@ -21512,6 +21587,232 @@ print(json.dumps({"issues": issues}))
         });
         checkoutCommand.addHelpText("after", "\n" + external_chalk_default().bold("Examples:") + '\n  anvil checkout http://localhost:3000/build/apps/APPID/code/assets/theme.css\n  anvil checkout https://anvil.works/git/APPID.git\n  anvil checkout APPID --url anvil.works\n  anvil checkout APPID --branch master --depth 1 --single-branch\n  anvil checkout APPID -O  # open editor/file browser after checkout\n  anvil checkout APPID my-local-folder --force\n  anvil checkout  # interactive search/select app list\n  anvil checkout -Q "dashboard"  # preseed picker search\n');
     }
+    class CreateCheckoutError extends Error {
+        created;
+        constructor(message, created, options){
+            super(message, options), this.created = created;
+            this.name = "CreateCheckoutError";
+        }
+    }
+    const create_defaultDeps = {
+        getAccountsForUrl: auth_getAccountsForUrl,
+        getValidAuthToken: auth_getValidAuthToken,
+        createApp: createAnvilApp,
+        checkout: executeCheckout
+    };
+    function validateCheckoutOptions(options) {
+        if (false === options.checkout && (void 0 !== options.directory || void 0 !== options.gitUrl || options.open)) throw new Error("--no-checkout cannot be combined with a destination argument, --directory, --git-url, or --open.");
+    }
+    async function validateCreateInput(options) {
+        validateCheckoutOptions(options);
+        const name = options.name.trim();
+        if (!name) throw new Error("App name is required.");
+        const tags = void 0 === options.tags ? void 0 : [
+            ...new Set(options.tags.map((tag)=>tag.trim().toLowerCase()))
+        ];
+        if (tags && (tags.length > 20 || tags.some((tag)=>tag.length > 50 || !/^[a-z0-9_-]+$/.test(tag)))) throw new Error("Use at most 20 unique tags, each 1–50 characters: letters, numbers, hyphens, or underscores.");
+        if (false === options.checkout) return {
+            name,
+            tags,
+            destinationPath: void 0
+        };
+        const directory = options.directory ?? sanitizeDirectoryName(name);
+        if (!directory) throw new Error("App name cannot be used as a directory. Pass --directory <PATH>.");
+        const destinationPath = external_path_default().resolve(directory);
+        await validateCheckoutDestination(destinationPath);
+        return {
+            name,
+            tags,
+            destinationPath
+        };
+    }
+    async function executeCreate(options, deps = create_defaultDeps) {
+        const { name, tags, destinationPath } = await validateCreateInput(options);
+        const anvilUrl = normalizeAnvilOrigin(options.anvilUrl ?? await resolveCheckoutUrlForApi() ?? "");
+        const gitUrl = void 0 === options.gitUrl ? void 0 : normalizeAnvilOrigin(options.gitUrl);
+        const accounts = options.user ? [] : await deps.getAccountsForUrl(anvilUrl);
+        const username = options.user ?? accounts[0];
+        if (!username) throw new Error(`Not logged in to ${anvilUrl}. Run 'anvil login ${anvilUrl}' and retry.`);
+        if (!options.user && accounts.length > 1) throw new Error(`Multiple accounts found for ${anvilUrl}: ${accounts.join(", ")}. Use --user <USERNAME>.`);
+        const authToken = await deps.getValidAuthToken(anvilUrl, username);
+        const created = await deps.createApp({
+            name,
+            anvilUrl,
+            authToken,
+            ...tags ? {
+                tags
+            } : {}
+        });
+        if (void 0 === destinationPath) return {
+            appId: created.id,
+            appName: created.name,
+            anvilUrl,
+            username,
+            tags: created.tags ?? tags ?? [],
+            editorUrl: `${anvilUrl}/build/apps/${encodeURIComponent(created.id)}`
+        };
+        try {
+            const checkout = await deps.checkout({
+                input: created.id,
+                directory: destinationPath,
+                anvilUrl,
+                ...gitUrl ? {
+                    gitUrl
+                } : {},
+                user: username
+            });
+            return {
+                ...checkout,
+                tags: created.tags ?? tags ?? []
+            };
+        } catch (error) {
+            const details = {
+                appId: created.id,
+                appName: created.name,
+                anvilUrl,
+                gitUrl,
+                destinationPath,
+                username,
+                tags: created.tags ?? tags ?? []
+            };
+            const retry = buildShellCommandLine([
+                "anvil",
+                "checkout",
+                created.id,
+                destinationPath,
+                "--url",
+                anvilUrl,
+                "--user",
+                username,
+                ...gitUrl ? [
+                    "--git-url",
+                    gitUrl
+                ] : []
+            ]);
+            const remainingFiles = await isDirectoryNonEmpty(destinationPath).catch(()=>true);
+            const recovery = remainingFiles ? `Inspect the existing checkout at ${destinationPath} before retrying. For Git authentication problems, run ${buildShellCommandLine([
+                "anvil",
+                "git-auth",
+                "doctor",
+                "--repo",
+                destinationPath
+            ])}.` : `Retry checkout with: ${retry}`;
+            const message = errors_getErrorMessage(error).replaceAll(authToken, "[REDACTED]").replaceAll(encodeURIComponent(authToken), "[REDACTED]");
+            throw new CreateCheckoutError(`Created app ${created.id} at ${anvilUrl}, but checkout failed: ${message}. Do not rerun create. ${recovery}`, details, {
+                cause: error
+            });
+        }
+    }
+    async function resolveCreateAccountInteractive(anvilUrl, options) {
+        const user = await resolveCheckoutUsername(anvilUrl, options.user);
+        if (null === user) return null;
+        try {
+            await auth_getValidAuthToken(anvilUrl, user);
+            return user;
+        } catch (error) {
+            const loginNeeded = isAnvilError(error) && ([
+                "auth_required",
+                "auth_expired",
+                "auth_invalid"
+            ].includes(error.type) || "token_refresh_failed" === error.type && [
+                400,
+                401,
+                403
+            ].includes(error.status ?? 0));
+            if (!loginNeeded) throw error;
+            if (!canPrompt()) throw new Error(`${errors_getErrorMessage(error)} Run 'anvil login ${anvilUrl}' and retry.`, {
+                cause: error
+            });
+            if (!await logger_logger.confirm(`${errors_getErrorMessage(error)} Log in to ${anvilUrl} now?`, true)) return null;
+            const login = await (options.login ?? runInteractiveLoginFlow)(anvilUrl);
+            if (user && login.email !== user) throw new Error(`Logged in as ${login.email}, but the selected account is ${user}. No app was created.`);
+            return login.email;
+        }
+    }
+    function registerCreateCommand(program, deps = {
+        executeCreate
+    }) {
+        program.command("create [name] [directory]").description("Create a new Anvil app and check it out locally").option("--no-checkout", "Create the app without a local checkout").option("-d, --directory <PATH>", "Local directory for the new app").option("--tag <TAG...>", "App tags (space-separated or repeated; place after name and directory)", (tag, tags)=>[
+                ...tags,
+                tag
+            ], []).option("-u, --url <ANVIL_URL>", "Anvil server URL").option("-U, --user <USERNAME>", "Logged-in account to create the app").option("--git-url <GIT_URL>", "Git server URL, if separate from the Anvil server").option("-O, --open", "Open the new app directory after checkout").action(async (name, directory, options)=>{
+            try {
+                if (void 0 !== directory && void 0 !== options.directory) throw new Error("Pass the directory once, either as an argument or with --directory.");
+                validateCheckoutOptions({
+                    ...options,
+                    directory: directory ?? options.directory
+                });
+                if (void 0 === name) {
+                    assertCanPrompt("`anvil create` without a name", "Pass a name: anvil create <NAME>.");
+                    const answer = await logger_logger.prompt([
+                        {
+                            type: "input",
+                            name: "name",
+                            message: "App name",
+                            validate: (value)=>value.trim() ? true : "App name is required."
+                        }
+                    ]);
+                    name = answer.name;
+                }
+                const input = await validateCreateInput({
+                    name,
+                    directory: directory ?? options.directory,
+                    tags: options.tag,
+                    checkout: options.checkout
+                });
+                const explicitUrl = void 0 === options.url ? void 0 : normalizeAnvilOrigin(options.url);
+                const gitUrl = void 0 === options.gitUrl ? void 0 : normalizeAnvilOrigin(options.gitUrl);
+                const selectedUrl = await resolveCheckoutUrl(explicitUrl);
+                if (!selectedUrl) return void logger_logger.info("Create cancelled.");
+                const anvilUrl = normalizeAnvilOrigin(selectedUrl);
+                const user = await resolveCreateAccountInteractive(anvilUrl, {
+                    user: options.user,
+                    login: deps.login
+                });
+                if (null === user) return void logger_logger.info("Create cancelled.");
+                const result = await deps.executeCreate({
+                    name: input.name,
+                    directory: input.destinationPath,
+                    tags: input.tags,
+                    anvilUrl,
+                    ...false === options.checkout ? {
+                        checkout: false
+                    } : {},
+                    ...gitUrl ? {
+                        gitUrl
+                    } : {},
+                    user
+                });
+                if (options.open && "destinationPath" in result) {
+                    const preferredEditor = String(getConfig("preferredEditor") || "").trim();
+                    try {
+                        await (deps.openPath ?? checkout_openPathInEditorOrDefault)(result.destinationPath, preferredEditor ? getPreferredEditorCommand(preferredEditor) : void 0);
+                    } catch (error) {
+                        logger_logger.warn(`App created and checked out at ${result.destinationPath}, but opening it failed: ${errors_getErrorMessage(error)}`);
+                    }
+                }
+                if (getGlobalOutputConfig().jsonMode) logJsonResult(true, {
+                    data: result
+                });
+                else {
+                    logger_logger.success("destinationDisplay" in result ? `Created ${result.appName ?? result.appId} (${result.appId}) in ${result.destinationDisplay}` : `Created ${result.appName ?? result.appId} (${result.appId}) at ${result.editorUrl}`);
+                    if ("destinationDisplay" in result) logger_logger.info(`${result.anvilUrl}/build/apps/${encodeURIComponent(result.appId)}`);
+                }
+            } catch (error) {
+                const message = errors_getErrorMessage(error);
+                if (getGlobalOutputConfig().jsonMode) logJsonResult(false, {
+                    error: message,
+                    ...error instanceof CreateCheckoutError ? {
+                        data: {
+                            created: error.created
+                        }
+                    } : {}
+                });
+                else logger_logger.error(`Error: ${message}`);
+                process.exitCode = 1;
+            }
+        });
+    }
     const defaultGitAuthDoctorDeps = {
         getAppAuthBinding: getAppAuthBinding,
         getAccountsForUrl: auth_getAccountsForUrl,
@@ -22206,36 +22507,6 @@ print(json.dumps({"issues": issues}))
         const selectedUrl = await logger_logger.select("Multiple logged-in Anvil URLs found. Which one would you like to use?", choices, decision.urls[0]);
         return selectedUrl;
     }
-    const defaultConfigureWatchGitAuthDeps = {
-        configureCredentialHelperForUrl: configureCredentialHelperForUrl,
-        setAppAuthBinding: setAppAuthBinding
-    };
-    const defaultSyncStartDeps = {
-        pushToAnvil,
-        recreateSessionAndValidate,
-        recheckSyncStatus,
-        startWatchingWithEventHandlers
-    };
-    function resolveWatchOpenPath(repoPath) {
-        return external_path_default().resolve(repoPath);
-    }
-    async function openWatchPath(targetPath, deps) {
-        const preferredEditor = String(getConfig("preferredEditor") || "").trim();
-        const preferredEditorCommand = preferredEditor ? getPreferredEditorCommand(preferredEditor) : "";
-        await openPathInEditorOrDefault(targetPath, preferredEditorCommand, deps);
-        logger_logger.info(external_chalk_default().gray(`Opened ${targetPath}`));
-    }
-    async function configureWatchGitAuth(options, deps = defaultConfigureWatchGitAuthDeps) {
-        await deps.configureCredentialHelperForUrl(options.repoPath, options.anvilUrl);
-        await deps.setAppAuthBinding(options.repoPath, options.appId, {
-            url: options.anvilUrl,
-            username: options.username
-        });
-    }
-    function isStaleRemotePushError(message) {
-        const normalized = message.toLowerCase();
-        return normalized.includes("fetch first") || normalized.includes("non-fast-forward") || normalized.includes("failed to push some refs") || normalized.includes("remote contains work that you do") || normalized.includes("[rejected]");
-    }
     async function selectAppId(candidates) {
         if (0 === candidates.length) {
             logger_logger.warn("Could not auto-detect app ID from repository.");
@@ -22313,6 +22584,169 @@ print(json.dumps({"issues": issues}))
             return null;
         }
     }
+    class AppAccountCancelledError extends Error {
+        constructor(){
+            super("Operation cancelled.");
+        }
+    }
+    class NoAppIdError extends Error {
+        constructor(){
+            super("No app ID provided. Cannot continue without an app ID.");
+        }
+    }
+    async function resolveAppAccount(repoPath, options = {}) {
+        const { appId: explicitAppId, url: explicitUrl, user: explicitUsername, useFirst = false } = options;
+        auth_setRepoContext(repoPath);
+        const detectedFromAllRemotes = await detectAppIdsFromAllRemotes(repoPath);
+        let filteredCandidates = filterCandidates(detectedFromAllRemotes, explicitUrl, explicitUsername);
+        logger_logger.verbose(external_chalk_default().cyan(`Detected ${detectedFromAllRemotes.length} app ID(s) from git remotes`));
+        if (filteredCandidates.length !== detectedFromAllRemotes.length) logger_logger.verbose(external_chalk_default().cyan(`After filtering: ${filteredCandidates.length} candidate(s)`));
+        let finalAppId;
+        let anvilUrl;
+        let username = explicitUsername;
+        let fallbackUrl;
+        let shouldPersistUsernameBinding = false;
+        if (explicitAppId) {
+            finalAppId = explicitAppId;
+            const binding = await getAppAuthBinding(repoPath, explicitAppId);
+            if (binding.url && !explicitUrl) {
+                anvilUrl = normalizeAnvilUrl(binding.url);
+                logger_logger.verbose(external_chalk_default().cyan("Resolved URL from binding for app ID: ") + external_chalk_default().bold(anvilUrl));
+            }
+            if (binding.username && !explicitUsername) {
+                username = binding.username;
+                logger_logger.verbose(external_chalk_default().cyan("Resolved username from binding for app ID: ") + external_chalk_default().bold(username));
+            }
+            const remoteInfo = lookupRemoteInfoForAppId(explicitAppId, detectedFromAllRemotes);
+            if (remoteInfo.detectedUrl && !explicitUrl && !anvilUrl) {
+                anvilUrl = normalizeAnvilUrl(remoteInfo.detectedUrl);
+                logger_logger.verbose(external_chalk_default().cyan("Resolved URL from remote for app ID: ") + external_chalk_default().bold(anvilUrl));
+            }
+            if (remoteInfo.detectedUsername && !explicitUsername && !username) {
+                username = remoteInfo.detectedUsername;
+                logger_logger.verbose(external_chalk_default().cyan("Resolved username from remote for app ID: ") + external_chalk_default().bold(username));
+            }
+        } else {
+            logger_logger.verbose(external_chalk_default().cyan("No app ID provided, attempting auto-detection..."));
+            if (0 === filteredCandidates.length) {
+                logger_logger.verbose(external_chalk_default().gray("No app IDs found in git remotes."));
+                const resolvedFallbackUrl = await resolveUrlForFallback(explicitUrl);
+                if (null === resolvedFallbackUrl) throw new AppAccountCancelledError();
+                fallbackUrl = normalizeAnvilUrl(resolvedFallbackUrl);
+                const lookupDecision = await confirmReverseLookupWithResolvedUser(fallbackUrl, username);
+                if (null === lookupDecision) throw new AppAccountCancelledError();
+                username = lookupDecision.username;
+                if (lookupDecision.shouldContinue) {
+                    logger_logger.progress("detect", `Searching ${fallbackUrl} ${username ? `for ${username}` : ""} for matching app IDs...`);
+                    const reverseLookupCandidates = await detectAppIdsByCommitLookup(repoPath, {
+                        anvilUrl: fallbackUrl,
+                        username,
+                        includeRemotes: false
+                    });
+                    logger_logger.progressEnd("detect");
+                    for (const c of reverseLookupCandidates)filteredCandidates.push({
+                        ...c,
+                        detectedUrl: fallbackUrl
+                    });
+                }
+            }
+            if (filteredCandidates.length > 0) {
+                for (const c of filteredCandidates)logger_logger.verbose(external_chalk_default().gray(`   Found: ${formatCandidateLabel(c)}`));
+                if (filteredCandidates.length > 1) logger_logger.verbose(external_chalk_default().yellow(`Found ${filteredCandidates.length} potential app IDs`));
+            }
+            if (useFirst && filteredCandidates.length > 0) {
+                const selected = filteredCandidates[0];
+                finalAppId = selected.appId;
+                if (selected.detectedUrl) anvilUrl = normalizeAnvilUrl(selected.detectedUrl);
+                if (selected.detectedUsername && !username) username = selected.detectedUsername;
+                logger_logger.success("Auto-selected first app ID: " + external_chalk_default().bold(finalAppId));
+            } else {
+                const selected = await selectAppId(filteredCandidates);
+                if (!selected) throw new NoAppIdError();
+                finalAppId = selected.appId;
+                if (selected.detectedUrl) anvilUrl = normalizeAnvilUrl(selected.detectedUrl);
+                if (selected.detectedUsername && !username) username = selected.detectedUsername;
+            }
+        }
+        const binding = await getAppAuthBinding(repoPath, finalAppId);
+        if (binding.url && !explicitUrl) {
+            anvilUrl = normalizeAnvilUrl(binding.url);
+            logger_logger.verbose(external_chalk_default().cyan("Using app binding URL: ") + external_chalk_default().bold(anvilUrl));
+        }
+        if (binding.username && !explicitUsername) {
+            username = binding.username;
+            logger_logger.verbose(external_chalk_default().cyan("Using app binding username: ") + external_chalk_default().bold(username));
+        }
+        shouldPersistUsernameBinding = !binding.username && !explicitUsername;
+        if (explicitUrl) anvilUrl = normalizeAnvilUrl(explicitUrl);
+        else if (!anvilUrl) if (fallbackUrl) anvilUrl = fallbackUrl;
+        else {
+            const resolvedFallbackUrl = await resolveUrlForFallback();
+            if (null === resolvedFallbackUrl) throw new AppAccountCancelledError();
+            anvilUrl = normalizeAnvilUrl(resolvedFallbackUrl);
+        }
+        anvilUrl = normalizeAnvilUrl(anvilUrl);
+        logger_logger.verbose(external_chalk_default().green("Using app ID: ") + external_chalk_default().bold(finalAppId));
+        logger_logger.verbose(external_chalk_default().cyan("Using Anvil URL: ") + external_chalk_default().bold(anvilUrl));
+        const resolvedUsername = await resolveUsernameForUrl(anvilUrl, username);
+        if (null === resolvedUsername) throw new AppAccountCancelledError();
+        username = resolvedUsername;
+        if (shouldPersistUsernameBinding && username && (await auth_getAccountsForUrl(anvilUrl)).length > 1) {
+            await setAppAuthBinding(repoPath, finalAppId, {
+                url: anvilUrl,
+                username
+            });
+            logger_logger.verbose(external_chalk_default().cyan("Saved app account binding for future non-interactive use."));
+        }
+        if (username) logger_logger.verbose(external_chalk_default().cyan("Using account: ") + external_chalk_default().bold(username));
+        return {
+            appId: finalAppId,
+            anvilUrl,
+            ...username ? {
+                username
+            } : {}
+        };
+    }
+    function addAppAccountOptions(command) {
+        return command.option("-A, --appid <APP_ID>", "Specify app ID directly").option("-u, --url <ANVIL_URL>", "Specify Anvil server URL (e.g., anvil.works, localhost)").option("-U, --user <USERNAME>", "Specify which user account to use");
+    }
+    function appAccountOptions(options) {
+        return {
+            appId: options.appid,
+            url: options.url,
+            user: options.user
+        };
+    }
+    const defaultConfigureWatchGitAuthDeps = {
+        configureCredentialHelperForUrl: configureCredentialHelperForUrl,
+        setAppAuthBinding: setAppAuthBinding
+    };
+    const defaultSyncStartDeps = {
+        pushToAnvil,
+        recreateSessionAndValidate,
+        recheckSyncStatus,
+        startWatchingWithEventHandlers
+    };
+    function resolveWatchOpenPath(repoPath) {
+        return external_path_default().resolve(repoPath);
+    }
+    async function openWatchPath(targetPath, deps) {
+        const preferredEditor = String(getConfig("preferredEditor") || "").trim();
+        const preferredEditorCommand = preferredEditor ? getPreferredEditorCommand(preferredEditor) : "";
+        await openPathInEditorOrDefault(targetPath, preferredEditorCommand, deps);
+        logger_logger.info(external_chalk_default().gray(`Opened ${targetPath}`));
+    }
+    async function configureWatchGitAuth(options, deps = defaultConfigureWatchGitAuthDeps) {
+        await deps.configureCredentialHelperForUrl(options.repoPath, options.anvilUrl);
+        await deps.setAppAuthBinding(options.repoPath, options.appId, {
+            url: options.anvilUrl,
+            username: options.username
+        });
+    }
+    function isStaleRemotePushError(message) {
+        const normalized = message.toLowerCase();
+        return normalized.includes("fetch first") || normalized.includes("non-fast-forward") || normalized.includes("failed to push some refs") || normalized.includes("remote contains work that you do") || normalized.includes("[rejected]");
+    }
     async function pushToAnvil(options) {
         try {
             const authToken = await auth_getValidAuthToken(options.anvilUrl, options.username);
@@ -22808,123 +23242,26 @@ print(json.dumps({"issues": issues}))
         try {
             const validationResult = await validateAnvilApp(repoPath);
             if (validationResult.appName) logger_logger.info(external_chalk_default().green("Anvil app: ") + external_chalk_default().bold(validationResult.appName));
-            const detectedFromAllRemotes = await detectAppIdsFromAllRemotes(repoPath);
-            let filteredCandidates = filterCandidates(detectedFromAllRemotes, explicitUrl, explicitUsername);
-            logger_logger.verbose(external_chalk_default().cyan(`Detected ${detectedFromAllRemotes.length} app ID(s) from git remotes`));
-            if (filteredCandidates.length !== detectedFromAllRemotes.length) logger_logger.verbose(external_chalk_default().cyan(`After filtering: ${filteredCandidates.length} candidate(s)`));
-            let finalAppId;
-            let anvilUrl;
-            let username = explicitUsername;
-            let fallbackUrl;
-            let shouldPersistUsernameBinding = false;
-            if (explicitAppId) {
-                finalAppId = explicitAppId;
-                const binding = await getAppAuthBinding(repoPath, explicitAppId);
-                if (binding.url && !explicitUrl) {
-                    anvilUrl = normalizeAnvilUrl(binding.url);
-                    logger_logger.verbose(external_chalk_default().cyan("Resolved URL from binding for app ID: ") + external_chalk_default().bold(anvilUrl));
-                }
-                if (binding.username && !explicitUsername) {
-                    username = binding.username;
-                    logger_logger.verbose(external_chalk_default().cyan("Resolved username from binding for app ID: ") + external_chalk_default().bold(username));
-                }
-                const remoteInfo = lookupRemoteInfoForAppId(explicitAppId, detectedFromAllRemotes);
-                if (remoteInfo.detectedUrl && !explicitUrl && !anvilUrl) {
-                    anvilUrl = normalizeAnvilUrl(remoteInfo.detectedUrl);
-                    logger_logger.verbose(external_chalk_default().cyan("Resolved URL from remote for app ID: ") + external_chalk_default().bold(anvilUrl));
-                }
-                if (remoteInfo.detectedUsername && !explicitUsername && !username) {
-                    username = remoteInfo.detectedUsername;
-                    logger_logger.verbose(external_chalk_default().cyan("Resolved username from remote for app ID: ") + external_chalk_default().bold(username));
-                }
-            } else {
-                logger_logger.verbose(external_chalk_default().cyan("No app ID provided, attempting auto-detection..."));
-                if (0 === filteredCandidates.length) {
-                    logger_logger.verbose(external_chalk_default().gray("No app IDs found in git remotes."));
-                    const resolvedFallbackUrl = await resolveUrlForFallback(explicitUrl);
-                    if (null === resolvedFallbackUrl) {
-                        logger_logger.warn("Operation cancelled.");
-                        process.exit(0);
-                    }
-                    fallbackUrl = normalizeAnvilUrl(resolvedFallbackUrl);
-                    const lookupDecision = await confirmReverseLookupWithResolvedUser(fallbackUrl, username);
-                    if (null === lookupDecision) {
-                        logger_logger.warn("Operation cancelled.");
-                        process.exit(0);
-                    }
-                    username = lookupDecision.username;
-                    if (lookupDecision.shouldContinue) {
-                        logger_logger.progress("detect", `Searching ${fallbackUrl} ${username ? `for ${username}` : ""} for matching app IDs...`);
-                        const reverseLookupCandidates = await detectAppIdsByCommitLookup(repoPath, {
-                            anvilUrl: fallbackUrl,
-                            username,
-                            includeRemotes: false
-                        });
-                        logger_logger.progressEnd("detect");
-                        for (const c of reverseLookupCandidates)filteredCandidates.push({
-                            ...c,
-                            detectedUrl: fallbackUrl
-                        });
-                    }
-                }
-                if (filteredCandidates.length > 0) {
-                    for (const c of filteredCandidates)logger_logger.verbose(external_chalk_default().gray(`   Found: ${formatCandidateLabel(c)}`));
-                    if (filteredCandidates.length > 1) logger_logger.verbose(external_chalk_default().yellow(`Found ${filteredCandidates.length} potential app IDs`));
-                }
-                if (useFirst && filteredCandidates.length > 0) {
-                    const selected = filteredCandidates[0];
-                    finalAppId = selected.appId;
-                    if (selected.detectedUrl) anvilUrl = normalizeAnvilUrl(selected.detectedUrl);
-                    if (selected.detectedUsername && !username) username = selected.detectedUsername;
-                    logger_logger.success("Auto-selected first app ID: " + external_chalk_default().bold(finalAppId));
-                } else {
-                    const selected = await selectAppId(filteredCandidates);
-                    if (!selected) {
-                        logger_logger.error("No app ID provided. Cannot continue without an app ID.");
-                        process.exit(1);
-                    }
-                    finalAppId = selected.appId;
-                    if (selected.detectedUrl) anvilUrl = normalizeAnvilUrl(selected.detectedUrl);
-                    if (selected.detectedUsername && !username) username = selected.detectedUsername;
-                }
-            }
-            const binding = await getAppAuthBinding(repoPath, finalAppId);
-            if (binding.url && !explicitUrl) {
-                anvilUrl = normalizeAnvilUrl(binding.url);
-                logger_logger.verbose(external_chalk_default().cyan("Using app binding URL: ") + external_chalk_default().bold(anvilUrl));
-            }
-            if (binding.username && !explicitUsername) {
-                username = binding.username;
-                logger_logger.verbose(external_chalk_default().cyan("Using app binding username: ") + external_chalk_default().bold(username));
-            }
-            shouldPersistUsernameBinding = !binding.username && !explicitUsername;
-            if (explicitUrl) anvilUrl = normalizeAnvilUrl(explicitUrl);
-            else if (!anvilUrl) if (fallbackUrl) anvilUrl = fallbackUrl;
-            else {
-                const resolvedFallbackUrl = await resolveUrlForFallback();
-                if (null === resolvedFallbackUrl) {
+            let account;
+            try {
+                account = await resolveAppAccount(repoPath, {
+                    appId: explicitAppId,
+                    url: explicitUrl,
+                    user: explicitUsername,
+                    useFirst
+                });
+            } catch (e) {
+                if (e instanceof AppAccountCancelledError) {
                     logger_logger.warn("Operation cancelled.");
                     process.exit(0);
                 }
-                anvilUrl = normalizeAnvilUrl(resolvedFallbackUrl);
-            }
-            anvilUrl = normalizeAnvilUrl(anvilUrl);
-            logger_logger.verbose(external_chalk_default().green("Using app ID: ") + external_chalk_default().bold(finalAppId));
-            logger_logger.verbose(external_chalk_default().cyan("Using Anvil URL: ") + external_chalk_default().bold(anvilUrl));
-            const resolvedUsername = await resolveUsernameForUrl(anvilUrl, username);
-            if (null === resolvedUsername) {
-                logger_logger.warn("Operation cancelled.");
-                process.exit(0);
-            }
-            username = resolvedUsername;
-            if (shouldPersistUsernameBinding && username && (await auth_getAccountsForUrl(anvilUrl)).length > 1) {
-                await setAppAuthBinding(repoPath, finalAppId, {
-                    url: anvilUrl,
-                    username
-                });
-                logger_logger.verbose(external_chalk_default().cyan("Saved app account binding for future non-interactive use."));
+                if (e instanceof NoAppIdError) {
+                    logger_logger.error(e.message);
+                    process.exit(1);
+                }
+                throw e;
             }
-            if (username) logger_logger.verbose(external_chalk_default().cyan("Using account: ") + external_chalk_default().bold(username));
+            const { appId: finalAppId, anvilUrl, username } = account;
             if (!await hasTokensForUrl(anvilUrl, username)) {
                 if (username) logger_logger.error(`Not logged in to ${anvilUrl} as ${username}`);
                 else logger_logger.error(`Not logged in to ${anvilUrl}`);
@@ -22981,7 +23318,7 @@ print(json.dumps({"issues": issues}))
         }
     }
     function registerWatchCommand(program) {
-        const watchCommand = program.command("watch [path]").description("Watch for file changes and sync to Anvil").alias("sync").alias("w").option("-A, --appid <APP_ID>", "Specify app ID directly").option("-f, --first", "Auto-select first detected app ID without confirmation").option("-s, --staged-only", "Only sync staged changes (use git add to stage files)").option("--no-dependency-watch", "Do not watch and refresh .anvil/deps dependencies").option("-a, --auto", "Auto mode: restart on branch changes and sync when behind").option("-O, --open", "Open watched path in preferred editor (or default app)").option("-u, --url <ANVIL_URL>", "Specify Anvil server URL (e.g., anvil.works, localhost)").option("-U, --user <USERNAME>", "Specify which user account to use").action(async (path, options, command)=>{
+        const watchCommand = addAppAccountOptions(program.command("watch [path]")).description("Watch for file changes and sync to Anvil").alias("sync").alias("w").option("-f, --first", "Auto-select first detected app ID without confirmation").option("-s, --staged-only", "Only sync staged changes (use git add to stage files)").option("--no-dependency-watch", "Do not watch and refresh .anvil/deps dependencies").option("-a, --auto", "Auto mode: restart on branch changes and sync when behind").option("-O, --open", "Open watched path in preferred editor (or default app)").action(async (path, options, command)=>{
             const globalOptions = command.optsWithGlobals();
             if (void 0 !== globalOptions.verbose && logger_logger instanceof CLILogger) logger_logger.setVerbose(globalOptions.verbose);
             await handleWatchCommand({
@@ -23595,33 +23932,19 @@ print(json.dumps({"issues": issues}))
             }
         });
     }
-    async function resolvePrimaryAppId(projectRoot, anvilUrl) {
-        const remoteCandidates = await detectAppIdsFromAllRemotes(projectRoot);
-        if (remoteCandidates.length > 0) return remoteCandidates[0].appId;
-        const lookupCandidates = await detectAppIdsByCommitLookup(projectRoot, {
-            anvilUrl,
-            includeRemotes: false
-        });
-        return lookupCandidates[0]?.appId ?? null;
-    }
     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)=>{
+        addAppAccountOptions(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();
-                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");
-                    logger_logger.info("Make sure you're in a directory with an Anvil app git remote.");
-                    process.exit(1);
-                }
+                const { appId: mainAppId, anvilUrl, username } = await resolveAppAccount(projectRoot, appAccountOptions(options));
                 logger_logger.info(`Fetching dependencies for app ${mainAppId}...`);
                 const { response, addedGitignoreEntry } = await refreshDependencyCache(projectRoot, mainAppId, anvilUrl, {
+                    username,
                     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)`);
@@ -23658,7 +23981,7 @@ print(json.dumps({"issues": issues}))
         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 token = await auth_getValidAuthToken(anvilUrl, options.username);
         const response = await fetch(`${anvilUrl}/ide/api/_/apps/${appId}/db/infer-from-env/apply-schema`, {
             method: "PUT",
             headers: {
@@ -23681,16 +24004,14 @@ print(json.dumps({"issues": issues}))
     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)=>{
+        addAppAccountOptions(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.");
+                const { appId, anvilUrl, username } = await resolveAppAccount(projectRoot, appAccountOptions(options));
                 if (!await confirmSchemaApplication(options.force)) return void logger_logger.info("Schema application cancelled.");
                 const response = await applyDatabaseSchema(appId, {
                     anvilUrl,
+                    username,
                     projectRoot
                 });
                 if (getGlobalOutputConfig().jsonMode) logJsonResult(true, {
@@ -23709,7 +24030,7 @@ print(json.dumps({"issues": issues}))
     }
     async function ensureEnvironmentUrl(appId, envPid, options = {}) {
         const anvilUrl = options.anvilUrl ?? await resolveAuthAnvilUrl();
-        const token = await auth_getValidAuthToken(anvilUrl);
+        const token = await auth_getValidAuthToken(anvilUrl, options.username);
         const response = await fetch(`${anvilUrl}/ide/api/_/apps/${encodeURIComponent(appId)}/environments/${encodeURIComponent(envPid)}/temporary-url`, {
             method: "POST",
             headers: {
@@ -23725,7 +24046,7 @@ print(json.dumps({"issues": issues}))
     }
     async function getTemporaryUplinkKey(appId, envPid, options = {}) {
         const anvilUrl = options.anvilUrl ?? await resolveAuthAnvilUrl();
-        const token = await auth_getValidAuthToken(anvilUrl);
+        const token = await auth_getValidAuthToken(anvilUrl, options.username);
         const response = await fetch(`${anvilUrl}/ide/api/_/apps/${encodeURIComponent(appId)}/environments/${encodeURIComponent(envPid)}/temporary-uplink-key`, {
             method: "POST",
             headers: {
@@ -23740,28 +24061,29 @@ print(json.dumps({"issues": issues}))
             expires_at
         };
     }
-    async function resolveEnvironmentContext() {
+    async function resolveEnvironmentContext(options = {}) {
         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.");
+        const { appId, anvilUrl, username } = await resolveAppAccount(projectRoot, options);
         return {
             envPid,
             anvilUrl,
-            appId
+            appId,
+            ...username ? {
+                username
+            } : {}
         };
     }
     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 ()=>{
+        addAppAccountOptions(env.command("url")).description("Get a temporary private app URL for the current environment").action(async (options)=>{
             try {
-                const { appId, envPid, anvilUrl } = await resolveEnvironmentContext();
+                const { appId, envPid, anvilUrl, username } = await resolveEnvironmentContext(appAccountOptions(options));
                 const { url, expires_at } = await ensureEnvironmentUrl(appId, envPid, {
-                    anvilUrl
+                    anvilUrl,
+                    username
                 });
                 if (getGlobalOutputConfig().jsonMode) logJsonResult(true, {
                     data: {
@@ -23779,11 +24101,12 @@ print(json.dumps({"issues": issues}))
                 process.exit(1);
             }
         });
-        env.command("uplink").description("Get a temporary uplink key for the current environment").action(async ()=>{
+        addAppAccountOptions(env.command("uplink")).description("Get a temporary uplink key for the current environment").action(async (options)=>{
             try {
-                const { appId, envPid, anvilUrl } = await resolveEnvironmentContext();
+                const { appId, envPid, anvilUrl, username } = await resolveEnvironmentContext(appAccountOptions(options));
                 const { key, url, expires_at } = await getTemporaryUplinkKey(appId, envPid, {
-                    anvilUrl
+                    anvilUrl,
+                    username
                 });
                 if (getGlobalOutputConfig().jsonMode) logJsonResult(true, {
                     data: {
@@ -23833,7 +24156,7 @@ print(json.dumps({"issues": issues}))
     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 token = await auth_getValidAuthToken(anvilUrl, options.username);
         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();
@@ -23982,16 +24305,16 @@ print(json.dumps({"issues": issues}))
     }
     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", `
+        addAppAccountOptions(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)=>{
+`).action(async (code, options)=>{
             const controller = new AbortController();
             const onInterrupt = ()=>controller.abort();
             try {
-                const { appId, envPid, anvilUrl } = await resolveEnvironmentContext();
+                const { appId, envPid, anvilUrl, username } = await resolveEnvironmentContext(appAccountOptions(options));
                 if ("-" === code) {
                     const chunks = [];
                     for await (const chunk of process.stdin)chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
@@ -24001,6 +24324,7 @@ Examples:
                 const response = await runRepl(appId, envPid, {
                     code,
                     anvilUrl,
+                    username,
                     signal: controller.signal,
                     onOutput: getGlobalOutputConfig().jsonMode ? writeJsonReplOutput : (output)=>{
                         process.stdout.write(output);
@@ -24029,6 +24353,714 @@ Examples:
             }
         });
     }
+    const external_yaml_namespaceObject = require("yaml");
+    async function encryptSecret(appId, secretName, options = {}) {
+        const anvilUrl = options.anvilUrl ?? await resolveAuthAnvilUrl();
+        const token = await auth_getValidAuthToken(anvilUrl, options.username);
+        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
+                }
+            })
+        });
+        if (!response.ok) throw new Error(formatHttpError("Failed to set secret", response.status, await response.text()));
+        return await response.json();
+    }
+    async function generateSecretKey(appId, keyName, options = {}) {
+        const anvilUrl = options.anvilUrl ?? await resolveAuthAnvilUrl();
+        const token = await auth_getValidAuthToken(anvilUrl, options.username);
+        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 registerSecretCommand(program) {
+        if ("1" !== process.env.ANVIL_AGENT_HOST) return;
+        const secret = program.command("secret").description("Manage app secrets");
+        addAppAccountOptions(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 { appId, anvilUrl, username } = await resolveAppAccount(projectRoot, appAccountOptions(options));
+                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,
+                    username,
+                    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);
+            }
+        });
+        addAppAccountOptions(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 {
+                const projectRoot = process.cwd();
+                const { appId, anvilUrl, username } = await resolveAppAccount(projectRoot, appAccountOptions(options));
+                const overwrite = await confirmOverwriteIfExists(projectRoot, name, {
+                    appId,
+                    type: "key",
+                    force: options.force
+                });
+                const response = await generateSecretKey(appId, name, {
+                    anvilUrl,
+                    username
+                });
+                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 REORDER_WAIT_MS = 200;
+    const LATE_OUTPUT_QUIET_MS = 500;
+    const LATE_OUTPUT_MAX_MS = 3000;
+    const CANCEL_WAIT_MS = 5000;
+    class ServerTestsError extends Error {
+    }
+    class InterruptedError extends Error {
+    }
+    function serverErrorMessage(error) {
+        if (error && "object" == typeof error) {
+            const value = error;
+            return String(value.message ?? value["anvil/server-error"] ?? JSON.stringify(value));
+        }
+        return String(error);
+    }
+    class OrderedLog {
+        write;
+        nextSeq = 1;
+        held = new Map();
+        timer;
+        constructor(write){
+            this.write = write;
+        }
+        add(seq, text) {
+            if ("number" != typeof seq || seq < this.nextSeq) return void this.write(text);
+            this.held.set(seq, text);
+            while(this.held.has(this.nextSeq)){
+                const next = this.held.get(this.nextSeq);
+                this.held.delete(this.nextSeq);
+                this.nextSeq++;
+                this.write(next);
+            }
+            if (0 === this.held.size) {
+                clearTimeout(this.timer);
+                this.timer = void 0;
+            } else this.timer ??= setTimeout(()=>{
+                this.timer = void 0;
+                this.flush();
+            }, REORDER_WAIT_MS);
+        }
+        flush() {
+            clearTimeout(this.timer);
+            this.timer = void 0;
+            for (const seq of [
+                ...this.held.keys()
+            ].sort((a, b)=>a - b)){
+                this.write(this.held.get(seq));
+                this.nextSeq = seq + 1;
+            }
+            this.held.clear();
+        }
+    }
+    async function runServerTests(appId, options) {
+        const anvilUrl = options.anvilUrl ?? await resolveAuthAnvilUrl();
+        const token = await auth_getValidAuthToken(anvilUrl, options.username);
+        const url = new URL(`${anvilUrl.replace(/\/$/, "")}/ide/api/_/apps/${encodeURIComponent(appId)}/ws`);
+        url.protocol = "https:" === url.protocol ? "wss:" : "ws:";
+        if (options.signal?.aborted) throw new InterruptedError("Interrupted.");
+        const ws = new (external_ws_default())(url, {
+            headers: {
+                Authorization: `Bearer ${token}`
+            },
+            handshakeTimeout: 30000
+        });
+        const controller = new AbortController();
+        const replies = new Map();
+        let nextId = 1;
+        let runId;
+        let sessionId;
+        let launchMessage = "";
+        let cancelId;
+        let keepalive;
+        let pongTimeout;
+        let closeTimeout;
+        const unmatchedLogs = new Map();
+        const runLog = new OrderedLog((text)=>{
+            if (text) options.onOutput?.(text);
+        });
+        let onRunLogEvent;
+        const fail = (error)=>controller.abort(error);
+        const connectionLost = (detail)=>runId ? new Error(`Lost connection to Anvil. The test run (${runId}) may still be running.`) : new Error(`Lost connection to Anvil (${detail}).`);
+        const markResponsive = ()=>{
+            clearTimeout(pongTimeout);
+            pongTimeout = void 0;
+        };
+        function addRunLog(message) {
+            runLog.add(message.seq, "print" === message.type && "string" == typeof message.log_text ? message.log_text : void 0);
+        }
+        function setSession(id) {
+            if (sessionId || "string" != typeof id || !id) return;
+            sessionId = id;
+            for (const message of unmatchedLogs.get(id) ?? [])addRunLog(message);
+            unmatchedLogs.clear();
+        }
+        function handleMessage(raw) {
+            markResponsive();
+            let message;
+            try {
+                message = JSON.parse(raw.toString());
+                if (!message || "object" != typeof message || Array.isArray(message)) throw new Error("Expected an object");
+            } catch  {
+                fail(new Error("Invalid message from Anvil."));
+                return;
+            }
+            if ("number" == typeof message.id) {
+                if (message.error && message.id !== cancelId) return void fail(new ServerTestsError(serverErrorMessage(message.error)));
+                const resolve = replies.get(message.id);
+                replies.delete(message.id);
+                resolve?.(message);
+                return;
+            }
+            switch(message.event){
+                case "LOG_EVENT":
+                    if ("string" != typeof message.session_id) return;
+                    if (sessionId) {
+                        if (message.session_id !== sessionId) return;
+                        addRunLog(message);
+                        onRunLogEvent?.();
+                    } else {
+                        const logs = unmatchedLogs.get(message.session_id) ?? [];
+                        logs.push(message);
+                        unmatchedLogs.set(message.session_id, logs);
+                    }
+                    return;
+                case "TEST_EVENT":
+                    {
+                        if (!runId || message.run_id !== runId) return;
+                        setSession(message.session_id);
+                        const testEvent = message.test_event;
+                        if (testEvent?.type === "test_run_update" && "string" == typeof testEvent.launch_message) {
+                            const text = testEvent.launch_message;
+                            const added = text.startsWith(launchMessage) ? text.slice(launchMessage.length) : text;
+                            launchMessage = text;
+                            if (added) options.onLaunchMessage?.(added);
+                        }
+                        return;
+                    }
+            }
+        }
+        function send(message) {
+            const id = nextId++;
+            ws.send(JSON.stringify({
+                id,
+                ...message
+            }), (error)=>{
+                if (error) fail(connectionLost(`send failed: ${error.message}`));
+            });
+            return id;
+        }
+        function reply(id) {
+            const signal = controller.signal;
+            return new Promise((resolve, reject)=>{
+                if (signal.aborted) return void reject(signal.reason);
+                const onAbort = ()=>{
+                    replies.delete(id);
+                    reject(signal.reason);
+                };
+                signal.addEventListener("abort", onAbort, {
+                    once: true
+                });
+                replies.set(id, (message)=>{
+                    signal.removeEventListener("abort", onAbort);
+                    resolve(message);
+                });
+            });
+        }
+        const request = (message)=>reply(send(message));
+        async function cancel(waited) {
+            let cancelTimeout;
+            let confirmed = false;
+            try {
+                cancelId = send({
+                    cmd: "CANCEL_SERVER_TEST_RUN",
+                    run_id: runId
+                });
+                const answer = await Promise.race([
+                    reply(cancelId),
+                    waited,
+                    new Promise((_, reject)=>{
+                        cancelTimeout = setTimeout(()=>reject(new Error("Timed out")), CANCEL_WAIT_MS);
+                    })
+                ]);
+                confirmed = !answer.error;
+            } catch  {} finally{
+                clearTimeout(cancelTimeout);
+            }
+            runLog.flush();
+            throw new InterruptedError(confirmed ? `Cancelled the test run (${runId}).` : `Couldn't confirm that the test run (${runId}) was cancelled. It may still be running.`);
+        }
+        async function readLateOutput() {
+            await new Promise((resolve)=>{
+                let quietTimeout;
+                const done = ()=>{
+                    clearTimeout(quietTimeout);
+                    clearTimeout(maxTimeout);
+                    onRunLogEvent = void 0;
+                    controller.signal.removeEventListener("abort", done);
+                    options.signal?.removeEventListener("abort", done);
+                    resolve();
+                };
+                const resetQuiet = ()=>{
+                    clearTimeout(quietTimeout);
+                    quietTimeout = setTimeout(done, LATE_OUTPUT_QUIET_MS);
+                };
+                const maxTimeout = setTimeout(done, LATE_OUTPUT_MAX_MS);
+                onRunLogEvent = resetQuiet;
+                resetQuiet();
+                controller.signal.addEventListener("abort", done, {
+                    once: true
+                });
+                options.signal?.addEventListener("abort", done, {
+                    once: true
+                });
+            });
+            runLog.flush();
+        }
+        const onAbort = ()=>fail(new InterruptedError("Interrupted."));
+        ws.on("pong", markResponsive);
+        ws.on("unexpected-response", (request, response)=>{
+            response.resume();
+            fail(new Error(`Couldn't connect to Anvil (${response.statusCode} ${response.statusMessage}).`));
+            request.destroy();
+        });
+        ws.on("error", (error)=>fail(connectionLost(error.message)));
+        ws.on("close", (code, reason)=>{
+            clearTimeout(closeTimeout);
+            fail(connectionLost(`code ${code}${reason.length ? `: ${reason}` : ""}`));
+        });
+        ws.on("message", handleMessage);
+        try {
+            options.signal?.addEventListener("abort", onAbort, {
+                once: true
+            });
+            await new Promise((resolve, reject)=>{
+                ws.once("open", ()=>resolve());
+                controller.signal.addEventListener("abort", ()=>reject(controller.signal.reason), {
+                    once: true
+                });
+            });
+            keepalive = setInterval(()=>{
+                pongTimeout ??= setTimeout(()=>fail(connectionLost("heartbeat timed out")), 10000);
+                ws.ping();
+            }, 20000);
+            await request({
+                cmd: "WATCH_APP",
+                app: appId,
+                only_branch: options.branch
+            });
+            const launched = await request({
+                cmd: "RUN_SERVER_TESTS",
+                commit_id: options.commitId,
+                ...options.selection ? {
+                    selection: options.selection
+                } : {},
+                ...options.collectOnly ? {
+                    collect_only: true
+                } : {}
+            });
+            if ("string" != typeof launched.run_id || !launched.run_id) throw new Error("Invalid response from Anvil: missing test run ID.");
+            runId = launched.run_id;
+            options.onRunCreated?.(runId);
+            options.signal?.removeEventListener("abort", onAbort);
+            const interrupted = new Promise((resolve)=>{
+                if (options.signal?.aborted) resolve();
+                options.signal?.addEventListener("abort", ()=>resolve(), {
+                    once: true
+                });
+            });
+            const watchId = send({
+                cmd: "WATCH_APP",
+                app: appId,
+                only_branch: options.branch,
+                test_run_ids: [
+                    runId
+                ]
+            });
+            const waitId = send({
+                cmd: "WAIT_FOR_SERVER_TEST_RUN",
+                run_id: runId
+            });
+            reply(watchId).catch(()=>{});
+            const waited = reply(waitId);
+            const done = await Promise.race([
+                waited,
+                interrupted.then(()=>void 0)
+            ]);
+            if (!done) return await cancel(waited);
+            setSession(done.session_id);
+            if (!sessionId) unmatchedLogs.clear();
+            await readLateOutput();
+            return {
+                runId,
+                ...sessionId ? {
+                    sessionId
+                } : {},
+                state: done.state ?? {}
+            };
+        } catch (error) {
+            if (error instanceof InterruptedError) throw error;
+            const failure = controller.signal.aborted ? controller.signal.reason : error;
+            throw failure instanceof Error ? failure : new Error(String(failure));
+        } finally{
+            clearInterval(keepalive);
+            clearTimeout(pongTimeout);
+            runLog.flush();
+            options.signal?.removeEventListener("abort", onAbort);
+            controller.abort();
+            if (ws.readyState === external_ws_default().OPEN) 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();
+            }
+        }
+    }
+    const PYTEST_EXIT_CODES = {
+        OK: 0,
+        TESTS_FAILED: 1,
+        INTERRUPTED: 2,
+        INTERNAL_ERROR: 3,
+        USAGE_ERROR: 4,
+        NO_TESTS_COLLECTED: 5
+    };
+    class UsageError extends Error {
+    }
+    function toServerTestTarget(target, options) {
+        const separator = target.indexOf("::");
+        const targetPath = -1 === separator ? target : target.slice(0, separator);
+        const suffix = -1 === separator ? "" : target.slice(separator);
+        const absolutePath = external_path_default().resolve(options.cwd, targetPath);
+        const serverTestsPath = external_path_default().relative(external_path_default().join(options.appRoot, "tests", "server_tests"), absolutePath);
+        if (external_path_default().isAbsolute(serverTestsPath) || ".." === serverTestsPath || serverTestsPath.startsWith(`..${external_path_default().sep}`)) throw new UsageError(`${target} isn't in tests/server_tests.`);
+        return external_path_default().relative(external_path_default().join(options.appRoot, "tests"), absolutePath).split(external_path_default().sep).join("/") + suffix;
+    }
+    async function checkCommitOnAnvil(git, options) {
+        const notOnAnvil = ()=>new Error(`Commit ${options.commitId.slice(0, 7)} isn't on Anvil. Push ${options.branch} first.`);
+        try {
+            await git.fetch(options.fetchUrl, `refs/heads/${options.branch}`);
+        } catch (error) {
+            const message = errors_getErrorMessage(error);
+            if (/couldn't find remote ref/i.test(message)) throw notOnAnvil();
+            throw new Error(message.replace(/\/\/git:[^@\s]*@/g, "//git:***@"));
+        }
+        if (!await git.isAncestor(options.commitId, "FETCH_HEAD")) throw notOnAnvil();
+    }
+    async function getBranch(git) {
+        try {
+            return await git.getCurrentBranch();
+        } catch  {
+            throw new Error("HEAD isn't on a branch. Check out the branch you've pushed to Anvil.");
+        }
+    }
+    async function runTestCommand(targets, options) {
+        const jsonMode = getGlobalOutputConfig().jsonMode;
+        const controller = new AbortController();
+        let runId;
+        let interrupted = false;
+        let outputEndsLine = true;
+        const writeOutput = (text)=>{
+            process.stdout.write(text);
+            outputEndsLine = text.endsWith("\n");
+        };
+        const writeJsonResult = (...args)=>{
+            if (!outputEndsLine) writeOutput("\n");
+            logJsonResult(...args);
+        };
+        const onInterrupt = ()=>{
+            if (interrupted) process.exit(130);
+            interrupted = true;
+            if (runId) process.stderr.write("\nCancelling test run...\n");
+            controller.abort();
+        };
+        try {
+            const projectRoot = process.cwd();
+            const git = new GitService(projectRoot);
+            let appRoot;
+            try {
+                appRoot = external_path_default().resolve(projectRoot, (await git.getGit().revparse([
+                    "--show-cdup"
+                ])).trim());
+            } catch  {
+                throw new Error("No Anvil app found in current directory. Make sure you're in a directory with an Anvil app git remote.");
+            }
+            const testTargets = targets.map((target)=>toServerTestTarget(target, {
+                    appRoot,
+                    cwd: projectRoot
+                }));
+            const selection = {
+                ...testTargets.length > 0 ? {
+                    test_targets: testTargets
+                } : {},
+                ...void 0 !== options.k ? {
+                    keyword_expression: options.k
+                } : {}
+            };
+            const { appId, anvilUrl, username } = await resolveAppAccount(projectRoot, appAccountOptions(options));
+            const branch = await getBranch(git);
+            const commitId = await git.getCommitId();
+            const authToken = await auth_getValidAuthToken(anvilUrl, username);
+            await checkCommitOnAnvil(git, {
+                fetchUrl: getGitFetchUrl(appId, authToken, anvilUrl),
+                branch,
+                commitId
+            });
+            if (await git.hasUncommittedChanges()) process.stderr.write(`You have uncommitted changes, which won't be included in the test run.\n`);
+            process.on("SIGINT", onInterrupt);
+            const { runId: completedRunId, state } = await runServerTests(appId, {
+                commitId,
+                branch,
+                ...Object.keys(selection).length > 0 ? {
+                    selection
+                } : {},
+                collectOnly: options.collectOnly,
+                anvilUrl,
+                username,
+                signal: controller.signal,
+                onOutput: writeOutput,
+                onLaunchMessage: (text)=>{
+                    process.stderr.write(text);
+                },
+                onRunCreated: (id)=>{
+                    runId = id;
+                }
+            });
+            const exitCode = state.exit_code ? PYTEST_EXIT_CODES[state.exit_code] ?? 1 : 1;
+            if (state.error?.message) process.stderr.write(`${state.error.message}\n`);
+            else if (!state.exit_code) process.stderr.write("The test run ended without a result.\n");
+            if (jsonMode) {
+                let snapshot;
+                try {
+                    snapshot = await getTestRunSnapshot(appId, completedRunId, {
+                        anvilUrl,
+                        username
+                    });
+                } catch (error) {
+                    writeJsonResult(false, {
+                        error: errors_getErrorMessage(error)
+                    });
+                    process.exitCode = 1;
+                    return;
+                }
+                const success = "OK" === state.exit_code || !!options.collectOnly && "NO_TESTS_COLLECTED" === state.exit_code;
+                writeJsonResult(success, {
+                    data: snapshot
+                });
+            }
+            process.exitCode = exitCode;
+        } catch (error) {
+            const message = errors_getErrorMessage(error);
+            if (jsonMode) writeJsonResult(false, {
+                error: message
+            });
+            else process.stderr.write(`${message}\n`);
+            process.exitCode = controller.signal.aborted ? 130 : error instanceof UsageError ? PYTEST_EXIT_CODES.USAGE_ERROR : 1;
+        } finally{
+            process.removeListener("SIGINT", onInterrupt);
+        }
+    }
+    function registerTestCommand(program) {
+        addAppAccountOptions(program.command("test")).description("Run the app's tests on Anvil, against the commit you have checked out").argument("[targets...]", "Test paths or pytest node IDs, relative to your current directory").option("-k <expression>", "Only run tests that match the pytest keyword expression").option("--collect-only", "List the tests without running them").addHelpText("after", `
+The commit you have checked out must already be pushed to Anvil.
+The exit code is the same as pytest: 0 if every test passed, 1 if any failed.
+
+Examples:
+  anvil test
+  anvil test tests/server_tests/test_orders.py::test_refund
+  anvil test -k "login and not slow"
+  anvil --json test
+`).action(async (targets, options)=>{
+            await runTestCommand(targets, options);
+        });
+    }
     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({
@@ -24440,6 +25472,7 @@ Examples:
         });
         const watchCommand = registerWatchCommand(program);
         registerCheckoutCommand(program);
+        registerCreateCommand(program);
         registerGitAuthCommand(program);
         registerGitCredentialCommand(program);
         registerLoginCommand(program);
@@ -24452,6 +25485,8 @@ Examples:
         registerDbCommand(program);
         registerEnvCommand(program);
         registerReplCommand(program);
+        registerSecretCommand(program);
+        registerTestCommand(program);
         program.command("update").description("Update anvil to the latest version").alias("u").action(async ()=>{
             await handleUpdateCommand();
         });