diff --git a/HISTORY.md b/HISTORY.md index 1334b4d3e..0bbaaa3f9 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -3,6 +3,7 @@ ### main branch +- New `/ask ` command to ask about your code, without making any edits. - Enhanced token usage and cost reporting. Now works when streaming too. - Filename auto-complete for `/add` and `/drop` is case-insensitive now. - Commit message improvements: diff --git a/aider/commands.py b/aider/commands.py index 7b350b376..7f1533d3e 100644 --- a/aider/commands.py +++ b/aider/commands.py @@ -620,8 +620,7 @@ class Commands: add = result.returncode != 0 else: response = self.io.prompt_ask( - "Add the output to the chat? (y/n/instructions): ", - default="y" + "Add the output to the chat? (y/n/instructions): ", default="y" ).strip() if response.lower() in ["yes", "y"]: @@ -644,7 +643,7 @@ class Commands: ) if instructions: - msg += f"\n\n{instructions}" + msg = instructions + "\n\n" + msg return msg diff --git a/aider/website/HISTORY.md b/aider/website/HISTORY.md index cb3a5bb2b..c2874665e 100644 --- a/aider/website/HISTORY.md +++ b/aider/website/HISTORY.md @@ -14,6 +14,7 @@ cog.out(text) ### main branch +- New `/ask ` command to ask about your code, without making any edits. - Enhanced token usage and cost reporting. Now works when streaming too. - Filename auto-complete for `/add` and `/drop` is case-insensitive now. - Commit message improvements: diff --git a/aider/website/docs/usage/commands.md b/aider/website/docs/usage/commands.md index 3a71f7289..3bdc93ea6 100644 --- a/aider/website/docs/usage/commands.md +++ b/aider/website/docs/usage/commands.md @@ -15,6 +15,7 @@ cog.out(get_help_md()) |Command|Description| |:------|:----------| | **/add** | Add files to the chat so GPT can edit them or review them in detail | +| **/ask** | Ask questions about the code base without editing any files | | **/clear** | Clear the chat history | | **/commit** | Commit edits to the repo made outside the chat (commit message optional) | | **/diff** | Display the diff of the last aider commit | @@ -24,6 +25,7 @@ cog.out(get_help_md()) | **/help** | Ask questions about aider | | **/lint** | Lint and fix provided files or in-chat files if none provided | | **/ls** | List all known files and indicate which are included in the chat session | +| **/mode** | Switch to a new editing mode | | **/model** | Switch to a new LLM | | **/models** | Search the list of available models | | **/quit** | Exit the application |