korekt-cli 0.9.0 → 0.9.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "korekt-cli",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "description": "AI-powered code review CLI - Keep your kode korekt",
   "main": "src/index.js",
   "bin": {

package/scripts/azure.sh

@@ -72,40 +72,20 @@ wrap_code_block() {
   printf "%s\n" "$content" | fold -s -w "$max_width"
 }
 
-# Function to fetch all pages of threads using pagination
-fetch_all_threads() {
+# Function to fetch threads (single request, no pagination)
+fetch_threads() {
   local url="$1"
-  local all_threads="[]"
-  local skip=0
-  local top=100
-  local has_more=true
-
-  while [ "$has_more" = true ]; do
-    local response
-    response=$(curl -s -X GET "${url}?\$top=${top}&\$skip=${skip}&api-version=6.0" \
-      -H "Authorization: Bearer $SYSTEM_ACCESSTOKEN" \
-      -H "Content-Type: application/json")
-
-    if ! echo "$response" | jq -e '.value' > /dev/null 2>&1; then
-      echo "[]"
-      return
-    fi
-
-    local page_threads
-    page_threads=$(echo "$response" | jq '.value')
-
-    local count
-    count=$(echo "$page_threads" | jq 'length')
+  local response
+  response=$(curl -s --max-time 30 -X GET "${url}?api-version=7.1" \
+    -H "Authorization: Bearer $SYSTEM_ACCESSTOKEN" \
+    -H "Content-Type: application/json")
 
-    if [ "$count" -eq 0 ]; then
-      has_more=false
-    else
-      all_threads=$(jq -s '.[0] + .[1]' <(echo "$all_threads") <(echo "$page_threads"))
-      skip=$((skip + top))
-    fi
-  done
+  if ! echo "$response" | jq -e '.value' > /dev/null 2>&1; then
+    echo "[]"
+    return
+  fi
 
-  echo "$all_threads"
+  echo "$response" | jq '.value'
 }
 
 # Function to delete old bot summary comments
@@ -114,7 +94,7 @@ delete_old_summary_comments() {
   local threads_url="${BASE_API_URL}/threads"
   local existing_threads
 
-  existing_threads=$(fetch_all_threads "$threads_url")
+  existing_threads=$(fetch_threads "$threads_url")
 
   if ! echo "$existing_threads" | jq -e . > /dev/null 2>&1; then
     echo "Warning: Could not fetch existing threads to delete old summaries."
@@ -122,27 +102,31 @@ delete_old_summary_comments() {
   fi
 
   # Find threads that contain the bot marker and have no threadContext (summary comments)
-  echo "$existing_threads" | jq -r '.[] | select(.comments[0].content | contains("🤖 **Automated Code Review Results**")) | select(.threadContext == null) | .id' | while IFS= read -r thread_id; do
-    if [ -z "$thread_id" ] || [ "$thread_id" = "null" ]; then
+  echo "$existing_threads" | jq -r '.[] | select((.comments[0].content? // "") | contains("🤖 **Automated Code Review Results**")) | select(.threadContext == null) | {id: .id, comment_id: .comments[0].id} | @json' | while IFS= read -r thread_json; do
+    local thread_id
+    local comment_id
+    thread_id=$(echo "$thread_json" | jq -r '.id')
+    comment_id=$(echo "$thread_json" | jq -r '.comment_id')
+
+    if [ -z "$thread_id" ] || [ "$thread_id" = "null" ] || [ -z "$comment_id" ] || [ "$comment_id" = "null" ]; then
       continue
     fi
 
-    echo "Deleting old summary thread (ID: $thread_id)..."
+    echo "Deleting old summary comment (thread ID: $thread_id, comment ID: $comment_id)..."
 
     local delete_response
-    delete_response=$(curl -s -X PATCH "${BASE_API_URL}/threads/${thread_id}?api-version=6.0" \
+    delete_response=$(curl -s -X DELETE "${BASE_API_URL}/threads/${thread_id}/comments/${comment_id}?api-version=7.1" \
       -H "Authorization: Bearer $SYSTEM_ACCESSTOKEN" \
       -H "Content-Type: application/json" \
-      --data '{"status": "closed"}' \
       -w "\n%{http_code}")
 
     local http_status
     http_status=$(echo "$delete_response" | tail -n1)
 
     if [ "$http_status" -ge 200 ] && [ "$http_status" -lt 300 ]; then
-      echo "Successfully closed thread $thread_id"
+      echo "Successfully deleted comment in thread $thread_id"
     else
-      echo "Warning: Could not close thread $thread_id (HTTP $http_status)"
+      echo "Warning: Could not delete comment in thread $thread_id (HTTP $http_status)"
     fi
   done
 }
@@ -153,7 +137,7 @@ populate_existing_comments_map() {
   local threads_url="${BASE_API_URL}/threads"
   local existing_threads
 
-  existing_threads=$(fetch_all_threads "$threads_url")
+  existing_threads=$(fetch_threads "$threads_url")
 
   if ! echo "$existing_threads" | jq -e . > /dev/null 2>&1; then
     echo "Warning: Could not fetch existing threads. Duplicate checking will be skipped."
@@ -209,6 +193,7 @@ post_review_thread() {
     '{
       comments: [
         {
+          parentCommentId: 0,
           content: $content,
           commentType: 1
         }
@@ -228,7 +213,7 @@ post_review_thread() {
     }')
 
   local post_response
-  post_response=$(curl -s -X POST "${BASE_API_URL}/threads?api-version=6.0" \
+  post_response=$(curl -s -X POST "${BASE_API_URL}/threads?api-version=7.1" \
     -H "Authorization: Bearer $SYSTEM_ACCESSTOKEN" \
     -H "Content-Type: application/json" \
     --data "$thread_payload" -w "\n%{http_code}")
@@ -458,6 +443,7 @@ SUMMARY_PAYLOAD=$(jq -n \
   '{
     comments: [
       {
+        parentCommentId: 0,
         content: $content,
         commentType: 1
       }
@@ -465,7 +451,7 @@ SUMMARY_PAYLOAD=$(jq -n \
     status: 1
   }')
 
-POST_RESPONSE=$(curl -s -X POST "${BASE_API_URL}/threads?api-version=6.0" \
+POST_RESPONSE=$(curl -s -X POST "${BASE_API_URL}/threads?api-version=7.1" \
   -H "Authorization: Bearer $SYSTEM_ACCESSTOKEN" \
   -H "Content-Type: application/json" \
   --data "$SUMMARY_PAYLOAD" -w "\n%{http_code}")
@@ -503,7 +489,7 @@ STATUS_PAYLOAD=$(jq -n \
     }
   }')
 
-STATUS_RESPONSE=$(curl -s -X POST "${BASE_API_URL}/statuses?api-version=6.0" \
+STATUS_RESPONSE=$(curl -s -X POST "${BASE_API_URL}/statuses?api-version=7.1" \
   -H "Authorization: Bearer $SYSTEM_ACCESSTOKEN" \
   -H "Content-Type: application/json" \
   --data "$STATUS_PAYLOAD" -w "\n%{http_code}")

package/src/index.test.js

@@ -451,7 +451,7 @@ describe('getPrUrl', () => {
     delete process.env.BITBUCKET_WORKSPACE;
     delete process.env.BITBUCKET_REPO_SLUG;
     delete process.env.BITBUCKET_PR_ID;
-    delete process.env.SYSTEM_COLLECTIONURI;
+    delete process.env.SYSTEM_TEAMFOUNDATIONCOLLECTIONURI;
     delete process.env.SYSTEM_TEAMPROJECT;
     delete process.env.BUILD_REPOSITORY_NAME;
     delete process.env.SYSTEM_PULLREQUEST_PULLREQUESTID;
@@ -477,7 +477,7 @@ describe('getPrUrl', () => {
   });
 
   it('should return Azure DevOps PR URL when Azure env vars are set', () => {
-    process.env.SYSTEM_COLLECTIONURI = 'https://dev.azure.com/myorg/';
+    process.env.SYSTEM_TEAMFOUNDATIONCOLLECTIONURI = 'https://dev.azure.com/myorg/';
     process.env.SYSTEM_TEAMPROJECT = 'myproject';
     process.env.BUILD_REPOSITORY_NAME = 'myrepo';
     process.env.SYSTEM_PULLREQUEST_PULLREQUESTID = '789';
@@ -486,7 +486,7 @@ describe('getPrUrl', () => {
   });
 
   it('should strip trailing slash from Azure DevOps collection URI', () => {
-    process.env.SYSTEM_COLLECTIONURI = 'https://dev.azure.com/myorg/';
+    process.env.SYSTEM_TEAMFOUNDATIONCOLLECTIONURI = 'https://dev.azure.com/myorg/';
     process.env.SYSTEM_TEAMPROJECT = 'myproject';
     process.env.BUILD_REPOSITORY_NAME = 'myrepo';
     process.env.SYSTEM_PULLREQUEST_PULLREQUESTID = '789';
@@ -497,7 +497,7 @@ describe('getPrUrl', () => {
   });
 
   it('should URL-encode spaces in Azure DevOps project and repo names', () => {
-    process.env.SYSTEM_COLLECTIONURI = 'https://dev.azure.com/myorg/';
+    process.env.SYSTEM_TEAMFOUNDATIONCOLLECTIONURI = 'https://dev.azure.com/myorg/';
     process.env.SYSTEM_TEAMPROJECT = 'My Project';
     process.env.BUILD_REPOSITORY_NAME = 'My Repo';
     process.env.SYSTEM_PULLREQUEST_PULLREQUESTID = '789';
@@ -527,7 +527,7 @@ describe('getPrUrl', () => {
   });
 
   it('should return null when only partial Azure env vars are set', () => {
-    process.env.SYSTEM_COLLECTIONURI = 'https://dev.azure.com/myorg/';
+    process.env.SYSTEM_TEAMFOUNDATIONCOLLECTIONURI = 'https://dev.azure.com/myorg/';
     process.env.SYSTEM_TEAMPROJECT = 'myproject';
     // BUILD_REPOSITORY_NAME and SYSTEM_PULLREQUEST_PULLREQUESTID not set
 

package/src/utils.js

@@ -34,12 +34,12 @@ export function getPrUrl() {
   }
   // Azure DevOps Pipelines
   if (
-    process.env.SYSTEM_COLLECTIONURI &&
+    process.env.SYSTEM_TEAMFOUNDATIONCOLLECTIONURI &&
     process.env.SYSTEM_TEAMPROJECT &&
     process.env.BUILD_REPOSITORY_NAME &&
     process.env.SYSTEM_PULLREQUEST_PULLREQUESTID
   ) {
-    const collectionUri = process.env.SYSTEM_COLLECTIONURI.replace(/\/$/, '');
+    const collectionUri = process.env.SYSTEM_TEAMFOUNDATIONCOLLECTIONURI.replace(/\/$/, '');
     return `${collectionUri}/${encodeURIComponent(process.env.SYSTEM_TEAMPROJECT)}/_git/${encodeURIComponent(process.env.BUILD_REPOSITORY_NAME)}/pullrequest/${process.env.SYSTEM_PULLREQUEST_PULLREQUESTID}`;
   }
   return null;