fallback

Author: AmirSa12

src/t.ts

@@ -217,6 +217,20 @@ 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];
   }

src/zsh.ts

@@ -39,6 +39,14 @@ _${name}() {
         __${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.