feat: Add debug mode; Improvements

zsh-copilot.plugin.zsh

@@ -7,7 +7,10 @@
 (( ! ${+ZSH_COPILOT_SEND_GIT_DIFF} )) &&
     typeset -g ZSH_COPILOT_SEND_GIT_DIFF=true
 
-SYSTEM_PROMPT="You will be given the raw input of a shell command. Your task is to either complete the command or provide a new command that you think the user is trying to type. If you return a completely new command for the user, prefix is with an equal sign (=). If you return a completion for the user's command, prefix it with a plus sign (+). Only respond with either a completion or a new command, not both. Do not explain the command. Do not ask for more information, you won't receive it. Your response will be run in the user's shell. Make sure input is escaped correctly if needed so. Your input should be able to run without any modifications to it. Don't you dare to return anything else other than a shell command!!! DO NOT INTERACT WITH THE USER IN NATURAL LANGUAGE! If you do, you will be banned from the system. Here are two examples: * User input: 'list files in current directory'; Your response: '=ls' * User input: 'cd /tm'; Your response: '+p'."
+(( ! ${+ZSH_COPILOT_DEBUG} )) &&
+    typeset -g ZSH_COPILOT_DEBUG=false
+
+SYSTEM_PROMPT="You will be given the raw input of a shell command. Your task is to either complete the command or provide a new command that you think the user is trying to type. If you return a completely new command for the user, prefix is with an equal sign (=). If you return a completion for the user's command, prefix it with a plus sign (+). MAKE SURE TO ONLY INCLUDE THE REST OF THE COMPLETION!!! Do not write any leading or trailing characters except if required for the completion to work. Only respond with either a completion or a new command, not both. Your response may only start with either a plus sign or an equal sign. Your response MAY NOT start with both! This means that your response IS NOT ALLOWED to start with '+=' or '=+'. Do not explain the command. Do not ask for more information, you won't receive it. Your response will be run in the user's shell. Make sure input is escaped correctly if needed so. Your input should be able to run without any modifications to it. Don't you dare to return anything else other than a shell command!!! DO NOT INTERACT WITH THE USER IN NATURAL LANGUAGE! If you do, you will be banned from the system. Note that the double quote sign is escaped. Keep this in mind when you create quotes. Here are two examples: * User input: 'list files in current directory'; Your response: '=ls' * User input: 'cd /tm'; Your response: '+p'."
 
 if [[ "$ZSH_COPILOT_SEND_CONTEXT" == 'true' ]]; then
     SYSTEM_PROMPT="$SYSTEM_PROMPT Context: You are user ${$(whoami)} with id ${$(id)} in directory ${$(pwd)}. Your shell is ${$(echo $SHELL)} and your terminal is ${$(echo $TERM)} running on ${$(uname -a)}. Your system is ${$(cat /etc/*-release | xargs | sed 's/ /,/g')}."
@@ -16,26 +19,25 @@ fi
 function _suggest_ai() {
     # Get input
     local input="${BUFFER:0:$CURSOR}"
+    input=$(echo "$input" | sed 's/"/\\"/g')
 
     _zsh_autosuggest_clear
     zle -R "Thinking..."
 
     local PROMPT="$SYSTEM_PROMPT"
     if [[ "$ZSH_COPILOT_SEND_GIT_DIFF" == 'true' ]]; then
-        if [[ "git rev-parse --is-inside-work-tree" == 'true' ]]; then
-            local git_diff=$(git diff --no-color | xargs | sed 's/ /\$/g' | xargs | sed 's/ /$/g')
+        if [[ $(git rev-parse --is-inside-work-tree) == 'true' ]]; then
+            local git_diff=$(git diff --staged --no-color)
+            local git_exit_code=$?
+            git_diff=$(echo "$git_diff" | tr -d '\n')
 
-            if [[ $? -eq 0 ]]; then
-                PROMPT="$PROMPT; This is the git diff (newlines separated by dollar signs): $git_diff;; You may provide a git commit message if the user is trying to commit changes. Do not say something like 'Your commit message' or 'Your commit message here'. Just provide the commit message."
+            if [[ git_exit_code -eq 0 ]]; then
+                PROMPT="$PROMPT; This is the git diff: <---->$git_diff<----> You may provide a git commit message if the user is trying to commit changes. You are an expert at committing changes, you don't give generic messages. You give the best commit messages"
             fi
         fi
     fi
 
-    local response=$(curl 'https://api.openai.com/v1/chat/completions' \
-        --silent \
-        -H "Content-Type: application/json" \
-        -H "Authorization: Bearer $OPENAI_API_KEY" \
-        -d "{
+    local data="{
             \"model\": \"gpt-4\",
             \"messages\": [
                 {
@@ -44,25 +46,38 @@ function _suggest_ai() {
                 },
                 {
                     \"role\": \"user\",
-                    \"content\": \"${input}\"
+                    \"content\": \""
+    data+=$input
+    data+="\"
                 }
             ]
-        }" | jq '.choices[0].message.content' --raw-output)
+        }"
+    local response=$(curl 'https://api.openai.com/v1/chat/completions' \
+        --silent \
+        -H "Content-Type: application/json" \
+        -H "Authorization: Bearer $OPENAI_API_KEY" \
+        -d $data)
+    local message=$(echo "$response" | jq -r '.choices[0].message.content')
 
     # zle -U "$suggestion"
 
-    local first_char=${response:0:1}
-    local suggestion=${response:1:${#response}}
+    local first_char=${message:0:1}
+    local suggestion=${message:1:${#message}}
+    
+    if [[ "$ZSH_COPILOT_DEBUG" == 'true' ]]; then
+        touch /tmp/zsh-copilot.log
+        echo "$(date);INPUT:$input;RESPONSE:$response;FIRST_CHAR:$first_char;SUGGESTION:$suggestion:DATA:$data" >> /tmp/zsh-copilot.log
+    fi
 
     if [[ "$first_char" == '=' ]]; then
+        # Reset user input
         BUFFER=""
         CURSOR=0
 
         zle -U "$suggestion"
-
-        # Reset suggestion
     elif [[ "$first_char" == '+' ]]; then
         _zsh_autosuggest_suggest "$suggestion"
+         # POSTDISPLAY="$suggestion"
     fi
 }