feat(chat): expand support for /prompts command #2799

Konippi · 2025-09-06T07:24:58Z

Issue #, if available:

resolve #2794

Description of changes:

This PR implements a comprehensive prompt management system that supports both global and local prompts. Users can now create, edit, and manage reusable prompt templates that are stored locally in their projects or globally across all projects.

Features added

Global and Local Prompt Support
- Global prompts: Stored in ~/.aws/amazonq/prompts/ (shared across all projects)
- Local prompts: Stored in /.amazonq/prompts/ (project-specific)
- Priority system: Local prompts override global prompts when names conflict
New Commands
- /prompts create <name> - Create a new local prompt (--content <content> argument is also supported)
- /prompts edit <name> - Edit an existing prompt with automatic editor opening

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

peteryxu · 2025-09-09T05:33:52Z

can we get this PR merged asap? Very important feature all othe major CLI AI tools already support!

kensave · 2025-09-11T00:18:16Z

Can you add the test scenarios you did to validate this?

For reviewers add repro steps and validated scenarios.

Konippi · 2025-09-11T04:53:35Z

@kensave

Test1: Prompt creation

Test 1.1: Create local prompt with content

# Create a prompt with inline content
q chat
/prompts create hello --content "Hello! How can I help you today?"

# Expected: Success message with file path
# ✓ Created prompt hello at <project>/.amazonq/prompts/hello.md

Test 1.2: Create local prompt without content (editor mode)

/prompts create deploy

# Expected: 
# - Default template content appears in editor
# - After saving and closing editor, success message appears

Test 1.3: Attempt to create duplicate prompt

/prompts create hello --content "Duplicate test"

# Expected: Prompt hello already exists. Use /prompts edit hello to modify it.

2. Prompt Listing and Discovery

Test 2.1: Create global prompt and test listing

# Create global prompt directory and file manually
mkdir -p ~/.aws/amazonq/prompts
echo "This is a global prompt for testing" > ~/.aws/amazonq/prompts/global-test.md

/prompts list

# Expected: Shows both sections:
# Global (.aws/amazonq/prompts):
# - global-test
# 
# Local (.amazonq/prompts):
# - hello
# - deploy

Test 2.2: Test search functionality (Please confirm that amazonq/prompts/hello.md exists.)

/prompts list hello

# Expected: Only shows prompts containing "hello"

3. Priority System Testing

Test 3.1: Create conflicting prompt names

# Create global prompt with same name as local
echo "Global version of hello prompt" > ~/.aws/amazonq/prompts/hello.md

/prompts list

# Expected: Only shows one "hello" in Local section (local overrides global)

Test 3.2: Test prompt loading priority

@hello

# Expected: Should load the LOCAL version of hello prompt, not global
# Verify by checking the content that gets loaded

4. Prompt Editing

Test 4.1: Edit existing local prompt

/prompts edit hello

# Expected: 
# - Editor opens with current content
# - After editing and saving, success message appears
# - ✓ Prompt edited successfully.

Test 4.2: Edit global prompt (should edit local copy if exists)

/prompts edit hello

# Expected: Opens the LOCAL version for editing (due to priority system)

Test 4.3: Edit non-existent prompt

/prompts edit nonexistent

# Expected: Error message suggesting to use /prompts create instead

kensave · 2025-09-11T05:46:54Z

Thanks for the detailed explanation.

Couple of comments:

What do you think about?

/prompts create -n hello --content "hello world"

Test 1.2 is failing for me, see output:

[rust-developer] > /prompts create deploy

Opening editor to create prompt content...

✓ Created prompt deploy at /Volumes/workplace/QCLI/amazon-q-developer-cli_main/.amazonq/prompts/deploy.md

Duplicate handling when global and local.

Currently when a global prompt with same name as local is created, file is created but its not shown in the list. I see Global start showing in list once we remove the local, if global is expected to be overridden should UX be clear denoting this is happening?

Should we sanitize validate the name, this seem to work:

/prompts create /Users/kennvene/workplace/AWSZornDataPlaneService/src/AWSZornDataPlaneService/hola.ms


Opening editor to create prompt content...

✓ Created prompt /Users/kennvene/workplace/AWSZornDataPlaneService/src/AWSZornDataPlaneService/hola.ms at /Users/kennvene/workplace/AWSZornDataPlaneService/src/AWSZornDataPlaneService/hola.ms.md

Though editor is not opened either, interesting is that after that we see

/prompts create /Users/kennvene/workplace/AWSZornDataPlaneService/src/AWSZornDataPlaneService/hola.ms


Prompt /Users/kennvene/workplace/AWSZornDataPlaneService/src/AWSZornDataPlaneService/hola.ms already exists. Use /prompts edit /Users/kennvene/workplace/AWSZornDataPlaneService/src/AWSZornDataPlaneService/hola.ms to modify it

But prompts list will now show it

Konippi · 2025-09-11T06:36:34Z

@kensave
I have reviewed the comments and completed all necessary corrections. Could you check it again?

kensave · 2025-09-11T06:43:48Z

An additional comment is that, what are your though on removing global and local prompts? We do support create and update.

Konippi · 2025-09-11T06:50:33Z

An additional comment is that, what are your though on removing global and local prompts? We do support create and update.

It's definitely necessary. Let's add a delete function too.

Konippi · 2025-09-11T09:34:13Z

@kensave
I've just added the /prompts delete command. Additionally, as a minor fix, we've updated each update command to support the --global option.

Commands:
  list    List available prompts from a tool or show all available prompt
  get     Get a specific prompt by name
  create  Create a new prompt
  edit    Edit an existing prompt
  delete  Delete an existing prompt
  help    Print this message or the help of the given subcommand(s)

kensave · 2025-09-11T16:00:45Z

Thank you

kensave · 2025-09-11T22:49:23Z

Can we use remove so we match other commands like /context

brandonskiser · 2025-09-12T21:41:10Z

crates/chat-cli/src/cli/chat/cli/prompts.rs

+    }
+
+    // Check for path separators
+    if name.contains('/') || name.contains('\\') {


nit - we could just use a regex here like [a-zA-Z_-]+

Is it okay that this regex doesn't allow numbers?
Considering that numbers might be needed for like versioning and workflows, I defined it as [a-zA-Z0-9_-]+.

brandonskiser · 2025-09-12T21:45:52Z

crates/chat-cli/src/cli/chat/cli/prompts.rs

+        execute!(session.stderr)?;
+
+        // Ask for user confirmation
+        let user_input = match session.read_user_input("Are you sure you want to remove this prompt? (y/n): ", false) {


Can user input be read using the util function like this instead? https://github.com/aws/amazon-q-developer-cli/blob/main/crates/chat-cli/src/cli/chat/cli/profile.rs#L310-L317

Otherwise the y/n will be stored as part of the readline history

Absolutely yes.

brandonskiser · 2025-09-12T21:49:30Z

crates/chat-cli/src/cli/chat/cli/prompts.rs

+                execute!(session.stderr)?;
+
+                // Ask for user confirmation
+                let user_input = match session.read_user_input("Do you want to continue? (y/n): ", false) {


same here for reading user input

brandonskiser · 2025-09-12T21:57:59Z

crates/chat-cli/src/cli/chat/cli/prompts.rs

+        }
+
+        // Check for conflicts between global and local
+        if !global {


A lot of this code seems a bit verbose - can this be restructured to instead be

struct Prompts { local: Prompt global: Prompt } struct Prompt { name: String, path: PathBuf, }

Then the logic for getting local/global names, checking if something exists, validation, etc. could be added as methods on these structs rather than implicitly duplicated across these different methods.

The logic for creating/editing/deleting etc. shouldn't really need to concern itself with checking md extensions for example, just more maintainable to add some structure around this IMO.

I've modified it to use structs.

Konippi · 2025-09-13T05:02:32Z

@brandonskiser
Since the prompt has been significantly modified to use structs, I would like you to review it again.

briananderson1222 · 2025-09-15T16:08:37Z

Does this support arguments?

Perhaps a default "context" argument that appends to the bottom of the prompt or the ability to insert {argument} {argument?} (optional) {argument:default} (optional, w/ default) in the content and have it get auto extracted into an argument? The default one (if supported) would also be nice to not require wrapping in double quotes (") ..

Thinking about integration with things like GitHub's new SpecKit where you may @specify <description of feature>

feat: expand support for /prompts command

01be05c

Konippi changed the title ~~feat: expand support for /prompts command~~ feat(chat): expand support for /prompts command Sep 6, 2025

ymhiroki mentioned this pull request Sep 8, 2025

Support Amazon Q Developer IDE/CLI github/spec-kit#15

Open

fix: prompts spec

5b5e1e7

fix: add /prompts delete cmd

0d6a9d0

kensave approved these changes Sep 11, 2025

View reviewed changes

fix: use 'remove' instead

a74534e

brandonskiser requested changes Sep 12, 2025

View reviewed changes

Konippi added 2 commits September 13, 2025 12:36

fix(prompts): improve validation and user input handling

8667370

fix(prompts): manage prompt using structs

4f6bdda

Konippi requested a review from brandonskiser September 13, 2025 05:02

feat(chat): expand support for /prompts command #2799

Are you sure you want to change the base?

feat(chat): expand support for /prompts command #2799

Conversation

Konippi commented Sep 6, 2025

Uh oh!

peteryxu commented Sep 9, 2025

Uh oh!

kensave commented Sep 11, 2025

Uh oh!

Konippi commented Sep 11, 2025

Test1: Prompt creation

Test 1.1: Create local prompt with content

Test 1.2: Create local prompt without content (editor mode)

Test 1.3: Attempt to create duplicate prompt

2. Prompt Listing and Discovery

Test 2.1: Create global prompt and test listing

3. Priority System Testing

Test 3.1: Create conflicting prompt names

Test 3.2: Test prompt loading priority

4. Prompt Editing

Test 4.1: Edit existing local prompt

Test 4.2: Edit global prompt (should edit local copy if exists)

Test 4.3: Edit non-existent prompt

Uh oh!

kensave commented Sep 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Konippi commented Sep 11, 2025

Uh oh!

kensave commented Sep 11, 2025

Uh oh!

Konippi commented Sep 11, 2025

Uh oh!

Konippi commented Sep 11, 2025

Uh oh!

kensave commented Sep 11, 2025

Uh oh!

kensave commented Sep 11, 2025

Uh oh!

brandonskiser Sep 12, 2025

Choose a reason for hiding this comment

Uh oh!

Konippi Sep 13, 2025

Choose a reason for hiding this comment

Uh oh!

brandonskiser Sep 12, 2025

Choose a reason for hiding this comment

Uh oh!

Konippi Sep 13, 2025

Choose a reason for hiding this comment

Uh oh!

brandonskiser Sep 12, 2025

Choose a reason for hiding this comment

Uh oh!

brandonskiser Sep 12, 2025

Choose a reason for hiding this comment

Uh oh!

Konippi Sep 13, 2025

Choose a reason for hiding this comment

Uh oh!

Konippi commented Sep 13, 2025

Uh oh!

briananderson1222 commented Sep 15, 2025

Uh oh!

Uh oh!

kensave commented Sep 11, 2025 •

edited

Loading