diff --git a/packages/cli/src/services/command-migration-tool.test.ts b/packages/cli/src/services/command-migration-tool.test.ts
index 8eae0b021..618a38f94 100644
--- a/packages/cli/src/services/command-migration-tool.test.ts
+++ b/packages/cli/src/services/command-migration-tool.test.ts
@@ -223,7 +223,7 @@ description = "Test description"`;
 
       const prompt = generateMigrationPrompt(files);
 
-      expect(prompt).toContain('Found 2 command files');
+      expect(prompt).toContain('Found 2 command file(s)');
       expect(prompt).toContain('cmd1.toml');
       expect(prompt).toContain('cmd2.toml');
       expect(prompt).toContain('qwen-code migrate-commands');
@@ -234,7 +234,7 @@ description = "Test description"`;
 
       const prompt = generateMigrationPrompt(files);
 
-      expect(prompt).toContain('Found 10 command files');
+      expect(prompt).toContain('Found 10 command file(s)');
       expect(prompt).toContain('... and 7 more');
     });
 
diff --git a/packages/cli/src/ui/commands/extensionsCommand.ts b/packages/cli/src/ui/commands/extensionsCommand.ts
index 2ae4b574f..c14365a71 100644
--- a/packages/cli/src/ui/commands/extensionsCommand.ts
+++ b/packages/cli/src/ui/commands/extensionsCommand.ts
@@ -495,8 +495,10 @@ export async function completeExtensions(
     name.startsWith(partialArg),
   );
 
-  if ('--all'.startsWith(partialArg) || 'all'.startsWith(partialArg)) {
-    suggestions.unshift('--all');
+  if (context.invocation?.name !== 'uninstall') {
+    if ('--all'.startsWith(partialArg) || 'all'.startsWith(partialArg)) {
+      suggestions.unshift('--all');
+    }
   }
 
   return suggestions;