[refactor] Update prompt template filenames and enhance project title parsing in tests

Author: lackeyi

docs/prompt-templates.md

@@ -33,9 +33,9 @@ By convention, store your templates in the `.giv/templates/` folder in your proj
 ```
 .giv/
 ├── templates/
-│   ├── summary.md
-│   ├── announcement.md
-│   └── message.md
+│   ├── summary_prompt.md
+│   ├── announcement_prompt.md
+│   └── message_prompt.md
 ├── src/
 ```
 
@@ -51,17 +51,16 @@ Follow these steps to create or customize a prompt template:
 2. **Copy or Create File:** In `templates/`, create a new file named `<subcommand>_prompt.md`, or copy an existing template from the `templates/` directory of this repository.
 3. **Insert Tokens:** Open the file and place tokens where dynamic content should appear. Use headers, paragraphs, or lists for structure.
 4. **Save & Reference:** Save the file. When running `giv`, use the `--prompt-file` option to point to your template:
-
    ```sh
    giv summary --prompt-file=templates/summary_custom.md
-   ```
+   ```   
 5. **Test & Iterate:** Review the generated output, tweak your template, and retest until satisfied.
 
 ---
 
 ## 5. Example: Custom Summary Template
 
-Below is a sample `templates/summary.md` for the `giv summary` subcommand. Copy and adapt it as needed:
+Below is a sample `templates/summary_summary.md` for the `giv summary` subcommand. Copy and adapt it as needed:
 
 ```markdown
 # Project: [PROJECT_TITLE]

src/giv.sh

@@ -462,15 +462,14 @@ EOF
 # # -------------------------------------------------------------------
 
 cmd_message() {
-    commit_id="$1"
+    commit_id="${1:-}"
     if [ -z "${commit_id}" ]; then
         commit_id="--current"
     fi
 
     print_debug "Generating commit message for ${commit_id}"
 
-    # Handle both --current and --cached, as argument parsing may set either value.
-    # This duplication ensures correct behavior regardless of which is set.
+    # Handle both --current and --cached (see argument parsing section for details).
     if [ "$commit_id" = "--current" ] || [ "$commit_id" = "--cached" ]; then
         hist=$(portable_mktemp "commit_history_XXXXXX.md")
         build_history "$hist" "$commit_id" "$todo_pattern" "$PATHSPEC"
@@ -479,10 +478,14 @@ cmd_message() {
         printf '%s' "$(build_prompt "${PROMPT_DIR}/message_prompt.md" "$hist")" >"$pr"
         print_debug "Generated prompt file $pr"
         res=$(generate_response "$pr" "$model_mode")
-        printf '%s\n' "$res"
+        res=$(generate_response "$pr" "$model_mode")
+        if [ $? -ne 0 ]; then
+            printf 'Error: Failed to generate AI response.\n' >&2
+            exit 1
+        fi
+        printf '%s\n' "${res}"
         return
     fi
-
     # Detect exactly two- or three-dot ranges (A..B or A...B)
     if echo "$commit_id" | grep -qE '\.\.\.?'; then
         print_debug "Detected commit range syntax: $commit_id"
@@ -503,6 +506,7 @@ cmd_message() {
             print_debug "Processing two-dot range: $commit_id"
             git --no-pager log --reverse --pretty=%B "$commit_id" | sed '${/^$/d;}'
             ;;
+        *) ;;
         esac
         return
     fi
@@ -512,7 +516,7 @@ cmd_message() {
         printf 'Error: Invalid commit ID: %s\n' "$commit_id" >&2
         exit 1
     fi
-    git --no-pager log -1 --pretty=%B "$commit_id" | sed '${/^$/d;}'
+    git --no-pager log -1 --pretty=%B "${commit_id}" | sed '${/^$/d;}'
     return
 }
 
@@ -525,10 +529,11 @@ cmd_summary() {
     summaries_file=$(portable_mktemp "summary_summaries_XXXXXX.md")
 
     summarize_target "${sum_revision}" "${summaries_file}" "${sum_model_mode}"
-    cat "${summaries_file}" >&2
+    print_debug "$(cat "${summaries_file}" || true)"
+
     # Early exit if no summaries were produced
     if [ ! -f "${summaries_file}" ]; then
-        printf 'Error: No summaries generated for %s.\n' "$sum_revision" >&2
+        printf 'Error: No summaries generated for %s.\n' "${sum_revision}" >&2
         exit 1
     fi
 

src/helpers.sh

@@ -1,5 +1,11 @@
 #!/bin/sh
 
+GIV_TOKEN_PROJECT_TITLE=""
+GIV_TOKEN_VERSION=""
+GIV_TOKEN_EXAMPLE=""
+GIV_TOKEN_RULES=""
+GIV_TOKEN_SUMMARY=""
+
 is_valid_git_range() {
     git rev-list "$1" >/dev/null 2>&1
 }
@@ -26,7 +32,7 @@ portable_mktemp_dir() {
 
     # Ensure only one subfolder under $TMPDIR/giv exists per execution of the script
     # If GIV_TMPDIR is not set, create a new temporary directory
-    if [ -z "$GIV_TMPDIR" ]; then
+    if [ -z "${GIV_TMPDIR}" ]; then
 
         if command -v mktemp >/dev/null 2>&1; then
             GIV_TMPDIR="$(mktemp -d -p "${base_path}")"
@@ -57,7 +63,7 @@ print_debug() {
     fi
 }
 print_info() {
-    printf '%s\n' "$*" >&2
+    printf 'INFO: %s\n' "$*" >&2
 }
 print_warn() {
     printf 'WARNING: %s\n' "$*" >&2
@@ -104,10 +110,10 @@ replace_tokens() {
 # Exports GIV_TOKEN_SUMMARY (and any of PROJECT_TITLE, VERSION, EXAMPLE, RULES
 # if passed) then runs replace_tokens on the template.
 build_prompt() {
-    project_title=""
-    version=""
-    example=""
-    rules=""
+    project_title=$(parse_project_title)
+    version="${GIV_TOKEN_VERSION:-}"
+    example="${GIV_TOKEN_EXAMPLE:-}"
+    rules="${GIV_TOKEN_RULES:-}"
     # parse flags
     while [ $# -gt 2 ]; do
         case "$1" in
@@ -138,18 +144,18 @@ build_prompt() {
     diff_file=$2
 
     # validate files
-    if [ ! -f "$prompt_template" ]; then
-        printf 'template file not found: %s\n' "$prompt_template" >&2
+    if [ ! -f "${prompt_template}" ]; then
+        printf 'template file not found: %s\n' "${prompt_template}" >&2
         return 1
     fi
-    if [ ! -f "$diff_file" ]; then
-        printf 'diff file not found: %s\n' "$diff_file" >&2
+    if [ ! -f "${diff_file}" ]; then
+        printf 'diff file not found: %s\n' "${diff_file}" >&2
         return 1
     fi
-
+    # export our tokens
     # export our tokens
     export GIV_TOKEN_SUMMARY
-    GIV_TOKEN_SUMMARY=$(cat "$diff_file")
+    GIV_TOKEN_SUMMARY=$(cat "${diff_file}")
     [ -n "$project_title" ] && export GIV_TOKEN_PROJECT_TITLE="$project_title"
     [ -n "$version" ] && export GIV_TOKEN_VERSION="$version"
     [ -n "$example" ] && export GIV_TOKEN_EXAMPLE="$example"
@@ -159,6 +165,54 @@ build_prompt() {
     replace_tokens <"$prompt_template"
 }
 
+# Locate the project from the codebase. Looks for common project files
+# like package.json, pyproject.toml, setup.py, Cargo.toml, composer.json
+# build.gradle, pom.xml, etc. and extracts the project name.
+# If no project file is found, returns an empty string.
+# If a project name is found, it is printed to stdout.
+parse_project_title() {
+    # Look for common project files
+    for file in package.json pyproject.toml setup.py Cargo.toml composer.json build.gradle pom.xml; do
+        if [ -f "${file}" ]; then
+            # Extract project name based on file type
+            case "${file}" in
+            package.json)
+                awk -F'"' '/"name"[[:space:]]*:/ {print $4; exit}' "${file}"
+                ;;
+            pyproject.toml)
+                awk -F' = ' '/^name/ {gsub(/"/, "", $2); print $2; exit}' "${file}"
+                ;;
+            setup.py)
+                # Double quotes
+                grep -E '^[[:space:]]*name[[:space:]]*=[[:space:]]*"[^"]+"' "${file}" | sed -E 's/^[[:space:]]*name[[:space:]]*=[[:space:]]*"([^"]+)".*/\1/' | head -n1 &&
+                    # Single quotes
+                    grep -E "^[[:space:]]*name[[:space:]]*=[[:space:]]*'[^']+'" "${file}" | sed -E "s/^[[:space:]]*name[[:space:]]*=[[:space:]]*'([^']+)'.*/\1/" | head -n1
+                ;;
+            Cargo.toml)
+                awk -F' = ' '/^name/ {gsub(/"/, "", $2); print $2; exit}' "${file}"
+                ;;
+            composer.json)
+                awk -F'"' '/"name"[[:space:]]*:/ {print $4; exit}' "${file}"
+                ;;
+            build.gradle)
+                # Double quotes
+                grep -E '^[[:space:]]*rootProject\.name[[:space:]]*=[[:space:]]*"[^"]+"' "${file}" | sed -E 's/^[[:space:]]*rootProject\.name[[:space:]]*=[[:space:]]*"([^"]+)".*/\1/' | head -n1 &&
+                    # Single quotes
+                    grep -E "^[[:space:]]*rootProject\.name[[:space:]]*=[[:space:]]*'[^']+'" "${file}" | sed -E "s/^[[:space:]]*rootProject\.name[[:space:]]*=[[:space:]]*'([^']+)'.*/\1/" | head -n1
+                ;;
+            pom.xml)
+                awk -F'[<>]' '/<name>/ {print $3; exit}' "${file}"
+                ;;
+            *)
+                echo "Unknown project file type: ${file}" >&2
+                return 1
+                ;;
+            esac
+            return
+        fi
+    done
+}
+
 # Extract version string from a line (preserving v if present)
 parse_version() {
     #printf 'Parsing version from: %s\n' "$1" >&2
@@ -259,11 +313,11 @@ generate_remote() {
 
     # Escape for JSON (replace backslash, double quote, and control characters)
     # Use json_escape to safely encode the prompt as a JSON string
-    escaped_content=$(printf "%s" "${content}" | json_escape) 
-    
+    escaped_content=$(printf "%s" "${content}" | json_escape)
+
     # shellcheck disable=SC2154
     body=$(printf '{"model":"%s","messages":[{"role":"user","content":%s}],"max_completion_tokens":8192}' \
-    "${api_model}" "${escaped_content}")
+        "${api_model}" "${escaped_content}")
 
     # shellcheck disable=SC2154
     response=$(curl -s -X POST "${api_url}" \
@@ -385,6 +439,11 @@ get_message_header() {
     esac
 }
 
+# Finds and returns the path to a version file in the current directory.
+# The function checks if the variable 'version_file' is set and points to an existing file.
+# If not, it searches for common version files (package.json, pyproject.toml, setup.py, Cargo.toml, composer.json, build.gradle, pom.xml).
+# If none are found, it attempts to locate a 'giv.sh' script using git.
+# If no suitable file is found, it returns an empty string.
 # helper: finds the version file path
 find_version_file() {
     print_debug "Finding version file..."
@@ -409,7 +468,37 @@ find_version_file() {
 
 }
 
-# helper: extract version text from a file or git index/commit
+# get_version_info
+#
+# Extracts version information from a specified file or from a file as it exists
+# in a given git commit or index state.
+#
+# Usage:
+#   get_version_info <commit> <file_path>
+#
+# Parameters:
+#   commit    - Specifies the git commit or index state to extract the version from.
+#               Accepts:
+#                 --current or "" : Use the current working directory file.
+#                 --cached        : Use the staged (index) version of the file.
+#                 <commit_hash>   : Use the file as it exists in the specified commit.
+#   file_path - Path to the file containing the version information.
+#
+# Behavior:
+#   - Searches for a version string matching the pattern 'versionX.Y' or 'version X.Y.Z'
+#     (case-insensitive) in the specified file or git object.
+#   - Returns the first matching version string found, parsed by parse_version.
+#   - Returns an empty string if the file or version string is not found.
+#
+# Dependencies:
+#   - Requires 'git' command-line tool for accessing git objects.
+#   - Relies on a 'parse_version' function to process the raw version string.
+#   - Uses 'print_debug' for optional debug output.
+#
+# Example:
+#   get_version_info --current ./package.json
+#   get_version_info --cached ./setup.py
+#   get_version_info abc123 ./src/version.txt
 get_version_info() {
     commit="$1"
     vf="$2"
@@ -624,21 +713,45 @@ summarize_target() {
     exit 1
 }
 
+# summarize_commit - Generates a summary for a given commit.
+#
+# Arguments:
+#   $1 - The commit hash or identifier to summarize.
+#   $2 - (Optional) The generation mode to use; defaults to the value of $model_mode.
+#
+# Description:
+#   This function creates temporary files to store commit history, prompt, and summary results.
+#   It builds the commit history, retrieves version information, and constructs a summary prompt.
+#   The prompt is then used to generate a summary response, which is saved to a file and printed.
+#
+# Outputs:
+#   Prints the generated summary to stdout.
+#
+# Dependencies:
+#   - portable_mktemp
+#   - print_debug
+#   - build_history
+#   - find_version_file
+#   - get_version_info
+#   - build_prompt
+#   - generate_response
 summarize_commit() {
     commit="$1"
-    gen_mode="${2:-$model_mode}"
+    gen_mode="${2:-${model_mode}}"
     hist=$(portable_mktemp "hist.${commit}.XXXXXX.md")
     pr=$(portable_mktemp "prompt.${commit}.XXXXXX.md")
     res_file=$(portable_mktemp "summary.${commit}.XXXXXX.md")
-    print_debug "summarize_commit $commit $hist $pr"
-    build_history "$hist" "$commit" "$todo_pattern" "$PATHSPEC"
-    summary_template=$(build_prompt "${PROMPT_DIR}/summary_prompt.md" "$hist")
-    print_debug "Using summary prompt: $summary_template"
-    printf '%s\n' "$summary_template" >"$pr"
-    res=$(generate_response "$pr" "${gen_mode}")
-    echo "${res}" >"$res_file"
-
-    printf '%s\n' "$res"
+    print_debug "summarize_commit ${commit} ${hist} ${pr}"
+    build_history "${hist}" "${commit}" "${todo_pattern}" "$PATHSPEC"
+    sc_version_file=$(find_version_file)
+    sc_version=$(get_version_info "${commit}" "${sc_version_file}")
+    summary_template=$(build_prompt --version "${sc_version}" "${PROMPT_DIR}/summary_prompt.md" "${hist}")
+    print_debug "Using summary prompt: ${summary_template}"
+    printf '%s\n' "${summary_template}" >"${pr}"
+    res=$(generate_response "${pr}" "${gen_mode}")
+    echo "${res}" >"${res_file}"
+
+    printf '%s\n' "${res}"
 }
 
 # extract_section <section_name> <markdown_file> [<header_id>]

tests/.tmp/tmp.4ifJ9Hiotv

@@ -0,0 +1 @@
+Subproject commit c932ca3d5b714623b97e2b172e5bcf2ccfcdfc2d