diff --git a/README.md b/README.md
index 8b6f68d..c3d21e1 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@
 [![pytest](https://github.com/quadsproject/quads-client/actions/workflows/pytest.yml/badge.svg)](https://github.com/quadsproject/quads-client/actions/workflows/pytest.yml)
 [![codecov](https://codecov.io/gh/quadsproject/quads-client/branch/main/graph/badge.svg)](https://codecov.io/gh/quadsproject/quads-client)
 [![PyPI version](https://img.shields.io/pypi/v/quads-client.svg)](https://pypi.org/project/quads-client/)
+[![GitHub Release](https://img.shields.io/github/v/release/quadsproject/quads-client)](https://github.com/quadsproject/quads-client/releases/latest)
 [![Python 3.13+](https://img.shields.io/badge/python-3.13+-blue.svg)](https://www.python.org/downloads/)
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
@@ -459,7 +460,7 @@ token-login
 # Option B: Register new account (legacy)
 register your.email@example.com YourPassword123
 
-# 2. Schedule hosts (automatic for 5 days or until Sunday 21:00 UTC)
+# 2. Schedule hosts (duration configured by QUADS admin)
 schedule 3 description "My dev environment"
 schedule host01,host02 description "CI testing"
 schedule host-list hosts.txt description "Perf lab"
@@ -489,25 +490,43 @@ cloud_list  cloud_only
 
 **Context-Aware Argument Completion**: Press `Tab` to complete command arguments based on live server data
 
-- **Cloud names**: `mod_cloud <Tab>` → shows available clouds
-- **Hostnames**: `mark_broken <Tab>` → shows non-broken hosts
-- **Assignment IDs**: `terminate <Tab>` → shows your active assignment IDs
-- **Server names**: `connect <Tab>` → shows configured servers
-- **Keywords**: `schedule <Tab>` → shows options like `description`, `nowipe`, `vlan`, `qinq`, `model`, `ram`, `disk-type`, `gpu-vendor`, `nic-vendor`, etc.
+- **Cloud names**: `mod_cloud <Tab>` shows available clouds
+- **Hostnames**: `mark_broken <Tab>` shows non-broken hosts
+- **Assignment IDs**: `terminate <Tab>` shows your active assignment IDs
+- **Server names**: `connect <Tab>` shows configured servers
+- **Position-aware schedule**: Completions change based on argument position (cloud, hosts, dates, options)
+- **Value completions**: `os <Tab>` shows available OS titles, `vlan <Tab>` shows free VLANs
 
 **Examples**:
 ```
-# SSM mode - schedule command shows hostnames first, then keywords
+# SSM mode - position 1: hostnames, host-list, and count suggestions
 (quads1-dev) > schedule <Tab>
-host01.example.com  host02.example.com  host03.example.com  1  2  3  5  10
+host-list  host01.example.com  host02.example.com  1  2  3  5  10
 
-(quads1-dev) > schedule 3 <Tab>
-description  nowipe  vlan  qinq  model  ram  host-list
+# SSM mode - position 2+: option keywords (after value keyword, no suggestions)
+(quads1-dev) > schedule 3 description "test" <Tab>
+description  nowipe  vlan  qinq  os  model  ram  disk-type  ...
 
-# Admin mode - schedule command shows cloud names first
-(quads1-dev) > schedule <Tab>
+# Admin mode - position 1: cloud names
+(quads1-dev) [ADMIN] > schedule <Tab>
 cloud01  cloud02  cloud03
 
+# Admin mode - position 2: hostnames and host-list
+(quads1-dev) [ADMIN] > schedule cloud02 <Tab>
+host-list  host01.example.com  host02.example.com  host03.example.com
+
+# Admin mode - position 3-4: dates (free-form, no suggestions)
+# Admin mode - position 5+: option keywords
+(quads1-dev) [ADMIN] > schedule cloud02 host-list ~/hosts.txt 2026-08-01 2026-08-15 <Tab>
+description  cloud-owner  cc-users  cloud-ticket  vlan  qinq  os  nowipe
+
+# Value completions from server
+(quads1-dev) [ADMIN] > schedule cloud02 host01 2026-08-01 2026-08-15 os <Tab>
+RHEL 9.4  RHEL 8.10  CentOS 9
+
+(quads1-dev) [ADMIN] > schedule cloud02 host01 2026-08-01 2026-08-15 vlan <Tab>
+1100  1200  1300
+
 # Cloud operations
 (quads1-dev) > cloud_list cloud <Tab>
 cloud01  cloud02  cloud03
@@ -842,7 +861,7 @@ schedule <count|hostname[,hostname...]|host-list path> description <desc> [OPTIO
   nic-speed <GBPS>                               - Minimum NIC speed in Gbps (count mode only)
 my_assignments                                   - List all your assignments
 my_hosts                                         - Show your currently scheduled hosts
-available                                        - Show available hosts for self-scheduling
+ls_available                                     - Show available hosts for self-scheduling
 terminate <assignment-id> [hostname]             - Terminate assignment or release host
 ```
 
@@ -882,11 +901,11 @@ schedule 2 description "ML training" gpu-vendor "NVIDIA Corporation" ram 256
 schedule 4 description "High-NIC" interfaces 4 nic-vendor Mellanox
 ```
 
-You can also use `ls-available` to discover hosts first, then schedule specific ones by name:
+You can also use `ls_available` to discover hosts first, then schedule specific ones by name:
 
 ```bash
 # Discover, then schedule by name
-ls-available gpu-vendor "NVIDIA Corporation" ram 256
+ls_available gpu-vendor "NVIDIA Corporation" ram 256
 schedule host03.example.com,host04.example.com description "ML training"
 ```
 
@@ -902,10 +921,10 @@ schedule 3 description "test"
 ```
 
 **SSM Server Requirements:**
-- QUADS server must have `self_serve_enabled: true` in quads.yml
+- QUADS server must have `ssm_enable: true` in quads.yml
 - No ticketing system required for SSM mode
-- Server limits: max 10 hosts per assignment, max 3 active assignments per user
-- Auto-expiration: 5 days or Sunday 21:00 UTC (configurable server-side)
+- Limits are configured by the QUADS admin per-lab (host count, active assignments, duration, etc.)
+- quads-client itself imposes no scheduling limits
 
 ### Host Management (Admin)
 
@@ -1122,8 +1141,7 @@ SSM users can:
 - **View** their own resources with `my_assignments` and `my_hosts` (ownership enforced)
 - **Track** any active move with `track`, `move_status`, and `activity` (global visibility)
 - **Terminate** assignments when done with `terminate` (own assignments only)
-- **Duration**: Server-controlled (5 days or Sunday 21:00 UTC, whichever first)
-- **Limits**: Max 10 hosts per assignment, max 3 active assignments per user
+- **Duration and Limits**: Configured by the QUADS admin per-lab (quads-client imposes no limits)
 
 > [!TIP]
 > `my_hosts` and `my_assignments` only show clouds where you are the **owner**. If you are a CC-user on an admin-scheduled cloud, use `track <cloudname>` or the GUI Move Progress view to follow its provisioning status.
@@ -1188,7 +1206,7 @@ quads-client/
 │       └── version.py        - Version command
 ├── conf/
 │   └── quads-client.yml.example - Example configuration
-├── tests/                    - pytest test suite (754 tests)
+├── tests/                    - pytest test suite (934 tests)
 │   ├── test_commands_programmatic.py - Tests for GUI-supporting programmatic methods
 │   └── ...                   - Other test files
 ├── rpm/
diff --git a/src/quads_client/commands/cloud.py b/src/quads_client/commands/cloud.py
index a543bbc..9b2bac3 100644
--- a/src/quads_client/commands/cloud.py
+++ b/src/quads_client/commands/cloud.py
@@ -3,6 +3,7 @@
 from tabulate import tabulate
 
 from quads_client.error_handler import require_connection
+from quads_client.utils import resolve_os
 
 
 class CloudCommands:
@@ -191,7 +192,7 @@ def cmd_cloud_create(self, args):
         if not self._require_connection():
             return
 
-        if not args.strip():
+        if not args.strip() or args.strip() in ("?", "-h", "--help"):
             self.shell.perror("Usage: cloud-create <name>")
             return
 
@@ -342,7 +343,11 @@ def cmd_mod_cloud(self, args):
                     return
                 i += 2
             elif parts[i] == "os" and i + 1 < len(parts):
-                updates["ostype"] = parts[i + 1]
+                resolved_os, os_error = resolve_os(self.shell.connection.api, parts[i + 1])
+                if os_error:
+                    self.shell.perror(os_error)
+                    return
+                updates["ostype"] = resolved_os
                 i += 2
             elif parts[i] == "wipe":
                 updates["wipe"] = True
@@ -456,7 +461,7 @@ def cmd_cloud_only(self, args):
 
         cloud_name = args.strip()
 
-        if not cloud_name:
+        if not cloud_name or cloud_name in ("?", "-h", "--help"):
             self.shell.perror("Usage: cloud_only <cloud_name>")
             return
 
diff --git a/src/quads_client/commands/host.py b/src/quads_client/commands/host.py
index 5d62986..45657b1 100644
--- a/src/quads_client/commands/host.py
+++ b/src/quads_client/commands/host.py
@@ -49,7 +49,7 @@ def cmd_mark_broken(self, args):
         if not self._require_connection():
             return
 
-        if not args.strip():
+        if not args.strip() or args.strip() in ("?", "-h", "--help"):
             self.shell.perror("Usage: mark-broken <hostname>")
             return
 
@@ -65,7 +65,7 @@ def cmd_mark_repaired(self, args):
         if not self._require_connection():
             return
 
-        if not args.strip():
+        if not args.strip() or args.strip() in ("?", "-h", "--help"):
             self.shell.perror("Usage: mark-repaired <hostname>")
             return
 
@@ -81,7 +81,7 @@ def cmd_retire(self, args):
         if not self._require_connection():
             return
 
-        if not args.strip():
+        if not args.strip() or args.strip() in ("?", "-h", "--help"):
             self.shell.perror("Usage: retire <hostname>")
             return
 
@@ -97,7 +97,7 @@ def cmd_unretire(self, args):
         if not self._require_connection():
             return
 
-        if not args.strip():
+        if not args.strip() or args.strip() in ("?", "-h", "--help"):
             self.shell.perror("Usage: unretire <hostname>")
             return
 
diff --git a/src/quads_client/commands/schedule.py b/src/quads_client/commands/schedule.py
index 9df9c43..e051b33 100644
--- a/src/quads_client/commands/schedule.py
+++ b/src/quads_client/commands/schedule.py
@@ -3,7 +3,7 @@
 
 from quads_client.arg_parser import parse_extend_args, parse_schedule_admin_args, parse_shrink_args
 from quads_client.error_handler import handle_api_error, require_admin, require_connection
-from quads_client.utils import format_schedule_datetime, parse_api_datetime
+from quads_client.utils import format_schedule_datetime, parse_api_datetime, resolve_os
 
 
 def parse_flexible_datetime(date_str):
@@ -261,7 +261,11 @@ def cmd_schedule_admin(self, args):
                 if parsed["qinq"] is not None:
                     batch_data["qinq"] = parsed["qinq"]
                 if parsed.get("os"):
-                    batch_data["ostype"] = parsed["os"]
+                    resolved_os, os_error = resolve_os(self.shell.connection.api, parsed["os"])
+                    if os_error:
+                        self.shell.perror(os_error)
+                        return
+                    batch_data["ostype"] = resolved_os
 
             try:
                 result = self.shell.connection.api.create_schedules_batch(batch_data)
diff --git a/src/quads_client/commands/server.py b/src/quads_client/commands/server.py
index 96ab61d..8ba4334 100644
--- a/src/quads_client/commands/server.py
+++ b/src/quads_client/commands/server.py
@@ -451,7 +451,7 @@ def rm_server_programmatic(self, name):
             return (False, f"Failed to remove server: {e}")
 
     def cmd_add_server(self, args):
-        """Add a new server to configuration. Usage: add-server <name> <url> <username> <password>"""
+        """Add a new server to configuration. Usage: add-server <name> <url> <username> <password> [--no-verify]"""
         parts = args.split()
         if len(parts) < 4:
             self.shell.perror("Usage: add-server <name> <url> <username> <password> [--no-verify]")
diff --git a/src/quads_client/commands/session.py b/src/quads_client/commands/session.py
index 241fe63..2645e8a 100644
--- a/src/quads_client/commands/session.py
+++ b/src/quads_client/commands/session.py
@@ -90,7 +90,7 @@ def cmd_session(self, args):
         """
         target = args.strip()
 
-        if not target or target == "?":
+        if not target or target in ("?", "-h", "--help"):
             self.shell.poutput("Usage: session <session_id|label>")
             self.shell.poutput("\nQuick switch to a session by ID or label.")
             self.shell.poutput("See also: session-list, session-switch")
diff --git a/src/quads_client/commands/user.py b/src/quads_client/commands/user.py
index e14b3ce..41d8765 100644
--- a/src/quads_client/commands/user.py
+++ b/src/quads_client/commands/user.py
@@ -10,6 +10,7 @@
     extract_cloud_number,
     extract_hostname,
     get_username_short,
+    resolve_os,
 )
 
 
@@ -729,7 +730,11 @@ def cmd_schedule(self, args):
             if parsed["vlan"]:
                 assignment_data["vlan"] = parsed["vlan"]
             if parsed["os"]:
-                assignment_data["ostype"] = parsed["os"]
+                resolved_os, os_error = resolve_os(self.shell.connection.api, parsed["os"])
+                if os_error:
+                    self.shell.perror(os_error)
+                    return
+                assignment_data["ostype"] = resolved_os
 
             # Step 1: Create self-assignment (SSM endpoint auto-assigns cloud)
             assignment = auto_refresh_on_auth_error(
diff --git a/src/quads_client/shell.py b/src/quads_client/shell.py
index 99667e9..9ffd14d 100644
--- a/src/quads_client/shell.py
+++ b/src/quads_client/shell.py
@@ -20,11 +20,6 @@
 from quads_client.utils import get_ssl_indicator
 
 
-def _rl(ansi):
-    """Wrap ANSI escape code for readline (mark as non-printing)"""
-    return f"\001{ansi}\002"
-
-
 class QuadsClientShell(cmd2.Cmd):
     intro = ""  # We'll use rich console for the banner
 
@@ -120,7 +115,7 @@ def _get_activity_indicator(self):
         try:
             moves = self.connection.api.get_all_move_status()
             if moves:
-                self._cached_activity_indicator = f"{_rl(chr(27) + '[1;33m')}⚡{_rl(chr(27) + '[0m')}"
+                self._cached_activity_indicator = "\033[1;33m⚡\033[0m"
             else:
                 self._cached_activity_indicator = ""
         except Exception:
@@ -165,15 +160,13 @@ def _update_prompt(self):
 
             admin_badge = ""
             if self.connection and self.connection.is_admin:
-                admin_badge = f" {_rl(chr(27) + '[1;31m')}[ADMIN]{_rl(chr(27) + '[0m')}"
+                admin_badge = " \033[1;31m[ADMIN]\033[0m"
 
             activity = self._get_activity_indicator()
 
-            self.prompt = (
-                f"{_rl(color)}{symbol} {session_info}({short_name}){activity}{admin_badge}{_rl(chr(27) + '[0m')} > "
-            )
+            self.prompt = f"{color}{symbol} {session_info}({short_name}){activity}{admin_badge}\033[0m > "
         else:
-            self.prompt = f"{_rl(chr(27) + '[1;31m')}(disconnected){_rl(chr(27) + '[0m')} > "
+            self.prompt = "\033[1;31m(disconnected)\033[0m > "
 
     def _get_session_indicators(self) -> str:
         """Generate session indicator string like '[1:dev* 2:prod]'"""
@@ -203,7 +196,6 @@ def _update_visible_commands(self):
             "cloud_delete",
             "mod_cloud",
             "find_free_cloud",
-            "cloud_only",
             "ls_vlan",
             "ls_hosts",
             "mark_broken",
@@ -238,6 +230,7 @@ def _update_visible_commands(self):
             "my_assignments",
             "terminate",
             "cloud_list",
+            "cloud_only",
             "ls_available",
             "os_list",
             "move_status",
@@ -282,7 +275,7 @@ def do_debug_admin(self, args):
             print("No connection")
 
     def do_connect(self, args):
-        """Connect to a QUADS server. Usage: connect [server_name]"""
+        """Connect to a QUADS server. Usage: connect [server_name|number] [session <label>]"""
         self.connection_commands.cmd_connect(args)
 
     def complete_connect(self, text, line, begidx, endidx):
@@ -292,9 +285,7 @@ def complete_connect(self, text, line, begidx, endidx):
             servers = self.connection.get_available_servers()
         elif self.config:
             servers = list(self.config.get_all_servers().keys())
-        if text:
-            return [s for s in servers if s.startswith(text)]
-        return servers
+        return self.basic_complete(text, line, begidx, endidx, servers)
 
     def do_disconnect(self, args):
         """Disconnect from current QUADS server"""
@@ -305,7 +296,7 @@ def do_status(self, args):
         self.connection_commands.cmd_status(args)
 
     def do_cloud_list(self, args):
-        """List all clouds (admin only)"""
+        """List all clouds"""
         self.cloud_commands.cmd_cloud_list(args)
 
     def do_find_free_cloud(self, args):
@@ -313,7 +304,7 @@ def do_find_free_cloud(self, args):
         self.cloud_commands.cmd_find_free_cloud(args)
 
     def do_cloud_only(self, args):
-        """List hosts assigned to a specific cloud (admin only)"""
+        """List hosts assigned to a specific cloud"""
         self.cloud_commands.cmd_cloud_only(args)
 
     def do_ls_vlan(self, args):
@@ -364,25 +355,154 @@ def do_assignment_terminate(self, args):
         """Terminate an assignment (deprecated, use terminate)"""
         self.user_commands.cmd_terminate(args)
 
+    def help_schedule(self):
+        """Role-aware help for the schedule command"""
+        if self.connection and self.connection.is_admin:
+            self.poutput("Usage: schedule <cloud> <hosts|host-list path> <start> <end> [options]")
+            self.poutput("\nSchedule hosts to a cloud (admin mode).")
+            self.poutput("\nOptions:")
+            self.poutput("  description <text>       Assignment description")
+            self.poutput("  cloud-owner <username>   Cloud owner username")
+            self.poutput("  cloud-ticket <ticket_id> Ticket ID (JIRA, etc.)")
+            self.poutput("  cc-users <user1,user2>   Comma-separated CC users")
+            self.poutput("  vlan <vlan_id>           VLAN ID number")
+            self.poutput("  qinq <0|1>              QinQ setting (0=disabled, 1=enabled)")
+            self.poutput("  os <title>               OS for provisioning (see os-list)")
+            self.poutput("  nowipe                   Disable host wiping")
+            self.poutput("\nExamples:")
+            self.poutput('  schedule cloud02 host01,host02 "2026-08-01 22:00" "2026-08-15 22:00"')
+            self.poutput('  schedule cloud03 host-list ~/hosts.txt "2026-08-01 22:00" "2026-08-15 22:00"')
+            self.poutput('  schedule cloud02 host01 "2026-08-01 22:00" "2026-08-15 22:00" description "CI env"')
+        else:
+            self.poutput("Usage: schedule <count|hostname[,hostname...]|host-list path> description <desc> [options]")
+            self.poutput("\nRequest a host assignment (SSM mode).")
+            self.poutput("\nOptions:")
+            self.poutput("  description <text>       Assignment description (required)")
+            self.poutput("  nowipe                   Disable host wiping")
+            self.poutput("  vlan <vlan_id>           VLAN ID number")
+            self.poutput("  qinq <0|1>              QinQ setting (0=disabled, 1=enabled)")
+            self.poutput("  os <title>               OS for provisioning (see os-list)")
+            self.poutput("  model <name>             Filter by server model (e.g., r640)")
+            self.poutput("  ram <GB>                 Minimum RAM in GB")
+            self.poutput("  disk-type <type>         Disk type (nvme, ssd, sata)")
+            self.poutput("  disk-size <GB>           Minimum disk size in GB")
+            self.poutput("  disk-count <N>           Minimum number of disks")
+            self.poutput("  gpu-vendor <vendor>      GPU vendor (e.g., 'NVIDIA Corporation')")
+            self.poutput("  gpu-product <product>    GPU model (e.g., 'Tesla V100')")
+            self.poutput("  interfaces <N>           Minimum number of network interfaces")
+            self.poutput("  nic-vendor <vendor>      NIC vendor (e.g., 'Intel', 'Mellanox')")
+            self.poutput("  nic-speed <Gbps>         Minimum NIC speed in Gbps")
+            self.poutput("\nExamples:")
+            self.poutput('  schedule 3 description "Dev testing"')
+            self.poutput('  schedule host01,host02 description "CI" model r640 ram 256')
+            self.poutput('  schedule host-list ~/hosts.txt description "Batch"')
+
     def do_schedule(self, args):
-        """
-        Unified schedule command (role-aware)
-        SSM mode: schedule <count|hosts|host-list path> description <desc> [options]
-        Admin mode: schedule <cloud> <hosts|host-list path> <start> <end>
-        """
-        # Route to appropriate handler based on role
+        """Schedule hosts (use 'help schedule' for full options)"""
+        if args.strip() in ("?", "-h", "--help"):
+            self.help_schedule()
+            return
         if self.connection and self.connection.is_admin:
             self.schedule_commands.cmd_schedule_admin(args)
         else:
             self.user_commands.cmd_schedule(args)
 
+    def _filter_completions(self, candidates, text, line, begidx, endidx):
+        return self.basic_complete(text, line, begidx, endidx, candidates)
+
+    def _get_arg_position(self, parts, text):
+        """Return the 1-based argument position being completed."""
+        if text:
+            return len(parts) - 1
+        return len(parts)
+
     def complete_schedule(self, text, line, begidx, endidx):
         """Autocomplete for schedule command"""
         if not self.connection or not self.connection.is_authenticated:
             return []
 
         parts = line.split()
-        keywords = [
+
+        if self.connection.is_admin:
+            return self._complete_schedule_admin(text, line, parts, begidx, endidx)
+
+        return self._complete_schedule_ssm(text, line, parts, begidx, endidx)
+
+    def _complete_schedule_admin(self, text, line, parts, begidx, endidx):
+        """Position-aware completion for admin schedule.
+
+        Syntax: schedule <cloud> <hosts|host-list> [path] <start> <end> [options]
+        """
+        admin_keywords = [
+            "description",
+            "cloud-owner",
+            "cc-users",
+            "cloud-ticket",
+            "vlan",
+            "qinq",
+            "os",
+            "nowipe",
+        ]
+        value_keywords = [
+            "description",
+            "cloud-owner",
+            "cc-users",
+            "cloud-ticket",
+            "vlan",
+            "qinq",
+            "os",
+        ]
+
+        pos = self._get_arg_position(parts, text)
+
+        try:
+            if pos == 1:
+                clouds = self.connection.api.get_clouds()
+                cloud_names = [c.get("name") for c in clouds if c.get("name")]
+                return self._filter_completions(cloud_names, text, line, begidx, endidx)
+
+            if pos == 2:
+                hosts = self.connection.api.get_hosts()
+                hostnames = [h.get("name") for h in hosts]
+                candidates = ["host-list"] + hostnames
+                return self._filter_completions(candidates, text, line, begidx, endidx)
+
+            prev_word = parts[-2] if text else parts[-1]
+
+            if prev_word == "host-list":
+                return self.path_complete(text, line, begidx, endidx)
+
+            has_host_list = "host-list" in parts
+            date_start = 4 if has_host_list else 3
+            options_start = date_start + 2
+
+            if pos < options_start:
+                return []
+
+            if prev_word == "os":
+                os_list = self.connection.api.get_os_list()
+                os_names = [o.get("Title") for o in os_list if o.get("Title")]
+                return self._filter_completions(os_names, text, line, begidx, endidx)
+
+            if prev_word == "vlan":
+                vlans = self.connection.api.get_free_vlans()
+                vlan_ids = [str(v.get("vlan_id")) for v in vlans if v.get("vlan_id")]
+                return self._filter_completions(vlan_ids, text, line, begidx, endidx)
+
+            if prev_word in value_keywords:
+                return []
+
+            return self._filter_completions(admin_keywords, text, line, begidx, endidx)
+        except Exception:
+            pass
+        return self.basic_complete(text, line, begidx, endidx, admin_keywords)
+
+    def _complete_schedule_ssm(self, text, line, parts, begidx, endidx):
+        """Position-aware completion for SSM schedule.
+
+        Syntax: schedule <count|hostname[,hostname]|host-list path> description <desc> [options]
+        """
+        ssm_keywords = [
             "description",
             "nowipe",
             "vlan",
@@ -390,7 +510,6 @@ def complete_schedule(self, text, line, begidx, endidx):
             "os",
             "model",
             "ram",
-            "host-list",
             "disk-type",
             "disk-size",
             "disk-count",
@@ -401,48 +520,55 @@ def complete_schedule(self, text, line, begidx, endidx):
             "nic-speed",
         ]
 
-        # For admin mode, try to get cloud names
-        if self.connection.is_admin:
-            try:
-                # First arg: cloud names
-                if len(parts) <= 2:
-                    clouds = self.connection.api.get_clouds()
-                    cloud_names = [c.get("name") for c in clouds if c.get("name")]
-                    if text:
-                        return [c for c in cloud_names if c.startswith(text)]
-                    return cloud_names
-                # Later args: hostnames or keywords
-                else:
-                    hosts = self.connection.api.get_hosts()
-                    hostnames = [h.get("name") for h in hosts]
-                    candidates = keywords + hostnames
-                    if text:
-                        return [c for c in candidates if c.startswith(text)]
-                    return candidates
-            except Exception:
-                pass
-
-        # SSM mode
+        pos = self._get_arg_position(parts, text)
+
         try:
-            # First arg: available hostnames (can_self_schedule) or count suggestions
-            if len(parts) <= 2:
+            if pos == 1:
                 hosts = self.connection.api.filter_hosts({"can_self_schedule": True})
                 hostnames = [h.get("name") for h in hosts]
-                # Also suggest common counts
                 count_suggestions = ["1", "2", "3", "5", "10"]
-                candidates = hostnames + count_suggestions
-                if text:
-                    return [c for c in candidates if c.startswith(text)]
-                return candidates
-            # After first arg (count/hosts/host-list): only keywords
-            else:
-                if text:
-                    return [k for k in keywords if k.startswith(text)]
-                return keywords
+                candidates = ["host-list"] + hostnames + count_suggestions
+                return self._filter_completions(candidates, text, line, begidx, endidx)
+
+            prev_word = parts[-2] if text else parts[-1]
+
+            if prev_word == "host-list":
+                return self.path_complete(text, line, begidx, endidx)
+
+            if prev_word == "os":
+                os_list = self.connection.api.get_os_list()
+                os_names = [o.get("Title") for o in os_list if o.get("Title")]
+                return self._filter_completions(os_names, text, line, begidx, endidx)
+
+            if prev_word == "vlan":
+                vlans = self.connection.api.get_free_vlans()
+                vlan_ids = [str(v.get("vlan_id")) for v in vlans if v.get("vlan_id")]
+                return self._filter_completions(vlan_ids, text, line, begidx, endidx)
+
+            ssm_value_keywords = [
+                "description",
+                "vlan",
+                "qinq",
+                "os",
+                "model",
+                "ram",
+                "disk-type",
+                "disk-size",
+                "disk-count",
+                "gpu-vendor",
+                "gpu-product",
+                "interfaces",
+                "nic-vendor",
+                "nic-speed",
+            ]
+            if prev_word in ssm_value_keywords:
+                return []
+
+            return self._filter_completions(ssm_keywords, text, line, begidx, endidx)
         except Exception:
             pass
 
-        return keywords
+        return self.basic_complete(text, line, begidx, endidx, ssm_keywords)
 
     def complete_terminate(self, text, line, begidx, endidx):
         """Autocomplete for terminate command - assignment IDs and hostnames"""
@@ -455,19 +581,18 @@ def complete_terminate(self, text, line, begidx, endidx):
             if len(parts) <= 2:
                 username = self.connection.username.split("@")[0]
                 assignments = self.connection.api.filter_assignments({"owner": username, "active": True})
-                ids = [str(a.get("id", "")) for a in assignments]
-                if text:
-                    return [i for i in ids if i.startswith(text)]
-                return ids
+                ids = sorted(
+                    [str(a.get("id", "")) for a in assignments],
+                    key=lambda x: int(x) if x.isdigit() else float("inf"),
+                )
+                return self.basic_complete(text, line, begidx, endidx, ids)
 
             # If assignment ID provided, suggest hostnames from that assignment
             if len(parts) >= 2:
                 assignment_id = parts[1]
                 schedules = self.connection.api.get_schedules({"assignment": assignment_id})
                 hostnames = [s.get("host", {}).get("name", "") for s in schedules]
-                if text:
-                    return [h for h in hostnames if h.startswith(text)]
-                return hostnames
+                return self.basic_complete(text, line, begidx, endidx, hostnames)
         except Exception:
             pass
         return []
@@ -487,16 +612,12 @@ def complete_extend(self, text, line, begidx, endidx):
                 schedules = self.connection.api.get_current_schedules({})
                 hostnames = list(set(s.get("host", {}).get("name", "") for s in schedules))
                 candidates = cloud_names + hostnames
-                if text:
-                    return [c for c in candidates if c.startswith(text)]
-                return candidates
+                return self.basic_complete(text, line, begidx, endidx, candidates)
 
             # Second arg: "weeks" or "date"
             if len(parts) == 3:
                 keywords = ["weeks", "date"]
-                if text:
-                    return [k for k in keywords if k.startswith(text)]
-                return keywords
+                return self.basic_complete(text, line, begidx, endidx, keywords)
         except Exception:
             pass
         return []
@@ -514,15 +635,11 @@ def complete_shrink(self, text, line, begidx, endidx):
                 schedules = self.connection.api.get_current_schedules({})
                 hostnames = list(set(s.get("host", {}).get("name", "") for s in schedules))
                 candidates = cloud_names + hostnames
-                if text:
-                    return [c for c in candidates if c.startswith(text)]
-                return candidates
+                return self.basic_complete(text, line, begidx, endidx, candidates)
 
             if len(parts) == 3:
                 keywords = ["weeks", "days", "now", "date"]
-                if text:
-                    return [k for k in keywords if k.startswith(text)]
-                return keywords
+                return self.basic_complete(text, line, begidx, endidx, keywords)
         except Exception:
             pass
         return []
@@ -535,9 +652,7 @@ def complete_cloud_delete(self, text, line, begidx, endidx):
         try:
             clouds = self.connection.api.get_clouds()
             cloud_names = [c.get("name") for c in clouds]
-            if text:
-                return [c for c in cloud_names if c.startswith(text)]
-            return cloud_names
+            return self.basic_complete(text, line, begidx, endidx, cloud_names)
         except Exception:
             pass
         return []
@@ -553,9 +668,7 @@ def complete_mod_cloud(self, text, line, begidx, endidx):
             if len(parts) <= 2:
                 clouds = self.connection.api.get_clouds()
                 cloud_names = [c.get("name") for c in clouds]
-                if text:
-                    return [c for c in cloud_names if c.startswith(text)]
-                return cloud_names
+                return self.basic_complete(text, line, begidx, endidx, cloud_names)
 
             # Subsequent args: attributes
             keywords = [
@@ -565,12 +678,11 @@ def complete_mod_cloud(self, text, line, begidx, endidx):
                 "cc-users",
                 "vlan",
                 "qinq",
+                "os",
                 "wipe",
                 "nowipe",
             ]
-            if text:
-                return [k for k in keywords if k.startswith(text)]
-            return keywords
+            return self.basic_complete(text, line, begidx, endidx, keywords)
         except Exception:
             pass
         return []
@@ -588,14 +700,10 @@ def complete_cloud_list(self, text, line, begidx, endidx):
             if len(parts) > 1 and parts[-2] == "cloud":
                 clouds = self.connection.api.get_clouds()
                 cloud_names = [c.get("name") for c in clouds]
-                if text:
-                    return [c for c in cloud_names if c.startswith(text)]
-                return cloud_names
+                return self.basic_complete(text, line, begidx, endidx, cloud_names)
 
             # Otherwise suggest keywords
-            if text:
-                return [k for k in keywords if k.startswith(text)]
-            return keywords
+            return self.basic_complete(text, line, begidx, endidx, keywords)
         except Exception:
             pass
         return []
@@ -609,9 +717,7 @@ def complete_mark_broken(self, text, line, begidx, endidx):
             hosts = self.connection.api.get_hosts()
             # Filter out already broken hosts
             hostnames = [h.get("name") for h in hosts if not h.get("broken", False)]
-            if text:
-                return [h for h in hostnames if h.startswith(text)]
-            return hostnames
+            return self.basic_complete(text, line, begidx, endidx, hostnames)
         except Exception:
             pass
         return []
@@ -625,9 +731,7 @@ def complete_mark_repaired(self, text, line, begidx, endidx):
             # Only show broken hosts
             hosts = self.connection.api.filter_hosts({"broken": True})
             hostnames = [h.get("name") for h in hosts]
-            if text:
-                return [h for h in hostnames if h.startswith(text)]
-            return hostnames
+            return self.basic_complete(text, line, begidx, endidx, hostnames)
         except Exception:
             pass
         return []
@@ -641,9 +745,7 @@ def complete_retire(self, text, line, begidx, endidx):
             hosts = self.connection.api.get_hosts()
             # Filter out already retired hosts
             hostnames = [h.get("name") for h in hosts if not h.get("retired", False)]
-            if text:
-                return [h for h in hostnames if h.startswith(text)]
-            return hostnames
+            return self.basic_complete(text, line, begidx, endidx, hostnames)
         except Exception:
             pass
         return []
@@ -657,9 +759,7 @@ def complete_unretire(self, text, line, begidx, endidx):
             # Only show retired hosts
             hosts = self.connection.api.filter_hosts({"retired": True})
             hostnames = [h.get("name") for h in hosts]
-            if text:
-                return [h for h in hostnames if h.startswith(text)]
-            return hostnames
+            return self.basic_complete(text, line, begidx, endidx, hostnames)
         except Exception:
             pass
         return []
@@ -677,22 +777,16 @@ def complete_ls_schedule(self, text, line, begidx, endidx):
             if len(parts) > 1 and parts[-2] == "host":
                 hosts = self.connection.api.get_hosts()
                 hostnames = [h.get("name") for h in hosts]
-                if text:
-                    return [h for h in hostnames if h.startswith(text)]
-                return hostnames
+                return self.basic_complete(text, line, begidx, endidx, hostnames)
 
             # If looking for cloud name after cloud keyword
             if len(parts) > 1 and parts[-2] == "cloud":
                 clouds = self.connection.api.get_clouds()
                 cloud_names = [c.get("name") for c in clouds]
-                if text:
-                    return [c for c in cloud_names if c.startswith(text)]
-                return cloud_names
+                return self.basic_complete(text, line, begidx, endidx, cloud_names)
 
             # Otherwise suggest keywords
-            if text:
-                return [k for k in keywords if k.startswith(text)]
-            return keywords
+            return self.basic_complete(text, line, begidx, endidx, keywords)
         except Exception:
             pass
         return []
@@ -710,14 +804,10 @@ def complete_mod_schedule(self, text, line, begidx, endidx):
             if len(parts) > 1 and parts[-2] == "id":
                 schedules = self.connection.api.get_schedules({})
                 schedule_ids = [str(s.get("id")) for s in schedules]
-                if text:
-                    return [i for i in schedule_ids if i.startswith(text)]
-                return schedule_ids
+                return self.basic_complete(text, line, begidx, endidx, schedule_ids)
 
             # Otherwise suggest keywords
-            if text:
-                return [k for k in keywords if k.startswith(text)]
-            return keywords
+            return self.basic_complete(text, line, begidx, endidx, keywords)
         except Exception:
             pass
         return []
@@ -732,15 +822,11 @@ def complete_edit_server(self, text, line, begidx, endidx):
             # First arg: server name
             if len(parts) <= 2:
                 servers = list(self.config.get_all_servers().keys())
-                if text:
-                    return [s for s in servers if s.startswith(text)]
-                return servers
+                return self.basic_complete(text, line, begidx, endidx, servers)
 
             # Subsequent args: attributes
             keywords = ["url", "username", "password", "token", "verify"]
-            if text:
-                return [k for k in keywords if k.startswith(text)]
-            return keywords
+            return self.basic_complete(text, line, begidx, endidx, keywords)
         except Exception:
             pass
         return []
@@ -755,9 +841,7 @@ def complete_rm_server(self, text, line, begidx, endidx):
             # Exclude currently connected server
             if self.connection and self.connection.current_server:
                 servers = [s for s in servers if s != self.connection.current_server]
-            if text:
-                return [s for s in servers if s.startswith(text)]
-            return servers
+            return self.basic_complete(text, line, begidx, endidx, servers)
         except Exception:
             pass
         return []
@@ -834,22 +918,59 @@ def complete_ls_available(self, text, line, begidx, endidx):
             "nic-vendor",
             "nic-speed",
         ]
-        if text:
-            return [k for k in keywords if k.startswith(text)]
-        return keywords
+        return self.basic_complete(text, line, begidx, endidx, keywords)
 
     def do_ls_available(self, args):
         """List available hosts"""
         self.available_commands.cmd_ls_available(args)
 
+    def complete_cloud_only(self, text, line, begidx, endidx):
+        """Autocomplete for cloud-only command"""
+        if not self.connection or not self.connection.is_authenticated:
+            return []
+        try:
+            clouds = self.connection.api.get_clouds()
+            cloud_names = [c.get("name") for c in clouds if c.get("name")]
+            return self.basic_complete(text, line, begidx, endidx, cloud_names)
+        except Exception:
+            pass
+        return []
+
     def do_move_status(self, args):
         """Show move/rebuild progress. Usage: move_status [hostname]"""
         self.move_commands.cmd_move_status(args)
 
+    def complete_move_status(self, text, line, begidx, endidx):
+        """Autocomplete for move-status command"""
+        if not self.connection or not self.connection.is_authenticated:
+            return []
+        try:
+            hosts = self.connection.api.get_hosts()
+            hostnames = [h.get("name") for h in hosts if h.get("name")]
+            return self.basic_complete(text, line, begidx, endidx, hostnames)
+        except Exception:
+            pass
+        return []
+
     def do_track(self, args):
         """Live-track move/rebuild progress. Usage: track [hostname|cloudname]"""
         self.track_commands.cmd_track(args)
 
+    def complete_track(self, text, line, begidx, endidx):
+        """Autocomplete for track command"""
+        if not self.connection or not self.connection.is_authenticated:
+            return []
+        try:
+            hosts = self.connection.api.get_hosts()
+            hostnames = [h.get("name") for h in hosts if h.get("name")]
+            clouds = self.connection.api.get_clouds()
+            cloud_names = [c.get("name") for c in clouds if c.get("name")]
+            candidates = hostnames + cloud_names
+            return self.basic_complete(text, line, begidx, endidx, candidates)
+        except Exception:
+            pass
+        return []
+
     def do_activity(self, args):
         """Show active moves grouped by cloud. Usage: activity"""
         self.move_commands.cmd_activity(args)
@@ -882,14 +1003,37 @@ def do_session_create(self, args):
         """Create new session"""
         self.session_commands.cmd_session_create(args)
 
+    def complete_session_create(self, text, line, begidx, endidx):
+        """Autocomplete for session-create command"""
+        servers = []
+        if self.config:
+            servers = list(self.config.get_all_servers().keys())
+        return self.basic_complete(text, line, begidx, endidx, servers)
+
     def do_session_switch(self, args):
         """Switch active session"""
         self.session_commands.cmd_session_switch(args)
 
+    def complete_session_switch(self, text, line, begidx, endidx):
+        """Autocomplete for session-switch command"""
+        if not self.session_manager:
+            return []
+        sessions = self.session_manager.list_sessions()
+        candidates = [str(s.id) for s in sessions]
+        return self.basic_complete(text, line, begidx, endidx, candidates)
+
     def do_session(self, args):
         """Quick switch to session by ID or label"""
         self.session_commands.cmd_session(args)
 
+    def complete_session(self, text, line, begidx, endidx):
+        """Autocomplete for session command"""
+        if not self.session_manager:
+            return []
+        sessions = self.session_manager.list_sessions()
+        candidates = [str(s.id) for s in sessions] + [s.label for s in sessions if s.label]
+        return self.basic_complete(text, line, begidx, endidx, candidates)
+
     def do_session_list(self, args):
         """List all sessions"""
         self.session_commands.cmd_session_list(args)
@@ -898,6 +1042,14 @@ def do_session_close(self, args):
         """Close session"""
         self.session_commands.cmd_session_close(args)
 
+    def complete_session_close(self, text, line, begidx, endidx):
+        """Autocomplete for session-close command"""
+        if not self.session_manager:
+            return []
+        sessions = self.session_manager.list_sessions()
+        candidates = [str(s.id) for s in sessions]
+        return self.basic_complete(text, line, begidx, endidx, candidates)
+
     def do_session_close_all(self, args):
         """Close all inactive sessions"""
         self.session_commands.cmd_session_close_all(args)
diff --git a/src/quads_client/utils.py b/src/quads_client/utils.py
index 70d6109..44fe370 100644
--- a/src/quads_client/utils.py
+++ b/src/quads_client/utils.py
@@ -271,3 +271,33 @@ def validate_cloud_exists(api, cloud_name: str) -> bool:
     """
     clouds = api.filter_clouds({"name": cloud_name})
     return bool(clouds)
+
+
+def resolve_os(api, os_input: str):
+    """
+    Validate and resolve an OS selection against the server's OS list.
+
+    Matches by Title (case-insensitive) or by numeric Id.
+    Returns (canonical_title, None) on success, (None, error_string) on failure.
+    """
+    os_list = api.get_os_list()
+    if not os_list:
+        return None, f"OS '{os_input}' not found"
+
+    os_lower = os_input.lower()
+    for entry in os_list:
+        title = entry.get("Title", "")
+        if title.lower() == os_lower:
+            return title, None
+
+    if os_input.isdigit():
+        os_id = int(os_input)
+        for entry in os_list:
+            if entry.get("Id") == os_id:
+                return entry.get("Title"), None
+
+    available = ", ".join(entry.get("Title", "") for entry in os_list if entry.get("Title"))
+    error = f"OS '{os_input}' not found"
+    if available:
+        error += f"\nAvailable: {available}"
+    return None, error
diff --git a/tests/helpers.py b/tests/helpers.py
new file mode 100644
index 0000000..68519da
--- /dev/null
+++ b/tests/helpers.py
@@ -0,0 +1,5 @@
+def completions_to_list(completions):
+    """Convert cmd2 Completions to a plain list of strings for assertions."""
+    if hasattr(completions, "to_strings"):
+        return list(completions.to_strings())
+    return list(completions)
diff --git a/tests/test_commands_cloud.py b/tests/test_commands_cloud.py
index 933919d..bd78be3 100644
--- a/tests/test_commands_cloud.py
+++ b/tests/test_commands_cloud.py
@@ -233,8 +233,28 @@ def test_mod_cloud_with_os(mock_shell):
     mock_shell.connection.is_connected = True
     mock_shell.connection.api.get_active_cloud_assignment.return_value = {"id": 42}
     mock_shell.connection.api.update_assignment.return_value = {"status": "success"}
+    mock_shell.connection.api.get_os_list.return_value = [
+        {"Id": 1, "Title": "RHEL 9.4", "Release Name": "", "Family": "Redhat"},
+    ]
 
     cloud_cmd = CloudCommands(mock_shell)
     cloud_cmd.cmd_mod_cloud('cloud05 os "RHEL 9.4"')
 
     mock_shell.connection.api.update_assignment.assert_called_once_with(42, {"ostype": "RHEL 9.4"})
+
+
+def test_mod_cloud_with_invalid_os(mock_shell):
+    """Test mod-cloud rejects invalid OS and does not call API"""
+    mock_shell.connection.is_connected = True
+    mock_shell.connection.api.get_active_cloud_assignment.return_value = {"id": 42}
+    mock_shell.connection.api.get_os_list.return_value = [
+        {"Id": 1, "Title": "RHEL 9.4", "Release Name": "", "Family": "Redhat"},
+    ]
+
+    cloud_cmd = CloudCommands(mock_shell)
+    cloud_cmd.cmd_mod_cloud('cloud05 os "Windows 11"')
+
+    mock_shell.connection.api.update_assignment.assert_not_called()
+    mock_shell.perror.assert_called()
+    error_msg = mock_shell.perror.call_args[0][0]
+    assert "not found" in error_msg
diff --git a/tests/test_commands_unified_schedule.py b/tests/test_commands_unified_schedule.py
index 6078015..1346dbd 100644
--- a/tests/test_commands_unified_schedule.py
+++ b/tests/test_commands_unified_schedule.py
@@ -97,6 +97,9 @@ def test_schedule_ssm_with_os(self, mock_shell):
             "owner": "alice",
         }
         mock_shell.connection.api.create_schedule.return_value = {"id": 1}
+        mock_shell.connection.api.get_os_list.return_value = [
+            {"Id": 1, "Title": "RHEL 9.4", "Release Name": "", "Family": "Redhat"},
+        ]
 
         user_cmd = UserCommands(mock_shell)
         user_cmd.cmd_schedule('1 description "Test" os "RHEL 9.4"')
@@ -104,6 +107,27 @@ def test_schedule_ssm_with_os(self, mock_shell):
         call_args = mock_shell.connection.api.create_self_assignment.call_args[0][0]
         assert call_args["ostype"] == "RHEL 9.4"
 
+    def test_schedule_ssm_with_invalid_os(self, mock_shell):
+        """Test SSM schedule rejects invalid OS and does not call API"""
+        mock_shell.connection.is_connected = True
+        mock_shell.connection.is_authenticated = True
+        mock_shell.connection.is_admin = False
+        mock_shell.connection.username = "alice@example.com"
+        mock_shell.connection.api.filter_available.return_value = [
+            {"name": "host01.example.com"},
+        ]
+        mock_shell.connection.api.get_os_list.return_value = [
+            {"Id": 1, "Title": "RHEL 9.4", "Release Name": "", "Family": "Redhat"},
+        ]
+
+        user_cmd = UserCommands(mock_shell)
+        user_cmd.cmd_schedule('1 description "Test" os "--help"')
+
+        mock_shell.connection.api.create_self_assignment.assert_not_called()
+        mock_shell.perror.assert_called()
+        error_msg = mock_shell.perror.call_args[0][0]
+        assert "not found" in error_msg
+
     def test_schedule_ssm_insufficient_hosts(self, mock_shell):
         """Test SSM schedule with insufficient available hosts"""
         mock_shell.connection.is_connected = True
@@ -703,6 +727,9 @@ def test_schedule_admin_batch_with_os(self, mock_shell):
             "schedules_created": 1,
             "hostnames": ["host01.example.com"],
         }
+        mock_shell.connection.api.get_os_list.return_value = [
+            {"Id": 1, "Title": "RHEL 9.4", "Release Name": "", "Family": "Redhat"},
+        ]
 
         schedule_cmd = ScheduleCommands(mock_shell)
         cmd = (
@@ -713,3 +740,25 @@ def test_schedule_admin_batch_with_os(self, mock_shell):
 
         batch_data = mock_shell.connection.api.create_schedules_batch.call_args[0][0]
         assert batch_data["ostype"] == "RHEL 9.4"
+
+    def test_schedule_admin_batch_with_invalid_os(self, mock_shell):
+        """Test batch schedule rejects invalid OS and does not call API"""
+        mock_shell.connection.is_connected = True
+        mock_shell.connection.is_authenticated = True
+        mock_shell.connection.is_admin = True
+        mock_shell.connection.api.filter_clouds.return_value = [{"name": "cloud02"}]
+        mock_shell.connection.api.get_os_list.return_value = [
+            {"Id": 1, "Title": "RHEL 9.4", "Release Name": "", "Family": "Redhat"},
+        ]
+
+        schedule_cmd = ScheduleCommands(mock_shell)
+        cmd = (
+            'cloud02 host01 "2026-05-11 22:00" "2026-06-11 22:00" '
+            'description "Test" cloud-owner jdoe cloud-ticket 123 os "bogus"'
+        )
+        schedule_cmd.cmd_schedule_admin(cmd)
+
+        mock_shell.connection.api.create_schedules_batch.assert_not_called()
+        mock_shell.perror.assert_called()
+        error_msg = mock_shell.perror.call_args[0][0]
+        assert "not found" in error_msg
diff --git a/tests/test_help_menu_coverage.py b/tests/test_help_menu_coverage.py
new file mode 100644
index 0000000..032504c
--- /dev/null
+++ b/tests/test_help_menu_coverage.py
@@ -0,0 +1,1201 @@
+import pytest
+from unittest.mock import MagicMock, patch
+from quads_client.shell import QuadsClientShell
+from quads_client.commands.host import HostCommands
+from quads_client.commands.cloud import CloudCommands
+from quads_client.commands.session import SessionCommands
+from tests.helpers import completions_to_list as _to_list
+
+
+def _make_shell():
+    with patch("quads_client.shell.QuadsClientConfig"):
+        with patch("quads_client.shell.SessionManager"):
+            shell = QuadsClientShell()
+    return shell
+
+
+def _make_connected_shell(is_admin=False):
+    shell = _make_shell()
+    mock_conn = MagicMock()
+    mock_conn.is_authenticated = True
+    mock_conn.is_admin = is_admin
+    mock_conn.is_connected = True
+    mock_conn.current_server = "test_server"
+    mock_conn.username = "testuser@example.com"
+    mock_conn.api.get_clouds.return_value = [
+        {"name": "cloud01"},
+        {"name": "cloud02"},
+    ]
+    mock_conn.api.get_hosts.return_value = [
+        {"name": "host01"},
+        {"name": "host02"},
+    ]
+    mock_conn.api.filter_hosts.return_value = [
+        {"name": "host01"},
+        {"name": "host02"},
+    ]
+    mock_conn.api.get_os_list.return_value = [
+        {"Id": 1, "Title": "RHEL 9.4", "Release Name": "Plow", "Family": "RHEL"},
+        {"Id": 2, "Title": "RHEL 8.10", "Release Name": "Ootpa", "Family": "RHEL"},
+    ]
+    mock_conn.api.get_free_vlans.return_value = [
+        {"vlan_id": 1100},
+        {"vlan_id": 1200},
+    ]
+    mock_conn.api.filter_assignments.return_value = [
+        {"id": 1},
+        {"id": 2},
+    ]
+    mock_conn.api.get_schedules.return_value = [
+        {"id": 10, "host": {"name": "host01"}},
+        {"id": 11, "host": {"name": "host02"}},
+    ]
+    mock_conn.api.get_current_schedules.return_value = [
+        {"host": {"name": "host01"}},
+        {"host": {"name": "host02"}},
+    ]
+    shell.session_manager.active_connection = mock_conn
+    return shell
+
+
+# --- help_schedule ---
+
+
+class TestHelpSchedule:
+    def test_admin_help(self):
+        shell = _make_connected_shell(is_admin=True)
+        shell.poutput = MagicMock()
+        shell.help_schedule()
+        calls = [str(c) for c in shell.poutput.call_args_list]
+        assert any("admin mode" in c.lower() for c in calls)
+        assert any("cloud-owner" in c for c in calls)
+
+    def test_ssm_help(self):
+        shell = _make_connected_shell(is_admin=False)
+        shell.poutput = MagicMock()
+        shell.help_schedule()
+        calls = [str(c) for c in shell.poutput.call_args_list]
+        assert any("ssm mode" in c.lower() for c in calls)
+        assert any("model" in c for c in calls)
+
+    def test_no_connection_shows_ssm(self):
+        shell = _make_shell()
+        shell.session_manager.active_connection = None
+        shell.poutput = MagicMock()
+        shell.help_schedule()
+        calls = [str(c) for c in shell.poutput.call_args_list]
+        assert any("ssm mode" in c.lower() for c in calls)
+
+
+# --- do_schedule help flags ---
+
+
+class TestDoScheduleHelp:
+    @pytest.mark.parametrize("flag", ["?", "-h", "--help"])
+    def test_help_flags_show_help(self, flag):
+        shell = _make_connected_shell(is_admin=False)
+        shell.poutput = MagicMock()
+        shell.do_schedule(flag)
+        assert shell.poutput.call_count >= 1
+
+    def test_normal_args_route_to_ssm(self):
+        shell = _make_connected_shell(is_admin=False)
+        shell.user_commands = MagicMock()
+        shell.do_schedule("3 description test")
+        shell.user_commands.cmd_schedule.assert_called_once()
+
+    def test_admin_args_route_to_admin(self):
+        shell = _make_connected_shell(is_admin=True)
+        shell.schedule_commands = MagicMock()
+        shell.do_schedule("cloud02 host01 2026-08-01 2026-08-15")
+        shell.schedule_commands.cmd_schedule_admin.assert_called_once()
+
+
+# --- complete_schedule ---
+
+
+class TestCompleteSchedule:
+    def test_no_connection(self):
+        shell = _make_shell()
+        shell.session_manager.active_connection = None
+        assert _to_list(shell.complete_schedule("", "schedule ", 9, 9)) == []
+
+    def test_not_authenticated(self):
+        shell = _make_connected_shell()
+        shell.connection.is_authenticated = False
+        assert _to_list(shell.complete_schedule("", "schedule ", 9, 9)) == []
+
+    def test_admin_first_arg_clouds(self):
+        shell = _make_connected_shell(is_admin=True)
+        result = shell.complete_schedule("", "schedule ", 9, 9)
+        assert "cloud01" in result
+        assert "cloud02" in result
+
+    def test_admin_first_arg_filtered(self):
+        shell = _make_connected_shell(is_admin=True)
+        result = shell.complete_schedule("cloud0", "schedule cloud0", 9, 15)
+        assert "cloud01" in result
+        assert "cloud02" in result
+
+    def test_admin_position2_hosts_and_host_list(self):
+        shell = _make_connected_shell(is_admin=True)
+        result = shell.complete_schedule("", "schedule cloud02 ", 18, 18)
+        assert "host01" in result
+        assert "host02" in result
+        assert "host-list" in result
+        assert "cloud01" not in result
+        assert "description" not in result
+
+    def test_admin_position2_filtered(self):
+        shell = _make_connected_shell(is_admin=True)
+        result = shell.complete_schedule("host", "schedule cloud02 host", 18, 22)
+        assert "host01" in result
+        assert "host02" in result
+        assert "host-list" in result
+
+    def test_admin_no_cloud_at_position2(self):
+        shell = _make_connected_shell(is_admin=True)
+        result = shell.complete_schedule("cloud", "schedule cloud02 cloud", 18, 23)
+        assert _to_list(result) == []
+
+    def test_admin_date_positions_empty(self):
+        shell = _make_connected_shell(is_admin=True)
+        result = shell.complete_schedule("", "schedule cloud02 host01 ", 24, 24)
+        assert result == []
+
+    def test_admin_date_position4_empty(self):
+        shell = _make_connected_shell(is_admin=True)
+        result = shell.complete_schedule("", "schedule cloud02 host01 2026-08-01 ", 35, 35)
+        assert result == []
+
+    def test_admin_options_keywords_only(self):
+        shell = _make_connected_shell(is_admin=True)
+        result = shell.complete_schedule(
+            "",
+            "schedule cloud02 host01 2026-08-01 2026-08-15 ",
+            47,
+            47,
+        )
+        assert "description" in result
+        assert "cloud-owner" in result
+        assert "nowipe" in result
+        assert "host01" not in result
+
+    def test_admin_options_filtered(self):
+        shell = _make_connected_shell(is_admin=True)
+        result = shell.complete_schedule(
+            "cl",
+            "schedule cloud02 host01 2026-08-01 2026-08-15 cl",
+            47,
+            49,
+        )
+        assert "cloud-owner" in result
+        assert "cloud-ticket" in result
+        assert "cc-users" not in result
+        assert "description" not in result
+
+    def test_admin_value_keyword_suppresses_completions(self):
+        shell = _make_connected_shell(is_admin=True)
+        result = shell.complete_schedule(
+            "",
+            "schedule cloud02 host01 2026-08-01 2026-08-15 cloud-owner ",
+            59,
+            59,
+        )
+        assert result == []
+
+    def test_admin_host_list_date_positions(self):
+        shell = _make_connected_shell(is_admin=True)
+        result = shell.complete_schedule("", "schedule cloud02 host-list ~/hosts.txt ", 40, 40)
+        assert result == []
+
+    def test_admin_host_list_options(self):
+        shell = _make_connected_shell(is_admin=True)
+        result = shell.complete_schedule(
+            "",
+            "schedule cloud02 host-list ~/hosts.txt 2026-08-01 2026-08-15 ",
+            62,
+            62,
+        )
+        assert "description" in result
+        assert "host01" not in result
+
+    def test_admin_os_value_completion(self):
+        shell = _make_connected_shell(is_admin=True)
+        result = shell.complete_schedule(
+            "",
+            "schedule cloud02 host01 2026-08-01 2026-08-15 os ",
+            50,
+            50,
+        )
+        assert "RHEL 9.4" in result
+        assert "RHEL 8.10" in result
+
+    def test_admin_vlan_value_completion(self):
+        shell = _make_connected_shell(is_admin=True)
+        result = shell.complete_schedule(
+            "",
+            "schedule cloud02 host01 2026-08-01 2026-08-15 vlan ",
+            51,
+            51,
+        )
+        assert "1100" in result
+        assert "1200" in result
+
+    def test_admin_api_exception_fallback(self):
+        shell = _make_connected_shell(is_admin=True)
+        shell.connection.api.get_clouds.side_effect = Exception("fail")
+        result = shell.complete_schedule("", "schedule ", 9, 9)
+        assert "description" in result
+
+    def test_ssm_first_arg_hosts_and_counts(self):
+        shell = _make_connected_shell(is_admin=False)
+        result = shell.complete_schedule("", "schedule ", 9, 9)
+        assert "host01" in result
+        assert "1" in result
+        assert "host-list" in result
+
+    def test_ssm_first_arg_filtered(self):
+        shell = _make_connected_shell(is_admin=False)
+        result = shell.complete_schedule("host", "schedule host", 9, 13)
+        assert "host01" in result
+        assert "1" not in result
+
+    def test_ssm_later_args_keywords(self):
+        shell = _make_connected_shell(is_admin=False)
+        result = shell.complete_schedule("", "schedule 3 description test ", 29, 29)
+        assert "nowipe" in result
+        assert "model" in result
+        assert "vlan" in result
+
+    def test_ssm_later_args_filtered(self):
+        shell = _make_connected_shell(is_admin=False)
+        result = shell.complete_schedule("disk", "schedule 3 description test disk", 33, 37)
+        assert "disk-type" in result
+        assert "disk-size" in result
+        assert "model" not in result
+
+    def test_ssm_value_keyword_suppresses_completions(self):
+        shell = _make_connected_shell(is_admin=False)
+        result = shell.complete_schedule("", "schedule 3 description ", 22, 22)
+        assert result == []
+
+    def test_ssm_os_value_completion(self):
+        shell = _make_connected_shell(is_admin=False)
+        result = shell.complete_schedule("", "schedule 3 description test os ", 31, 31)
+        assert "RHEL 9.4" in result
+        assert "RHEL 8.10" in result
+
+    def test_ssm_vlan_value_completion(self):
+        shell = _make_connected_shell(is_admin=False)
+        result = shell.complete_schedule("", "schedule 3 description test vlan ", 33, 33)
+        assert "1100" in result
+        assert "1200" in result
+
+    def test_ssm_api_exception_fallback(self):
+        shell = _make_connected_shell(is_admin=False)
+        shell.connection.api.filter_hosts.side_effect = Exception("fail")
+        result = shell.complete_schedule("", "schedule ", 9, 9)
+        assert "description" in result
+
+
+# --- complete_cloud_only ---
+
+
+class TestCompleteCloudOnly:
+    def test_no_connection(self):
+        shell = _make_shell()
+        shell.session_manager.active_connection = None
+        assert _to_list(shell.complete_cloud_only("", "cloud_only ", 11, 11)) == []
+
+    def test_not_authenticated(self):
+        shell = _make_connected_shell()
+        shell.connection.is_authenticated = False
+        assert _to_list(shell.complete_cloud_only("", "cloud_only ", 11, 11)) == []
+
+    def test_all_clouds(self):
+        shell = _make_connected_shell()
+        result = shell.complete_cloud_only("", "cloud_only ", 11, 11)
+        assert "cloud01" in result
+        assert "cloud02" in result
+
+    def test_filtered(self):
+        shell = _make_connected_shell()
+        result = shell.complete_cloud_only("cloud01", "cloud_only cloud01", 11, 18)
+        assert _to_list(result) == ["cloud01"]
+
+    def test_api_exception(self):
+        shell = _make_connected_shell()
+        shell.connection.api.get_clouds.side_effect = Exception("fail")
+        assert _to_list(shell.complete_cloud_only("", "cloud_only ", 11, 11)) == []
+
+
+# --- complete_move_status ---
+
+
+class TestCompleteMoveStatus:
+    def test_no_connection(self):
+        shell = _make_shell()
+        shell.session_manager.active_connection = None
+        assert _to_list(shell.complete_move_status("", "move_status ", 12, 12)) == []
+
+    def test_not_authenticated(self):
+        shell = _make_connected_shell()
+        shell.connection.is_authenticated = False
+        assert _to_list(shell.complete_move_status("", "move_status ", 12, 12)) == []
+
+    def test_all_hosts(self):
+        shell = _make_connected_shell()
+        result = shell.complete_move_status("", "move_status ", 12, 12)
+        assert "host01" in result
+        assert "host02" in result
+
+    def test_filtered(self):
+        shell = _make_connected_shell()
+        result = shell.complete_move_status("host01", "move_status host01", 12, 18)
+        assert _to_list(result) == ["host01"]
+
+    def test_api_exception(self):
+        shell = _make_connected_shell()
+        shell.connection.api.get_hosts.side_effect = Exception("fail")
+        assert _to_list(shell.complete_move_status("", "move_status ", 12, 12)) == []
+
+
+# --- complete_track ---
+
+
+class TestCompleteTrack:
+    def test_no_connection(self):
+        shell = _make_shell()
+        shell.session_manager.active_connection = None
+        assert _to_list(shell.complete_track("", "track ", 6, 6)) == []
+
+    def test_not_authenticated(self):
+        shell = _make_connected_shell()
+        shell.connection.is_authenticated = False
+        assert _to_list(shell.complete_track("", "track ", 6, 6)) == []
+
+    def test_all_hosts_and_clouds(self):
+        shell = _make_connected_shell()
+        result = shell.complete_track("", "track ", 6, 6)
+        assert "host01" in result
+        assert "cloud01" in result
+
+    def test_filtered(self):
+        shell = _make_connected_shell()
+        result = shell.complete_track("cloud", "track cloud", 6, 11)
+        assert "cloud01" in result
+        assert "cloud02" in result
+        assert "host01" not in result
+
+    def test_api_exception(self):
+        shell = _make_connected_shell()
+        shell.connection.api.get_hosts.side_effect = Exception("fail")
+        assert _to_list(shell.complete_track("", "track ", 6, 6)) == []
+
+
+# --- complete_session_create ---
+
+
+class TestCompleteSessionCreate:
+    def test_with_config(self):
+        shell = _make_shell()
+        mock_config = MagicMock()
+        mock_config.get_all_servers.return_value = {
+            "server1": {},
+            "server2": {},
+        }
+        shell.config = mock_config
+        result = shell.complete_session_create("", "session_create ", 15, 15)
+        assert "server1" in result
+        assert "server2" in result
+
+    def test_filtered(self):
+        shell = _make_shell()
+        mock_config = MagicMock()
+        mock_config.get_all_servers.return_value = {
+            "server1": {},
+            "staging": {},
+        }
+        shell.config = mock_config
+        result = shell.complete_session_create("ser", "session_create ser", 15, 18)
+        assert _to_list(result) == ["server1"]
+
+    def test_no_config(self):
+        shell = _make_shell()
+        shell.config = None
+        result = shell.complete_session_create("", "session_create ", 15, 15)
+        assert _to_list(result) == []
+
+
+# --- complete_session_switch ---
+
+
+class TestCompleteSessionSwitch:
+    def test_with_sessions(self):
+        shell = _make_shell()
+        mock_session = MagicMock()
+        mock_session.id = "1"
+        shell.session_manager.list_sessions.return_value = [mock_session]
+        result = shell.complete_session_switch("", "session_switch ", 15, 15)
+        assert "1" in result
+
+    def test_filtered(self):
+        shell = _make_shell()
+        s1 = MagicMock()
+        s1.id = "1"
+        s2 = MagicMock()
+        s2.id = "2"
+        shell.session_manager.list_sessions.return_value = [s1, s2]
+        result = shell.complete_session_switch("1", "session_switch 1", 15, 16)
+        assert _to_list(result) == ["1"]
+
+    def test_no_session_manager(self):
+        shell = _make_shell()
+        shell.session_manager = None
+        result = shell.complete_session_switch("", "session_switch ", 15, 15)
+        assert _to_list(result) == []
+
+
+# --- complete_session ---
+
+
+class TestCompleteSession:
+    def test_ids_and_labels(self):
+        shell = _make_shell()
+        mock_session = MagicMock()
+        mock_session.id = "1"
+        mock_session.label = "dev"
+        shell.session_manager.list_sessions.return_value = [mock_session]
+        result = shell.complete_session("", "session ", 8, 8)
+        assert "1" in result
+        assert "dev" in result
+
+    def test_filtered_by_label(self):
+        shell = _make_shell()
+        s1 = MagicMock()
+        s1.id = "1"
+        s1.label = "dev"
+        s2 = MagicMock()
+        s2.id = "2"
+        s2.label = "prod"
+        shell.session_manager.list_sessions.return_value = [s1, s2]
+        result = shell.complete_session("dev", "session dev", 8, 11)
+        assert _to_list(result) == ["dev"]
+
+    def test_no_session_manager(self):
+        shell = _make_shell()
+        shell.session_manager = None
+        result = shell.complete_session("", "session ", 8, 8)
+        assert _to_list(result) == []
+
+
+# --- complete_session_close ---
+
+
+class TestCompleteSessionClose:
+    def test_with_sessions(self):
+        shell = _make_shell()
+        mock_session = MagicMock()
+        mock_session.id = "1"
+        shell.session_manager.list_sessions.return_value = [mock_session]
+        result = shell.complete_session_close("", "session_close ", 14, 14)
+        assert "1" in result
+
+    def test_filtered(self):
+        shell = _make_shell()
+        s1 = MagicMock()
+        s1.id = "1"
+        s2 = MagicMock()
+        s2.id = "2"
+        shell.session_manager.list_sessions.return_value = [s1, s2]
+        result = shell.complete_session_close("2", "session_close 2", 14, 15)
+        assert _to_list(result) == ["2"]
+
+    def test_no_session_manager(self):
+        shell = _make_shell()
+        shell.session_manager = None
+        result = shell.complete_session_close("", "session_close ", 14, 14)
+        assert _to_list(result) == []
+
+
+# --- host command help flags ---
+
+
+class TestHostHelpFlags:
+    @pytest.fixture
+    def host_cmd(self, mock_shell):
+        mock_shell.connection.is_connected = True
+        return HostCommands(mock_shell)
+
+    @pytest.mark.parametrize("flag", ["-h", "--help"])
+    def test_mark_broken_help(self, host_cmd, mock_shell, flag):
+        host_cmd.cmd_mark_broken(flag)
+        mock_shell.perror.assert_called_with("Usage: mark-broken <hostname>")
+
+    @pytest.mark.parametrize("flag", ["-h", "--help"])
+    def test_mark_repaired_help(self, host_cmd, mock_shell, flag):
+        host_cmd.cmd_mark_repaired(flag)
+        mock_shell.perror.assert_called_with("Usage: mark-repaired <hostname>")
+
+    @pytest.mark.parametrize("flag", ["-h", "--help"])
+    def test_retire_help(self, host_cmd, mock_shell, flag):
+        host_cmd.cmd_retire(flag)
+        mock_shell.perror.assert_called_with("Usage: retire <hostname>")
+
+    @pytest.mark.parametrize("flag", ["-h", "--help"])
+    def test_unretire_help(self, host_cmd, mock_shell, flag):
+        host_cmd.cmd_unretire(flag)
+        mock_shell.perror.assert_called_with("Usage: unretire <hostname>")
+
+
+# --- cloud command help flags ---
+
+
+class TestCloudHelpFlags:
+    @pytest.fixture
+    def cloud_cmd(self, mock_shell):
+        mock_shell.connection.is_connected = True
+        return CloudCommands(mock_shell)
+
+    @pytest.mark.parametrize("flag", ["-h", "--help"])
+    def test_cloud_create_help(self, cloud_cmd, mock_shell, flag):
+        cloud_cmd.cmd_cloud_create(flag)
+        mock_shell.perror.assert_called_with("Usage: cloud-create <name>")
+
+    @pytest.mark.parametrize("flag", ["-h", "--help"])
+    def test_cloud_only_help(self, cloud_cmd, mock_shell, flag):
+        cloud_cmd.cmd_cloud_only(flag)
+        mock_shell.perror.assert_called_with("Usage: cloud_only <cloud_name>")
+
+
+# --- session command help flags ---
+
+
+class TestSessionHelpFlags:
+    @pytest.fixture
+    def session_cmd(self, mock_shell):
+        return SessionCommands(mock_shell)
+
+    @pytest.mark.parametrize("flag", ["-h", "--help"])
+    def test_session_help_flags(self, session_cmd, mock_shell, flag):
+        session_cmd.cmd_session(flag)
+        assert mock_shell.poutput.call_count >= 1
+        assert any("Usage:" in str(c) for c in mock_shell.poutput.call_args_list)
+
+
+# --- complete_terminate ---
+
+
+class TestCompleteTerminate:
+    def test_no_connection(self):
+        shell = _make_shell()
+        shell.session_manager.active_connection = None
+        assert shell.complete_terminate("", "terminate ", 10, 10) == []
+
+    def test_not_authenticated(self):
+        shell = _make_connected_shell()
+        shell.connection.is_authenticated = False
+        assert shell.complete_terminate("", "terminate ", 10, 10) == []
+
+    def test_first_arg_assignment_ids(self):
+        shell = _make_connected_shell()
+        result = shell.complete_terminate("", "terminate ", 10, 10)
+        assert "1" in result
+        assert "2" in result
+
+    def test_second_arg_hostnames(self):
+        shell = _make_connected_shell()
+        result = shell.complete_terminate("h", "terminate 1 h", 12, 13)
+        assert "host01" in result
+        assert "host02" in result
+
+    def test_assignment_ids_sorted_numerically(self):
+        shell = _make_connected_shell()
+        shell.connection.api.filter_assignments.return_value = [
+            {"id": 10},
+            {"id": 11},
+            {"id": 8},
+        ]
+        result = shell.complete_terminate("", "terminate ", 10, 10)
+        assert [str(item) for item in result] == ["8", "10", "11"]
+
+    def test_api_exception(self):
+        shell = _make_connected_shell()
+        shell.connection.api.filter_assignments.side_effect = Exception("fail")
+        assert shell.complete_terminate("", "terminate ", 10, 10) == []
+
+
+# --- complete_extend ---
+
+
+class TestCompleteExtend:
+    def test_no_connection(self):
+        shell = _make_shell()
+        shell.session_manager.active_connection = None
+        assert shell.complete_extend("", "extend ", 7, 7) == []
+
+    def test_not_admin(self):
+        shell = _make_connected_shell(is_admin=False)
+        assert shell.complete_extend("", "extend ", 7, 7) == []
+
+    def test_first_arg_clouds_and_hosts(self):
+        shell = _make_connected_shell(is_admin=True)
+        result = shell.complete_extend("", "extend ", 7, 7)
+        assert "cloud01" in result
+        assert "host01" in result
+
+    def test_second_arg_keywords(self):
+        shell = _make_connected_shell(is_admin=True)
+        result = shell.complete_extend("w", "extend cloud01 w", 15, 16)
+        assert "weeks" in result
+
+    def test_api_exception(self):
+        shell = _make_connected_shell(is_admin=True)
+        shell.connection.api.get_clouds.side_effect = Exception("fail")
+        assert shell.complete_extend("", "extend ", 7, 7) == []
+
+
+# --- complete_shrink ---
+
+
+class TestCompleteShrink:
+    def test_no_connection(self):
+        shell = _make_shell()
+        shell.session_manager.active_connection = None
+        assert shell.complete_shrink("", "shrink ", 7, 7) == []
+
+    def test_not_admin(self):
+        shell = _make_connected_shell(is_admin=False)
+        assert shell.complete_shrink("", "shrink ", 7, 7) == []
+
+    def test_first_arg_clouds_and_hosts(self):
+        shell = _make_connected_shell(is_admin=True)
+        result = shell.complete_shrink("", "shrink ", 7, 7)
+        assert "cloud01" in result
+        assert "host01" in result
+
+    def test_second_arg_weeks(self):
+        shell = _make_connected_shell(is_admin=True)
+        result = shell.complete_shrink("w", "shrink cloud01 w", 15, 16)
+        assert "weeks" in result
+
+    def test_second_arg_date(self):
+        shell = _make_connected_shell(is_admin=True)
+        result = shell.complete_shrink("d", "shrink cloud01 d", 15, 16)
+        assert "days" in result
+        assert "date" in result
+
+    def test_api_exception(self):
+        shell = _make_connected_shell(is_admin=True)
+        shell.connection.api.get_clouds.side_effect = Exception("fail")
+        assert shell.complete_shrink("", "shrink ", 7, 7) == []
+
+
+# --- complete_cloud_delete ---
+
+
+class TestCompleteCloudDelete:
+    def test_no_connection(self):
+        shell = _make_shell()
+        shell.session_manager.active_connection = None
+        assert shell.complete_cloud_delete("", "cloud_delete ", 13, 13) == []
+
+    def test_not_admin(self):
+        shell = _make_connected_shell(is_admin=False)
+        assert shell.complete_cloud_delete("", "cloud_delete ", 13, 13) == []
+
+    def test_all_clouds(self):
+        shell = _make_connected_shell(is_admin=True)
+        result = shell.complete_cloud_delete("", "cloud_delete ", 13, 13)
+        assert "cloud01" in result
+        assert "cloud02" in result
+
+    def test_api_exception(self):
+        shell = _make_connected_shell(is_admin=True)
+        shell.connection.api.get_clouds.side_effect = Exception("fail")
+        assert shell.complete_cloud_delete("", "cloud_delete ", 13, 13) == []
+
+
+# --- complete_mod_cloud ---
+
+
+class TestCompleteModCloud:
+    def test_no_connection(self):
+        shell = _make_shell()
+        shell.session_manager.active_connection = None
+        assert shell.complete_mod_cloud("", "mod_cloud ", 10, 10) == []
+
+    def test_not_admin(self):
+        shell = _make_connected_shell(is_admin=False)
+        assert shell.complete_mod_cloud("", "mod_cloud ", 10, 10) == []
+
+    def test_first_arg_cloud_names(self):
+        shell = _make_connected_shell(is_admin=True)
+        result = shell.complete_mod_cloud("", "mod_cloud ", 10, 10)
+        assert "cloud01" in result
+        assert "cloud02" in result
+
+    def test_later_args_keywords(self):
+        shell = _make_connected_shell(is_admin=True)
+        result = shell.complete_mod_cloud("c", "mod_cloud cloud01 c", 18, 19)
+        assert "cloud-owner" in result
+        assert "cloud-ticket" in result
+        assert "cc-users" in result
+
+    def test_api_exception(self):
+        shell = _make_connected_shell(is_admin=True)
+        shell.connection.api.get_clouds.side_effect = Exception("fail")
+        assert shell.complete_mod_cloud("", "mod_cloud ", 10, 10) == []
+
+
+# --- complete_cloud_list ---
+
+
+class TestCompleteCloudList:
+    def test_no_connection(self):
+        shell = _make_shell()
+        shell.session_manager.active_connection = None
+        assert shell.complete_cloud_list("", "cloud_list ", 11, 11) == []
+
+    def test_keywords(self):
+        shell = _make_connected_shell()
+        result = shell.complete_cloud_list("", "cloud_list ", 11, 11)
+        assert "cloud" in result
+        assert "detail" in result
+
+    def test_cloud_names_after_keyword(self):
+        shell = _make_connected_shell()
+        result = shell.complete_cloud_list("c", "cloud_list cloud c", 17, 18)
+        assert "cloud01" in result
+        assert "cloud02" in result
+
+    def test_api_exception(self):
+        shell = _make_connected_shell()
+        shell.connection.api.get_clouds.side_effect = Exception("fail")
+        assert _to_list(shell.complete_cloud_list("c", "cloud_list cloud c", 17, 18)) == []
+
+
+# --- complete_mark_broken ---
+
+
+class TestCompleteMarkBroken:
+    def test_no_connection(self):
+        shell = _make_shell()
+        shell.session_manager.active_connection = None
+        assert shell.complete_mark_broken("", "mark_broken ", 12, 12) == []
+
+    def test_not_admin(self):
+        shell = _make_connected_shell(is_admin=False)
+        assert shell.complete_mark_broken("", "mark_broken ", 12, 12) == []
+
+    def test_non_broken_hosts(self):
+        shell = _make_connected_shell(is_admin=True)
+        shell.connection.api.get_hosts.return_value = [
+            {"name": "host01", "broken": False},
+            {"name": "host02", "broken": True},
+        ]
+        result = shell.complete_mark_broken("", "mark_broken ", 12, 12)
+        assert "host01" in result
+        assert "host02" not in result
+
+    def test_api_exception(self):
+        shell = _make_connected_shell(is_admin=True)
+        shell.connection.api.get_hosts.side_effect = Exception("fail")
+        assert shell.complete_mark_broken("", "mark_broken ", 12, 12) == []
+
+
+# --- complete_mark_repaired ---
+
+
+class TestCompleteMarkRepaired:
+    def test_no_connection(self):
+        shell = _make_shell()
+        shell.session_manager.active_connection = None
+        assert shell.complete_mark_repaired("", "mark_repaired ", 14, 14) == []
+
+    def test_not_admin(self):
+        shell = _make_connected_shell(is_admin=False)
+        assert shell.complete_mark_repaired("", "mark_repaired ", 14, 14) == []
+
+    def test_broken_hosts(self):
+        shell = _make_connected_shell(is_admin=True)
+        result = shell.complete_mark_repaired("", "mark_repaired ", 14, 14)
+        assert "host01" in result
+        assert "host02" in result
+
+    def test_api_exception(self):
+        shell = _make_connected_shell(is_admin=True)
+        shell.connection.api.filter_hosts.side_effect = Exception("fail")
+        assert shell.complete_mark_repaired("", "mark_repaired ", 14, 14) == []
+
+
+# --- complete_retire ---
+
+
+class TestCompleteRetire:
+    def test_no_connection(self):
+        shell = _make_shell()
+        shell.session_manager.active_connection = None
+        assert shell.complete_retire("", "retire ", 7, 7) == []
+
+    def test_not_admin(self):
+        shell = _make_connected_shell(is_admin=False)
+        assert shell.complete_retire("", "retire ", 7, 7) == []
+
+    def test_non_retired_hosts(self):
+        shell = _make_connected_shell(is_admin=True)
+        shell.connection.api.get_hosts.return_value = [
+            {"name": "host01", "retired": False},
+            {"name": "host02", "retired": True},
+        ]
+        result = shell.complete_retire("", "retire ", 7, 7)
+        assert "host01" in result
+        assert "host02" not in result
+
+    def test_api_exception(self):
+        shell = _make_connected_shell(is_admin=True)
+        shell.connection.api.get_hosts.side_effect = Exception("fail")
+        assert shell.complete_retire("", "retire ", 7, 7) == []
+
+
+# --- complete_unretire ---
+
+
+class TestCompleteUnretire:
+    def test_no_connection(self):
+        shell = _make_shell()
+        shell.session_manager.active_connection = None
+        assert shell.complete_unretire("", "unretire ", 9, 9) == []
+
+    def test_not_admin(self):
+        shell = _make_connected_shell(is_admin=False)
+        assert shell.complete_unretire("", "unretire ", 9, 9) == []
+
+    def test_retired_hosts(self):
+        shell = _make_connected_shell(is_admin=True)
+        result = shell.complete_unretire("", "unretire ", 9, 9)
+        assert "host01" in result
+        assert "host02" in result
+
+    def test_api_exception(self):
+        shell = _make_connected_shell(is_admin=True)
+        shell.connection.api.filter_hosts.side_effect = Exception("fail")
+        assert shell.complete_unretire("", "unretire ", 9, 9) == []
+
+
+# --- complete_ls_schedule ---
+
+
+class TestCompleteLsSchedule:
+    def test_no_connection(self):
+        shell = _make_shell()
+        shell.session_manager.active_connection = None
+        assert shell.complete_ls_schedule("", "ls_schedule ", 12, 12) == []
+
+    def test_keywords(self):
+        shell = _make_connected_shell()
+        result = shell.complete_ls_schedule("", "ls_schedule ", 12, 12)
+        assert "host" in result
+        assert "cloud" in result
+
+    def test_hostnames_after_host_keyword(self):
+        shell = _make_connected_shell()
+        result = shell.complete_ls_schedule("h", "ls_schedule host h", 17, 18)
+        assert "host01" in result
+        assert "host02" in result
+
+    def test_cloud_names_after_cloud_keyword(self):
+        shell = _make_connected_shell()
+        result = shell.complete_ls_schedule("c", "ls_schedule cloud c", 18, 19)
+        assert "cloud01" in result
+        assert "cloud02" in result
+
+    def test_api_exception(self):
+        shell = _make_connected_shell()
+        shell.connection.api.get_hosts.side_effect = Exception("fail")
+        assert _to_list(shell.complete_ls_schedule("h", "ls_schedule host h", 17, 18)) == []
+
+
+# --- complete_mod_schedule ---
+
+
+class TestCompleteModSchedule:
+    def test_no_connection(self):
+        shell = _make_shell()
+        shell.session_manager.active_connection = None
+        assert shell.complete_mod_schedule("", "mod_schedule ", 13, 13) == []
+
+    def test_not_admin(self):
+        shell = _make_connected_shell(is_admin=False)
+        assert shell.complete_mod_schedule("", "mod_schedule ", 13, 13) == []
+
+    def test_keywords(self):
+        shell = _make_connected_shell(is_admin=True)
+        result = shell.complete_mod_schedule("", "mod_schedule ", 13, 13)
+        assert "id" in result
+        assert "start" in result
+        assert "end" in result
+
+    def test_schedule_ids_after_id_keyword(self):
+        shell = _make_connected_shell(is_admin=True)
+        result = shell.complete_mod_schedule("1", "mod_schedule id 1", 16, 17)
+        assert "10" in result
+        assert "11" in result
+
+    def test_api_exception(self):
+        shell = _make_connected_shell(is_admin=True)
+        shell.connection.api.get_schedules.side_effect = Exception("fail")
+        assert _to_list(shell.complete_mod_schedule("1", "mod_schedule id 1", 16, 17)) == []
+
+
+# --- complete_edit_server ---
+
+
+class TestCompleteEditServer:
+    def test_no_config(self):
+        shell = _make_shell()
+        shell.config = None
+        assert shell.complete_edit_server("", "edit_server ", 12, 12) == []
+
+    def test_first_arg_server_names(self):
+        shell = _make_shell()
+        mock_config = MagicMock()
+        mock_config.get_all_servers.return_value = {"server1": {}, "server2": {}}
+        shell.config = mock_config
+        result = shell.complete_edit_server("", "edit_server ", 12, 12)
+        assert "server1" in result
+        assert "server2" in result
+
+    def test_later_args_keywords(self):
+        shell = _make_shell()
+        mock_config = MagicMock()
+        mock_config.get_all_servers.return_value = {"server1": {}}
+        shell.config = mock_config
+        result = shell.complete_edit_server("u", "edit_server server1 u", 20, 21)
+        assert "url" in result
+        assert "username" in result
+
+    def test_exception(self):
+        shell = _make_shell()
+        mock_config = MagicMock()
+        mock_config.get_all_servers.side_effect = Exception("fail")
+        shell.config = mock_config
+        assert shell.complete_edit_server("", "edit_server ", 12, 12) == []
+
+
+# --- complete_rm_server ---
+
+
+class TestCompleteRmServer:
+    def test_no_config(self):
+        shell = _make_shell()
+        shell.config = None
+        assert shell.complete_rm_server("", "rm_server ", 10, 10) == []
+
+    def test_excludes_connected_server(self):
+        shell = _make_connected_shell()
+        mock_config = MagicMock()
+        mock_config.get_all_servers.return_value = {
+            "test_server": {},
+            "other_server": {},
+        }
+        shell.config = mock_config
+        result = shell.complete_rm_server("", "rm_server ", 10, 10)
+        assert "other_server" in result
+        assert "test_server" not in result
+
+    def test_exception(self):
+        shell = _make_shell()
+        mock_config = MagicMock()
+        mock_config.get_all_servers.side_effect = Exception("fail")
+        shell.config = mock_config
+        assert shell.complete_rm_server("", "rm_server ", 10, 10) == []
+
+
+# --- postcmd ---
+
+
+class TestPostcmd:
+    def test_returns_stop_and_updates_prompt(self):
+        shell = _make_shell()
+        shell._update_prompt = MagicMock()
+        result = shell.postcmd(True, "some_command")
+        assert result is True
+        shell._update_prompt.assert_called_once()
+
+    def test_returns_false(self):
+        shell = _make_shell()
+        shell._update_prompt = MagicMock()
+        result = shell.postcmd(False, "some_command")
+        assert result is False
+
+
+# --- _get_activity_indicator ---
+
+
+class TestGetActivityIndicator:
+    def test_not_authenticated(self):
+        shell = _make_shell()
+        shell.session_manager.active_connection = None
+        assert shell._get_activity_indicator() == ""
+
+    def test_active_moves(self):
+        shell = _make_connected_shell()
+        shell._last_activity_check = 0
+        shell.connection.api.get_all_move_status.return_value = [{"host": "host01"}]
+        result = shell._get_activity_indicator()
+        assert "⚡" in result
+
+    def test_no_moves(self):
+        shell = _make_connected_shell()
+        shell._last_activity_check = 0
+        shell.connection.api.get_all_move_status.return_value = []
+        result = shell._get_activity_indicator()
+        assert result == ""
+
+    def test_api_exception(self):
+        shell = _make_connected_shell()
+        shell._last_activity_check = 0
+        shell.connection.api.get_all_move_status.side_effect = Exception("fail")
+        result = shell._get_activity_indicator()
+        assert result == ""
+
+    def test_cached_within_30s(self):
+        import time
+
+        shell = _make_connected_shell()
+        shell._last_activity_check = time.time()
+        shell._cached_activity_indicator = "cached"
+        result = shell._get_activity_indicator()
+        assert result == "cached"
+
+
+# --- _get_session_indicators ---
+
+
+class TestGetSessionIndicators:
+    def test_no_session_manager(self):
+        shell = _make_shell()
+        shell.session_manager = None
+        assert shell._get_session_indicators() == ""
+
+    def test_single_session(self):
+        shell = _make_shell()
+        s1 = MagicMock()
+        s1.id = "1"
+        s1.label = "dev"
+        shell.session_manager.list_sessions.return_value = [s1]
+        assert shell._get_session_indicators() == ""
+
+    def test_multiple_sessions(self):
+        shell = _make_shell()
+        s1 = MagicMock()
+        s1.id = "1"
+        s1.label = "dev"
+        s2 = MagicMock()
+        s2.id = "2"
+        s2.label = "prod"
+        shell.session_manager.active_session_id = "1"
+        shell.session_manager.list_sessions.return_value = [s1, s2]
+        result = shell._get_session_indicators()
+        assert "1:dev*" in result
+        assert "2:prod" in result
+
+    def test_overflow_more_than_4(self):
+        shell = _make_shell()
+        sessions = []
+        for i in range(6):
+            s = MagicMock()
+            s.id = str(i)
+            s.label = f"s{i}"
+            sessions.append(s)
+        shell.session_manager.active_session_id = "0"
+        shell.session_manager.list_sessions.return_value = sessions
+        result = shell._get_session_indicators()
+        assert "+2" in result
+
+
+# --- do_* delegates ---
+
+
+class TestDoCommandDelegates:
+    @pytest.mark.parametrize(
+        "method,command_group,command_method",
+        [
+            ("do_version", "version_commands", "cmd_version"),
+            ("do_connect", "connection_commands", "cmd_connect"),
+            ("do_disconnect", "connection_commands", "cmd_disconnect"),
+            ("do_status", "connection_commands", "cmd_status"),
+            ("do_cloud_list", "cloud_commands", "cmd_cloud_list"),
+            ("do_find_free_cloud", "cloud_commands", "cmd_find_free_cloud"),
+            ("do_cloud_only", "cloud_commands", "cmd_cloud_only"),
+            ("do_ls_vlan", "cloud_commands", "cmd_ls_vlan"),
+            ("do_os_list", "cloud_commands", "cmd_os_list"),
+            ("do_cloud_create", "cloud_commands", "cmd_cloud_create"),
+            ("do_cloud_delete", "cloud_commands", "cmd_cloud_delete"),
+            ("do_register", "user_commands", "cmd_register"),
+            ("do_login", "user_commands", "cmd_login"),
+            ("do_token_login", "user_commands", "cmd_token_login"),
+            ("do_whoami", "user_commands", "cmd_whoami"),
+            ("do_assignment_create", "user_commands", "cmd_assignment_create"),
+            ("do_assignment_list", "user_commands", "cmd_assignment_list"),
+            ("do_assignment_status", "user_commands", "cmd_assignment_status"),
+            ("do_my_hosts", "user_commands", "cmd_my_hosts"),
+            ("do_my_assignments", "user_commands", "cmd_my_assignments"),
+            ("do_terminate", "user_commands", "cmd_terminate"),
+            ("do_ls_hosts", "host_commands", "cmd_ls_hosts"),
+            ("do_mark_broken", "host_commands", "cmd_mark_broken"),
+            ("do_mark_repaired", "host_commands", "cmd_mark_repaired"),
+            ("do_retire", "host_commands", "cmd_retire"),
+            ("do_unretire", "host_commands", "cmd_unretire"),
+            ("do_ls_broken", "host_commands", "cmd_ls_broken"),
+            ("do_ls_retired", "host_commands", "cmd_ls_retired"),
+            ("do_ls_schedule", "schedule_commands", "cmd_ls_schedule"),
+            ("do_mod_schedule", "schedule_commands", "cmd_mod_schedule"),
+            ("do_extend", "schedule_commands", "cmd_extend"),
+            ("do_shrink", "schedule_commands", "cmd_shrink"),
+            ("do_ls_available", "available_commands", "cmd_ls_available"),
+            ("do_move_status", "move_commands", "cmd_move_status"),
+            ("do_track", "track_commands", "cmd_track"),
+            ("do_activity", "move_commands", "cmd_activity"),
+            ("do_servers", "server_commands", "cmd_servers"),
+            ("do_add_server", "server_commands", "cmd_add_server"),
+            ("do_add_quads_server", "server_commands", "cmd_add_quads_server"),
+            ("do_edit_server", "server_commands", "cmd_edit_server"),
+            ("do_rm_server", "server_commands", "cmd_rm_server"),
+            ("do_config_reload", "server_commands", "cmd_config_reload"),
+            ("do_session_create", "session_commands", "cmd_session_create"),
+            ("do_session_switch", "session_commands", "cmd_session_switch"),
+            ("do_session", "session_commands", "cmd_session"),
+            ("do_session_list", "session_commands", "cmd_session_list"),
+            ("do_session_close", "session_commands", "cmd_session_close"),
+            ("do_session_close_all", "session_commands", "cmd_session_close_all"),
+            ("do_mod_cloud", "cloud_commands", "cmd_mod_cloud"),
+        ],
+    )
+    def test_delegate(self, method, command_group, command_method):
+        shell = _make_shell()
+        mock_group = MagicMock()
+        setattr(shell, command_group, mock_group)
+        getattr(shell, method)("test_args")
+        getattr(mock_group, command_method).assert_called_once_with("test_args")
+
+
+# --- do_debug_admin ---
+
+
+class TestDoDebugAdmin:
+    def test_with_connection(self, capsys):
+        shell = _make_connected_shell()
+        shell.do_debug_admin("")
+        output = capsys.readouterr().out
+        assert "Connected:" in output
+        assert "Authenticated:" in output
+
+    def test_without_connection(self, capsys):
+        shell = _make_shell()
+        shell.session_manager.active_connection = None
+        shell.do_debug_admin("")
+        output = capsys.readouterr().out
+        assert "No connection" in output
diff --git a/tests/test_shell_autocomplete.py b/tests/test_shell_autocomplete.py
index abc975f..b9ba60e 100644
--- a/tests/test_shell_autocomplete.py
+++ b/tests/test_shell_autocomplete.py
@@ -1,6 +1,7 @@
 import pytest
 from unittest.mock import MagicMock, patch
 from quads_client.shell import QuadsClientShell
+from tests.helpers import completions_to_list as _to_list
 
 
 def test_complete_connect_all_servers():
@@ -15,7 +16,7 @@ def test_complete_connect_all_servers():
 
             completions = shell.complete_connect("", "connect ", 8, 8)
 
-            assert completions == ["server1", "server2", "server3"]
+            assert _to_list(completions) == ["server1", "server2", "server3"]
 
 
 def test_complete_connect_filtered():
@@ -30,7 +31,7 @@ def test_complete_connect_filtered():
 
             completions = shell.complete_connect("ser", "connect ser", 8, 11)
 
-            assert completions == ["server1", "server2"]
+            assert _to_list(completions) == ["server1", "server2"]
 
 
 def test_complete_connect_no_connection_with_config():
@@ -47,7 +48,7 @@ def test_complete_connect_no_connection_with_config():
 
             completions = shell.complete_connect("", "connect ", 8, 8)
 
-            assert sorted(completions) == ["server1", "server2"]
+            assert sorted(_to_list(completions)) == ["server1", "server2"]
 
 
 def test_complete_connect_no_connection_no_config():
@@ -61,7 +62,7 @@ def test_complete_connect_no_connection_no_config():
 
             completions = shell.complete_connect("", "connect ", 8, 8)
 
-            assert completions == []
+            assert _to_list(completions) == []
 
 
 def test_complete_connect_no_connection_filtered():
@@ -76,7 +77,7 @@ def test_complete_connect_no_connection_filtered():
 
             completions = shell.complete_connect("ser", "connect ser", 8, 11)
 
-            assert sorted(completions) == ["server1", "server2"]
+            assert sorted(_to_list(completions)) == ["server1", "server2"]
 
 
 def test_complete_connect_exact_match():
@@ -107,7 +108,7 @@ def test_complete_connect_no_match():
 
             completions = shell.complete_connect("xyz", "connect xyz", 8, 11)
 
-            assert completions == []
+            assert _to_list(completions) == []
 
 
 def test_complete_ls_available_all_keywords():
@@ -154,4 +155,4 @@ def test_complete_ls_available_no_match():
 
             completions = shell.complete_ls_available("xyz", "ls_available xyz", 13, 16)
 
-            assert completions == []
+            assert _to_list(completions) == []
diff --git a/tests/test_shell_extended.py b/tests/test_shell_extended.py
index 8411ff3..69e6945 100644
--- a/tests/test_shell_extended.py
+++ b/tests/test_shell_extended.py
@@ -168,7 +168,7 @@ def test_shell_update_visible_commands_admin():
 
 
 def test_shell_update_prompt_admin_badge():
-    """Test prompt includes [ADMIN] badge for admin users with readline wrapping"""
+    """Test prompt includes [ADMIN] badge for admin users"""
     with patch("quads_client.shell.QuadsClientConfig"):
         with patch("quads_client.shell.SessionManager"):
             shell = QuadsClientShell()
@@ -183,9 +183,6 @@ def test_shell_update_prompt_admin_badge():
 
             shell._update_prompt()
             assert "[ADMIN]" in shell.prompt
-            # Verify readline wrapping markers are present
-            assert "\001" in shell.prompt
-            assert "\002" in shell.prompt
 
 
 def test_shell_update_prompt_no_admin_badge():
@@ -206,12 +203,15 @@ def test_shell_update_prompt_no_admin_badge():
             assert "[ADMIN]" not in shell.prompt
 
 
-def test_rl_wraps_ansi_for_readline():
-    """Test _rl helper wraps ANSI codes with readline non-printing markers"""
-    from quads_client.shell import _rl
-
-    result = _rl("\033[1;31m")
-    assert result == "\001\033[1;31m\002"
+def test_prompt_uses_raw_ansi_codes():
+    """Prompt must use raw ANSI codes so cmd2's rl_escape_prompt handles wrapping"""
+    with patch("quads_client.shell.QuadsClientConfig"):
+        with patch("quads_client.shell.SessionManager"):
+            shell = QuadsClientShell()
+            shell._update_prompt()
+            assert "\033[" in shell.prompt
+            assert "\001" not in shell.prompt
+            assert "\002" not in shell.prompt
 
 
 def test_shell_preloop_binds_readline():
diff --git a/tests/test_utils.py b/tests/test_utils.py
index e170a1c..d3cf248 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -12,6 +12,7 @@
     get_ssl_indicator,
     get_ssl_status_text,
     get_username_short,
+    resolve_os,
     validate_cloud_exists,
 )
 
@@ -485,3 +486,75 @@ def test_validate_cloud_exists_false():
 
     assert result is False
     mock_api.filter_clouds.assert_called_once_with({"name": "cloud99"})
+
+
+OS_LIST = [
+    {"Id": 1, "Title": "Rocky Linux 9.8", "Release Name": "", "Family": "Redhat"},
+    {"Id": 2, "Title": "Fedora 42", "Release Name": "", "Family": "Redhat"},
+    {"Id": 3, "Title": "RHEL 10.0", "Release Name": "", "Family": "Redhat"},
+]
+
+
+def test_resolve_os_exact_title():
+    mock_api = MagicMock()
+    mock_api.get_os_list.return_value = OS_LIST
+    title, error = resolve_os(mock_api, "RHEL 10.0")
+    assert title == "RHEL 10.0"
+    assert error is None
+
+
+def test_resolve_os_case_insensitive():
+    mock_api = MagicMock()
+    mock_api.get_os_list.return_value = OS_LIST
+    title, error = resolve_os(mock_api, "rhel 10.0")
+    assert title == "RHEL 10.0"
+    assert error is None
+    title, error = resolve_os(mock_api, "fedora 42")
+    assert title == "Fedora 42"
+    assert error is None
+
+
+def test_resolve_os_by_id():
+    mock_api = MagicMock()
+    mock_api.get_os_list.return_value = OS_LIST
+    title, error = resolve_os(mock_api, "2")
+    assert title == "Fedora 42"
+    assert error is None
+    title, error = resolve_os(mock_api, "3")
+    assert title == "RHEL 10.0"
+    assert error is None
+
+
+def test_resolve_os_no_match():
+    mock_api = MagicMock()
+    mock_api.get_os_list.return_value = OS_LIST
+    title, error = resolve_os(mock_api, "--help")
+    assert title is None
+    assert "not found" in error
+    assert "Available:" in error
+
+
+def test_resolve_os_no_match_shows_available():
+    mock_api = MagicMock()
+    mock_api.get_os_list.return_value = OS_LIST
+    title, error = resolve_os(mock_api, "Windows 11")
+    assert title is None
+    assert "Rocky Linux 9.8" in error
+    assert "Fedora 42" in error
+    assert "RHEL 10.0" in error
+
+
+def test_resolve_os_empty_list():
+    mock_api = MagicMock()
+    mock_api.get_os_list.return_value = []
+    title, error = resolve_os(mock_api, "RHEL 10.0")
+    assert title is None
+    assert "not found" in error
+
+
+def test_resolve_os_none_list():
+    mock_api = MagicMock()
+    mock_api.get_os_list.return_value = None
+    title, error = resolve_os(mock_api, "RHEL 10.0")
+    assert title is None
+    assert "not found" in error