icoa-cli 2.19.61 → 2.19.63

package/dist/commands/ai4ctf.js

@@ -308,11 +308,18 @@ export async function handleChatMessage(input) {
 // ═══════════════════════════════════════════════════════════════
 // Real-exam AI4CTF chat mode (Q31-38)
 // ═══════════════════════════════════════════════════════════════
-function printExamAi4ctfWelcome(q, qNum) {
+function printExamAi4ctfWelcome(q, qNum, existingAnswer) {
     const config = getConfig();
     const modelName = config.geminiModel || 'gemma-4-31b-it';
+    const isResume = chatTokensUsed > 0;
     console.log();
     console.log(chalk.green.bold(`  ═══ AI4CTF — Q${qNum}: ${q.category} ═══`));
+    if (isResume) {
+        console.log(chalk.gray(`  (resuming — prior chat is not remembered, but tokens already used stay deducted)`));
+    }
+    if (existingAnswer) {
+        console.log(chalk.gray(`  Current answer: `) + chalk.yellow(existingAnswer) + chalk.gray(`  (submit again to change)`));
+    }
     console.log();
     console.log(chalk.cyan('  ┌─────────────────────────────────────────────'));
     console.log(chalk.cyan('  │ ') + chalk.bold.white(`Q${qNum}  [${q.category}]  · ${q.points || 6} pts`));
@@ -387,9 +394,27 @@ export async function startExamAi4ctfChat(qNum, question) {
     chatTokensUsed = usedSoFar;
     tokensLocked = false;
     examChatCtx = { qNum, question, usageField: 'ai4ctf' };
-    printExamAi4ctfWelcome(question, qNum);
+    const existingAnswer = state.answers?.[qNum];
+    printExamAi4ctfWelcome(question, qNum, existingAnswer);
     return true;
 }
+// Usage warnings shown once each when crossing thresholds. Keyed by cap.
+function maybeWarnTokenUsage(used, cap, warnedSet) {
+    const pct = (used / cap) * 100;
+    if (pct >= 95 && !warnedSet.has('95')) {
+        console.log(chalk.red.bold(`  ⚠ ${Math.round(pct)}% of section AI budget used — only ~${cap - used} tokens left.`));
+        warnedSet.add('95');
+    }
+    else if (pct >= 80 && !warnedSet.has('80')) {
+        console.log(chalk.yellow(`  ⚠ 80% of section AI budget used.`));
+        warnedSet.add('80');
+    }
+    else if (pct >= 50 && !warnedSet.has('50')) {
+        console.log(chalk.gray(`  Note: 50% of section AI budget used.`));
+        warnedSet.add('50');
+    }
+}
+const _ai4ctfWarned = new Set();
 async function handleExamAi4ctfMessage(input) {
     if (!examChatCtx || !chatSession)
         return 'exit';
@@ -426,6 +451,16 @@ async function handleExamAi4ctfMessage(input) {
     const submitMatch = trimmed.match(/^submit\s+(.+)/i);
     if (submitMatch) {
         const flag = submitMatch[1].trim();
+        // Letter-only footgun: reject 'A'/'B'/'C'/'D' as flags. Same defence we
+        // added at the REPL and exam-answer layers; duplicated here because chat
+        // bypasses both.
+        if (/^[A-Da-d]$/.test(flag)) {
+            console.log();
+            console.log(chalk.yellow(`  "${flag}" looks like an MCQ letter, not a flag.`));
+            console.log(chalk.gray('  Flag format: ') + chalk.green('ICOA{your_flag}') + chalk.gray('. Try again inside this chat.'));
+            console.log();
+            return 'continue';
+        }
         const { getExamState, saveExamState } = await import('../lib/exam-state.js');
         const state = getExamState();
         if (!state)
@@ -435,7 +470,8 @@ async function handleExamAi4ctfMessage(input) {
             console.log(chalk.red(`  Q${examChatCtx.qNum} not found in state.`));
             return 'continue';
         }
-        // Store answer (validated on server at exam submit)
+        // Store answer (validated on server at exam submit). Stay in chat so the
+        // contestant can iterate on the flag without having to re-enter.
         const prevAnswer = state.answers[examChatCtx.qNum];
         if (!state.interactions)
             state.interactions = [];
@@ -447,33 +483,30 @@ async function handleExamAi4ctfMessage(input) {
             result: 'via ai4ctf chat',
         });
         state.answers[examChatCtx.qNum] = flag;
-        state._lastQ = examChatCtx.qNum;
+        // Advance _lastQ to the next question in the section so that a subsequent
+        // `ai4ctf` (after exit) picks up Q+1 automatically, no `exam q N` needed.
+        const nextQ = examChatCtx.qNum + 1;
+        state._lastQ = nextQ <= 38 ? nextQ : examChatCtx.qNum;
         saveExamState(state);
         console.log();
-        console.log(chalk.green.bold(`  ✓ Answer for Q${examChatCtx.qNum} recorded: ${flag}`));
+        if (prevAnswer) {
+            console.log(chalk.green(`  ✓ Q${examChatCtx.qNum} answer updated: `) + chalk.yellow(flag));
+            console.log(chalk.gray(`    Previous: ${prevAnswer}`));
+        }
+        else {
+            console.log(chalk.green.bold(`  ✓ Answer for Q${examChatCtx.qNum} recorded: ${flag}`));
+        }
         console.log(chalk.gray('    (Grading happens at exam submit — you cannot preview correctness during the exam.)'));
         console.log();
-        // Auto-navigate to next unanswered AI4CTF question
-        const nextQ = examChatCtx.qNum + 1;
-        const savedQ = examChatCtx.qNum;
-        chatActive = false;
-        chatSession = null;
-        examChatCtx = null;
+        console.log(chalk.gray('  ') + chalk.white('submit ICOA{...}') + chalk.gray(' again to change, or ') + chalk.white('exit') + chalk.gray(' to move on'));
         if (nextQ <= 38) {
-            console.log(chalk.cyan('  ─────────────────────────────────────────────'));
-            console.log(chalk.white('  Next: ') + chalk.bold.green(`Q${nextQ}`));
-            console.log(chalk.gray('    → ') + chalk.bold.cyan(`exam q ${nextQ}`) + chalk.gray('     jump to question'));
-            console.log(chalk.gray('    → ') + chalk.bold.cyan('ai4ctf') + chalk.gray('          start AI chat for Q') + String(nextQ));
-            console.log(chalk.cyan('  ─────────────────────────────────────────────'));
+            console.log(chalk.gray('  After exit: ') + chalk.cyan('ai4ctf') + chalk.gray(` will open Q${nextQ}`));
         }
         else {
-            console.log(chalk.cyan('  ─────────────────────────────────────────────'));
-            console.log(chalk.bold.white('  AI4CTF section complete — Q39 begins CTF4AI.'));
-            console.log(chalk.gray('    → ') + chalk.bold.red('ctf4ai') + chalk.gray('          start CTF4AI for Q39'));
-            console.log(chalk.cyan('  ─────────────────────────────────────────────'));
+            console.log(chalk.gray('  After exit: AI4CTF section complete. Next: ') + chalk.red('ctf4ai') + chalk.gray(' on Q39'));
         }
         console.log();
-        return 'exit';
+        return 'continue';
     }
     // Shell command
     if (input.startsWith('!')) {
@@ -497,13 +530,26 @@ async function handleExamAi4ctfMessage(input) {
     }
     // Exit chat
     if (lower === 'exit' || lower === 'back' || lower === 'quit') {
+        const savedQ = examChatCtx.qNum;
+        const { getExamState } = await import('../lib/exam-state.js');
+        const exitState = getExamState();
+        const hasAnswer = exitState && exitState.answers[savedQ] != null;
+        const lastQ = (exitState?._lastQ) || savedQ;
         chatActive = false;
         chatSession = null;
-        const savedQ = examChatCtx.qNum;
         examChatCtx = null;
+        _ai4ctfWarned.clear();
         console.log();
         console.log(chalk.gray(`  AI4CTF chat ended for Q${savedQ}.`));
-        console.log(chalk.gray('  Resume answering: ') + chalk.white(`exam q ${savedQ}`) + chalk.gray('  ·  Re-enter chat: ') + chalk.white('ai4ctf'));
+        if (hasAnswer && lastQ > savedQ && lastQ <= 38) {
+            console.log(chalk.white('  Next: ') + chalk.bold.green(`Q${lastQ}`) + chalk.gray(' — type ') + chalk.cyan('ai4ctf') + chalk.gray(' to continue'));
+        }
+        else if (hasAnswer && savedQ >= 38) {
+            console.log(chalk.white('  AI4CTF section complete — ') + chalk.bold.red('ctf4ai') + chalk.gray(' for Q39'));
+        }
+        else {
+            console.log(chalk.gray('  Resume: ') + chalk.white(`exam q ${savedQ}`) + chalk.gray('  ·  Re-enter: ') + chalk.white('ai4ctf'));
+        }
         console.log();
         return 'exit';
     }
@@ -542,6 +588,7 @@ async function handleExamAi4ctfMessage(input) {
         console.log();
         printMarkdown(response.text);
         drawTokenBar();
+        maybeWarnTokenUsage(chatTokensUsed, EXAM_AI4CTF_CAP, _ai4ctfWarned);
         console.log();
     }
     catch (err) {

package/dist/commands/ctf4ai-demo.js

@@ -176,11 +176,18 @@ export async function handleCtf4aiMessage(input) {
 // ═══════════════════════════════════════════════════════════════
 // Real-exam CTF4AI chat mode (Q39-40)
 // ═══════════════════════════════════════════════════════════════
-function printExamCtf4aiWelcome(q, qNum) {
+function printExamCtf4aiWelcome(q, qNum, existingAnswer) {
     const config = getConfig();
     const modelName = config.geminiModel || 'gemma-4-31b-it';
+    const isResume = ctf4aiTokens > 0;
     console.log();
     console.log(chalk.red.bold(`  ═══ CTF4AI — Q${qNum}: ${q.category} (${q.points || 16} pts) ═══`));
+    if (isResume) {
+        console.log(chalk.gray(`  (resuming — prior chat is not remembered, but tokens already used stay deducted)`));
+    }
+    if (existingAnswer) {
+        console.log(chalk.gray(`  Current answer: `) + chalk.yellow(existingAnswer) + chalk.gray(`  (submit again to change)`));
+    }
     console.log();
     console.log(chalk.red('  ┌─────────────────────────────────────────────'));
     console.log(chalk.red('  │ ') + chalk.bold.white(`Q${qNum}  [${q.category}]  · adversarial AI`));
@@ -259,9 +266,26 @@ export async function startExamCtf4aiChat(qNum, question) {
     ctf4aiActive = true;
     ctf4aiTokens = usedSoFar;
     examCtf4aiCtx = { qNum, question };
-    printExamCtf4aiWelcome(question, qNum);
+    const existingAnswer = state.answers?.[qNum];
+    printExamCtf4aiWelcome(question, qNum, existingAnswer);
     return true;
 }
+const _ctf4aiWarned = new Set();
+function maybeWarnCtf4aiUsage(used, cap) {
+    const pct = (used / cap) * 100;
+    if (pct >= 95 && !_ctf4aiWarned.has('95')) {
+        console.log(chalk.red.bold(`  ⚠ ${Math.round(pct)}% of CTF4AI budget used — only ~${cap - used} tokens left.`));
+        _ctf4aiWarned.add('95');
+    }
+    else if (pct >= 80 && !_ctf4aiWarned.has('80')) {
+        console.log(chalk.yellow(`  ⚠ 80% of CTF4AI budget used.`));
+        _ctf4aiWarned.add('80');
+    }
+    else if (pct >= 50 && !_ctf4aiWarned.has('50')) {
+        console.log(chalk.gray(`  Note: 50% of CTF4AI budget used.`));
+        _ctf4aiWarned.add('50');
+    }
+}
 async function handleExamCtf4aiMessage(input) {
     if (!examCtf4aiCtx || !ctf4aiSession)
         return 'exit';
@@ -297,6 +321,13 @@ async function handleExamCtf4aiMessage(input) {
     const submitMatch = trimmed.match(/^submit\s+(.+)/i);
     if (submitMatch) {
         const flag = submitMatch[1].trim();
+        if (/^[A-Da-d]$/.test(flag)) {
+            console.log();
+            console.log(chalk.yellow(`  "${flag}" looks like an MCQ letter, not a flag.`));
+            console.log(chalk.gray('  Flag format: ') + chalk.green('ICOA{your_flag}') + chalk.gray('. Try again.'));
+            console.log();
+            return 'continue';
+        }
         const { getExamState, saveExamState } = await import('../lib/exam-state.js');
         const state = getExamState();
         if (!state)
@@ -312,32 +343,29 @@ async function handleExamCtf4aiMessage(input) {
             result: 'via ctf4ai chat',
         });
         state.answers[examCtf4aiCtx.qNum] = flag;
-        state._lastQ = examCtf4aiCtx.qNum;
+        // Advance _lastQ so `ctf4ai` after exit picks up Q40 automatically.
+        const nextQ = examCtf4aiCtx.qNum + 1;
+        state._lastQ = nextQ <= 40 ? nextQ : examCtf4aiCtx.qNum;
         saveExamState(state);
         console.log();
-        console.log(chalk.green.bold(`  ✓ Answer for Q${examCtf4aiCtx.qNum} recorded: ${flag}`));
+        if (prevAnswer) {
+            console.log(chalk.green(`  ✓ Q${examCtf4aiCtx.qNum} answer updated: `) + chalk.yellow(flag));
+            console.log(chalk.gray(`    Previous: ${prevAnswer}`));
+        }
+        else {
+            console.log(chalk.green.bold(`  ✓ Answer for Q${examCtf4aiCtx.qNum} recorded: ${flag}`));
+        }
         console.log(chalk.gray('    (Grading happens at exam submit.)'));
         console.log();
-        const savedQ = examCtf4aiCtx.qNum;
-        ctf4aiActive = false;
-        ctf4aiSession = null;
-        examCtf4aiCtx = null;
-        if (savedQ === 39) {
-            console.log(chalk.red('  ─────────────────────────────────────────────'));
-            console.log(chalk.white('  Next: ') + chalk.bold.red('Q40 — final question'));
-            console.log(chalk.gray('    → ') + chalk.bold.cyan('exam q 40') + chalk.gray('     jump to Q40'));
-            console.log(chalk.gray('    → ') + chalk.bold.red('ctf4ai') + chalk.gray('          start CTF4AI for Q40'));
-            console.log(chalk.red('  ─────────────────────────────────────────────'));
+        console.log(chalk.gray('  ') + chalk.white('submit ICOA{...}') + chalk.gray(' again to change, or ') + chalk.white('exit') + chalk.gray(' to move on'));
+        if (nextQ <= 40) {
+            console.log(chalk.gray('  After exit: ') + chalk.red('ctf4ai') + chalk.gray(` will open Q${nextQ}`));
         }
         else {
-            console.log(chalk.green('  ─────────────────────────────────────────────'));
-            console.log(chalk.bold.green('  All 40 questions answered! Time to submit.'));
-            console.log(chalk.gray('    → ') + chalk.bold.cyan('exam review') + chalk.gray('   sanity-check your answers'));
-            console.log(chalk.gray('    → ') + chalk.bold.cyan('exam submit') + chalk.gray('   final submission'));
-            console.log(chalk.green('  ─────────────────────────────────────────────'));
+            console.log(chalk.gray('  After exit: all 40 answered → ') + chalk.cyan('exam submit'));
         }
         console.log();
-        return 'exit';
+        return 'continue';
     }
     // Shell
     if (input.startsWith('!')) {
@@ -362,12 +390,25 @@ async function handleExamCtf4aiMessage(input) {
     // Exit
     if (lower === 'exit' || lower === 'back' || lower === 'quit') {
         const savedQ = examCtf4aiCtx.qNum;
+        const { getExamState } = await import('../lib/exam-state.js');
+        const exitState = getExamState();
+        const hasAnswer = exitState && exitState.answers[savedQ] != null;
+        const lastQ = (exitState?._lastQ) || savedQ;
         ctf4aiActive = false;
         ctf4aiSession = null;
         examCtf4aiCtx = null;
+        _ctf4aiWarned.clear();
         console.log();
         console.log(chalk.gray(`  CTF4AI chat ended for Q${savedQ}.`));
-        console.log(chalk.gray('  Resume: ') + chalk.white(`exam q ${savedQ}`) + chalk.gray('  ·  Re-enter: ') + chalk.white('ctf4ai'));
+        if (hasAnswer && savedQ === 39 && lastQ <= 40) {
+            console.log(chalk.white('  Next: ') + chalk.bold.red('Q40') + chalk.gray(' — type ') + chalk.red('ctf4ai') + chalk.gray(' to continue'));
+        }
+        else if (hasAnswer && savedQ === 40) {
+            console.log(chalk.bold.green('  All 40 answered! ') + chalk.gray('Review + submit: ') + chalk.cyan('exam review') + chalk.gray(' · ') + chalk.cyan('exam submit'));
+        }
+        else {
+            console.log(chalk.gray('  Resume: ') + chalk.white(`exam q ${savedQ}`) + chalk.gray('  ·  Re-enter: ') + chalk.white('ctf4ai'));
+        }
         console.log();
         return 'exit';
     }
@@ -398,6 +439,7 @@ async function handleExamCtf4aiMessage(input) {
         console.log();
         const pct = Math.round((ctf4aiTokens / EXAM_CTF4AI_CAP) * 100);
         console.log(chalk.gray(`  [${ctf4aiTokens}/${EXAM_CTF4AI_CAP} CTF4AI tokens · ${pct}%]`));
+        maybeWarnCtf4aiUsage(ctf4aiTokens, EXAM_CTF4AI_CAP);
         console.log();
     }
     catch (err) {

package/package.json

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