2 files changed, 48 insertions, 0 deletions
diff --git a/packages/cli/src/ui/hooks/slashCommandProcessor.ts b/packages/cli/src/ui/hooks/slashCommandProcessor.ts
index a4b13d0a..dfefc562 100644
--- a/packages/cli/src/ui/hooks/slashCommandProcessor.ts
+++ b/packages/cli/src/ui/hooks/slashCommandProcessor.ts
@@ -44,6 +44,7 @@ export interface SlashCommand {
   name: string;
   altName?: string;
   description?: string;
+  completion?: () => Promise<string[]>;
   action: (
     mainCommand: string,
     subCommand?: string,
@@ -643,6 +644,25 @@ Add any other context about the problem here.
         name: 'resume',
         description:
           'resume from conversation checkpoint. Usage: /resume [tag]',
+        completion: async () => {
+          const geminiDir = config?.getGeminiDir();
+          if (!geminiDir) {
+            return [];
+          }
+          try {
+            const files = await fs.readdir(geminiDir);
+            return files
+              .filter(
+                (file) =>
+                  file.startsWith('checkpoint-') && file.endsWith('.json'),
+              )
+              .map((file) =>
+                file.replace('checkpoint-', '').replace('.json', ''),
+              );
+          } catch (_err) {
+            return [];
+          }
+        },
         action: async (_mainCommand, subCommand, _args) => {
           const tag = (subCommand || '').trim();
           const logger = new Logger(config?.getSessionId() || '');
diff --git a/packages/cli/src/ui/hooks/useCompletion.ts b/packages/cli/src/ui/hooks/useCompletion.ts
index b7603720..5217e60c 100644
--- a/packages/cli/src/ui/hooks/useCompletion.ts
+++ b/packages/cli/src/ui/hooks/useCompletion.ts
@@ -127,6 +127,34 @@ export function useCompletion(
 
     // --- Handle Slash Command Completion ---
     if (trimmedQuery.startsWith('/')) {
+      const parts = trimmedQuery.substring(1).split(' ');
+      const commandName = parts[0];
+      const subCommand = parts.slice(1).join(' ');
+
+      const command = slashCommands.find(
+        (cmd) => cmd.name === commandName || cmd.altName === commandName,
+      );
+
+      if (command && command.completion) {
+        const fetchAndSetSuggestions = async () => {
+          setIsLoadingSuggestions(true);
+          if (command.completion) {
+            const results = await command.completion();
+            const filtered = results.filter((r) => r.startsWith(subCommand));
+            const newSuggestions = filtered.map((s) => ({
+              label: s,
+              value: s,
+            }));
+            setSuggestions(newSuggestions);
+            setShowSuggestions(newSuggestions.length > 0);
+            setActiveSuggestionIndex(newSuggestions.length > 0 ? 0 : -1);
+          }
+          setIsLoadingSuggestions(false);
+        };
+        fetchAndSetSuggestions();
+        return;
+      }
+
       const partialCommand = trimmedQuery.substring(1);
       const filteredSuggestions = slashCommands
         .filter(