feat: finalize mcp command

Author: Swiftwork

packages/cli/commands/companies.ts

@@ -20,13 +20,14 @@ export const listCompaniesAction = async (options: { filter?: string }) => {
   if (!appId) {
     return handleError(new MissingAppIdError(), "Companies List");
   }
-  const app = getApp(appId);
-  const production = app.environments.find((e) => e.isProduction);
-  if (!production) {
-    return handleError(new MissingEnvIdError(), "Companies List");
-  }
 
   try {
+    const app = getApp(appId);
+    const production = app.environments.find((e) => e.isProduction);
+    if (!production) {
+      return handleError(new MissingEnvIdError(), "Companies List");
+    }
+
     spinner = ora(
       `Loading companies for app ${chalk.cyan(app.name)}${baseUrlSuffix(baseUrl)}...`,
     ).start();

packages/cli/commands/features.ts

@@ -4,7 +4,7 @@ import { Argument, Command } from "commander";
 import { relative } from "node:path";
 import ora, { Ora } from "ora";
 
-import { getApp, getOrg } from "../services/bootstrap.js";
+import { App, getApp, getOrg } from "../services/bootstrap.js";
 import {
   createFeature,
   Feature,
@@ -54,7 +54,14 @@ export const createFeatureAction = async (
   if (!appId) {
     return handleError(new MissingAppIdError(), "Features Create");
   }
-  const app = getApp(appId);
+
+  let app: App;
+  try {
+    app = getApp(appId);
+  } catch (error) {
+    return handleError(error, "Features Create");
+  }
+
   const production = app.environments.find((e) => e.isProduction);
 
   try {
@@ -102,13 +109,13 @@ export const listFeaturesAction = async () => {
   if (!appId) {
     return handleError(new MissingAppIdError(), "Features Create");
   }
-  const app = getApp(appId);
-  const production = app.environments.find((e) => e.isProduction);
-  if (!production) {
-    return handleError(new MissingEnvIdError(), "Features Types");
-  }
 
   try {
+    const app = getApp(appId);
+    const production = app.environments.find((e) => e.isProduction);
+    if (!production) {
+      return handleError(new MissingEnvIdError(), "Features Types");
+    }
     spinner = ora(
       `Loading features of app ${chalk.cyan(app.name)}${baseUrlSuffix(baseUrl)}...`,
     ).start();
@@ -142,7 +149,13 @@ export const generateTypesAction = async () => {
     return handleError(new MissingAppIdError(), "Features Types");
   }
 
-  const app = getApp(appId);
+  let app: App;
+  try {
+    app = getApp(appId);
+  } catch (error) {
+    return handleError(error, "Features Types");
+  }
+
   const production = app.environments.find((e) => e.isProduction);
   if (!production) {
     return handleError(new MissingEnvIdError(), "Features Types");
@@ -161,8 +174,7 @@ export const generateTypesAction = async () => {
     );
   } catch (error) {
     spinner?.fail("Loading features failed.");
-    void handleError(error, "Features Types");
-    return;
+    return handleError(error, "Features Types");
   }
 
   try {
@@ -202,7 +214,13 @@ export const featureAccessAction = async (
     return handleError(new MissingAppIdError(), "Feature Access");
   }
 
-  const app = getApp(appId);
+  let app: App;
+  try {
+    app = getApp(appId);
+  } catch (error) {
+    return handleError(error, "Features Types");
+  }
+
   const production = app.environments.find((e) => e.isProduction);
   if (!production) {
     return handleError(new MissingEnvIdError(), "Feature Access");

packages/cli/commands/init.ts

@@ -32,7 +32,7 @@ export const initAction = async (args: InitArgs = {}) => {
 
     // Load apps
     spinner = ora(`Loading apps from ${chalk.cyan(baseUrl)}...`).start();
-    apps = await listApps();
+    apps = listApps();
     spinner.succeed(`Loaded apps from ${chalk.cyan(baseUrl)}.`);
   } catch (error) {
     spinner?.fail("Loading apps failed.");
@@ -42,20 +42,15 @@ export const initAction = async (args: InitArgs = {}) => {
 
   try {
     let appId: string | undefined;
-    const nonDemoApps = apps.filter((app) => !app.demo);
+    const nonDemoApp = apps.find((app) => !app.demo);
 
-    // If there is only one non-demo app, select it automatically
     if (apps.length === 0) {
       throw new Error("You don't have any apps yet. Please create one.");
-    } else if (nonDemoApps.length === 1) {
-      appId = nonDemoApps[0].id;
-      console.log(
-        `Automatically selected app ${chalk.cyan(nonDemoApps[0].name)} (${chalk.cyan(appId)}).`,
-      );
     } else {
       const longestName = Math.max(...apps.map((app) => app.name.length));
       appId = await select({
         message: "Select an app",
+        default: nonDemoApp?.id,
         choices: apps.map((app) => ({
           name: `${app.name.padEnd(longestName, " ")}${app.demo ? " [Demo]" : ""}`,
           value: app.id,