revert

Author: AmirSa12

src/t.ts

@@ -217,20 +217,6 @@ export class RootCommand extends Command {
       }
     }
 
-    // Fallback: if nothing matched yet, try to match any single-token command
-    // later in the args (helps when the executable name or runner is included,
-    // e.g., `pnpm nuxt dev` where `nuxt` is not a registered command).
-    if (!matchedCommand) {
-      for (let i = 0; i < args.length; i++) {
-        const potential = this.commands.get(args[i]);
-        if (potential) {
-          matchedCommand = potential;
-          remaining = args.slice(i + 1);
-          break;
-        }
-      }
-    }
-
     // If no command was matched, use the root command (this)
     return [matchedCommand || this, remaining];
   }
@@ -273,12 +259,9 @@ export class RootCommand extends Command {
   // Determine if we should complete commands
   private shouldCompleteCommands(
     toComplete: string,
-    endsWithSpace: boolean,
-    isRootCommandContext: boolean
+    endsWithSpace: boolean
   ): boolean {
-    // Only suggest commands when we're still completing at the root context.
-    // Once a command is matched, we should move on to its arguments/flags.
-    return isRootCommandContext && !toComplete.startsWith('-');
+    return !toComplete.startsWith('-');
   }
 
   // Handle flag completion (names and values)
@@ -474,7 +457,6 @@ export class RootCommand extends Command {
     }
 
     const [matchedCommand] = this.matchCommand(previousArgs);
-    const isRootContext = matchedCommand === this;
     const lastPrevArg = previousArgs[previousArgs.length - 1];
 
     // 1. Handle flag/option completion
@@ -508,9 +490,7 @@ export class RootCommand extends Command {
       }
 
       // 2. Handle command/subcommand completion
-      if (
-        this.shouldCompleteCommands(toComplete, endsWithSpace, isRootContext)
-      ) {
+      if (this.shouldCompleteCommands(toComplete, endsWithSpace)) {
         this.handleCommandCompletion(previousArgs, toComplete);
       }
       // 3. Handle positional arguments - always check for root command arguments

src/zsh.ts

@@ -21,32 +21,12 @@ _${name}() {
     local shellCompDirectiveFilterDirs=${ShellCompDirective.ShellCompDirectiveFilterDirs}
     local shellCompDirectiveKeepOrder=${ShellCompDirective.ShellCompDirectiveKeepOrder}
 
-    local lastParam lastChar flagPrefix requestComp out directive comp lastComp noSpace keepOrder isNewWord
+    local lastParam lastChar flagPrefix requestComp out directive comp lastComp noSpace keepOrder
     local -a completions
 
     __${name}_debug "\\n========= starting completion logic =========="
     __${name}_debug "CURRENT: \${CURRENT}, words[*]: \${words[*]}"
 
-    # Track whether the cursor is positioned on a new (empty) word so we can
-    # pass an empty argument to the CLI when the user has already completed
-    # the previous token (e.g. after typing a space).
-    isNewWord=0
-    if [ \${#words[@]} -ge \${CURRENT} ] && [ -z "\${words[\${CURRENT}]}" ]; then
-        isNewWord=1
-        __${name}_debug "Detected empty current word via words[\${CURRENT}]"
-    elif [ -n "\${BUFFER}" ] && [ "\${BUFFER[-1]}" = " " ]; then
-        isNewWord=1
-        __${name}_debug "Detected trailing space in buffer"
-    fi
-
-    # When completing a brand-new (empty) word, CURRENT can point past the end
-    # of the words array. Pad with an empty element so downstream logic keeps
-    # the last typed argument (avoids replaying the prior completion).
-    if [ $isNewWord -eq 1 ] && [ \${#words[@]} -lt \${CURRENT} ]; then
-        __${name}_debug "Padding words to CURRENT with empty element"
-        words+=("")
-    fi
-
     # The user could have moved the cursor backwards on the command-line.
     # We need to trigger completion from the $CURRENT location, so we need
     # to truncate the command-line ($words) up to the $CURRENT location.
@@ -68,7 +48,7 @@ _${name}() {
 
     # Prepare the command to obtain completions, ensuring arguments are quoted for eval
     local -a args_to_quote=("\${(@)words[2,-1]}")
-    if [ "\${lastChar}" = "" ] || [ $isNewWord -eq 1 ]; then
+    if [ "\${lastChar}" = "" ]; then
         # If the last parameter is complete (there is a space following it)
         # We add an extra empty parameter so we can indicate this to the go completion code.
         __${name}_debug "Adding extra empty parameter"