@supatype/cli 0.1.0-alpha.9 → 0.1.1

package/dist/commands/db.js

@@ -5,12 +5,14 @@
  */
 import { loadConfig } from "../config.js";
 import { connectionString } from "../project-config.js";
-import { loadCloudConfig } from "./cloud.js";
+import { loadProjectLink } from "../link.js";
+import { resolveTarget } from "../resolve-target.js";
+import { targetFetch } from "../target-client.js";
+import { error, info, plain } from "../ui/messages.js";
 export function registerDb(program) {
     const db = program
         .command("db")
         .description("Database connection management");
-    // supatype db connection-string
     db
         .command("connection-string")
         .description("Show the database connection string for the linked project")
@@ -19,96 +21,73 @@ export function registerDb(program) {
         .action(async (opts) => {
         const cwd = process.cwd();
         const config = loadConfig(cwd);
-        const cloudCfg = loadCloudConfig(cwd);
+        const link = loadProjectLink(cwd);
         const localConn = connectionString(config);
-        // If no cloud project linked, show the local connection string.
-        if (!cloudCfg?.projectSlug) {
+        if (!link || link.kind !== "cloud") {
             const connStr = opts.transaction ? localConn.replace(/:5432\//, ":6432/") : localConn;
-            console.log(connStr);
-            console.log();
-            console.log("Session mode (port 5432): for interactive tools (psql, DataGrip, TablePlus)");
-            console.log("Transaction mode (port 6432): for application servers and serverless functions");
+            plain(connStr);
+            plain();
+            plain("Session mode (port 5432): for interactive tools (psql, DataGrip, TablePlus)");
+            plain("Transaction mode (port 6432): for application servers and serverless functions");
             return;
         }
-        // If linked to a cloud project, fetch from the API
-        const apiUrl = cloudCfg.apiUrl || "https://api.supatype.com";
-        const token = cloudCfg.token || process.env["SUPATYPE_ACCESS_TOKEN"] || "";
+        const target = resolveTarget(cwd, { env: opts.env });
         const envName = opts.env || "production";
         try {
-            const res = await fetch(`${apiUrl}/platform/v1/projects/${cloudCfg.projectSlug}/environments`, {
-                headers: {
-                    Authorization: `Bearer ${token}`,
-                },
+            const data = await targetFetch(target.apiBaseUrl, target.apiPrefix, {
+                method: "GET",
+                path: `/projects/${target.projectRef}/environments`,
+                token: target.token,
+                orgId: target.orgId,
             });
-            if (!res.ok) {
-                console.error(`Failed to fetch project info: ${res.status}`);
-                process.exitCode = 1;
-                return;
-            }
-            const { data } = (await res.json());
             const env = data.find((e) => e.name === envName);
             if (!env) {
-                console.error(`Environment "${envName}" not found`);
+                error(`Environment "${envName}" not found`);
                 process.exitCode = 1;
                 return;
             }
             const connStr = env.databaseUrl || "Connection string not available";
-            if (opts.transaction) {
-                console.log(connStr.replace(/:5432\//, ":6432/"));
-            }
-            else {
-                console.log(connStr);
-            }
-            console.log();
-            console.log("Session mode (port 5432): for interactive tools (psql, DataGrip, TablePlus)");
-            console.log("Transaction mode (port 6432): for application servers and serverless functions");
+            plain(opts.transaction ? connStr.replace(/:5432\//, ":6432/") : connStr);
+            plain();
+            plain("Session mode (port 5432): for interactive tools (psql, DataGrip, TablePlus)");
+            plain("Transaction mode (port 6432): for application servers and serverless functions");
         }
         catch (err) {
-            console.error("Failed to fetch connection string:", err.message);
+            error(`Failed to fetch connection string: ${err.message}`);
             process.exitCode = 1;
         }
     });
-    // supatype db reset-password
     db
         .command("reset-password")
         .description("Reset the database password for the linked project")
         .option("--env <name>", "Environment name", "production")
         .action(async (opts) => {
         const cwd = process.cwd();
-        const cloudCfg = loadCloudConfig(cwd);
-        if (!cloudCfg?.projectSlug) {
-            console.error("Not linked to a cloud project. Run: supatype link --project <ref>");
+        const link = loadProjectLink(cwd);
+        if (!link || link.kind !== "cloud") {
+            error("Not linked to a cloud project. Run: supatype link --project <ref>");
             process.exitCode = 1;
             return;
         }
-        const apiUrl = cloudCfg.apiUrl || "https://api.supatype.com";
-        const token = cloudCfg.token || process.env["SUPATYPE_ACCESS_TOKEN"] || "";
+        const target = resolveTarget(cwd, { env: opts.env });
         const envName = opts.env || "production";
         try {
-            const res = await fetch(`${apiUrl}/platform/v1/projects/${cloudCfg.projectSlug}/environments/${envName}/reset-db-password`, {
+            const data = await targetFetch(target.apiBaseUrl, target.apiPrefix, {
                 method: "POST",
-                headers: {
-                    Authorization: `Bearer ${token}`,
-                    "Content-Type": "application/json",
-                },
+                path: `/projects/${target.projectRef}/environments/${envName}/reset-db-password`,
+                token: target.token,
+                orgId: target.orgId,
             });
-            if (!res.ok) {
-                const body = await res.text();
-                console.error(`Failed to reset password: ${res.status} ${body}`);
-                process.exitCode = 1;
-                return;
+            info("Database password reset successfully.");
+            if (data.databaseUrl) {
+                plain(`\nNew connection string:\n${data.databaseUrl}`);
+            }
+            else if (data.password) {
+                plain(`\nNew password: ${data.password}`);
             }
-            const { data } = (await res.json());
-            console.log("Database password reset successfully.");
-            console.log();
-            console.log(`New password: ${data.password}`);
-            console.log(`Connection string: ${data.connectionString}`);
-            console.log();
-            console.log("Warning: Existing database connections have been terminated.");
-            console.log("Update your application with the new connection string.");
         }
         catch (err) {
-            console.error("Failed to reset password:", err.message);
+            error(`Failed to reset password: ${err.message}`);
             process.exitCode = 1;
         }
     });

package/dist/commands/db.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAWxC,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAsRrD"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAgBxC,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAwSrD"}

package/dist/commands/deploy.js

@@ -10,19 +10,25 @@
  *   supatype deploy status       — show current deployment info
  *   supatype deploy logs <version> — show build logs
  */
-import { join } from "node:path";
+import { readdirSync, statSync, mkdirSync, cpSync } from "node:fs";
+import { join, relative } from "node:path";
 import { loadConfig, loadSchemaAst } from "../config.js";
 import { connectionString, schemaPathFromProject } from "../project-config.js";
 import { deploySchemaToLinkedProject, loadCloudConfig, pushSchemaToLinkedProject } from "./cloud.js";
+import { loadProjectLink } from "../link.js";
+import { resolveTarget } from "../resolve-target.js";
+import { targetFetch } from "../target-client.js";
 import { ensureEngine, engineRequest } from "../engine-client.js";
 import { resolveAppConfig, validateStaticMode, validateBuildOutput, detectPackageManager } from "../app/framework.js";
 import { spawnSync } from "node:child_process";
+import { error, info, plain, step } from "../ui/messages.js";
 export function registerDeploy(program) {
     const deploy = program
         .command("deploy")
         .description("Deploy schema and app — Supatype Cloud by default when linked (`supatype link`); pass --local for engine + your database")
         .option("--local", "Use local schema engine and database_url from config (skip cloud control plane)")
-        .option("--environment <name>", "Cloud environment when using linked project", "production")
+        .option("--environment <name>", "Target environment when linked", "production")
+        .option("--env <name>", "Alias for --environment")
         .option("--app-only", "Skip schema push, only deploy the static site")
         .option("--schema-only", "Skip app build, only push schema changes")
         .option("--skip-build", "Deploy existing build output without building")
@@ -31,14 +37,15 @@ export function registerDeploy(program) {
         .action(async (opts) => {
         const cwd = process.cwd();
         const config = loadConfig(cwd);
+        const link = loadProjectLink(cwd);
         const cloudCfg = loadCloudConfig(cwd);
+        const envName = opts.env ?? opts.environment ?? "production";
         let schemaDone = false;
-        // Default: cloud — .supatype/cloud.json → control plane schema deploy
         if (!opts.local &&
-            cloudCfg?.projectSlug &&
+            link &&
             !opts.appOnly &&
             !opts.skipBuild) {
-            await deploySchemaToLinkedProject(cwd, opts.environment ?? "production");
+            await deploySchemaToLinkedProject(cwd, envName);
             schemaDone = true;
             if (opts.schemaOnly) {
                 return;
@@ -48,7 +55,7 @@ export function registerDeploy(program) {
         if (!opts.appOnly && !opts.skipBuild && !schemaDone) {
             const ast = loadSchemaAst(schemaPathFromProject(config, cwd), cwd);
             if (opts.local) {
-                console.log("=== Schema Push (local) ===");
+                step("Schema Push (local)");
                 await ensureEngine();
                 const diff = await engineRequest("/diff", {
                     ast,
@@ -57,25 +64,25 @@ export function registerDeploy(program) {
                 });
                 const ops = diff.operations ?? [];
                 if (ops.length > 0) {
-                    console.log(`${ops.length} schema change(s) to apply.`);
+                    info(`${ops.length} schema change(s) to apply.`);
                     await engineRequest("/push", {
                         ast,
                         database_url: connectionString(config),
                         schema: "public",
                         force: true,
                     });
-                    console.log("Schema changes applied.");
+                    info("Schema changes applied.");
                 }
                 else {
-                    console.log("Schema is up to date.");
+                    info("Schema is up to date.");
                 }
             }
-            else if (cloudCfg?.projectSlug) {
-                console.log("=== Schema Push (cloud) ===");
-                await pushSchemaToLinkedProject(cwd, { force: opts.yes ?? true });
+            else if (link) {
+                step("Schema Push (linked)");
+                await pushSchemaToLinkedProject(cwd, { force: opts.yes ?? true, env: envName });
             }
             else {
-                console.error("Not linked to Supatype Cloud. Run: supatype link\n" +
+                error("Not linked to Supatype Cloud. Run: supatype link\n" +
                     "Or deploy against your own database: supatype deploy --local");
                 process.exit(1);
             }
@@ -84,26 +91,26 @@ export function registerDeploy(program) {
         if (!opts.schemaOnly) {
             if (!config.build) {
                 if (opts.appOnly) {
-                    console.error("No build section found in supatype.config.ts");
+                    error("No build section found in supatype.config.ts");
                     process.exit(1);
                 }
                 // No build config — skip app deployment silently
                 return;
             }
-            console.log("\n=== App Build & Deploy ===");
+            step("App Build & Deploy");
             const appConfig = resolveAppConfig(config.build, cwd);
             // Validate static mode
             const staticError = validateStaticMode(appConfig.framework, appConfig.directory);
             if (staticError) {
-                console.error(staticError);
+                error(staticError);
                 process.exit(1);
             }
             // Build step
             if (!opts.skipBuild && appConfig.buildCommand) {
-                console.log(`Framework: ${appConfig.framework}`);
-                console.log(`Build command: ${appConfig.buildCommand}`);
-                console.log(`Output directory: ${appConfig.outputDirectory}`);
-                console.log();
+                info(`Framework: ${appConfig.framework}`);
+                info(`Build command: ${appConfig.buildCommand}`);
+                info(`Output directory: ${appConfig.outputDirectory}`);
+                plain();
                 // Inject environment variables
                 const buildEnv = {
                     ...process.env,
@@ -118,7 +125,7 @@ export function registerDeploy(program) {
                 }
                 // Install dependencies
                 const pm = detectPackageManager(appConfig.directory);
-                console.log(`Installing dependencies (${pm})...`);
+                info(`Installing dependencies (${pm})...`);
                 const installResult = spawnSync(pm, ["install"], {
                     cwd: appConfig.directory,
                     stdio: "inherit",
@@ -126,11 +133,11 @@ export function registerDeploy(program) {
                     timeout: 5 * 60 * 1000, // 5 minute timeout
                 });
                 if (installResult.status !== 0) {
-                    console.error("Dependency installation failed.");
+                    error("Dependency installation failed.");
                     process.exit(1);
                 }
                 // Run build
-                console.log("\nBuilding...");
+                plain("\nBuilding...");
                 const [buildCmd, ...buildArgs] = appConfig.buildCommand.split(" ");
                 const buildResult = spawnSync(buildCmd, buildArgs, {
                     cwd: appConfig.directory,
@@ -139,7 +146,7 @@ export function registerDeploy(program) {
                     timeout: 10 * 60 * 1000, // 10 minute timeout
                 });
                 if (buildResult.status !== 0) {
-                    console.error("Build failed.");
+                    error("Build failed.");
                     process.exit(1);
                 }
             }
@@ -147,22 +154,26 @@ export function registerDeploy(program) {
             const maxSizeMb = 500; // Default, should be tier-aware in cloud
             const validationError = validateBuildOutput(appConfig.outputDirectory, maxSizeMb);
             if (validationError) {
-                console.error(validationError);
+                error(validationError);
                 process.exit(1);
             }
             // Deploy (--local never uploads to cloud, even if linked)
-            if (cloudCfg?.projectSlug && !opts.local) {
-                await deployToCloud({ projectRef: cloudCfg.projectSlug, apiUrl: cloudCfg.apiUrl, accessToken: cloudCfg.token }, appConfig.outputDirectory, opts.preview ?? false);
+            if (link && !opts.local) {
+                await deployStaticSite(cwd, appConfig.outputDirectory, {
+                    preview: opts.preview ?? false,
+                    env: envName,
+                });
             }
             else {
                 deploySelfHost(appConfig.outputDirectory, cwd);
             }
-            console.log("\nDeployment complete!");
-            if (cloudCfg?.projectSlug && !opts.local) {
+            info("Deployment complete!");
+            if (link && !opts.local) {
+                const target = resolveTarget(cwd, { env: envName });
                 const url = opts.preview
-                    ? `https://preview-${Date.now().toString(36)}.${cloudCfg.projectSlug}.supatype.dev`
-                    : `https://${cloudCfg.projectSlug}.supatype.dev`;
-                console.log(`URL: ${url}`);
+                    ? `${target.apiBaseUrl}/preview`
+                    : target.apiBaseUrl;
+                info(`URL: ${url}`);
             }
         }
     });
@@ -170,93 +181,128 @@ export function registerDeploy(program) {
     deploy
         .command("rollback")
         .description("Roll back to the previous static site deployment")
-        .action(async () => {
-        const cloudCfg = loadCloudConfig(process.cwd());
-        if (!cloudCfg?.projectSlug) {
-            console.error("Not linked to a cloud project. Rollback is only available for cloud deployments.");
+        .option("--env <name>", "Target environment when linked")
+        .option("--to <id>", "Roll back to a specific deployment id or version")
+        .action(async (opts) => {
+        const cwd = process.cwd();
+        const link = loadProjectLink(cwd);
+        if (!link) {
+            error("Not linked to a project. Rollback requires a linked target.");
             process.exit(1);
         }
-        const apiUrl = cloudCfg.apiUrl || "https://api.supatype.com";
-        const token = cloudCfg.token || process.env["SUPATYPE_ACCESS_TOKEN"] || "";
-        const res = await fetch(`${apiUrl}/platform/v1/projects/${cloudCfg.projectSlug}/deployments/rollback`, {
+        const target = resolveTarget(cwd, { env: opts.env });
+        const body = opts.to ? { to: opts.to } : undefined;
+        const data = await targetFetch(target.apiBaseUrl, target.apiPrefix, {
             method: "POST",
-            headers: { Authorization: `Bearer ${token}`, "Content-Type": "application/json" },
+            path: `/projects/${target.projectRef}/deployments/rollback`,
+            body,
+            token: target.token,
+            orgId: target.orgId,
+            environment: target.mode === "cloud" ? target.environment : undefined,
         });
-        if (!res.ok) {
-            const body = await res.text();
-            console.error(`Rollback failed: ${res.status} ${body}`);
-            process.exit(1);
-        }
-        const { data } = await res.json();
-        console.log(`Rolled back to deployment ${data.version}.`);
+        info(`Rolled back to deployment ${data.version ?? "previous"}.`);
     });
     // supatype deploy status
     deploy
         .command("status")
         .description("Show current deployment status")
-        .action(async () => {
-        const cloudCfg = loadCloudConfig(process.cwd());
-        if (!cloudCfg?.projectSlug) {
-            console.error("Not linked to a cloud project.");
+        .option("--env <name>", "Target environment when linked")
+        .action(async (opts) => {
+        const cwd = process.cwd();
+        const link = loadProjectLink(cwd);
+        if (!link) {
+            error("Not linked to a project.");
             process.exit(1);
         }
-        const apiUrl = cloudCfg.apiUrl || "https://api.supatype.com";
-        const token = cloudCfg.token || process.env["SUPATYPE_ACCESS_TOKEN"] || "";
-        const res = await fetch(`${apiUrl}/platform/v1/projects/${cloudCfg.projectSlug}/deployments/current`, {
-            headers: { Authorization: `Bearer ${token}` },
+        const target = resolveTarget(cwd, { env: opts.env });
+        const data = await targetFetch(target.apiBaseUrl, target.apiPrefix, {
+            method: "GET",
+            path: `/projects/${target.projectRef}/deployments/current`,
+            token: target.token,
+            orgId: target.orgId,
+            environment: target.mode === "cloud" ? target.environment : undefined,
         });
-        if (!res.ok) {
-            console.error("No active deployment found.");
+        if (!data) {
+            info("No active deployment found.");
             return;
         }
-        const { data } = await res.json();
-        console.log(`Deployment: ${data.version}`);
-        console.log(`Status: ${data.status}`);
-        console.log(`Deployed: ${data.timestamp}`);
-        console.log(`Size: ${(data.size / (1024 * 1024)).toFixed(1)}MB`);
-        console.log(`Build duration: ${data.buildDuration}s`);
-        console.log(`URL: ${data.url}`);
+        info(`Deployment: ${data.version ?? data.id ?? "unknown"}`);
+        info(`Status: ${data.status ?? "live"}`);
+        if (data.timestamp ?? data.createdAt) {
+            info(`Deployed: ${data.timestamp ?? data.createdAt}`);
+        }
+        if (data.size)
+            info(`Size: ${(data.size / (1024 * 1024)).toFixed(1)}MB`);
+        if (data.buildDuration)
+            info(`Build duration: ${data.buildDuration}s`);
+        if (data.url)
+            info(`URL: ${data.url}`);
     });
     // supatype deploy logs <version>
     deploy
         .command("logs [version]")
         .description("Show build logs for a deployment")
-        .action(async (version) => {
-        const cloudCfg = loadCloudConfig(process.cwd());
-        if (!cloudCfg?.projectSlug) {
-            console.error("Not linked to a cloud project.");
+        .option("--env <name>", "Target environment when linked")
+        .action(async (version, opts) => {
+        const cwd = process.cwd();
+        const link = loadProjectLink(cwd);
+        if (!link) {
+            error("Not linked to a project.");
             process.exit(1);
         }
-        const apiUrl = cloudCfg.apiUrl || "https://api.supatype.com";
-        const token = cloudCfg.token || process.env["SUPATYPE_ACCESS_TOKEN"] || "";
+        const target = resolveTarget(cwd, { env: opts.env });
         const versionPath = version ? `/${version}` : "/current";
-        const res = await fetch(`${apiUrl}/platform/v1/projects/${cloudCfg.projectSlug}/deployments${versionPath}/logs`, {
-            headers: { Authorization: `Bearer ${token}` },
+        const data = await targetFetch(target.apiBaseUrl, target.apiPrefix, {
+            method: "GET",
+            path: `/projects/${target.projectRef}/deployments${versionPath}/logs`,
+            token: target.token,
+            orgId: target.orgId,
+            environment: target.mode === "cloud" ? target.environment : undefined,
         });
-        if (!res.ok) {
-            console.error("Logs not found.");
-            process.exit(1);
-        }
-        const { data } = await res.json();
-        console.log(data.logs);
+        plain(data.logs ?? "(no logs)");
     });
 }
-async function deployToCloud(config, outputDir, isPreview) {
-    const apiUrl = config.apiUrl || "https://api.supatype.com";
-    const token = config.accessToken || process.env["SUPATYPE_ACCESS_TOKEN"] || "";
-    console.log("Uploading build artifacts...");
-    // Collect files from output directory
+async function deployStaticSite(cwd, outputDir, opts) {
+    const target = resolveTarget(cwd, { env: opts.env });
+    const token = target.token;
+    if (!token) {
+        throw new Error("No token for linked target. Re-run supatype link --token ...");
+    }
+    info("Uploading build artifacts...");
     const files = collectFiles(outputDir, outputDir);
-    console.log(`${files.length} files to upload (${formatSize(files.reduce((s, f) => s + f.size, 0))})`);
-    // Create deployment
-    const createRes = await fetch(`${apiUrl}/platform/v1/projects/${config.projectRef}/deployments`, {
+    info(`${files.length} files to upload (${formatSize(files.reduce((s, f) => s + f.size, 0))})`);
+    const { readFileSync } = await import("node:fs");
+    if (target.apiPrefix === "/platform/v1") {
+        const filePayload = files.map((f) => ({
+            path: f.relativePath,
+            content: readFileSync(f.absolutePath).toString("base64"),
+            encoding: "base64",
+        }));
+        const created = await targetFetch(target.apiBaseUrl, target.apiPrefix, {
+            method: "POST",
+            path: `/projects/${target.projectRef}/deployments`,
+            body: { preview: opts.preview ?? false, files: filePayload },
+            token,
+            orgId: target.orgId,
+        });
+        await targetFetch(target.apiBaseUrl, target.apiPrefix, {
+            method: "POST",
+            path: `/projects/${target.projectRef}/deployments/${created.id}/finalize`,
+            token,
+            orgId: target.orgId,
+        });
+        return;
+    }
+    const createRes = await fetch(`${target.apiBaseUrl}/api/v1/projects/${target.projectRef}/deployments`, {
         method: "POST",
         headers: {
             Authorization: `Bearer ${token}`,
             "Content-Type": "application/json",
+            ...(target.orgId ? { "X-Org-Id": target.orgId } : {}),
+            ...(target.environment ? { "X-Supatype-Environment": target.environment } : {}),
         },
         body: JSON.stringify({
-            preview: isPreview,
+            preview: opts.preview ?? false,
             fileCount: files.length,
             totalSize: files.reduce((s, f) => s + f.size, 0),
             files: files.map((f) => ({ path: f.relativePath, size: f.size })),
@@ -267,9 +313,8 @@ async function deployToCloud(config, outputDir, isPreview) {
         throw new Error(`Failed to create deployment: ${createRes.status} ${body}`);
     }
     const { data } = await createRes.json();
-    // Upload files (simplified — in production, use multipart or presigned URLs)
     for (const file of files) {
-        const content = require("node:fs").readFileSync(file.absolutePath);
+        const content = readFileSync(file.absolutePath);
         await fetch(`${data.uploadUrl}/${file.relativePath}`, {
             method: "PUT",
             headers: {
@@ -280,23 +325,22 @@ async function deployToCloud(config, outputDir, isPreview) {
             body: content,
         });
     }
-    // Finalize deployment
-    await fetch(`${apiUrl}/platform/v1/projects/${config.projectRef}/deployments/${data.deploymentId}/finalize`, {
+    await fetch(`${target.apiBaseUrl}/api/v1/projects/${target.projectRef}/deployments/${data.deploymentId}/finalize`, {
         method: "POST",
-        headers: { Authorization: `Bearer ${token}` },
+        headers: {
+            Authorization: `Bearer ${token}`,
+            ...(target.orgId ? { "X-Org-Id": target.orgId } : {}),
+        },
     });
 }
 function deploySelfHost(outputDir, cwd) {
     const servingDir = join(cwd, ".supatype", "static");
-    const { mkdirSync, cpSync } = require("node:fs");
     mkdirSync(servingDir, { recursive: true });
     cpSync(outputDir, servingDir, { recursive: true });
-    console.log(`Static files deployed to ${servingDir}`);
+    info(`Static files deployed to ${servingDir}`);
 }
 function collectFiles(dir, baseDir) {
     const files = [];
-    const { readdirSync, statSync } = require("node:fs");
-    const { relative } = require("node:path");
     for (const entry of readdirSync(dir, { withFileTypes: true })) {
         const fullPath = join(dir, entry.name);
         if (entry.isFile()) {