codequiry-cli 2.0.0 → 2.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codequiry-cli",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Codequiry CLI - Source code similarity checker",
   "main": "src/index.js",
   "bin": {

package/src/commands/account.js

@@ -12,30 +12,36 @@ async function accountCommand() {
   const spinner = ora('Fetching account info...').start();
 
   try {
-    const account = await getAccount();
+    const data = await getAccount();
     spinner.stop();
 
-    const user = account.user || account;
-    const plan = user.plan_name || user.plan || 'Free';
-    const checksUsed = user.checks_used ?? user.procheck_used ?? 0;
-    const checksLimit = user.checks_limit ?? user.procheck_limit ?? 0;
-    const quotaPct = checksLimit > 0 ? Math.round((checksUsed / checksLimit) * 100) : 0;
+    // API returns: {id, name, email, quota: {remaining, total, unlimited, ...}, is_pro, plan_id, edu_verified}
+    const name = data.name || 'N/A';
+    const email = data.email || 'N/A';
+    const isPro = data.is_pro;
+    const planLabel = isPro ? 'Pro' : 'Free';
+    const quota = data.quota || {};
+    const remaining = quota.remaining ?? 0;
+    const isUnlimited = quota.unlimited || false;
+
+    const quotaDisplay = isUnlimited ? 'Unlimited' : String(remaining);
     const barLen = 20;
-    const filled = Math.round((quotaPct / 100) * barLen);
+    const filled = isUnlimited ? barLen : Math.min(barLen, Math.max(0, Math.round((remaining / Math.max(remaining, 1)) * barLen)));
     const quotaBar = chalk.green('█'.repeat(filled)) + chalk.dim('░'.repeat(barLen - filled));
 
     const content = [
       chalk.bold('Account'),
       '',
-      `${chalk.dim('Name:')}    ${user.name || user.email || 'N/A'}`,
-      `${chalk.dim('Email:')}   ${user.email || 'N/A'}`,
-      `${chalk.dim('Plan:')}    ${chalk.cyan(plan)}`,
+      `${chalk.dim('Name:')}    ${name}`,
+      `${chalk.dim('Email:')}   ${email}`,
+      `${chalk.dim('Plan:')}    ${chalk.cyan(planLabel)}`,
+      `${chalk.dim('EDU:')}     ${data.edu_verified ? chalk.green('Verified') : chalk.dim('No')}`,
       '',
-      chalk.bold('Usage'),
+      chalk.bold('Quota'),
       '',
-      `${chalk.dim('Checks:')}  ${checksUsed} / ${checksLimit}`,
-      `          ${quotaBar} ${quotaPct}%`,
-    ].join('\n');
+      `${chalk.dim('Remaining:')} ${quotaDisplay}`,
+      isUnlimited ? '' : `           ${quotaBar}`,
+    ].filter(Boolean).join('\n');
 
     console.log(
       '\n' +

package/src/commands/create.js

@@ -46,7 +46,7 @@ async function createCommand(options) {
       name: 'languageId',
       message: 'Programming language:',
       choices: langList.map((l) => ({
-        name: l.name || l.language,
+        name: l.language || l.name,
         value: l.id,
       })),
     });
@@ -75,8 +75,9 @@ async function createCommand(options) {
 
   try {
     const result = await createCheck(name, languageId, testType);
-    createSpinner.succeed(`Check created: ${chalk.cyan(result.check?.name || name)} (ID: ${result.check?.id || 'N/A'})`);
-    return result.check || result;
+    // API returns the Assignment object directly
+    createSpinner.succeed(`Check created: ${chalk.cyan(result.name || name)} (ID: ${result.id || 'N/A'})`);
+    return result;
   } catch (error) {
     createSpinner.fail('Failed to create check.');
   }

package/src/commands/results.js

@@ -27,7 +27,7 @@ async function resultsCommand(options) {
 
     // Filter to completed checks
     const completed = checks.filter(
-      (c) => c.status === 5 || c.status_name === 'Completed' || c.status === 'completed'
+      (c) => c.status_id === 4 || c.assignmentstatuses?.status === 'Completed'
     );
 
     if (completed.length === 0) {
@@ -88,8 +88,8 @@ async function resultsCommand(options) {
           name: 'submissionId',
           message: 'Select a submission:',
           choices: submissions.map((s) => ({
-            name: `${s.id || s.submission_id} - ${s.filename || s.name}`,
-            value: s.id || s.submission_id,
+            name: `${s.id} - ${s.filename || 'unknown'}`,
+            value: s.id,
           })),
         },
       ]);
@@ -103,7 +103,8 @@ async function resultsCommand(options) {
         detailSpinner.fail('Failed to fetch details.');
       }
     } else if (action === 'browser') {
-      await open(`https://codequiry.com/results/${checkId}`);
+      const url = overview?.overviewURL || `https://codequiry.com/results/${checkId}`;
+      await open(url);
       console.log(chalk.dim('  Opened in browser.\n'));
     }
   }

package/src/commands/scan.js

@@ -67,7 +67,7 @@ async function scanCommand(inputPath, options) {
                 type: 'list',
                 name: 'languageId',
                 message: 'Programming language:',
-                choices: langList.map((l) => ({ name: l.name || l.language, value: l.id })),
+                choices: langList.map((l) => ({ name: l.language || l.name, value: l.id })),
               },
             ]
           : []),
@@ -107,7 +107,7 @@ async function scanCommand(inputPath, options) {
   let check;
   try {
     const result = await createCheck(checkName, languageId, testType);
-    check = result.check || result;
+    check = result; // API returns Assignment object directly
     createSpinner.succeed(`Check created: ${chalk.cyan(check.name || checkName)} (ID: ${check.id})`);
   } catch (error) {
     createSpinner.fail('Failed to create check.');
@@ -172,7 +172,7 @@ async function scanCommand(inputPath, options) {
       if (options.threshold) {
         const submissions = overview?.submissions || overview || [];
         const maxScore = Math.max(
-          ...submissions.map((s) => parseFloat(s.result_score || s.similarity || 0))
+          ...submissions.map((s) => parseFloat(s.result1 || s.total_result || 0))
         );
         if (maxScore > parseFloat(options.threshold)) {
           process.exit(1);

package/src/commands/status.js

@@ -53,8 +53,8 @@ async function statusCommand(options) {
     try {
       const status = await getCheckStatus(checkId);
       spinner.stop();
-      const s = status?.status_name || status?.status || 'Unknown';
-      const p = status?.progress ?? status?.percentage ?? '';
+      const s = status?.status || 'Unknown';
+      const p = status?.progress ?? '';
       console.log(`\n  Check ${chalk.cyan(checkId)}: ${statusColor(s)}${p ? ` (${p}%)` : ''}\n`);
     } catch (error) {
       spinner.fail('Failed to fetch status.');

package/src/index.js

@@ -6,7 +6,7 @@ const program = new Command();
 program
   .name('codequiry')
   .description('Codequiry CLI - Source Code Similarity Checker')
-  .version('2.0.0');
+  .version('2.0.1');
 
 // Auth command
 program

package/src/utils/banner.js

@@ -11,9 +11,9 @@ function showBanner() {
       horizontalLayout: 'default',
     });
     console.log(gradient.vice(text));
-    console.log(chalk.dim('  Source Code Similarity Checker') + '  ' + chalk.dim('v2.0.0\n'));
+    console.log(chalk.dim('  Source Code Similarity Checker') + '  ' + chalk.dim('v2.0.1\n'));
   } catch {
-    console.log(gradient.vice('\n  Codequiry CLI v2.0.0\n'));
+    console.log(gradient.vice('\n  Codequiry CLI v2.0.1\n'));
   }
 }
 

package/src/utils/display.js

@@ -14,11 +14,12 @@ function colorScore(score) {
 function statusColor(status) {
   const s = String(status).toLowerCase();
   if (s === 'completed' || s === 'done') return chalk.green(status);
-  if (s === 'processing' || s === 'running' || s === 'in_progress') return chalk.yellow(status);
+  if (s === 'checking' || s === 'waiting' || s === 'uploading') return chalk.yellow(status);
   if (s === 'failed' || s === 'error') return chalk.red(status);
   return chalk.dim(status);
 }
 
+// API returns array of Assignment objects directly from getChecks
 function checksTable(checks) {
   const table = new Table({
     head: [
@@ -26,13 +27,12 @@ function checksTable(checks) {
       chalk.cyan('Name'),
       chalk.cyan('Language'),
       chalk.cyan('Status'),
-      chalk.cyan('Submissions'),
       chalk.cyan('Created'),
     ],
     style: { head: [], border: ['dim'] },
   });
 
-  const list = Array.isArray(checks) ? checks : checks?.checks || [];
+  const list = Array.isArray(checks) ? checks : [];
 
   if (list.length === 0) {
     console.log(chalk.dim('\n  No checks found.\n'));
@@ -40,12 +40,13 @@ function checksTable(checks) {
   }
 
   list.forEach((c) => {
+    // Assignment model fields from Laravel
+    const statusName = c.assignmentstatuses?.status || '';
     table.push([
       chalk.white(c.id),
       c.name || '',
-      c.language_name || c.language || '',
-      statusColor(c.status_name || c.status || ''),
-      String(c.submission_count || c.submissions || 0),
+      String(c.language_id || ''),
+      statusColor(statusName),
       c.created_at ? new Date(c.created_at).toLocaleDateString() : '',
     ]);
   });
@@ -53,8 +54,10 @@ function checksTable(checks) {
   console.log('\n' + table.toString() + '\n');
 }
 
+// API overview returns {overviewURL, submissions, bardata}
+// submissions have: id, filename, result1 (score), assignment_id, etc.
 function overviewTable(overview) {
-  const submissions = overview?.submissions || overview || [];
+  const submissions = overview?.submissions || [];
 
   if (!Array.isArray(submissions) || submissions.length === 0) {
     console.log(chalk.dim('\n  No results available.\n'));
@@ -66,25 +69,25 @@ function overviewTable(overview) {
       chalk.cyan('ID'),
       chalk.cyan('Filename'),
       chalk.cyan('Similarity'),
-      chalk.cyan('Matches'),
     ],
     style: { head: [], border: ['dim'] },
   });
 
   submissions.forEach((s) => {
+    const score = s.result1 || s.total_result || 0;
     table.push([
-      chalk.white(s.id || s.submission_id || ''),
-      s.filename || s.name || '',
-      colorScore(s.result_score || s.similarity || s.score || 0),
-      String(s.match_count || s.matches || ''),
+      chalk.white(s.id || ''),
+      s.filename || '',
+      colorScore(score),
     ]);
   });
 
   console.log('\n' + table.toString() + '\n');
 }
 
+// API results returns {submission, avg, max, min, other_matches, related_submissions, related_files}
 function resultsDetailTable(results) {
-  const matches = results?.matches || results?.results || results || [];
+  const matches = results?.other_matches || [];
 
   if (!Array.isArray(matches) || matches.length === 0) {
     console.log(chalk.dim('\n  No matches found.\n'));
@@ -94,8 +97,7 @@ function resultsDetailTable(results) {
   const table = new Table({
     head: [
       chalk.cyan('Matched With'),
-      chalk.cyan('Similarity'),
-      chalk.cyan('Lines Matched'),
+      chalk.cyan('Tokens'),
       chalk.cyan('Type'),
     ],
     style: { head: [], border: ['dim'] },
@@ -103,14 +105,18 @@ function resultsDetailTable(results) {
 
   matches.forEach((m) => {
     table.push([
-      m.matched_filename || m.other_filename || m.name || '',
-      colorScore(m.score || m.similarity || 0),
-      String(m.lines_matched || m.matched_lines || ''),
-      m.type || m.match_type || '',
+      m.filename || m.other_filename || '',
+      String(m.tokens || ''),
+      m.type || '',
     ]);
   });
 
-  console.log('\n' + table.toString() + '\n');
+  console.log('\n' + table.toString());
+
+  // Show stats
+  if (results.avg !== undefined) {
+    console.log(chalk.dim(`  Avg: ${results.avg}%  Max: ${results.max}%  Min: ${results.min}%\n`));
+  }
 }
 
 module.exports = { colorScore, statusColor, checksTable, overviewTable, resultsDetailTable };

package/src/utils/poller.js

@@ -2,19 +2,16 @@
 
 const ora = require('ora');
 const chalk = require('chalk');
-const cliProgress = require('cli-progress');
 const { getCheckStatus } = require('../api/endpoints');
 
 async function pollUntilComplete(checkId, { silent = false } = {}) {
   const POLL_INTERVAL = 3000;
   let spinner;
-  let progressBar;
   let interrupted = false;
 
   const cleanup = () => {
     interrupted = true;
     if (spinner) spinner.stop();
-    if (progressBar) progressBar.stop();
   };
 
   process.on('SIGINT', cleanup);
@@ -26,27 +23,26 @@ async function pollUntilComplete(checkId, { silent = false } = {}) {
   try {
     while (!interrupted) {
       const status = await getCheckStatus(checkId);
-      const statusVal = status?.status ?? status?.check_status ?? status;
-      const progress = status?.progress ?? status?.percentage ?? 0;
+      const statusId = status?.status_id;
+      const progress = status?.progress ?? 0;
 
-      // Check if completed
-      if (statusVal === 5 || statusVal === 'completed' || statusVal === 'done') {
+      // status_id 4 = Completed
+      if (statusId === 4) {
         if (spinner) spinner.succeed('Check completed!');
-        if (progressBar) progressBar.stop();
         return status;
       }
 
-      // Check if failed
-      if (statusVal === 'failed' || statusVal === 'error' || statusVal === -1) {
-        if (spinner) spinner.fail('Check failed.');
-        if (progressBar) progressBar.stop();
+      // status_id 5 = Error/Failed
+      if (statusId === 5 || statusId === -1) {
+        if (spinner) spinner.fail('Check failed: ' + (status?.status_message || status?.status || ''));
         return status;
       }
 
       // Update progress display
       if (!silent && spinner) {
-        const pct = typeof progress === 'number' ? progress : 0;
-        spinner.text = `Processing... ${chalk.cyan(pct + '%')}`;
+        const statusText = status?.status || 'Processing';
+        const msg = status?.status_message || '';
+        spinner.text = `${statusText}... ${chalk.cyan(progress + '%')}${msg ? chalk.dim(' - ' + msg) : ''}`;
       }
 
       await new Promise((resolve) => setTimeout(resolve, POLL_INTERVAL));