@@ -14,6 +14,12 @@
 class Commands:
     scraper = None
 
+    # Queue commands need the FULL text after the command name (including the
+    # trailing space) passed as completion args, so nested slash-command
+    # completion (e.g. "/queue /add <tab>") can see the inner command and its
+    # arguments (plan 9.13). Both completers (io.py, tui/app.py) consult this.
+    FULL_ARGS_COMPLETION_COMMANDS = ("/queue", "/insert-queue")
+
     def _get_coder(self):
         """Return coder via weak reference, or None if collected."""
         if self._coder_ref is not None:
@@ -90,7 +96,7 @@ def __init__(
         self.last_command_show_notification = True
 
         # Commands that should NOT trigger auto-processing of the queue
-        self._MANAGEMENT_COMMANDS = {"queue", "list-queue", "remove-queue"}
+        self._MANAGEMENT_COMMANDS = {"queue", "list-queue", "remove-queue", "run-queue"}
 
     def _load_custom_commands(self, custom_commands):
         """
 
@@ -1,10 +1,12 @@
 """Insert-queue command for CLI-33: inserts a prompt at a specific queue position."""
 
+import asyncio
 from typing import List
 
 from cecli.commands.utils.base_command import BaseCommand
 from cecli.commands.utils.helpers import format_command_result
 from cecli.helpers import command_queue
+from cecli.signals import SwitchCoderSignal
 
 
 class InsertQueueCommand(BaseCommand):
@@ -60,6 +62,22 @@ async def execute(cls, io, coder, args, **kwargs):
         try:
             item = command_queue.insert_prompt(coder, prompt_text, index)
             io.tool_output(f"Prompt inserted at position {index + 1} (id: {item['id']})")
+
+            # Idle-immediate: when no request is in flight there is nothing to
+            # wait for, so drain the queue right away. When a request IS in
+            # flight, the queue auto-drains when run_one() completes.
+            target = command_queue.get_active_coder(coder)
+            if command_queue.idle_drain_needed(target):
+                try:
+                    await target.process_prompt_queue()
+                except (KeyboardInterrupt, asyncio.CancelledError):
+                    # The interrupted item was re-queued; let the user know the queue paused.
+                    io.tool_output("Queue processing paused. Use /run-queue to resume.")
+                except (SwitchCoderSignal, SystemExit):
+                    raise
+                except Exception as e:
+                    return format_command_result(io, cls.NORM_NAME, "", error=str(e))
+
             return f"Successfully executed {cls.NORM_NAME}."
         except ValueError as e:
             return format_command_result(io, cls.NORM_NAME, "", error=str(e))
@@ -68,8 +86,20 @@ async def execute(cls, io, coder, args, **kwargs):
 
     @classmethod
     def get_completions(cls, io, coder, args) -> List[str]:
-        """Get completion options for insert-queue command."""
-        return []
+        """Get completion options for insert-queue command.
+
+        Args are "<index> <prompt text>"; once the index token and a space
+        are present, mirror the nested prompt's completions (e.g. a nested
+        slash command delegates to the original command's completions).
+        """
+        text = args or ""
+        first_space = text.find(" ")
+        if first_space == -1:
+            # Still typing the index; suggest valid positions.
+            if not coder.commands:
+                return []
+            return [str(i) for i in range(1, command_queue.get_queue_length(coder) + 2)]
+        return command_queue.nested_command_completions(coder, text[first_space + 1 :])
 
     @classmethod
     def get_help(cls) -> str:
 
@@ -2,9 +2,12 @@
 
 from typing import List
 
+import asyncio
+
 from cecli.commands.utils.base_command import BaseCommand
 from cecli.commands.utils.helpers import format_command_result
 from cecli.helpers import command_queue
+from cecli.signals import SwitchCoderSignal
 
 
 class QueueCommand(BaseCommand):
@@ -59,6 +62,22 @@ async def execute(cls, io, coder, args, **kwargs):
             item = command_queue.enqueue_prompt(coder, prompt_text)
             position = command_queue.get_queue_length(coder)
             io.tool_output(f"Prompt queued at position {position} (id: {item['id']})")
+
+            # Idle-immediate: when no request is in flight there is nothing to
+            # wait for, so drain the queue right away. When a request IS in
+            # flight, the queue auto-drains when run_one() completes.
+            target = command_queue.get_active_coder(coder)
+            if command_queue.idle_drain_needed(target):
+                try:
+                    await target.process_prompt_queue()
+                except (KeyboardInterrupt, asyncio.CancelledError):
+                    # The interrupted item was re-queued; let the user know the queue paused.
+                    io.tool_output("Queue processing paused. Use /run-queue to resume.")
+                except (SwitchCoderSignal, SystemExit):
+                    raise
+                except Exception as e:
+                    return format_command_result(io, cls.NORM_NAME, "", error=str(e))
+
             return f"Successfully executed {cls.NORM_NAME}."
         except ValueError as e:
             return format_command_result(io, cls.NORM_NAME, "", error=str(e))
@@ -67,8 +86,12 @@ async def execute(cls, io, coder, args, **kwargs):
 
     @classmethod
     def get_completions(cls, io, coder, args) -> List[str]:
-        """Get completion options for queue command."""
-        return []
+        """Get completion options for queue command.
+
+        When the queued prompt starts with a slash command, mirror the
+        original command's completions (e.g. /queue /add <tab> offers files).
+        """
+        return command_queue.nested_command_completions(coder, args)
 
     @classmethod
     def get_help(cls) -> str:
 
@@ -265,7 +265,20 @@ def get_command_completions(self, document, complete_event, text, words):
             yield from raw_completer(document, complete_event)
             return
 
-        candidates = self.commands.get_completions(cmd, partial)
+        # Nested-host commands (/queue, /insert-queue) need the FULL text after
+        # the command name (trailing space preserved) so inner slash-command
+        # argument completion works (e.g. "/queue /add <tab>") - plan 9.13.
+        if cmd in self.commands.FULL_ARGS_COMPLETION_COMMANDS:
+            nested_text = text[len(words[0]) :].lstrip()
+            candidates = self.commands.get_completions(cmd, nested_text)
+            # The substring filter and start_position below operate on the last
+            # word; an empty/trailing-space nested text means "no partial yet".
+            if not nested_text or nested_text[-1].isspace():
+                partial = ""
+            else:
+                partial = nested_text.split()[-1].lower()
+        else:
+            candidates = self.commands.get_completions(cmd, partial)
 
         if candidates is None:
             return