goatchain-cli 0.0.9-beta.21 → 0.0.9-beta.23

package/bin/goatchain.mjs

@@ -26,16 +26,83 @@ const wrapperPm
     : 'npm'
 
 const args = process.argv.slice(2)
-const useOpentui = args[0] === 'opentui'
-const forwardArgs = useOpentui ? args.slice(1) : args
+const routing = resolveRouting(args)
 
-if (useOpentui) {
-  runOpentui(forwardArgs)
+if (routing.target === 'opentui') {
+  runOpentui(routing.forwardArgs)
 }
 else {
   await runInk()
 }
 
+function resolveRouting(argv) {
+  // Explicit `goatchain ink ...` forces the Ink TUI.
+  if (argv[0] === 'ink')
+    return { target: 'ink', forwardArgs: argv.slice(1) }
+  // Explicit `goatchain opentui ...` forces the opentui binary.
+  if (argv[0] === 'opentui')
+    return { target: 'opentui', forwardArgs: argv.slice(1) }
+
+  // Known subcommands handled only by the opentui binary.
+  const first = String(argv[0] ?? '').trim().toLowerCase()
+  const opentuiSubcommands = new Set([
+    'version',
+    '--version',
+    '-v',
+    'upgrade',
+    'update',
+    'acp',
+    'auth',
+    'exec',
+    'e',
+    '--help',
+    '-h',
+  ])
+  if (opentuiSubcommands.has(first))
+    return { target: 'opentui', forwardArgs: argv }
+
+  // One-shot prompt (non-flag first positional, e.g. `goatchain hi`) or
+  // one-shot flags (`--cwd`, `--session`, `--no-interaction`) go to opentui.
+  if (isOneShotPromptArgv(argv))
+    return { target: 'opentui', forwardArgs: argv }
+
+  // Bare invocation (no args) or flag-only invocation: default to Ink.
+  return { target: 'ink', forwardArgs: argv }
+}
+
+function isOneShotPromptArgv(argv) {
+  const oneShotFlags = new Set([
+    '-c',
+    '-cwd',
+    '--cwd',
+    '--chdir',
+    '-s',
+    '--session',
+    '--no-interaction',
+  ])
+  let sawOneShotFlag = false
+  for (let i = 0; i < argv.length; i++) {
+    const arg = String(argv[i] ?? '').trim()
+    if (!arg)
+      continue
+    if (arg === '--')
+      return true
+    if (arg.startsWith('-cwd=')) {
+      sawOneShotFlag = true
+      continue
+    }
+    if (oneShotFlags.has(arg)) {
+      sawOneShotFlag = true
+      i += 1
+      continue
+    }
+    if (arg.startsWith('-'))
+      return false
+    return true
+  }
+  return sawOneShotFlag
+}
+
 async function runInk() {
   const inkEntry = path.join(__dirname, '..', 'dist', 'ink.mjs')
   if (!fs.existsSync(inkEntry)) {