Merge pull request #57 from chatbotkit/next

Next

Author: pdparchitect

.changeset/mean-bees-hide.md

@@ -0,0 +1,5 @@
+---
+'@chatbotkit/cli': patch
+---
+
+Correct handling of help command line flags when used with scripts.

packages/cli/src/command/run/index.js

@@ -97,9 +97,11 @@ export const command = new Command()
   .description('Run a JavaScript file with @chatbotkit/* packages available')
   .argument('<script>', 'Path to the JavaScript file to run')
   .argument('[args...]', 'Arguments to pass to the script')
+  .helpOption(false) // Disable built-in help so it passes through to script
+  .enablePositionalOptions() // Stop parsing options after first positional arg
+  .passThroughOptions() // Options after <script> pass through to the script
   .allowUnknownOption(true)
   .allowExcessArguments(true)
-  .helpOption('-h, --help', 'Display help for the run command')
   .addHelpText(
     'after',
     `

packages/cli/src/index.js

@@ -6,6 +6,44 @@ import run from './command/run/index.js'
 import solution from './command/solution/index.js'
 
 import { Argument, Command, Option } from 'commander'
+import { readFileSync } from 'fs'
+import { dirname, join } from 'path'
+import { fileURLToPath } from 'url'
+
+const __dirname = dirname(fileURLToPath(import.meta.url))
+
+/**
+ * Get the CLI version from package.json.
+ */
+function getVersion() {
+  try {
+    // Try source structure first (src/)
+
+    let pkgPath = join(__dirname, '..', 'package.json')
+    let pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'))
+
+    if (pkg.version) {
+      return pkg.version
+    }
+  } catch {
+    // Ignore
+  }
+
+  try {
+    // Try dist structure (dist/esm/)
+
+    let pkgPath = join(__dirname, '..', '..', 'package.json')
+    let pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'))
+
+    if (pkg.version) {
+      return pkg.version
+    }
+  } catch {
+    // Ignore
+  }
+
+  return 'unknown'
+}
 
 // Re-export commander utilities for scripts to build their own CLIs
 
@@ -41,7 +79,10 @@ Y88b  d88P 888   d88P 888   Y88b
 export default async function cbk(argv = process.argv) {
   const program = new Command()
 
-  program.name('cbk').description('Command line tools for ChatBotKit')
+  program
+    .name('cbk')
+    .description('Command line tools for ChatBotKit')
+    .version(getVersion(), '-v, --version', 'Display the CLI version')
 
   if (process.stdout.isTTY) {
     program.hook('preAction', () => {
@@ -55,5 +96,21 @@ export default async function cbk(argv = process.argv) {
   program.addCommand(run)
   program.addCommand(solution)
 
+  // Special handling for `cbk run --help` or `cbk run -h` without a script
+  // Since run command has helpOption(false) to pass --help to scripts,
+  // we need to manually show help when no script is provided
+
+  const args = argv.slice(2)
+
+  if (
+    args[0] === 'run' &&
+    args.length === 2 &&
+    (args[1] === '--help' || args[1] === '-h')
+  ) {
+    run.outputHelp()
+
+    return
+  }
+
   program.parse(argv)
 }