@buildspacestudio/cli 0.6.0 → 0.8.0

package/README.md

@@ -122,7 +122,7 @@ Behavior:
 
 - `list` shows masked values
 - `set` creates or updates a variable, and uppercases the key automatically
-- `pull` writes system vars plus non-secret vars to a local env file
+- `pull` writes non-secret vars plus the managed database credentials (`BUILDSPACE_DB_URL` and `BUILDSPACE_DB_TOKEN`) to a local env file
 - keys with the `BUILDSPACE_` prefix are reserved
 - `NEXT_PUBLIC_*` keys default to non-secret unless you override them
 

package/dist/commands/agent.d.ts

@@ -0,0 +1,2 @@
+export declare function runAgentCommand(args: string[]): Promise<number>;
+//# sourceMappingURL=agent.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/commands/agent.ts"],"names":[],"mappings":"AAwTA,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CA0B/D"}

package/dist/commands/agent.js

@@ -0,0 +1,285 @@
+import { acceptHostedWorkspaceChanges, getHostedAgent, inspectHostedWorkspace, resetHostedWorkspace, setHostedAgentProviderKey, } from "../lib/api.js";
+import { resolveAppContext } from "../lib/app.js";
+import { hasFlag, readFlag } from "../lib/args.js";
+import { resolveStoredAuth } from "../lib/auth.js";
+import { openBrowser } from "../lib/browser.js";
+import { trackEvent } from "../lib/telemetry.js";
+const PROVIDERS = ["anthropic", "google", "openai", "openrouter"];
+const PROVIDER_LABELS = {
+    anthropic: "Anthropic",
+    google: "Google Gemini",
+    openai: "OpenAI",
+    openrouter: "OpenRouter",
+};
+function printUsage() {
+    console.log("Usage: buildspace agent <subcommand> [options]");
+    console.log("");
+    console.log("Manage the hosted dev agent (OpenCode) attached to your app's dev workspace.");
+    console.log("");
+    console.log("Subcommands:");
+    console.log("  status                Show the hosted agent URL, status, and provider");
+    console.log("  open                  Open the hosted agent workspace in your browser");
+    console.log("  inspect               Show pending file changes in the workspace");
+    console.log("  accept                Commit and push workspace changes to the tracked branch");
+    console.log("  reset                 Reset the workspace to match the tracked branch");
+    console.log("  key set               Set the AI provider key the agent runs with");
+    console.log("");
+    console.log("Options:");
+    console.log("  --app <slug>          App slug (default: git remote or active app)");
+    console.log("  --json                Output as JSON (status, inspect only)");
+    console.log("  --no-open             Print the URL instead of opening a browser (open only)");
+    console.log("  --message <text>      Commit message for `accept` (default: auto-generated)");
+    console.log("  --provider <name>     Provider for `key set`: anthropic, google, openai, openrouter");
+    console.log("  --key <value>         Provider API key (omit to read from stdin)");
+    console.log("");
+    console.log("Examples:");
+    console.log("  buildspace agent status");
+    console.log("  buildspace agent open");
+    console.log("  buildspace agent inspect");
+    console.log("  buildspace agent accept --message 'Add auth flow'");
+    console.log("  buildspace agent reset");
+    console.log("  buildspace agent key set --provider anthropic --key sk-ant-...");
+    console.log("  cat key.txt | buildspace agent key set --provider openai");
+}
+const NOT_ENABLED_HINT = "Hosted dev agent is not enabled. Run `buildspace app hosting enable` to provision it.";
+function resolveDevEnvId(context) {
+    return context.environments.find((env) => env.type === "dev")?.id ?? null;
+}
+function agentUrl(agent) {
+    return agent.url ?? (agent.domain ? `https://${agent.domain}` : null);
+}
+async function runStatus(args) {
+    const json = hasFlag(args, "--json");
+    const auth = await resolveStoredAuth();
+    try {
+        const context = await resolveAppContext(args, auth);
+        const agent = await getHostedAgent(context.app.id, auth);
+        if (json) {
+            console.log(JSON.stringify({ hostedAgent: agent }, null, 2));
+            return 0;
+        }
+        console.log(`App: ${context.app.name} (${context.app.slug})`);
+        if (!agent) {
+            console.log(NOT_ENABLED_HINT);
+            return 0;
+        }
+        console.log(`  status:   ${agent.status ?? "pending"}`);
+        console.log(`  url:      ${agentUrl(agent) ?? "pending"}`);
+        console.log(`  branch:   ${agent.trackedGitBranch ?? "buildspace/dev"}`);
+        console.log(`  provider: ${agent.providerConfigured
+            ? `configured${agent.configuredProvider ? ` (${agent.configuredProvider})` : ""}`
+            : "not configured — run `buildspace agent key set`"}`);
+        return 0;
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : "Failed to get agent status";
+        console.error(`Error: ${message}`);
+        return 1;
+    }
+}
+async function runOpen(args) {
+    const noOpen = hasFlag(args, "--no-open");
+    const auth = await resolveStoredAuth();
+    try {
+        const context = await resolveAppContext(args, auth);
+        const agent = await getHostedAgent(context.app.id, auth);
+        if (!agent) {
+            console.error(NOT_ENABLED_HINT);
+            return 1;
+        }
+        const url = agentUrl(agent);
+        if (!url) {
+            console.error("Agent URL is not ready yet. Check `buildspace agent status` and retry.");
+            return 1;
+        }
+        if (noOpen) {
+            console.log(url);
+            return 0;
+        }
+        const opened = await openBrowser(url);
+        trackEvent("cli.agent.opened");
+        if (opened) {
+            console.log(`Opening ${url}`);
+        }
+        else {
+            console.log("Could not open a browser automatically. Open this URL manually:");
+            console.log(`  ${url}`);
+        }
+        return 0;
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : "Failed to open agent";
+        console.error(`Error: ${message}`);
+        return 1;
+    }
+}
+function readStdin() {
+    return new Promise((resolve, reject) => {
+        let data = "";
+        process.stdin.setEncoding("utf8");
+        process.stdin.on("data", (chunk) => {
+            data += chunk;
+        });
+        process.stdin.on("end", () => resolve(data));
+        process.stdin.on("error", reject);
+    });
+}
+function isHostedAgentProvider(value) {
+    return PROVIDERS.includes(value);
+}
+async function runKeySet(args) {
+    const provider = readFlag(args, "--provider")?.trim().toLowerCase();
+    if (!provider) {
+        console.error("Missing required --provider.");
+        console.error(`Valid providers: ${PROVIDERS.join(", ")}`);
+        return 1;
+    }
+    if (!isHostedAgentProvider(provider)) {
+        console.error(`Invalid --provider '${provider}'. Valid providers: ${PROVIDERS.join(", ")}`);
+        return 1;
+    }
+    let apiKey = readFlag(args, "--key")?.trim();
+    if (!apiKey) {
+        if (process.stdin.isTTY) {
+            console.error("Missing API key. Pass --key <value> or pipe it via stdin.");
+            return 1;
+        }
+        apiKey = (await readStdin()).trim();
+    }
+    if (!apiKey) {
+        console.error("Provider API key is empty.");
+        return 1;
+    }
+    const auth = await resolveStoredAuth();
+    try {
+        const context = await resolveAppContext(args, auth);
+        const envId = resolveDevEnvId(context);
+        if (!envId) {
+            console.error(`No dev environment found for app '${context.app.slug}'.`);
+            return 1;
+        }
+        await setHostedAgentProviderKey({ appId: context.app.id, envId, provider, apiKey }, auth);
+        trackEvent("cli.agent.key_set");
+        console.log(`Saved ${PROVIDER_LABELS[provider]} key for ${context.app.slug}.`);
+        console.log("Restart the workspace for the agent to pick up the new key.");
+        return 0;
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : "Failed to save agent key";
+        console.error(`Error: ${message}`);
+        return 1;
+    }
+}
+async function runInspect(args) {
+    const json = hasFlag(args, "--json");
+    const auth = await resolveStoredAuth();
+    try {
+        const context = await resolveAppContext(args, auth);
+        const status = await inspectHostedWorkspace(context.app.id, auth);
+        if (json) {
+            console.log(JSON.stringify({ status }, null, 2));
+            return 0;
+        }
+        console.log(`App: ${context.app.name} (${context.app.slug})`);
+        console.log(`  branch:  ${status.branch}`);
+        console.log(`  clean:   ${status.clean}`);
+        if (status.files.length === 0) {
+            console.log("  No pending changes.");
+        }
+        else {
+            console.log(`  ${status.files.length} changed file(s):`);
+            for (const f of status.files) {
+                console.log(`    ${f.status}  ${f.path}`);
+            }
+        }
+        return 0;
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : "Failed to inspect workspace";
+        console.error(`Error: ${message}`);
+        return 1;
+    }
+}
+async function runAccept(args) {
+    const commitMessage = readFlag(args, "--message")?.trim();
+    const auth = await resolveStoredAuth();
+    try {
+        const context = await resolveAppContext(args, auth);
+        const result = await acceptHostedWorkspaceChanges({ appId: context.app.id, commitMessage }, auth);
+        trackEvent("cli.agent.accept");
+        if (result.committed) {
+            console.log(`Accepted ${result.fileCount} file(s) on branch ${result.branch}.`);
+            console.log(`  ${result.summary}`);
+        }
+        else {
+            console.log("No changes to accept — workspace is already clean.");
+        }
+        return 0;
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : "Failed to accept workspace changes";
+        console.error(`Error: ${message}`);
+        return 1;
+    }
+}
+async function runReset(args) {
+    const auth = await resolveStoredAuth();
+    try {
+        const context = await resolveAppContext(args, auth);
+        const result = await resetHostedWorkspace(context.app.id, auth);
+        trackEvent("cli.agent.reset");
+        if (result.reset) {
+            console.log(`Workspace reset to branch ${result.branch}.`);
+        }
+        else {
+            console.log("Workspace was already clean — nothing to reset.");
+        }
+        return 0;
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : "Failed to reset workspace";
+        console.error(`Error: ${message}`);
+        return 1;
+    }
+}
+function runKey(args) {
+    const subcommand = args[0];
+    if (!subcommand || hasFlag(args, "--help", "-h", "help")) {
+        console.log("Usage: buildspace agent key set --provider <name> [--key <value>]");
+        return Promise.resolve(subcommand ? 0 : 1);
+    }
+    switch (subcommand) {
+        case "set":
+            return runKeySet(args.slice(1));
+        default:
+            console.error(`Unknown agent key subcommand: ${subcommand}`);
+            console.log("Usage: buildspace agent key set --provider <name> [--key <value>]");
+            return Promise.resolve(1);
+    }
+}
+export function runAgentCommand(args) {
+    const subcommand = args[0];
+    if (!subcommand || hasFlag(args, "--help", "-h", "help")) {
+        printUsage();
+        return Promise.resolve(subcommand ? 0 : 1);
+    }
+    switch (subcommand) {
+        case "status":
+            return runStatus(args.slice(1));
+        case "open":
+            return runOpen(args.slice(1));
+        case "inspect":
+            return runInspect(args.slice(1));
+        case "accept":
+            return runAccept(args.slice(1));
+        case "reset":
+            return runReset(args.slice(1));
+        case "key":
+            return runKey(args.slice(1));
+        default:
+            console.error(`Unknown agent subcommand: ${subcommand}`);
+            printUsage();
+            return Promise.resolve(1);
+    }
+}
+//# sourceMappingURL=agent.js.map

package/dist/commands/agent.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../src/commands/app.ts"],"names":[],"mappings":"AAuhBA,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CA0B7D"}
+{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../src/commands/app.ts"],"names":[],"mappings":"AAmqBA,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CA4B7D"}

package/dist/commands/app.js

@@ -1,4 +1,4 @@
-import { createApp, deleteApp, disableHosting, enableHosting, getHostingState, getProvisioningStatus, } from "../lib/api.js";
+import { ApiError, createApp, deleteApp, disableHosting, enableHosting, getHostingState, getProvisioningStatus, } from "../lib/api.js";
 import { clearActiveApp, getActiveApp, listAppsWithActive, resolveAppContext, setActiveApp, validateAppForSelection, } from "../lib/app.js";
 import { hasFlag, readFlag } from "../lib/args.js";
 import { resolveStoredAuth } from "../lib/auth.js";
@@ -18,6 +18,7 @@ const ACTIVE_PROVISIONING_STATUSES = new Set(["pending", "running"]);
 const TERMINAL_PROVISIONING_STATUSES = new Set(["completed", "completed_with_warnings", "failed"]);
 const PROVISIONING_POLL_INTERVAL_MS = 1500;
 const PROVISIONING_WAIT_WINDOW_MS = 30_000;
+const REPO_STEP_KEY = "repository";
 function printUsage() {
     console.log("Usage: buildspace app <subcommand> [options]");
     console.log("");
@@ -26,6 +27,7 @@ function printUsage() {
     console.log("  current                      Show the current resolved app");
     console.log("  use <slug>                   Set the active app");
     console.log("  create                       Create a new app");
+    console.log("  status [<slug>]              Show hosting status for an app");
     console.log("  delete <slug>                Soft-delete an app");
     console.log("  hosting <status|enable|disable>   Manage hosting per environment");
 }
@@ -37,6 +39,8 @@ function printCreateUsage() {
     console.log("  --slug <slug>               Optional app slug override");
     console.log("  --description <text>        Optional description");
     console.log("  --category <value>          Optional category");
+    console.log("  --json                      Output result as JSON and skip provisioning wait");
+    console.log("  --no-wait                   Skip provisioning wait entirely");
 }
 function printDeleteUsage() {
     console.log("Usage: buildspace app delete <slug> --confirm <slug> [--note <text>]");
@@ -95,31 +99,138 @@ function formatProvisioningLine(session) {
     const label = activeStep?.label ?? "Finalizing provisioning";
     return `${label} (${session.percent}%)`;
 }
-async function waitForProvisioning(sessionId, auth) {
-    const startedAt = Date.now();
+async function pollUntilRepoReady(sessionId, auth, deadlineMs) {
     let lastLine = null;
-    let lastSession = null;
-    while (Date.now() - startedAt <= PROVISIONING_WAIT_WINDOW_MS) {
-        const result = await getProvisioningStatus(sessionId, auth);
-        const { session } = result;
-        lastSession = session;
+    while (Date.now() < deadlineMs) {
+        const { session } = await getProvisioningStatus(sessionId, auth);
         const line = formatProvisioningLine(session);
         if (line !== lastLine) {
             console.log(`  ${line}`);
             lastLine = line;
         }
         if (TERMINAL_PROVISIONING_STATUSES.has(session.status)) {
-            return session;
+            return { reachedTerminal: true, session };
         }
         if (!ACTIVE_PROVISIONING_STATUSES.has(session.status)) {
-            return session;
+            return { reachedTerminal: false, session };
+        }
+        const repoStep = session.steps.find((s) => s.key === REPO_STEP_KEY);
+        if (repoStep?.status === "complete" || repoStep?.status === "warning") {
+            return { reachedTerminal: false, session };
+        }
+        await sleep(PROVISIONING_POLL_INTERVAL_MS);
+    }
+    // Deadline expired — do one final fetch to return current state
+    const { session } = await getProvisioningStatus(sessionId, auth);
+    return { reachedTerminal: TERMINAL_PROVISIONING_STATUSES.has(session.status), session };
+}
+async function pollUntilTerminal(sessionId, auth, deadlineMs) {
+    while (Date.now() < deadlineMs) {
+        const { session } = await getProvisioningStatus(sessionId, auth);
+        if (TERMINAL_PROVISIONING_STATUSES.has(session.status)) {
+            return { session, timedOut: false };
+        }
+        if (!ACTIVE_PROVISIONING_STATUSES.has(session.status)) {
+            return { session, timedOut: false };
         }
         await sleep(PROVISIONING_POLL_INTERVAL_MS);
     }
-    if (!lastSession) {
-        throw new Error("Provisioning started, but status could not be loaded");
+    const { session } = await getProvisioningStatus(sessionId, auth).catch(() => ({
+        session: null,
+    }));
+    return { session, timedOut: true };
+}
+function buildCreateAppInput(name, args) {
+    const slug = readFlag(args, "--slug")?.trim();
+    const description = readFlag(args, "--description")?.trim();
+    const category = readFlag(args, "--category")?.trim();
+    return {
+        name,
+        ...(slug ? { slug } : {}),
+        ...(description ? { description } : {}),
+        ...(category ? { category } : {}),
+    };
+}
+function writeJsonCommandError(error, fallback) {
+    const code = error instanceof ApiError ? error.code : "NETWORK_ERROR";
+    const message = error instanceof Error ? error.message : fallback;
+    process.stderr.write(`${JSON.stringify({ error: message, code })}\n`);
+}
+async function printCreateResultHuman(result, noWait, auth) {
+    console.log(`Created app ${result.app.name} (${result.app.slug})`);
+    console.log("Active app updated.");
+    if (result.keys.length > 0) {
+        console.log("");
+        console.log("Initial API keys:");
+        for (const key of result.keys) {
+            console.log(`  ${key.environment}/${key.type}: ${key.key}`);
+        }
+    }
+    if (noWait) {
+        console.log("");
+        console.log("Provisioning is running in the background.");
+        console.log(`Run \`buildspace app status ${result.app.slug}\` to check progress.`);
+    }
+    else {
+        console.log("");
+        await waitAndPrintCreateProgress(result.provisioningSession.id, result.app.slug, auth);
+    }
+    console.log("");
+    console.log("  Run your coding agent of choice to build your app.");
+    console.log("  buildspace deploy   # when you're ready to ship a dev deploy");
+    await maybeShowSkillsHint();
+}
+function printCreateNextSteps(slug) {
+    console.log("Next steps:");
+    console.log(`  buildspace init --app ${slug}   # clone repo and pull dev env vars`);
+    console.log(`  cd ${slug}`);
+    console.log("  bun dev");
+}
+async function waitAndPrintCreateProgress(sessionId, slug, auth) {
+    console.log("Provisioning infrastructure...");
+    const deadline = Date.now() + PROVISIONING_WAIT_WINDOW_MS;
+    const phase1 = await pollUntilRepoReady(sessionId, auth, deadline);
+    if (phase1.reachedTerminal) {
+        printProvisioningFinalStatus(phase1.session);
+        console.log("");
+        printCreateNextSteps(slug);
+        return;
+    }
+    console.log("");
+    console.log("Repository ready.");
+    console.log("");
+    printCreateNextSteps(slug);
+    console.log("");
+    console.log("Hosting, database, and storage are finishing setup in the background (~30s).");
+    const phase2 = await pollUntilTerminal(sessionId, auth, deadline);
+    if (phase2.timedOut || !phase2.session) {
+        console.log(`Run \`buildspace app status ${slug}\` to check when setup is complete.`);
+    }
+    else {
+        printProvisioningFinalStatus(phase2.session);
+    }
+}
+function printProvisioningFinalStatus(session) {
+    if (session.status === "completed") {
+        console.log("Infrastructure setup complete.");
+    }
+    else if (session.status === "completed_with_warnings") {
+        console.log("Infrastructure setup complete with warnings.");
+    }
+    else if (session.status === "failed") {
+        console.log("Infrastructure setup failed.");
+    }
+    if (session.warnings.length > 0) {
+        console.log("");
+        console.log("Setup warnings:");
+        for (const warning of session.warnings) {
+            console.log(`  - ${warning}`);
+        }
+    }
+    if (session.errorMessage) {
+        console.log("");
+        console.log(`Setup error: ${session.errorMessage}`);
     }
-    return lastSession;
 }
 async function runList(args) {
     const json = hasFlag(args, "--json");
@@ -187,23 +298,21 @@ async function runCreate(args) {
         return 0;
     }
     const json = hasFlag(args, "--json");
+    const noWait = json || hasFlag(args, "--no-wait");
     const name = readFlag(args, "--name")?.trim();
-    const slug = readFlag(args, "--slug")?.trim();
-    const description = readFlag(args, "--description")?.trim();
-    const category = readFlag(args, "--category")?.trim();
     if (!name) {
-        console.error("Missing required --name.");
-        printCreateUsage();
+        if (json) {
+            process.stderr.write(`${JSON.stringify({ error: "Missing required --name.", code: "VALIDATION_ERROR" })}\n`);
+        }
+        else {
+            console.error("Missing required --name.");
+            printCreateUsage();
+        }
         return 1;
     }
     const auth = await resolveStoredAuth();
     try {
-        const result = await createApp({
-            name,
-            ...(slug ? { slug } : {}),
-            ...(description ? { description } : {}),
-            ...(category ? { category } : {}),
-        }, auth);
+        const result = await createApp(buildCreateAppInput(name, args), auth);
         await setActiveApp(result.app);
         trackEvent("cli.app.created");
         if (json) {
@@ -211,62 +320,60 @@ async function runCreate(args) {
                 app: { id: result.app.id, slug: result.app.slug, name: result.app.name },
                 environments: result.environments,
                 keys: result.keys,
+                provisioningSession: {
+                    id: result.provisioningSession.id,
+                    status: result.provisioningSession.status,
+                },
             }, null, 2));
             return 0;
         }
-        console.log(`Created app ${result.app.name} (${result.app.slug})`);
-        console.log("Active app updated.");
-        if (result.keys.length > 0) {
-            console.log("");
-            console.log("Initial API keys:");
-            for (const key of result.keys) {
-                console.log(`  ${key.environment}/${key.type}: ${key.key}`);
-            }
-        }
-        console.log("");
-        console.log("Provisioning infrastructure. This usually takes around 30 seconds.");
-        const provisioningSession = await waitForProvisioning(result.provisioningSession.id, auth);
-        if (provisioningSession.status === "completed") {
-            console.log("Provisioning finished successfully.");
-        }
-        else if (provisioningSession.status === "completed_with_warnings") {
-            console.log("Provisioning finished with warnings.");
-        }
-        else if (provisioningSession.status === "failed") {
-            console.log("Provisioning failed.");
+        await printCreateResultHuman(result, noWait, auth);
+        return 0;
+    }
+    catch (error) {
+        if (json) {
+            writeJsonCommandError(error, "Failed to create app");
         }
         else {
-            console.log("Provisioning is still running in the background.");
-            console.log(`Check the dashboard or run \`buildspace app hosting status ${result.app.slug}\` in a moment for the latest state.`);
+            console.error(error instanceof Error ? error.message : "Failed to create app");
         }
-        if (provisioningSession.warnings.length > 0) {
-            console.log("");
-            console.log("Setup warnings:");
-            for (const warning of provisioningSession.warnings) {
-                console.log(`  - ${warning}`);
-            }
-        }
-        if (provisioningSession.errorMessage) {
-            console.log("");
-            console.log(`Provisioning error: ${provisioningSession.errorMessage}`);
+        return 1;
+    }
+}
+function buildHostingEnvMap(hosting) {
+    const envMap = {};
+    for (const env of hosting.environments) {
+        const url = env.hosting?.managedDomain
+            ? `https://${env.hosting.managedDomain}`
+            : (env.hosting?.publicUrl ?? null);
+        envMap[env.envType] = { status: env.hosting?.status ?? "disabled", url };
+    }
+    return envMap;
+}
+async function runStatus(args) {
+    const json = hasFlag(args, "--json");
+    const auth = await resolveStoredAuth();
+    try {
+        const context = await resolveAppContext(normalizeAppArgs(args), auth);
+        const hosting = await getHostingState(context.app.id, auth);
+        if (json) {
+            const { app } = context;
+            console.log(JSON.stringify({
+                app: { id: app.id, slug: app.slug, name: app.name },
+                hosting: buildHostingEnvMap(hosting),
+            }, null, 2));
+            return 0;
         }
-        console.log("");
-        console.log("Next steps:");
-        console.log("  To connect this app locally and get it running in your terminal:");
-        console.log(`  buildspace init --app ${result.app.slug}   # clone, set up Bun, and pull dev env vars`);
-        console.log(`  cd ${result.app.slug}`);
-        console.log("  bun dev                                    # start local development");
-        console.log("");
-        console.log("  Run your coding agent of choice to build your app.");
-        console.log("");
-        console.log("  When you're ready to ship a dev deploy:");
-        console.log("  buildspace deploy");
-        await maybeShowSkillsHint();
+        printHostingStatus(hosting);
         return 0;
     }
     catch (error) {
-        const message = error instanceof Error ? error.message : "Failed to create app";
-        console.error(message);
+        if (json) {
+            writeJsonCommandError(error, "Failed to get status");
+        }
+        else {
+            console.error(error instanceof Error ? error.message : "Failed to get status");
+        }
         return 1;
     }
 }
@@ -417,6 +524,8 @@ export function runAppCommand(args) {
             return runUse(args.slice(1));
         case "create":
             return runCreate(args.slice(1));
+        case "status":
+            return runStatus(args.slice(1));
         case "delete":
             return runDelete(args.slice(1));
         case "hosting":