@stacksjs/buddy 0.58.58 → 0.58.60

package/src/commands/domains.ts

@@ -1,6 +1,6 @@
 import process from 'node:process'
 import { runAction } from '@stacksjs/actions'
-import { bgCyan, bold, intro, italic, outro, prompts } from '@stacksjs/cli'
+import { bgCyan, bold, intro, italic, log, outro, prompts } from '@stacksjs/cli'
 import { config } from '@stacksjs/config'
 import { addDomain } from '@stacksjs/dns'
 import { ExitCode } from '@stacksjs/types'
@@ -64,6 +64,8 @@ export function domains(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (domain: string, options: DomainsOptions) => {
+      log.debug('Running `buddy domains:purchase <domain>` ...', options)
+
       options.domain = domain
       const startTime = await intro('buddy domains:purchase')
       const result = await runAction(Action.DomainsPurchase, options)
@@ -103,6 +105,8 @@ export function domains(buddy: CLI) {
     .command('domains:add <domain>', descriptions.add)
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: DomainsOptions) => {
+      log.debug('Running `buddy domains:add <domain>` ...', options)
+
       const startTime = await intro('buddy domains:add')
       const result = await addDomain({
         ...options,
@@ -123,6 +127,8 @@ export function domains(buddy: CLI) {
     .option('--yes', descriptions.skip, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: DomainsOptions) => {
+      log.debug('Running `buddy domains:remove <domain>` ...', options)
+
       const domain = options.domain || config.app.url
       const opts = { ...options, domain }
       const startTime = await intro('buddy domains:remove')

package/src/commands/fresh.ts

@@ -2,12 +2,12 @@ import process from 'node:process'
 import { ExitCode } from '@stacksjs/types'
 import type { CLI, FreshOptions } from '@stacksjs/types'
 import { runAction } from '@stacksjs/actions'
-import { intro, outro } from '@stacksjs/cli'
+import { intro, log, outro } from '@stacksjs/cli'
 import { Action } from '@stacksjs/enums'
 
 export function fresh(buddy: CLI) {
   const descriptions = {
-    fresh: 'Reinstalls your npm dependencies',
+    fresh: 'Re-installs your npm dependencies',
     project: 'Target a specific project',
     verbose: 'Enable verbose output',
   }
@@ -17,6 +17,8 @@ export function fresh(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: FreshOptions) => {
+      log.debug('Running `buddy fresh` ...', options)
+
       const perf = await intro('buddy fresh')
       const result = await runAction(Action.Fresh, { ...options, stdout: 'inherit' })
 

package/src/commands/generate.ts

@@ -10,9 +10,8 @@ import {
   generateWebTypes,
   invoke as startGenerationProcess,
 } from '@stacksjs/actions'
-import { prompt } from '@stacksjs/cli'
+import { log } from '@stacksjs/cli'
 import { type CLI, ExitCode, type GeneratorOptions } from '@stacksjs/types'
-import { isString } from '@stacksjs/validation'
 
 export function generate(buddy: CLI) {
   const descriptions = {
@@ -41,25 +40,28 @@ export function generate(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: GeneratorOptions) => {
-      if (hasNoOptions(options)) {
-        let answers = await prompt.require()
-          .multiselect(descriptions.select, {
-            options: [
-              { label: '1.) TypeScript Types', value: 'types' },
-              { label: '2.) Library Entry Points', value: 'entries' },
-              { label: '3.) Web Types', value: 'web-types' },
-              { label: '4.) VS Code Custom Data', value: 'custom-data' },
-              { label: '5.) IDE Helpers', value: 'ide-helpers' },
-              { label: '6.) Component Meta', value: 'component-meta' },
-            ],
-          })
-
-        if (isString(answers))
-          answers = [answers]
-
-        // creates an object out of array and sets answers to true
-        options = (answers as Array<any>).reduce((a: any, v: any) => ({ ...a, [v]: true }), {})
-      }
+      log.debug('Running `buddy generate` ...', options)
+
+      // TODO: uncomment this
+      // if (hasNoOptions(options)) {
+      //   let answers = await prompt.require()
+      //     .multiselect(descriptions.select, {
+      //       options: [
+      //         { label: '1.) TypeScript Types', value: 'types' },
+      //         { label: '2.) Library Entry Points', value: 'entries' },
+      //         { label: '3.) Web Types', value: 'web-types' },
+      //         { label: '4.) VS Code Custom Data', value: 'custom-data' },
+      //         { label: '5.) IDE Helpers', value: 'ide-helpers' },
+      //         { label: '6.) Component Meta', value: 'component-meta' },
+      //       ],
+      //     })
+      //
+      //   if (isString(answers))
+      //     answers = [answers]
+      //
+      //   // creates an object out of array and sets answers to true
+      //   options = (answers as Array<any>).reduce((a: any, v: any) => ({ ...a, [v]: true }), {})
+      // }
 
       await startGenerationProcess(options)
 
@@ -72,6 +74,7 @@ export function generate(buddy: CLI) {
     .option('--verbose', descriptions.verbose, { default: false })
     .alias('types:generate')
     .action(async (options: GeneratorOptions) => {
+      log.debug('Running `buddy generate:types` ...', options)
       await generateTypes(options)
     })
 
@@ -80,6 +83,7 @@ export function generate(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: GeneratorOptions) => {
+      log.debug('Running `buddy generate:entries` ...', options)
       await generateLibEntries(options)
     })
 
@@ -88,6 +92,7 @@ export function generate(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: GeneratorOptions) => {
+      log.debug('Running `buddy generate:web-types` ...', options)
       await generateWebTypes(options)
     })
 
@@ -96,6 +101,7 @@ export function generate(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: GeneratorOptions) => {
+      log.debug('Running `buddy generate:vscode-custom-data` ...', options)
       await generateVsCodeCustomData(options)
     })
 
@@ -104,6 +110,7 @@ export function generate(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: GeneratorOptions) => {
+      log.debug('Running `buddy generate:ide-helpers` ...', options)
       await generateIdeHelpers(options)
     })
 
@@ -112,6 +119,7 @@ export function generate(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: GeneratorOptions) => {
+      log.debug('Running `buddy generate:component-meta` ...', options)
       await generateComponentMeta(options)
     })
 
@@ -119,13 +127,15 @@ export function generate(buddy: CLI) {
     .command('generate:pkgx-config', descriptions.pkgx)
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
-    .action(() => {
+    .action((options: GeneratorOptions) => {
+      log.debug('Running `buddy generate:pkgx-config` ...', options)
       generatePkgxConfig()
     })
 
   buddy
     .command('generate:migrations', 'Generate Migrations')
-    .action(() => {
+    .action((options: GeneratorOptions) => {
+      log.debug('Running `buddy generate:migrations` ...', options)
       generateMigrations()
     })
 
@@ -135,6 +145,6 @@ export function generate(buddy: CLI) {
   })
 }
 
-function hasNoOptions(options: GeneratorOptions) {
-  return !options.types && !options.entries && !options.webTypes && !options.customData && !options.ideHelpers && !options.componentMeta
-}
+// function hasNoOptions(options: GeneratorOptions) {
+//   return !options.types && !options.entries && !options.webTypes && !options.customData && !options.ideHelpers && !options.componentMeta
+// }

package/src/commands/http.ts

@@ -4,7 +4,7 @@ import type { CLI } from '@stacksjs/types'
 import { config } from '@stacksjs/config'
 
 // import { path } from '@stacksjs/path'
-import { runCommandSync } from '@stacksjs/cli'
+import { log, runCommandSync } from '@stacksjs/cli'
 
 // function runCommand(command: string): Promise<string> {
 //   return new Promise((resolve, reject) => {
@@ -39,6 +39,8 @@ export function http(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     // .option('--verbose', descriptions.verbose, { default: false })
     .action(async (domain: string | undefined, options: HttpOptions) => {
+      log.debug('Running `buddy http [domain]` ...', options)
+
       // Convert options object to command-line options string
       const optionsString = Object.entries(options)
         .filter(([key, value]) => key !== '--' && key.length > 1 && value !== false) // filter out '--' key and short options
@@ -46,9 +48,9 @@ export function http(buddy: CLI) {
         .join(' ')
 
       const command = `http GET ${domain || config.app.url} ${optionsString}`
-      // eslint-disable-next-line no-console
-      console.log(`Running command: ${command}`)
-      runCommandSync(command)
+
+      log.info(`Running command: ${command}`)
+      await runCommandSync(command)
 
       process.exit(ExitCode.Success)
     })

package/src/commands/index.ts

@@ -9,13 +9,11 @@ export * from './deploy'
 export * from './dev'
 export * from './domains'
 export * from './dns'
-export * from './example'
 export * from './fresh'
 export * from './generate'
 export * from './http'
 export * from './lint'
 export * from './list'
-export * from './inspire'
 export * from './install'
 export * from './key'
 export * from './make'

package/src/commands/install.ts

@@ -1,6 +1,6 @@
 import process from 'node:process'
 import type { CLI, InstallOptions } from '@stacksjs/types'
-import { runCommand } from '@stacksjs/cli'
+import { log, runCommand } from '@stacksjs/cli'
 import { path as p } from '@stacksjs/path'
 
 export function install(buddy: CLI) {
@@ -15,6 +15,8 @@ export function install(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('-v, --verbose', descriptions.verbose, { default: false })
     .action(async (options: InstallOptions) => {
+      log.debug('Running `buddy install` ...', options)
+
       await runCommand('bun install', {
         ...options,
         cwd: p.projectPath(),

package/src/commands/key.ts

@@ -16,6 +16,8 @@ export function key(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: KeyOptions) => {
+      log.debug('Running `buddy key:generate` ...', options)
+
       await intro('buddy key:generate')
       const result = await runAction(Action.KeyGenerate, options)
 

package/src/commands/lint.ts

@@ -18,6 +18,8 @@ export function lint(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: LintOptions) => {
+      log.debug('Running `buddy lint` ...', options)
+
       const startTime = await intro('buddy lint')
       const result = await runAction(Action.Lint, options)
 
@@ -35,6 +37,8 @@ export function lint(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: LintOptions) => {
+      log.debug('Running `buddy lint:fix` ...', options)
+
       log.info('Fixing lint errors...')
       const result = await runAction(Action.LintFix, { ...options })
 

package/src/commands/list.ts

@@ -1,7 +1,8 @@
 import process from 'node:process'
-import type { CLI } from '@stacksjs/types'
+import type { CLI, CliOptions } from '@stacksjs/types'
 import { $ } from 'bun'
 import { projectPath } from '@stacksjs/path'
+import { log } from 'stacks/logging'
 
 export function list(buddy: CLI) {
   const descriptions = {
@@ -14,8 +15,11 @@ export function list(buddy: CLI) {
     .command('list', descriptions.list)
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
-    .action(async () => {
+    .action(async (options: CliOptions) => {
+      log.debug('Running `buddy list` ...', options)
+
       $.cwd(projectPath())
+
       const test = await $`buddy --help`.text()
       const commandsSection = test.match(/Commands:.*?(?=For more info, run any command with the)/s)?.[0]
 

package/src/commands/make.ts

@@ -10,11 +10,10 @@ import {
   makePage,
   makeStack,
 } from '@stacksjs/actions'
-import { intro, italic, outro, prompt } from '@stacksjs/cli'
+import { intro, italic, outro } from '@stacksjs/cli'
 import { log } from '@stacksjs/logging'
 import type { CLI, MakeOptions } from '@stacksjs/types'
 import { ExitCode } from '@stacksjs/types'
-import { isString } from '@stacksjs/validation'
 
 export function make(buddy: CLI) {
   const descriptions = {
@@ -47,6 +46,8 @@ export function make(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: MakeOptions) => {
+      log.debug('Running `buddy make` ...', options)
+
       const name = buddy.args[0]
 
       if (!name) {
@@ -54,31 +55,32 @@ export function make(buddy: CLI) {
         process.exit()
       }
 
-      if (hasNoOptions(options)) {
-        let answers = await prompt.require()
-          .multiselect(descriptions.select, {
-            options: [
-              { label: 'Page', value: 'page' },
-              { label: 'Function', value: 'function' },
-              { label: 'Component', value: 'component' },
-              { label: 'Notification', value: 'notification' },
-              { label: 'Language', value: 'language' },
-              { label: 'Database', value: 'database' },
-              { label: 'Migration', value: 'migration' },
-              { label: 'Factory', value: 'factory' },
-              { label: 'Stack', value: 'stack' },
-            ],
-          })
-
-        if (answers !== null)
-          process.exit(ExitCode.InvalidArgument)
-
-        if (isString(answers))
-          answers = [answers]
-
-        // creates an object out of array and sets answers to true
-        options = answers.reduce((a: any, v: any) => ({ ...a, [v]: true }), {})
-      }
+      // TODO: uncomment this when prompt is ready
+      // if (hasNoOptions(options)) {
+      //   let answers = await prompt.require()
+      //     .multiselect(descriptions.select, {
+      //       options: [
+      //         { label: 'Page', value: 'page' },
+      //         { label: 'Function', value: 'function' },
+      //         { label: 'Component', value: 'component' },
+      //         { label: 'Notification', value: 'notification' },
+      //         { label: 'Language', value: 'language' },
+      //         { label: 'Database', value: 'database' },
+      //         { label: 'Migration', value: 'migration' },
+      //         { label: 'Factory', value: 'factory' },
+      //         { label: 'Stack', value: 'stack' },
+      //       ],
+      //     })
+      //
+      //   if (answers !== null)
+      //     process.exit(ExitCode.InvalidArgument)
+      //
+      //   if (isString(answers))
+      //     answers = [answers]
+      //
+      //   // creates an object out of array and sets answers to true
+      //   options = answers.reduce((a: any, v: any) => ({ ...a, [v]: true }), {})
+      // }
 
       await invoke(options)
 
@@ -91,6 +93,8 @@ export function make(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: MakeOptions) => {
+      log.debug('Running `buddy make:component` ...', options)
+
       const name = buddy.args[0] || options.name
       options.name = name
 
@@ -108,6 +112,8 @@ export function make(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action((options: MakeOptions) => {
+      log.debug('Running `buddy make:database` ...', options)
+
       const name = buddy.args[0] || options.name
       options.name = name
 
@@ -125,6 +131,8 @@ export function make(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action((options: MakeOptions) => {
+      log.debug('Running `buddy make:factory` ...', options)
+
       const name = buddy.args[0] || options.name
       options.name = name
 
@@ -143,6 +151,8 @@ export function make(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: MakeOptions) => {
+      log.debug('Running `buddy make:view` ...', options)
+
       const name = buddy.args[0] || options.name
       options.name = name
 
@@ -160,6 +170,8 @@ export function make(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: MakeOptions) => {
+      log.debug('Running `buddy make:function` ...', options)
+
       await makeFunction(options)
     })
 
@@ -169,6 +181,8 @@ export function make(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: MakeOptions) => {
+      log.debug('Running `buddy make:lang` ...', options)
+
       const name = buddy.args[0] || options.name
       options.name = name
 
@@ -189,6 +203,8 @@ export function make(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: MakeOptions) => {
+      log.debug('Running `buddy make:notification` ...', options)
+
       const perf = await intro('buddy make:notification')
 
       const name = buddy.args[0] || options.name
@@ -216,6 +232,8 @@ export function make(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action((options: MakeOptions) => {
+      log.debug('Running `buddy make:stack` ...', options)
+
       const name = buddy.args[0] || options.name
       options.name = name
 
@@ -231,6 +249,8 @@ export function make(buddy: CLI) {
     .command('make:model', descriptions.model)
     .option('-n, --name', 'The name of the model')
     .action(async (options: MakeOptions) => {
+      log.debug('Running `buddy make:model` ...', options)
+
       const name = buddy.args[0] || options.name
       options.name = name
 
@@ -247,6 +267,8 @@ export function make(buddy: CLI) {
     .option('-n, --name', 'The name of the migration')
     .option('-e, --env', 'The environment to run the migration in', { default: 'dev' })
     .action((options: MakeOptions) => {
+      log.debug('Running `buddy make:migration` ...', options)
+
       const name = buddy.args[0] || options.name
       options.name = name
 
@@ -264,6 +286,6 @@ export function make(buddy: CLI) {
   })
 }
 
-function hasNoOptions(options: MakeOptions) {
-  return !options.component && !options.page && !options.function && !options.language && !options.database && !options.migration && !options.notification && !options.stack
-}
+// function hasNoOptions(options: MakeOptions) {
+//   return !options.component && !options.page && !options.function && !options.language && !options.database && !options.migration && !options.notification && !options.stack
+// }

package/src/commands/migrate.ts

@@ -2,7 +2,7 @@ import process from 'node:process'
 import { ExitCode } from '@stacksjs/types'
 import type { CLI, MigrateOptions } from '@stacksjs/types'
 import { runAction } from '@stacksjs/actions'
-import { intro, outro } from '@stacksjs/cli'
+import { intro, log, outro } from '@stacksjs/cli'
 import { Action } from '@stacksjs/enums'
 
 export function migrate(buddy: CLI) {
@@ -18,6 +18,8 @@ export function migrate(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: MigrateOptions) => {
+      log.debug('Running `buddy migrate` ...', options)
+
       const perf = await intro('buddy migrate')
       const result = await runAction(Action.Migrate, { ...options })
 
@@ -37,7 +39,9 @@ export function migrate(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: MigrateOptions) => {
-      const perf = await intro('buddy migrate')
+      log.debug('Running `buddy migrate:dns` ...', options)
+
+      const perf = await intro('buddy migrate:dns')
       const result = await runAction(Action.MigrateDns, { ...options })
 
       if (result.isErr()) {

package/src/commands/prepublish.ts

@@ -2,6 +2,7 @@ import process from 'node:process'
 import type { CLI, PrepublishOptions } from '@stacksjs/types'
 import { Action } from '@stacksjs/enums'
 import { runAction } from '@stacksjs/actions'
+import { log } from 'stacks/logging'
 
 export function prepublish(buddy: CLI) {
   const descriptions = {
@@ -15,6 +16,8 @@ export function prepublish(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: PrepublishOptions) => {
+      log.debug('Running `buddy prepublish` ...', options)
+
       await runAction(Action.Prepublish, options)
     })
 

package/src/commands/release.ts

@@ -8,24 +8,34 @@ import { runAction } from '@stacksjs/actions'
 const descriptions = {
   release: 'Release a new version of your libraries/packages',
   project: 'Target a specific project',
+  dryRun: 'Run the release without actually releasing',
   verbose: 'Enable verbose output',
 }
 
 export function release(buddy: CLI) {
   buddy
     .command('release', descriptions.release)
+    .option('--dry-run', descriptions.dryRun, { default: false })
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: ReleaseOptions) => {
+      log.debug('Running `buddy release` ...', options)
+
+      if (options.dryRun)
+        log.warn('Dry run enabled. No changes will be made or committed.')
+
       const startTime = await intro('buddy release')
-      const result = await runAction(Action.Release, { ...options, stdin: 'inherit' })
+      const result = await runAction(Action.Release, {
+        stdin: 'inherit',
+        ...options,
+      })
 
       if (result.isErr()) {
         log.error('Failed to release', result.error)
         process.exit(ExitCode.FatalError)
       }
 
-      await outro('Triggered your CI/CD release workflow', { startTime, useSeconds: true })
+      await outro('Triggered CI/CD Release Workflow', { startTime, useSeconds: true })
     })
 
   buddy.on('release:*', () => {

package/src/commands/seed.ts

@@ -2,7 +2,7 @@ import process from 'node:process'
 import { ExitCode } from '@stacksjs/types'
 import type { CLI, SeedOptions } from '@stacksjs/types'
 import { runAction } from '@stacksjs/actions'
-import { intro, outro } from '@stacksjs/cli'
+import { intro, log, outro } from '@stacksjs/cli'
 import { Action } from '@stacksjs/enums'
 
 export function seed(buddy: CLI) {
@@ -17,6 +17,8 @@ export function seed(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: SeedOptions) => {
+      log.debug('Running `buddy seed` ...', options)
+
       const perf = await intro('buddy seed')
       const result = await runAction(Action.Seed, options)
 

package/src/commands/setup.ts

@@ -22,6 +22,8 @@ export function setup(buddy: CLI) {
     .option('-p, --project', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: CliOptions) => {
+      log.debug('Running `buddy setup` ...', options)
+
       if (!await isPkgxInstalled())
         await installPkgx()
 
@@ -35,6 +37,8 @@ export function setup(buddy: CLI) {
     .command('setup:oh-my-zsh', descriptions.ohMyZsh) // if triggered multiple times, it will update the plugin
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (_options?: CliOptions) => {
+      log.debug('Running `buddy setup:oh-my-zsh` ...', _options)
+
       const homePath = (await $`echo $HOME`.text()).trim()
       const zshrcPath = p.join(homePath, '.zshrc')
       const pluginPath = p.frameworkPath('core/zsh-buddy/buddy.plugin.zsh')
@@ -50,7 +54,11 @@ export function setup(buddy: CLI) {
 
       if (match) {
         // 1. Find the plugins line
-        const plugins = match[1].split(' ')
+        const plugins = match[1]?.split(' ')
+        if (!plugins) {
+          log.error('Maybe the plugins line in your .zshrc file could not be found? If this continues being an issue, please reach out to us on Discord.')
+          process.exit(ExitCode.FatalError)
+        }
 
         // 2. Add buddy to the list of plugins if it's not already there
         if (!plugins.includes('buddy')) {
@@ -72,18 +80,18 @@ export function setup(buddy: CLI) {
           log.success('Copied buddy zsh plugin')
         }
         else {
-          log.info('buddy is already integrated in your shell, updating...')
+          log.info('Buddy is already integrated in your shell, ensuring it is updated...')
           await runCommand(`cp -rf ${pluginPath} ${customPath}`)
           // await runCommand(`source ${customPath}/buddy.plugin.zsh`)
-          log.success('Updated buddy zsh plugin')
+          log.success('Updated buddy zsh plugin to latest version')
         }
       }
 
-      log.success('Oh My Zsh setup complete')
-      log.info('To see changes reflect, you may need to:')
-      // if on vscode show the message
-      // log.info('⌘⇧P workbench.action.reloadWindow')
-      // else show the message
+      log.success('Oh My Zsh Setup Complete')
+      log.info('To see changes reflect, you may need to open a new terminal window')
+      // if using the vscode terminal, show the message
+      if (process.env.TERM_PROGRAM === 'vscode')
+        log.info('⌘⇧P terminal.create.new.terminal')
     })
 
   buddy.on('setup:*', () => {