canvaslms-cli 1.4.3 → 1.4.4

package/commands/submit.js

@@ -18,195 +18,336 @@ export async function submitAssignment(options) {
     let selectedCourse = null;
     let selectedAssignment = null;
     
-    // Step 1: Select Course (if not provided)
-    while (!courseId) {
-      console.log(chalk.cyan.bold('\n' + '-'.repeat(60)));
-      console.log(chalk.cyan.bold('Loading your courses, please wait...'));
-      const courses = await makeCanvasRequest('get', 'courses', [
-        'enrollment_state=active',
-        'include[]=favorites'
-      ]);
-      if (!courses || courses.length === 0) {
-        console.log(chalk.red('Error: No courses found.'));
-        rl.close();
-        return;
-      }
-      let selectableCourses = courses;
-      if (!options.all) {
-        selectableCourses = courses.filter(course => course.is_favorite);
-        if (selectableCourses.length === 0) {
-          console.log(chalk.red('Error: No starred courses found. Showing all enrolled courses...'));
-          selectableCourses = courses;
+    
+    // Step 1 & 2: Select Course and Assignment (if not provided)
+    while (!courseId || !assignmentId) {
+      if (!courseId) {
+        let courses = null;
+        while (true) {
+          console.log(chalk.cyan.bold(`\n${'-'.repeat(60)}`));
+          console.log(chalk.cyan.bold('Loading your courses, please wait...'));
+          try {
+            courses = await makeCanvasRequest('get', 'courses', [
+              'enrollment_state=active',
+              'include[]=favorites'
+            ]);
+          } catch (error) {
+            console.error(chalk.red('Error: Failed to load courses: ' + error.message));
+            const retryCourses = await askConfirmation(rl, chalk.yellow('Try loading courses again?'), true);
+            if (retryCourses) {
+              continue;
+            }
+            console.log(chalk.yellow('Submission cancelled.'));
+            return;
+          }
+
+          if (!courses || courses.length === 0) {
+            console.log(chalk.red('Error: No courses found.'));
+            const retryCourses = await askConfirmation(rl, chalk.yellow('Refresh course list?'), true);
+            if (retryCourses) {
+              continue;
+            }
+            console.log(chalk.yellow('Submission cancelled.'));
+            return;
+          }
+          break;
+        }
+
+        let selectableCourses = courses;
+        if (!options.all) {
+          selectableCourses = courses.filter(course => course.is_favorite);
+          if (selectableCourses.length === 0) {
+            console.log(chalk.yellow('No starred courses found. Showing all enrolled courses...'));
+            selectableCourses = courses;
+          }
+        }
+
+        console.log(chalk.cyan('-'.repeat(60)));
+        console.log(chalk.cyan.bold('Select a course:'));
+        selectableCourses.forEach((course, index) => {
+          console.log(pad(chalk.white((index + 1) + '. '), 5) + chalk.white(course.name));
+        });
+
+        while (!courseId) {
+          const courseChoice = await askQuestion(rl, chalk.bold.cyan(`
+Enter course number (or ".."/"back" to cancel): `));
+          if (courseChoice === '..' || courseChoice.toLowerCase() === 'back') {
+            const confirmCancel = await askConfirmation(rl, chalk.yellow('Cancel submission?'), false);
+            if (confirmCancel) {
+              console.log(chalk.yellow('Submission cancelled.'));
+              return;
+            }
+            continue;
+          }
+          if (!courseChoice.trim()) {
+            console.log(chalk.yellow('Please enter a course number.'));
+            continue;
+          }
+          const parsedIndex = Number.parseInt(courseChoice, 10);
+          if (Number.isNaN(parsedIndex)) {
+            console.log(chalk.red('Error: Please enter a valid course number.'));
+            continue;
+          }
+          const courseIndex = parsedIndex - 1;
+          if (courseIndex < 0 || courseIndex >= selectableCourses.length) {
+            console.log(chalk.red('Error: Invalid course selection.'));
+            continue;
+          }
+          selectedCourse = selectableCourses[courseIndex];
+          courseId = selectedCourse.id;
+          console.log(chalk.green(`Success: Selected ${selectedCourse.name}
+`));
         }
       }
-      console.log(chalk.cyan('-'.repeat(60)));
-      console.log(chalk.cyan.bold('Select a course:'));
-      selectableCourses.forEach((course, index) => {
-        console.log(pad(chalk.white((index + 1) + '. '), 5) + chalk.white(course.name));
-      });
-      const courseChoice = await askQuestion(rl, chalk.bold.cyan('\nEnter course number (or ".."/"back" to cancel): '));
-      if (courseChoice === '..' || courseChoice.toLowerCase() === 'back') {
-        rl.close();
-        return;
-      }
-      if (!courseChoice.trim()) {
-        console.log(chalk.red('Error: No course selected. Exiting...'));
-        rl.close();
-        return;
+
+      if (!assignmentId) {
+        let assignments = null;
+        while (true) {
+          console.log(chalk.cyan.bold('-'.repeat(60)));
+          console.log(chalk.cyan.bold('Loading assignments, please wait...'));
+          try {
+            assignments = await makeCanvasRequest('get', `courses/${courseId}/assignments`, [
+              'include[]=submission',
+              'order_by=due_at',
+              'per_page=100'
+            ]);
+          } catch (error) {
+            console.error(chalk.red('Error: Failed to load assignments: ' + error.message));
+            const retryAssignments = await askConfirmation(rl, chalk.yellow('Try loading assignments again?'), true);
+            if (retryAssignments) {
+              continue;
+            }
+            const chooseDifferentCourse = await askConfirmation(rl, chalk.yellow('Choose a different course?'), true);
+            if (chooseDifferentCourse) {
+              courseId = null;
+              selectedCourse = null;
+              break;
+            }
+            console.log(chalk.yellow('Submission cancelled.'));
+            return;
+          }
+
+          if (!assignments || assignments.length === 0) {
+            console.log(chalk.red('Error: No assignments found for this course.'));
+            const chooseDifferentCourse = await askConfirmation(rl, chalk.yellow('Select a different course?'), true);
+            if (chooseDifferentCourse) {
+              courseId = null;
+              selectedCourse = null;
+              break;
+            }
+            const retryAssignments = await askConfirmation(rl, chalk.yellow('Refresh assignments for this course?'), true);
+            if (retryAssignments) {
+              continue;
+            }
+            console.log(chalk.yellow('Submission cancelled.'));
+            return;
+          }
+          break;
+        }
+
+        if (!courseId) {
+          assignmentId = null;
+          selectedAssignment = null;
+          continue;
+        }
+
+        console.log(chalk.cyan('-'.repeat(60)));
+        console.log(chalk.cyan.bold(`Found ${assignments.length} assignment(s):`));
+        const submittedCount = assignments.filter(a => a.submission && a.submission.submitted_at).length;
+        const pendingCount = assignments.length - submittedCount;
+        const uploadableCount = assignments.filter(a =>
+          a.submission_types &&
+          a.submission_types.includes('online_upload') &&
+          a.workflow_state === 'published'
+        ).length;
+        console.log(chalk.yellow(`Summary: ${submittedCount} submitted, ${pendingCount} pending, ${uploadableCount} accept file uploads`));
+        console.log(chalk.cyan('-'.repeat(60)));
+
+        assignments.forEach((assignment, index) => {
+          const dueDate = assignment.due_at ? new Date(assignment.due_at).toLocaleDateString() : 'No due date';
+          const submitted = assignment.submission && assignment.submission.submitted_at ? chalk.green('Submitted') : chalk.yellow('Not submitted');
+          const canSubmitFiles = assignment.submission_types && assignment.submission_types.includes('online_upload') && assignment.workflow_state === 'published';
+          let gradeDisplay = '';
+          const submission = assignment.submission;
+          if (submission && submission.score !== null && submission.score !== undefined) {
+            const score = submission.score % 1 === 0 ? Math.round(submission.score) : submission.score;
+            const total = assignment.points_possible || 0;
+            gradeDisplay = ` | Grade: ${score}/${total}`;
+          } else if (submission && submission.excused) {
+            gradeDisplay = ' | Grade: Excused';
+          } else if (submission && submission.missing) {
+            gradeDisplay = ' | Grade: Missing';
+          } else if (assignment.points_possible) {
+            gradeDisplay = ` | Grade: –/${assignment.points_possible}`;
+          }
+          let line = pad(chalk.white((index + 1) + '. '), 5) + chalk.white(assignment.name) + chalk.gray(` (${dueDate})`) + ' ' + submitted + gradeDisplay;
+          if (!canSubmitFiles) {
+            line += chalk.red(' [No file uploads]');
+          }
+          console.log(line);
+        });
+
+        let awaitingAssignment = true;
+        while (awaitingAssignment) {
+          const assignmentChoice = await askQuestion(rl, chalk.bold.cyan(`
+Enter assignment number (or ".."/"back" to re-select course): `));
+          if (assignmentChoice === '..' || assignmentChoice.toLowerCase() === 'back') {
+            const chooseCourseAgain = await askConfirmation(rl, chalk.yellow('Go back to course selection?'), true);
+            if (chooseCourseAgain) {
+              courseId = null;
+              selectedCourse = null;
+              assignmentId = null;
+              selectedAssignment = null;
+              awaitingAssignment = false;
+              break;
+            }
+            continue;
+          }
+          if (!assignmentChoice.trim()) {
+            console.log(chalk.yellow('Please enter an assignment number.'));
+            continue;
+          }
+          const parsedIndex = Number.parseInt(assignmentChoice, 10);
+          if (Number.isNaN(parsedIndex)) {
+            console.log(chalk.red('Error: Please enter a valid assignment number.'));
+            continue;
+          }
+          const assignmentIndex = parsedIndex - 1;
+          if (assignmentIndex < 0 || assignmentIndex >= assignments.length) {
+            console.log(chalk.red('Error: Invalid assignment selection.'));
+            continue;
+          }
+          const candidate = assignments[assignmentIndex];
+          const canSubmitFiles = candidate.submission_types && candidate.submission_types.includes('online_upload') && candidate.workflow_state === 'published';
+          if (!canSubmitFiles) {
+            console.log(chalk.red('Error: This assignment does not accept file uploads or is not published.'));
+            continue;
+          }
+          selectedAssignment = candidate;
+          assignmentId = candidate.id;
+          console.log(chalk.green(`Success: Selected ${selectedAssignment.name}
+`));
+          if (selectedAssignment.submission && selectedAssignment.submission.submitted_at) {
+            const resubmit = await askConfirmation(rl, chalk.yellow('This assignment has already been submitted. Do you want to resubmit?'), true);
+            if (!resubmit) {
+              console.log(chalk.yellow('Select a different assignment.'));
+              assignmentId = null;
+              selectedAssignment = null;
+              continue;
+            }
+          }
+          awaitingAssignment = false;
+        }
+
+        if (!courseId) {
+          continue;
+        }
       }
-      const courseIndex = parseInt(courseChoice) - 1;
-      if (courseIndex < 0 || courseIndex >= selectableCourses.length) {
-        console.log(chalk.red('Error: Invalid course selection.'));
-        continue;
+
+      if (courseId && assignmentId) {
+        break;
       }
-      selectedCourse = selectableCourses[courseIndex];
-      courseId = selectedCourse.id;
-      console.log(chalk.green(`Success: Selected ${selectedCourse.name}\n`));
     }
-    
-    // Step 2: Select Assignment (if not provided)
-    while (!assignmentId) {
+
+    // Step 3: Choose file selection method and select files
+    let filePaths = [];
+    while (filePaths.length === 0) {
       console.log(chalk.cyan.bold('-'.repeat(60)));
-      console.log(chalk.cyan.bold('Loading assignments, please wait...'));
-      const assignments = await makeCanvasRequest('get', `courses/${courseId}/assignments`, [
-        'include[]=submission',
-        'order_by=due_at',
-        'per_page=100'
-      ]);
-      if (!assignments || assignments.length === 0) {
-        console.log(chalk.red('Error: No assignments found for this course.'));
-        rl.close();
-        return;
-      }
-      console.log(chalk.cyan('-'.repeat(60)));
-      console.log(chalk.cyan.bold(`Found ${assignments.length} assignment(s):`));
-      // Show summary of assignment statuses
-      const submittedCount = assignments.filter(a => a.submission && a.submission.submitted_at).length;
-      const pendingCount = assignments.length - submittedCount;
-      const uploadableCount = assignments.filter(a => 
-        a.submission_types && 
-        a.submission_types.includes('online_upload') && 
-        a.workflow_state === 'published'
-      ).length;
-      console.log(chalk.yellow(`Summary: ${submittedCount} submitted, ${pendingCount} pending, ${uploadableCount} accept file uploads`));
+      console.log(chalk.cyan.bold('File Selection Method'));
       console.log(chalk.cyan('-'.repeat(60)));
-      // Numbered menu
-      assignments.forEach((assignment, index) => {
-        const dueDate = assignment.due_at ? new Date(assignment.due_at).toLocaleDateString() : 'No due date';
-        const submitted = assignment.submission && assignment.submission.submitted_at ? chalk.green('Submitted') : chalk.yellow('Not submitted');
-        const canSubmitFiles = assignment.submission_types && assignment.submission_types.includes('online_upload') && assignment.workflow_state === 'published';
-        let gradeDisplay = '';
-        const submission = assignment.submission;
-        if (submission && submission.score !== null && submission.score !== undefined) {
-          const score = submission.score % 1 === 0 ? Math.round(submission.score) : submission.score;
-          const total = assignment.points_possible || 0;
-          gradeDisplay = ` | Grade: ${score}/${total}`;
-        } else if (submission && submission.excused) {
-          gradeDisplay = ' | Grade: Excused';
-        } else if (submission && submission.missing) {
-          gradeDisplay = ' | Grade: Missing';
-        } else if (assignment.points_possible) {
-          gradeDisplay = ` | Grade: –/${assignment.points_possible}`;
+      const courseLabel = selectedCourse?.name || `Course ${courseId}`;
+      const assignmentLabel = selectedAssignment?.name || `Assignment ${assignmentId}`;
+      console.log(chalk.white('Course: ') + chalk.bold(courseLabel));
+      console.log(chalk.white('Assignment: ') + chalk.bold(assignmentLabel));
+      console.log();
+
+      console.log(chalk.yellow('📁 Choose file selection method:'));
+      console.log(chalk.white('1. ') + chalk.cyan('Keyboard Navigator') + chalk.gray(' (NEW! - Use arrow keys and space bar to navigate and select)'));
+      console.log(chalk.white('2. ') + chalk.cyan('Text-based Selector') + chalk.gray(' (Traditional - Type filenames and wildcards)'));
+      console.log(chalk.white('3. ') + chalk.cyan('Basic Directory Listing') + chalk.gray(' (Simple - Select from numbered list)'));
+
+      let selectorChoice = '';
+      while (true) {
+        selectorChoice = await askQuestion(rl, chalk.bold.cyan(`
+Choose method (1-3): `));
+        if (!selectorChoice) {
+          console.log(chalk.yellow('Please choose option 1, 2, or 3.'));
+          continue;
         }
-        let line = pad(chalk.white((index + 1) + '. '), 5) + chalk.white(assignment.name) + chalk.gray(` (${dueDate})`) + ' ' + submitted + gradeDisplay;
-        if (!canSubmitFiles) {
-          line += chalk.red(' [No file uploads]');
+        if (['1', '2', '3'].includes(selectorChoice)) {
+          break;
         }
-        console.log(line);
-      });
-      const assignmentChoice = await askQuestion(rl, chalk.bold.cyan('\nEnter assignment number (or ".."/"back" to re-select course): '));
-      if (assignmentChoice === '..' || assignmentChoice.toLowerCase() === 'back') {
-        courseId = null;
-        selectedCourse = null;
-        break;
+        console.log(chalk.red('Invalid option. Please enter 1, 2, or 3.'));
       }
-      if (!assignmentChoice.trim()) {
-        console.log(chalk.red('Error: No assignment selected. Exiting...'));
-        rl.close();
-        return;
+
+      if (selectorChoice === '1') {
+        filePaths = await selectFilesKeyboard(rl);
+      } else if (selectorChoice === '2') {
+        filePaths = await selectFilesImproved(rl);
+      } else {
+        filePaths = await selectFiles(rl);
       }
-      const assignmentIndex = parseInt(assignmentChoice) - 1;
-      if (assignmentIndex < 0 || assignmentIndex >= assignments.length) {
-        console.log(chalk.red('Error: Invalid assignment selection.'));
+
+      if (!filePaths || filePaths.length === 0) {
+        console.log(chalk.yellow('No files selected.'));
+        const retrySelection = await askConfirmation(rl, chalk.yellow('Do you want to try selecting files again?'), true);
+        if (!retrySelection) {
+          console.log(chalk.yellow('Submission cancelled.'));
+          return;
+        }
         continue;
       }
-      selectedAssignment = assignments[assignmentIndex];
-      if (!selectedAssignment.submission_types || !selectedAssignment.submission_types.includes('online_upload') || selectedAssignment.workflow_state !== 'published') {
-        console.log(chalk.red('Error: This assignment does not accept file uploads or is not published.'));
-        rl.close();
-        return;
+
+      const validFiles = [];
+      for (const file of filePaths) {
+        if (fs.existsSync(file)) {
+          validFiles.push(file);
+        } else {
+          console.log(chalk.red('Error: File not found: ' + file));
+        }
       }
-      assignmentId = selectedAssignment.id;
-      console.log(chalk.green(`Success: Selected ${selectedAssignment.name}\n`));      if (selectedAssignment.submission && selectedAssignment.submission.submitted_at) {
-        const resubmit = await askConfirmation(rl, chalk.yellow('This assignment has already been submitted. Do you want to resubmit?'), true);
-        if (!resubmit) {
+
+      if (validFiles.length === 0) {
+        console.log(chalk.red('Error: No valid files selected.'));
+        const retrySelection = await askConfirmation(rl, chalk.yellow('Try selecting files again?'), true);
+        if (!retrySelection) {
           console.log(chalk.yellow('Submission cancelled.'));
-          rl.close();
           return;
         }
+        filePaths = [];
+        continue;
       }
+
+      filePaths = validFiles;
     }
-    
-    // Step 3: Choose file selection method and select files
-    let filePaths = [];
-    console.log(chalk.cyan.bold('-'.repeat(60)));
-    console.log(chalk.cyan.bold('File Selection Method'));
-    console.log(chalk.cyan('-'.repeat(60)));
-    console.log(chalk.white('Course: ') + chalk.bold(selectedCourse.name));
-    console.log(chalk.white('Assignment: ') + chalk.bold(selectedAssignment.name) + '\n');
-    
-    console.log(chalk.yellow('📁 Choose file selection method:'));
-    console.log(chalk.white('1. ') + chalk.cyan('Keyboard Navigator') + chalk.gray(' (NEW! - Use arrow keys and space bar to navigate and select)'));
-    console.log(chalk.white('2. ') + chalk.cyan('Text-based Selector') + chalk.gray(' (Traditional - Type filenames and wildcards)'));
-    console.log(chalk.white('3. ') + chalk.cyan('Basic Directory Listing') + chalk.gray(' (Simple - Select from numbered list)'));
-    
-    const selectorChoice = await askQuestion(rl, chalk.bold.cyan('\nChoose method (1-3): '));
-    
-    console.log(chalk.cyan.bold('-'.repeat(60)));
-    console.log(chalk.cyan.bold('File Selection'));
-    console.log(chalk.cyan('-'.repeat(60)));
-    
-    if (selectorChoice === '1') {
-      filePaths = await selectFilesKeyboard(rl);
-    } else if (selectorChoice === '2') {
-      filePaths = await selectFilesImproved(rl);
-    } else {
-      filePaths = await selectFiles(rl);
-    }
-    // Validate all selected files exist
-    const validFiles = [];
-    for (const file of filePaths) {
-      if (fs.existsSync(file)) {
-        validFiles.push(file);
-      } else {
-        console.log(chalk.red('Error: File not found: ' + file));
-      }
-    }
-    if (validFiles.length === 0) {
-      console.log(chalk.red('Error: No valid files selected.'));
-      rl.close();
-      return;
-    }
-    filePaths = validFiles;
+
     // Step 4: Confirm and Submit
     console.log(chalk.cyan.bold('-'.repeat(60)));
     console.log(chalk.cyan.bold('Submission Summary:'));
     console.log(chalk.cyan('-'.repeat(60)));
-    console.log(chalk.white('Course: ') + chalk.bold(selectedCourse?.name || 'Unknown Course'));
-    console.log(chalk.white('Assignment: ') + chalk.bold(selectedAssignment?.name || 'Unknown Assignment'));
+    const courseSummary = selectedCourse?.name || `Course ${courseId}`;
+    const assignmentSummary = selectedAssignment?.name || `Assignment ${assignmentId}`;
+    console.log(chalk.white('Course: ') + chalk.bold(courseSummary));
+    console.log(chalk.white('Assignment: ') + chalk.bold(assignmentSummary));
     console.log(chalk.white(`Files (${filePaths.length}):`));
     filePaths.forEach((file, index) => {
-      const stats = fs.statSync(file);
-      const size = (stats.size / 1024).toFixed(1) + ' KB';
-      console.log(pad(chalk.white((index + 1) + '.'), 5) + pad(path.basename(file), 35) + chalk.gray(size));
+      try {
+        const stats = fs.statSync(file);
+        const size = (stats.size / 1024).toFixed(1) + ' KB';
+        console.log(pad(chalk.white((index + 1) + '.'), 5) + pad(path.basename(file), 35) + chalk.gray(size));
+      } catch (error) {
+        console.log(pad(chalk.white((index + 1) + '.'), 5) + pad(path.basename(file), 35) + chalk.red(' [unavailable]'));
+      }
     });
-    const confirm = await askConfirmation(rl, chalk.bold.cyan('\nProceed with submission?'), true);
+    const confirm = await askConfirmation(rl, chalk.bold.cyan(`
+Proceed with submission?`), true, { requireExplicit: true });
     if (!confirm) {
       console.log(chalk.yellow('Submission cancelled.'));
-      rl.close();
       return;
     }
-    console.log(chalk.cyan.bold('\nUploading files, please wait...'));
+
+    console.log(chalk.cyan.bold(`
+Uploading files, please wait...`));
     // Upload all files
     const uploadedFileIds = [];
     for (let i = 0; i < filePaths.length; i++) {
@@ -217,11 +358,13 @@ export async function submitAssignment(options) {
         uploadedFileIds.push(fileId);
         console.log(chalk.green('Success: Uploaded.'));
       } catch (error) {
-        console.error(chalk.red(`Error: Failed to upload ${currentFile}: ${error.message}`));
-        const continueUpload = await askConfirmation(rl, chalk.yellow('Continue with remaining files?'), true);
-        if (!continueUpload) {
-          break;
+        if (error && error.message && error.message.includes('filetype not allowed')) {
+          console.error(chalk.red(`Error: File type not allowed for ${currentFile}. Please select a permitted file type.`));
+        } else {
+          console.error(chalk.red(`Error: Failed to upload ${currentFile}: ${error.message}`));
         }
+        const continueUpload = await askConfirmation(rl, chalk.yellow('Continue with remaining files?'), true);
+        if (!continueUpload) break;
       }
     }
     // Submit assignment with uploaded files
@@ -236,6 +379,7 @@ export async function submitAssignment(options) {
     } else {
       console.log(chalk.red('Error: No files were uploaded. Submission not completed.'));
     }
+
   } catch (error) {
     console.error(chalk.red('Error: Submission failed: ' + error.message));
   } finally {
@@ -247,119 +391,213 @@ async function selectFiles(rl) {
   console.log('📁 File selection options:');
   console.log('1. Enter file path(s) manually');
   console.log('2. Select from current directory');
-  
-  const fileChoice = await askQuestion(rl, '\nChoose option (1-2): ');
-  
-  if (fileChoice === '1') {
-    return await selectFilesManually(rl);
-  } else if (fileChoice === '2') {
-    return await selectFilesFromDirectory(rl);
-  } else {
-    console.log('Invalid option.');
-    return [];
+
+  while (true) {
+    const fileChoice = await askQuestion(rl, '\nChoose option (1-2): ');
+
+    if (!fileChoice) {
+      console.log('Please choose option 1 or 2.');
+      continue;
+    }
+
+    if (fileChoice === '1') {
+      return await selectFilesManually(rl);
+    }
+    if (fileChoice === '2') {
+      return await selectFilesFromDirectory(rl);
+    }
+
+    console.log('Invalid option. Please enter 1 or 2.');
   }
 }
 
 async function selectFilesManually(rl) {
-  const singleOrMultiple = await askQuestion(rl, 'Submit single file or multiple files? (s/m): ');
+  let mode = '';
+  while (true) {
+    mode = await askQuestion(rl, 'Submit single file or multiple files? (s/m): ');
+    if (!mode) {
+      mode = 's';
+      break;
+    }
+    const normalized = mode.toLowerCase();
+    if (normalized === 's' || normalized === 'single') {
+      mode = 's';
+      break;
+    }
+    if (normalized === 'm' || normalized === 'multiple') {
+      mode = 'm';
+      break;
+    }
+    console.log('Please enter "s" for single or "m" for multiple.');
+  }
+
   const filePaths = [];
-  
-  if (singleOrMultiple.toLowerCase() === 'm' || singleOrMultiple.toLowerCase() === 'multiple') {
+  if (mode === 'm') {
     console.log('Enter file paths (one per line). Press Enter on empty line to finish:');
-    let fileInput = '';
     while (true) {
-      fileInput = await askQuestion(rl, 'File path: ');
-      if (fileInput === '') break;
+      const fileInput = await askQuestion(rl, 'File path: ');
+      if (!fileInput) {
+        break;
+      }
       filePaths.push(fileInput);
     }
   } else {
-    const singleFile = await askQuestion(rl, 'Enter file path: ');
-    filePaths.push(singleFile);
+    while (filePaths.length === 0) {
+      const singleFile = await askQuestion(rl, 'Enter file path: ');
+      if (!singleFile) {
+        console.log('File path cannot be empty.');
+        continue;
+      }
+      filePaths.push(singleFile);
+    }
   }
-  
+
   return filePaths;
 }
 
 async function selectFilesFromDirectory(rl) {
-  try {
-    const files = fs.readdirSync('.').filter(file => 
-      fs.statSync(file).isFile() && 
-      !file.startsWith('.') &&
-      file !== 'package.json' &&
-      file !== 'README.md'
-    );
-    
-    if (files.length === 0) {
+  while (true) {
+    let files;
+    try {
+      files = fs.readdirSync('.').filter(file => {
+        try {
+          return (
+            fs.statSync(file).isFile() &&
+            !file.startsWith('.') &&
+            file !== 'package.json' &&
+            file !== 'README.md'
+          );
+        } catch {
+          return false;
+        }
+      });
+    } catch (error) {
+      console.log('Error reading directory: ' + error.message);
+      const manualFile = await askQuestion(rl, 'Enter file path manually: ');
+      return manualFile ? [manualFile] : [];
+    }
+
+    if (!files || files.length === 0) {
       console.log('No suitable files found in current directory.');
       const manualFile = await askQuestion(rl, 'Enter file path manually: ');
-      return [manualFile];
+      return manualFile ? [manualFile] : [];
     }
-    
+
     console.log('\nFiles in current directory:');
     files.forEach((file, index) => {
-      const stats = fs.statSync(file);
-      const size = (stats.size / 1024).toFixed(1) + ' KB';
-      console.log(`${index + 1}. ${file} (${size})`);
+      try {
+        const stats = fs.statSync(file);
+        const size = (stats.size / 1024).toFixed(1) + ' KB';
+        console.log(`${index + 1}. ${file} (${size})`);
+      } catch (error) {
+        console.log(`${index + 1}. ${file} (unavailable)`);
+      }
     });
-    
-    const multipleFiles = await askQuestion(rl, '\nSelect multiple files? (y/N): ');
-    
-    if (multipleFiles.toLowerCase() === 'y' || multipleFiles.toLowerCase() === 'yes') {
-      return await selectMultipleFilesFromList(rl, files);
-    } else {
-      return await selectSingleFileFromList(rl, files);
+
+    while (true) {
+      const multipleFiles = await askQuestion(rl, '\nSelect multiple files? (y/N): ');
+      if (!multipleFiles) {
+        const selection = await selectSingleFileFromList(rl, files);
+        if (selection.length > 0) {
+          return selection;
+        }
+      } else {
+        const normalized = multipleFiles.toLowerCase();
+        if (normalized === 'y' || normalized === 'yes') {
+          const selection = await selectMultipleFilesFromList(rl, files);
+          if (selection.length > 0) {
+            return selection;
+          }
+        } else if (normalized === 'n' || normalized === 'no') {
+          const selection = await selectSingleFileFromList(rl, files);
+          if (selection.length > 0) {
+            return selection;
+          }
+        } else {
+          console.log('Please answer with y or n.');
+          continue;
+        }
+      }
+
+      console.log('No files selected. Returning to file list.');
+      break;
     }
-  } catch (error) {
-    console.log('Error reading directory.');
-    const manualFile = await askQuestion(rl, 'Enter file path manually: ');
-    return [manualFile];
   }
 }
 
 async function selectMultipleFilesFromList(rl, files) {
-  console.log('Enter file numbers separated by commas (e.g., 1,3,5) or ranges (e.g., 1-3):');
-  const fileIndices = await askQuestion(rl, 'File numbers: ');
-  
-  const selectedIndices = [];
-  const parts = fileIndices.split(',');
-  
-  for (const part of parts) {
-    const trimmed = part.trim();
-    if (trimmed.includes('-')) {
-      // Handle range (e.g., 1-3)
-      const [start, end] = trimmed.split('-').map(n => parseInt(n.trim()));
-      for (let i = start; i <= end; i++) {
-        selectedIndices.push(i - 1); // Convert to 0-based index
+  console.log('Enter file numbers separated by commas (e.g., 1,3,5) or ranges (e.g., 1-3). Type ".." or "back" to cancel.');
+  while (true) {
+    const fileIndices = await askQuestion(rl, 'File numbers: ');
+    if (!fileIndices) {
+      return [];
+    }
+    if (fileIndices === '..' || fileIndices.toLowerCase() === 'back') {
+      return [];
+    }
+
+    const selectedIndices = [];
+    const parts = fileIndices.split(',');
+
+    for (const part of parts) {
+      const trimmed = part.trim();
+      if (!trimmed) {
+        continue;
+      }
+      if (trimmed.includes('-')) {
+        const [startStr, endStr] = trimmed.split('-').map(n => n.trim());
+        const start = Number.parseInt(startStr, 10);
+        const end = Number.parseInt(endStr, 10);
+        if (Number.isNaN(start) || Number.isNaN(end)) {
+          continue;
+        }
+        const rangeStart = Math.min(start, end);
+        const rangeEnd = Math.max(start, end);
+        for (let i = rangeStart; i <= rangeEnd; i++) {
+          selectedIndices.push(i - 1);
+        }
+      } else {
+        const parsed = Number.parseInt(trimmed, 10);
+        if (!Number.isNaN(parsed)) {
+          selectedIndices.push(parsed - 1);
+        }
       }
-    } else {
-      // Handle single number
-      selectedIndices.push(parseInt(trimmed) - 1); // Convert to 0-based index
     }
+
+    const uniqueIndices = [...new Set(selectedIndices)].filter(
+      index => index >= 0 && index < files.length
+    );
+
+    if (uniqueIndices.length === 0) {
+      console.log('No valid file selections. Please try again.');
+      continue;
+    }
+
+    return uniqueIndices.map(index => files[index]);
   }
-  
-  // Remove duplicates and filter valid indices
-  const uniqueIndices = [...new Set(selectedIndices)].filter(
-    index => index >= 0 && index < files.length
-  );
-  
-  if (uniqueIndices.length === 0) {
-    console.log('No valid file selections.');
-    const manualFile = await askQuestion(rl, 'Enter file path manually: ');
-    return [manualFile];
-  }
-  
-  return uniqueIndices.map(index => files[index]);
 }
 
 async function selectSingleFileFromList(rl, files) {
-  const fileIndex = await askQuestion(rl, '\nEnter file number: ');
-  const selectedFileIndex = parseInt(fileIndex) - 1;
-  
-  if (selectedFileIndex >= 0 && selectedFileIndex < files.length) {
-    return [files[selectedFileIndex]];
-  } else {
-    console.log('Invalid file selection.');
-    const manualFile = await askQuestion(rl, 'Enter file path manually: ');
-    return [manualFile];
+  while (true) {
+    const fileIndex = await askQuestion(rl, '\nEnter file number (or ".." to cancel): ');
+    if (!fileIndex) {
+      console.log('Please enter a file number or ".." to cancel.');
+      continue;
+    }
+    if (fileIndex === '..' || fileIndex.toLowerCase() === 'back') {
+      return [];
+    }
+
+    const selectedFileIndex = Number.parseInt(fileIndex, 10) - 1;
+    if (Number.isNaN(selectedFileIndex)) {
+      console.log('Please enter a valid number.');
+      continue;
+    }
+
+    if (selectedFileIndex >= 0 && selectedFileIndex < files.length) {
+      return [files[selectedFileIndex]];
+    }
+
+    console.log('Invalid file selection. Please try again.');
   }
 }

package/lib/interactive.js

@@ -63,27 +63,38 @@ function askQuestionWithValidation(rl, question, validator, errorMessage) {
 /**
  * Ask for confirmation (Y/n format)
  */
-async function askConfirmation(rl, question, defaultYes = true) {
+async function askConfirmation(rl, question, defaultYes = true, options = {}) {
+  const { requireExplicit = false } = options;
   const suffix = defaultYes ? " (Y/n)" : " (y/N)";
-  const answer = await askQuestion(rl, question + suffix + ": ");
 
-  const lower = answer.toLowerCase();
-  
-  // If user presses Enter → return defaultYes (true by default)
-  if (lower === "") {
-    return defaultYes;
-  }
+  while (true) {
+    const answer = await askQuestion(rl, question + suffix + ": ");
+    const lower = answer.toLowerCase();
 
-  // Convert input to boolean
-  if (lower === "y" || lower === "yes") {
-    return true;
-  }
-  if (lower === "n" || lower === "no") {
-    return false;
-  }
+    // If user presses Enter → return defaultYes (true by default)
+    if (lower === "") {
+      if (!requireExplicit) {
+        return defaultYes;
+      }
+      console.log(chalk.yellow('Please enter "y" or "n" to confirm.'));
+      continue;
+    }
+
+    // Convert input to boolean
+    if (lower === "y" || lower === "yes") {
+      return true;
+    }
+    if (lower === "n" || lower === "no") {
+      return false;
+    }
+
+    if (!requireExplicit) {
+      // If input is something else, fallback to defaultYes
+      return defaultYes;
+    }
 
-  // If input is something else, fallback to defaultYes
-  return defaultYes;
+    console.log(chalk.yellow('Please enter "y" or "n" to confirm.'));
+  }
 }
 
 /**
@@ -495,25 +506,23 @@ async function selectFilesKeyboard(rl, currentDir = process.cwd()) {
     return chalk.yellow('📂 ') + breadcrumb;
   }
 
+  // Helper to clear the terminal without dropping scrollback history
+  function safeClearScreen() {
+    if (!process.stdout.isTTY) return;
+
+    process.stdout.write('\x1b[H\x1b[J'); // Move cursor to top and clear below, not full console.clear()
+
+  }
+
   // Helper function to display the file browser
   function displayBrowser() {
-    // Header with keyboard controls at the top
-    console.log(chalk.cyan.bold('╭' + '─'.repeat(100) + '╮'));
-    console.log(chalk.cyan.bold('│') + chalk.white.bold(' Keyboard File Selector'.padEnd(98)) + chalk.cyan.bold('│'));    console.log(chalk.cyan.bold('├' + '─'.repeat(100) + '┤'));
+    safeClearScreen();
     // Keyboard controls - compact format at top
     const controls = [
-      '↑↓←→:Navigate', 'Space:Select', 'Enter:Open/Finish', 'Backspace:Up', 'a:All', 'c:Clear', 'Esc:Exit'
     ];
-    const controlLine = controls.map(c => {
-      const [key, desc] = c.split(':');
-      return chalk.white(key) + chalk.gray(':') + chalk.gray(desc);
-    }).join(chalk.gray(' │ '));
-    console.log(chalk.cyan.bold('│ ') + controlLine.padEnd(98) + chalk.cyan.bold(' │'));
-    console.log(chalk.cyan.bold('╰' + '─'.repeat(100) + '╯'));
-    
-    console.log();
       // Breadcrumb path
     console.log(buildBreadcrumb());
+    console.log(chalk.gray('💡 ↑↓←→:Navigate', 'Space:Select', 'Enter:Open/Finish', 'Backspace:Up', 'a:All', 'c:Clear', 'Esc:Exit'));
     
     // Selected files count
     if (selectedFiles.length > 0) {
@@ -525,12 +534,10 @@ async function selectFilesKeyboard(rl, currentDir = process.cwd()) {
         }
       }, 0);
       console.log(chalk.green(`✅ Selected: ${selectedFiles.length} files (${(totalSize / 1024).toFixed(1)} KB) - Press Enter to finish`));
-    } else {
-      console.log(chalk.gray('💡 Use Space to select files, then press Enter to finish'));
     }
-    
+
     console.log();
-    
+
     if (fileList.length === 0) {
       console.log(chalk.yellow('📭 No files found in this directory.'));
       return;
@@ -879,4 +886,4 @@ export {
   getFilesMatchingWildcard,
   getSubfoldersRecursive,
   pad
-};
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "canvaslms-cli",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "description": "A command line tool for interacting with Canvas LMS API",
   "keywords": [
     "canvas",