@swell/cli 2.4.1 → 2.5.1

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

@@ -8,6 +8,7 @@ export default class AppDev extends PushAppCommand {
         'frontend-port': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         'storefront-id': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         'storefront-select': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        yes: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
     static orientation: {
         env: string;

package/dist/commands/app/dev.js

@@ -37,6 +37,11 @@ export default class AppDev extends PushAppCommand {
             default: false,
             description: 'for storefront apps, prompt to select a storefront to preview',
         }),
+        // Declared here so oclif accepts -y; passed through to app:frontend:dev via this.argv
+        yes: Flags.boolean({
+            char: 'y',
+            description: 'skip prompts (non-interactive mode)',
+        }),
     };
     static orientation = {
         env: 'test',

package/dist/commands/app/frontend/deploy.d.ts

@@ -6,6 +6,7 @@ export default class AppFrontendDeploy extends PushAppCommand {
         force: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         'storefront-id': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         'storefront-select': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        yes: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
     static orientation: {
         env: string;

package/dist/commands/app/frontend/deploy.js

@@ -22,6 +22,10 @@ the app's deployment URL and push the updated frontend files.`;
             default: false,
             description: 'prompt to select a storefront to preview deployment with',
         }),
+        yes: Flags.boolean({
+            char: 'y',
+            description: 'skip prompts (non-interactive mode)',
+        }),
     };
     static orientation = {
         env: 'test',

package/dist/commands/app/frontend/dev.d.ts

@@ -2,10 +2,11 @@ import { PushAppCommand } from '../../../push-app-command.js';
 export default class AppFrontendDev extends PushAppCommand {
     static examples: string[];
     static flags: {
-        'proxy-port': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<number, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        'proxy-port': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         'storefront-id': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         'storefront-select': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         'app-dev': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        yes: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         'no-push': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         port: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         'frontend-port': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;

package/dist/commands/app/frontend/dev.js

@@ -1,5 +1,5 @@
 import { Flags } from '@oclif/core';
-import { getProjectCommands, } from '../../../lib/apps/index.js';
+import { CUSTOM_FRAMEWORK_SLUG, getManualDevHint, getProjectCommands, } from '../../../lib/apps/index.js';
 import { default as localConfig } from '../../../lib/config.js';
 import style from '../../../lib/style.js';
 import { PushAppCommand } from '../../../push-app-command.js';
@@ -15,8 +15,7 @@ export default class AppFrontendDev extends PushAppCommand {
     static flags = {
         ...AppDev.flags,
         'proxy-port': Flags.integer({
-            description: 'specify the port for an existing frontend proxy',
-            default: 3001,
+            description: 'specify the port for the frontend proxy',
         }),
         'storefront-id': Flags.string({
             description: 'identify a storefront to preview with and push theme files to',
@@ -29,6 +28,10 @@ export default class AppFrontendDev extends PushAppCommand {
             description: 'indicates frontend app is running in app dev mode',
             default: false,
         }),
+        yes: Flags.boolean({
+            char: 'y',
+            description: 'skip prompts (non-interactive mode)',
+        }),
     };
     static orientation = {
         env: 'test',
@@ -70,11 +73,32 @@ export default class AppFrontendDev extends PushAppCommand {
         if (!projectType) {
             return;
         }
+        // Manual mode for unrecognized frameworks
+        if (projectType.slug === CUSTOM_FRAMEWORK_SLUG) {
+            const hintCommand = getManualDevHint(this.appPath, serverPort);
+            const currentStore = localConfig.getDefaultStore();
+            const sessionId = localConfig.getSessionId(currentStore);
+            this.log(`Detected a frontend project but could not identify the framework.`);
+            this.log(`Start your dev server manually on port ${serverPort}:\n`);
+            this.log(`  cd frontend && ${hintCommand}\n`);
+            this.log(`The Swell tunnel is ready and will route traffic once your server is running.\n`);
+            this.logAppLocalUrl(currentStore, sessionId);
+            if (!isAppDev) {
+                this.watchForChanges();
+            }
+            // Keep the process alive so the tunnel remains open
+            await new Promise(() => { });
+            return;
+        }
         // Get commands transformed for the detected package manager
         const { devCommand } = getProjectCommands(this.appPath, projectType);
         const currentStore = localConfig.getDefaultStore();
         let serverReadyDetected = false;
         await this.execFrontend(devCommand.replace('${PORT}', String(serverPort)), (string) => {
+            // Shared: Hide Vite noise output common across frameworks
+            if (/press h \+ enter to show help/i.test(string)) {
+                return false;
+            }
             // Framework-specific output handling and ready detection
             switch (projectType.slug) {
                 case 'nextjs': {
@@ -120,10 +144,6 @@ export default class AppFrontendDev extends PushAppCommand {
                     break;
                 }
                 case 'angular': {
-                    // 1. NOISE FILTER: Hide unwanted output
-                    if (string.includes('press h + enter to show help')) {
-                        return false;
-                    }
                     // 2. URL FILTER: Hide localhost/network URLs (confusing - users should use Swell tunnel)
                     if (/➜\s+local:\s+http:\/\//i.test(string)) {
                         return false;
@@ -143,9 +163,23 @@ export default class AppFrontendDev extends PushAppCommand {
                     break;
                 }
                 case 'hono': {
-                    // 2. URL FILTER: Hide localhost URLs (confusing - users should use Swell tunnel)
-                    // Note: For Hono, the ready signal IS the URL line, so we handle both in section 3
-                    // 3. READY DETECTION: Detect server ready, show our message, hide the URL
+                    // 2. URL FILTER: Hide localhost/network/debug URLs (confusing - users should use Swell tunnel)
+                    // Vite-based Hono apps output "➜  Local:   http://localhost:PORT/"
+                    if (/➜\s+local:\s+http:\/\//i.test(string) ||
+                        /➜\s+network:/i.test(string) ||
+                        /➜\s+debug:\s+http:\/\//i.test(string)) {
+                        if (!serverReadyDetected) {
+                            serverReadyDetected = true;
+                            this.log(`Started ${projectType.name} dev server on port ${serverPort}.\n`);
+                            const sessionId = localConfig.getSessionId(currentStore);
+                            setTimeout(() => this.logAppLocalUrl(currentStore, sessionId), 100);
+                            if (!isAppDev) {
+                                this.watchForChanges();
+                            }
+                        }
+                        return false;
+                    }
+                    // 3. READY DETECTION: Native Hono dev server outputs "ready on http://localhost:PORT"
                     if (!serverReadyDetected &&
                         /ready on http:\/\/localhost:\d+/i.test(string)) {
                         serverReadyDetected = true;
@@ -155,7 +189,7 @@ export default class AppFrontendDev extends PushAppCommand {
                         if (!isAppDev) {
                             this.watchForChanges();
                         }
-                        return false; // Hide the "Ready on localhost" line
+                        return false;
                     }
                     break;
                 }

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

@@ -7,9 +7,7 @@ export default class AppPush extends PushAppCommand {
     static description: string;
     static examples: string[];
     static flags: any;
-    static orientation: {
-        env: string;
-    };
+    static orientation: AppCommandOrientation;
     static summary: string;
     resolvePushPaths(file: string, appPathFlag?: string): {
         filePath: string;

package/dist/commands/theme/dev.d.ts

@@ -9,6 +9,7 @@ export default class AppThemeDev extends PushAppCommand {
         'storefront-id': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         'storefront-select': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         env: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        yes: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
     static summary: string;
     appType: string;

package/dist/commands/theme/dev.js

@@ -41,6 +41,10 @@ export default class AppThemeDev extends PushAppCommand {
             char: 'e',
             description: 'target environment to push to, defaults to live',
         }),
+        yes: Flags.boolean({
+            char: 'y',
+            description: 'skip prompts (non-interactive mode)',
+        }),
     };
     static summary = `Run a theme in dev mode from your local machine.`;
     appType = 'theme';

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

@@ -11,7 +11,9 @@ export default class AppThemePush extends AppPush {
         'storefront-select': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         env: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         'sync-app': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        yes: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
+    static orientation: AppCommandOrientation;
     static summary: string;
     appType: string;
     run(): Promise<void>;

package/dist/commands/theme/push.js

@@ -53,7 +53,13 @@ ${Object.values(ThemeConfigPaths)
             default: false,
             description: 'push app files in addition to theme files',
         }),
+        yes: Flags.boolean({
+            char: 'y',
+            description: 'skip prompts (non-interactive mode)',
+        }),
     };
+    // No fixed env — respect saved storefront env (test or live)
+    static orientation = {};
     static summary = 'Push local files to your Swell theme.';
     appType = 'theme';
     async run() {
@@ -77,7 +83,7 @@ ${Object.values(ThemeConfigPaths)
             this.themeSyncApp = true;
         }
         await this.getStorefrontToPush(flags);
-        await this.logOrientation();
+        await this.logOrientation({ env: this.api.envId || 'live' });
         if (file) {
             const { filePath, relativePath } = this.resolvePushPaths(file);
             // Push individual files if not referring to the whole app path

package/dist/create-app-command.js

@@ -429,7 +429,7 @@ export class CreateAppCommand extends SwellCommand {
             // Required for yarn workspaces, good practice for all package managers
             private: true,
             scripts: {
-                typecheck: '([ -z "$(find functions -name \'*.ts\' 2>/dev/null | head -1)" ] || tsc --noEmit) && ([ ! -f test/tsconfig.json ] || tsc --noEmit -p test) && ([ ! -f frontend/tsconfig.json ] || tsc --noEmit -p frontend)',
+                typecheck: '([ -z "$(find functions -name \'*.ts\' 2>/dev/null | head -1)" ] || tsc --noEmit) && ([ ! -f test/tsconfig.json ] || tsc --build --noEmit test) && ([ ! -f frontend/tsconfig.json ] || tsc --build --noEmit frontend)',
             },
             version: config.get('version'),
         };

package/dist/lib/apps/index.d.ts

@@ -126,6 +126,7 @@ export interface FrontendProjectType {
     name: string;
     slug: string;
 }
+export declare const CUSTOM_FRAMEWORK_SLUG = "custom";
 export declare const FrontendProjectTypes: FrontendProjectType[];
 export declare function getFrontendProjectSlugs(withNone?: boolean, withLegacy?: boolean): string[];
 export declare function getFrontendProjectValidValues(withNone?: boolean, withLegacy?: boolean): string;
@@ -140,6 +141,11 @@ export declare function getProjectCommands(appPath: string, projectType: Fronten
     buildCommand?: string;
     devCommand: string;
 };
+/**
+ * Get a suggested dev command for an unrecognized frontend project,
+ * translated for the detected package manager.
+ */
+export declare function getManualDevHint(appPath: string, port: number): string;
 export declare function getConfigTypeFromPath(path: string): ConfigType | undefined;
 export declare function getConfigTypeKeyFromValue(value: string): string | undefined;
 export declare function filePathExists(filePath: string): boolean;

package/dist/lib/apps/index.js

@@ -114,6 +114,8 @@ export var ConfigInputFields;
     ConfigInputFields["VALUES"] = "values";
     ConfigInputFields["VERSION"] = "version";
 })(ConfigInputFields || (ConfigInputFields = {}));
+// Slug for unrecognized frontend frameworks (manual dev server mode)
+export const CUSTOM_FRAMEWORK_SLUG = 'custom';
 // Frontend project types - all use direct commands run from frontend/ directory
 export const FrontendProjectTypes = [
     {
@@ -133,7 +135,7 @@ export const FrontendProjectTypes = [
         slug: 'angular',
     },
     {
-        devCommand: 'npx wrangler dev --port ${PORT}',
+        devCommand: 'npm run dev -- --port ${PORT}',
         installCommand: 'npm create cloudflare@latest -- frontend --framework=hono  --deploy=false --git=false',
         mainPackage: 'hono',
         name: 'Hono',
@@ -198,6 +200,16 @@ export function getFrontendProjectType(appPath) {
                     return detectedType;
                 }
             }
+            // Fallback: if package.json has a dev script, treat as unrecognized framework
+            if (pkg.scripts?.dev) {
+                return {
+                    buildCommand: pkg.scripts?.build ? 'npm run build' : '',
+                    devCommand: '',
+                    mainPackage: '',
+                    name: 'Custom',
+                    slug: CUSTOM_FRAMEWORK_SLUG,
+                };
+            }
         }
         catch {
             // Ignore JSON parse errors, try next path
@@ -220,6 +232,14 @@ export function getProjectCommands(appPath, projectType) {
         devCommand: transformCommand(projectType.devCommand, pm),
     };
 }
+/**
+ * Get a suggested dev command for an unrecognized frontend project,
+ * translated for the detected package manager.
+ */
+export function getManualDevHint(appPath, port) {
+    const pm = detectPackageManager(appPath);
+    return transformCommand(`npm run dev -- --port ${port}`, pm);
+}
 export function getConfigTypeFromPath(path) {
     for (const type in AllConfigPaths) {
         if (AllConfigPaths[type] === path) {

package/dist/lib/config.js

@@ -7,12 +7,13 @@ import prodEnv from '../env/production.js';
 import reviewEnv from '../env/review.js';
 import stagingEnv from '../env/staging.js';
 import style from './style.js';
+const swellHome = process.env.SWELL_CONFIG_HOME || homedir();
 const configPath = process.env.NODE_ENV === 'test'
     ? path.resolve(process.cwd(), 'test', '.swell', 'config.json')
-    : path.resolve(homedir(), '.swell', 'config.json');
+    : path.resolve(swellHome, '.swell', 'config.json');
 const configDir = process.env.NODE_ENV === 'test'
     ? path.resolve(process.cwd(), 'test', 'fixtures')
-    : homedir();
+    : swellHome;
 const configStore = new Configstore('swell', {
 // user: {...},
 // defaultStore: '<store_id>',

package/dist/push-app-command.d.ts

@@ -21,7 +21,7 @@ export declare abstract class PushAppCommand extends RemoteAppCommand {
     protected showFrontendMigrationError(): never;
     buildFrontend(projectType?: FrontendProjectType): Promise<void>;
     chooseAppToPull(query?: any): Promise<App>;
-    createAppStorefront(hasOtherStorefronts?: boolean): Promise<any>;
+    createAppStorefront(hasOtherStorefronts?: boolean, nonInteractive?: boolean): Promise<any>;
     deployAppFrontend(force?: boolean, log?: boolean): Promise<void>;
     deployFrontend(projectType: FrontendProjectType): Promise<string>;
     ensureAppExists(file?: string, shouldCreate?: boolean): Promise<boolean>;
@@ -59,6 +59,7 @@ export declare abstract class PushAppCommand extends RemoteAppCommand {
         env?: string;
         'storefront-id'?: string;
         'storefront-select'?: boolean;
+        yes?: boolean;
     }): Promise<any>;
     setStorefrontEnv(flags: {
         env?: string;

package/dist/push-app-command.js

@@ -6,7 +6,7 @@ import * as path from 'node:path';
 import Stream from 'node:stream';
 import ora from 'ora';
 import { default as swellConfig } from './lib/app-config.js';
-import { ConfigType, getFrontendProjectValidValues, allConfigFilesInDir, appConfigFromFile, filePathExists, filePathExistsAsync, findAppConfig, getAppSlugId, getConfigTypeFromPath, getConfigTypeKeyFromValue, getFrontendProjectType, getProjectCommands, globAllFilesByPath, hashString, isPathDirectory, } from './lib/apps/index.js';
+import { ConfigType, getFrontendProjectValidValues, allConfigFilesInDir, CUSTOM_FRAMEWORK_SLUG, appConfigFromFile, filePathExists, filePathExistsAsync, findAppConfig, getAppSlugId, getConfigTypeFromPath, getConfigTypeKeyFromValue, getFrontendProjectType, getProjectCommands, globAllFilesByPath, hashString, isPathDirectory, } from './lib/apps/index.js';
 import { getGlobIgnorePathsChecker } from './lib/apps/paths.js';
 import { default as localConfig } from './lib/config.js';
 import { toAppId } from './lib/create/index.js';
@@ -110,6 +110,14 @@ export class PushAppCommand extends RemoteAppCommand {
             this.showFrontendMigrationError();
             return; // unreachable but helps TypeScript narrow the type
         }
+        // Skip automatic build for unrecognized frameworks
+        if (projectType.slug === CUSTOM_FRAMEWORK_SLUG) {
+            if (projectType.buildCommand) {
+                this.log(`Skipping automatic frontend build for unrecognized framework.\n` +
+                    `Run your build command manually before deploying.\n`);
+            }
+            return;
+        }
         // Get commands transformed for the detected package manager
         const { buildCommand } = getProjectCommands(this.appPath, projectType);
         if (!buildCommand) {
@@ -140,7 +148,7 @@ export class PushAppCommand extends RemoteAppCommand {
         this.log();
         return app;
     }
-    async createAppStorefront(hasOtherStorefronts = true) {
+    async createAppStorefront(hasOtherStorefronts = true, nonInteractive = false) {
         let appId;
         let themeAppId;
         if (this.app.type === 'theme') {
@@ -155,6 +163,12 @@ export class PushAppCommand extends RemoteAppCommand {
             if (compatibleStorefrontApps.length === 0) {
                 this.error('No compatible storefront apps found for this theme. Install a new storefront app first.');
             }
+            if (compatibleStorefrontApps.length > 1 && nonInteractive) {
+                const appList = compatibleStorefrontApps
+                    .map((app) => `  ${app.id} (${app.name})`)
+                    .join('\n');
+                this.error(`Multiple compatible storefront apps found. Run without -y to select one interactively:\n${appList}`);
+            }
             const targetApp = compatibleStorefrontApps.length === 1
                 ? compatibleStorefrontApps[0]
                 : await select({
@@ -169,37 +183,49 @@ export class PushAppCommand extends RemoteAppCommand {
         }
         else if (this.app.type === 'storefront') {
             appId = this.app.id;
-            const themeApps = await this.handleRequestErrors(async () => this.api.get({
-                adminPath: `/apps?type=theme`,
-            }));
-            const compatibleThemeApps = themeApps.results.filter((app) => app.installed &&
-                Object.keys(app.compatibilities || {}).includes(this.app.private_id));
-            if (compatibleThemeApps.length === 0) {
-                this.error('No compatible theme apps found for this storefront. Install a new theme app first.');
-            }
-            let targetApp;
-            if (compatibleThemeApps.length === 1) {
-                targetApp = compatibleThemeApps[0];
+            const requiresTheme = this.app.storefront?.theme?.provider === 'app';
+            if (requiresTheme) {
+                const themeApps = await this.handleRequestErrors(async () => this.api.get({
+                    adminPath: `/apps?type=theme`,
+                }));
+                const compatibleThemeApps = themeApps.results.filter((app) => app.installed &&
+                    Object.keys(app.compatibilities || {}).includes(this.app.private_id));
+                if (compatibleThemeApps.length === 0) {
+                    this.error('No compatible theme apps found for this storefront. Install a new theme app first.');
+                }
+                let targetApp;
+                if (compatibleThemeApps.length === 1) {
+                    targetApp = compatibleThemeApps[0];
+                }
+                else if (nonInteractive) {
+                    const appList = compatibleThemeApps
+                        .map((app) => `  ${app.id} (${app.name})`)
+                        .join('\n');
+                    this.error(`Multiple compatible theme apps found. Run without -y to select one interactively:\n${appList}`);
+                }
+                else {
+                    targetApp = await select({
+                        choices: compatibleThemeApps.map((app) => ({
+                            name: `${style.appConfigValue(app.name)} v${app.version}`,
+                            value: app,
+                        })),
+                        message: 'Choose a theme app',
+                    });
+                    this.log();
+                }
+                themeAppId = targetApp.id;
+                this.log(`${style.success('✔')} Using ${style.appConfigValue(targetApp.name)} v${targetApp.version}\n`);
             }
             else {
-                targetApp = await select({
-                    choices: compatibleThemeApps.map((app) => ({
-                        name: `${style.appConfigValue(app.name)} v${app.version}`,
-                        value: app,
-                    })),
-                    message: 'Choose a theme app',
-                });
-                this.log();
+                this.log(`${style.success('✔')} Creating storefront without theme app\n`);
             }
-            themeAppId = targetApp.id;
-            this.log(`${style.success('✔')} Using ${style.appConfigValue(targetApp.name)} v${targetApp.version}\n`);
         }
         else {
             this.error('App type not supported for storefront creation');
         }
         let name;
         // Leave name blank when syncing theme app to avoid blocking push
-        if (hasOtherStorefronts && !this.themeSyncApp) {
+        if (hasOtherStorefronts && !this.themeSyncApp && !nonInteractive) {
             name = await input({
                 default: this.app.name,
                 message: 'Name your storefront',
@@ -504,6 +530,7 @@ export class PushAppCommand extends RemoteAppCommand {
         return this.storefront;
     }
     async getStorefrontToPush(flags = {}) {
+        const nonInteractive = flags.yes || false;
         const targetStorefront = flags['storefront-id'];
         const defaultStorefront = localConfig.getDefaultStorefront(this.appPath);
         let storefrontId = targetStorefront || defaultStorefront?.id;
@@ -518,22 +545,37 @@ export class PushAppCommand extends RemoteAppCommand {
             // Choose storefront if multiple storefronts exist
             // Except if we are syncing a theme app, then force create new storefront if not found
             if (storefronts.count > 0 && !this.themeSyncApp) {
-                storefrontId = await select({
-                    choices: [
-                        ...storefronts.results.map((storefront) => ({
-                            name: `${style.appConfigValue(storefront.name)} (${storefront.id}) ${storefront.primary ? '[primary]' : ''}`,
-                            value: storefront.id,
-                        })),
-                        {
-                            name: 'Create new storefront',
-                            value: null,
-                        },
-                    ],
-                    message: 'Choose a storefront',
-                });
+                if (nonInteractive) {
+                    if (storefronts.count === 1) {
+                        const sf = storefronts.results[0];
+                        storefrontId = sf.id;
+                        this.log(`${style.success('✔')} Using storefront ${style.appConfigValue(sf.name)} (${sf.id})\n`);
+                    }
+                    else {
+                        const sfList = storefronts.results
+                            .map((sf) => `  ${sf.id} (${sf.name})${sf.primary ? ' [primary]' : ''}`)
+                            .join('\n');
+                        this.error(`Multiple storefronts found. Specify one with --storefront-id:\n${sfList}`);
+                    }
+                }
+                else {
+                    storefrontId = await select({
+                        choices: [
+                            ...storefronts.results.map((storefront) => ({
+                                name: `${style.appConfigValue(storefront.name)} (${storefront.id}) ${storefront.primary ? '[primary]' : ''}`,
+                                value: storefront.id,
+                            })),
+                            {
+                                name: 'Create new storefront',
+                                value: null,
+                            },
+                        ],
+                        message: 'Choose a storefront',
+                    });
+                }
             }
             if (!storefrontId) {
-                this.storefront = await this.createAppStorefront(storefronts.count > 0);
+                this.storefront = await this.createAppStorefront(storefronts.count > 0, nonInteractive);
             }
         }
         if (storefrontId) {
@@ -547,7 +589,7 @@ export class PushAppCommand extends RemoteAppCommand {
                 }
                 this.log(`Storefront ${style.appConfigValue(storefrontId)} not found.\n`);
                 localConfig.setDefaultStorefront(this.appPath, '');
-                return this.getStorefrontToPush();
+                return this.getStorefrontToPush({ yes: nonInteractive });
             }
         }
         this.app = await this.getApp(this.app.id);
@@ -758,7 +800,9 @@ export class PushAppCommand extends RemoteAppCommand {
                 $environment_id: 'test',
                 frontend: {
                     deployment_hash: deploymentHash,
-                    framework: projectType.slug,
+                    ...(projectType.slug !== CUSTOM_FRAMEWORK_SLUG && {
+                        framework: projectType.slug,
+                    }),
                     service: 'cloudflare',
                     url: deploymentUrl,
                 },

package/oclif.manifest.json

@@ -727,6 +727,13 @@
           "name": "storefront-select",
           "allowNo": false,
           "type": "boolean"
+        },
+        "yes": {
+          "char": "y",
+          "description": "skip prompts (non-interactive mode)",
+          "name": "yes",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -2483,6 +2490,13 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "yes": {
+          "char": "y",
+          "description": "skip prompts (non-interactive mode)",
+          "name": "yes",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -2770,6 +2784,13 @@
           "name": "sync-app",
           "allowNo": false,
           "type": "boolean"
+        },
+        "yes": {
+          "char": "y",
+          "description": "skip prompts (non-interactive mode)",
+          "name": "yes",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -2780,9 +2801,7 @@
       "pluginType": "core",
       "summary": "Push local files to your Swell theme.",
       "delayOrientation": true,
-      "orientation": {
-        "env": "test"
-      },
+      "orientation": {},
       "isESM": true,
       "relativePath": [
         "dist",
@@ -2827,6 +2846,13 @@
           "name": "storefront-select",
           "allowNo": false,
           "type": "boolean"
+        },
+        "yes": {
+          "char": "y",
+          "description": "skip prompts (non-interactive mode)",
+          "name": "yes",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -2901,10 +2927,16 @@
           "allowNo": false,
           "type": "boolean"
         },
+        "yes": {
+          "char": "y",
+          "description": "skip prompts (non-interactive mode)",
+          "name": "yes",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "proxy-port": {
-          "description": "specify the port for an existing frontend proxy",
+          "description": "specify the port for the frontend proxy",
           "name": "proxy-port",
-          "default": 3001,
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -2937,5 +2969,5 @@
       ]
     }
   },
-  "version": "2.4.1"
+  "version": "2.5.1"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swell/cli",
-  "version": "2.4.1",
+  "version": "2.5.1",
   "type": "module",
   "description": "Swell's command line interface/utility",
   "keywords": [