Tools and prompts list are difficult to review

Checks

• I have searched github.com/aws/amazon-q-developer-cli/issues and there are no duplicates of my issue
• I have run q doctor in the affected terminal session
• I have run q restart and replicated the issue again

Operating system

macOS 15.4.1 (24E263)

Expected behaviour

1. Sorting

Right now, the output of /prompts and /tools doesn't seem to be sorted in any particular order. This makes it hard to review this list and locate a specific prompt or tool.

2. Tool name mangling

Tool names are always shown mangled with the mcp server name prefixed, i.e. instead of:

sqlite (MCP):
- append_insight   * not trusted
- create_table     * not trusted
- describe_table   * not trusted
- list_tables      * not trusted
- read_query       * not trusted
- write_query      * not trusted

we show the below, which is much harder to read:

sqlite (MCP):
- sqlite___append_insight   * not trusted
- sqlite___create_table     * not trusted
- sqlite___describe_table   * not trusted
- sqlite___list_tables      * not trusted
- sqlite___read_query       * not trusted
- sqlite___write_query      * not trusted

Actual behaviour

1. Sorting

Sort the output of /prompts and /tools as described below (and as noted in the PRD):

In the output of /prompts:

1. The MCP groups should be displayed in alphabetical order
2. Within each group, the prompts for that group should be displayed in alphabetical order

In the output of /tools:

1. The "Built-in" group should be shown first
2. Then, the MCP groups should be displayed in alphabetical order
3. Within each group, the tools for that group should be displayed in alphabetical order

2. Tool name mangling

Don't mangle tool names in the output. Tool names are already shown grouped into MCP servers, so there is no need to prefix the MCP server name to the toolname.

(On a related note, this is not just a display issue. We should not be unnecessarily mangling tool names when there is no name conflict. See the PRD.)

Steps to reproduce

Run the /tools or /prompts command.

Environment

<This will be visible to anyone. Do not include personal or sensitive information>

[q-details]
version = "1.9.1"
hash = "5d2c2807cab9bc6c9dc5fcd05f92c7a979e8a4f7"
date = "2025-04-29T06:22:42.917989Z (10d ago)"
variant = "full"

[system-info]
os = "macOS 15.4.1 (24E263)"
chip = "Apple M3"
total-cores = 8
memory = "24.00 GB"

[environment]
cwd = "/Users/USER"
cli-path = "/Users/USER"
os = "Mac"
shell-path = "/bin/zsh"
shell-version = "5.9"
terminal = "macOS"
install-method = "brew"

[env-vars]
PATH = "/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin"
QTERM_SESSION_ID = "861875d35e244fd9b7bd54ce51e9e6a9"
Q_SET_PARENT_CHECK = "1"
Q_TERM = "1.9.1"
SHELL = "/bin/zsh"
TERM = "xterm-256color"
__CFBundleIdentifier = "com.apple.Terminal"

まず、MCP グループを指定して /tools コマンドと /prompts コマンドを実行し、現在の並び順と表示名を確認します。コマンドのエントリポイントと既存の MCP グループ化ロジックを追跡します。完了条件は、tools では Built-in が最初に表示され、MCP グループとそのエントリがアルファベット順になり、prompts がアルファベット順にグループ化され、tool 名に不要なプレフィックスが付かなくなることです。