icoa-cli 2.19.21 → 2.19.22

package/dist/commands/lang.js

@@ -51,25 +51,55 @@ export function registerLangCommand(program) {
         }
         saveConfig({ language: code });
         printSuccess(`Language set to: ${LANG_NAMES[code] || code}`);
-        // If demo exam in progress, restart with fresh random pick in new language.
-        // (Progress is lost because questions are randomly picked from a 30-question pool
-        // and each attempt shuffles option positions — mid-exam translation would
-        // desync the answer key.)
+        // If demo in progress, re-translate each drawn question in place using
+        // sourceNumber + sourceOrder so the user's answers and option positions are
+        // preserved. If an older state lacks these fields (pre-v2.19.22), fall back
+        // to restart-with-fresh-pick so nothing crashes.
         const state = getExamState();
         if (state && state.session.examId === 'demo-free') {
             try {
-                const { pickDemoQuestions, getLocalizedDemoSession, DEMO_PICK_SIZE } = await import('../lib/demo-exam.js');
-                const freshQuestions = pickDemoQuestions(DEMO_PICK_SIZE);
-                state.questions = freshQuestions;
-                state.answers = {};
-                state.session.examName = getLocalizedDemoSession().examName;
-                state.session.startedAt = new Date().toISOString();
-                state._lastQ = 1;
+                const { pickDemoQuestions, getLocalizedDemoSession, getLocalizedDemoQuestions, getLocalizedExplanations, DEMO_PICK_SIZE, } = await import('../lib/demo-exam.js');
                 const { saveExamState } = await import('../lib/exam-state.js');
-                saveExamState(state);
-                console.log();
-                console.log(chalk.green(`  Demo restarted in ${LANG_NAMES[code] || code}.`));
-                console.log(chalk.white('  Type: exam q 1'));
+                const canRetranslate = state.questions.every((q) => q.sourceNumber != null && Array.isArray(q.sourceOrder) && q.sourceOrder.length === 4);
+                if (canRetranslate) {
+                    const pool = getLocalizedDemoQuestions();
+                    const explanations = getLocalizedExplanations();
+                    state.questions = state.questions.map((q) => {
+                        const src = pool.find((p) => p.number === q.sourceNumber);
+                        if (!src || !q.sourceOrder)
+                            return q;
+                        return {
+                            ...q,
+                            text: src.text,
+                            category: src.category,
+                            options: {
+                                A: src.options[q.sourceOrder[0]],
+                                B: src.options[q.sourceOrder[1]],
+                                C: src.options[q.sourceOrder[2]],
+                                D: src.options[q.sourceOrder[3]],
+                            },
+                            explanation: explanations[q.sourceNumber],
+                        };
+                    });
+                    state.session.examName = getLocalizedDemoSession().examName;
+                    saveExamState(state);
+                    const currentQ = state._lastQ || 1;
+                    console.log();
+                    console.log(chalk.green(`  Demo continues in ${LANG_NAMES[code] || code}. Your progress is kept.`));
+                    console.log(chalk.white(`  Resume: exam q ${currentQ}`));
+                }
+                else {
+                    // Legacy state from before v2.19.22 — safely reset
+                    state.questions = pickDemoQuestions(DEMO_PICK_SIZE);
+                    state.answers = {};
+                    state.session.examName = getLocalizedDemoSession().examName;
+                    state.session.startedAt = new Date().toISOString();
+                    state._lastQ = 1;
+                    saveExamState(state);
+                    console.log();
+                    console.log(chalk.green(`  Demo restarted in ${LANG_NAMES[code] || code}.`));
+                    console.log(chalk.white('  Type: exam q 1'));
+                }
             }
             catch {
                 console.log(chalk.gray('  Language changed. Type: demo'));

package/dist/lib/demo-exam.js

@@ -127,16 +127,24 @@ function shuffle(arr) {
     }
     return out;
 }
-/** Shuffle the four options within a single question; recompute the answer letter. */
+/**
+ * Shuffle the four options within a single question; recompute the answer letter
+ * and record `sourceOrder` so the shuffle can be replayed against a different
+ * translation of the same question (used by lang-switch to keep answers).
+ */
 function shuffleQuestionOptions(q) {
     if (!q.answer)
         return q;
-    const correctText = q.options[q.answer];
     const keys = ['A', 'B', 'C', 'D'];
-    const values = shuffle(keys.map((k) => q.options[k]));
-    const newOptions = { A: values[0], B: values[1], C: values[2], D: values[3] };
-    const newAnswer = keys.find((k) => newOptions[k] === correctText);
-    return { ...q, options: newOptions, answer: newAnswer };
+    const sourceOrder = shuffle(keys);
+    const newOptions = {
+        A: q.options[sourceOrder[0]],
+        B: q.options[sourceOrder[1]],
+        C: q.options[sourceOrder[2]],
+        D: q.options[sourceOrder[3]],
+    };
+    const newAnswer = keys[sourceOrder.indexOf(q.answer)];
+    return { ...q, options: newOptions, answer: newAnswer, sourceOrder };
 }
 /**
  * Pick `n` random questions from the pool, shuffle each question's options,
@@ -152,12 +160,14 @@ export function pickDemoQuestions(n = DEMO_PICK_SIZE) {
         answer: DEMO_ANSWERS[q.number],
         explanation: explanations[q.number],
     }));
-    // Shuffle pool, pick n, shuffle each question's options, renumber 1..n
+    // Shuffle pool, pick n, shuffle each question's options, renumber 1..n.
+    // Keep the original pool number as `sourceNumber` so lang-switch can re-translate
+    // this exact question without losing the user's answer.
     const picked = shuffle(enriched).slice(0, n);
-    return picked.map((q, i) => ({
-        ...shuffleQuestionOptions(q),
-        number: i + 1,
-    }));
+    return picked.map((q, i) => {
+        const shuffled = shuffleQuestionOptions(q);
+        return { ...shuffled, sourceNumber: q.number, number: i + 1 };
+    });
 }
 /**
  * Get localized explanations for demo questions.

package/dist/types/index.d.ts

@@ -152,6 +152,8 @@ export interface ExamQuestion {
     };
     answer?: 'A' | 'B' | 'C' | 'D';
     explanation?: string;
+    sourceNumber?: number;
+    sourceOrder?: ('A' | 'B' | 'C' | 'D')[];
 }
 export interface ExamSession {
     examId: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "icoa-cli",
-  "version": "2.19.21",
+  "version": "2.19.22",
   "description": "ICOA CLI — The world's first CLI-native CTF competition terminal",
   "type": "module",
   "bin": {