Enhance AI-driven development scripts and update documentation

ai-driven-dev-prompts/package.yml

@@ -113,13 +113,22 @@ matches:
       If not, list the potential issues in bullet points and suggest possible solutions.
   - trigger: ':reviewCreatePullRequest'
     form: |
-      Goal: Create a pull request for my changes.
+      Goal:
+      Create a pull request for my changes.
 
       Rules:
-      - Use the following template file: #file
-      - "AI instruction" comments are hints for you, follow them carefully, then, delete them.
-      - Here are the changes:
+      - Use the changes from main.
+      - Fill the "template" file to create the PR (the "output").
+      - "Instructions" comments must be followed no matter what.
+      - "Instructions" comments must be remove from the output.
+      - Output should be properly formatted in markdown.
+
+      Template: #file
+
+      Code changes (surrendered by `---`):
+      ---
       [[copy_your_git_changes_from_main_here]]
+      ---
     form_fields:
       copy_your_git_changes_from_main_here:
         multiline: true

resources/prompts/code-review.md

@@ -85,11 +85,20 @@ Create a pull request from an AI template (eg: using `.github/pull_request_templ
 **Prompt**:
 
 ```text
-Goal: Create a pull request for my changes.
+Goal:
+Create a pull request for my changes.
 
 Rules:
-- Use the following template file: #file
-- "AI instruction" comments are hints for you, follow them carefully, then, delete them.
-- Here are the changes:
+- Use the changes from main.
+- Fill the "template" file to create the PR (the "output").
+- "Instructions" comments must be followed no matter what.
+- "Instructions" comments must be remove from the output.
+- Output should be properly formatted in markdown.
+
+Template: #file
+
+Code changes (surrendered by `---`):
+---
 [[Copy your git changes (from main?) here]]
+---
 ```

scripts/aiddc/aliases.sh

@@ -9,6 +9,7 @@ alias aiddc-review='~/.aiddc/scripts/aidd-review.sh'
 # Commits
 alias aiddc-commit-msg='~/.aiddc/scripts/aidd-commit-msg.sh'
 alias aiddc-commit-last='~/.aiddc/scripts/aidd-commit-last.sh'
+alias aiddc-commits-diff-main='~/.aiddc/scripts/aidd-commits-diff-main.sh'
 
 # Scripts
 alias aiddc-changes='~/.aiddc/scripts/aidd-changes.sh'

scripts/aiddc/main.js

@@ -4,10 +4,6 @@
  * It reads environment variables, validates the OpenAI API key, and provides functions to call the OpenAI API.
  */
 
-// const fs = require('fs');
-// const path = require('path');
-// const https = require('https');
-// const readline = require('readline');
 import path from 'path';
 import { fileURLToPath } from 'url';
 
@@ -19,7 +15,6 @@ import fs from 'fs';
 import https from 'https';
 import readline from 'readline';
 
-// Redefine console.error to always print in red
 console.error = (function(origError) {
     return function(...args) {
         origError('\x1b[31m', ...args, '\x1b[0m');
@@ -32,7 +27,6 @@ console.warn = (function(origWarn) {
     };
 })(console.warn);
 
-
 console.info = (function(origInfo) {
     return function(...args) {
         origInfo('\x1b[32m', ...args, '\x1b[0m');
@@ -68,11 +62,14 @@ if (!process.env.OPENAI_API_KEY) {
 // Gen-AI parameters
 const GEN_AI_MODEL = 'gpt-4o';
 const GEN_AI_MAX_TOKENS = 600;
-const GEN_AI_TEMPERATURE = 0.7;
+const GEN_AI_TEMPERATURE = 1;
 const GEN_AI_SYSTEM_MESSAGE = `
 Act as a Senior Software Engineer that is experienced in software craft.
 Assist with high-quality, concise, efficient, and scalable software solutions.
-Limit the response to minimum tokens.
+Limit the response to minimum tokens when possible.
+
+Remember that code that will be provided to you is the result of a "git diff" command.
+"-" means that a line was removed, and "+" means that a line was added, etc. 
 `;
 
 /**

scripts/aiddc/scripts/aidd-commit-msg.sh

@@ -12,20 +12,44 @@ notice "[aidd-commit-msg]: Preparing commit message"
 PREV_COMMIT_MSG=$(git log -10 --pretty=format:%s)
 
 # Current staged git changes.
-CHANGES=$(git diff --staged)
+CHANGES=$(git diff)
+CURRENT_DIR=$(pwd)
 
 # If there is no changes, exit.
 if [ -z "$CHANGES" ]; then
     error "No changes to commit"
-    echo "Please stage your changes before generating a commit message."
+    echo "Please UNSTAGE changes before generating a commit message."
     exit 1
 fi
 
+# FUNCTION
+# --------------------
+created_files_prompt() {
+
+    local UNTRACKED=$(git ls-files --others --exclude-standard)
+
+    if [ -z "$UNTRACKED" ]; then
+        return "No created files."
+    fi
+
+    echo "Created files:"
+
+    for file in $UNTRACKED; do
+        echo "---"
+        echo "$file"
+        cat "$file"
+        echo "---"
+        echo ""
+    done
+}
+
 # PROMPT
 # --------------------
 PROMPT=$(cat <<EOF
 Goal:
-Generate git add + git commit message for every changes in the code.
+1. Summarize functionnal changes in comments, with numbered list.
+2. Identify hunks (but do not display them).
+3. Generate git add + git commit message for every changes in the code, following rules.
 
 Rules:
 - Should be formatted in Conventional Commit.
@@ -34,12 +58,18 @@ Rules:
 - Commits should be small and focused on a single change.
 - 1 commit message can have multiple files changes.
 - Answer with shell script ONLY.
+- Use relative git add path based on $CURRENT_DIR.
+- Use "git add --patch" with hunks when little changes are made.
+    - When using path option, be sure to "y" in EOF multiple if needed.
+- Do not use "git add --patch" one 1 line changes.
 
 Previous commit messages:
 $PREV_COMMIT_MSG
 
 Current git changes:
 $CHANGES
+
+$(created_files_prompt)
 EOF
 )
 

scripts/aiddc/scripts/aidd-commits-diff-main.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+. "$(dirname "$0")/_.sh"
+
+# REQUIREMENTS
+# --------------------
+check_binary "git"
+
+# NOTICE
+# --------------------
+notice "[aiddc-commits-diff-main]: Get the commits diff between the current branch and main branch."
+
+# PROMPT PARAMS
+# --------------------
+DIFF=$(git log --oneline --no-merges main..HEAD)
+
+#
+# PROMPT
+#
+PROMPT=$DIFF
+#
+# COPY OUTPUT
+# 
+copy "$PROMPT"