codeant-cli 0.5.1 → 0.5.3

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 CodeAnt AI
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeant-cli",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "Code review CLI tool",
   "type": "module",
   "bin": {

package/src/commands/login.js

@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import { Text, Box, useApp } from 'ink';
 import { getConfigValue, setConfigValue } from '../utils/config.js';
-import { getBaseUrl } from '../utils/baseUrl.js';
+import { getBaseUrl, getDashboardUrl } from '../utils/baseUrl.js';
 import { randomUUID } from 'crypto';
 
 const POLL_INTERVAL = 10000; // 10 seconds
@@ -24,49 +24,55 @@ export default function Login() {
 
     const token = randomUUID();
     const baseUrl = getBaseUrl();
-    const loginUrl = `https://app.codeant.ai?ideLoginToken=${token}`;
-    setLoginUrl(loginUrl);
     const pollUrl = `${baseUrl}/extension/login/status?apiKey=${token}`;
 
-    // Open browser
-    import('open').then(({ default: open }) => {
-      open(loginUrl);
-      setStatus('waiting');
-    }).catch(() => {
-      // Fallback: just show the URL
-      console.log(`\nOpen this URL in your browser:\n${loginUrl}\n`);
-      setStatus('waiting');
-    });
-
-    // Poll for login status
+    let intervalId;
     let timeoutId;
-    const intervalId = setInterval(async () => {
-      try {
-        const response = await fetch(pollUrl);
-        const data = await response.json();
 
-        if (data.status === 'yes') {
-          clearInterval(intervalId);
-          clearTimeout(timeoutId);
-
-          // Save the API key
-          setConfigValue('apiKeyV2', token);
-
-          setStatus('success');
-          setTimeout(() => exit(), 100);
+    (async () => {
+      const dashboardUrl = await getDashboardUrl();
+      const loginUrl = `${dashboardUrl}?ideLoginToken=${token}`;
+      setLoginUrl(loginUrl);
+
+      // Open browser
+      import('open').then(({ default: open }) => {
+        open(loginUrl);
+        setStatus('waiting');
+      }).catch(() => {
+        // Fallback: just show the URL
+        console.log(`\nOpen this URL in your browser:\n${loginUrl}\n`);
+        setStatus('waiting');
+      });
+
+      // Poll for login status
+      intervalId = setInterval(async () => {
+        try {
+          const response = await fetch(pollUrl);
+          const data = await response.json();
+
+          if (data.status === 'yes') {
+            clearInterval(intervalId);
+            clearTimeout(timeoutId);
+
+            // Save the API key
+            setConfigValue('apiKeyV2', token);
+
+            setStatus('success');
+            setTimeout(() => exit(), 100);
+          }
+        } catch (err) {
+          // Silently continue polling
         }
-      } catch (err) {
-        // Silently continue polling
-      }
-    }, POLL_INTERVAL);
-
-    // Timeout after 10 minutes
-    timeoutId = setTimeout(() => {
-      clearInterval(intervalId);
-      setError('Login timed out. Please try again.');
-      setStatus('error');
-      setTimeout(() => exit(new Error('Login timed out')), 100);
-    }, TIMEOUT);
+      }, POLL_INTERVAL);
+
+      // Timeout after 10 minutes
+      timeoutId = setTimeout(() => {
+        clearInterval(intervalId);
+        setError('Login timed out. Please try again.');
+        setStatus('error');
+        setTimeout(() => exit(new Error('Login timed out')), 100);
+      }, TIMEOUT);
+    })();
 
     // Cleanup
     return () => {

package/src/commands/review.js

@@ -81,24 +81,39 @@ export default function Review({ scanType = 'all', lastNCommits = 1, failOn = 'C
 
         // ── Split into per-file requests ───────────────────────────────────
         const perFileRequests = ReviewApiHelper.splitIntoPerFileRequests(requestBody);
+        let riskHypotheses = '';
+        try {
+          setCurrentMessage('Planning review risks...');
+          const plannerResult = await runTurnLoop(
+            {
+              diff_content: requestBody.diff_content,
+              prompt_template_name: 'risk_planner',
+            },
+            gitRoot,
+            () => cancelled,
+            () => {},
+            false
+          );
+          riskHypotheses = plannerResult.finalOutput?.risk_hypotheses || '';
+        } catch (plannerError) {
+          console.error(`Risk planner failed; continuing without hypotheses: ${plannerError.message}`);
+        }
+
+        if (cancelled) return;
 
         // ── Per-file agent turn loops (parallel) ──────────────────────────
         setCurrentMessage(`Analyzing ${perFileRequests.length} file${perFileRequests.length !== 1 ? 's' : ''} in parallel...`);
 
         const perFileResults = await Promise.all(
           perFileRequests.map((fileReq) => {
-            const filename = fileReq._filename;
-            delete fileReq._filename;
-
-            // Convert file_contents dict → file_content/file_path for API
-            if (fileReq.file_contents?.[filename]) {
-              fileReq.file_content = fileReq.file_contents[filename];
-              fileReq.file_path = filename;
-            }
-            delete fileReq.file_contents;
+            const payload = {
+              ...fileReq,
+              extra_variables: { risk_hypotheses: riskHypotheses },
+            };
+            delete payload._filenames;
 
             return runTurnLoop(
-              fileReq,
+              payload,
               gitRoot,
               () => cancelled,
               () => {},
@@ -110,21 +125,23 @@ export default function Review({ scanType = 'all', lastNCommits = 1, failOn = 'C
         // Pair each file's suggestions with its own diff — skip files with no real suggestions
         const perFileWithSuggestions = perFileRequests.map((fileReq, i) => ({
           diff_content: fileReq.diff_content,
-          suggestions: perFileResults[i].finalMessage?.content,
-          output: perFileResults[i].finalOutput,
-        })).filter(r => r.output?.code_suggestions?.length > 0);
+          file_contents: fileReq.file_contents,
+          generator_output: perFileResults[i].finalOutput,
+          rejector_input: perFileResults[i].rejectorInput,
+        })).filter(r => r.generator_output?.code_suggestions?.length > 0);
 
         if (cancelled) return;
 
-        // ── Per-file reflector loops (parallel) ─────────────────────────────
-        setCurrentMessage('Running reflector...');
-        const reflectorResults = await Promise.all(
-          perFileWithSuggestions.map(({ diff_content, suggestions }) =>
+        // ── Per-batch rejector loops (parallel) ─────────────────────────────
+        setCurrentMessage('Running rejector...');
+        const rejectorResults = await Promise.all(
+          perFileWithSuggestions.map(({ diff_content, file_contents, rejector_input }) =>
             runTurnLoop(
               {
                 diff_content,
-                prompt_template_name: 'reflector',
-                extra_variables: { suggestion_str: suggestions },
+                file_contents,
+                prompt_template_name: 'rejector',
+                extra_variables: rejector_input,
               },
               gitRoot,
               () => cancelled,
@@ -136,11 +153,23 @@ export default function Review({ scanType = 'all', lastNCommits = 1, failOn = 'C
 
         if (cancelled) return;
 
-        const reviewIssues = reflectorResults.flatMap(r =>
-          (r.finalOutput?.code_suggestions || []).map(issue => ({
-            issue_content: issue.issue_content || '',
+        const finalizedResults = await Promise.all(
+          rejectorResults.map((result, i) => fetchApi(
+            '/extension/pr-review/agent/finalize',
+            'POST',
+            {
+              diff_content: perFileWithSuggestions[i].diff_content,
+              generator_output: perFileWithSuggestions[i].generator_output,
+              rejector_output: result.finalOutput || { code_suggestions: [] },
+            }
+          ))
+        );
+
+        const reviewIssues = finalizedResults.flatMap(r =>
+          (r.output?.code_suggestions || []).map(issue => ({
+            issue_content: issue.suggestion_content || issue.one_sentence_summary || '',
             relevant_file: issue.relevant_file || 'Unknown',
-            start_line: issue.start_line || 0,
+            start_line: issue.relevant_lines_start || 0,
             label: issue.label || 'Code Quality',
           }))
         );
@@ -213,10 +242,11 @@ export default function Review({ scanType = 'all', lastNCommits = 1, failOn = 'C
 
 // ── Turn loop ──────────────────────────────────────────────────────────────
 
-async function runTurnLoop(initialPayload, gitRoot, isCancelled, onMessage, isReflectorLoop) {
+async function runTurnLoop(initialPayload, gitRoot, isCancelled, onMessage, isRejectorLoop) {
   let nextPayload = initialPayload;
   let finalMessage = null;
   let finalOutput = null;
+  let rejectorInput = null;
 
   for (let turn = 0; turn < MAX_TURNS; turn+=1) {
     if (isCancelled()) break;
@@ -239,10 +269,11 @@ async function runTurnLoop(initialPayload, gitRoot, isCancelled, onMessage, isRe
 
     finalMessage = assistantMsg;
     if (resp.output) finalOutput = resp.output;
+    if (resp.rejector_input) rejectorInput = resp.rejector_input;
 
     if (done) {
-      // Handle parsing errors in final message by dumping response content (only on reflector loop)
-      if (isReflectorLoop && resp.parsing_error) {
+      // Preserve malformed rejector output for debugging.
+      if (isRejectorLoop && resp.parsing_error) {
         const dumpDir = path.join(gitRoot, '.codeant', 'codeSuggestions');
         const dumpFile = path.join(dumpDir, `code_suggestions_${Date.now()}.txt`);
         let dumpContent = resp.response?.content || JSON.stringify(resp, null, 2);
@@ -289,6 +320,5 @@ async function runTurnLoop(initialPayload, gitRoot, isCancelled, onMessage, isRe
     nextPayload = { session_id: sessionId, tool_results: toolResults };
   }
 
-  return { finalMessage, finalOutput };
+  return { finalMessage, finalOutput, rejectorInput };
 }
-

package/src/components/ReviewUI.js

@@ -180,7 +180,7 @@ export function renderFetchingDiff(startTime) {
 }
 
 export function renderReviewing(currentMessage, startTime, meta) {
-  const step = currentMessage?.toLowerCase().includes('reflector') ? 3 : 2;
+  const step = currentMessage?.toLowerCase().includes('rejector') ? 3 : 2;
   return React.createElement(ReviewLoading, {
     message: currentMessage || 'Analyzing code...',
     step,

package/src/mcp/server.js

@@ -390,7 +390,7 @@ export async function startMcpServer() {
     'codeant_login',
     {
       title: 'Sign in to CodeAnt AI',
-      description: 'Opens app.codeant.ai in the user\'s browser and waits up to 10 minutes for them to complete sign-in. Tell the user to check their browser and finish the flow there. On success the API token is saved to ~/.codeant/config.json (apiKeyV2) and set on the running MCP process, so subsequent tool calls are authenticated without restart. Returns { alreadyLoggedIn: true } immediately if a token is already configured, unless `force` is true.',
+      description: 'Opens the configured CodeAnt dashboard in the user\'s browser and waits up to 10 minutes for them to complete sign-in. Tell the user to check their browser and finish the flow there. On success the API token is saved to ~/.codeant/config.json (apiKeyV2) and set on the running MCP process, so subsequent tool calls are authenticated without restart. Returns { alreadyLoggedIn: true } immediately if a token is already configured, unless `force` is true.',
       inputSchema: {
         force: z.boolean().optional().describe('Re-authenticate even if a token is already configured. Default false.'),
       },

package/src/reviewHeadless.js

@@ -7,12 +7,13 @@ import { track } from './utils/analytics.js';
 const MAX_TURNS = 5;
 
 /**
- * Run a single agent turn loop (per-file or reflector).
+ * Run a single agent turn loop (planner, generator, or rejector).
  */
-async function runTurnLoop(initialPayload, gitRoot, isReflectorLoop) {
+async function runTurnLoop(initialPayload, gitRoot, isRejectorLoop) {
   let nextPayload = initialPayload;
   let finalMessage = null;
   let finalOutput = null;
+  let rejectorInput = null;
 
   for (let turn = 0; turn < MAX_TURNS; turn += 1) {
     const resp = await fetchApi('/extension/pr-review/agent/turn', 'POST', nextPayload);
@@ -31,10 +32,11 @@ async function runTurnLoop(initialPayload, gitRoot, isReflectorLoop) {
 
     finalMessage = assistantMsg;
     if (resp.output) finalOutput = resp.output;
+    if (resp.rejector_input) rejectorInput = resp.rejector_input;
 
     if (done) {
-      if (isReflectorLoop && resp.parsing_error) {
-        console.error('Warning: parsing error in reflector response');
+      if (isRejectorLoop && resp.parsing_error) {
+        console.error('Warning: parsing error in rejector response');
       }
       break;
     }
@@ -52,7 +54,7 @@ async function runTurnLoop(initialPayload, gitRoot, isReflectorLoop) {
     nextPayload = { session_id: sessionId, tool_results: toolResults };
   }
 
-  return { finalMessage, finalOutput };
+  return { finalMessage, finalOutput, rejectorInput };
 }
 
 /**
@@ -126,29 +128,38 @@ export async function runReviewHeadless(options = {}) {
     const perFileRequests = ReviewApiHelper.splitIntoPerFileRequests(requestBody);
 
     const totalFiles = perFileRequests.reduce((n, r) => n + (r._filenames?.length || 0), 0);
+    let riskHypotheses = '';
+    try {
+      onProgress(`Planning risks across ${totalFiles} file${totalFiles !== 1 ? 's' : ''}...`);
+      const plannerResult = await runTurnLoop(
+        {
+          diff_content: requestBody.diff_content,
+          prompt_template_name: 'risk_planner',
+        },
+        gitRoot,
+        false
+      );
+      riskHypotheses = plannerResult.finalOutput?.risk_hypotheses || '';
+    } catch (err) {
+      console.error(`[warning] Risk planner failed; continuing without hypotheses: ${err.message}`);
+    }
     onProgress(`Analyzing ${totalFiles} file${totalFiles !== 1 ? 's' : ''}...`);
 
     // ── Per-batch agent turn loops (parallel, fault-tolerant) ────────────
-    // Each batch covers up to 5 files; backend reviews the multi-file diff
-    // in a single session (matches pragent's FileBatcher).
+    // Each review session covers a batch of up to five files.
     const perFileResults = await Promise.all(
       perFileRequests.map(async (fileReq) => {
         const filenames = fileReq._filenames || [];
-        delete fileReq._filenames;
+        const payload = {
+          ...fileReq,
+          extra_variables: { risk_hypotheses: riskHypotheses },
+        };
+        delete payload._filenames;
         const label = filenames.join(', ');
 
-        // Single-file batch: still pass file_content/file_path so backend can
-        // build head_file_str. Multi-file batches drop these (head_file_str
-        // becomes empty; agent gathers context via tools instead).
-        if (filenames.length === 1 && fileReq.file_contents?.[filenames[0]]) {
-          fileReq.file_content = fileReq.file_contents[filenames[0]];
-          fileReq.file_path = filenames[0];
-        }
-        delete fileReq.file_contents;
-
         try {
           onProgress(`Reviewing ${label}...`);
-          const result = await runTurnLoop(fileReq, gitRoot, false);
+          const result = await runTurnLoop(payload, gitRoot, false);
           onProgress(`Done reviewing ${label}`);
           return result;
         } catch (err) {
@@ -161,65 +172,59 @@ export async function runReviewHeadless(options = {}) {
     // Pair each file's suggestions with its own diff — skip files with no real suggestions
     const perFileWithSuggestions = perFileRequests.map((fileReq, i) => ({
       diff_content: fileReq.diff_content,
-      suggestions: perFileResults[i].finalMessage?.content,
-      output: perFileResults[i].finalOutput,
-    })).filter(r => r.output?.code_suggestions?.length > 0);
+      file_contents: fileReq.file_contents,
+      generator_output: perFileResults[i].finalOutput,
+      rejector_input: perFileResults[i].rejectorInput,
+    })).filter(r => r.generator_output?.code_suggestions?.length > 0);
 
     const filesWithSuggestions = new Set(
       perFileWithSuggestions.flatMap(r =>
-        (r.output?.code_suggestions || []).map(s => (s.relevant_file || '').trim()).filter(Boolean)
+        (r.generator_output?.code_suggestions || []).map(s => (s.relevant_file || '').trim()).filter(Boolean)
       )
     ).size;
-    onProgress(`${filesWithSuggestions} file${filesWithSuggestions !== 1 ? 's' : ''} have suggestions, running reflector...`);
+    onProgress(`${filesWithSuggestions} file${filesWithSuggestions !== 1 ? 's' : ''} have suggestions, running rejector...`);
 
-    // ── Per-file reflector loops (parallel, fault-tolerant) ──────────────
-    const reflectorResults = await Promise.all(
-      perFileWithSuggestions.map(async ({ diff_content, suggestions }, i) => {
+    // ── Per-batch rejector loops (parallel, fault-tolerant) ──────────────
+    const rejectorResults = await Promise.all(
+      perFileWithSuggestions.map(async ({ diff_content, file_contents, rejector_input }, i) => {
         try {
           return await runTurnLoop(
             {
               diff_content,
-              prompt_template_name: 'reflector',
-              extra_variables: { suggestion_str: suggestions },
+              file_contents,
+              prompt_template_name: 'rejector',
+              extra_variables: rejector_input,
             },
             gitRoot,
             true
           );
         } catch (err) {
-          console.error(`[error] Reflector failed for file ${i}: ${err.message}`);
+          console.error(`[error] Rejector failed for batch ${i}: ${err.message}`);
           return { finalMessage: null, finalOutput: null };
         }
       })
     );
 
-    // ── Parse results, carrying generator labels through reflector ──────
-    // Pragent's rejector schema drops `label`; preserve it by matching the
-    // reflector's per-issue (file, start_line) back to the generator's output.
-    const issues = reflectorResults.flatMap((r, i) => {
-      const genSuggestions = perFileWithSuggestions[i]?.output?.code_suggestions || [];
-      const norm = (v) => (typeof v === 'string' ? v.trim() : v);
-      const labelFor = (issue) => {
-        if (norm(issue.label)) return norm(issue.label);
-        // Match by summary (pragent's primary strategy): rejector's
-        // suggestion_summary (renamed to issue_content server-side) is
-        // "Repeated from the input" — i.e. the generator's one_sentence_summary.
-        const summary = norm(issue.issue_content);
-        if (summary) {
-          const exact = genSuggestions.find(g => norm(g.one_sentence_summary) === summary);
-          if (norm(exact?.label)) return norm(exact.label);
+    const finalizedResults = await Promise.all(
+      rejectorResults.map((result, i) => fetchApi(
+        '/extension/pr-review/agent/finalize',
+        'POST',
+        {
+          diff_content: perFileWithSuggestions[i].diff_content,
+          generator_output: perFileWithSuggestions[i].generator_output,
+          rejector_output: result.finalOutput || { code_suggestions: [] },
         }
-        // Fallback: first generator suggestion in the same file with a label.
-        const file = norm(issue.relevant_file);
-        const sameFile = genSuggestions.find(g => norm(g.relevant_file) === file && norm(g.label));
-        return norm(sameFile?.label) || 'Code Quality';
-      };
-      return (r.finalOutput?.code_suggestions || []).map((issue) => ({
-        issue_content: issue.issue_content || '',
+      ))
+    );
+
+    const issues = finalizedResults.flatMap(r =>
+      (r.output?.code_suggestions || []).map(issue => ({
+        issue_content: issue.suggestion_content || issue.one_sentence_summary || '',
         relevant_file: issue.relevant_file || 'Unknown',
-        start_line: issue.start_line || 0,
-        label: labelFor(issue),
-      }));
-    });
+        start_line: issue.relevant_lines_start || 0,
+        label: issue.label || 'Code Quality',
+      }))
+    );
 
     const labelCounts = {};
     for (const i of issues) { labelCounts[i.label] = (labelCounts[i.label] || 0) + 1; }

package/src/scans/fetchScanResults.js

@@ -70,6 +70,7 @@ export async function fetchScanResults(repo, commitId, resultType, opts = {}) {
       filter_dismissed: filterDismissed,
       include_false_positives: includeFalsePositives,
     });
+    console.error("dropship: ", JSON.stringify(response, null, 2));
 
     if (!response) {
       return { success: false, error: 'Failed to connect to CodeAnt server' };

package/src/utils/baseUrl.js

@@ -9,4 +9,15 @@ const getBaseUrl = () => {
   return url;
 };
 
-export { getBaseUrl };
+const getDashboardUrl = async () => {
+  try {
+    const response = await fetch(`${getBaseUrl()}/extension/get/dashboard`);
+    // console.log('Fetching dashboard URL from:', `${getBaseUrl()}/extension/get/dashboard`);
+    const data = await response.json();
+    return data.dashboard_url || 'https://app.codeant.ai';
+  } catch {
+    return 'https://app.codeant.ai';
+  }
+};
+
+export { getBaseUrl, getDashboardUrl };

package/src/utils/loginFlow.js

@@ -1,6 +1,6 @@
 import { randomUUID } from 'crypto';
 import { getConfigValue, setConfigValue } from './config.js';
-import { getBaseUrl } from './baseUrl.js';
+import { getBaseUrl, getDashboardUrl } from './baseUrl.js';
 
 const DEFAULT_POLL_INTERVAL = 10_000;
 const DEFAULT_TIMEOUT = 10 * 60 * 1000;
@@ -12,7 +12,8 @@ export function isAlreadyLoggedIn() {
 export async function startLoginFlow() {
   const token = randomUUID();
   const baseUrl = getBaseUrl();
-  const loginUrl = `https://app.codeant.ai?ideLoginToken=${token}`;
+  const dashboardUrl = await getDashboardUrl();
+  const loginUrl = `${dashboardUrl}?ideLoginToken=${token}`;
   const pollUrl = `${baseUrl}/extension/login/status?apiKey=${token}`;
 
   let browserOpened = false;

package/src/utils/reviewApiHelper.js

@@ -266,8 +266,8 @@ class ReviewApiHelper extends CommonApiHelper {
 
   /**
    * Split a combined review request into batched payloads.
-   * Files are grouped in chunks of up to FILES_PER_BATCH so each backend
-   * session reviews multiple files at once (matches pragent's batching).
+   * Files are grouped in chunks of up to FILES_PER_BATCH so each review
+   * session can process multiple files together.
    */
   static splitIntoPerFileRequests(requestBody, batchSize = 5) {
     if (!requestBody?.diff_content?.length) return [];
@@ -280,6 +280,7 @@ class ReviewApiHelper extends CommonApiHelper {
       if (!nameMatch) continue;
       perFile.push({ section, filename: nameMatch[1] });
     }
+    perFile.sort((a, b) => (a.filename < b.filename ? -1 : a.filename > b.filename ? 1 : 0));
 
     const batches = [];
     for (let i = 0; i < perFile.length; i += batchSize) {