Merge branch 'codex/feedback-polish' into codex/daily-engagement

Author: gmval-g3

index.html

@@ -414,6 +414,7 @@ <h2 id="journal-title">SIGNAL LOG</h2>
   if (entityOccupiesTile(player, tx, ty)) return false;
   // Check other NPCs
   if (isTileReserved(npcs, tx, ty, npc)) return false;
+  if (getActiveFragmentAt(tx, ty)) return false;
   npc.facing = dir;
   npc.moveFromX = npc.tileX; npc.moveFromY = npc.tileY;
   npc.moveToX = tx; npc.moveToY = ty;
@@ -975,6 +976,12 @@ <h2 id="journal-title">SIGNAL LOG</h2>
   )) || null;
 }
 
+function getActiveFragmentAt(x, y) {
+  return signalFragments.find(fragment => (
+    !fragment.collected && fragment.x === x && fragment.y === y
+  )) || null;
+}
+
 function updateQuestUI() {
   const collected = signalFragments.filter(fragment => fragment.collected).length;
   questEl.textContent = quest.complete ? `FACTORY ONLINE · ${dailyChallenge.code}` : `SIGNALS ${collected}/${signalFragments.length} · ${dailyChallenge.code}`;
@@ -1053,6 +1060,16 @@ <h2 id="journal-title">SIGNAL LOG</h2>
   metrics.increment('replays');
 }
 
+function requestQuestReset(confirmReset) {
+  const message = 'Restart the journey? Recovered signals and the resident log will be cleared.';
+  const confirmed = typeof confirmReset === 'function' ?
+    confirmReset(message) :
+    typeof window.confirm === 'function' && window.confirm(message);
+  if (!confirmed) return false;
+  resetQuest();
+  return true;
+}
+
 function performAction() {
   if (player.state !== 'IDLE') return;
   const adjacentFragment = getFacingFragment();
@@ -1069,7 +1086,7 @@ <h2 id="journal-title">SIGNAL LOG</h2>
   canvas.focus({ preventScroll: true });
   performAction();
 });
-questResetButton.addEventListener('click', resetQuest);
+questResetButton.addEventListener('click', () => requestQuestReset());
 journalButton.addEventListener('click', () => {
   updateJournal();
   journalDialog.showModal();

tests/runtime-smoke.test.cjs

@@ -121,6 +121,18 @@ test('runtime initializes and renders a frame', () => {
     { discovered: true, blocked: 'BLOCKED', collected: true },
   );
 
+  const resetBehavior = vm.runInContext(`
+    discoveredNPCs.add('OVERSEER');
+    const cancelled = requestQuestReset(() => false);
+    const retained = fragment.collected && discoveredNPCs.has('OVERSEER');
+    const accepted = requestQuestReset(() => true);
+    ({ cancelled, retained, accepted, cleared: !fragment.collected && discoveredNPCs.size === 0 });
+  `, sandbox);
+  assert.deepEqual(
+    { ...resetBehavior },
+    { cancelled: false, retained: true, accepted: true, cleared: true },
+  );
+
   const completion = vm.runInContext(`
     for (const fragment of signalFragments) {
       fragment.discovered = true;
@@ -157,10 +169,16 @@ test('NPC movement rejects a destination reserved earlier in the frame', () => {
     npcs.length = 0;
     const first = makeNPC('worker', 9, 11, 'east');
     const second = makeNPC('worker', 11, 11, 'west');
-    npcs.push(first, second);
-    ({ first: npcStartMove(first, 'east', 200), second: npcStartMove(second, 'west', 200) });
+    const fragment = signalFragments[0];
+    const fragmentSeeker = makeNPC('worker', fragment.x - 1, fragment.y, 'east');
+    npcs.push(first, second, fragmentSeeker);
+    ({
+      first: npcStartMove(first, 'east', 200),
+      second: npcStartMove(second, 'west', 200),
+      fragment: npcStartMove(fragmentSeeker, 'east', 200),
+    });
   `, sandbox);
-  assert.deepEqual({ ...result }, { first: true, second: false });
+  assert.deepEqual({ ...result }, { first: true, second: false, fragment: false });
 });
 
 test('interaction waits for a moving NPC to finish its tile step', () => {