Merge pull request #14 from IdenWorks/shivang/git-capability

git: enhance git and gh prompts

Author: shivangag

src/core/prompts/sections/capabilities.ts

@@ -16,6 +16,7 @@ CAPABILITIES
 - You have access to tools that let you execute CLI commands on the user's computer, list files, view source code definitions, regex search${
 		supportsComputerUse ? ", use the browser" : ""
 	}, read and write files, and ask follow-up questions. These tools help you effectively accomplish a wide range of tasks, such as writing code, making edits or improvements to existing files, understanding the current state of a project, performing system operations, and much more.
+- You can use the CLI command \`git\` and \`gh\` to manage git repositories in the workspace, for example to clone existing repositories, push changes to remote repositories, create pull requests, and more.
 - When the user initially gives you a task, a recursive list of all filepaths in the current workspace directory ('${cwd}') will be included in environment_details. This provides an overview of the project's file structure, offering key insights into the project from directory/file names (how developers conceptualize and organize their code) and file extensions (the language used). This can also guide decision-making on which files to explore further. If you need to further explore directories such as outside the current workspace directory, you can use the list_files tool. If you pass 'true' for the recursive parameter, it will list files recursively. Otherwise, it will list files at the top level, which is better suited for generic directories where you don't necessarily need the nested structure, like the Desktop.${
 		codeIndexManager &&
 		codeIndexManager.isFeatureEnabled &&

src/core/prompts/sections/objective.ts

@@ -31,6 +31,22 @@ You accomplish a given task iteratively, breaking it down into clear steps and w
 1. Analyze the user's task and set clear, achievable goals to accomplish it. Prioritize these goals in a logical order.
 2. Work through these goals sequentially, utilizing available tools one at a time as necessary. Each goal should correspond to a distinct step in your problem-solving process. You will be informed on the work completed and what's remaining as you go.
 3. Remember, you have extensive capabilities with access to a wide range of tools that can be used in powerful and clever ways as necessary to accomplish each goal. Before calling a tool, do some analysis within <thinking></thinking> tags. ${codebaseSearchInstruction}analyze the file structure provided in environment_details to gain context and insights for proceeding effectively. Next, think about which of the provided tools is the most relevant tool to accomplish the user's task. Go through each of the required parameters of the relevant tool and determine if the user has directly provided or given enough information to infer a value. When deciding if the parameter can be inferred, carefully consider all the context to see if it supports a specific value. If all of the required parameters are present or can be reasonably inferred, close the thinking tag and proceed with the tool use. BUT, if one of the values for a required parameter is missing, DO NOT invoke the tool (not even with fillers for the missing params) and instead, ask the user to provide the missing parameters using the ask_followup_question tool. DO NOT ask for more information on optional parameters if it is not provided.
-4. Once you've completed the user's task, you must use the attempt_completion tool to present the result of the task to the user.${commandInstruction}
-5. The user may provide feedback, which you can use to make improvements and try again. But DO NOT continue in pointless back and forth conversations, i.e. don't end your responses with questions or offers for further assistance.`
+4. **GIT WORKFLOW REQUIREMENTS**: For all code-related tasks, you MUST follow proper git workflow:
+  * **Before Starting Task**: Always pull latest changes before beginning work on all the repos in the workspace:
+    - Pull latest changes: \`git pull\`
+  * **Initial Task Completion**: Before using attempt_completion, commit changes and create a PR:
+    - Check git status: \`git status\`
+    - Stage changes: \`git add .\`
+    - Commit with descriptive message: \`git commit -m "feat: [brief description]"\`
+    - Create and push to feature branch: \`git checkout -b otto/[task-name] && git push -u origin otto/[task-name]\`
+    - Create PR: \`gh pr create --title "[PR Title]" --body "[Description]"\` (if GitHub CLI available)
+  * **Subsequent Changes**: If user requests changes after PR creation:
+    - Make requested changes
+    - Commit: \`git add . && git commit -m "fix: [description of changes]"\`
+    - Push to existing branch: \`git push\`
+  * **Edge Cases**: Handle missing git repo (\`git init\`), missing remote, existing branches (\`git checkout [branch]\`), merge conflicts, and missing GitHub CLI
+  * **Branch Naming**: Use descriptive names like \`otto/feat/add-authentication\`, \`otto/fix/resolve-login-bug\`, \`otto/refactor/update-api\`
+  * **Commit Messages**: Use conventional format: \`type: description\` (feat, fix, docs, style, refactor, test, chore)
+5. Once you've completed the user's task, you must use the attempt_completion tool to present the result of the task to the user.${commandInstruction}
+6. The user may provide feedback, which you can use to make improvements and try again. But DO NOT continue in pointless back and forth conversations, i.e. don't end your responses with questions or offers for further assistance.`
 }

src/core/prompts/sections/rules.ts

@@ -45,25 +45,6 @@ function getEditingInstructions(diffStrategy?: DiffStrategy): string {
 	return instructions.join("\n")
 }
 
-function getGitWorkflowInstructions(): string {
-	return `- **GIT WORKFLOW REQUIREMENTS**: For all code-related tasks, you MUST follow proper git workflow:
-  * **Before Starting Task**: Always pull latest changes before beginning work:
-    - Pull latest changes: \`git pull\`
-  * **Initial Task Completion**: Before using attempt_completion, commit changes and create a PR:
-    - Check git status: \`git status\`
-    - Stage changes: \`git add .\`
-    - Commit with descriptive message: \`git commit -m "feat: [brief description]"\`
-    - Create and push to feature branch: \`git checkout -b otto/[task-name] && git push -u origin otto/[task-name]\`
-    - Create PR: \`gh pr create --title "[PR Title]" --body "[Description]"\` (if GitHub CLI available)
-  * **Subsequent Changes**: If user requests changes after PR creation:
-    - Make requested changes
-    - Commit: \`git add . && git commit -m "fix: [description of changes]"\`
-    - Push to existing branch: \`git push\`
-  * **Edge Cases**: Handle missing git repo (\`git init\`), missing remote, existing branches (\`git checkout [branch]\`), merge conflicts, and missing GitHub CLI
-  * **Branch Naming**: Use descriptive names like \`otto/feat/add-authentication\`, \`otto/fix/resolve-login-bug\`, \`otto/refactor/update-api\`
-  * **Commit Messages**: Use conventional format: \`type: description\` (feat, fix, docs, style, refactor, test, chore)`
-}
-
 export function getRulesSection(
 	cwd: string,
 	supportsComputerUse: boolean,
@@ -92,7 +73,6 @@ RULES
 ${codebaseSearchRule}- When using the search_files tool${isCodebaseSearchAvailable ? " (after codebase_search)" : ""}, craft your regex patterns carefully to balance specificity and flexibility. Based on the user's task you may use it to find code patterns, TODO comments, function definitions, or any text-based information across the project. The results include context, so analyze the surrounding code to better understand the matches. Leverage the search_files tool in combination with other tools for more comprehensive analysis. For example, use it to find specific code patterns, then use read_file to examine the full context of interesting matches before using ${diffStrategy ? "apply_diff or write_to_file" : "write_to_file"} to make informed changes.
 - When creating a new project (such as an app, website, or any software project), organize all new files within a dedicated project directory unless the user specifies otherwise. Use appropriate file paths when writing files, as the write_to_file tool will automatically create any necessary directories. Structure the project logically, adhering to best practices for the specific type of project being created. Unless otherwise specified, new projects should be easily run without additional setup, for example most projects can be built in HTML, CSS, and JavaScript - which you can open in a browser.
 ${getEditingInstructions(diffStrategy)}
-${getGitWorkflowInstructions()}
 - Some modes have restrictions on which files they can edit. If you attempt to edit a restricted file, the operation will be rejected with a FileRestrictionError that will specify which file patterns are allowed for the current mode.
 - Be sure to consider the type of project (e.g. Python, JavaScript, web application) when determining the appropriate structure and files to include. Also consider what files may be most relevant to accomplishing the task, for example looking at a project's manifest file would help you understand the project's dependencies, which you could incorporate into any code you write.
   * For example, in architect mode trying to edit app.js would be rejected because architect mode can only edit files matching "\\.md$"