@mo7yw4ng/openape 1.0.2 → 1.0.3

package/README.md

@@ -1,4 +1,7 @@
-# OpenApe CLI (Unofficial)
+<h1 align="center">
+  <img src="assets/logo.svg" width="150" /><br/>
+  OpenApe CLI (Unofficial)
+</h1>
 
 中原大學 [i-Learning](https://ilearning.cycu.edu.tw/) (Moodle) 平台自動化命令列工具 (CLI)，幫助你快速查詢課程、觀看影片、下載教材。
 
@@ -6,7 +9,7 @@
 - 📚 **課程資訊**：列出修課清單、成績、課程大綱與進度。
 - 📺 **影片輔助**：列出/下載影片，甚至自動標記為已觀看。
 - 📝 **測驗與教材**：快速查看測驗、下載教材。
-- 💬 **討論區與公告**：在終端機直接閱讀公告與討論區。
+- 💬 **討論區與公告**：閱讀公告與討論區。
 - 📅 **行事曆**：內建行事曆事件查詢與匯出。
 - 🤖 **Agent Skills**：提供 Claude Code 等 Skills 工作流支援。
 
@@ -33,8 +36,8 @@ deno install -A -g -n openape jsr:@openape/openape
 第一次使用需要登入，會開啟瀏覽器讓你手動完成登入，隨後會快取 Session 供未來使用。
 ```bash
 openape login          # 登入並儲存 session (開啟瀏覽器)
-openape auth status    # 檢查當前登入狀態
-openape auth logout    # 登出並清除 session
+openape status         # 檢查當前登入狀態
+openape logout         # 登出並清除 session
 ```
 
 ### 課程 (Courses)
@@ -42,7 +45,7 @@ openape auth logout    # 登出並清除 session
 openape courses list               # 列出所有課程 (支援 --incomplete-only, --level)
 openape courses info <id>          # 顯示特定課程的詳細資訊
 openape courses progress <id>      # 顯示特定課程的進度
-openape courses syllabus <id>      # 顯示課程大綱 (從 CMAP 取得)
+openape courses syllabus <id>      # 顯示課程大綱
 ```
 
 ### 影片 (Videos)

package/esm/deno.js

@@ -1,6 +1,6 @@
 export default {
     "name": "@openape/openape",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "description": "CLI tool for CYCU i-Learning platform",
     "license": "MIT",
     "exports": "./src/index.ts",

package/esm/src/commands/auth.d.ts

@@ -1,3 +1,3 @@
 import { Command } from "commander";
-export declare function registerAuthCommand(program: Command): void;
+export declare function registerCommand(program: Command): void;
 //# sourceMappingURL=auth.d.ts.map

package/esm/src/commands/auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../src/src/commands/auth.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAUpC,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAyQ1D"}
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../src/src/commands/auth.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAUpC,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAoQtD"}

package/esm/src/commands/auth.js

@@ -5,10 +5,7 @@ import { findEdgePath } from "../lib/auth.js";
 import { saveSesskey, acquireWsToken, saveWsToken } from "../lib/token.js";
 import path from "node:path";
 import fs from "node:fs";
-export function registerAuthCommand(program) {
-    const authCmd = program.command("auth");
-    authCmd.description("Authentication commands");
-    // Register login directly on program (not under auth subcommand)
+export function registerCommand(program) {
     program
         .command("login")
         .description("Login to iLearning manually and save session")
@@ -186,8 +183,7 @@ export function registerAuthCommand(program) {
             await new Promise(resolve => setTimeout(resolve, 500));
         }
     });
-    // auth subcommand group (for status and other auth-related commands)
-    authCmd
+    program
         .command("status")
         .description("Check session status")
         .option("--session <path>", "Session file path", ".auth/storage-state.json")
@@ -236,7 +232,7 @@ export function registerAuthCommand(program) {
             console.log(JSON.stringify(result, null, 2));
         }
     });
-    authCmd
+    program
         .command("logout")
         .description("Remove saved session")
         .option("--session <path>", "Session file path", ".auth/storage-state.json")

package/esm/src/commands/forums.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"forums.d.ts","sourceRoot":"","sources":["../../../src/src/commands/forums.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAiBpC,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA0Q5D"}
+{"version":3,"file":"forums.d.ts","sourceRoot":"","sources":["../../../src/src/commands/forums.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAkBpC,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA6P5D"}

package/esm/src/commands/forums.js

@@ -68,6 +68,7 @@ export function registerForumsCommand(program) {
                     cmid: wsForum.cmid.toString(),
                     forum_id: wsForum.id,
                     name: wsForum.name,
+                    timemodified: wsForum.timemodified,
                     // url: `https://ilearning.cycu.edu.tw/mod/forum/view.php?id=${wsForum.cmid}`,
                 });
             }
@@ -111,7 +112,7 @@ export function registerForumsCommand(program) {
                     cmid: wsForum.cmid.toString(),
                     forum_id: wsForum.id,
                     name: wsForum.name,
-                    url: `https://ilearning.cycu.edu.tw/mod/forum/view.php?id=${wsForum.cmid}`,
+                    timemodified: wsForum.timemodified,
                 });
             }
         }
@@ -131,7 +132,6 @@ export function registerForumsCommand(program) {
         .description("List discussions in a forum (use forum ID)")
         .argument("<forum-id>", "Forum ID")
         .option("--output <format>", "Output format: json|csv|table|silent")
-        .option("--msg", "Include message content in response")
         .action(async (forumId, options, command) => {
         const apiContext = await createApiContext(options, command);
         if (!apiContext) {
@@ -162,20 +162,15 @@ export function registerForumsCommand(program) {
             forum_name: targetForum.name,
             course_id: course?.id,
             course_name: course?.fullname,
-            discussions: discussions.map(d => {
-                const discussion = {
-                    id: d.id,
-                    name: d.name,
-                    user_id: d.userId,
-                    time_modified: d.timeModified,
-                    post_count: d.postCount,
-                    unread: d.unread,
-                };
-                if (options.msg) {
-                    discussion.message = stripHtmlTags(d.message || "");
-                }
-                return discussion;
-            }),
+            discussions: discussions.map(d => ({
+                id: d.id,
+                name: d.name,
+                user_id: d.userId,
+                time_modified: d.timeModified,
+                post_count: d.postCount,
+                unread: d.unread,
+                message: (stripHtmlTags(d.message || "")).substring(0, 250) + "...",
+            })),
             summary: {
                 total_discussions: discussions.length,
             },

package/esm/src/commands/materials.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"materials.d.ts","sourceRoot":"","sources":["../../../src/src/commands/materials.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA+BpC,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAka/D"}
+{"version":3,"file":"materials.d.ts","sourceRoot":"","sources":["../../../src/src/commands/materials.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAgCpC,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAqlB/D"}

package/esm/src/commands/materials.js

@@ -1,20 +1,16 @@
-import { getBaseDir } from "../lib/utils.js";
-import { getEnrolledCourses, getEnrolledCoursesApi, getResourcesByCoursesApi } from "../lib/moodle.js";
+import { getBaseDir, getOutputFormat, sanitizeFilename } from "../lib/utils.js";
+import { getEnrolledCourses, getEnrolledCoursesApi, getResourcesByCoursesApi, updateActivityCompletionStatusManually, getSiteInfoApi, moodleApiCall } from "../lib/moodle.js";
 import { createLogger } from "../lib/logger.js";
 import { launchAuthenticated } from "../lib/auth.js";
 import { extractSessionInfo } from "../lib/session.js";
 import { closeBrowserSafely } from "../lib/auth.js";
+import { formatAndOutput } from "../index.js";
 import { loadWsToken } from "../lib/token.js";
 import path from "node:path";
 import fs from "node:fs";
 export function registerMaterialsCommand(program) {
     const materialsCmd = program.command("materials");
     materialsCmd.description("Material/resource operations");
-    // Helper to get output format from global or local options
-    function getOutputFormat(command) {
-        const opts = command.optsWithGlobals();
-        return opts.output || "json";
-    }
     // Pure API context - no browser required (fast!)
     async function createApiContext(options, command) {
         const opts = command?.optsWithGlobals ? command.optsWithGlobals() : options;
@@ -77,10 +73,6 @@ export function registerMaterialsCommand(program) {
             throw err;
         }
     }
-    // Helper to sanitize filenames
-    function sanitizeFilename(name) {
-        return name.replace(/[<>:"/\\|?*]/g, "_").replace(/\s+/g, "_");
-    }
     // Helper to download a single resource
     async function downloadResource(page, resource, outputDir, log) {
         try {
@@ -359,4 +351,172 @@ export function registerMaterialsCommand(program) {
             await closeBrowserSafely(browser, browserContext);
         }
     });
+    materialsCmd
+        .command("complete")
+        .description("Mark all incomplete resources (non-video) as complete in a course")
+        .argument("<course-id>", "Course ID")
+        .option("--dry-run", "Show what would be marked complete without doing it")
+        .option("--output <format>", "Output format: json|csv|table|silent")
+        .action(async (courseId, options, command) => {
+        const output = getOutputFormat(command);
+        const apiContext = await createApiContext(options, command);
+        if (!apiContext) {
+            process.exitCode = 1;
+            return;
+        }
+        try {
+            const { log, session } = apiContext;
+            // Get user ID
+            const siteInfo = await getSiteInfoApi(session);
+            // Get completion status for all activities in the course
+            const completionData = await moodleApiCall(session, "core_completion_get_activities_completion_status", { courseid: parseInt(courseId, 10), userid: siteInfo.userid });
+            if (!completionData?.statuses) {
+                log.info("No activities found in this course.");
+                return;
+            }
+            // Filter for resources (non-video) that have completion enabled but are not complete
+            const incompleteResources = completionData.statuses.filter((status) => {
+                // Only resources, not supervideo
+                if (status.modname === "supervideo")
+                    return false;
+                // Must have completion enabled
+                if (!status.hascompletion)
+                    return false;
+                // Must be incomplete
+                if (status.isoverallcomplete)
+                    return false;
+                return true;
+            });
+            if (incompleteResources.length === 0) {
+                log.info("All resources are already complete (or no resources with completion tracking).");
+                return;
+            }
+            log.info(`Found ${incompleteResources.length} incomplete resources to complete:`);
+            for (const resource of incompleteResources) {
+                log.info(`  - ${resource.name} (cmid: ${resource.cmid})`);
+            }
+            if (options.dryRun) {
+                log.info("\n[Dry run] No changes made.");
+                return;
+            }
+            // Mark each resource as complete
+            const results = [];
+            for (const resource of incompleteResources) {
+                const success = await updateActivityCompletionStatusManually(session, resource.cmid, true);
+                results.push({
+                    cmid: resource.cmid,
+                    name: resource.name,
+                    success,
+                });
+                if (success) {
+                    log.success(`  ✓ Completed: ${resource.name}`);
+                }
+                else {
+                    log.error(`  ✗ Failed: ${resource.name}`);
+                }
+            }
+            const completed = results.filter(r => r.success).length;
+            const failed = results.filter(r => !r.success).length;
+            log.info(`\n執行結果: ${completed} 成功, ${failed} 失敗`);
+            if (output !== "silent") {
+                formatAndOutput(results, output, log);
+            }
+        }
+        catch (e) {
+            apiContext.log.error(`Error: ${e instanceof Error ? e.message : String(e)}`);
+            process.exitCode = 1;
+        }
+    });
+    materialsCmd
+        .command("complete-all")
+        .description("Mark all incomplete resources (non-video) as complete across all in-progress courses")
+        .option("--dry-run", "Show what would be marked complete without doing it")
+        .option("--level <type>", "Course level: in_progress (default) | all", "in_progress")
+        .option("--output <format>", "Output format: json|csv|table|silent")
+        .action(async (options, command) => {
+        const output = getOutputFormat(command);
+        const apiContext = await createApiContext(options, command);
+        if (!apiContext) {
+            process.exitCode = 1;
+            return;
+        }
+        try {
+            const { log, session } = apiContext;
+            // Get user ID
+            const siteInfo = await getSiteInfoApi(session);
+            // Get all courses
+            const classification = options.level === "all" ? undefined : "inprogress";
+            const courses = await getEnrolledCoursesApi(session, { classification });
+            log.info(`Scanning ${courses.length} courses for incomplete resources...`);
+            const allResults = [];
+            let totalIncomplete = 0;
+            for (const course of courses) {
+                try {
+                    // Get completion status for all activities in the course
+                    const completionData = await moodleApiCall(session, "core_completion_get_activities_completion_status", { courseid: course.id, userid: siteInfo.userid });
+                    if (!completionData?.statuses)
+                        continue;
+                    // Filter for resources (non-video) that have completion enabled but are not complete
+                    const incompleteResources = completionData.statuses.filter((status) => {
+                        if (status.modname === "supervideo")
+                            return false;
+                        if (!status.hascompletion)
+                            return false;
+                        if (status.isoverallcomplete)
+                            return false;
+                        return true;
+                    });
+                    if (incompleteResources.length > 0) {
+                        log.info(`\n${course.fullname}: ${incompleteResources.length} incomplete resources`);
+                        totalIncomplete += incompleteResources.length;
+                        if (options.dryRun) {
+                            for (const resource of incompleteResources) {
+                                log.info(`  - ${resource.name} (cmid: ${resource.cmid})`);
+                            }
+                        }
+                        else {
+                            for (const resource of incompleteResources) {
+                                const success = await updateActivityCompletionStatusManually(session, resource.cmid, true);
+                                allResults.push({
+                                    courseId: course.id,
+                                    courseName: course.fullname,
+                                    cmid: resource.cmid,
+                                    name: resource.name,
+                                    success,
+                                });
+                                if (success) {
+                                    log.success(`  ✓ Completed: ${resource.name}`);
+                                }
+                                else {
+                                    log.error(`  ✗ Failed: ${resource.name}`);
+                                }
+                            }
+                        }
+                    }
+                }
+                catch (e) {
+                    log.warn(`Failed to process course ${course.fullname}: ${e}`);
+                }
+            }
+            if (totalIncomplete === 0) {
+                log.info("\nAll resources are already complete (or no resources with completion tracking).");
+                return;
+            }
+            if (options.dryRun) {
+                log.info(`\n[Dry run] Found ${totalIncomplete} incomplete resources across ${courses.length} courses.`);
+                log.info("Run without --dry-run to mark them as complete.");
+                return;
+            }
+            const completed = allResults.filter(r => r.success).length;
+            const failed = allResults.filter(r => !r.success).length;
+            log.info(`\n執行結果: ${completed} 成功, ${failed} 失敗`);
+            if (output !== "silent") {
+                formatAndOutput(allResults, output, log);
+            }
+        }
+        catch (e) {
+            apiContext.log.error(`Error: ${e instanceof Error ? e.message : String(e)}`);
+            process.exitCode = 1;
+        }
+    });
 }

package/esm/src/commands/videos.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"videos.d.ts","sourceRoot":"","sources":["../../../src/src/commands/videos.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAYpC,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAuV5D"}
+{"version":3,"file":"videos.d.ts","sourceRoot":"","sources":["../../../src/src/commands/videos.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAYpC,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA+X5D"}

package/esm/src/commands/videos.js

@@ -1,5 +1,5 @@
-import { getBaseDir } from "../lib/utils.js";
-import { getEnrolledCourses, getSupervideosInCourse, getSupervideosInCourseApi, getVideoMetadata, completeVideo, downloadVideo } from "../lib/moodle.js";
+import { getBaseDir, getOutputFormat, sanitizeFilename } from "../lib/utils.js";
+import { getEnrolledCoursesApi, getSupervideosInCourse, getSupervideosInCourseApi, getVideoMetadata, completeVideoApi, downloadVideo, getIncompleteVideosApi } from "../lib/moodle.js";
 import { createLogger } from "../lib/logger.js";
 import { launchAuthenticated } from "../lib/auth.js";
 import { extractSessionInfo } from "../lib/session.js";
@@ -11,15 +11,11 @@ import fs from "node:fs";
 export function registerVideosCommand(program) {
     const videosCmd = program.command("videos");
     videosCmd.description("Video progress operations");
-    // Helper to get output format from global or local options
-    function getOutputFormat(command) {
-        const opts = command.optsWithGlobals();
-        return opts.output || "json";
-    }
     // Pure API context - no browser required (fast!)
     async function createApiContext(options, command) {
         const opts = command?.optsWithGlobals ? command.optsWithGlobals() : options;
-        const outputFormat = getOutputFormat(command || { optsWithGlobals: () => ({ output: "json" }) });
+        // Don't silence logs for commands that don't have explicit output format control
+        const outputFormat = command && command.optsWithGlobals ? getOutputFormat(command) : "table";
         const silent = outputFormat === "json" && !opts.verbose;
         const log = createLogger(opts.verbose, silent);
         const baseDir = getBaseDir();
@@ -91,46 +87,61 @@ export function registerVideosCommand(program) {
             process.exitCode = 1;
             return;
         }
-        const videos = await getSupervideosInCourseApi(apiContext.session, parseInt(courseId, 10));
-        // Note: API doesn't provide completion status, so --incomplete-only shows all
+        let videos = await getSupervideosInCourseApi(apiContext.session, parseInt(courseId, 10));
+        // Filter for incomplete videos if requested
         if (options.incompleteOnly) {
-            apiContext.log.warn("--incomplete-only is not supported in API mode, showing all videos");
+            videos = videos.filter(v => !v.isComplete);
         }
         formatAndOutput(videos, output, apiContext.log);
     });
     videosCmd
         .command("complete")
-        .description("Complete videos in a course (requires browser)")
+        .description("Complete videos in a course (uses API for list & completion, browser for metadata)")
         .argument("<course-id>", "Course ID")
         .option("--dry-run", "Discover videos but don't complete them")
         .option("--output <format>", "Output format: json|csv|table|silent")
         .action(async (courseId, options, command) => {
+        const output = getOutputFormat(command);
+        // Get API context for getting incomplete videos and completion
+        const apiContext = await createApiContext(options, command);
+        if (!apiContext) {
+            process.exitCode = 1;
+            return;
+        }
+        // Get incomplete videos via API (fast, no browser needed)
+        const incompleteVideos = await getIncompleteVideosApi(apiContext.session, parseInt(courseId, 10));
+        if (incompleteVideos.length === 0) {
+            apiContext.log.info("所有影片已完成（或無影片）。");
+            return;
+        }
+        apiContext.log.info(`找到 ${incompleteVideos.length} 部未完成影片`);
+        // Dry-run: show videos without needing browser
+        if (options.dryRun) {
+            const results = incompleteVideos.map(v => ({ name: v.name, success: true }));
+            for (const video of incompleteVideos) {
+                apiContext.log.info(`  [試執行] ${video.name}`);
+            }
+            apiContext.log.info(`\n執行結果: ${results.length} 影片將被完成`);
+            if (output !== "silent") {
+                formatAndOutput(results, output, apiContext.log);
+            }
+            return;
+        }
+        // Need browser only for getting viewId and duration (not needed for dry-run)
         const context = await createSessionContext(options, command);
         if (!context) {
             process.exitCode = 1;
             return;
         }
-        const { log, page, session, browser, context: browserContext } = context;
-        const output = getOutputFormat(command);
+        const { log, page, browser, context: browserContext } = context;
         try {
-            const videos = await getSupervideosInCourse(page, session, parseInt(courseId, 10), log, {
-                incompleteOnly: true, // Only operate on incomplete videos
-            });
-            if (videos.length === 0) {
-                log.info("所有影片已完成（或無影片）。");
-                return;
-            }
             const results = [];
-            for (const sv of videos) {
+            for (const sv of incompleteVideos) {
                 log.info(`處理中: ${sv.name}`);
                 try {
                     const video = await getVideoMetadata(page, sv.url, log);
-                    if (options.dryRun) {
-                        log.info(`  [試執行] viewId=${video.viewId}, duration=${video.duration}s`);
-                        results.push({ name: sv.name, success: true });
-                        continue;
-                    }
-                    const success = await completeVideo(page, session, { ...video, cmid: sv.cmid }, log);
+                    // Use WS API for completion
+                    const success = await completeVideoApi(apiContext.session, { ...video, cmid: sv.cmid.toString() });
                     if (success) {
                         log.success(`  已完成！`);
                         results.push({ name: sv.name, success: true });
@@ -159,65 +170,94 @@ export function registerVideosCommand(program) {
     });
     videosCmd
         .command("complete-all")
-        .description("Complete all incomplete videos across all courses (requires browser)")
+        .description("Complete all incomplete videos across all courses (uses API for list & completion, browser for metadata)")
         .option("--dry-run", "Discover videos but don't complete them")
         .option("--output <format>", "Output format: json|csv|table|silent")
         .action(async (options, command) => {
+        const output = getOutputFormat(command);
+        // Get API context for getting incomplete videos and completion
+        const apiContext = await createApiContext(options, command);
+        if (!apiContext) {
+            process.exitCode = 1;
+            return;
+        }
+        // Get all courses via API
+        const classification = undefined; // all courses
+        const courses = await getEnrolledCoursesApi(apiContext.session, { classification });
+        apiContext.log.info(`掃描 ${courses.length} 個課程...`);
+        // Collect all incomplete videos across all courses using flatMap for cleaner code
+        const allIncompleteVideos = (await Promise.allSettled(courses.map(async (course) => {
+            try {
+                const videos = await getIncompleteVideosApi(apiContext.session, course.id);
+                return videos.map((video) => ({
+                    courseId: course.id,
+                    courseName: course.fullname,
+                    cmid: video.cmid,
+                    name: video.name,
+                    url: video.url,
+                }));
+            }
+            catch (e) {
+                apiContext.log.warn(`無法取得課程 ${course.fullname} 的影片: ${e}`);
+                return [];
+            }
+        })))
+            .filter((result) => result.status === "fulfilled")
+            .flatMap((result) => result.status === "fulfilled" ? result.value : []);
+        if (allIncompleteVideos.length === 0) {
+            apiContext.log.info("所有影片已完成（或無影片）。");
+            return;
+        }
+        apiContext.log.info(`找到 ${allIncompleteVideos.length} 部未完成影片`);
+        // Dry-run: show videos without needing browser
+        if (options.dryRun) {
+            for (const video of allIncompleteVideos) {
+                apiContext.log.info(`  [試執行] [${video.courseName}] ${video.name}`);
+            }
+            apiContext.log.info("\n===== 執行結果 =====");
+            apiContext.log.info(`掃描課程數: ${courses.length}`);
+            apiContext.log.info(`找到未完成影片: ${allIncompleteVideos.length}`);
+            apiContext.log.info(`執行影片數: ${allIncompleteVideos.length} (試執行)`);
+            return;
+        }
+        // Need browser only for getting viewId and duration (not needed for dry-run)
         const context = await createSessionContext(options, command);
         if (!context) {
             process.exitCode = 1;
             return;
         }
-        const { log, page, session, browser, context: browserContext } = context;
-        const output = getOutputFormat(command);
+        const { log, page, browser, context: browserContext } = context;
         try {
-            const courses = await getEnrolledCourses(page, session, log);
             const allResults = [];
-            let totalVideos = 0;
             let totalCompleted = 0;
             let totalFailed = 0;
-            for (const course of courses) {
-                log.info(`\n======================================`);
-                log.info(`課程: ${course.fullname}`);
-                log.info(`======================================`);
-                const videos = await getSupervideosInCourse(page, session, course.id, log);
-                if (videos.length === 0) {
-                    log.info("  所有影片已完成（或無影片）。");
-                    continue;
-                }
-                totalVideos += videos.length;
-                for (const sv of videos) {
-                    log.info(`  處理中: ${sv.name}`);
-                    try {
-                        const video = await getVideoMetadata(page, sv.url, log);
-                        if (options.dryRun) {
-                            log.info(`    [試執行] viewId=${video.viewId}, duration=${video.duration}s`);
-                            allResults.push({ courseName: course.fullname, name: sv.name, success: true });
-                            continue;
-                        }
-                        const success = await completeVideo(page, session, { ...video, cmid: sv.cmid }, log);
-                        if (success) {
-                            log.success(`    已完成！`);
-                            allResults.push({ courseName: course.fullname, name: sv.name, success: true });
-                            totalCompleted++;
-                        }
-                        else {
-                            log.error(`    失敗。`);
-                            allResults.push({ courseName: course.fullname, name: sv.name, success: false, error: "Failed to complete" });
-                            totalFailed++;
-                        }
+            for (const video of allIncompleteVideos) {
+                log.info(`處理中: [${video.courseName}] ${video.name}`);
+                try {
+                    const metadata = await getVideoMetadata(page, video.url, log);
+                    // Use WS API for completion
+                    const success = await completeVideoApi(apiContext.session, { ...metadata, cmid: video.cmid.toString() });
+                    if (success) {
+                        log.success(`  已完成！`);
+                        allResults.push({ courseName: video.courseName, name: video.name, success: true });
+                        totalCompleted++;
                     }
-                    catch (err) {
-                        const msg = err instanceof Error ? err.message : String(err);
-                        log.error(`    錯誤: ${msg}`);
-                        allResults.push({ courseName: course.fullname, name: sv.name, success: false, error: msg });
+                    else {
+                        log.error(`  失敗。`);
+                        allResults.push({ courseName: video.courseName, name: video.name, success: false, error: "Failed to complete" });
                         totalFailed++;
                     }
                 }
+                catch (err) {
+                    const msg = err instanceof Error ? err.message : String(err);
+                    log.error(`  錯誤: ${msg}`);
+                    allResults.push({ courseName: video.courseName, name: video.name, success: false, error: msg });
+                    totalFailed++;
+                }
             }
             log.info("\n===== 執行結果 =====");
             log.info(`掃描課程數: ${courses.length}`);
-            log.info(`掃描影片數: ${totalVideos}`);
+            log.info(`找到未完成影片: ${allIncompleteVideos.length}`);
             log.info(`執行影片數: ${totalCompleted}`);
             if (totalFailed > 0)
                 log.warn(`失敗影片數: ${totalFailed}`);
@@ -229,13 +269,6 @@ export function registerVideosCommand(program) {
             await closeBrowserSafely(browser, browserContext);
         }
     });
-    // Helper function to sanitize filename
-    function sanitizeFilename(name) {
-        return name
-            .replace(/[<>:"/\\|?*]/g, "_")
-            .replace(/\s+/g, "_")
-            .substring(0, 200);
-    }
     videosCmd
         .command("download")
         .description("Download videos from a course (requires browser)")

package/esm/src/index.js

@@ -11,7 +11,7 @@ import denoJson from "../deno.js";
 import { registerCoursesCommand } from "./commands/courses.js";
 import { registerVideosCommand } from "./commands/videos.js";
 import { registerQuizzesCommand } from "./commands/quizzes.js";
-import { registerAuthCommand } from "./commands/auth.js";
+import { registerCommand } from "./commands/auth.js";
 import { registerMaterialsCommand } from "./commands/materials.js";
 import { registerGradesCommand } from "./commands/grades.js";
 import { registerForumsCommand } from "./commands/forums.js";
@@ -32,7 +32,7 @@ program
     .option("--silent", "Suppress all log output (JSON only)")
     .option("--headed", "Run browser in visible mode");
 // Register subcommands
-registerAuthCommand(program);
+registerCommand(program);
 registerCoursesCommand(program);
 registerVideosCommand(program);
 registerQuizzesCommand(program);