@learnpack/learnpack 5.0.343 → 5.0.344

package/lib/commands/serve.js

@@ -108,6 +108,161 @@ const uploadFileToBucket = async (bucket, file, path) => {
     const fileRef = bucket.file(path);
     await fileRef.save(buffer_1.Buffer.from(content, "utf8"));
 };
+const uploadBinaryToBucket = async (bucket, buffer, path, contentType) => {
+    const fileRef = bucket.file(path);
+    await fileRef.save(buffer, Object.assign({ resumable: false }, (contentType && { contentType })));
+};
+const getGithubCredentials = () => {
+    var _a, _b;
+    const token = (_a = process.env.GITHUB_TOKEN) === null || _a === void 0 ? void 0 : _a.trim();
+    const username = (_b = process.env.GITHUB_USERNAME) === null || _b === void 0 ? void 0 : _b.trim();
+    return { token, username, isConfigured: Boolean(token && username) };
+};
+const GITHUB_RETRY_DELAYS_MS = [250, 600, 1200];
+const wait = (ms) => new Promise(resolve => {
+    setTimeout(resolve, ms);
+});
+const getGithubErrorStatus = (error) => { var _a; return (_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.status; };
+const getGithubErrorData = (error) => { var _a; return ((_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.data) || {}; };
+const getGithubErrorMessage = (error) => {
+    const data = getGithubErrorData(error);
+    if (typeof (data === null || data === void 0 ? void 0 : data.message) === "string") {
+        return data.message;
+    }
+    if (typeof (error === null || error === void 0 ? void 0 : error.message) === "string") {
+        return error.message;
+    }
+    return undefined;
+};
+const errorPayloadHasText = (payload, term) => {
+    if (!payload || !term)
+        return false;
+    try {
+        return JSON.stringify(payload).toLowerCase().includes(term.toLowerCase());
+    }
+    catch (_a) {
+        return false;
+    }
+};
+const isGithubPushProtectionConflict = (error) => {
+    if (getGithubErrorStatus(error) !== 409)
+        return false;
+    const message = (getGithubErrorMessage(error) || "").toLowerCase();
+    const data = getGithubErrorData(error);
+    return (message.includes("push protection") ||
+        message.includes("secret scanning") ||
+        message.includes("secret") ||
+        errorPayloadHasText(data === null || data === void 0 ? void 0 : data.errors, "push protection") ||
+        errorPayloadHasText(data === null || data === void 0 ? void 0 : data.errors, "secret"));
+};
+const isGithubRepoUnavailableConflict = (error) => {
+    if (getGithubErrorStatus(error) !== 409)
+        return false;
+    const message = (getGithubErrorMessage(error) || "").toLowerCase();
+    return (message.includes("empty or unavailable") ||
+        message.includes("repository is empty") ||
+        message.includes("repository is unavailable") ||
+        message.includes("currently being created"));
+};
+const shouldRetryGithubConflict = (error) => isGithubRepoUnavailableConflict(error) &&
+    !isGithubPushProtectionConflict(error);
+const toGithubOperationalError = (error, context) => {
+    if ((error === null || error === void 0 ? void 0 : error.isOperational) === true) {
+        return error;
+    }
+    const status = getGithubErrorStatus(error);
+    const data = getGithubErrorData(error);
+    const githubMessage = getGithubErrorMessage(error);
+    const details = Object.assign(Object.assign(Object.assign(Object.assign({ failedOperation: context.operation }, (context.failedPath ? { failedPath: context.failedPath } : {})), (context.repository ? { repository: context.repository } : {})), (context.repoCreated ? { repoCreated: true } : {})), { github: {
+            status,
+            message: githubMessage,
+            documentation_url: data === null || data === void 0 ? void 0 : data.documentation_url,
+            errors: data === null || data === void 0 ? void 0 : data.errors,
+        } });
+    let message = githubMessage ||
+        `GitHub request failed during operation "${context.operation}"`;
+    if (status === 422 && context.operation === "create_repo") {
+        message = context.repoName ?
+            `Repository "${context.repoName}" may already exist or name is invalid` :
+            "Repository may already exist or the requested name is invalid";
+    }
+    else if (status === 409 && isGithubPushProtectionConflict(error)) {
+        message = context.failedPath ?
+            `File blocked by push protection: ${context.failedPath}` :
+            "GitHub push protection blocked sensitive content during the initial commit";
+    }
+    else if (context.repoCreated && context.operation !== "create_repo") {
+        message =
+            "Repo created on GitHub, but the initial commit failed. Check the details and try again.";
+    }
+    if (status === 400)
+        return new errorHandler_1.ValidationError(message, details);
+    if (status === 404)
+        return new errorHandler_1.NotFoundError(message, details);
+    if (status === 409 || status === 422)
+        return new errorHandler_1.ConflictError(message, details);
+    return new errorHandler_1.InternalServerError(message, details);
+};
+const githubApiFetch = async (url, token, options = {}) => {
+    const res = await (0, axios_1.default)({
+        url,
+        method: options.method || "GET",
+        headers: {
+            Authorization: `token ${token}`,
+            Accept: "application/vnd.github.v3+json",
+        },
+        data: options.body,
+    });
+    return res.data;
+};
+const githubApiFetchWithContext = async (url, token, context, options = {}) => {
+    try {
+        return await githubApiFetch(url, token, options);
+    }
+    catch (error) {
+        throw toGithubOperationalError(error, context);
+    }
+};
+const githubApiFetchWithRetry = async (url, token, context, options = {}) => {
+    const attempts = context.retryOnUnavailableConflict ?
+        GITHUB_RETRY_DELAYS_MS.length + 1 :
+        1;
+    for (let attempt = 0; attempt < attempts; attempt++) {
+        try {
+            // eslint-disable-next-line no-await-in-loop -- Sequential processing to avoid rate limits
+            return await githubApiFetch(url, token, options);
+        }
+        catch (error) {
+            const canRetry = attempt < attempts - 1 && shouldRetryGithubConflict(error);
+            if (!canRetry) {
+                throw toGithubOperationalError(error, context);
+            }
+            // eslint-disable-next-line no-await-in-loop -- Sequential processing to avoid rate limits
+            await wait(GITHUB_RETRY_DELAYS_MS[attempt]);
+        }
+    }
+    throw new errorHandler_1.InternalServerError("GitHub request failed after retries", {
+        failedOperation: context.operation,
+        repository: context.repository,
+    });
+};
+const mapWithConcurrency = async (items, limit, mapper) => {
+    if (items.length === 0) {
+        return [];
+    }
+    const concurrency = Math.max(1, Math.min(limit, items.length));
+    const results = Array.from({ length: items.length });
+    let cursor = 0;
+    const worker = async () => {
+        let index;
+        while ((index = cursor++) < items.length) {
+            // eslint-disable-next-line no-await-in-loop -- intentional: each worker processes items sequentially
+            results[index] = await mapper(items[index], index);
+        }
+    };
+    await Promise.all(Array.from({ length: concurrency }, () => worker()));
+    return results;
+};
 const PARAMS = {
     expected_grade_level: "8",
     max_fkgl: 10,
@@ -361,6 +516,19 @@ const getConfigJSON = async (bucket, courseSlug) => {
     const [content] = await configFile.download();
     return JSON.parse(content.toString());
 };
+async function mergeConfigPreservingGithub(bucket, courseSlug, newConfig) {
+    var _a;
+    try {
+        const existing = await getConfigJSON(bucket, courseSlug);
+        if ((_a = existing === null || existing === void 0 ? void 0 : existing.config) === null || _a === void 0 ? void 0 : _a.github) {
+            return Object.assign(Object.assign({}, newConfig), { github: Object.assign({}, existing.config.github) });
+        }
+    }
+    catch (_b) {
+        // No existing config or parse error - use newConfig as-is
+    }
+    return newConfig;
+}
 async function getSyllabus(courseSlug, bucket) {
     const syllabus = await bucket.file(`courses/${courseSlug}/.learn/initialSyllabus.json`);
     const [content] = await syllabus.download();
@@ -1969,7 +2137,8 @@ class ServeCommand extends SessionCommand_1.default {
                     .json({ error: "Course slug and rigo token required" });
             }
             try {
-                const { config, exercises } = await (0, configBuilder_1.buildConfig)(bucket, courseSlug);
+                const { config: builtConfig, exercises } = await (0, configBuilder_1.buildConfig)(bucket, courseSlug);
+                const config = await mergeConfigPreservingGithub(bucket, courseSlug, builtConfig);
                 res.set("X-Creator-Web", "true");
                 res.set("Access-Control-Expose-Headers", "X-Creator-Web");
                 await uploadFileToBucket(bucket, JSON.stringify({ config, exercises }), `courses/${courseSlug}/.learn/config.json`);
@@ -3069,6 +3238,8 @@ class ServeCommand extends SessionCommand_1.default {
                 const keptLessons = [];
                 const duplicatesRemoved = [];
                 const addedLessons = [];
+                let repairedTranslationsInLessons = 0;
+                let repairedTranslationEntries = 0;
                 console.log(`📋 Checking ${syllabus.lessons.length} lessons in syllabus...`);
                 // First pass: Check each lesson to see if it exists in the bucket and count files.
                 // We try two possible folder names because they can differ by source:
@@ -3211,9 +3382,70 @@ class ServeCommand extends SessionCommand_1.default {
                         return String(a.id).localeCompare(String(b.id));
                     });
                 }
-                if (totalRemoved > 0 || addedLessons.length > 0) {
+                // Fourth pass: reconcile lesson.translations from actual README files in bucket.
+                // This fixes lessons that exist but lost translations metadata after renames or syncs.
+                try {
+                    const { exercises } = await (0, configBuilder_1.buildConfig)(bucket, courseSlug);
+                    const translationsBySlug = new Map();
+                    for (const exercise of exercises) {
+                        const langs = Object.keys(exercise.translations || {})
+                            .map(lang => lang.toLowerCase())
+                            .filter(Boolean);
+                        if (langs.length > 0) {
+                            translationsBySlug.set(exercise.slug, [...new Set(langs)]);
+                        }
+                    }
+                    for (const lesson of syllabus.lessons) {
+                        const candidateSlugs = [
+                            (0, creatorUtilities_2.slugify)(lesson.id + "-" + lesson.title),
+                            lesson.uid,
+                        ].filter(Boolean);
+                        const matchedSlug = candidateSlugs.find(s => translationsBySlug.has(s));
+                        if (!matchedSlug)
+                            continue;
+                        const languageCodes = translationsBySlug.get(matchedSlug) || [];
+                        if (languageCodes.length === 0)
+                            continue;
+                        const currentTranslations = lesson.translations || {};
+                        let lessonChanged = false;
+                        for (const lang of languageCodes) {
+                            const now = Date.now();
+                            if (!currentTranslations[lang]) {
+                                currentTranslations[lang] = {
+                                    completionId: 0,
+                                    startedAt: now,
+                                    completedAt: now,
+                                };
+                                repairedTranslationEntries += 1;
+                                lessonChanged = true;
+                            }
+                            else {
+                                // If README exists for this language but metadata is incomplete, mark it as completed.
+                                if (!currentTranslations[lang].startedAt) {
+                                    currentTranslations[lang].startedAt = now;
+                                    lessonChanged = true;
+                                }
+                                if (!currentTranslations[lang].completedAt) {
+                                    currentTranslations[lang].completedAt = now;
+                                    repairedTranslationEntries += 1;
+                                    lessonChanged = true;
+                                }
+                            }
+                        }
+                        if (lessonChanged) {
+                            lesson.translations = currentTranslations;
+                            repairedTranslationsInLessons += 1;
+                        }
+                    }
+                }
+                catch (error) {
+                    console.error("⚠️ Could not reconcile lesson translations during syllabus sync:", error);
+                }
+                if (totalRemoved > 0 ||
+                    addedLessons.length > 0 ||
+                    repairedTranslationsInLessons > 0) {
                     await saveSyllabus(courseSlug, syllabus, bucket);
-                    console.log(`✅ Syllabus synchronized. Removed ${removedLessons.length} non-existent, ${duplicatesRemoved.length} duplicate(s); added ${addedLessons.length} from bucket.`);
+                    console.log(`✅ Syllabus synchronized. Removed ${removedLessons.length} non-existent, ${duplicatesRemoved.length} duplicate(s); added ${addedLessons.length} from bucket; repaired translations in ${repairedTranslationsInLessons} lesson(s).`);
                 }
                 else {
                     console.log(`✅ Syllabus is already in sync. No changes.`);
@@ -3226,6 +3458,8 @@ class ServeCommand extends SessionCommand_1.default {
                     removedLessons: removedLessons.length,
                     duplicatesResolved: duplicatesRemoved.length,
                     addedLessons: addedLessons.length,
+                    repairedTranslationsInLessons,
+                    repairedTranslationEntries,
                     removed: removedLessons,
                     duplicates: duplicatesRemoved,
                     kept: keptLessons,
@@ -4067,6 +4301,544 @@ class ServeCommand extends SessionCommand_1.default {
                 });
             }
         });
+        app.get("/actions/github/status", async (req, res) => {
+            var _a;
+            const courseSlug = req.query.slug;
+            if (!courseSlug) {
+                return res
+                    .status(400)
+                    .json({ error: "slug query parameter is required" });
+            }
+            const { isConfigured } = getGithubCredentials();
+            try {
+                const configJson = await getConfigJSON(bucket, courseSlug);
+                const github = (_a = configJson.config) === null || _a === void 0 ? void 0 : _a.github;
+                const repository = github === null || github === void 0 ? void 0 : github.repository;
+                const linked = Boolean(repository);
+                return res.json({
+                    configured: isConfigured,
+                    linked,
+                    repository: linked ? repository : null,
+                });
+            }
+            catch (_b) {
+                return res.json({
+                    configured: isConfigured,
+                    linked: false,
+                    repository: null,
+                });
+            }
+        });
+        app.post("/actions/github/create-repo", express.json(), (0, errorHandler_1.asyncHandler)(async (req, res) => {
+            var _a, _b, _c, _d, _e, _f, _g, _h;
+            const { courseSlug, repoName, isPrivate, description } = req.body;
+            if (!courseSlug) {
+                throw new errorHandler_1.ValidationError("courseSlug is required in request body");
+            }
+            const { token, username, isConfigured } = getGithubCredentials();
+            if (!isConfigured || !token || !username) {
+                throw new errorHandler_1.ValidationError("GitHub credentials not configured. Set GITHUB_TOKEN and GITHUB_USERNAME in .env");
+            }
+            const configJson = await getConfigJSON(bucket, courseSlug);
+            if ((_b = (_a = configJson.config) === null || _a === void 0 ? void 0 : _a.github) === null || _b === void 0 ? void 0 : _b.repository) {
+                throw new errorHandler_1.ConflictError("Package already has a linked GitHub repository");
+            }
+            const finalRepoName = repoName || courseSlug;
+            const finalDescription = description || "Tutorial created with LearnPack";
+            const createRepoUrl = "https://api.github.com/user/repos";
+            const createdRepo = await githubApiFetchWithContext(createRepoUrl, token, {
+                operation: "create_repo",
+                repoName: finalRepoName,
+            }, {
+                method: "POST",
+                body: {
+                    name: finalRepoName,
+                    private: Boolean(isPrivate),
+                    description: finalDescription,
+                    auto_init: true,
+                },
+            });
+            const repository = (createdRepo === null || createdRepo === void 0 ? void 0 : createdRepo.full_name) || `${username}/${finalRepoName}`;
+            const defaultBranch = (createdRepo === null || createdRepo === void 0 ? void 0 : createdRepo.default_branch) || "main";
+            const repositoryUrl = (createdRepo === null || createdRepo === void 0 ? void 0 : createdRepo.html_url) || `https://github.com/${repository}`;
+            const refRes = await githubApiFetchWithRetry(`https://api.github.com/repos/${repository}/git/ref/heads/${defaultBranch}`, token, {
+                operation: "get_base_ref",
+                repository,
+                repoCreated: true,
+                retryOnUnavailableConflict: true,
+            }, {});
+            const baseSHA = (_g = (_d = (_c = refRes.object) === null || _c === void 0 ? void 0 : _c.sha) !== null && _d !== void 0 ? _d : (_f = (_e = refRes.ref) === null || _e === void 0 ? void 0 : _e.object) === null || _f === void 0 ? void 0 : _f.sha) !== null && _g !== void 0 ? _g : (_h = refRes.object) === null || _h === void 0 ? void 0 : _h.sha;
+            if (!baseSHA) {
+                throw new errorHandler_1.InternalServerError("Could not get default branch SHA from GitHub after repository creation", {
+                    failedOperation: "get_base_ref",
+                    repository,
+                    repoCreated: true,
+                });
+            }
+            const [allFiles] = await bucket.getFiles({
+                prefix: `courses/${courseSlug}/`,
+            });
+            const treeEntries = await mapWithConcurrency(allFiles, 5, async (file) => {
+                const relativePath = file.name.replace(`courses/${courseSlug}/`, "");
+                const [content] = await file.download();
+                const contentBase64 = content.toString("base64");
+                const blobRes = await githubApiFetchWithRetry(`https://api.github.com/repos/${repository}/git/blobs`, token, {
+                    operation: "create_blob",
+                    repository,
+                    failedPath: relativePath,
+                    repoCreated: true,
+                    retryOnUnavailableConflict: true,
+                }, {
+                    method: "POST",
+                    body: { content: contentBase64, encoding: "base64" },
+                });
+                return {
+                    path: relativePath,
+                    mode: "100644",
+                    type: "blob",
+                    sha: blobRes.sha,
+                };
+            });
+            const treeRes = await githubApiFetchWithRetry(`https://api.github.com/repos/${repository}/git/trees`, token, {
+                operation: "create_tree",
+                repository,
+                repoCreated: true,
+                retryOnUnavailableConflict: true,
+            }, {
+                method: "POST",
+                body: { tree: treeEntries },
+            });
+            const commitRes = await githubApiFetchWithRetry(`https://api.github.com/repos/${repository}/git/commits`, token, {
+                operation: "create_commit",
+                repository,
+                repoCreated: true,
+                retryOnUnavailableConflict: true,
+            }, {
+                method: "POST",
+                body: {
+                    message: "Initial commit from LearnPack",
+                    tree: treeRes.sha,
+                    parents: [baseSHA],
+                },
+            });
+            await githubApiFetchWithRetry(`https://api.github.com/repos/${repository}/git/refs/heads/${defaultBranch}`, token, {
+                operation: "update_ref",
+                repository,
+                repoCreated: true,
+                retryOnUnavailableConflict: true,
+            }, {
+                method: "PATCH",
+                body: {
+                    sha: commitRes.sha,
+                    force: false,
+                },
+            });
+            configJson.config = configJson.config || {};
+            configJson.config.github = {
+                repository,
+                defaultBranch,
+                lastSyncSHA: commitRes.sha,
+            };
+            await uploadFileToBucket(bucket, JSON.stringify(configJson), `courses/${courseSlug}/.learn/config.json`);
+            return res.json({
+                success: true,
+                repository,
+                url: repositoryUrl,
+                sha: commitRes.sha,
+            });
+        }));
+        const GITHUB_STRUCTURAL_FILES = new Set([
+            "learn.json",
+            ".learn/config.json",
+            ".learn/initialSyllabus.json",
+            ".learn/sidebar.json",
+            ".learn/memory_bank.txt",
+        ]);
+        const isStructuralFile = (relativePath) => GITHUB_STRUCTURAL_FILES.has(relativePath) ||
+            relativePath === "learn.json" ||
+            (relativePath.startsWith(".learn/") &&
+                !relativePath.startsWith(".learn/assets/"));
+        const IMAGE_EXTENSIONS = [".png", ".jpg", ".jpeg", ".gif", ".svg", ".webp"];
+        const isImageFile = (path) => IMAGE_EXTENSIONS.some(ext => path.toLowerCase().endsWith(ext));
+        app.get("/actions/github/check-changes", (0, errorHandler_1.asyncHandler)(async (req, res) => {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+            const courseSlug = req.query.slug;
+            if (!courseSlug) {
+                throw new errorHandler_1.ValidationError("slug query parameter is required");
+            }
+            const { token, isConfigured } = getGithubCredentials();
+            if (!isConfigured || !token) {
+                throw new errorHandler_1.ValidationError("GitHub credentials not configured. Set GITHUB_TOKEN and GITHUB_USERNAME in .env");
+            }
+            const configJson = await getConfigJSON(bucket, courseSlug);
+            const repository = (_b = (_a = configJson.config) === null || _a === void 0 ? void 0 : _a.github) === null || _b === void 0 ? void 0 : _b.repository;
+            const lastSyncSHA = (_d = (_c = configJson.config) === null || _c === void 0 ? void 0 : _c.github) === null || _d === void 0 ? void 0 : _d.lastSyncSHA;
+            const defaultBranch = ((_f = (_e = configJson.config) === null || _e === void 0 ? void 0 : _e.github) === null || _f === void 0 ? void 0 : _f.defaultBranch) || "main";
+            if (!repository || !lastSyncSHA) {
+                throw new errorHandler_1.ValidationError("Package has no linked GitHub repository. Create one first.");
+            }
+            const refRes = await githubApiFetch(`https://api.github.com/repos/${repository}/git/ref/heads/${defaultBranch}`, token);
+            const currentBranchSHA = (_l = (_h = (_g = refRes.object) === null || _g === void 0 ? void 0 : _g.sha) !== null && _h !== void 0 ? _h : (_k = (_j = refRes.ref) === null || _j === void 0 ? void 0 : _j.object) === null || _k === void 0 ? void 0 : _k.sha) !== null && _l !== void 0 ? _l : (_m = refRes.object) === null || _m === void 0 ? void 0 : _m.sha;
+            if (!currentBranchSHA) {
+                throw new errorHandler_1.ValidationError(`Could not get ${defaultBranch} branch SHA from GitHub`);
+            }
+            const compareRes = await githubApiFetch(`https://api.github.com/repos/${repository}/compare/${lastSyncSHA}...${currentBranchSHA}`, token);
+            if (compareRes.status === "identical" ||
+                !compareRes.files ||
+                compareRes.files.length === 0) {
+                return res.json({ hasChanges: false });
+            }
+            const [allExerciseFiles] = await bucket.getFiles({
+                prefix: `courses/${courseSlug}/exercises/`,
+            });
+            const lessonSlugs = new Set();
+            const lessonFilesMap = new Map();
+            for (const file of allExerciseFiles) {
+                const match = file.name.match(new RegExp(`courses/${courseSlug}/exercises/([^/]+)/(.+)$`));
+                if (match) {
+                    const [, slug, filePart] = match;
+                    lessonSlugs.add(slug);
+                    if (!lessonFilesMap.has(slug)) {
+                        lessonFilesMap.set(slug, new Set());
+                    }
+                    lessonFilesMap.get(slug).add(filePart);
+                }
+            }
+            const syncableLessons = [];
+            const syncableAssets = [];
+            const skippedFiles = [];
+            for (const f of compareRes.files) {
+                const relativePath = f.filename;
+                const status = f.status || "modified";
+                if (isStructuralFile(relativePath)) {
+                    skippedFiles.push({
+                        filename: relativePath,
+                        status,
+                        reason: "Structural file",
+                    });
+                    continue;
+                }
+                const exercisesMatch = relativePath.match(/^exercises\/([^/]+)\/(.+)$/);
+                if (exercisesMatch) {
+                    const [, slug, filename] = exercisesMatch;
+                    if (!lessonSlugs.has(slug)) {
+                        skippedFiles.push({
+                            filename: relativePath,
+                            status,
+                            reason: "Lesson does not exist in bucket",
+                        });
+                        continue;
+                    }
+                    const existingFiles = lessonFilesMap.get(slug);
+                    if (status !== "modified" || !existingFiles.has(filename)) {
+                        skippedFiles.push({
+                            filename: relativePath,
+                            status,
+                            reason: status === "modified" ?
+                                "File does not exist in bucket (only modified existing files are synced)" :
+                                "Structural change in lesson (only modified files are synced)",
+                        });
+                        continue;
+                    }
+                    let lessonEntry = syncableLessons.find(l => l.slug === slug);
+                    if (!lessonEntry) {
+                        lessonEntry = { slug, files: [] };
+                        syncableLessons.push(lessonEntry);
+                    }
+                    lessonEntry.files.push({ filename, status });
+                    continue;
+                }
+                if (relativePath.startsWith(".learn/assets/")) {
+                    syncableAssets.push({ filename: relativePath, status });
+                    continue;
+                }
+                skippedFiles.push({
+                    filename: relativePath,
+                    status,
+                    reason: "Unknown path",
+                });
+            }
+            return res.json({
+                hasChanges: true,
+                currentSHA: currentBranchSHA,
+                lastSyncSHA,
+                syncableChanges: {
+                    lessons: syncableLessons,
+                    assets: syncableAssets,
+                    totalFiles: syncableLessons.reduce((s, l) => s + l.files.length, 0) +
+                        syncableAssets.length,
+                },
+                skippedChanges: {
+                    files: skippedFiles,
+                    totalFiles: skippedFiles.length,
+                },
+            });
+        }));
+        app.post("/actions/github/pull", express.json(), (0, errorHandler_1.asyncHandler)(async (req, res) => {
+            var _a, _b, _c, _d, _e;
+            const { courseSlug, targetSHA, lessons } = req.body;
+            if (!courseSlug || !targetSHA) {
+                throw new errorHandler_1.ValidationError("courseSlug and targetSHA are required in request body");
+            }
+            const { token, isConfigured } = getGithubCredentials();
+            if (!isConfigured || !token) {
+                throw new errorHandler_1.ValidationError("GitHub credentials not configured. Set GITHUB_TOKEN and GITHUB_USERNAME in .env");
+            }
+            const configJson = await getConfigJSON(bucket, courseSlug);
+            const repository = (_b = (_a = configJson.config) === null || _a === void 0 ? void 0 : _a.github) === null || _b === void 0 ? void 0 : _b.repository;
+            const lastSyncSHA = (_d = (_c = configJson.config) === null || _c === void 0 ? void 0 : _c.github) === null || _d === void 0 ? void 0 : _d.lastSyncSHA;
+            if (!repository || !lastSyncSHA) {
+                throw new errorHandler_1.ValidationError("Package has no linked GitHub repository. Create one first.");
+            }
+            const [allExerciseFiles] = await bucket.getFiles({
+                prefix: `courses/${courseSlug}/exercises/`,
+            });
+            const lessonSlugs = new Set();
+            const lessonFilesMap = new Map();
+            for (const file of allExerciseFiles) {
+                const match = file.name.match(new RegExp(`courses/${courseSlug}/exercises/([^/]+)/(.+)$`));
+                if (match) {
+                    const [, slug, filePart] = match;
+                    lessonSlugs.add(slug);
+                    if (!lessonFilesMap.has(slug)) {
+                        lessonFilesMap.set(slug, new Set());
+                    }
+                    lessonFilesMap.get(slug).add(filePart);
+                }
+            }
+            const compareRes = await githubApiFetch(`https://api.github.com/repos/${repository}/compare/${lastSyncSHA}...${targetSHA}`, token);
+            if (compareRes.status === "identical" ||
+                !compareRes.files ||
+                compareRes.files.length === 0) {
+                configJson.config = configJson.config || {};
+                configJson.config.github = Object.assign(Object.assign({}, configJson.config.github), { lastSyncSHA: targetSHA });
+                await uploadFileToBucket(bucket, JSON.stringify(configJson), `courses/${courseSlug}/.learn/config.json`);
+                return res.json({
+                    success: true,
+                    syncedLessons: [],
+                    syncedAssets: 0,
+                    syncedFiles: 0,
+                    removedFiles: 0,
+                    skippedFiles: [],
+                    newSHA: targetSHA,
+                });
+            }
+            const lessonFilter = Array.isArray(lessons) && lessons.length > 0 ?
+                new Set(lessons) :
+                null;
+            const toSync = [];
+            const skippedFiles = [];
+            for (const f of compareRes.files) {
+                const relativePath = f.filename;
+                const status = f.status || "modified";
+                if (isStructuralFile(relativePath)) {
+                    skippedFiles.push({
+                        filename: relativePath,
+                        status,
+                        reason: "Structural file",
+                    });
+                    continue;
+                }
+                const exercisesMatch = relativePath.match(/^exercises\/([^/]+)\/(.+)$/);
+                if (exercisesMatch) {
+                    const [, slug, filename] = exercisesMatch;
+                    if (lessonFilter && !lessonFilter.has(slug))
+                        continue;
+                    if (!lessonSlugs.has(slug)) {
+                        skippedFiles.push({
+                            filename: relativePath,
+                            status,
+                            reason: "Lesson does not exist in bucket",
+                        });
+                        continue;
+                    }
+                    if (status !== "modified" ||
+                        !lessonFilesMap.get(slug).has(filename)) {
+                        skippedFiles.push({
+                            filename: relativePath,
+                            status,
+                            reason: status === "modified" ?
+                                "File does not exist in bucket" :
+                                "Structural change in lesson",
+                        });
+                        continue;
+                    }
+                    toSync.push({
+                        relativePath,
+                        status,
+                        bucketPath: `courses/${courseSlug}/exercises/${slug}/${filename}`,
+                        isAsset: false,
+                    });
+                    continue;
+                }
+                if (relativePath.startsWith(".learn/assets/")) {
+                    const bucketPath = `courses/${courseSlug}/${relativePath}`;
+                    const previousPath = f.previous_filename;
+                    const previousBucketPath = previousPath ?
+                        `courses/${courseSlug}/${previousPath}` :
+                        undefined;
+                    toSync.push({
+                        relativePath,
+                        status,
+                        bucketPath,
+                        isAsset: true,
+                        previousBucketPath,
+                    });
+                }
+            }
+            const syncedLessonSlugs = new Set();
+            let syncedLessonFilesCount = 0;
+            let syncedAssetsUploaded = 0;
+            let removedCount = 0;
+            for (const item of toSync) {
+                if (item.isAsset && item.status === "removed") {
+                    try {
+                        const fileRef = bucket.file(item.bucketPath);
+                        // eslint-disable-next-line no-await-in-loop -- Sequential processing to avoid rate limits
+                        await fileRef.delete();
+                        removedCount++;
+                    }
+                    catch (_f) {
+                        // File may not exist, ignore
+                    }
+                    continue;
+                }
+                if (item.isAsset && item.previousBucketPath) {
+                    try {
+                        const oldFileRef = bucket.file(item.previousBucketPath);
+                        // eslint-disable-next-line no-await-in-loop -- Sequential processing to avoid rate limits
+                        await oldFileRef.delete();
+                        removedCount++;
+                    }
+                    catch (_g) {
+                        // Old file may not exist, ignore
+                    }
+                }
+                if (item.isAsset || item.status === "modified") {
+                    let contentRes;
+                    try {
+                        // eslint-disable-next-line no-await-in-loop -- Sequential processing to avoid rate limits
+                        contentRes = await githubApiFetch(`https://api.github.com/repos/${repository}/contents/${encodeURIComponent(item.relativePath)}?ref=${targetSHA}`, token);
+                    }
+                    catch (error) {
+                        const axErr = error;
+                        if (((_e = axErr.response) === null || _e === void 0 ? void 0 : _e.status) === 404) {
+                            skippedFiles.push({
+                                filename: item.relativePath,
+                                status: item.status,
+                                reason: "File not found in GitHub",
+                            });
+                            continue;
+                        }
+                        throw error;
+                    }
+                    const content = contentRes.content;
+                    if (!content) {
+                        skippedFiles.push({
+                            filename: item.relativePath,
+                            status: item.status,
+                            reason: "No content in response",
+                        });
+                        continue;
+                    }
+                    const buffer = buffer_1.Buffer.from(content, "base64");
+                    if (isImageFile(item.relativePath)) {
+                        // eslint-disable-next-line no-await-in-loop -- Sequential processing to avoid rate limits
+                        await uploadBinaryToBucket(bucket, buffer, item.bucketPath, "application/octet-stream");
+                    }
+                    else {
+                        const text = buffer.toString("utf8");
+                        // eslint-disable-next-line no-await-in-loop -- Sequential processing to avoid rate limits
+                        await uploadFileToBucket(bucket, text, item.bucketPath);
+                    }
+                    if (item.isAsset) {
+                        syncedAssetsUploaded++;
+                    }
+                    else {
+                        syncedLessonSlugs.add(item.relativePath.replace(/^exercises\/([^/]+)\/.*/, "$1"));
+                        syncedLessonFilesCount++;
+                    }
+                }
+            }
+            configJson.config = configJson.config || {};
+            configJson.config.github = Object.assign(Object.assign({}, configJson.config.github), { lastSyncSHA: targetSHA });
+            await uploadFileToBucket(bucket, JSON.stringify(configJson), `courses/${courseSlug}/.learn/config.json`);
+            return res.json({
+                success: true,
+                syncedLessons: [...syncedLessonSlugs],
+                syncedAssets: syncedAssetsUploaded + removedCount,
+                syncedFiles: syncedLessonFilesCount + syncedAssetsUploaded,
+                removedFiles: removedCount,
+                skippedFiles,
+                newSHA: targetSHA,
+            });
+        }));
+        app.post("/actions/github/push", express.json(), (0, errorHandler_1.asyncHandler)(async (req, res) => {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+            const { courseSlug } = req.body;
+            if (!courseSlug) {
+                throw new errorHandler_1.ValidationError("courseSlug is required in request body");
+            }
+            const { token, username, isConfigured } = getGithubCredentials();
+            if (!isConfigured || !token || !username) {
+                throw new errorHandler_1.ValidationError("GitHub credentials not configured. Set GITHUB_TOKEN and GITHUB_USERNAME in .env");
+            }
+            const configJson = await getConfigJSON(bucket, courseSlug);
+            const repository = (_b = (_a = configJson.config) === null || _a === void 0 ? void 0 : _a.github) === null || _b === void 0 ? void 0 : _b.repository;
+            const lastSyncSHA = (_d = (_c = configJson.config) === null || _c === void 0 ? void 0 : _c.github) === null || _d === void 0 ? void 0 : _d.lastSyncSHA;
+            const defaultBranch = ((_f = (_e = configJson.config) === null || _e === void 0 ? void 0 : _e.github) === null || _f === void 0 ? void 0 : _f.defaultBranch) || "main";
+            if (!repository || !lastSyncSHA) {
+                throw new errorHandler_1.ValidationError("Package has no linked GitHub repository. Create one first.");
+            }
+            const refRes = await githubApiFetch(`https://api.github.com/repos/${repository}/git/ref/heads/${defaultBranch}`, token);
+            const currentBranchSHA = (_l = (_h = (_g = refRes.object) === null || _g === void 0 ? void 0 : _g.sha) !== null && _h !== void 0 ? _h : (_k = (_j = refRes.ref) === null || _j === void 0 ? void 0 : _j.object) === null || _k === void 0 ? void 0 : _k.sha) !== null && _l !== void 0 ? _l : (_m = refRes.object) === null || _m === void 0 ? void 0 : _m.sha;
+            if (!currentBranchSHA) {
+                throw new errorHandler_1.ValidationError(`Could not get ${defaultBranch} branch SHA from GitHub`);
+            }
+            const [allFiles] = await bucket.getFiles({
+                prefix: `courses/${courseSlug}/`,
+            });
+            const treeEntries = await Promise.all(allFiles.map(async (file) => {
+                const [content] = await file.download();
+                const contentBase64 = content.toString("base64");
+                const blobRes = await githubApiFetch(`https://api.github.com/repos/${repository}/git/blobs`, token, {
+                    method: "POST",
+                    body: { content: contentBase64, encoding: "base64" },
+                });
+                const relativePath = file.name.replace(`courses/${courseSlug}/`, "");
+                return {
+                    path: relativePath,
+                    mode: "100644",
+                    type: "blob",
+                    sha: blobRes.sha,
+                };
+            }));
+            const treeRes = await githubApiFetch(`https://api.github.com/repos/${repository}/git/trees`, token, {
+                method: "POST",
+                body: { tree: treeEntries },
+            });
+            const commitRes = await githubApiFetch(`https://api.github.com/repos/${repository}/git/commits`, token, {
+                method: "POST",
+                body: {
+                    message: "Sync from LearnPack bucket",
+                    tree: treeRes.sha,
+                    parents: [currentBranchSHA],
+                },
+            });
+            await githubApiFetch(`https://api.github.com/repos/${repository}/git/refs/heads/${defaultBranch}`, token, {
+                method: "PATCH",
+                body: { sha: commitRes.sha, force: false },
+            });
+            configJson.config = configJson.config || {};
+            configJson.config.github = Object.assign(Object.assign({}, configJson.config.github), { lastSyncSHA: commitRes.sha });
+            await uploadFileToBucket(bucket, JSON.stringify(configJson), `courses/${courseSlug}/.learn/config.json`);
+            return res.json({
+                success: true,
+                repository,
+                sha: commitRes.sha,
+                totalFiles: allFiles.length,
+            });
+        }));
         app.get("/proxy", async (req, res) => {
             const { url } = req.query;
             if (!url) {