@supatype/cli 0.3.0 → 0.3.1

package/dist/commands/keys.d.ts

@@ -1,5 +1,40 @@
 import type { Command } from "commander";
 export declare function registerKeys(program: Command): void;
+/**
+ * Every env name a minted key pair is written to, in one place.
+ *
+ * Shared with `supatype dev`, which writes the same pair when it starts a stack. They used to hold
+ * separate lists, so a front end's prefix could be written by one and forgotten by the other, and
+ * which names your `.env` ended up with depended on whichever command you happened to run last.
+ *
+ * The URL names are only included when there is a URL to write, because an empty
+ * `VITE_SUPATYPE_URL` is worse than an absent one: the client reads it, finds a blank string, and
+ * requests against the page origin without saying why.
+ */
+export declare function anonKeyEnvUpdates(anonKey: string, serviceKey: string, apiUrl?: string | undefined): Record<string, string>;
+export interface WriteKeysResult {
+    /** The .env written, or null when there is none here. */
+    path: string | null;
+    written: string[];
+    kept: string[];
+}
+/**
+ * Write a minted pair into `dir`'s .env.
+ *
+ * Blanks only by default. An anon key already in `.env` is held by clients this command cannot
+ * reach, and reissuing it locks them out, so filling what is empty is the useful half and
+ * replacing what is not is a decision someone has to make out loud. `--force` is how they make it,
+ * and it rewrites every name this owns rather than only the empty ones.
+ *
+ * `--force` does not rewrite the file. `.env` also holds `JWT_SECRET`, which these keys are
+ * derived from, along with the database password and whatever else the project keeps there;
+ * replacing the file would leave a project whose keys cannot be regenerated and whose stack cannot
+ * start. Every line this command does not own is left exactly as it was, comments included.
+ */
+export declare function writeKeysToEnv(dir: string, keys: {
+    anonKey: string;
+    serviceKey: string;
+}, force: boolean): WriteKeysResult;
 /** Mint a long-lived anon + service_role JWT pair from a secret. */
 export declare function signKeyPair(secret: string, expYears?: number): {
     anonKey: string;

package/dist/commands/keys.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"keys.d.ts","sourceRoot":"","sources":["../../src/commands/keys.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAMxC,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA8BnD;AAID,oEAAoE;AACpE,wBAAgB,WAAW,CACzB,MAAM,EAAE,MAAM,EACd,QAAQ,SAAK,GACZ;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAOzC;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,MAAM,EACX,QAAQ,SAAK,GACZ;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAuBhD;AAiBD,wBAAgB,aAAa,CAAC,GAAG,GAAE,MAAsB,GAAG,MAAM,GAAG,SAAS,CAsB7E;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,SAAK,GAAG,MAAM,EAAE,CAyBpE"}
+{"version":3,"file":"keys.d.ts","sourceRoot":"","sources":["../../src/commands/keys.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAOxC,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAmDnD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,GAC1B,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAaxB;AAED,MAAM,WAAW,eAAe;IAC9B,yDAAyD;IACzD,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IACnB,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,IAAI,EAAE,MAAM,EAAE,CAAA;CACf;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,MAAM,EACX,IAAI,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,EAC7C,KAAK,EAAE,OAAO,GACb,eAAe,CAsBjB;AAID,oEAAoE;AACpE,wBAAgB,WAAW,CACzB,MAAM,EAAE,MAAM,EACd,QAAQ,SAAK,GACZ;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAOzC;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,MAAM,EACX,QAAQ,SAAK,GACZ;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAuBhD;AAsBD,wBAAgB,aAAa,CAAC,GAAG,GAAE,MAAsB,GAAG,MAAM,GAAG,SAAS,CAsB7E;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,SAAK,GAAG,MAAM,EAAE,CAyBpE"}

package/dist/commands/keys.js

@@ -1,5 +1,6 @@
-import { readFileSync, existsSync, writeFileSync } from "node:fs";
+import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { resolve } from "node:path";
+import { readEnvFile, upsertEnvFile } from "../env-file.js";
 import { signJwt } from "../jwt.js";
 import { error, plain } from "../ui/messages.js";
 export function registerKeys(program) {
@@ -8,6 +9,8 @@ export function registerKeys(program) {
         .description("Generate ANON_KEY and SERVICE_ROLE_KEY JWTs from your JWT_SECRET")
         .option("--secret <secret>", "JWT secret (defaults to JWT_SECRET env var or value in .env)")
         .option("--exp-years <years>", "Token expiry in years (default: 10)", "10")
+        .option("--write", "Write the keys into .env in the current directory instead of printing them")
+        .option("--force", "With --write, replace every key already in .env rather than filling blanks")
         .action((opts) => {
         const secret = opts.secret ?? resolveSecret();
         if (!secret) {
@@ -19,16 +22,93 @@ export function registerKeys(program) {
             error("--exp-years must be a positive integer");
             process.exit(1);
         }
-        const now = Math.floor(Date.now() / 1000);
-        const exp = now + expYears * 365 * 24 * 60 * 60;
-        const anonKey = signJwt({ iss: "supatype", role: "anon", iat: now, exp }, secret);
-        const serviceKey = signJwt({ iss: "supatype", role: "service_role", iat: now, exp }, secret);
+        const { anonKey, serviceKey } = signKeyPair(secret, expYears);
+        if (opts.write) {
+            const written = writeKeysToEnv(process.cwd(), { anonKey, serviceKey }, opts.force === true);
+            if (written.path === null) {
+                error("No .env here to write to. Create one, or drop --write to print the keys.");
+                process.exit(1);
+            }
+            plain(`\nKeys valid for ${expYears} years, written to ${written.path}:\n`);
+            // The names come back from the writer rather than being restated here, which is the whole
+            // point of there being one list.
+            for (const key of written.written)
+                plain(`  ${key}`);
+            if (written.kept.length > 0) {
+                plain(`\nLeft alone, because they already hold a value:\n`);
+                for (const key of written.kept)
+                    plain(`  ${key}`);
+                plain("\nRe-run with --force to replace them.");
+            }
+            plain("\nDo not commit .env to source control.");
+            return;
+        }
         plain(`\nGenerated keys (valid for ${expYears} years):\n`);
         plain("ANON_KEY=" + anonKey);
         plain("SERVICE_ROLE_KEY=" + serviceKey);
-        plain("\nAdd these to your .env file. Do not commit .env to source control.");
+        plain("\nAdd these to your .env file, or re-run with --write. Do not commit .env to source control.");
     });
 }
+/**
+ * Every env name a minted key pair is written to, in one place.
+ *
+ * Shared with `supatype dev`, which writes the same pair when it starts a stack. They used to hold
+ * separate lists, so a front end's prefix could be written by one and forgotten by the other, and
+ * which names your `.env` ended up with depended on whichever command you happened to run last.
+ *
+ * The URL names are only included when there is a URL to write, because an empty
+ * `VITE_SUPATYPE_URL` is worse than an absent one: the client reads it, finds a blank string, and
+ * requests against the page origin without saying why.
+ */
+export function anonKeyEnvUpdates(anonKey, serviceKey, apiUrl) {
+    return {
+        ANON_KEY: anonKey,
+        SERVICE_ROLE_KEY: serviceKey,
+        VITE_SUPATYPE_ANON_KEY: anonKey,
+        PUBLIC_SUPATYPE_ANON_KEY: anonKey,
+        EXPO_PUBLIC_SUPATYPE_ANON_KEY: anonKey,
+        ...(apiUrl !== undefined && {
+            VITE_SUPATYPE_URL: apiUrl,
+            PUBLIC_SUPATYPE_URL: apiUrl,
+            EXPO_PUBLIC_SUPATYPE_URL: apiUrl,
+        }),
+    };
+}
+/**
+ * Write a minted pair into `dir`'s .env.
+ *
+ * Blanks only by default. An anon key already in `.env` is held by clients this command cannot
+ * reach, and reissuing it locks them out, so filling what is empty is the useful half and
+ * replacing what is not is a decision someone has to make out loud. `--force` is how they make it,
+ * and it rewrites every name this owns rather than only the empty ones.
+ *
+ * `--force` does not rewrite the file. `.env` also holds `JWT_SECRET`, which these keys are
+ * derived from, along with the database password and whatever else the project keeps there;
+ * replacing the file would leave a project whose keys cannot be regenerated and whose stack cannot
+ * start. Every line this command does not own is left exactly as it was, comments included.
+ */
+export function writeKeysToEnv(dir, keys, force) {
+    const envPath = resolve(dir, ".env");
+    if (!existsSync(envPath))
+        return { path: null, written: [], kept: [] };
+    const existing = readEnvFile(dir);
+    const apiUrl = existing["PUBLIC_SUPATYPE_URL"] || existing["API_EXTERNAL_URL"] || undefined;
+    const candidates = anonKeyEnvUpdates(keys.anonKey, keys.serviceKey, apiUrl);
+    const updates = {};
+    const kept = [];
+    for (const [name, value] of Object.entries(candidates)) {
+        // Blank counts as absent: a template ships `ANON_KEY=` and that is exactly the line to fill.
+        const current = existing[name]?.trim() ?? "";
+        if (!force && current !== "") {
+            kept.push(name);
+            continue;
+        }
+        updates[name] = value;
+    }
+    if (Object.keys(updates).length > 0)
+        upsertEnvFile(dir, updates);
+    return { path: envPath, written: Object.keys(updates), kept };
+}
 // ─── Helpers ─────────────────────────────────────────────────────────────────
 /** Mint a long-lived anon + service_role JWT pair from a secret. */
 export function signKeyPair(secret, expYears = 10) {
@@ -73,6 +153,10 @@ function upsertEnvVar(content, key, value) {
     const sep = content.endsWith("\n") || content.length === 0 ? "" : "\n";
     return `${content}${sep}${key}=${value}\n`;
 }
+/** Whether `.env` declares `key` at all, with or without a value. */
+function hasEnvLine(content, key) {
+    return new RegExp(`^${key}=`, "m").test(content);
+}
 function readEnvVar(content, key) {
     const re = new RegExp(`^${key}=(.*)$`, "m");
     const match = re.exec(content);

package/dist/commands/keys.js.map

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

package/dist/commands/push.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../src/commands/push.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAyDxC,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAsDnD"}
+{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../src/commands/push.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AA0DxC,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAsDnD"}

package/dist/commands/push.js

@@ -3,6 +3,7 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { loadConfig, loadSchemaAst } from "../config.js";
 import { syncManifestHooks, validateModelHooks, validateModelValidators, writeHooksModule, } from "../model-hooks.js";
+import { syncRowCacheEnv } from "../model-cache.js";
 import { adapterEntry, readHookUpload } from "../hook-upload.js";
 import { checkServiceRoleRoutes, serviceRoleProblemLines } from "../service-role-check.js";
 import { fatalError } from "../ui/fatal.js";
@@ -222,6 +223,14 @@ async function generateTypesLocal(ast, config) {
     // The server watches this file, so a changed hook takes effect without a restart.
     if (syncManifestHooks(cwd, ast))
         info("Hook map written to .supatype/manifest.json");
+    // The row cache is configured at postmaster start, so this is the one cache setting a push
+    // cannot make take effect on its own.
+    const rowCache = syncRowCacheEnv(cwd, ast);
+    if (rowCache !== null) {
+        info(`Row cache switched ${rowCache} in .env. Recreate the database container for it to take ` +
+            "effect: the image writes pg_keyspace.conf at start, so a running Postgres keeps the " +
+            "setting it booted with.");
+    }
     if (!config.output?.types && !config.output?.client)
         return;
     // The CLI writes these, it does not ask the engine to. Passing types_path and client_path and

package/dist/commands/push.js.map

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

package/dist/dev-compose.d.ts

@@ -2,6 +2,7 @@
  * `supatype dev` when `provider: docker`, full self-host Compose stack (Kong gateway).
  */
 import { type SupatypeProjectConfig } from "./project-config.js";
+import { type SelfHostComposePaths } from "./self-host-compose.js";
 import type { DockerBrandOptions } from "./docker-runtime.js";
 import { type DiffResult } from "./engine-client.js";
 /** Sync optional Docker image pins from config into `.env` (no JWT rotation). */
@@ -41,4 +42,16 @@ export declare function diffSchemaDocker(cwd: string, config: SupatypeProjectCon
  */
 export declare function pushSchemaDocker(cwd: string, config: SupatypeProjectConfig): Promise<void>;
 export declare function runDevCompose(cwd: string, config: SupatypeProjectConfig, opts: DevComposeOptions): Promise<void>;
+/**
+ * Write `admin-config.json` and the generated types using the in-compose engine.
+ *
+ * The fallback for a host engine that could not be fetched. Without it, a `supatype dev` that
+ * applied the schema perfectly well still left no `admin-config.json`, and Studio reads that file
+ * to decide whether a schema exists: the stack came up, every table was live, the API served them,
+ * and Studio said **"No schema has been pushed yet."** The warning that preceded it named the
+ * download, not the consequence, so nothing connected the two.
+ *
+ * Returns true when the admin config was written, which is the file Studio actually needs.
+ */
+export declare function generateViaComposeEngine(paths: SelfHostComposePaths, cwd: string, composeProject: string, config: SupatypeProjectConfig, ast: unknown, adminConfigPath: string): Promise<boolean>;
 //# sourceMappingURL=dev-compose.d.ts.map

package/dist/dev-compose.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev-compose.d.ts","sourceRoot":"","sources":["../src/dev-compose.ts"],"names":[],"mappings":"AAAA;;GAEG;AAUH,OAAO,EAQL,KAAK,qBAAqB,EAC3B,MAAM,qBAAqB,CAAA;AAkB5B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAQ7D,OAAO,EAA+B,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAA;AA4BjF,iFAAiF;AACjF,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,qBAAqB,GAAG,IAAI,CASrF;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,OAAO,CAAA;CACf;AAED,kEAAkE;AAClE,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAIhD;AA+BD;;;GAGG;AACH,wBAAsB,oCAAoC,CACxD,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,qBAAqB,EAC7B,KAAK,CAAC,EAAE,kBAAkB,GACzB,OAAO,CAAC,IAAI,CAAC,CAuBf;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,qBAAqB,EAC7B,kBAAkB,CAAC,EAAE,MAAM,GAC1B,OAAO,CAOT;AAED;;;;GAIG;AACH,wBAAsB,4BAA4B,CAChD,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,qBAAqB,EAC7B,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAAC,CAQjB;AAoED,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,qBAAqB,EAC7B,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,MAAM,GACjB,IAAI,CAiFN;AAogBD;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,UAAU,CAAC,CAsDtG;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CA8ChG;AAED,wBAAsB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,qBAAqB,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CA+QtH"}
+{"version":3,"file":"dev-compose.d.ts","sourceRoot":"","sources":["../src/dev-compose.ts"],"names":[],"mappings":"AAAA;;GAEG;AAUH,OAAO,EAQL,KAAK,qBAAqB,EAC3B,MAAM,qBAAqB,CAAA;AAU5B,OAAO,EASL,KAAK,oBAAoB,EAC1B,MAAM,wBAAwB,CAAA;AAC/B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAQ7D,OAAO,EAA+B,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAA;AA4BjF,iFAAiF;AACjF,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,qBAAqB,GAAG,IAAI,CASrF;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,OAAO,CAAA;CACf;AAED,kEAAkE;AAClE,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAIhD;AA+BD;;;GAGG;AACH,wBAAsB,oCAAoC,CACxD,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,qBAAqB,EAC7B,KAAK,CAAC,EAAE,kBAAkB,GACzB,OAAO,CAAC,IAAI,CAAC,CAuBf;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,qBAAqB,EAC7B,kBAAkB,CAAC,EAAE,MAAM,GAC1B,OAAO,CAOT;AAED;;;;GAIG;AACH,wBAAsB,4BAA4B,CAChD,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,qBAAqB,EAC7B,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAAC,CAQjB;AAoED,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,qBAAqB,EAC7B,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,MAAM,GACjB,IAAI,CAiFN;AAkiBD;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,UAAU,CAAC,CAsDtG;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CA8ChG;AAED,wBAAsB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,qBAAqB,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CA+QtH;AAsID;;;;;;;;;;GAUG;AACH,wBAAsB,wBAAwB,CAC5C,KAAK,EAAE,oBAAoB,EAC3B,GAAG,EAAE,MAAM,EACX,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,qBAAqB,EAC7B,GAAG,EAAE,OAAO,EACZ,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,OAAO,CAAC,CAwBlB"}

package/dist/dev-compose.js

@@ -11,13 +11,15 @@ import { loadSchemaAst } from "./config.js";
 import { withComposeSchemaPushLock } from "./schema-push-lock.js";
 import { connectionString, projectRootFromConfig, resolveRuntimeProvider, hooksPathFromProject, schemaPathFromProject, usesExternalDatabase, } from "./project-config.js";
 import { syncManifestHooks, writeHooksModule } from "./model-hooks.js";
+import { syncRowCacheEnv } from "./model-cache.js";
+import { anonKeyEnvUpdates } from "./commands/keys.js";
 import { signJwt } from "./jwt.js";
 import { ensureDevDbPort, ensureKongPort } from "./dev-ports.js";
 import { handleComposeProjectRename } from "./compose-rename.js";
 import { recoverStaleDevSession, writeDevSessionLock } from "./dev-session-lock.js";
 import { endDevSession, startDevSession } from "./dev-session.js";
 import { ensureDevApiConfig } from "./ensure-dev-api-config.js";
-import { COMPOSE_PINNED_IMAGE_ENV_KEYS, composeDockerImageEnv, composeProjectName, exitComposeFailed, runDockerCompose, schemaEngineImageForPush, writeSelfHostCompose, } from "./self-host-compose.js";
+import { COMPOSE_PINNED_IMAGE_ENV_KEYS, composeDockerImageEnv, composeProjectName, exitComposeFailed, runDockerCompose, schemaEngineImageForPush, writeSelfHostCompose, selfHostComposePaths, } from "./self-host-compose.js";
 import { hasEngineOverride } from "./binary-cache.js";
 import { STUDIO_DEV_PORT, startStudioViteDevServer } from "./studio-dev-server.js";
 import { ensureLocalServerDockerImage, usesLocalServerImage, LOCAL_SERVER_DOCKER_IMAGE, } from "./compose-local-server-image.js";
@@ -214,13 +216,13 @@ export function upsertDevComposeEnv(cwd, config, anonKey, serviceRoleKey, kongPo
         ...seedMissingLocalSecrets(cwd),
         // Project configuration, seeded not overwritten, see seedMissingDatabaseIdentity.
         ...seedMissingDatabaseIdentity(cwd),
-        ANON_KEY: anonKey,
-        SERVICE_ROLE_KEY: serviceRoleKey,
-        PUBLIC_SUPATYPE_ANON_KEY: anonKey,
-        VITE_SUPATYPE_ANON_KEY: anonKey,
-        EXPO_PUBLIC_SUPATYPE_ANON_KEY: anonKey,
-        PUBLIC_SUPATYPE_URL: apiUrl,
-        EXPO_PUBLIC_SUPATYPE_URL: apiUrl,
+        // Shared with `supatype keys --write`, so a front end's prefix cannot be written by one and
+        // forgotten by the other. See `anonKeyEnvUpdates`.
+        //
+        // This list used to live here as well, and the two had already drifted: `dev` wrote
+        // PUBLIC_ and EXPO_PUBLIC_ URLs and no VITE_SUPATYPE_URL, so a Vite app whose `.env` had only
+        // ever been touched by `supatype dev` built against an empty string.
+        ...anonKeyEnvUpdates(anonKey, serviceRoleKey, apiUrl),
         SUPATYPE_KONG_PORT: String(kongPort),
         API_EXTERNAL_URL: apiUrl,
         SITE_URL: apiUrl,
@@ -469,11 +471,32 @@ async function refreshSchemaArtifacts(cwd, config, ast) {
     if (syncManifestHooks(cwd, ast)) {
         console.log("[supatype] Hook and validator maps written to .supatype/manifest.json");
     }
+    // Written before the stack comes up, so a first run with a row cache declared starts with it on
+    // rather than needing a second `supatype dev`.
+    const rowCache = syncRowCacheEnv(cwd, ast);
+    if (rowCache !== null) {
+        console.log(`[supatype] Row cache switched ${rowCache} in .env (pg_keyspace Mode B).`);
+    }
     try {
         await ensureEngine();
     }
     catch (err) {
-        console.warn(`[supatype] Host engine unavailable, admin/types not refreshed: ${err.message}`);
+        // The host engine is a CDN download and this machine could not complete it. The schema is
+        // already applied, so fall back to the engine in compose rather than giving up: without
+        // admin-config.json Studio reports "No schema has been pushed yet" on a stack whose schema is
+        // entirely live, which reads as a failed push rather than a missing binary.
+        const paths = selfHostComposePaths(cwd);
+        const composeProject = composeProjectName(config.project.name);
+        const wrote = await generateViaComposeEngine(paths, cwd, composeProject, config, ast, adminConfigPath).catch(() => false);
+        if (wrote) {
+            console.warn(`[supatype] Host engine unavailable (${err.message}); used the in-compose ` +
+                "engine instead.");
+            return;
+        }
+        console.warn(`[supatype] Host engine unavailable, admin/types not refreshed: ${err.message}
+` +
+            "[supatype] Studio will report no schema until this succeeds, even though the schema is " +
+            "applied. Retry with the stack up, or run `supatype push`.");
         return;
     }
     const typesPath = config.output?.types;
@@ -1054,4 +1077,73 @@ function grantAuthSchemaAccess(paths, cwd, composeProject) {
         console.warn("[supatype] Could not grant service_role access to auth.users, Studio relation preview may fail.");
     }
 }
+/**
+ * Run one read-only generator in the in-compose schema-engine and return its stdout.
+ *
+ * The same image and the same bind mount the push just used, so if the schema could be applied
+ * this can run. It exists because the host engine is a separate binary fetched from a CDN, and a
+ * machine that cannot fetch it is not a machine that cannot generate: the schema is already
+ * applied, the AST is already on disk, and the container that did it is one `docker compose run`
+ * away.
+ */
+async function runComposeEngineGenerator(paths, cwd, composeProject, config, args) {
+    const envFile = resolve(cwd, ".env");
+    const composeArgs = ["compose", "--progress", "quiet"];
+    if (composeProject)
+        composeArgs.push("-p", composeProject);
+    composeArgs.push("--project-directory", cwd);
+    composeArgs.push("-f", paths.composePath);
+    if (existsSync(envFile))
+        composeArgs.push("--env-file", envFile);
+    composeArgs.push("--profile", "tools", "run", "--rm", "-T", "schema-engine", ...args, "-i", "/project/.supatype/schema.ast.json");
+    const env = { ...process.env, COMPOSE_PROGRESS: "quiet" };
+    const engineImage = await schemaEngineImageForPush(config);
+    if (engineImage)
+        env.SUPATYPE_ENGINE_IMAGE = engineImage;
+    const result = spawnSync("docker", composeArgs, {
+        cwd,
+        encoding: "utf8",
+        maxBuffer: 20 * 1024 * 1024,
+        env,
+    });
+    if ((result.status ?? 1) !== 0)
+        return null;
+    return String(result.stdout ?? "");
+}
+/**
+ * Write `admin-config.json` and the generated types using the in-compose engine.
+ *
+ * The fallback for a host engine that could not be fetched. Without it, a `supatype dev` that
+ * applied the schema perfectly well still left no `admin-config.json`, and Studio reads that file
+ * to decide whether a schema exists: the stack came up, every table was live, the API served them,
+ * and Studio said **"No schema has been pushed yet."** The warning that preceded it named the
+ * download, not the consequence, so nothing connected the two.
+ *
+ * Returns true when the admin config was written, which is the file Studio actually needs.
+ */
+export async function generateViaComposeEngine(paths, cwd, composeProject, config, ast, adminConfigPath) {
+    const typesPath = config.output?.types;
+    if (typeof typesPath === "string" && typesPath.trim().length > 0) {
+        const out = await runComposeEngineGenerator(paths, cwd, composeProject, config, ["generate"]);
+        const marker = out?.indexOf("// Generated by supatype-engine") ?? -1;
+        if (out && out.includes("export type")) {
+            const ts = (marker >= 0 ? out.slice(marker) : out).trimStart();
+            const hostPath = join(cwd, typesPath);
+            mkdirSync(dirname(hostPath), { recursive: true });
+            writeFileSync(hostPath, ts);
+            console.log(`[supatype] Types written to ${typesPath} (in-compose engine).`);
+        }
+    }
+    const adminOut = await runComposeEngineGenerator(paths, cwd, composeProject, config, ["admin"]);
+    if (!adminOut)
+        return false;
+    const parsed = parseEngineJsonOutput(adminOut);
+    if (parsed === null)
+        return false;
+    const admin = withAdminRoles(parsed, config);
+    restoreSystemRelationTargets(admin, ast);
+    writeFileSync(adminConfigPath, `${JSON.stringify(admin, null, 2)}\n`);
+    console.log("[supatype] Admin config written to .supatype/admin-config.json (in-compose engine).");
+    return true;
+}
 //# sourceMappingURL=dev-compose.js.map