quizmill 0.2.3 → 0.2.5

package/bin/quizmill.js

@@ -23,6 +23,7 @@ const path = require('node:path');
 const ENGINE_REPO = 'https://github.com/quizmill/quizmill.git';
 const HOME = process.env.QUIZMILL_HOME || path.join(os.homedir(), '.quizmill');
 const ENGINE = process.env.QUIZMILL_ENGINE || path.join(HOME, 'engine');
+const CLI_VERSION = require('../package.json').version;
 
 const log = (s) => console.log(s);
 const die = (s) => {
@@ -46,9 +47,27 @@ function ensureEngine() {
   }
 }
 
+function engineSha() {
+  try {
+    return execSync('git rev-parse --short HEAD', { cwd: ENGINE }).toString().trim();
+  } catch {
+    return '?';
+  }
+}
+
 function engineNpm(args) {
   ensureEngine();
-  run('npm', args, { cwd: ENGINE });
+  const env = { ...process.env };
+  // The cached engine is a shallow, tagless clone, so its own
+  // `git describe` can't resolve a release tag — the in-app version would
+  // fall back to the 0.0.0-dev sentinel. Stamp the build with the CLI's
+  // version instead (the CLI is published in lockstep with the engine).
+  // Skipped when QUIZMILL_ENGINE points at a real checkout (let its git
+  // tags win) or when the caller set the version explicitly.
+  if (!process.env.QUIZMILL_ENGINE && !env.NEXT_PUBLIC_APP_VERSION) {
+    env.NEXT_PUBLIC_APP_VERSION = CLI_VERSION;
+  }
+  run('npm', args, { cwd: ENGINE, env });
 }
 
 /** Resolve a pack argument: absolute path for dirs, verbatim otherwise
@@ -152,11 +171,27 @@ function cmdValidate(arg) {
 
 function cmdUpgrade() {
   ensureEngine();
-  if (!process.env.QUIZMILL_ENGINE) {
-    run('git', ['pull', '--ff-only'], { cwd: ENGINE });
+  if (process.env.QUIZMILL_ENGINE) {
+    log('QUIZMILL_ENGINE points at your own checkout — its update is up to you.');
+  } else {
+    const before = engineSha();
+    try {
+      // The cache is a depth-1 shallow clone, so `git pull --ff-only` can't
+      // fast-forward across the grafted history once main advances. Fetch
+      // the latest main and hard-reset onto it — the cache holds no local
+      // commits worth keeping (gitignored content/ and out/ are untouched).
+      run('git', ['fetch', '--depth', '1', 'origin', 'main'], { cwd: ENGINE });
+      run('git', ['reset', '--hard', 'FETCH_HEAD'], { cwd: ENGINE });
+    } catch {
+      log('… update failed — re-cloning the engine fresh');
+      fs.rmSync(ENGINE, { recursive: true, force: true });
+      ensureEngine();
+    }
+    const after = engineSha();
+    log(before === after ? `engine already current (${after})` : `engine ${before} → ${after}`);
   }
   run('npm', ['install', '--no-fund', '--no-audit'], { cwd: ENGINE });
-  log('✓ engine up to date');
+  log(`✓ quizmill ${CLI_VERSION} ready — engine deps installed`);
 }
 
 const HELP = `quizmill — the mill that grinds questions into knowledge
@@ -169,6 +204,7 @@ usage:
   quizmill build [dir|owner/repo]  build a static app into <pack-id>-app/
   quizmill list                 published packs you can install
   quizmill upgrade              update the cached engine (~/.quizmill)
+  quizmill --version            print the CLI version (stamped into builds)
 
 A learning pack is three JSON files. You can write them, but the
 intended author is your AI agent — see the create-learning-pack skill
@@ -183,6 +219,9 @@ try {
     case 'build':     cmdBuild(arg); break;
     case 'list':      engineNpm(['run', 'pack:list']); break;
     case 'upgrade':   cmdUpgrade(); break;
+    case 'version':
+    case '--version':
+    case '-v':        log(CLI_VERSION); break;
     case 'help':
     case '--help':
     case undefined:   log(HELP); break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quizmill",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "Turn a folder of JSON into an installable, offline-first practice app. The mill that grinds questions into knowledge.",
   "bin": {
     "quizmill": "bin/quizmill.js"