some stuff

.github/workflows/build.yml

@@ -1,8 +1,6 @@
 name: Build
 run-name: Build the project
-on:
+on: [push]
-  workflow_dispatch:
-  push:
 jobs:
   build:
     runs-on: ubuntu-latest

.vscode/ltex.dictionary.en-US.txt

@@ -1,7 +0,0 @@
-GameSkeleton
-HiddenTactic
-subgoals
-KaTex
-gameserver
-lakefile
-Zulip

README.md

@@ -1,6 +1,6 @@
 # Lean 4 Game
 
-This is the source code for a Lean game platform hosted at [adam.math.hhu.de](https://adam.math.hhu.de).
+This is the source code for a Lean 4 game platform hosted at [adam.math.hhu.de](https://adam.math.hhu.de).
 
 ## Creating a Game
 
@@ -9,7 +9,6 @@ Please follow the tutorial [Creating a Game](doc/create_game.md). In particular,
 * Step 5: [How to Run Games Locally](doc/running_locally.md)
 * Step 7: [How to Update an existing Game](doc/update_game.md)
 * Step 8: [How to Publishing a Game](doc/publish_game.md)
-* [Troubleshooting](doc/troubleshoot.md)
 
 ## Documentation
 
@@ -29,9 +28,7 @@ should be up-to-date:
 
 ### Backend
 
-not fully written yet.
+not written yet
-
-* [Server](doc/DOCUMENTATION.md): describes the server part (i.e. the content of `server/` und `relay/`).
 
 ## Contributing
 
@@ -43,8 +40,7 @@ Providing the use access to a Lean instance running on the server is a severe se
 
 ## Credits
 
-The project has pimarily been developed by Alexander Bentkamp and Jon Eugster.
+The project is based on ideas from the [Lean Game Maker](https://github.com/mpedramfar/Lean-game-maker) and the [Natural Number Game
-
-It is based on ideas from the [Lean Game Maker](https://github.com/mpedramfar/Lean-game-maker) and the [Natural Number Game
 (NNG)](https://www.ma.imperial.ac.uk/~buzzard/xena/natural_number_game/)
-by Kevin Buzzard and Mohammad Pedramfar, and on Patrick Massot's prototype: [NNG4](https://github.com/PatrickMassot/NNG4).
+by Kevin Buzzard and Mohammad Pedramfar.
+The project is based on Patrick Massot's prototype: [NNG4](https://github.com/PatrickMassot/NNG4).

client/public/worker.js

@@ -0,0 +1,93 @@
+var stderrBuffer = ""
+var messageBuffer = []
+var initialized = false;
+var flushing = false;
+
+var headerMode = true;
+var header="";
+var re = /Content-Length: (\d+)\r\n/i;
+var contentLength = 0;
+var content = []
+var utf8decoder = new TextDecoder();
+
+
+function flushMessageBuffer(){
+  if (initialized && !flushing) {
+    while(messageBuffer.length > 0) {
+      flushing = true;
+      var msg = messageBuffer.shift();
+      console.log(`Send message: ${msg}`);
+      Module.ccall('send_message', 'void', ['string'], [msg]);
+      console.log(`Message done: ${msg}`);
+    }
+    flushing = false;
+  }
+}
+
+var Module = {
+  "arguments": ["--worker"],
+  "preRun": [function() {
+    function stdin() {
+      return null;
+    }
+
+    function stdout(asciiCode) {
+      if (headerMode) {
+        header += String.fromCharCode(asciiCode)
+        if (header.endsWith('\r\n\r\n')) {
+          const found = header.match(re)
+          if (found == null) { console.error(`Invalid header: ${header}`) }
+          contentLength = parseInt(found[1])
+          content = []
+          headerMode = false
+        }
+      } else {
+        content.push(asciiCode)
+        if (content.length == contentLength) {
+          const message = utf8decoder.decode(new Uint8Array(content))
+          console.log(`Server: ${message}`)
+          postMessage(message);
+          headerMode = true
+          header = ''
+        }
+      }
+    }
+
+    function stderr(asciiCode) {
+      stderrBuffer += String.fromCharCode(asciiCode)
+    }
+
+    FS.init(stdin, stdout, stderr);
+  }],
+  "noInitialRun": true,
+  "onRuntimeInitialized": () => {
+    Module.ccall('main', 'void', [], []);
+    initialized = true;
+    if (stderrBuffer !== "") {
+      console.log(stderrBuffer);
+      stderrBuffer = ""
+    }
+    flushMessageBuffer();
+  }
+};
+
+importScripts("server.js")
+
+
+
+onmessage = (ev) => {
+  console.log(`Client: ${ev.data}`)
+  messageBuffer.push(ev.data);
+  flushMessageBuffer();
+}
+
+setInterval(() => {
+  if (stderrBuffer !== "") {
+    console.log(stderrBuffer);
+    stderrBuffer = ""
+  }
+}, 1000)
+
+setTimeout(() =>{
+
+},2000)

client/src/app.tsx

@@ -8,24 +8,40 @@ import '@fontsource/roboto/700.css';
 
 import './css/reset.css';
 import './css/app.css';
-import { PreferencesContext} from './components/infoview/context';
+import { MobileContext } from './components/infoview/context';
-import UsePreferences from "./state/hooks/use_preferences"
+import { useMobile } from './hooks';
+import { AUTO_SWITCH_THRESHOLD, getWindowDimensions} from './state/preferences';
 
 export const GameIdContext = React.createContext<string>(undefined);
 
 function App() {
+  const { mobile, setMobile, lockMobile, setLockMobile } = useMobile();
 
   const params = useParams()
   const gameId = "g/" + params.owner + "/" + params.repo
 
-  const {mobile, layout, isSavePreferences, setLayout, setIsSavePreferences} = UsePreferences()
+  const automaticallyAdjustLayout = () => {
+    const {width} = getWindowDimensions()
+    setMobile(width < AUTO_SWITCH_THRESHOLD)
+  }
+
+  React.useEffect(()=>{
+    if (!lockMobile){
+      void automaticallyAdjustLayout()
+      window.addEventListener('resize', automaticallyAdjustLayout)
+
+      return () => {
+        window.removeEventListener('resize', automaticallyAdjustLayout)
+      }
+    }
+  }, [lockMobile])
 
   return (
     <div className="app">
       <GameIdContext.Provider value={gameId}>
-          <PreferencesContext.Provider value={{mobile, layout, isSavePreferences, setLayout, setIsSavePreferences}}>
+        <MobileContext.Provider value={{mobile, setMobile, lockMobile, setLockMobile}}>
-            <Outlet />
+          <Outlet />
-          </PreferencesContext.Provider>
+        </MobileContext.Provider>
       </GameIdContext.Provider>
     </div>
   )

client/src/components/app_bar.tsx

@@ -7,7 +7,7 @@ import { faDownload, faUpload, faEraser, faBook, faBookOpen, faGlobe, faHome,
   faArrowRight, faArrowLeft, faXmark, faBars, faCode,
   faCircleInfo, faTerminal, faMobileScreenButton, faDesktop, faGear } from '@fortawesome/free-solid-svg-icons'
 import { GameIdContext } from "../app"
-import { InputModeContext, PreferencesContext, WorldLevelIdContext } from "./infoview/context"
+import { InputModeContext, MobileContext, WorldLevelIdContext } from "./infoview/context"
 import { GameInfo, useGetGameInfoQuery } from '../state/api'
 import { changedOpenedIntro, selectCompleted, selectDifficulty, selectProgress } from '../state/progress'
 import { useAppDispatch, useAppSelector } from '../hooks'
@@ -162,7 +162,7 @@ export function WelcomeAppBar({pageNumber, setPageNumber, gameInfo, toggleImpres
 }) {
   const gameId = React.useContext(GameIdContext)
   const gameProgress = useAppSelector(selectProgress(gameId))
-  const {mobile} = React.useContext(PreferencesContext)
+  const {mobile, setMobile} = React.useContext(MobileContext)
   const [navOpen, setNavOpen] = React.useState(false)
 
   return <div className="app-bar">
@@ -212,7 +212,7 @@ export function LevelAppBar({isLoading, levelTitle, toggleImpressum, pageNumber=
 }) {
   const gameId = React.useContext(GameIdContext)
   const {worldId, levelId} = React.useContext(WorldLevelIdContext)
-  const {mobile} = React.useContext(PreferencesContext)
+  const {mobile} = React.useContext(MobileContext)
   const [navOpen, setNavOpen] = React.useState(false)
   const gameInfo = useGetGameInfoQuery({game: gameId})
   const completed = useAppSelector(selectCompleted(gameId, worldId, levelId))

client/src/components/hints.tsx

@@ -1,42 +1,22 @@
-import { GameHint, InteractiveGoalsWithHints, ProofState } from "./infoview/rpc_api";
+import { GameHint } from "./infoview/rpc_api";
 import * as React from 'react';
 import Markdown from './markdown';
-import { DeletedChatContext, ProofContext } from "./infoview/context";
+import { ProofStep } from "./infoview/context";
-import { lastStepHasErrors } from "./infoview/goals";
-import { Button } from "./button";
-
-/** Plug-in the variable names in a hint. We do this client-side to prepare
- * for i18n in the future. i.e. one should be able translate the `rawText`
- * and have the variables substituted just before displaying.
- */
-function getHintText(hint: GameHint): string {
-  if (hint.rawText) {
-    // Replace the variable names used in the hint with the ones used by the player
-    // variable names are marked like `«{g}»` inside the text.
-    return hint.rawText.replaceAll(/«\{(.*?)\}»/g, ((_, v) =>
-      // `hint.varNames` contains tuples `[oldName, newName]`
-      (hint.varNames.find(x => x[0] == v))[1]))
-  } else {
-    // hints created in the frontend do not have a `rawText`
-    // TODO: `hint.text` could be removed in theory.
-    return hint.text
-  }
-}
 
 export function Hint({hint, step, selected, toggleSelection, lastLevel} : {hint: GameHint, step: number, selected: number, toggleSelection: any, lastLevel?: boolean}) {
   return <div className={`message information step-${step}` + (step == selected ? ' selected' : '') + (lastLevel ? ' recent' : '')} onClick={toggleSelection}>
-    <Markdown>{getHintText(hint)}</Markdown>
+    <Markdown>{hint.text}</Markdown>
   </div>
 }
 
 export function HiddenHint({hint, step, selected, toggleSelection, lastLevel} : {hint: GameHint, step: number, selected: number, toggleSelection: any, lastLevel?: boolean}) {
   return <div className={`message warning step-${step}` + (step == selected ? ' selected' : '') + (lastLevel ? ' recent' : '')} onClick={toggleSelection}>
-    <Markdown>{getHintText(hint)}</Markdown>
+    <Markdown>{hint.text}</Markdown>
   </div>
 }
 
 export function Hints({hints, showHidden, step, selected, toggleSelection, lastLevel} : {hints: GameHint[], showHidden: boolean, step: number, selected: number, toggleSelection: any, lastLevel?: boolean}) {
-  if (!hints) {return <></>}
+
   const openHints = hints.filter(hint => !hint.hidden)
   const hiddenHints = hints.filter(hint => hint.hidden)
 
@@ -49,7 +29,7 @@ export function Hints({hints, showHidden, step, selected, toggleSelection, lastL
 
 export function DeletedHint({hint} : {hint: GameHint}) {
   return <div className="message information deleted-hint">
-    <Markdown>{getHintText(hint)}</Markdown>
+    <Markdown>{hint.text}</Markdown>
   </div>
 }
 
@@ -66,52 +46,22 @@ export function DeletedHints({hints} : {hints: GameHint[]}) {
 }
 
 /** Filter hints to not show consequtive identical hints twice.
- * Hidden hints are not filtered.
+ *
+ * This function takes a `ProofStep[]` and extracts the hints in form of an
+ * element of type `GameHint[][]` where it removes hints that are identical to hints
+ * appearing in the previous step. Hidden hints are not filtered.
+ *
+ * This effectively means we prevent consequtive identical hints from being shown.
  */
-export function filterHints(hints: GameHint[], prevHints: GameHint[]): GameHint[] {
+export function filterHints(proof: ProofStep[]): GameHint[][] {
-  if (!hints) {
+  return proof.map((step, i) => {
-    return []}
+    if (i == 0){
-  else if (!prevHints) {
+      return step.hints
-    return hints }
-  else {
-    return hints.filter((hint) => hint.hidden ||
-    (prevHints.find(x => (x.text == hint.text && x.hidden == hint.hidden)) === undefined)
-    )
-  }
-}
-
-
-function hasHiddenHints(step: InteractiveGoalsWithHints): boolean {
-  return step?.goals[0]?.hints.some((hint) => hint.hidden)
-}
-
-
-export function MoreHelpButton({selected=null} : {selected?: number}) {
-
-  const {proof, setProof} = React.useContext(ProofContext)
-  const {deletedChat, setDeletedChat, showHelp, setShowHelp} = React.useContext(DeletedChatContext)
-
-  let k = (selected === null) ? (proof.steps.length - (lastStepHasErrors(proof) ? 2 : 1)) : selected
-
-  const activateHiddenHints = (ev) => {
-    // If the last step (`k`) has errors, we want the hidden hints from the
-    // second-to-last step to be affected
-    if (!(proof.steps.length)) {return}
-
-    // state must not be mutated, therefore we need to clone the set
-    let tmp = new Set(showHelp)
-    if (tmp.has(k)) {
-      tmp.delete(k)
     } else {
-      tmp.add(k)
+      // TODO: Writing all fields explicitely is somewhat fragile to changes, is there a
+      // good way to shallow-compare objects?
+      return step.hints.filter((hint) => hint.hidden ||
+        (proof[i-1].hints.find((x) => (x.text == hint.text && x.hidden == hint.hidden)) === undefined))
     }
-    setShowHelp(tmp)
+  })
-    console.debug(`help: ${Array.from(tmp.values())}`)
-  }
-
-  if (hasHiddenHints(proof.steps[k]) && !showHelp.has(k)) {
-    return <Button to="" onClick={activateHiddenHints}>
-      Show more help!
-    </Button>
-  }
 }

client/src/components/infoview/context.ts

@@ -3,48 +3,45 @@
  */
 import * as React from 'react';
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api.js'
-import { InteractiveDiagnostic } from '@leanprover/infoview-api';
+import { InteractiveDiagnostic, InteractiveTermGoal } from '@leanprover/infoview-api';
-import { GameHint, InteractiveGoal, InteractiveTermGoal,InteractiveGoalsWithHints, ProofState } from './rpc_api';
+import { GameHint, InteractiveGoal, InteractiveGoals } from './rpc_api';
-import { PreferencesState } from '../../state/preferences';
 
 export const MonacoEditorContext = React.createContext<monaco.editor.IStandaloneCodeEditor>(
   null as any)
 
 export type InfoStatus = 'updating' | 'error' | 'ready';
 
-// /** One step of the proof */
+/** One step of the proof */
-// export type ProofStep = {
+export type ProofStep = {
-//   /** The command in this step */
+  /** The command in this step */
-//   command : string
+  command : string
-//   /** List of goals *after* this command */
+  /** List of goals *after* this command */
-//   goals: InteractiveGoal[]     // TODO: Add correct type
+  goals: InteractiveGoal[]     // TODO: Add correct type
-//   /** Story relevant messages */
+  /** Story relevant messages */
-//   hints: GameHint[]        // TODO: Add correct type
+  hints: GameHint[]        // TODO: Add correct type
-//   /** Errors and warnings */
+  /** Errors and warnings */
-//   errors: InteractiveDiagnostic[]       // TODO: Add correct type
+  errors: InteractiveDiagnostic[]       // TODO: Add correct type
-// }
+}
 
 /** The context storing the proof step-by-step for the command line mode */
 export const ProofContext = React.createContext<{
   /** The proof consists of multiple steps that are processed one after the other.
    * In particular multi-line terms like `match`-statements will not be supported.
    *
-   * Note that the first step will always have "" as command
+   * Note that the first step will always have `null` as command
    */
-  proof: ProofState,
+  proof: ProofStep[],
-  setProof: React.Dispatch<React.SetStateAction<ProofState>>
+  setProof: React.Dispatch<React.SetStateAction<Array<ProofStep>>>
 }>({
-  proof: {steps: [], diagnostics: [], completed: false},
+  proof: [],
-  setProof: () => {}
+  setProof: () => {} // TODO: implement me
 })
 
-
-// TODO: Do we still need that?
 export interface ProofStateProps {
   // pos: DocumentPosition;
   status: InfoStatus;
   messages: InteractiveDiagnostic[];
-  goals?: InteractiveGoalsWithHints;
+  goals?: InteractiveGoals;
   termGoal?: InteractiveTermGoal;
   error?: string;
   // userWidgets: UserWidgetInstance[];
@@ -52,31 +49,31 @@ export interface ProofStateProps {
   // triggerUpdate: () => Promise<void>;
 }
 
-// export const ProofStateContext = React.createContext<{
+export const ProofStateContext = React.createContext<{
-//   proofState : ProofStateProps,
+  proofState : ProofStateProps,
-//   setProofState: React.Dispatch<React.SetStateAction<ProofStateProps>>
+  setProofState: React.Dispatch<React.SetStateAction<ProofStateProps>>
-// }>({
+}>({
-//   proofState : {
+  proofState : {
-//     status: 'updating',
+    status: 'updating',
-//     messages: [],
+    messages: [],
-//     goals: undefined,
+    goals: undefined,
-//     termGoal: undefined,
+    termGoal: undefined,
-//     error: undefined},
+    error: undefined},
-//   setProofState: () => {},
+  setProofState: () => {},
-// })
+})
 
-export interface IPreferencesContext extends PreferencesState{
+export interface IMobileContext {
-  mobile: boolean, // The variables that actually control the page 'layout' can only be changed through layout.
+  mobile : boolean,
-  setLayout: React.Dispatch<React.SetStateAction<PreferencesState["layout"]>>;
+  setMobile: React.Dispatch<React.SetStateAction<Boolean>>,
-  setIsSavePreferences: React.Dispatch<React.SetStateAction<Boolean>>;
+  lockMobile: boolean,
+  setLockMobile: React.Dispatch<React.SetStateAction<Boolean>>,
 }
 
-export const PreferencesContext = React.createContext<IPreferencesContext>({
+export const MobileContext = React.createContext<IMobileContext>({
   mobile: false,
-  layout: "auto",
+  setMobile: () => {},
-  isSavePreferences: false,
+  lockMobile: false,
-  setLayout: () => {},
+  setLockMobile: () => {}
-  setIsSavePreferences: () => {}
 })
 
 export const WorldLevelIdContext = React.createContext<{

client/src/components/infoview/goals.tsx

@@ -10,10 +10,7 @@ import { Locations, LocationsContext, SelectableLocation } from '../../../../nod
 import { InteractiveCode } from '../../../../node_modules/lean4-infoview/src/infoview/interactiveCode'
 import { WithTooltipOnHover } from '../../../../node_modules/lean4-infoview/src/infoview/tooltips';
 import { InputModeContext } from './context';
-import { InteractiveGoal, InteractiveGoals, InteractiveGoalsWithHints, InteractiveHypothesisBundle, ProofState } from './rpc_api';
+import { InteractiveGoal, InteractiveGoals, InteractiveHypothesisBundle } from './rpc_api';
-import { RpcSessionAtPos } from '@leanprover/infoview/*';
-import { DocumentPosition } from '../../../../node_modules/lean4-infoview/src/infoview/util';
-import { DiagnosticSeverity } from 'vscode-languageserver-protocol';
 
 /** Returns true if `h` is inaccessible according to Lean's default name rendering. */
 function isInaccessibleName(h: string): boolean {
@@ -42,11 +39,7 @@ function goalToString(g: InteractiveGoal): string {
 }
 
 export function goalsToString(goals: InteractiveGoals): string {
-    return goals.goals.map(g => goalToString(g)).join('\n\n')
+    return goals.goals.map(goalToString).join('\n\n')
-}
-
-export function goalsWithHintsToString(goals: InteractiveGoalsWithHints): string {
-    return goals.goals.map(g => goalToString(g.goal)).join('\n\n')
 }
 
 interface GoalFilterState {
@@ -262,16 +255,16 @@ export const ProofDisplay = React.memo((props : ProofDisplayProps) => {
 })
 
 interface GoalsProps {
-    goals: InteractiveGoalsWithHints
+    goals: InteractiveGoals
     filter: GoalFilterState
 }
 
 export function Goals({ goals, filter }: GoalsProps) {
     if (goals.goals.length === 0) {
-        return <></>
+        return <>No goals</>
     } else {
         return <>
-          {goals.goals.map((g, i) => <Goal typewriter={false} key={i} goal={g.goal} filter={filter} />)}
+          {goals.goals.map((g, i) => <Goal typewriter={false} key={i} goal={g} filter={filter} />)}
         </>
     }
 }
@@ -283,7 +276,7 @@ interface FilteredGoalsProps {
      * When this is `undefined`, the component will not appear at all but will remember its state
      * by virtue of still being mounted in the React tree. When it does appear again, the filter
      * settings and collapsed state will be as before. */
-    goals?: InteractiveGoalsWithHints
+    goals?: InteractiveGoals
 }
 
 /**
@@ -298,7 +291,7 @@ export const FilteredGoals = React.memo(({ headerChildren, goals }: FilteredGoal
             data-id="copy-goal-to-comment"
             onClick={e => {
                 e.preventDefault();
-                if (goals) void ec.copyToComment(goalsWithHintsToString(goals))
+                if (goals) void ec.copyToComment(goalsToString(goals))
             }}
             title="copy state to comment" />
 
@@ -343,112 +336,3 @@ export const FilteredGoals = React.memo(({ headerChildren, goals }: FilteredGoal
         </details>
     </div>
 })
-
-export function loadGoals(
-    rpcSess: RpcSessionAtPos,
-    uri: string,
-    setProof: React.Dispatch<React.SetStateAction<ProofState>>) {
-  console.info('sending rpc request to load the proof state')
-
-  rpcSess.call('Game.getProofState', DocumentPosition.toTdpp({line: 0, character: 0, uri: uri})).then(
-    (proof : ProofState) => {
-      console.info(`received a proof state!`)
-      console.log(proof)
-      setProof(proof)
-
-
-
-
-      // let tmpProof : ProofStep[] = []
-
-      // let goalCount = 0
-
-      // steps.map((goals, i) => {
-      //   // The first step has an empty command and therefore also no error messages
-      //   // Usually there is a newline at the end of the editors content, so we need to
-      //   // display diagnostics from potentally two lines in the last step.
-      //   let messages = i ? (i == steps.length - 1 ? diagnostics.slice(i-1).flat() : diagnostics[i-1]) : []
-
-      //   // Filter out the 'unsolved goals' message
-      //   messages = messages.filter((msg) => {
-      //     return !("append" in msg.message &&
-      //       "text" in msg.message.append[0] &&
-      //       msg.message.append[0].text === "unsolved goals")
-      //   })
-
-      //   if (typeof goals == 'undefined') {
-      //     tmpProof.push({
-      //       command: i ? model.getLineContent(i) : '',
-      //       goals: [],
-      //       hints: [],
-      //       errors: messages
-      //     } as ProofStep)
-      //     console.debug('goals is undefined')
-      //     return
-      //   }
-
-      //   // If the number of goals reduce, show a message
-      //   if (goals.length && goalCount > goals.length) {
-      //     messages.unshift({
-      //       range: {
-      //         start: {
-      //           line: i-1,
-      //           character: 0,
-      //         },
-      //         end: {
-      //           line: i-1,
-      //           character: 0,
-      //         }},
-      //       severity: DiagnosticSeverity.Information,
-      //       message: {
-      //       text: 'intermediate goal solved 🎉'
-      //       }
-      //     })
-      //   }
-      //   goalCount = goals.length
-
-      //   // with no goals there will be no hints.
-      //   let hints : GameHint[] = goals.length ? goals[0].hints : []
-
-      //   console.debug(`Command (${i}): `, i ? model.getLineContent(i) : '')
-      //   console.debug(`Goals: (${i}): `, goalsToString(goals)) //
-      //   console.debug(`Hints: (${i}): `, hints)
-      //   console.debug(`Errors: (${i}): `, messages)
-
-      //   tmpProof.push({
-      //     // the command of the line above. Note that `getLineContent` starts counting
-      //     // at `1` instead of `zero`. The first ProofStep will have an empty command.
-      //     command: i ? model.getLineContent(i) : '',
-      //     // TODO: store correct data
-      //     goals: goals.map(g => g.goal),
-      //     // only need the hints of the active goals in chat
-      //     hints: hints,
-      //     // errors and messages from the server
-      //     errors: messages
-      //   } as ProofStep)
-
-      // })
-      // // Save the proof to the context
-      // setProof(tmpProof)
-
-
-
-    }
-  )
-}
-
-
-export function lastStepHasErrors (proof : ProofState): boolean {
-  if (!proof?.steps.length) {return false}
-
-  let diags = [...proof.steps[proof.steps.length - 1].diags, ...proof.diagnostics]
-
-  return diags.some(
-    (d) => (d.severity == DiagnosticSeverity.Error ) // || d.severity == DiagnosticSeverity.Warning
-  )
-}
-
-export function isLastStepWithErrors (proof : ProofState, i: number): boolean {
-  if (!proof?.steps.length) {return false}
-  return (i == proof.steps.length - 1) && lastStepHasErrors(proof)
-}

client/src/components/infoview/info.tsx

@@ -4,7 +4,7 @@ import * as React from 'react'
 import { CircularProgress } from '@mui/material'
 import type { Location, Diagnostic } from 'vscode-languageserver-protocol'
 import { getInteractiveTermGoal, InteractiveDiagnostic, UserWidgetInstance, Widget_getWidgets, RpcSessionAtPos, isRpcError,
-  RpcErrorCode, getInteractiveDiagnostics } from '@leanprover/infoview-api'
+  RpcErrorCode, getInteractiveDiagnostics, InteractiveTermGoal } from '@leanprover/infoview-api'
 import { basename, DocumentPosition, RangeHelpers, useEvent, usePausableState, discardMethodNotFound,
   mapRpcError, useAsyncWithTrigger, PausableProps } from '../../../../node_modules/lean4-infoview/src/infoview/util'
 import { ConfigContext, EditorContext, LspDiagnosticsContext, ProgressContext } from '../../../../node_modules/lean4-infoview/src/infoview/contexts'
@@ -14,7 +14,7 @@ import { GoalsLocation, Locations, LocationsContext } from '../../../../node_mod
 
 import { AllMessages, lspDiagToInteractive } from './messages'
 import { goalsToString, Goal, MainAssumptions, OtherGoals, ProofDisplay } from './goals'
-import { InteractiveTermGoal, InteractiveGoalsWithHints, InteractiveGoals, ProofState } from './rpc_api'
+import { InteractiveGoals } from './rpc_api'
 import { MonacoEditorContext, ProofStateProps, InfoStatus, ProofContext } from './context'
 
 // TODO: All about pinning could probably be removed
@@ -83,11 +83,11 @@ interface InfoDisplayContentProps extends PausableProps {
   error?: string
   userWidgets: UserWidgetInstance[]
   triggerUpdate: () => Promise<void>
-  proofString? : string
+  proof? : string
 }
 
 const InfoDisplayContent = React.memo((props: InfoDisplayContentProps) => {
-    const {pos, messages, goals, termGoal, error, userWidgets, triggerUpdate, isPaused, setPaused, proofString} = props
+    const {pos, messages, goals, termGoal, error, userWidgets, triggerUpdate, isPaused, setPaused, proof} = props
 
     const hasWidget = userWidgets.length > 0
     const hasError = !!error
@@ -114,8 +114,7 @@ const InfoDisplayContent = React.memo((props: InfoDisplayContentProps) => {
 
     const goalFilter = { reverse: false, showType: true, showInstance: true, showHiddenAssumption: true, showLetValue: true }
     /* Adding {' '} to manage string literals properly: https://reactjs.org/docs/jsx-in-depth.html#string-literals-1 */
-
+    return <>
-   return <>
         {hasError &&
             <div className='error' key='errors'>
                 Error updating:{' '}{error}.
@@ -138,7 +137,7 @@ const InfoDisplayContent = React.memo((props: InfoDisplayContentProps) => {
         {userWidgets.map(widget =>
           <details key={`widget::${widget.id}::${widget.range?.toString()}`} open>
             <summary className='mv2 pointer'>{widget.name}</summary>
-            <PanelWidgetDisplay pos={pos} goals={goals ? goals.goals : []}
+            <PanelWidgetDisplay pos={pos} goals={goals ? goals.goals.map (goal => goal) : []}
               termGoal={termGoal} selectedLocations={selectedLocs} widget={widget}/>
           </details>
         )}
@@ -167,7 +166,6 @@ interface InfoDisplayProps {
   pos: DocumentPosition,
   status: InfoStatus,
   messages: InteractiveDiagnostic[],
-  proof?: ProofState,
   goals?: InteractiveGoals,
   termGoal?: InteractiveTermGoal,
   error?: string,
@@ -177,7 +175,7 @@ interface InfoDisplayProps {
 }
 
 /** Displays goal state and messages. Can be paused. */
-function InfoDisplay(props0: InfoDisplayProps & InfoPinnable) {
+function InfoDisplay(props0: ProofStateProps & InfoDisplayProps & InfoPinnable) {
     // Used to update the paused state *just once* if it is paused,
     // but a display update is triggered
     const [shouldRefresh, setShouldRefresh] = React.useState<boolean>(false)
@@ -216,7 +214,7 @@ function InfoDisplay(props0: InfoDisplayProps & InfoPinnable) {
     {/* <details open> */}
         {/* <InfoStatusBar {...props} triggerUpdate={triggerDisplayUpdate} isPaused={isPaused} setPaused={setPaused} /> */}
         <div className="vscode-light">
-            <InfoDisplayContent {...props} proofString={editor.getValue()} triggerUpdate={triggerDisplayUpdate} isPaused={isPaused} setPaused={setPaused} />
+            <InfoDisplayContent {...props} proof={editor.getValue()} triggerUpdate={triggerDisplayUpdate} isPaused={isPaused} setPaused={setPaused} />
         </div>
     {/* </details> */}
     </RpcContext.Provider>
@@ -254,7 +252,7 @@ function useIsProcessingAt(p: DocumentPosition): boolean {
 
 function InfoAux(props: InfoProps) {
 
-    const { setProof } = React.useContext(ProofContext)
+    const proofContext = React.useContext(ProofContext)
 
     const config = React.useContext(ConfigContext)
 
@@ -292,8 +290,6 @@ function InfoAux(props: InfoProps) {
     // with e.g. a new `pos`.
     type InfoRequestResult = Omit<InfoDisplayProps, 'triggerUpdate'>
     const [state, triggerUpdateCore] = useAsyncWithTrigger(() => new Promise<InfoRequestResult>((resolve, reject) => {
-
-        const proofReq = rpcSess.call('Game.getProofState', DocumentPosition.toTdpp(pos))
         const goalsReq = rpcSess.call('Game.getInteractiveGoals', DocumentPosition.toTdpp(pos))
         const termGoalReq = getInteractiveTermGoal(rpcSess, DocumentPosition.toTdpp(pos))
         const widgetsReq = Widget_getWidgets(rpcSess, pos).catch(discardMethodNotFound)
@@ -312,7 +308,6 @@ function InfoAux(props: InfoProps) {
                 pos,
                 status: 'updating',
                 messages: lspDiagsHere.map(lspDiagToInteractive),
-                proof: undefined,
                 goals: undefined,
                 termGoal: undefined,
                 error: undefined,
@@ -323,12 +318,11 @@ function InfoAux(props: InfoProps) {
 
         // NB: it is important to await await reqs at once, otherwise
         // if both throw then one exception becomes unhandled.
-        Promise.all([proofReq, goalsReq, termGoalReq, widgetsReq, messagesReq]).then(
+        Promise.all([goalsReq, termGoalReq, widgetsReq, messagesReq]).then(
-            ([proof, goals, termGoal, userWidgets, messages]) => resolve({
+            ([goals, termGoal, userWidgets, messages]) => resolve({
                 pos,
                 status: 'ready',
                 messages,
-                proof : proof as any,
                 goals: goals as any,
                 termGoal,
                 error: undefined,
@@ -359,7 +353,6 @@ function InfoAux(props: InfoProps) {
                     pos,
                     status: 'error',
                     messages: lspDiagsHere.map(lspDiagToInteractive),
-                    proof: undefined,
                     goals: undefined,
                     termGoal: undefined,
                     error: `Error fetching goals: ${errorString}`,
@@ -396,7 +389,6 @@ function InfoAux(props: InfoProps) {
         pos,
         status: 'updating',
         messages: [],
-        proof: undefined,
         goals: undefined,
         termGoal: undefined,
         error: undefined,
@@ -420,11 +412,6 @@ function InfoAux(props: InfoProps) {
           //   hintContext.setHints(state.value.goals.goals[0].hints)
           // }
           setDisplayProps({ ...state.value, triggerUpdate })
-
-          // Update the game's proof state
-          console.info('updating proof from editor mode.')
-          setProof(state.value.proof)
-
         } else if (state.state === 'rejected' && state.error !== 'retry') {
             // The code inside `useAsyncWithTrigger` may only ever reject with a `retry` exception.
             console.warn('Unreachable code reached with error: ', state.error)

client/src/components/infoview/main.tsx

@@ -26,16 +26,15 @@ import Markdown from '../markdown';
 
 import { Infos } from './infos';
 import { AllMessages, Errors, WithLspDiagnosticsContext } from './messages';
-import { Goal, isLastStepWithErrors, lastStepHasErrors, loadGoals } from './goals';
+import { Goal } from './goals';
-import { DeletedChatContext, InputModeContext, PreferencesContext, MonacoEditorContext, ProofContext, SelectionContext, WorldLevelIdContext } from './context';
+import { DeletedChatContext, InputModeContext, MobileContext, MonacoEditorContext, ProofContext, ProofStep, SelectionContext, WorldLevelIdContext } from './context';
-import { Typewriter, getInteractiveDiagsAt, hasErrors, hasInteractiveErrors } from './typewriter';
+import { Typewriter, hasErrors, hasInteractiveErrors } from './typewriter';
 import { InteractiveDiagnostic } from '@leanprover/infoview/*';
 import { Button } from '../button';
 import { CircularProgress } from '@mui/material';
-import { GameHint, InteractiveGoalsWithHints, ProofState } from './rpc_api';
+import { GameHint } from './rpc_api';
 import { store } from '../../state/store';
-import { Hints, MoreHelpButton, filterHints } from '../hints';
+import { Hints, filterHints } from '../hints';
-import { DocumentPosition } from '../../../../node_modules/lean4-infoview/src/infoview/util';
 
 /** Wrapper for the two editors. It is important that the `div` with `codeViewRef` is
  * always present, or the monaco editor cannot start.
@@ -62,35 +61,36 @@ function DualEditorMain({ worldId, levelId, level, worldSize }: { worldId: strin
   const gameId = React.useContext(GameIdContext)
   const { typewriterMode } = React.useContext(InputModeContext)
 
-  const {proof, setProof} = React.useContext(ProofContext)
+  // Mark level as completed when server gives notification
-
   const dispatch = useAppDispatch()
+  useServerNotificationEffect(
+    '$/game/completed',
+    (params: any) => {
+      if (ec.events.changedCursorLocation.current &&
+          ec.events.changedCursorLocation.current.uri === params.uri) {
+        dispatch(levelCompleted({ game: gameId, world: worldId, level: levelId }))
 
-  React.useEffect(() => {
+        // On completion, add the names of all new items to the local storage
-    if (proof.completed) {
+        let newTiles = [
-      dispatch(levelCompleted({ game: gameId, world: worldId, level: levelId }))
+          ...level?.tactics,
+          ...level?.lemmas,
+          ...level?.definitions
+        ].filter((tile) => tile.new).map((tile) => tile.name)
 
-      // On completion, add the names of all new items to the local storage
+        // Add the proven statement to the local storage as well.
-      let newTiles = [
+        if (level?.statementName != null) {
-        ...level?.tactics,
+          newTiles.push(level?.statementName)
-        ...level?.lemmas,
+        }
-        ...level?.definitions
-      ].filter((tile) => tile.new).map((tile) => tile.name)
 
-      // Add the proven statement to the local storage as well.
+        let inv: string[] = selectInventory(gameId)(store.getState())
-      if (level?.statementName != null) {
+
-        newTiles.push(level?.statementName)
+        // add new items and remove duplicates
+        let newInv = [...inv, ...newTiles].filter((item, i, array) => array.indexOf(item) == i)
+
+        dispatch(changedInventory({ game: gameId, inventory: newInv }))
       }
-
+    }, [level]
-      let inv: string[] = selectInventory(gameId)(store.getState())
+  )
-
-      // add new items and remove duplicates
-      let newInv = [...inv, ...newTiles].filter((item, i, array) => array.indexOf(item) == i)
-
-      dispatch(changedInventory({ game: gameId, inventory: newInv }))
-
-    }
-  }, [proof, level])
 
   /* Set up updates to the global infoview state on editor events. */
   const config = useEventResult(ec.events.changedInfoviewConfig) ?? defaultInfoviewConfig;
@@ -154,21 +154,8 @@ export function Main(props: { world: string, level: number, data: LevelInfo}) {
   const gameId = React.useContext(GameIdContext)
   const {worldId, levelId} = React.useContext(WorldLevelIdContext)
 
-  const { proof, setProof } = React.useContext(ProofContext)
+  const completed = useAppSelector(selectCompleted(gameId, props.world, props.level))
-  const {selectedStep, setSelectedStep} = React.useContext(SelectionContext)
-  const { setDeletedChat, showHelp, setShowHelp } = React.useContext(DeletedChatContext)
 
-
-  function toggleSelection(line: number) {
-    return (ev) => {
-      console.debug('toggled selection')
-      if (selectedStep == line) {
-        setSelectedStep(undefined)
-      } else {
-        setSelectedStep(line)
-      }
-    }
-  }
   console.debug(`template: ${props.data?.template}`)
 
   // React.useEffect (() => {
@@ -195,19 +182,6 @@ export function Main(props: { world: string, level: number, data: LevelInfo}) {
 
   const curUri = useEventResult(ec.events.changedCursorLocation, loc => loc?.uri);
 
-  const curPos: DocumentPosition | undefined =
-    useEventResult(ec.events.changedCursorLocation, loc => loc ? { uri: loc.uri, ...loc.range.start } : undefined)
-
-  // Effect when the cursor changes in the editor
-  React.useEffect(() => {
-    // TODO: this is a bit of a hack and will yield unexpected behaviour if lines
-    // are indented.
-    let newPos = curPos?.line + (curPos?.character == 0 ? 0 : 1)
-
-    // scroll the chat along
-    setSelectedStep(newPos)
-  }, [curPos])
-
   useClientNotificationEffect(
     'textDocument/didClose',
     (params: DidCloseTextDocumentParams) => {
@@ -232,17 +206,8 @@ export function Main(props: { world: string, level: number, data: LevelInfo}) {
     ret = <div><p>{serverStoppedResult.message}</p><p className="error">{serverStoppedResult.reason}</p></div>
   } else {
     ret = <div className="infoview vscode-light">
-      {proof.completedWithWarnings &&
+      {completed && <div className="level-completed">Level completed! 🎉</div>}
-        <div className="level-completed">
-          {proof.completed ? "Level completed! 🎉" : "Level completed with warnings 🎭"}
-        </div>
-      }
       <Infos />
-      <Hints hints={proof.steps[curPos?.line]?.goals[0]?.hints}
-        showHidden={showHelp.has(curPos?.line)} step={curPos?.line}
-        selected={selectedStep} toggleSelection={toggleSelection(curPos?.line)}
-        lastLevel={curPos?.line == proof.steps.length - 1}/>
-      <MoreHelpButton selected={curPos?.line}/>
     </div>
   }
 
@@ -258,24 +223,15 @@ const goalFilter = {
 }
 
 /** The display of a single entered lean command */
-function Command({ proof, i, deleteProof }: { proof: ProofState, i: number, deleteProof: any }) {
+function Command({ command, deleteProof }: { command: string, deleteProof: any }) {
   // The first step will always have an empty command
-  if (!proof?.steps[i]?.command) { return <></> }
+  if (!command) { return <></> }
-
+  return <div className="command">
-  if (isLastStepWithErrors(proof, i)) {
+    <div className="command-text">{command}</div>
-    // If the last step has errors, we display the command in a different style
+    <Button to="" className="undo-button btn btn-inverted" title="Retry proof from here" onClick={deleteProof}>
-    // indicating that it will be removed on the next try.
+      <FontAwesomeIcon icon={faDeleteLeft} />&nbsp;Retry
-    return <div className="failed-command">
+    </Button>
-      <i>Failed command</i>: {proof.steps[i].command}
+  </div>
-    </div>
-  } else {
-    return <div className="command">
-      <div className="command-text">{proof.steps[i].command}</div>
-      <Button to="" className="undo-button btn btn-inverted" title="Retry proof from here" onClick={deleteProof}>
-        <FontAwesomeIcon icon={faDeleteLeft} />&nbsp;Retry
-      </Button>
-    </div>
-  }
 }
 
 // const MessageView = React.memo(({uri, diag}: MessageViewProps) => {
@@ -330,14 +286,10 @@ function Command({ proof, i, deleteProof }: { proof: ProofState, i: number, dele
 // }, fastIsEqual)
 
 /** The tabs of goals that lean ahs after the command of this step has been processed */
-function GoalsTabs({ proofStep, last, onClick, onGoalChange=(n)=>{}}: { proofStep: InteractiveGoalsWithHints, last : boolean, onClick? : any, onGoalChange?: (n?: number) => void }) {
+function GoalsTabs({ proofStep, last, onClick, onGoalChange=(n)=>{}}: { proofStep: ProofStep, last : boolean, onClick? : any, onGoalChange?: (n?: number) => void }) {
 
   const [selectedGoal, setSelectedGoal] = React.useState<number>(0)
 
-  if (proofStep.goals.length == 0) {
-    return <></>
-  }
-
   return <div className="goal-tabs" onClick={onClick}>
     <div className={`tab-bar ${last ? 'current' : ''}`}>
       {proofStep.goals.map((goal, i) => (
@@ -348,7 +300,7 @@ function GoalsTabs({ proofStep, last, onClick, onGoalChange=(n)=>{}}: { proofSte
       ))}
     </div>
     <div className="goal-tab vscode-light">
-      <Goal typewriter={false} filter={goalFilter} goal={proofStep.goals[selectedGoal]?.goal} />
+      <Goal typewriter={false} filter={goalFilter} goal={proofStep.goals[selectedGoal]} />
     </div>
   </div>
 }
@@ -397,12 +349,13 @@ export function TypewriterInterface({props}) {
   const [disableInput, setDisableInput] = React.useState<boolean>(false)
   const [loadingProgress, setLoadingProgress] = React.useState<number>(0)
   const { setDeletedChat, showHelp, setShowHelp } = React.useContext(DeletedChatContext)
-  const {mobile} = React.useContext(PreferencesContext)
+  const {mobile} = React.useContext(MobileContext)
-  const { proof, setProof } = React.useContext(ProofContext)
+  const { proof } = React.useContext(ProofContext)
   const { setTypewriterInput } = React.useContext(InputModeContext)
   const { selectedStep, setSelectedStep } = React.useContext(SelectionContext)
 
   const proofPanelRef = React.useRef<HTMLDivElement>(null)
+  const completed = useAppSelector(selectCompleted(gameId, props.world, props.level))
   // const config = useEventResult(ec.events.changedInfoviewConfig) ?? defaultInfoviewConfig;
   // const curUri = useEventResult(ec.events.changedCursorLocation, loc => loc?.uri);
 
@@ -414,11 +367,9 @@ export function TypewriterInterface({props}) {
   function deleteProof(line: number) {
     return (ev) => {
       let deletedChat: Array<GameHint> = []
-      proof.steps.slice(line).map((step, i) => {
+      filterHints(proof).slice(line).map((hintsAtStep, i) => {
-        let filteredHints = filterHints(step.goals[0]?.hints, proof?.steps[i-1]?.goals[0]?.hints)
-
         // Only add these hidden hints to the deletion stack which were visible
-        deletedChat = [...deletedChat, ...filteredHints.filter(hint => (!hint.hidden || showHelp.has(line + i)))]
+        deletedChat = [...deletedChat, ...hintsAtStep.filter(hint => (!hint.hidden || showHelp.has(line + i)))]
       })
       setDeletedChat(deletedChat)
 
@@ -431,9 +382,7 @@ export function TypewriterInterface({props}) {
         forceMoveMarkers: false
       }])
       setSelectedStep(undefined)
-      setTypewriterInput(proof.steps[line].command)
+      setTypewriterInput(proof[line].command)
-      // Reload proof on deleting
-      loadGoals(rpcSess, uri, setProof)
       ev.stopPropagation()
     }
   }
@@ -453,7 +402,7 @@ export function TypewriterInterface({props}) {
 
    // Scroll to the end of the proof if it is updated.
    React.useEffect(() => {
-    if (proof.steps.length > 1) {
+    if (proof?.length > 1) {
       proofPanelRef.current?.lastElementChild?.scrollIntoView() //scrollTo(0,0)
     } else {
       proofPanelRef.current?.scrollTo(0,0)
@@ -474,8 +423,38 @@ export function TypewriterInterface({props}) {
     }
   }, [selectedStep])
 
-  // TODO: superfluous, can be replaced with `withErr` from above
+  // TODO: This about hidden hints is all copied from `level.tsx`. Can we move that into `hints.tsx`?
-  let lastStepErrors = proof.steps.length ? hasInteractiveErrors(getInteractiveDiagsAt(proof, proof.steps.length)) : false
+
+  // If the last step has errors, we want to treat it as if it is part of the second-to-last step
+  let k = proof.length - 1
+  let withErr = hasInteractiveErrors(proof[k]?.errors) ? 1 : 0
+
+  const activateHiddenHints = (ev) => {
+    // If the last step (`k`) has errors, we want the hidden hints from the
+    // second-to-last step to be affected
+    if (!(proof.length)) {return}
+
+    // state must not be mutated, therefore we need to clone the set
+    let tmp = new Set(showHelp)
+    if (tmp.has(k - withErr)) {
+      tmp.delete(k - withErr)
+    } else {
+      tmp.add(k - withErr)
+    }
+    setShowHelp(tmp)
+    console.debug(`help: ${Array.from(tmp.values())}`)
+  }
+
+  function hasHiddenHints(i : number): boolean {
+    let step = proof[i]
+
+    // For example if the proof isn't loaded yet
+    if(!step) {return false}
+
+    return step.hints.some((hint) => hint.hidden)
+  }
+
+  let lastStepErrors = proof.length ? hasInteractiveErrors(proof[proof.length - 1].errors) : false
 
 
   useServerNotificationEffect("$/game/loading", (params : any) => {
@@ -495,22 +474,20 @@ export function TypewriterInterface({props}) {
       </div>
       <div className='proof' ref={proofPanelRef}>
         <ExerciseStatement data={props.data} />
-        {proof.steps.length ?
+        {proof.length ?
           <>
-            {proof.steps.map((step, i) => {
+            {proof.map((step, i) => {
-              let filteredHints = filterHints(step.goals[0]?.hints, proof?.steps[i-1]?.goals[0]?.hints)
+              if (i == proof.length - 1 && lastStepErrors) {
-
+                // if the last command contains an error, we only display the errors but not the
-              // if (i == proof.steps.length - 1 && hasInteractiveErrors(step.diags)) {
+                // entered command as it is still present in the command line.
-              //   // if the last command contains an error, we only display the errors but not the
+                // TODO: Should not use index as key.
-              //   // entered command as it is still present in the command line.
+                return <div key={`proof-step-${i}`}>
-              //   // TODO: Should not use index as key.
+                  <Errors errors={step.errors} typewriterMode={true} />
-              //   return <div key={`proof-step-${i}`} className={`step step-${i}`}>
+                </div>
-              //     <Errors errors={step.diags} typewriterMode={true} />
+              } else {
-              //   </div>
-              // } else {
                 return <div key={`proof-step-${i}`} className={`step step-${i}` + (selectedStep == i ? ' selected' : '')}>
-                  <Command proof={proof} i={i} deleteProof={deleteProof(i)} />
+                  <Command command={step.command} deleteProof={deleteProof(i)} />
-                  <Errors errors={step.diags} typewriterMode={true} />
+                  <Errors errors={step.errors} typewriterMode={true} />
                   {mobile && i == 0 && props.data?.introduction &&
                     <div className={`message information step-0${selectedStep === 0 ? ' selected' : ''}`} onClick={toggleSelectStep(0)}>
                       <Markdown>{props.data?.introduction}</Markdown>
@@ -518,21 +495,22 @@ export function TypewriterInterface({props}) {
                   }
                   {mobile &&
                     <Hints key={`hints-${i}`}
-                      hints={filteredHints} showHidden={showHelp.has(i)} step={i}
+                      hints={step.hints} showHidden={showHelp.has(i)} step={i}
                       selected={selectedStep} toggleSelection={toggleSelectStep(i)}/>
                   }
-                  {/* <GoalsTabs proofStep={step} last={i == proof.steps.length - (lastStepErrors ? 2 : 1)} onClick={toggleSelectStep(i)} onGoalChange={i == proof.steps.length - 1 - withErr ? (n) => setDisableInput(n > 0) : (n) => {}}/> */}
+                  <GoalsTabs proofStep={step} last={i == proof.length - (lastStepErrors ? 2 : 1)} onClick={toggleSelectStep(i)} onGoalChange={i == proof.length - 1 - withErr ? (n) => setDisableInput(n > 0) : (n) => {}}/>
-                  {!(isLastStepWithErrors(proof, i)) &&
+
-                    <GoalsTabs proofStep={step} last={i == proof.steps.length - (lastStepHasErrors(proof) ? 2 : 1)} onClick={toggleSelectStep(i)} onGoalChange={i == proof.steps.length - (lastStepHasErrors(proof) ? 2 : 1) ? (n) => setDisableInput(n > 0) : (n) => {}}/>
+                  {mobile && i == proof.length - 1 &&
-                  }
+                    hasHiddenHints(proof.length - 1) && !showHelp.has(k - withErr) &&
-                  {mobile && i == proof.steps.length - 1 &&
+                    <Button className="btn btn-help" to="" onClick={activateHiddenHints}>
-                    <MoreHelpButton />
+                      Show more help!
+                    </Button>
                   }
 
                   {/* Show a message that there are no goals left */}
-                  {/* {!step.goals.length && (
+                  {!step.goals.length && (
                     <div className="message information">
-                      {proof.completed ?
+                      {completed ?
                         <p>Level completed! 🎉</p> :
                         <p>
                           <b>no goals left</b><br />
@@ -540,17 +518,11 @@ export function TypewriterInterface({props}) {
                         </p>
                       }
                     </div>
-                  )} */}
+                  )}
                 </div>
               }
-            //}
+            })}
-            )}
+            {mobile && completed &&
-            {proof.diagnostics.length > 0 &&
-              <div key={`proof-step-remaining`} className="step step-remaining">
-                <Errors errors={proof.diagnostics} typewriterMode={true} />
-              </div>
-            }
-            {mobile && proof.completed &&
               <div className="button-row mobile">
                 {props.level >= props.worldSize ?
                   <Button to={`/${gameId}`}>
@@ -567,7 +539,7 @@ export function TypewriterInterface({props}) {
         }
       </div>
     </div>
-    <Typewriter disabled={disableInput || !proof.steps.length}/>
+    <Typewriter hidden={!withErr && proof[proof.length - 1]?.goals.length == 0} disabled={disableInput || !proof.length}/>
     </RpcContext.Provider>
   </div>
 }

client/src/components/infoview/messages.tsx

@@ -194,24 +194,16 @@ export function AllMessages() {
                 </a>
             </span>
         </summary> */}
-        <AllMessagesBody uri={curPos.uri} key={curPos.uri} messages={iDiags0} curPos={curPos} />
+        <AllMessagesBody uri={curPos.uri} key={curPos.uri} messages={iDiags0} />
     {/* </Details> */}
     </RpcContext.Provider>
     )
 }
 
 /** We factor out the body of {@link AllMessages} which lazily fetches its contents only when expanded. */
-function AllMessagesBody({uri, curPos, messages}: {uri: DocumentUri, curPos: DocumentPosition | undefined , messages: () => Promise<InteractiveDiagnostic[]>}) {
+function AllMessagesBody({uri, messages}: {uri: DocumentUri, messages: () => Promise<InteractiveDiagnostic[]>}) {
     const [msgs, setMsgs] = React.useState<InteractiveDiagnostic[] | undefined>(undefined)
-    React.useEffect(() => { void messages().then(
+    React.useEffect(() => { void messages().then(setMsgs) }, [messages])
-        msgs => setMsgs(msgs.filter(
-            (d)=>{
-                //console.log(`message start: ${d.range.start.line}. CurPos: ${curPos.line}`)
-
-                // Only show the messages from the line where the cursor is.
-                return d.range.start.line == curPos.line
-            }))
-    ) }, [messages, curPos])
     if (msgs === undefined) return <div>Loading messages...</div>
     else return <MessagesList uri={uri} messages={msgs}/>
 }

client/src/components/infoview/rpc_api.ts

@@ -3,82 +3,46 @@
  *
  * This file is based on `vscode-lean4/vscode-lean4/src/rpcApi.ts`
  */
-import type { Range } from 'vscode-languageserver-protocol';
+import { ContextInfo, FVarId, CodeWithInfos, MVarId } from '@leanprover/infoview-api';
-import type { ContextInfo, FVarId, CodeWithInfos, MVarId } from '@leanprover/infoview-api';
+
-import { InteractiveDiagnostic, TermInfo } from '@leanprover/infoview/*';
+export interface GameHint {
-import type { Diagnostic } from 'vscode-languageserver-protocol';
+  text: string;
+  hidden: boolean;
+}
 
 export interface InteractiveHypothesisBundle {
   /** The pretty names of the variables in the bundle. Anonymous names are rendered
    * as `"[anonymous]"` whereas inaccessible ones have a `✝` appended at the end.
    * Use `InteractiveHypothesisBundle_nonAnonymousNames` to filter anonymouse ones out. */
   names: string[];
+  /** Present since server version 1.1.2. */
   fvarIds?: FVarId[];
   type: CodeWithInfos;
   val?: CodeWithInfos;
   isInstance?: boolean;
   isType?: boolean;
+  isAssumption?: boolean;
   isInserted?: boolean;
   isRemoved?: boolean;
-  isAssumption?: boolean;
 }
 
 export interface InteractiveGoalCore {
   hyps: InteractiveHypothesisBundle[];
   type: CodeWithInfos;
+  /** Present since server version 1.1.2. */
   ctx?: ContextInfo;
 }
 
 export interface InteractiveGoal extends InteractiveGoalCore {
   userName?: string;
   goalPrefix?: string;
+  /** Present since server version 1.1.2. */
   mvarId?: MVarId;
   isInserted?: boolean;
   isRemoved?: boolean;
-}
-
-export interface InteractiveGoals extends InteractiveGoalCore {
-  goals: InteractiveGoals[];
-}
-
-export interface InteractiveTermGoal extends InteractiveGoalCore {
-  range?: Range;
-  term?: TermInfo;
-}
-
-export interface GameHint {
-  text: string;
-  hidden: boolean;
-  rawText: string;
-  varNames: string[][]; // in Lean: `Array (Name × Name)`
-}
-
-export interface InteractiveGoalWithHints {
-  goal: InteractiveGoal;
   hints: GameHint[];
 }
 
-export interface InteractiveGoalsWithHints {
+export interface InteractiveGoals {
-  goals: InteractiveGoalWithHints[];
+  goals: InteractiveGoal[];
-  command: string;
-  diags: InteractiveDiagnostic[];
-}
-
-/**
- * The proof state as it is received from the server.
- * Per proof step of the tactic proof, there is one `InteractiveGoalWithHints[]`.
- */
-export interface ProofState {
-  /** The proof steps. step 0 is the state at the beginning of the proof. step one
-   * contains the goal after the first line has been evaluated.
-   *
-   * In particular `step[i]` is the proof step at the beginning of line `i` in vscode.
-   */
-  steps: InteractiveGoalsWithHints[];
-  /** The remaining diagnostics that are not in the steps. Usually this should only
-   * be the "unsolved goals" message, I believe.
-   */
-  diagnostics : InteractiveDiagnostic[];
-  completed : Boolean;
-  completedWithWarnings : Boolean;
 }

client/src/components/infoview/typewriter.tsx

@@ -5,7 +5,7 @@ import { faWandMagicSparkles } from '@fortawesome/free-solid-svg-icons'
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api.js'
 import { Registry } from 'monaco-textmate' // peer dependency
 import { wireTmGrammars } from 'monaco-editor-textmate'
-import { DiagnosticSeverity, PublishDiagnosticsParams, DocumentUri } from 'vscode-languageserver-protocol';
+import { DiagnosticSeverity, PublishDiagnosticsParams } from 'vscode-languageserver-protocol';
 import { useServerNotificationEffect } from '../../../../node_modules/lean4-infoview/src/infoview/util';
 import { AbbreviationRewriter } from 'lean4web/client/src/editor/abbreviation/rewriter/AbbreviationRewriter';
 import { AbbreviationProvider } from 'lean4web/client/src/editor/abbreviation/AbbreviationProvider';
@@ -13,21 +13,13 @@ import * as leanSyntax from 'lean4web/client/src/syntaxes/lean.json'
 import * as leanMarkdownSyntax from 'lean4web/client/src/syntaxes/lean-markdown.json'
 import * as codeblockSyntax from 'lean4web/client/src/syntaxes/codeblock.json'
 import languageConfig from 'lean4/language-configuration.json';
-import { InteractiveDiagnostic, RpcSessionAtPos, getInteractiveDiagnostics } from '@leanprover/infoview-api';
+import { InteractiveDiagnostic, getInteractiveDiagnostics } from '@leanprover/infoview-api';
 import { Diagnostic } from 'vscode-languageserver-types';
 import { DocumentPosition } from '../../../../node_modules/lean4-infoview/src/infoview/util';
 import { RpcContext } from '../../../../node_modules/lean4-infoview/src/infoview/rpcSessions';
-import { DeletedChatContext, InputModeContext, MonacoEditorContext, ProofContext } from './context'
+import { DeletedChatContext, InputModeContext, MonacoEditorContext, ProofContext, ProofStep } from './context'
-import { goalsToString, lastStepHasErrors, loadGoals } from './goals'
+import { goalsToString } from './goals'
-import { GameHint, ProofState } from './rpc_api'
+import { GameHint, InteractiveGoals } from './rpc_api'
-
-export interface GameDiagnosticsParams {
-  uri: DocumentUri;
-  diagnostics: Diagnostic[];
-}
-
-
-
 
 /* We register a new language `leancmd` that looks like lean4, but does not use the lsp server. */
 
@@ -72,7 +64,7 @@ config.autoClosingPairs = config.autoClosingPairs.map(
 monaco.languages.setLanguageConfiguration('lean4cmd', config);
 
 /** The input field */
-export function Typewriter({disabled}: {disabled?: boolean}) {
+export function Typewriter({hidden, disabled}: {hidden?: boolean, disabled?: boolean}) {
 
   /** Reference to the hidden multi-line editor */
   const editor = React.useContext(MonacoEditorContext)
@@ -97,98 +89,98 @@ export function Typewriter({disabled}: {disabled?: boolean}) {
   /** Load all goals an messages of the current proof (line-by-line) and save
    * the retrieved information into context (`ProofContext`)
    */
-  // const loadAllGoals = React.useCallback(() => {
+  const loadAllGoals = React.useCallback(() => {
 
-  //   let goalCalls = []
+    let goalCalls = []
-  //   let msgCalls = []
+    let msgCalls = []
 
-  //   // For each line of code ask the server for the goals and the messages on this line
+    // For each line of code ask the server for the goals and the messages on this line
-  //   for (let i = 0; i < model.getLineCount(); i++) {
+    for (let i = 0; i < model.getLineCount(); i++) {
-  //     goalCalls.push(
+      goalCalls.push(
-  //       rpcSess.call('Game.getInteractiveGoals', DocumentPosition.toTdpp({line: i, character: 0, uri: uri}))
+        rpcSess.call('Game.getInteractiveGoals', DocumentPosition.toTdpp({line: i, character: 0, uri: uri}))
-  //     )
+      )
-  //     msgCalls.push(
+      msgCalls.push(
-  //       getInteractiveDiagnostics(rpcSess, {start: i, end: i+1}).catch((error) => {console.debug("promise broken")})
+        getInteractiveDiagnostics(rpcSess, {start: i, end: i+1}).catch((error) => {console.debug("promise broken")})
-  //     )
+      )
-  //   }
+    }
 
-  //   // Wait for all these requests to be processed before saving the results
+    // Wait for all these requests to be processed before saving the results
-  //   Promise.all(goalCalls).then((steps : InteractiveGoalsWithHints[]) => {
+    Promise.all(goalCalls).then((steps : InteractiveGoals[]) => {
-  //     Promise.all(msgCalls).then((diagnostics : [InteractiveDiagnostic[]]) => {
+      Promise.all(msgCalls).then((diagnostics : [InteractiveDiagnostic[]]) => {
-  //       let tmpProof : ProofStep[] = []
+        let tmpProof : ProofStep[] = []
 
-  //       let goalCount = 0
+        let goalCount = 0
 
-  //       steps.map((goals, i) => {
+        steps.map((goals, i) => {
-  //         // The first step has an empty command and therefore also no error messages
+          // The first step has an empty command and therefore also no error messages
-  //         // Usually there is a newline at the end of the editors content, so we need to
+          // Usually there is a newline at the end of the editors content, so we need to
-  //         // display diagnostics from potentally two lines in the last step.
+          // display diagnostics from potentally two lines in the last step.
-  //         let messages = i ? (i == steps.length - 1 ? diagnostics.slice(i-1).flat() : diagnostics[i-1]) : []
+          let messages = i ? (i == steps.length - 1 ? diagnostics.slice(i-1).flat() : diagnostics[i-1]) : []
 
-  //         // Filter out the 'unsolved goals' message
+          // Filter out the 'unsolved goals' message
-  //         messages = messages.filter((msg) => {
+          messages = messages.filter((msg) => {
-  //           return !("append" in msg.message &&
+            return !("append" in msg.message &&
-  //             "text" in msg.message.append[0] &&
+              "text" in msg.message.append[0] &&
-  //             msg.message.append[0].text === "unsolved goals")
+              msg.message.append[0].text === "unsolved goals")
-  //         })
+          })
 
-  //         if (typeof goals == 'undefined') {
+          if (typeof goals == 'undefined') {
-  //           tmpProof.push({
+            tmpProof.push({
-  //             command: i ? model.getLineContent(i) : '',
+              command: i ? model.getLineContent(i) : '',
-  //             goals: [],
+              goals: [],
-  //             hints: [],
+              hints: [],
-  //             errors: messages
+              errors: messages
-  //           } as ProofStep)
+            } as ProofStep)
-  //           console.debug('goals is undefined')
+            console.debug('goals is undefined')
-  //           return
+            return
-  //         }
+          }
 
-  //         // If the number of goals reduce, show a message
+          // If the number of goals reduce, show a message
-  //         if (goals.length && goalCount > goals.length) {
+          if (goals.goals.length && goalCount > goals.goals.length) {
-  //           messages.unshift({
+            messages.unshift({
-  //             range: {
+              range: {
-  //               start: {
+                start: {
-  //                 line: i-1,
+                  line: i-1,
-  //                 character: 0,
+                  character: 0,
-  //               },
+                },
-  //               end: {
+                end: {
-  //                 line: i-1,
+                  line: i-1,
-  //                 character: 0,
+                  character: 0,
-  //               }},
+                }},
-  //             severity: DiagnosticSeverity.Information,
+              severity: DiagnosticSeverity.Information,
-  //             message: {
+              message: {
-  //             text: 'intermediate goal solved 🎉'
+              text: 'intermediate goal solved 🎉'
-  //             }
+              }
-  //           })
+            })
-  //         }
+          }
-  //         goalCount = goals.length
+          goalCount = goals.goals.length
 
-  //         // with no goals there will be no hints.
+          // with no goals there will be no hints.
-  //         let hints : GameHint[] = goals.length ? goals[0].hints : []
+          let hints : GameHint[] = goals.goals.length ? goals.goals[0].hints : []
 
-  //         console.debug(`Command (${i}): `, i ? model.getLineContent(i) : '')
+          console.debug(`Command (${i}): `, i ? model.getLineContent(i) : '')
-  //         console.debug(`Goals: (${i}): `, goalsToString(goals)) //
+          console.debug(`Goals: (${i}): `, goalsToString(goals)) //
-  //         console.debug(`Hints: (${i}): `, hints)
+          console.debug(`Hints: (${i}): `, hints)
-  //         console.debug(`Errors: (${i}): `, messages)
+          console.debug(`Errors: (${i}): `, messages)
 
-  //         tmpProof.push({
+          tmpProof.push({
-  //           // the command of the line above. Note that `getLineContent` starts counting
+            // the command of the line above. Note that `getLineContent` starts counting
-  //           // at `1` instead of `zero`. The first ProofStep will have an empty command.
+            // at `1` instead of `zero`. The first ProofStep will have an empty command.
-  //           command: i ? model.getLineContent(i) : '',
+            command: i ? model.getLineContent(i) : '',
-  //           // TODO: store correct data
+            // TODO: store correct data
-  //           goals: goals.map(g => g.goal),
+            goals: goals.goals,
-  //           // only need the hints of the active goals in chat
+            // only need the hints of the active goals in chat
-  //           hints: hints,
+            hints: hints,
-  //           // errors and messages from the server
+            // errors and messages from the server
-  //           errors: messages
+            errors: messages
-  //         } as ProofStep)
+          } as ProofStep)
 
-  //       })
+        })
-  //       // Save the proof to the context
+        // Save the proof to the context
-  //       setProof(tmpProof)
+        setProof(tmpProof)
-  //     }).catch((error) => {console.debug("promise broken")})
+      }).catch((error) => {console.debug("promise broken")})
-  //   }).catch((error) => {console.debug("promise broken")})
+    }).catch((error) => {console.debug("promise broken")})
-  // }, [editor, rpcSess, uri, model])
+  }, [editor, rpcSess, uri, model])
 
   // Run the command
   const runCommand = React.useCallback(() => {
@@ -209,8 +201,6 @@ export function Typewriter({disabled}: {disabled?: boolean}) {
         forceMoveMarkers: false
       }])
       setTypewriterInput('')
-      // Load proof after executing edits
-      loadGoals(rpcSess, uri, setProof)
     }
 
     editor.setPosition(pos)
@@ -222,15 +212,9 @@ export function Typewriter({disabled}: {disabled?: boolean}) {
     }
   }, [typewriterInput])
 
-  /* Load proof on start/switching to typewriter */
   useEffect(() => {
-    loadGoals(rpcSess, uri, setProof)
+    if (proof.length && hasInteractiveErrors(proof[proof.length - 1].errors)) {
-  }, [])
+      setTypewriterInput(proof[proof.length - 1].command)
-
-  /** If the last step has an error, add the command to the typewriter. */
-  useEffect(() => {
-    if (lastStepHasErrors(proof)) {
-      setTypewriterInput(proof.steps[proof.steps.length - 1].command)
     }
   }, [proof])
 
@@ -238,9 +222,7 @@ export function Typewriter({disabled}: {disabled?: boolean}) {
   useServerNotificationEffect('textDocument/publishDiagnostics', (params: PublishDiagnosticsParams) => {
     if (params.uri == uri) {
       setProcessing(false)
-      //loadGoals(rpcSess, uri, setProof)
+      loadAllGoals()
-
-      // TODO: loadAllGoals()
       if (!hasErrors(params.diagnostics)) {
         //setTypewriterInput("")
         editor.setPosition(editor.getModel().getFullModelRange().getEndPosition())
@@ -254,15 +236,6 @@ export function Typewriter({disabled}: {disabled?: boolean}) {
     // loadAllGoals()
   }, [uri]);
 
-  // React when answer from the server comes back
-  useServerNotificationEffect('$/game/publishDiagnostics', (params: GameDiagnosticsParams) => {
-    console.log('Received game diagnostics')
-    console.log(`diag. uri : ${params.uri}`)
-    console.log(params.diagnostics)
-
-  }, [uri]);
-
-
   useEffect(() => {
     const myEditor = monaco.editor.create(inputRef.current!, {
       value: typewriterInput,
@@ -333,8 +306,7 @@ export function Typewriter({disabled}: {disabled?: boolean}) {
   useEffect(() => {
     console.debug(`time to update: ${uri} \n ${rpcSess}`)
     console.debug(rpcSess)
-    // console.debug('LOAD ALL GOALS')
+    loadAllGoals()
-    // TODO: loadAllGoals()
   }, [rpcSess])
 
   /** Process the entered command */
@@ -343,8 +315,7 @@ export function Typewriter({disabled}: {disabled?: boolean}) {
     runCommand()
   }
 
-  // do not display if the proof is completed (with potential warnings still present)
+  return <div className={`typewriter${hidden ? ' hidden' : ''}${disabled ? ' disabled' : ''}`}>
-  return <div className={`typewriter${proof.completedWithWarnings ? ' hidden' : ''}${disabled ? ' disabled' : ''}`}>
       <form onSubmit={handleSubmit}>
         <div className="typewriter-input-wrapper">
           <div ref={inputRef} className="typewriter-input" />
@@ -372,14 +343,3 @@ export function hasInteractiveErrors (diags: InteractiveDiagnostic[]) {
     (d) => (d.severity == DiagnosticSeverity.Error ) // || d.severity == DiagnosticSeverity.Warning
   )
 }
-
-export function getInteractiveDiagsAt (proof: ProofState, k : number) {
-  if (k == 0) {
-    return []
-  } else if (k >= proof.steps.length-1) {
-    // TODO: Do we need that?
-    return proof.diagnostics.filter(msg => msg.range.start.line >= proof.steps.length-1)
-  } else {
-    return proof.diagnostics.filter(msg => msg.range.start.line == k-1)
-  }
-}

client/src/components/landing_page.tsx

@@ -134,8 +134,7 @@ function LandingPage() {
     "leanprover-community/nng4",
     "hhu-adam/robo",
     "djvelleman/stg4",
-    "miguelmarco/stg4",
+    "miguelmarco/STG4",
-    "trequetrum/lean4game-logic",
   ]
   let allTiles = allGames.map((gameId) => (useGetGameInfoQuery({game: `g/${gameId}`}).data?.tile))
 

client/src/components/level.tsx

@@ -27,11 +27,11 @@ import { Button } from './button'
 import Markdown from './markdown'
 import {InventoryPanel} from './inventory'
 import { hasInteractiveErrors } from './infoview/typewriter'
-import { DeletedChatContext, InputModeContext, PreferencesContext, MonacoEditorContext,
+import { DeletedChatContext, InputModeContext, MobileContext, MonacoEditorContext,
-  ProofContext, SelectionContext, WorldLevelIdContext } from './infoview/context'
+  ProofContext, ProofStep, SelectionContext, WorldLevelIdContext } from './infoview/context'
 import { DualEditor } from './infoview/main'
-import { GameHint, InteractiveGoalsWithHints, ProofState } from './infoview/rpc_api'
+import { GameHint } from './infoview/rpc_api'
-import { DeletedHints, Hint, Hints, MoreHelpButton, filterHints } from './hints'
+import { DeletedHints, Hint, Hints, filterHints } from './hints'
 import { PrivacyPolicyPopup } from './popup/privacy_policy'
 import path from 'path';
 
@@ -49,7 +49,6 @@ import { WebSocketMessageWriter, toSocket } from 'vscode-ws-jsonrpc'
 import { IConnectionProvider } from 'monaco-languageclient'
 import { monacoSetup } from 'lean4web/client/src/monacoSetup'
 import { onigasmH } from 'onigasm/lib/onigasmH'
-import { isLastStepWithErrors, lastStepHasErrors } from './infoview/goals'
 
 
 monacoSetup()
@@ -73,9 +72,9 @@ function Level() {
   </WorldLevelIdContext.Provider>
 }
 
-function ChatPanel({lastLevel, visible = true}) {
+function ChatPanel({lastLevel}) {
   const chatRef = useRef<HTMLDivElement>(null)
-  const {mobile} = useContext(PreferencesContext)
+  const {mobile} = useContext(MobileContext)
   const gameId = useContext(GameIdContext)
   const {worldId, levelId} = useContext(WorldLevelIdContext)
   const level = useLoadLevelQuery({game: gameId, world: worldId, level: levelId})
@@ -84,7 +83,9 @@ function ChatPanel({lastLevel, visible = true}) {
   const {selectedStep, setSelectedStep} = useContext(SelectionContext)
   const completed = useAppSelector(selectCompleted(gameId, worldId, levelId))
 
-  let k = proof.steps.length - (lastStepHasErrors(proof) ? 2 : 1)
+  // If the last step has errors, we want to treat it as if it is part of the second-to-last step
+  let k = proof.length - 1
+  let withErr = hasInteractiveErrors(proof[k]?.errors) ? 1 : 0
 
   function toggleSelection(line: number) {
     return (ev) => {
@@ -97,6 +98,29 @@ function ChatPanel({lastLevel, visible = true}) {
     }
   }
 
+  function hasHiddenHints(i : number): boolean {
+    let step = proof[i]
+    // For example if the proof isn't loaded yet
+    if(!step) {return false}
+    return step.hints.some((hint) => hint.hidden)
+  }
+
+  const activateHiddenHints = (ev) => {
+    // If the last step (`k`) has errors, we want the hidden hints from the
+    // second-to-last step to be affected
+    if (!(proof.length)) {return}
+
+    // state must not be mutated, therefore we need to clone the set
+    let tmp = new Set(showHelp)
+    if (tmp.has(k - withErr)) {
+      tmp.delete(k - withErr)
+    } else {
+      tmp.add(k - withErr)
+    }
+    setShowHelp(tmp)
+    console.debug(`help: ${Array.from(tmp.values())}`)
+  }
+
   useEffect(() => {
     // TODO: For some reason this is always called twice
     console.debug('scroll chat')
@@ -122,34 +146,29 @@ function ChatPanel({lastLevel, visible = true}) {
 
   let introText: Array<string> = level?.data?.introduction.split(/\n(\s*\n)+/)
 
-  return <div className={`chat-panel ${visible ? '' : 'hidden'}`}>
+  // experimental: Remove all hints that appeared identically in the previous step
+  // This effectively prevent consequtive hints being shown.
+  let modifiedHints : GameHint[][] = filterHints(proof)
+
+  return <div className="chat-panel">
     <div ref={chatRef} className="chat">
       {introText?.filter(t => t.trim()).map(((t, i) =>
         // Show the level's intro text as hints, too
         <Hint key={`intro-p-${i}`}
           hint={{text: t, hidden: false}} step={0} selected={selectedStep} toggleSelection={toggleSelection(0)} />
       ))}
-      {proof.steps.map((step, i) => {
+      {modifiedHints.map((step, i) => {
-        let filteredHints = filterHints(step.goals[0]?.hints, proof?.steps[i-1]?.goals[0]?.hints)
-        if (step.goals.length > 0 && !isLastStepWithErrors(proof, i)) {
-          return <Hints key={`hints-${i}`}
-          hints={filteredHints} showHidden={showHelp.has(i)} step={i}
-          selected={selectedStep} toggleSelection={toggleSelection(i)} lastLevel={i == proof.steps.length - 1}/>
-        }
-      })}
-
-      {/* {modifiedHints.map((step, i) => {
         // It the last step has errors, it will have the same hints
         // as the second-to-last step. Therefore we should not display them.
-        if (!(i == proof.steps.length - 1 && withErr)) {
+        if (!(i == proof.length - 1 && withErr)) {
           // TODO: Should not use index as key.
           return <Hints key={`hints-${i}`}
             hints={step} showHidden={showHelp.has(i)} step={i}
-            selected={selectedStep} toggleSelection={toggleSelection(i)} lastLevel={i == proof.steps.length - 1}/>
+            selected={selectedStep} toggleSelection={toggleSelection(i)} lastLevel={i == proof.length - 1}/>
         }
-      })} */}
+      })}
       <DeletedHints hints={deletedChat}/>
-      {proof.completed &&
+      {completed &&
         <>
           <div className={`message information recent step-${k}${selectedStep == k ? ' selected' : ''}`} onClick={toggleSelection(k)}>
             Level completed! 🎉
@@ -163,7 +182,7 @@ function ChatPanel({lastLevel, visible = true}) {
       }
     </div>
     <div className="button-row">
-      {proof.completed && (lastLevel ?
+      {completed && (lastLevel ?
         <Button to={`/${gameId}`}>
           <FontAwesomeIcon icon={faHome} />&nbsp;Leave World
         </Button> :
@@ -171,13 +190,16 @@ function ChatPanel({lastLevel, visible = true}) {
           Next&nbsp;<FontAwesomeIcon icon={faArrowRight} />
         </Button>)
         }
-      <MoreHelpButton />
+      {hasHiddenHints(proof.length - 1) && !showHelp.has(k - withErr) &&
+        <Button to="" onClick={activateHiddenHints}>
+          Show more help!
+        </Button>
+      }
     </div>
   </div>
 }
 
-
+function ExercisePanel({codeviewRef, visible=true}) {
-function ExercisePanel({codeviewRef, visible=true}: {codeviewRef: React.MutableRefObject<HTMLDivElement>, visible?: boolean}) {
   const gameId = React.useContext(GameIdContext)
   const {worldId, levelId} = useContext(WorldLevelIdContext)
   const level = useLoadLevelQuery({game: gameId, world: worldId, level: levelId})
@@ -193,7 +215,7 @@ function PlayableLevel({impressum, setImpressum}) {
   const codeviewRef = useRef<HTMLDivElement>(null)
   const gameId = React.useContext(GameIdContext)
   const {worldId, levelId} = useContext(WorldLevelIdContext)
-  const {mobile} = React.useContext(PreferencesContext)
+  const {mobile} = React.useContext(MobileContext)
 
   const dispatch = useAppDispatch()
 
@@ -207,7 +229,7 @@ function PlayableLevel({impressum, setImpressum}) {
   const level = useLoadLevelQuery({game: gameId, world: worldId, level: levelId})
 
   // The state variables for the `ProofContext`
-  const [proof, setProof] = useState<ProofState>({steps: [], diagnostics: [], completed: false, completedWithWarnings: false})
+  const [proof, setProof] = useState<Array<ProofStep>>([])
   // When deleting the proof, we want to keep to old messages around until
   // a new proof has been entered. e.g. to consult messages coming from dead ends
   const [deletedChat, setDeletedChat] = useState<Array<GameHint>>([])
@@ -334,15 +356,15 @@ function PlayableLevel({impressum, setImpressum}) {
 
   useEffect(() => {
     // Forget whether hidden hints are displayed for steps that don't exist yet
-    if (proof.steps.length) {
+    if (proof.length) {
       console.debug(Array.from(showHelp))
-      setShowHelp(new Set(Array.from(showHelp).filter(i => (i < proof.steps.length))))
+      setShowHelp(new Set(Array.from(showHelp).filter(i => (i < proof.length))))
     }
   }, [proof])
 
   // save showed help in store
   useEffect(() => {
-    if (proof.steps.length) {
+    if (proof.length) {
       console.debug(`showHelp:\n ${showHelp}`)
       dispatch(helpEdited({game: gameId, world: worldId, level: levelId, help: Array.from(showHelp)}))
     }
@@ -419,7 +441,7 @@ function PlayableLevel({impressum, setImpressum}) {
 function IntroductionPanel({gameInfo}) {
   const gameId = React.useContext(GameIdContext)
   const {worldId} = useContext(WorldLevelIdContext)
-  const {mobile} = React.useContext(PreferencesContext)
+  const {mobile} = React.useContext(MobileContext)
 
   let text: Array<string> = gameInfo.data?.worlds.nodes[worldId].introduction.split(/\n(\s*\n)+/)
 
@@ -446,7 +468,7 @@ export default Level
 /** The site with the introduction text of a world */
 function Introduction({impressum, setImpressum}) {
   const gameId = React.useContext(GameIdContext)
-  const {mobile} = useContext(PreferencesContext)
+  const {mobile} = useContext(MobileContext)
 
   const inventory = useLoadInventoryOverviewQuery({game: gameId})
 
@@ -600,9 +622,7 @@ function useLevelEditor(codeviewRef, initialCode, initialSelections, onDidChange
     }
     // loadRenderInfoview(imports, [infoProvider.getApi(), div], setInfoviewApi)
     setInfoProvider(infoProvider)
-
+    client.restart()
-    // TODO: it looks like we get errors "File Changed" here.
-    client.restart("Lean4Game")
 
     const editorApi = infoProvider.getApi()
 

client/src/components/popup/preferences.tsx

@@ -1,42 +1,16 @@
 import * as React from 'react'
 import { Input, Typography } from '@mui/material'
 import Markdown from '../markdown'
-import { Switch, Button, ButtonGroup } from '@mui/material';
+import Switch from '@mui/material/Switch';
-import Box from '@mui/material/Box';
-import Slider from '@mui/material/Slider';
-
 import FormControlLabel from '@mui/material/FormControlLabel';
 
-import { IPreferencesContext } from "../infoview/context"
+import { IMobileContext } from "../infoview/context"
 
-interface PreferencesPopupProps extends Omit<IPreferencesContext, 'mobile'> {
+interface PreferencesPopupProps extends IMobileContext{
     handleClose: () => void
-}
+} 
-
-export function PreferencesPopup({ layout, setLayout, isSavePreferences, setIsSavePreferences, handleClose }: PreferencesPopupProps) {
-
-    const marks = [
-        {
-            value: 0,
-            label: 'Mobile',
-            key: "mobile"
-        },
-        {
-            value: 1,
-            label: 'Auto',
-            key: "auto"
-        },
-        {
-            value: 2,
-            label: 'Desktop',
-            key: "desktop"
-        },
-    ];
-
-    const handlerChangeLayout = (_: Event, value: number) => {
-        setLayout(marks[value].key as IPreferencesContext["layout"])
-    }
 
+export function PreferencesPopup({ mobile, setMobile, lockMobile, setLockMobile, handleClose }: PreferencesPopupProps) {
     return <div className="modal-wrapper">
         <div className="modal-backdrop" onClick={handleClose} />
         <div className="modal">
@@ -44,43 +18,34 @@ export function PreferencesPopup({ layout, setLayout, isSavePreferences, setIsSa
             <Typography variant="body1" component="div" className="settings">
                 <div className='preferences-category'>
                     <div className='category-title'>
-                        <h3>Layout</h3>
+                        <h3>Mobile layout</h3>
                     </div>
-                    <div className='preferences-item first leave-left-gap'>
-                        <FormControlLabel
-                            control={
-                                <Box sx={{ width: 300 }}>
-                                    <Slider
-                                        aria-label="Always visible"
-                                        value={marks.find(item => item.key === layout).value}
-                                        step={1}
-                                        marks={marks}
-                                        max={2}
-                                        sx={{
-                                            '& .MuiSlider-track': { display: 'none', },
-                                        }}
-                                        onChange={handlerChangeLayout}
-                                    />
-                                </Box>
-                            }
-                            label=""
-                        />
-                    </div>
-                </div>
-
-                <div className='preferences-category tail-category'>
                     <div className='preferences-item'>
                         <FormControlLabel
                             control={
-                                <Switch
+                            <Switch
-                                    checked={isSavePreferences}
+                                checked={mobile}
-                                    onChange={() => setIsSavePreferences(!isSavePreferences)}
+                                onChange={() => setMobile(!mobile)}
-                                    name="checked"
+                                name="checked"
-                                    color="primary"
+                                color="primary"
-                                />
+                            />
                             }
-                            label="Save my settings (in the browser store)"
+                            label="Enable"
-                            labelPlacement="end"
+                            labelPlacement="start"
+                        />
+                    </div>
+                    <div className='preferences-item'>
+                        <FormControlLabel
+                            control={
+                            <Switch
+                                checked={!lockMobile}
+                                onChange={() => setLockMobile(!lockMobile)}
+                                name="checked"
+                                color="primary"
+                            />
+                            }
+                            label="Auto"
+                            labelPlacement="start"
                         />
                     </div>
                 </div>

client/src/components/welcome.tsx

@@ -10,7 +10,7 @@ import { useAppDispatch, useAppSelector } from '../hooks'
 import { changedOpenedIntro, selectOpenedIntro } from '../state/progress'
 import { useGetGameInfoQuery, useLoadInventoryOverviewQuery } from '../state/api'
 import { Button } from './button'
-import { PreferencesContext } from './infoview/context'
+import { MobileContext } from './infoview/context'
 import { InventoryPanel } from './inventory'
 import { ErasePopup } from './popup/erase'
 import { InfoPopup } from './popup/game_info'
@@ -27,7 +27,7 @@ import { Hint } from './hints'
 
 /** the panel showing the game's introduction text */
 function IntroductionPanel({introduction, setPageNumber}: {introduction: string, setPageNumber}) {
-  const {mobile} = React.useContext(PreferencesContext)
+  const {mobile} = React.useContext(MobileContext)
   const gameId = React.useContext(GameIdContext)
   const dispatch = useAppDispatch()
 
@@ -64,9 +64,7 @@ function IntroductionPanel({introduction, setPageNumber}: {introduction: string,
 /** main page of the game showing among others the tree of worlds/levels */
 function Welcome() {
   const gameId = React.useContext(GameIdContext)
-  const {mobile} = React.useContext(PreferencesContext)
+  const {mobile, setMobile, lockMobile, setLockMobile} = React.useContext(MobileContext)
-  const {layout, isSavePreferences, setLayout, setIsSavePreferences} = React.useContext(PreferencesContext)
-
   const gameInfo = useGetGameInfoQuery({game: gameId})
   const inventory = useLoadInventoryOverviewQuery({game: gameId})
 
@@ -136,7 +134,7 @@ function Welcome() {
     {eraseMenu? <ErasePopup handleClose={closeEraseMenu}/> : null}
     {uploadMenu? <UploadPopup handleClose={closeUploadMenu}/> : null}
     {info ? <InfoPopup info={gameInfo.data?.info} handleClose={closeInfo}/> : null}
-    {preferencesPopup ? <PreferencesPopup layout={layout} isSavePreferences={isSavePreferences} setLayout={setLayout} setIsSavePreferences={setIsSavePreferences} handleClose={closePreferencesPopup}/> : null}
+    {preferencesPopup ? <PreferencesPopup mobile={mobile} setMobile={setMobile} lockMobile={lockMobile} setLockMobile={setLockMobile} handleClose={closePreferencesPopup}/> : null}
   </>
 }
 

client/src/components/world_tree.tsx

@@ -11,12 +11,11 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faXmark, faCircleQuestion } from '@fortawesome/free-solid-svg-icons'
 
 import { GameIdContext } from '../app'
-import { useAppDispatch } from '../hooks'
+import { useAppDispatch, useMobile } from '../hooks'
 import { selectDifficulty, changedDifficulty, selectCompleted } from '../state/progress'
 import { store } from '../state/store'
 
 import '../css/world_tree.css'
-import { PreferencesContext } from './infoview/context'
 
 // Settings for the world tree
 cytoscape.use( klay )
@@ -198,7 +197,7 @@ export function WorldSelectionMenu({rulesHelp, setRulesHelp}) {
   const gameId = React.useContext(GameIdContext)
   const difficulty = useSelector(selectDifficulty(gameId))
   const dispatch = useAppDispatch()
-  const { mobile } = React.useContext(PreferencesContext)
+  const { mobile } = useMobile()
 
 
   function label(x : number) {

client/src/css/infoview.css

@@ -41,13 +41,6 @@
 .level-completed {
   font-size: 1.8rem;
   font-weight: 500;
-  padding-left: .5em;
-  padding-right: .5em;
-  padding-top: .2em;
-  padding-bottom: .2em;
-  border-radius: .5em;
-  background-color: #eee;
-
 }
 
 .typewriter {
@@ -195,18 +188,6 @@
   flex-direction: row;
 }
 
-.exercise .failed-command {
-  background-color: #eee;
-  padding: .5em;
-  border-radius: .2em;
-  /* TODO: It seems my browsers merge the margings of the proof steps,
-  so that it only shows once 0.5rem instead of twice. Thus have 1.5 here now.
-  */
-  margin-bottom: 1.5rem;
-  display: flex;
-  flex-direction: row;
-}
-
 .exercise .command-text {
   flex: 1;
   background-color: #fff;

client/src/css/level.css

@@ -368,8 +368,3 @@ td code  {
   min-width: 40px;
   text-align: center;
 }
-
-/* DEBUG */
-/* .proof .step {
-  border: 2px solid rgb(0, 123, 255);
-} */

client/src/css/welcome.css

@@ -187,15 +187,3 @@ h5, h6 {
   margin-left: 0.3rem;
   margin-right: 0.3rem;
 }
-
-.preferences-category.tail-category{
-  margin-top: 2em;
-}
-
-.preferences-item.first{
-  margin-top: 1em;
-}
-
-.preferences-item.leave-left-gap{
-  margin-left: 3em;
-}

client/src/hooks.ts

@@ -1,6 +1,30 @@
 import { TypedUseSelectorHook, useDispatch, useSelector } from 'react-redux'
 import type { RootState, AppDispatch } from './state/store'
 
+import { setMobile as setMobileState, setLockMobile as setLockMobileState} from "./state/preferences"
+
 // Use throughout your app instead of plain `useDispatch` and `useSelector`
 export const useAppDispatch: () => AppDispatch = useDispatch
 export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector
+
+export const useMobile = () => {
+  const dispatch = useAppDispatch();
+
+  const mobile = useAppSelector((state) => state.preferences.mobile);
+  const lockMobile = useAppSelector((state) => state.preferences.lockMobile);
+
+  const setMobile = (val: boolean) => {
+    dispatch(setMobileState(val));
+  };
+
+  const setLockMobile = (val: boolean) => {
+    dispatch(setLockMobileState(val));
+  };
+
+  return {
+    mobile,
+    setMobile,
+    lockMobile,
+    setLockMobile,
+  };
+};

client/src/state/hooks/use_preferences.ts

@@ -1,41 +0,0 @@
-import React, { useState } from "react";
-import { useAppDispatch, useAppSelector } from "../../hooks";
-import { 
-    PreferencesState, 
-    setLayout as setPreferencesLayout, 
-    setIsSavePreferences as setPreferencesIsSavePreferences,
-    getWindowDimensions,
-    AUTO_SWITCH_THRESHOLD
-} from "../preferences";
-
-
-const UsePreferences = () => {
-    const dispatch = useAppDispatch()
-    const [mobile, setMobile] = React.useState<boolean>()
-
-    const layout = useAppSelector((state) => state.preferences.layout);
-    const setLayout = (layout: PreferencesState["layout"]) => dispatch(setPreferencesLayout(layout))
-
-    const isSavePreferences = useAppSelector((state) => state.preferences.isSavePreferences);
-    const setIsSavePreferences = (isSave: boolean) => dispatch(setPreferencesIsSavePreferences(isSave))
-
-    const automaticallyAdjustLayout = () => {
-        const {width} = getWindowDimensions()
-        setMobile(width < AUTO_SWITCH_THRESHOLD)
-    }
-
-    React.useEffect(()=>{
-        if (layout === "auto"){
-          void automaticallyAdjustLayout()
-          window.addEventListener('resize', automaticallyAdjustLayout)
-    
-          return () => window.removeEventListener('resize', automaticallyAdjustLayout)
-        } else {
-          setMobile(layout === "mobile")
-        }
-    }, [layout])
-
-    return {mobile, layout, isSavePreferences, setLayout, setIsSavePreferences}
-} 
-
-export default UsePreferences;

client/src/state/local_storage.ts

@@ -57,12 +57,3 @@ export function savePreferences(state: any) {
     // Ignore
   }
 }
-
-export function removePreferences() {
-  try {
-    localStorage.removeItem(PREFERENCES_KEY);
-  } catch (e) {
-    // Ignore
-  }
-}
-

client/src/state/preferences.ts

@@ -1,10 +1,10 @@
 import { createSlice } from "@reduxjs/toolkit";
 
-import { loadPreferences, removePreferences, savePreferences } from "./local_storage";
+import { loadPreferences } from "./local_storage";
 
-export interface PreferencesState {
+interface PreferencesState {
-  layout: "mobile" | "auto" | "desktop";
+  mobile: boolean;
-  isSavePreferences: boolean;
+  lockMobile: boolean;
 }
 
 export function getWindowDimensions() {
@@ -12,24 +12,26 @@ export function getWindowDimensions() {
   return {width, height}
 }
 
+const { width } = getWindowDimensions()
+
 export const AUTO_SWITCH_THRESHOLD = 800
 
-const initialState: PreferencesState = loadPreferences() ??{
+const initialState: PreferencesState = loadPreferences() ?? {
-    layout: "auto",
+    mobile: width < AUTO_SWITCH_THRESHOLD,
-    isSavePreferences: false
+    lockMobile: false
 }
 
 export const preferencesSlice = createSlice({
   name: "preferences",
   initialState,
   reducers: {
-    setLayout: (state, action) => {
+    setMobile: (state, action) => {
-      state.layout = action.payload;
+      state.mobile = action.payload;
     },
-    setIsSavePreferences: (state, action) => {
+    setLockMobile: (state, action) => {
-      state.isSavePreferences = action.payload;
+      state.lockMobile = action.payload;
     },
   },
 });
 
-export const { setLayout, setIsSavePreferences } = preferencesSlice.actions;
+export const { setMobile, setLockMobile } = preferencesSlice.actions;

client/src/state/progress.ts

@@ -53,22 +53,22 @@ const initalLevelProgressState: LevelProgressState = {code: "", completed: false
 
 /** Add an empty skeleton with progress for the current game */
 function addGameProgress (state: ProgressState, action: PayloadAction<{game: string}>) {
-  if (!state.games[action.payload.game.toLowerCase()]) {
+  if (!state.games[action.payload.game]) {
-    state.games[action.payload.game.toLowerCase()] = {inventory: [], openedIntro: true, data: {}, difficulty: DEFAULT_DIFFICULTY}
+    state.games[action.payload.game] = {inventory: [], openedIntro: true, data: {}, difficulty: DEFAULT_DIFFICULTY}
   }
-  if (!state.games[action.payload.game.toLowerCase()].data) {
+  if (!state.games[action.payload.game].data) {
-    state.games[action.payload.game.toLowerCase()].data = {}
+    state.games[action.payload.game].data = {}
   }
 }
 
 /** Add an empty skeleton with progress for the current level */
 function addLevelProgress(state: ProgressState, action: PayloadAction<{game: string, world: string, level: number}>) {
   addGameProgress(state, action)
-  if (!state.games[action.payload.game.toLowerCase()].data[action.payload.world]) {
+  if (!state.games[action.payload.game].data[action.payload.world]) {
-    state.games[action.payload.game.toLowerCase()].data[action.payload.world] = {}
+    state.games[action.payload.game].data[action.payload.world] = {}
   }
-  if (!state.games[action.payload.game.toLowerCase()].data[action.payload.world][action.payload.level]) {
+  if (!state.games[action.payload.game].data[action.payload.world][action.payload.level]) {
-    state.games[action.payload.game.toLowerCase()].data[action.payload.world][action.payload.level] = {...initalLevelProgressState}
+    state.games[action.payload.game].data[action.payload.world][action.payload.level] = {...initalLevelProgressState}
   }
 }
 
@@ -79,58 +79,58 @@ export const progressSlice = createSlice({
     /** put edited code in the state and set completed to false */
     codeEdited(state: ProgressState, action: PayloadAction<{game: string, world: string, level: number, code: string}>) {
       addLevelProgress(state, action)
-      state.games[action.payload.game.toLowerCase()].data[action.payload.world][action.payload.level].code = action.payload.code
+      state.games[action.payload.game].data[action.payload.world][action.payload.level].code = action.payload.code
-      state.games[action.payload.game.toLowerCase()].data[action.payload.world][action.payload.level].completed = false
+      state.games[action.payload.game].data[action.payload.world][action.payload.level].completed = false
     },
     /** TODO: docstring */
     changedSelection(state: ProgressState, action: PayloadAction<{game: string, world: string, level: number, selections: Selection[]}>) {
       addLevelProgress(state, action)
-      state.games[action.payload.game.toLowerCase()].data[action.payload.world][action.payload.level].selections = action.payload.selections
+      state.games[action.payload.game].data[action.payload.world][action.payload.level].selections = action.payload.selections
     },
     /** mark level as completed */
     levelCompleted(state: ProgressState, action: PayloadAction<{game: string, world: string, level: number}>) {
       addLevelProgress(state, action)
-      state.games[action.payload.game.toLowerCase()].data[action.payload.world][action.payload.level].completed = true
+      state.games[action.payload.game].data[action.payload.world][action.payload.level].completed = true
     },
     /** Set the list of rows where help is displayed */
     helpEdited(state: ProgressState, action: PayloadAction<{game: string, world: string, level: number, help: number[]}>) {
       addLevelProgress(state, action)
       console.debug(`!setting help to: ${action.payload.help}`)
-      state.games[action.payload.game.toLowerCase()].data[action.payload.world][action.payload.level].help = action.payload.help
+      state.games[action.payload.game].data[action.payload.world][action.payload.level].help = action.payload.help
     },
     /** delete all progress for this game */
     deleteProgress(state: ProgressState, action: PayloadAction<{game: string}>) {
-      state.games[action.payload.game.toLowerCase()] = {inventory: [], data: {}, openedIntro: true, difficulty: DEFAULT_DIFFICULTY}
+      state.games[action.payload.game] = {inventory: [], data: {}, openedIntro: true, difficulty: DEFAULT_DIFFICULTY}
     },
     /** delete progress for this level */
     deleteLevelProgress(state: ProgressState, action: PayloadAction<{game: string, world: string, level: number}>) {
       addLevelProgress(state, action)
-      state.games[action.payload.game.toLowerCase()].data[action.payload.world][action.payload.level] = initalLevelProgressState
+      state.games[action.payload.game].data[action.payload.world][action.payload.level] = initalLevelProgressState
     },
     /** load progress, e.g. from external import */
     loadProgress(state: ProgressState, action: PayloadAction<{game: string, data:GameProgressState}>) {
       console.debug(`setting data to:\n ${action.payload.data}`)
-      state.games[action.payload.game.toLowerCase()] = action.payload.data
+      state.games[action.payload.game] = action.payload.data
     },
     /** set the current inventory */
     changedInventory(state: ProgressState, action: PayloadAction<{game: string, inventory: string[]}>) {
       addGameProgress(state, action)
-      state.games[action.payload.game.toLowerCase()].inventory = action.payload.inventory
+      state.games[action.payload.game].inventory = action.payload.inventory
     },
     /** set the difficulty */
     changedDifficulty(state: ProgressState, action: PayloadAction<{game: string, difficulty: number}>) {
       addGameProgress(state, action)
-      state.games[action.payload.game.toLowerCase()].difficulty = action.payload.difficulty
+      state.games[action.payload.game].difficulty = action.payload.difficulty
     },
     /** set the difficulty */
     changedOpenedIntro(state: ProgressState, action: PayloadAction<{game: string, openedIntro: boolean}>) {
       addGameProgress(state, action)
-      state.games[action.payload.game.toLowerCase()].openedIntro = action.payload.openedIntro
+      state.games[action.payload.game].openedIntro = action.payload.openedIntro
     },
     /** set the typewriter mode */
     changeTypewriterMode(state: ProgressState, action: PayloadAction<{game: string, typewriterMode: boolean}>) {
       addGameProgress(state, action)
-      state.games[action.payload.game.toLowerCase()].typewriterMode = action.payload.typewriterMode
+      state.games[action.payload.game].typewriterMode = action.payload.typewriterMode
     }
   }
 })
@@ -138,74 +138,74 @@ export const progressSlice = createSlice({
 /** if the level does not exist, return default values */
 export function selectLevel(game: string, world: string, level: number) {
   return (state) =>{
-    if (!state.progress.games[game.toLowerCase()]) { return initalLevelProgressState }
+    if (!state.progress.games[game]) { return initalLevelProgressState }
-    if (!state.progress.games[game.toLowerCase()].data[world]) { return initalLevelProgressState }
+    if (!state.progress.games[game].data[world]) { return initalLevelProgressState }
-    if (!state.progress.games[game.toLowerCase()].data[world][level]) { return initalLevelProgressState }
+    if (!state.progress.games[game].data[world][level]) { return initalLevelProgressState }
-    return state.progress.games[game.toLowerCase()].data[world][level]
+    return state.progress.games[game].data[world][level]
   }
 }
 
 /** return the code of the current level */
 export function selectCode(game: string, world: string, level: number) {
   return (state) => {
-    return selectLevel(game.toLowerCase(), world, level)(state).code
+    return selectLevel(game, world, level)(state).code
   }
 }
 
 /** return the current inventory */
 export function selectInventory(game: string) {
   return (state) => {
-    if (!state.progress.games[game.toLowerCase()]) { return [] }
+    if (!state.progress.games[game]) { return [] }
-    return state.progress.games[game.toLowerCase()].inventory
+    return state.progress.games[game].inventory
   }
 }
 
 /** return the code of the current level */
 export function selectHelp(game: string, world: string, level: number) {
   return (state) => {
-    return selectLevel(game.toLowerCase(), world, level)(state).help
+    return selectLevel(game, world, level)(state).help
   }
 }
 
 /** return the selections made in the current level */
 export function selectSelections(game: string, world: string, level: number) {
   return (state) => {
-    return selectLevel(game.toLowerCase(), world, level)(state).selections
+    return selectLevel(game, world, level)(state).selections
   }
 }
 
 /** return whether the current level is clompleted */
 export function selectCompleted(game: string, world: string, level: number) {
   return (state) => {
-    return selectLevel(game.toLowerCase(), world, level)(state).completed
+    return selectLevel(game, world, level)(state).completed
   }
 }
 
 /** return progress for the current game if it exists */
 export function selectProgress(game: string) {
   return (state) => {
-    return state.progress.games[game.toLowerCase()] ?? null
+    return state.progress.games[game] ?? null
   }
 }
 
 /** return difficulty for the current game if it exists */
 export function selectDifficulty(game: string) {
   return (state) => {
-    return state.progress.games[game.toLowerCase()]?.difficulty ?? DEFAULT_DIFFICULTY
+    return state.progress.games[game]?.difficulty ?? DEFAULT_DIFFICULTY
   }
 }
 
 /** return whether the intro has been read */
 export function selectOpenedIntro(game: string) {
   return (state) => {
-    return state.progress.games[game.toLowerCase()]?.openedIntro
+    return state.progress.games[game]?.openedIntro
   }
 }
 
 /** return typewriter mode for the current game if it exists */
 export function selectTypewriterMode(game: string) {
   return (state) => {
-    return state.progress.games[game.toLowerCase()]?.typewriterMode ?? true
+    return state.progress.games[game]?.typewriterMode ?? true
   }
 }
 

client/src/state/store.ts

@@ -8,7 +8,7 @@ import { connection } from '../connection'
 import { apiSlice } from './api'
 import { progressSlice } from './progress'
 import { preferencesSlice } from "./preferences"
-import { saveState, savePreferences, removePreferences} from "./local_storage";
+import { saveState, savePreferences } from "./local_storage";
 
 
 export const store = configureStore({
@@ -29,9 +29,7 @@ export const store = configureStore({
 store.subscribe(
   debounce(() => {
     saveState(store.getState()[progressSlice.name]);
-
+    savePreferences(store.getState()[preferencesSlice.name]);
-    const preferencesState = store.getState()[preferencesSlice.name]
-    preferencesState.isSavePreferences ? savePreferences(preferencesState) : removePreferences()
   }, 800)
 );
 

client/src/wasm.ts

@@ -0,0 +1,339 @@
+import { DataCallback, AbstractMessageReader, MessageReader } from 'vscode-jsonrpc/lib/common/messageReader.js';
+
+import { Message } from 'vscode-jsonrpc/lib/common/messages.js';
+import { AbstractMessageWriter, MessageWriter } from 'vscode-jsonrpc/lib/common/messageWriter.js';
+import { Emitter } from 'vscode-jsonrpc/lib/common/events.js';
+import { Disposable, IWebSocket } from 'vscode-ws-jsonrpc/.';
+
+declare var IO: any;
+
+export class WasmWriter implements MessageWriter {
+  protected errorCount = 0;
+  errorEmitter
+  closeEmitter
+  constructor(private worker: Worker) {
+    this.errorEmitter = new Emitter()
+    this.closeEmitter = new Emitter()
+}
+dispose() {
+    this.errorEmitter.dispose();
+    this.closeEmitter.dispose();
+}
+get onError() {
+    return this.errorEmitter.event;
+}
+fireError(error, message, count) {
+    this.errorEmitter.fire([this.asError(error), message, count]);
+}
+get onClose() {
+    return this.closeEmitter.event;
+}
+fireClose() {
+    this.closeEmitter.fire(undefined);
+}
+asError(error) {
+    if (error instanceof Error) {
+        return error;
+    }
+    else {
+        return new Error(`Writer received error. Reason: ${error.message}`);
+    }
+}
+
+  end(): void {
+  }
+
+  async write(msg: Message): Promise<void> {
+      try {
+          const content = JSON.stringify(msg);
+          this.worker.postMessage(content)
+      } catch (e) {
+          this.errorCount++;
+          this.fireError(e, msg, this.errorCount);
+      }
+  }
+}
+
+
+export class WasmReader implements MessageReader {
+  protected state: 'initial' | 'listening' | 'closed' = 'initial';
+  protected callback: DataCallback | undefined;
+  protected readonly events: { message?: any, error?: any }[] = [];
+
+  constructor(private worker: Worker) {
+    this.worker.onmessage = (ev) => {
+      this.readMessage(ev.data)
+    }
+      // this.socket.onMessage(message =>
+      //     this.readMessage(message)
+      // );
+      // this.socket.onError(error =>
+      //     this.fireError(error)
+      // );
+      // this.socket.onClose((code, reason) => {
+      //     if (code !== 1000) {
+      //         const error: Error = {
+      //             name: '' + code,
+      //             message: `Error during socket reconnect: code = ${code}, reason = ${reason}`
+      //         };
+      //         this.fireError(error);
+      //     }
+      //     this.fireClose();
+      // });
+    this.errorEmitter = new Emitter()
+    this.closeEmitter = new Emitter()
+    this.partialMessageEmitter = new Emitter()
+  }
+
+  protected errorCount = 0;
+  errorEmitter
+  closeEmitter
+  partialMessageEmitter
+
+dispose() {
+    this.errorEmitter.dispose();
+    this.closeEmitter.dispose();
+}
+get onError() {
+    return this.errorEmitter.event;
+}
+get onClose() {
+    return this.closeEmitter.event;
+}
+get onPartialMessage() {
+    return this.partialMessageEmitter.event;
+}
+firePartialMessage(info) {
+    this.partialMessageEmitter.fire(info);
+}
+asError(error) {
+    if (error instanceof Error) {
+        return error;
+    }
+    else {
+        return new Error(`Reader received error. Reason: ${error.message ? error.message : 'unknown'}`);
+    }
+}
+
+  listen(callback: DataCallback): Disposable {
+      if (this.state === 'initial') {
+          this.state = 'listening';
+          this.callback = callback;
+          while (this.events.length !== 0) {
+              const event = this.events.pop()!;
+              if (event.message) {
+                  this.readMessage(event.message);
+              } else if (event.error) {
+                  this.fireError(event.error);
+              } else {
+                  this.fireClose();
+              }
+          }
+      }
+      return {
+          dispose: () => {
+              if (this.callback === callback) {
+                  this.callback = undefined;
+              }
+          }
+      };
+  }
+
+  protected readMessage(message: any): void {
+      if (this.state === 'initial') {
+          this.events.splice(0, 0, { message });
+      } else if (this.state === 'listening') {
+          try {
+              const data = JSON.parse(message);
+              this.callback!(data);
+          } catch (err) {
+              const error: Error = {
+                  name: '' + 400,
+                  message: `Error during message parsing, reason = ${typeof err === 'object' ? (err as any).message : 'unknown'}`
+              };
+              this.fireError(error);
+          }
+      }
+  }
+
+  protected fireError(error: any): void {
+      if (this.state === 'initial') {
+          this.events.splice(0, 0, { error });
+      } else if (this.state === 'listening') {
+
+    this.errorEmitter.fire(this.asError(error));
+      }
+  }
+
+  protected fireClose(): void {
+      if (this.state === 'initial') {
+          this.events.splice(0, 0, {});
+      } else if (this.state === 'listening') {
+        this.closeEmitter.fire(undefined);
+      }
+      this.state = 'closed';
+  }
+}
+export class WebSocketMessageWriter implements MessageWriter {
+    protected errorCount = 0;
+    errorEmitter
+    closeEmitter
+
+    constructor(protected readonly socket: IWebSocket) {
+        this.errorEmitter = new Emitter();
+        this.closeEmitter = new Emitter();
+    }
+    dispose() {
+        this.errorEmitter.dispose();
+        this.closeEmitter.dispose();
+    }
+    get onError() {
+        return this.errorEmitter.event;
+    }
+    fireError(error, message, count) {
+        this.errorEmitter.fire([this.asError(error), message, count]);
+    }
+    get onClose() {
+        return this.closeEmitter.event;
+    }
+    fireClose() {
+        this.closeEmitter.fire(undefined);
+    }
+    asError(error) {
+        if (error instanceof Error) {
+            return error;
+        }
+        else {
+            return new Error(`Writer received error. Reason: ${(error.message) ? error.message : 'unknown'}`);
+        }
+    }
+    end(): void {
+    }
+
+    async write(msg: Message): Promise<void> {
+        console.log("WRITE",msg)
+        try {
+            const content = JSON.stringify(msg);
+            this.socket.send(content);
+        } catch (e) {
+            this.errorCount++;
+            this.fireError(e, msg, this.errorCount);
+        }
+    }
+}
+
+
+
+export class WebSocketMessageReader implements MessageReader {
+    protected state: 'initial' | 'listening' | 'closed' = 'initial';
+    protected callback: DataCallback | undefined;
+    protected readonly events: { message?: any, error?: any }[] = [];
+    errorEmitter
+    closeEmitter
+    partialMessageEmitter
+
+    constructor(protected readonly socket: IWebSocket) {
+        this.errorEmitter = new Emitter();
+        this.closeEmitter = new Emitter();
+        this.partialMessageEmitter = new Emitter();
+        this.socket.onMessage(message =>{
+            console.log("READ", message)
+            this.readMessage(message)
+        });
+        this.socket.onError(error =>
+            this.fireError(error)
+        );
+        this.socket.onClose((code, reason) => {
+            if (code !== 1000) {
+                const error: Error = {
+                    name: '' + code,
+                    message: `Error during socket reconnect: code = ${code}, reason = ${reason}`
+                };
+                this.fireError(error);
+            }
+            this.fireClose();
+        });
+    }
+    dispose() {
+        this.errorEmitter.dispose();
+        this.closeEmitter.dispose();
+    }
+    get onError() {
+        return this.errorEmitter.event;
+    }
+    get onClose() {
+        return this.closeEmitter.event;
+    }
+    get onPartialMessage() {
+        return this.partialMessageEmitter.event;
+    }
+    firePartialMessage(info) {
+        this.partialMessageEmitter.fire(info);
+    }
+    asError(error) {
+        if (error instanceof Error) {
+            return error;
+        }
+        else {
+            return new Error(`Reader received error. Reason: ${(error.message) ? error.message : 'unknown'}`);
+        }
+    }
+
+    listen(callback: DataCallback): Disposable {
+        if (this.state === 'initial') {
+            this.state = 'listening';
+            this.callback = callback;
+            while (this.events.length !== 0) {
+                const event = this.events.pop()!;
+                if (event.message) {
+                    this.readMessage(event.message);
+                } else if (event.error) {
+                    this.fireError(event.error);
+                } else {
+                    this.fireClose();
+                }
+            }
+        }
+        return {
+            dispose: () => {
+                if (this.callback === callback) {
+                    this.callback = undefined;
+                }
+            }
+        };
+    }
+
+    protected readMessage(message: any): void {
+        if (this.state === 'initial') {
+            this.events.splice(0, 0, { message });
+        } else if (this.state === 'listening') {
+            try {
+                const data = JSON.parse(message);
+                this.callback!(data);
+            } catch (err) {
+                const error: Error = {
+                    name: '' + 400,
+                    message: `Error during message parsing, reason = ${typeof err === 'object' ? (err as any).message : 'unknown'}`
+                };
+                this.fireError(error);
+            }
+        }
+    }
+
+    protected fireError(error: any): void {
+        if (this.state === 'initial') {
+            this.events.splice(0, 0, { error });
+        } else if (this.state === 'listening') {
+            this.errorEmitter.fire(this.asError(error));
+        }
+    }
+
+    protected fireClose(): void {
+        if (this.state === 'initial') {
+            this.events.splice(0, 0, {});
+        } else if (this.state === 'listening') {
+            this.closeEmitter.fire(undefined);
+        }
+        this.state = 'closed';
+    }
+}

doc/DOCUMENTATION.md

@@ -1,67 +1,335 @@
-# Server
+**NOTE! This document is deprecated! The current documentation is [How To Create A Game](create_game.md)**
 
-The server is made out of two parts, named "relay" and "server".
+# Creating a game.
 
-The former, "relay", is the server which
+Ideally one takes the [GameSkeleton template](https://github.com/hhu-adam/GameSkeleton) to create a new game.
-sets up a socket connection to the client, starts the lean servers to work on files and
-relays messages between the lean server and the client. `index.mjs` is the file that needs to
-be run, which is done for example using `pm2` or by calling `npm run start_server` or
-`npm run production`, see more later.
 
-The latter, "server", is the lean server which has two jobs. For one, it produces the "gameserver"
+## Game Structure
-executable which is the lean server that handles the files the player plays on. The second job
-is to provide the lean commands which are used when creating a game. These are located in
-`Commands.lean`.
 
+A game consist of worlds which have multiple levels each. In the following we describe how to create a level file and how to combine these into a game.
 
-## Integration into Games
+### Level
 
-Games need the "server" as a lake-dependency, which is done in the game's lakefile.
+A level file is a lean file that imports at least `import GameServer.Commands` and starts with the following Lean commands.
-
-A game imports `GameServer.Commands` which provides to all the API required to
-create a game.
-
-In particular the lean command `MakeGame` compiles the entire game. Static information is
-stored as JSON files in `.lake/gamedata` for faster loading, while other data is only
-saved to lean env-extensions which the lean server has access to after loading the lean file.
-
-For games to be run successfully, it is important that the "gameserver" executable inside
-the game's `.lake` folder is actually built.
-Currently, this happens through a lake-post-update-hook when calling `lake update -R` (in the game's folder), but if this fails, you can always build it manually by calling `lake build gameserver`.
-(both commands are to be executed in the game's directory!)
-
-## Modifying the server
-
-### Starting the server
-
-When using the [manual installation](running_locally.md#manual-installation) you can run the server
-using
 
+```lean
+Game "NNG"
+World "Addition"
+Level 1
+Title "The rfl tactic"
 ```
+
+Note that the levels inside a world must have consecutive numbering starting with `1`. The `Game`
+and `World` strings can be anything, see below.
+
+#### Statement
+
+The core of a level is the `Statement`, which is the exercise that should be proven.
+
+```lean
+/-- For all natural numbers $n$, we have $0 + n = n$. -/
+@[simp]
+Statement MyNat.zero_add
+    (n : ℕ) : 0 + n = n := by
+  Hint "You can start a proof by `induction n`."
+  induction n with n hn
+  · Hint "This is the base case."
+    rw [add_zero]
+    rfl
+  · Hint "This is the induction hypothesis"
+    rw [add_succ]
+    Branch
+      simp
+      Hint "A branch is an alternative tactic sequence. Does not need to finish the proof."
+    rw [hn]
+    rfl
+```
+
+##### Proof
+
+The proof must always be a tactic proof, i.e. `:= by` is a mandatory part of the syntax.
+
+There are a few extra tactics that help you structuring the proof:
+
+- `Hint`: You can use `Hint "text"` to display text if the goal state in-game matches
+  the one where `Hint` is placed. For more options about hints, see below.
+- `Branch`: In the proof you can add a `Branch` that runs an alternative tactic sequence, which
+  helps setting `Hints` in different   places. The `Branch` does not affect the main
+  proof and does not need to finish any goals.
+- `Template`/`Hole`: Used to provide a sample proof template. Anything inside `Template`
+  will be copied into the editor with all `Hole`s replaced with `sorry`. Note that
+  having a `Template` will force the user to use Editor-mode for this level.
+
+##### Statement Name (optional)
+
+If you specify a name (`MyNat.zero_add`), this lemma will be available in future levels.
+(Note that a future level must also import this level,
+so that Lean knows about the added statement).
+
+The name must be *fully qualified*. (TODO: is that still true? Did we implement namespaces?)
+
+##### Doc Comment (optional)
+
+There are three places where the documentation comment appears:
+
+1. as doc comment when hovering over the theorem
+2. as exercise description at the top of the level: ``Theorem `zero_add`: yada yada.``
+3. in the inventory. This can be overwritten by using
+  `LemmaDoc MyNat.zero_add "different yada yada"` as one might want to add a more detailed
+  description there including examples etc.
+
+Both latter points support Markdown (including katex).
+
+##### Attributes (optional)
+
+the `@[ attributes ]` prefix should work just like you know it from the `theorem` keyword.
+
+#### Introduction/Conclusion
+
+Optionally, you can add an `Introduction "some text"` and `Conclusion "some text"` to your level.
+The introduction will be shown at the beginning, the conclusion is displayed once the level
+is solved.
+
+#### Theorems/Tactics/Definitions
+
+Only enabled theorems/tactics/definitions (called "items" here) are available in a level.
+
+To add a new item in a level, you can add
+
+```lean
+NewTactic rfl simp
+NewLemma MyNat.add_zero MyNat.add_succ
+NewDefinition Nat Pow Mul
+```
+
+Once added, items will be available in all future levels/worlds,
+unless you disable them for a particular level with
+
+```lean
+DisabledTactic tauto
+DisabledLemma MyNat.add_zero
+```
+
+or specify explicitly which items should be available with
+
+```lean
+OnlyTactic rw rfl apply
+OnlyLemma MyNat.add_zero
+```
+
+Lastly, all items need documentation entries (which are imported in the level),
+see more about that below. There is also explains the `LemmaTab` keyword.
+
+### World
+
+Multiple levels are combined into a world and the worlds are then added to the game. It is recommended that all levels of a world are inside one folder (e.g. `NNG/Levels/Addition/`) and
+then there is one world file (`NNG/Levels/Addition.lean`) which contains the following
+
+```lean
+import NNG.Levels.Addition.Level_1
+import NNG.Levels.Addition.Level_2
+
+Game "NNG"
+World "Addition"
+Title "Addition World"
+
+Introduction "some text"
+```
+
+The `Title` is the world's display title. The `Introduction` is displayed before loading level 1.
+Note that all levels of a world should be imported by the world file.
+
+BUG: A level **must not** be imported in a different world's level. Instead, you have to import an entire world there: `import NNG.Levels.Addition`
+
+### Game
+
+The Game itself (i.e. the main file of you lake project, `NNG.lean`) should import all worlds and have the following layout, concluding with `MakeGame`:
+
+```lean
+import NNG.Levels.Addition
+import NNG.Levels.Multiplication
+import NNG.Levels.Power
+
+Game "NNG"
+Title "Natural Number Game"
+Introduction "some text"
+
+MakeGame
+```
+
+The game will automatically compute the order of the worlds depending on the sample proofs of the Levels (ignoring anything inside a `Branch`). You can add additional dependencies manually by adding `Dependency PowerWorld → ImpossibleWorld` before `MakeGame`.
+The order of worlds influences which tactics and lemmas will be unlocked in a given level.
+
+`MakeGame` will display warnings about things in the game that need to be fixed, like missing
+documentation or if a tactic is never introduced.
+
+### Documentation
+
+Each tactic, theorem, or definition (all called items here) that is introduced in the game
+needs a documentation entry. These are statements of the following form:
+
+```lean
+LemmaDoc MyNat.add_squared as "add_squared" in "Pow"
+"(missing)"
+
+TacticDoc constructor
+"(missing)"
+
+DefinitionDoc One as "1"
+"(missing)"
+```
+
+Notes:
+
+* The lemma name must be **fully qualified**. The string display name can be arbitrary.
+* Tactics must have their proper name. use `TacticDoc «have» ""` if it does not work
+  without french quotes.
+* Definition names can be arbitrary. E.g. I used `DefinitionDoc Symbol.Fun as "fun x ↦ x" "(missing)"` once.
+
+Moreover, the lemmas are in sorted in tabs (the `in "Pow`) part. In each level file, you
+can define which tab is open when the level is loaded by adding `LemmaTab "Pow"`.
+
+There will be features added to get automatic information from mathlib!
+
+## Escaping
+(TODO: Move)
+
+
+Inside the doc comment you don't need to escape the backslashes:
+
+```lean
+/-- $\operatorname{succ}(n)$. notation for naturals is `\N`. -/
+Statement ...
+```
+
+However, inside interpolated strings (e.g. in `Hint`, `Introduction` and `Conclusion`)
+you do need to escape backslashes
+with `\\` and `{` with `\{`:
+
+```lean
+Hint "This code has some $\\operatorname\{succ}(n)$ math. The value of `h` is {h}.
+Notation for naturals is `\\N`."
+```
+
+## Game design
+Here are some things you should consider designing a new game:
+
+* A world with more than 16 levels will be displayed with the levels spiraling outwards,
+  it might be desirable to stay below that bound. Above 22 levels the spiral start getting out
+  of control.
+
+# Running Games Locally
+
+The installation instructions are not yet tested on Mac/Windows. Comments very welcome!
+
+## VSCode Dev Containers
+
+1.  **Install Docker and Dev Containers** *(once)*:<br/>
+    See [official instructions](https://code.visualstudio.com/docs/devcontainers/containers#_getting-started).
+    Explicitly this means:
+    * Install docker engine if you have not yet: [Instructions](https://docs.docker.com/engine/install/).
+      I followed the "Server" instructions for linux.
+    * Note that on Linux you need to add your user to the `docker` group
+      ([see instructions](https://docs.docker.com/engine/install/linux-postinstall/)) and probably reboot.
+    * Open the games folder in VSCode: `cd NNG4 && code .` or "Open Folder" within VSCode
+    * a message appears prompting you to install the "Dev Containers" extension (by Microsoft).
+
+2.  **Open Project in Dev Container** *(everytime)*:<br/>
+    Once you have the Dev Containers Extension installed, (re)open the project folder of your game in VSCode.
+    A message appears asking you to "Reopen in Container".
+
+    * The first start will take a while, ca. 2-10 minutes. After the first
+      start this should be very quickly.
+    * Once built, it should open a tab "Simple Browser" inside VSCode displaying
+      the game. (Alternatively, open http://localhost:3000 in your browser).
+
+3.  **Editing Files** *(everytime)*:<br/>
+    After editing some files in VSCode, open VSCode's terminal (View > Terminal) and run `lake build`.
+    Now you can reload your browser to see the changes.
+
+### Errors
+
+* If you don't get the pop-up, you might have disabled them and you can reenable it by
+  running the `remote-containers.showReopenInContainerNotificationReset` command in vscode.
+* If the starting the container fails, in particular with a message `Error: network xyz not found`,
+  you might have deleted stuff from docker via your shell. Try deleting the container and image
+  explicitly in VSCode (left side, "Docker" icon). Then reopen vscode and let it rebuild the
+  container. (this will again take some time)
+
+
+## Without Dev Containers
+Install `nvm`:
+```bash
+curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.2/install.sh | bash
+```
+then reopen bash and test with `command -v nvm` if it is available (Should print "nvm").
+
+Now install node:
+```bash
+nvm install node
+```
+
+Clone the game (e.g. `NNG4` here):
+```bash
+git clone https://github.com/hhu-adam/NNG4.git
+# or: git clone git@github.com:hhu-adam/NNG4.git
+```
+
+Download dependencies and build the game:
+```bash
+cd NNG4
+lake update
+lake exe cache get   # if your game depends on mathlib
+lake build
+```
+
+Clone the game repository into a directory next to the game:
+```bash
+cd ..
+git clone https://github.com/leanprover-community/lean4game.git
+# or: git clone git@github.com:leanprover-community/lean4game.git
+```
+The folders `NNG4` and `lean4game` must be in the same directory!
+
+In `lean4game`, install dependencies:
+```bash
+cd lean4game
+npm install
+```
+
+TODO: This is outdated!
+If you are developing a game other than `Robo` or `NNG4`, adapt the
+code at the beginning of `lean4game/relay/index.mjs`:
+```typescript
+const games = {
+    "g/hhu-adam/robo": {
+        dir: "../../../../Robo",
+        queueLength: 5
+    },
+    "g/hhu-adam/nng4": {
+        dir: "../../../../NNG4",
+        queueLength: 5
+    }
+}
+```
+
+Run the game:
+```bash
 npm start
 ```
 
-This way any changes to files in `client/` or `relay/` will cause the server to restart automatically.
+This takes a little time. Eventually, the server is available on http://localhost:3000/
+and the game is available on http://localhost:3000/#/g/hhu-adam/NNG4.
 
-Alternative, you can run `npm run build` followed by the commands
+### Modifying the GameServer
 
+When modifying the game engine itself (in particular the content in `lean4game/server`) you can test it live with this
+setup by setting `export NODE_ENV=development` inside your local game before building it:
+
+```bash
+cd NNG4
+export NODE_ENV=development
+lake update
+lake build
 ```
-npm run start_client
+This causes lake to search locally for the `GameServer` lake package instead of using the version from github.
-npm run production
-```
-
-(in two separate terminals) to test the production mode of the server. This way it will only
-change once you build and restart the server.
-
-### Modifying the lean server
-
-To test a modified lean server (i.e. content of `server/`), you can use the local dev setup and call
-`lake update -R -Klean4game.local` in your game followed by `lake build`.
-This will cause lake to look for the
-local lean server as a dependency instead of the version it downloaded from git.
-
-You can play a local game at https://localhost:3000/#/g/local/{FolderName} where you replace `{FolderName}` with the game folder name.
-
-After modifications in `server/`, you will need to call `lake build gameserver` (called in `server/` or in your game's folder) to rebuild
-the gameserver executable and
-`lake build` (called in the game's folder) to rebuild the game.

doc/changelog.md

@@ -1,9 +0,0 @@
-# Changelog
-
-## v4.5.0
-
-### Breaking changes
-
-* Fix (#183): local store accepts case insensitive URL. The game progress has previously been saved under case sensitive URLs. You might need to recover old progress from your browser storage.
-
-## Other

doc/create_game.md

@@ -98,7 +98,7 @@ This introduction text is shown when one first enters a world.
 1. Use the template above and make sure you import all levels of this world.
 1. In `Game.lean` import the world with `import Game.Levels.MyWorld`
 
-Now you created a world with one level and added it🎉 The command `MakeGame` in `Game.lean` shows you any problems you might need to fix. Currently, it shows
+Now you created a world with one level and added it🎉 The command `MakeGame` in `Game.lean` shows you any problems you might need to fix. Currently it shows
 
 ```text
 No world introducing sorry, but required by MyWorld
@@ -125,32 +125,23 @@ The player has an inventory with tactics, theorems, and definitions that unlock
 
 ```lean
 NewTactic induction simp
-NewTheorem Nat.zero_mul
+NewLemma Nat.zero_mul
 NewDefinition Pow
 ```
 
-**Important:** All commands in this section 6a) expect the `Name` they take as input
-to be **fully qualified**. For example `NewTheorem Nat.zero_mul` and not `NewTheorem zero_mul`.
-
 #### Doc entries
 
-You'll see a warning about a missing Theorem documentation. You can fix it by adding doc-entries like the following somewhere above it.
+You'll see a warning about a missing Lemma documentation. You can fix it by adding doc-entries like the following somewhere above it.
 
 ```lean
-/--
+LemmaDoc Nat.zero_mul as "zero_mul" in "Mul"
-some description
+"some description"
--/
-TheoremDoc Nat.zero_mul as "zero_mul" in "Mul"
 
-/--
-some description
--/
 TacticDoc simp
+"some description"
 
-/--
-some description
--/
 DefinitionDoc Pow as "^"
+"some description"
 ```
 
 (e.g. you could also create a file `Game/Doc/MyTheorems.lean`, add there your documentation and import it)
@@ -162,7 +153,7 @@ If you do not provide any content for the inventory, the game will try to find a
 You have a few options to disable inventory items that have been unlocked in previous levels:
 
 ```lean
-DisabledTactic, DisabledTheorem, OnlyTactic, OnlyTheorem
+DisableTactic, DisableLemma, OnlyTactic, OnlyLemma
 ```
 
 have the same syntax as above. The former two disable items for this level, the latter two
@@ -170,7 +161,7 @@ disable all items except the ones specified.
 
 #### Theorem Tab
 
-Theorems are sorted into tabs. With `TheoremTab "Mul"` you specify which tab should be open by default in this level.
+Theorems are sorted into tabs. with `LemmaTab "Mul"` you specify which tab should be open by default in this level.
 
 #### HiddenTactic
 
@@ -185,14 +176,12 @@ and only `rw` would show up in the inventory.
 
 ### 6. b) Statement
 
-The statement is the exercise of the level. The basics work the same as they would in `example` or `theorem`. Note however, that you **must** do a tactic proof, i.e. the `:= by` is a hard-coded part of the syntax
+The statement is the exercise of the level. the basics work the same as they would in `example` or `theorem`. Note however, that you **must** do a tactic proof, i.e. the `:= by` is a hard-coded part of the syntax
 
 #### Name
 
 You can give your exercise a name: `Statement my_first_exercise (n : Nat) ...`. If you do so, it will be added to the inventory and be available in future levels.
 
-You can but a `Statement` inside namespaces like you would with `theorem`.
-
 #### Doc String / Exercise statement
 
 Add a docstring that contains the exercise statement in natural language. If you do this, it will appear at the top of the exercise. It supports Latex.
@@ -216,12 +205,12 @@ Statement my_simp_lemma ...
 
 The proof must always be a tactic proof, i.e. `:= by` is a mandatory part of the syntax.
 
-There are a few extra tactics that help you with structuring the proof:
+There are a few extra tactics that help you structuring the proof:
 
 - `Hint`: You can use `Hint "text"` to display text if the goal state in-game matches
   the one where `Hint` is placed. For more options about hints, see below.
 - `Branch`: In the proof you can add a `Branch` that runs an alternative tactic sequence, which
-  helps to set `Hints` in different places. The `Branch` does not affect the main
+  helps setting `Hints` in different places. The `Branch` does not affect the main
   proof and does not need to finish any goals.
 - `Template`/`Hole`: Used to provide a sample proof template. Anything inside `Template`
   will be copied into the editor with all `Hole`s replaced with `sorry`. Note that
@@ -236,23 +225,23 @@ Most important for game development are probably the `Hints`.
 The hints will be displayed whenever the player's current goal matches the goal the hint is
 placed at inside the sample proof. You can use `Branch` to place hints in dead ends or alternative proof strands.
 
-Read [More about Hints](hints.md) for how they work and what the options are.
+Read [More about Hints](doc/hints.md) for how they work and what the options are.
 
 ### 6. e) Extra: Images
 You can add images on any layer of the game (i.e. game/world/level). These will be displayed in your game.
 
-The images need to be placed in `images/` and you need to add a command like `Image "images/path/to/myWorldImage.png"`
+The images need to be placed in `images/` and you need to add a command like `Image "images/path/to/myWorldImage.png"` 
 in one of the files you created in 2), 3), or 4) (i.e. game/world/level).
 
 NOTE: At present, only the images for a world are displayed. They appear in the introduction of the world.
 
 ## 7. Update your game
 
-In principle, it is as simple as modifying `lean-toolchain` to update your game to a new Lean version. However, you should read about the details in [Update An Existing Game](update_game.md).
+In principle, it is as simple as modifying `lean-toolchain` to update your game to a new Lean version. However, you should read about the details in [Update An Existing Game](doc/update_game.md).
 
 ## 8. Publish your game
 
-To publish your game on the official server, see [Publishing a game](publish_game.md)
+To publish your game on the official server, see [Publishing a game](doc/publish_game.md)
 
 There are a few more options you can add in `Game.lean` before the `MakeGame` command, which describe the tile that is visible on the server's landing page:
 
@@ -264,7 +253,7 @@ Prerequisites "NNG"
 CoverImage "images/cover.png"
 ```
 * `Languages`: Currently only a single language (capital English name). The tile will show a corresponding flag.
-* `CaptionShort`: One catchphrase. Appears above the image.
+* `CaptionShort`: One catch phrase. Appears above the image.
 * `CaptionLong`: 2-4 sentences to describe the game.
 * `Prerequisites` a list of other games you should play before this one, e.g. `Prerequisites "NNG" "STG"`. The game names are free-text.
 * `CoverImage`: You can create a folder `images/` and put images there for the game to use. The maximal ratio is ca. 500x200 (W x H) but it might be cropped horizontally on narrow screens.

doc/hints.md

@@ -10,8 +10,6 @@ Statement .... := by
   ...
 ```
 
-Note that hints are only **context-aware but not history-aware**. In particular, they only look at the assumptions and the current goal. Player's might encounter hints in a different order - or not at all - if they decide to go for a unique proof idea. The `Branch` tactic helps to place hints outside the sample solution's proof.
-
 ## 1. When do hints show?
 
 A hint will be displayed if the player's goal matches the one where the hint was placed in the
@@ -19,7 +17,7 @@ sample solutions and the entire context from the sample solutions is present in
 player's context. The player's context may contain additional items.
 
 This means if you have multiple identical
-subgoals, you should only place a single hint in one of them, and it will be displayed in
+subgoals, you should only place a single hint in one of them and it will be displayed in
 all of them.
 
 However, identical (non-hidden) hints which where already present in the step
@@ -32,12 +30,12 @@ Hidden hints are not filtered.
 You can use `Branch` to place hints
 in dead ends or alternative proof strands.
 
-A proof inside a `Branch`-block is normally evaluated by lean, but it's discarded at the end
+A proof inside a `Branch`-block is normally evaluated by lean but it's discarded at the end
 so that no progress has been made on proofing the goal.
 
 ```
 Statement .... := by
-  Hint "use `rw` or `rewrite`."
+  Hint "Huse `rw` or `rewrite`."
   Branch
     rewrite [h]
     Hint "now you still need `rfl`"

doc/publish_game.md

@@ -1,6 +1,6 @@
 # Publishing games
 
-You can publish your game on the official [Lean Game Server](https://adam.math.hhu.de) in a few simple
+You can publish your game on the official (Lean Game Server)[https://adam.math.hhu.de] in a few simple
 steps.
 
 ## 1. Upload Game to github
@@ -11,7 +11,7 @@ tab.
 
 ## 2. Import the game
 
-You call the URL that's listed under "What's Next?" in the latest action run. Explicitly you call
+You call the URL that's listed under "What's Next?" in the latest action run. Explicitely you call
 the URL of the form
 
 > adam.math.hhu.de/import/trigger/{USER}/{REPOSITORY}

doc/running_locally.md

@@ -2,8 +2,6 @@
 
 The installation instructions are not yet tested on Mac/Windows. Comments very welcome!
 
-Please also consult the [Troubleshooting Collection](troubleshoot.md), where some known pitfalls are collected.
-
 There are several options to play a game locally:
 
 1. VSCode Dev Container: needs `docker` installed on your machine
@@ -33,14 +31,24 @@ The template game [GameSkeleton](https://github.com/hhu-adam/GameSkeleton) conta
 
     * The first start will take a while, ca. 2-15 minutes. After the first
       start this should be very quickly.
-    * Once built, you can open http://localhost:3000 in your browser, which should load the game.
+    * Once built, you can open http://localhost:3000 in your browser. which should load the game.
 
 3.  **Editing Files** *(everytime)*:<br/>
     After editing some Lean files in VSCode, open VSCode's terminal (View > Terminal) and run `lake build`. Now you can reload your browser to see the changes.
 
+### Errors
+
+* If you don't get the pop-up, you might have disabled them and you can reenable it by
+  running the `remote-containers.showReopenInContainerNotificationReset` command in vscode.
+* If the starting the container fails, in particular with a message `Error: network xyz not found`,
+  you might have deleted stuff from docker via your shell. Try deleting the container and image
+  explicitely in VSCode (left side, "Docker" icon). Then reopen vscode and let it rebuild the
+  container. (this will again take some time)
+* On a working dev container setup, http://localhost:3000 should directly redirect you to http://localhost:3000/#/g/local/game, try if the latter is accessible.
+
 ## Codespaces
 
-You can work on your game using Github codespaces (click "Code" and then "Codespaces" and then "create codespace on main"). It should run the game locally in the background. You can open it for example under "Ports" and clicking on "Open in Browser".
+You can work on your game using Github codespaces (click "Code" and then "Codespaces" and then "create codespace on main"). It it should run the game locally in the background. You can open it for example under "Ports" and clicking on "Open in Browser".
 
 Note: You have to wait until npm started properly, which might take a good while.
 
@@ -100,29 +108,6 @@ Run the game:
 npm start
 ```
 
-You should see a message like this:
-```bash
-[server] > lean4-game@0.1.0 start_server
-[server] > (cd server && lake build) && (cd relay && cross-env NODE_ENV=development nodemon -e mjs --exec "node ./index.mjs")
-[server]
-[client]
-[client] > lean4-game@0.1.0 start_client
-[client] > cross-env NODE_ENV=development vite --host
-[client]
-[server] [nodemon] 3.0.#
-[server] [nodemon] to restart at any time, enter `rs`
-[server] [nodemon] watching path(s): *.*
-[server] [nodemon] watching extensions: mjs
-[server] [nodemon] starting `node ./index.mjs`
-[client]
-[client]   VITE v4.5.1  ready in \#\#\# ms
-[client]
-[client]   ➜  Local:   http://localhost:3000/
-[client]   ➜  Network: http://###.###.###.##:3000/
-[client] [vite-plugin-static-copy] Collected 7 items.
-[server] (node:#####) [DEP0040] [server] Listening on 8080
-```
-
 This takes a little time. Eventually, the game is available on http://localhost:3000/#/g/local/GameSkeleton. Replace `GameSkeleton` with the folder name of your local game.
 
 ## Modifying the GameServer

doc/server.md

@@ -6,7 +6,7 @@ In order to set up the server to allow imports, one needs to create a
 repos will suffice.
 
 You need to set the environment variables `LEAN4GAME_GITHUB_USER` and `LEAN4GAME_GITHUB_TOKEN`
-with your user name and access token. For example, you can set these in `ecosystem.config.cjs` if
+with your user name and access token. For example, you can seet these in `ecosystem.config.cjs` if
 you're using `pm2`
 
 Then people can call:
@@ -22,7 +22,7 @@ where you replace:
 
 > https://{website}/#/g/{owner}/{repo}
 
-## Data management
+## data management
 Everything downloaded remains in the folder `lean4game/games`.
-The subfolder `tmp` contains downloaded artifacts and can be deleted without loss.
+the subfolder `tmp` contains downloaded artifacts and can be deleted without loss.
 The other folders should only contain the built lean-games, sorted by owner and repo.

doc/troubleshoot.md

@@ -1,37 +0,0 @@
-# Troubleshooting
-
-Here are some issues experienced by users.
-
-- You can reset the lake projects involved (i.e. the `server/` folder here as well as your [game's folder](https://github.com/hhu-adam/GameSkeleton)) with the following commands:
-  ```
-  cd [THE PROJECT]
-  rm -rf .lake/
-  lake update -R
-  lake build
-  ```
-  If you experience problems related to Lean or lake, you should first try to reset it this way.
-
-# VSCode Dev-Container
-* If you don't get the pop-up, you might have disabled them, and you can reenable it by
-  running the `remote-containers.showReopenInContainerNotificationReset` command in vscode.
-* If the starting the container fails, in particular with a message `Error: network xyz not found`,
-  you might have deleted stuff from docker via your shell. Try deleting the container and image
-  explicitly in VSCode (left side, "Docker" icon). Then reopen vscode and let it rebuild the
-  container. (this will again take some time)
-* On a working dev container setup, http://localhost:3000 should directly redirect you to http://localhost:3000/#/g/local/game, try if the latter is accessible.
-
-
-# Manual Installation
-Here are known issues/pitfalls with the local setup using `npm`.
-
-* If `CDPATH` is set on your mac/linux system, it might provide issues with `npm start` resulting in a server crash or blank screen. In particular `npm start` will display
-  ```
-  [server] sh: line 0: cd: server: No such file or directory
-  [server] npm run start_server exited with code 1
-  ```
-  As a fix you might need to delete your manually set `CDPATH` environment variable.
-
-# Publication
-Errors concerning uploads to the server.
-
-* Your game overview loads but the server crashes on loading a level: Check your game's github action is identical to the [GameSkeleton's](https://github.com/hhu-adam/GameSkeleton/blob/main/.github/workflows/build.yml), in particular that there is a step about building the "`gameserver`-executable".

doc/update_game.md

@@ -9,8 +9,8 @@ Before you continue, make sure there [exists a `v4.X.0`-tag in this repo](https:
 
 Then, depending on the setup you use, do one of the following:
 
-* **Dev Container**: Rebuild the VSCode Devcontainer (without Cache!).
+* Dev Container: Rebuild the VSCode Devcontainer.
-* **Local Setup**: in your game's folder run the following:
+* Local Setup: in your game's folder run the following:
   ```
   lake update -R
   lake build
@@ -24,7 +24,7 @@ Then, depending on the setup you use, do one of the following:
     npm install
     ```
     where `{VERSION_TAG}` is the tag from above of the form `v4.X.0`
-* **Gitpod/Codespaces**: Create a fresh one
+* Gitpod/Codespaces: Create a fresh one
 
 This will update your game (and the mathlib version you might be using) to the new lean version.
 

index.html

@@ -33,6 +33,7 @@
       </p>
     </div>
   </noscript>
+  <script src="coi-serviceworker.js"></script>
   <script type="module" src="/client/src/index.tsx"></script>
 </body>
 

package.json

@@ -21,6 +21,7 @@
     "@types/cytoscape": "^3.19.9",
     "@types/react-router-dom": "^5.3.3",
     "@vitejs/plugin-react-swc": "^3.4.0",
+    "coi-serviceworker": "^0.1.7",
     "cross-env": "^7.0.3",
     "cytoscape": "^3.23.0",
     "cytoscape-elk": "^2.1.0",
@@ -28,8 +29,8 @@
     "debounce": "^1.2.1",
     "express": "^4.18.2",
     "lean4-infoview": "https://gitpkg.now.sh/leanprover/vscode-lean4/lean4-infoview?de0062c",
-    "lean4web": "github:hhu-adam/lean4web#414d9e62638a392fca278761b4c61a1d2e138bc7",
+    "lean4web": "github:hhu-adam/lean4web#b91645a7b88814675ba9f99817436d0a2ce3a0ec",
-    "octokit": "^3.1.2",
+    "octokit": "^2.0.14",
     "path-browserify": "^1.0.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

relay/index.mjs

@@ -19,8 +19,7 @@ import { importTrigger, importStatus } from './import.mjs'
 const queueLength = {
   "g/hhu-adam/robo": 2,
   "g/hhu-adam/nng4": 5,
-  "g/djvelleman/stg4": 0,
+  "g/djvelleman/stg4": 2,
-  "g/trequetrum/lean4game-logic": 0,
 }
 
 const __filename = url.fileURLToPath(import.meta.url);

relay/unpack.sh

@@ -28,7 +28,3 @@ do
   #tar -xvzf $f -C games/${OWNER}/${REPO}
   unzip -q -o $f -d ${OWNER}/${REPO}
 done
-
-# Delete temporary files
-rm -f tmp/${OWNER}_${REPO}_${ARTIFACT_ID}.zip
-rm -fr tmp/${OWNER}_${REPO}_${ARTIFACT_ID}

server/GameServer.lean

@@ -11,7 +11,7 @@ unsafe def main : List String → IO UInt32 := fun args => do
 
   -- TODO: remove this argument
   if args[0]? == some "--server" then
-    GameServer.FileWorker.workerMain {} args
+    MyServer.FileWorker.workerMain {} args
   else
     e.putStrLn s!"Expected `--server`"
     return 1

server/GameServer/Commands.lean

@@ -2,8 +2,6 @@ import GameServer.Helpers
 import GameServer.Inventory
 import GameServer.Options
 import GameServer.SaveData
-import GameServer.Hints
-import I18n
 
 open Lean Meta Elab Command
 
@@ -34,17 +32,16 @@ elab "Level" level:num : command => do
 
 /-- Define the title of the current game/world/level. -/
 elab "Title" t:str : command => do
-  let title ← t.getString.translate
   match ← getCurLayer with
-  | .Level => modifyCurLevel fun level => pure {level with title := title}
+  | .Level => modifyCurLevel fun level => pure {level with title := t.getString}
-  | .World => modifyCurWorld  fun world => pure {world with title := title}
+  | .World => modifyCurWorld  fun world => pure {world with title := t.getString}
   | .Game => modifyCurGame  fun game => pure {game with
       title := t.getString
-      tile := {game.tile with title := title}}
+      tile := {game.tile with title := t.getString}}
 
 /-- Define the introduction of the current game/world/level. -/
 elab "Introduction" t:str : command => do
-  let intro ← t.getString.translate
+  let intro := t.getString
   match ← getCurLayer with
   | .Level => modifyCurLevel fun level => pure {level with introduction := intro}
   | .World => modifyCurWorld  fun world => pure {world with introduction := intro}
@@ -52,7 +49,7 @@ elab "Introduction" t:str : command => do
 
 /-- Define the info of the current game. Used for e.g. credits -/
 elab "Info" t:str : command => do
-  let info ← t.getString.translate
+  let info:= t.getString
   match ← getCurLayer with
   | .Level =>
     logError "Can't use `Info` in a level!"
@@ -84,7 +81,7 @@ elab "Image" t:str : command => do
 /-- Define the conclusion of the current game or current level if some
 building a level. -/
 elab "Conclusion" t:str : command => do
-  let conclusion ← t.getString.translate
+  let conclusion := t.getString
   match ← getCurLayer with
   | .Level => modifyCurLevel fun level => pure {level with conclusion := conclusion}
   | .World => modifyCurWorld  fun world => pure {world with conclusion := conclusion}
@@ -97,13 +94,13 @@ elab "Prerequisites" t:str* : command => do
 
 /-- Short caption for the game (1 sentence) -/
 elab "CaptionShort" t:str : command => do
-  let caption ← t.getString.translate
+  let caption := t.getString
   modifyCurGame fun game => pure {game with
     tile := {game.tile with short := caption}}
 
 /-- More detailed description what the game is about (2-4 sentences). -/
 elab "CaptionLong" t:str : command => do
-  let caption ← t.getString.translate
+  let caption := t.getString
   modifyCurGame fun game => pure {game with
     tile := {game.tile with long := caption}}
 
@@ -144,7 +141,6 @@ TacticDoc rw "`rw` stands for rewrite, etc. "
  -/
 elab doc:docComment ? "TacticDoc" name:ident content:str ? : command => do
   let doc ← parseDocCommentLegacy doc content
-  let doc ← doc.translate
   modifyEnv (inventoryTemplateExt.addEntry · {
     type := .Tactic
     name := name.getId
@@ -169,7 +165,6 @@ The theorem/definition to have the same fully qualified name as in mathlib.
 elab doc:docComment ? "TheoremDoc" name:ident "as" displayName:str "in" category:str content:str ? :
     command => do
   let doc ← parseDocCommentLegacy doc content
-  let doc ← doc.translate
   modifyEnv (inventoryTemplateExt.addEntry · {
     type := .Lemma
     name := name.getId
@@ -199,7 +194,6 @@ The theorem/definition to have the same fully qualified name as in mathlib.
  -/
 elab doc:docComment ? "DefinitionDoc" name:ident "as" displayName:str template:str ? : command => do
   let doc ← parseDocCommentLegacy doc template
-  let doc ← doc.translate
   modifyEnv (inventoryTemplateExt.addEntry · {
     type := .Definition
     name := name.getId,
@@ -346,9 +340,6 @@ elab doc:docComment ? attrs:Parser.Term.attributes ?
   let lvlIdx ← getCurLevelIdx
 
   let docContent ← parseDocComment doc
-  let docContent ← match docContent with
-  | none => pure none
-  | some d => d.translate
 
   -- Save the messages before evaluation of the proof.
   let initMsgs ← modifyGet fun st => (st.messages, { st with messages := {} })
@@ -405,41 +396,12 @@ elab doc:docComment ? attrs:Parser.Term.attributes ?
         .nest hidden $
         .compose (.ofGoal text) (.ofGoal goal) := msg.data then
       let hint ← liftTermElabM $ withMCtx ctx.mctx $ withLCtx ctx.lctx #[] $ withEnv ctx.env do
-
-        let goalDecl ← goal.getDecl
-        let fvars := goalDecl.lctx.decls.toArray.filterMap id |> Array.map (·.fvarId)
-
-        -- NOTE: This code about `hintFVarsNames` is duplicated from `RpcHandlers`
-        -- where the variable bijection is constructed, and they
-        -- need to be matching.
-        -- NOTE: This is a bit a hack of somebody who does not know how meta-programming works.
-        -- All we want here is a list of `userNames` for the `FVarId`s in `hintFVars`...
-        -- and we wrap them in `«{}»` here since I don't know how to do it later.
-        let mut hintFVarsNames : Array Expr := #[]
-        for fvar in fvars do
-          let name₁ ← fvar.getUserName
-          hintFVarsNames := hintFVarsNames.push <| Expr.fvar ⟨s!"«\{{name₁}}»"⟩
-
-        let text ← instantiateMVars (mkMVar text)
-
-        -- Evaluate the text in the `Hint`'s context to get the old variable names.
-        let rawText := (← GameServer.evalHintMessage text) hintFVarsNames
-        let ctx₂ := {env := ← getEnv, mctx := ← getMCtx, lctx := ← getLCtx, opts := {}}
-        let rawText : String ← (MessageData.withContext ctx₂ rawText).toString
-
         return {
           goal := ← abstractCtx goal
-          text := text
+          text := ← instantiateMVars (mkMVar text)
-          rawText := rawText
           strict := strict == 1
           hidden := hidden == 1
         }
-
-      -- Note: The current setup for hints is a bit convoluted, but for now we need to
-      -- send the text once through i18n to register it in the env extension.
-      -- This could probably be rewritten once i18n works fully.
-      let _ ← hint.rawText.translate
-
       hints := hints.push hint
     else
       nonHintMsgs := nonHintMsgs.push msg
@@ -478,8 +440,6 @@ elab doc:docComment ? attrs:Parser.Term.attributes ?
 
 /-! # Hints -/
 
-open GameServer in
-
 /-- A tactic that can be used inside `Statement`s to indicate in which proof states players should
 see hints. The tactic does not affect the goal state.
 -/

server/GameServer/EnvExtensions.lean

@@ -1,13 +1,7 @@
 import GameServer.AbstractCtx
 import GameServer.Graph
-import GameServer.Hints
 
-open GameServer
 
--- TODO: Is there a better place?
-/-- Keywords that the server should not consider as tactics. -/
-def GameServer.ALLOWED_KEYWORDS : List String :=
-  ["with", "fun", "at", "only", "by", "generalizing"]
 
 /-- The default game name if `Game "MyGame"` is not used. -/
 def defaultGameName: String := "MyGame"
@@ -24,6 +18,22 @@ defined in this file.
 
 open Lean
 
+/-! ## Hints -/
+
+/-- A hint to help the user with a specific goal state -/
+structure GoalHintEntry where
+  goal : AbstractCtxResult
+  /-- Text of the hint as an expression of type `Array Expr → MessageData` -/
+  text : Expr
+  /-- If true, then hint should be hidden and only be shown on player's request -/
+  hidden : Bool := false
+  /-- If true, then the goal must contain only the assumptions specified in `goal` and no others -/
+  strict : Bool := false
+
+instance : Repr GoalHintEntry := {
+  reprPrec := fun a n => reprPrec a.text n
+}
+
 /-! ## Inventory (documentation)
 
 The inventory contains documentation that the user can access.

server/GameServer/FileWorker.lean

@@ -3,10 +3,8 @@ import Lean.Server.FileWorker
 import GameServer.Game
 import GameServer.ImportModules
 import GameServer.SaveData
-import GameServer.EnvExtensions
 
 namespace MyModule
-
 open Lean
 open Elab
 open Parser
@@ -50,8 +48,7 @@ partial def parseTactic (inputCtx : InputContext) (pmctx : ParserModuleContext)
 
 end MyModule
 
-namespace GameServer.FileWorker
+namespace MyServer.FileWorker
-
 open Lean
 open Lean.Server
 open Lean.Server.FileWorker
@@ -60,142 +57,103 @@ open IO
 open Snapshots
 open JsonRpc
 
-/--
+structure GameWorkerState :=
-Game-specific state to be packed on top of the `Server.FileWorker.WorkerState`
-used by the Lean server.
--/
-structure WorkerState :=
-  /--
-  Collection of items which are considered unlocked.
-  Tactics and theorems are mixed together.
-  -/
   inventory : Array String
   /--
-  Difficulty determines whether tactics/theorems can be locked.
+  Check for tactics/theorems that are not unlocked.
-  * 0: do not check
+  0: no check
-  * 1: give warnings when locked items are used
+  1: give warnings
-  * 2: give errors when locked items are used
+  2: give errors
   -/
   difficulty : Nat
-  /--
-  `levelInfo` contains all the (static) information about the level which is not influenced
-  by the user's progress.
-  -/
   levelInfo : LevelInfo
-deriving ToJson, FromJson
+  deriving ToJson, FromJson
 
-/--
+abbrev GameWorkerM := StateT GameWorkerState Server.FileWorker.WorkerM
-Pack the our custom `WorkerState` on top of the normal worker monad
-`Server.FileWorker.WorkerM`.
--/
-abbrev WorkerM := StateT WorkerState Server.FileWorker.WorkerM
 
 section Elab
 
-/-- Add a message. use `(severity := .warning)` to specify the severity-/
+def addErrorMessage (info : SourceInfo) (inputCtx : Parser.InputContext) (s : MessageData) :
-def addMessage (info : SourceInfo) (inputCtx : Parser.InputContext)
-    (severity := MessageSeverity.warning) (s : MessageData) :
     Elab.Command.CommandElabM Unit := do
   modify fun st => { st with
-    messages := st.messages.add {
+      messages := st.messages.add {
-      fileName := inputCtx.fileName
+        fileName := inputCtx.fileName
-      severity := severity
+        severity := MessageSeverity.error
-      pos      := inputCtx.fileMap.toPosition (info.getPos?.getD 0)
+        pos      := inputCtx.fileMap.toPosition (info.getPos?.getD 0)
-      data     := s }}
+        data     := s
+      }
+    }
 
 -- TODO: use HashSet for allowed tactics?
-/--
+/-- Find all tactics in syntax object that are forbidden according to a
-Find all tactics in syntax object that are forbidden according to a
+set `allowed` of allowed tactics. -/
-set `allowed` of allowed tactics.
+partial def findForbiddenTactics (inputCtx : Parser.InputContext)
--/
+    (gameWorkerState : GameWorkerState) (stx : Syntax) :
-partial def findForbiddenTactics (inputCtx : Parser.InputContext) (workerState : WorkerState)
+    Elab.Command.CommandElabM Unit := do
-    (stx : Syntax) : Elab.Command.CommandElabM Unit := do
+  let levelInfo := gameWorkerState.levelInfo
-  let levelInfo := workerState.levelInfo
-  -- Parse the syntax object and look for tactics and declarations.
   match stx with
   | .missing => return ()
   | .node _info _kind args =>
-    -- Go inside a node.
     for arg in args do
-      findForbiddenTactics inputCtx workerState arg
+      findForbiddenTactics inputCtx gameWorkerState arg
   | .atom info val =>
-    -- Atoms might be tactic names or other keywords.
+    -- ignore syntax elements that do not start with a letter
-    -- Note: We whitelisted known keywords because we cannot
+    -- and ignore "with" keyword
-    -- distinguish keywords from tactic names.
+    let allowed := ["with", "fun", "at", "only", "by", "to"]
-    let allowed := GameServer.ALLOWED_KEYWORDS
-    -- Ignore syntax elements that do not start with a letter or are listed above.
     if 0 < val.length ∧ val.data[0]!.isAlpha ∧ not (allowed.contains val) then
-      -- Treat `simp?` and `simp!` like `simp`
+      let val := val.dropRightWhile (fun c => c == '!' || c == '?') -- treat `simp?` and `simp!` like `simp`
-      let val := val.dropRightWhile (fun c => c == '!' || c == '?')
       match levelInfo.tactics.find? (·.name.toString == val) with
       | none =>
-        -- Tactic will never be introduced in the game.
+        -- Note: This case means that the tactic will never be introduced in the game.
-        match workerState.inventory.find? (· == val) with
+        match gameWorkerState.inventory.find? (· == val) with
-        | some _ =>
-          -- Tactic is in the inventory, allow it.
-          -- Note: This case shouldn't be possible...
-          pure ()
         | none =>
-          -- Tactic is not in the inventory.
+          addWarningMessage info s!"You have not unlocked the tactic '{val}' yet!"
-          addMessageByDifficulty info s!"The tactic '{val}' is not available in this game!"
+        | some _ => pure () -- tactic is in the inventory, allow it.
       | some tac =>
-        -- Tactic is introduced at some point in the game.
+        if tac.locked then
-        if tac.disabled then
+          match gameWorkerState.inventory.find? (· == val) with
-          -- Tactic is disabled in this level.
-          addMessageByDifficulty info s!"The tactic '{val}' is disabled in this level!"
-        else if tac.locked then
-          match workerState.inventory.find? (· == val) with
           | none =>
-            -- Tactic is marked as locked and not in the inventory.
+            addWarningMessage info s!"You have not unlocked the tactic '{val}' yet!"
-            addMessageByDifficulty info s!"You have not unlocked the tactic '{val}' yet!"
+          | some _ => pure () -- tactic is in the inventory, allow it.
-          | some _ =>
+        else if tac.disabled then
-            -- Tactic is in the inventory, allow it.
+          addWarningMessage info s!"The tactic '{val}' is disabled in this level!"
-            pure ()
   | .ident info _rawVal val _preresolved =>
-    -- Try to resolve the name
+      let ns ←
-    let ns ←
+        try resolveGlobalConst (mkIdent val)
-      try resolveGlobalConst (mkIdent val)
+        catch | _ => pure [] -- catch "unknown constant" error
-      -- Catch "unknown constant" error
+      for n in ns do
-      catch | _ => pure []
+        let some (.thmInfo ..) := (← getEnv).find? n
-    for n in ns do
+          | return () -- not a theorem -> ignore
-      let some (.thmInfo ..) := (← getEnv).find? n
-        -- Not a theorem, no checks needed.
-        | return ()
-      if some n = levelInfo.statementName then
         -- Forbid the theorem we are proving currently
-        addMessage info inputCtx (severity := .error)
+        if some n = levelInfo.statementName then
-          s!"Structural recursion: you can't use '{n}' to proof itself!"
+          addErrorMessage info inputCtx s!"Structural recursion: you can't use '{n}' to proof itself!"
-      let theoremsAndDefs := levelInfo.lemmas ++ levelInfo.definitions
-      match theoremsAndDefs.find? (·.name == n) with
-      | none =>
-        -- Theorem will never be introduced in this game
-        addMessageByDifficulty info s!"The theorem/definition '{n}' is not available in this game!"
-      | some thm =>
-        -- Theorem is introduced at some point in the game.
-        if thm.disabled then
-          -- Theorem is disabled in this level.
-          addMessageByDifficulty info s!"The theorem/definition '{n}' is disabled in this level!"
-        else if thm.locked then
-          match workerState.inventory.find? (· == n.toString) with
-          | none =>
-            -- Theorem is still locked.
-            addMessageByDifficulty info s!"You have not unlocked the theorem/definition '{n}' yet!"
-          | some _ =>
-            -- Theorem is in the inventory, allow it.
-            pure ()
 
-where addMessageByDifficulty (info : SourceInfo) (s : MessageData) :=
+        let lemmasAndDefs := levelInfo.lemmas ++ levelInfo.definitions
-  -- See `GameServer.FileWorker.WorkerState.difficulty`. Send nothing/warnings/errors
+        match lemmasAndDefs.find? (fun l => l.name == n) with
-  -- deppending on difficulty.
+        | none => addWarningMessage info s!"You have not unlocked the lemma/definition '{n}' yet!"
-  let difficulty := workerState.difficulty
+        | some lem =>
+          if lem.locked then
+            addWarningMessage info s!"You have not unlocked the lemma/definition '{n}' yet!"
+          else if lem.disabled then
+            addWarningMessage info s!"The lemma/definition '{n}' is disabled in this level!"
+where addWarningMessage (info : SourceInfo) (s : MessageData) :=
+  let difficulty := gameWorkerState.difficulty
   if difficulty > 0 then
-    addMessage info inputCtx (if difficulty > 1 then .error else .warning) s
+    modify fun st => { st with
+      messages := st.messages.add {
+        fileName := inputCtx.fileName
+        severity := if difficulty > 1 then MessageSeverity.error else MessageSeverity.warning
+        pos      := inputCtx.fileMap.toPosition (info.getPos?.getD 0)
+        data     := s
+      }
+    }
   else pure ()
+-- where addErrorMessage (info : SourceInfo) (s : MessageData) :=
+--   pure ()
 
 open Elab Meta Expr in
-
 def compileProof (inputCtx : Parser.InputContext) (snap : Snapshot) (hasWidgets : Bool)
-    (couldBeEndSnap : Bool) (gameWorkerState : WorkerState)
+    (couldBeEndSnap : Bool) (gameWorkerState : GameWorkerState)
     (initParams : Lsp.InitializeParams) : IO Snapshot := do
   -- Recognize end snap
   if inputCtx.input.atEnd snap.mpState.pos ∧ couldBeEndSnap then
@@ -304,7 +262,7 @@ where
   private def publishIleanInfo (method : String) (m : DocumentMeta) (hOut : FS.Stream)
       (snaps : Array Snapshot) : IO Unit := do
     let trees := snaps.map fun snap => snap.infoTree
-    let references ← findModuleRefs m.text trees (localVars := true) |>.toLspModuleRefs
+    let references := findModuleRefs m.text trees (localVars := true)
     let param := { version := m.version, references : LeanIleanInfoParams }
     hOut.writeLspNotification { method, param }
 
@@ -318,400 +276,301 @@ where
     uri : String
   deriving ToJson, FromJson
 
-structure GameDiagnostics where
+  /-- Checks whether game level has been completed and sends a notification to the client -/
-  diagnostics : List Diagnostic
+  def publishGameCompleted (m : DocumentMeta) (hOut : FS.Stream) (snaps : Array Snapshot) : IO Unit := do
-deriving ToJson, FromJson
+    -- check if there is any error or warning
+    for snap in snaps do
+      if snap.diagnostics.any fun d => d.severity? == some .error ∨ d.severity? == some .warning
+      then return
+    let param := { uri := m.uri : GameCompletedParams}
+    hOut.writeLspNotification { method := "$/game/completed", param }
 
-structure GameParams where
+  /-- Elaborates the next command after `parentSnap` and emits diagnostics into `hOut`. -/
-  uri : String
+  private def nextSnap (ctx : WorkerContext) (m : DocumentMeta) (cancelTk : CancelToken)
-  diagnostics : GameDiagnostics
+      (gameWorkerState : GameWorkerState) (initParams : Lsp.InitializeParams)
-deriving ToJson, FromJson
+      : AsyncElabM (Option Snapshot) := do
+    cancelTk.check
+    let s ← get
+    let .some lastSnap := s.snaps.back? | panic! "empty snapshots"
+    if lastSnap.isAtEnd then
+      publishGameCompleted m ctx.hOut s.snaps
+      publishDiagnostics m lastSnap.diagnostics.toArray ctx.hOut
+      publishProgressDone m ctx.hOut
+      -- This will overwrite existing ilean info for the file, in case something
+      -- went wrong during the incremental updates.
+      publishIleanInfoFinal m ctx.hOut s.snaps
+      return none
+    publishProgressAtPos m lastSnap.endPos ctx.hOut
+    -- Make sure that there is at least one snap after the head snap, so that
+    -- we can see the current goal even on an empty document
+    let couldBeEndSnap := s.snaps.size > 1
+    let snap ← compileProof m.mkInputContext lastSnap ctx.clientHasWidgets couldBeEndSnap
+      gameWorkerState initParams
+    set { s with snaps := s.snaps.push snap }
+    -- TODO(MH): check for interrupt with increased precision
+    cancelTk.check
+    /- NOTE(MH): This relies on the client discarding old diagnostics upon receiving new ones
+      while preferring newer versions over old ones. The former is necessary because we do
+      not explicitly clear older diagnostics, while the latter is necessary because we do
+      not guarantee that diagnostics are emitted in order. Specifically, it may happen that
+      we interrupted this elaboration task right at this point and a newer elaboration task
+      emits diagnostics, after which we emit old diagnostics because we did not yet detect
+      the interrupt. Explicitly clearing diagnostics is difficult for a similar reason,
+      because we cannot guarantee that no further diagnostics are emitted after clearing
+      them. -/
+    -- NOTE(WN): this is *not* redundant even if there are no new diagnostics in this snapshot
+    -- because empty diagnostics clear existing error/information squiggles. Therefore we always
+    -- want to publish in case there was previously a message at this position.
+    publishDiagnostics m snap.diagnostics.toArray ctx.hOut
+    publishIleanInfoUpdate m ctx.hOut #[snap]
+    return some snap
 
-/-- WIP: publish diagnostics, all intermediate goals and if the game is completed. -/
+  /-- Elaborates all commands after the last snap (at least the header snap is assumed to exist), emitting the diagnostics into `hOut`. -/
-def publishProofState (m : DocumentMeta) (snap : Snapshot) (initParams : Lsp.InitializeParams) (hOut : FS.Stream) :
+  def unfoldSnaps (m : DocumentMeta) (snaps : Array Snapshot) (cancelTk : CancelToken)
-    IO Unit := do
+      (startAfterMs : UInt32) (gameWorkerState : GameWorkerState)
-  -- let text := m.text
+      : ReaderT WorkerContext IO (AsyncList ElabTaskError Snapshot) := do
-
+    let ctx ← read
-  -- -- `snap` is the one snapshot containing the entire proof.
+    let some headerSnap := snaps[0]? | panic! "empty snapshots"
-  -- let mut goals : Array <| InteractiveGoalsWithHints := #[]
+    if headerSnap.msgLog.hasErrors then
-  -- for pos in text.positions do
+      -- Treat header processing errors as fatal so users aren't swamped with
-  --   let source := text.getLineBefore pos
+      -- followup errors
-  --   -- iterate over all newlines in the proof and get the goals and hints at each position
+      publishProgressAtPos m headerSnap.beginPos ctx.hOut (kind := LeanFileProgressKind.fatalError)
-  --   if let goalsAtResult@(_ :: _) := snap.infoTree.goalsAt? text pos then
+      publishIleanInfoFinal m ctx.hOut #[headerSnap]
-  --     pure ()
+      return AsyncList.ofList [headerSnap]
-  --     let goalAtPos : List <| List InteractiveGoalWithHints ← goalsAtResult.mapM
+    else
-  --       fun { ctxInfo := ci, tacticInfo := tacticInfo, useAfter := useAfter, .. } => do
+      -- This will overwrite existing ilean info for the file since this has a
-  --         -- TODO: What does this function body do?
+      -- higher version number.
-  --         -- let ciAfter := { ci with mctx := ti.mctxAfter }
+      publishIleanInfoUpdate m ctx.hOut snaps
-  --         let ci := if useAfter then
+      return AsyncList.ofList snaps.toList ++ AsyncList.delayed (← EIO.asTask (ε := ElabTaskError) (prio := .dedicated) do
-  --             { ci with mctx := tacticInfo.mctxAfter }
+        IO.sleep startAfterMs
-  --           else
+        AsyncList.unfoldAsync (nextSnap ctx m cancelTk gameWorkerState ctx.initParams) { snaps })
-  --             { ci with mctx := tacticInfo.mctxBefore }
-  --         -- compute the interactive goals
-  --         let goalMvars : List MVarId ← ci.runMetaM {} do
-  --           return if useAfter then tacticInfo.goalsAfter else tacticInfo.goalsBefore
-
-  --         let interactiveGoals : List InteractiveGoalWithHints ← ci.runMetaM {} do
-  --           goalMvars.mapM fun goal => do
-  --             let hints ← findHints goal m initParams
-  --             let interactiveGoal ← goalToInteractive goal
-  --             return ⟨interactiveGoal, hints⟩
-  --         -- TODO: This code is way old, can it be deleted?
-  --         -- compute the goal diff
-  --         -- let goals ← ciAfter.runMetaM {} (do
-  --         --     try
-  --         --       Widget.diffInteractiveGoals useAfter ti goals
-  --         --     catch _ =>
-  --         --       -- fail silently, since this is just a bonus feature
-  --         --       return goals
-  --         -- )
-  --         return interactiveGoals
-  --     let goalAtPos : Array InteractiveGoalWithHints := ⟨goalAtPos.foldl (· ++ ·) []⟩
-  --     goals := goals.push ⟨goalAtPos, source⟩
-  --   else
-  --     -- No goals present
-  --     goals := goals.push default
-
-  -- -- Question: Is there a difference between the diags of this snap and the last snap?
-  -- -- Should we get the diags from there?
-  -- let diag : Array Widget.InteractiveDiagnostic := snap.interactiveDiags.toArray
-
-  -- -- Level is completed if there are no errrors or warnings
-  -- let completed : Bool := ¬ diag.any (fun d =>
-  --   d.severity? == some .error ∨ d.severity? == some .warning)
-
-  -- let param : ProofState := {
-  --   steps := goals,
-  --   diagnostics := diag,
-  --   completed := completed }
-
-  -- TODO
-  let param := { uri := m.uri : GameCompletedParams}
-
-
-  hOut.writeLspNotification { method := "$/game/publishProofState", param }
-
-/-- Checks whether game level has been completed and sends a notification to the client -/
-def publishGameCompleted (m : DocumentMeta) (hOut : FS.Stream) (snaps : Array Snapshot) : IO Unit := do
-  -- check if there is any error or warning
-  for snap in snaps do
-    if snap.diagnostics.any fun d => d.severity? == some .error ∨ d.severity? == some .warning
-    then return
-  let param := { uri := m.uri : GameCompletedParams}
-  hOut.writeLspNotification { method := "$/game/completed", param }
-
-/-- copied from `Lean.Server.FileWorker.nextCmdSnap`. -/
--- @[inherit_doc Lean.Server.FileWorker.nextCmdSnap] -- cannot inherit from private
-private def nextCmdSnap (ctx : WorkerContext) (m : DocumentMeta) (cancelTk : CancelToken)
-    (gameWorkerState : WorkerState) (initParams : Lsp.InitializeParams) :
-    AsyncElabM (Option Snapshot) := do
-  cancelTk.check
-  let s ← get
-  let .some lastSnap := s.snaps.back? | panic! "empty snapshots"
-  if lastSnap.isAtEnd then
-    publishDiagnostics m lastSnap.diagnostics.toArray ctx.hOut
-    publishProgressDone m ctx.hOut
-    publishIleanInfoFinal m ctx.hOut s.snaps
-    return none
-  publishProgressAtPos m lastSnap.endPos ctx.hOut
-
-  -- (modified part)
-  -- Make sure that there is at least one snap after the head snap, so that
-  -- we can see the current goal even on an empty document
-  let couldBeEndSnap := s.snaps.size > 1
-  let snap ← compileProof m.mkInputContext lastSnap ctx.clientHasWidgets couldBeEndSnap
-    gameWorkerState initParams
-
-  set { s with snaps := s.snaps.push snap }
-  cancelTk.check
-  publishProofState m snap initParams ctx.hOut
-  publishDiagnostics m snap.diagnostics.toArray ctx.hOut
-  publishIleanInfoUpdate m ctx.hOut #[snap]
-  return some snap
-
--- Copied from `Lean.Server.FileWorker.unfoldCmdSnaps` using our own `nextCmdSnap`.
-@[inherit_doc Lean.Server.FileWorker.unfoldCmdSnaps]
-def unfoldCmdSnaps (m : DocumentMeta) (snaps : Array Snapshot) (cancelTk : CancelToken)
-    (startAfterMs : UInt32) (gameWorkerState : WorkerState)
-    : ReaderT WorkerContext IO (AsyncList ElabTaskError Snapshot) := do
-  let ctx ← read
-  let some headerSnap := snaps[0]? | panic! "empty snapshots"
-  if headerSnap.msgLog.hasErrors then
-    publishProgressAtPos m headerSnap.beginPos ctx.hOut (kind := LeanFileProgressKind.fatalError)
-    publishIleanInfoFinal m ctx.hOut #[headerSnap]
-    return AsyncList.ofList [headerSnap]
-  else
-    publishIleanInfoUpdate m ctx.hOut snaps
-    return AsyncList.ofList snaps.toList ++ AsyncList.delayed (← EIO.asTask (ε := ElabTaskError) (prio := .dedicated) do
-      IO.sleep startAfterMs
-      AsyncList.unfoldAsync (nextCmdSnap ctx m cancelTk gameWorkerState ctx.initParams) { snaps })
 
 end Elab
 
 section Updates
 
 /-- Given the new document, updates editable doc state. -/
-def updateDocument (newMeta : DocumentMeta) : WorkerM Unit := do
+  def updateDocument (newMeta : DocumentMeta) : GameWorkerM Unit := do
-  let s ← get
+    let s ← get
-  let ctx ← read
+    let ctx ← read
-  let oldDoc := (← StateT.lift get).doc
+    let oldDoc := (← StateT.lift get).doc
-  oldDoc.cancelTk.set
+    oldDoc.cancelTk.set
-  let initHeaderStx := (← StateT.lift get).initHeaderStx
+    let initHeaderStx := (← StateT.lift get).initHeaderStx
-  let (newHeaderStx, newMpState, _) ← Parser.parseHeader newMeta.mkInputContext
+    let (newHeaderStx, newMpState, _) ← Parser.parseHeader newMeta.mkInputContext
-  let cancelTk ← CancelToken.new
+    let cancelTk ← CancelToken.new
-  let headSnapTask := oldDoc.cmdSnaps.waitHead?
+    let headSnapTask := oldDoc.cmdSnaps.waitHead?
-  let newSnaps ← if initHeaderStx != newHeaderStx then
+    let newSnaps ← if initHeaderStx != newHeaderStx then
-    EIO.asTask (ε := ElabTaskError) (prio := .dedicated) do
+      EIO.asTask (ε := ElabTaskError) (prio := .dedicated) do
-      IO.sleep ctx.initParams.editDelay.toUInt32
+        IO.sleep ctx.initParams.editDelay.toUInt32
-      cancelTk.check
+        cancelTk.check
-      IO.Process.exit 2
+        IO.Process.exit 2
-  else EIO.mapTask (ε := ElabTaskError) (t := headSnapTask) (prio := .dedicated) fun headSnap?? => do
+    else EIO.mapTask (ε := ElabTaskError) (t := headSnapTask) (prio := .dedicated) fun headSnap?? => do
-    -- There is always at least one snapshot absent exceptions
+      -- There is always at least one snapshot absent exceptions
-    let some headSnap ← MonadExcept.ofExcept headSnap?? | panic! "empty snapshots"
+      let some headSnap ← MonadExcept.ofExcept headSnap?? | panic! "empty snapshots"
-    let newHeaderSnap := { headSnap with stx := newHeaderStx, mpState := newMpState }
+      let newHeaderSnap := { headSnap with stx := newHeaderStx, mpState := newMpState }
-    let changePos := oldDoc.meta.text.source.firstDiffPos newMeta.text.source
+      let changePos := oldDoc.meta.text.source.firstDiffPos newMeta.text.source
-    -- Ignore exceptions, we are only interested in the successful snapshots
+      -- Ignore exceptions, we are only interested in the successful snapshots
-    let (cmdSnaps, _) ← oldDoc.cmdSnaps.getFinishedPrefix
+      let (cmdSnaps, _) ← oldDoc.cmdSnaps.getFinishedPrefix
-    -- NOTE(WN): we invalidate eagerly as `endPos` consumes input greedily. To re-elaborate only
+      -- NOTE(WN): we invalidate eagerly as `endPos` consumes input greedily. To re-elaborate only
-    -- when really necessary, we could do a whitespace-aware `Syntax` comparison instead.
+      -- when really necessary, we could do a whitespace-aware `Syntax` comparison instead.
-    let mut validSnaps ← pure (cmdSnaps.takeWhile (fun s => s.endPos < changePos))
+      let mut validSnaps ← pure (cmdSnaps.takeWhile (fun s => s.endPos < changePos))
-    if h : validSnaps.length ≤ 1 then
+      if h : validSnaps.length ≤ 1 then
-      validSnaps := [newHeaderSnap]
+        validSnaps := [newHeaderSnap]
-    else
+      else
-      /- When at least one valid non-header snap exists, it may happen that a change does not fall
+        /- When at least one valid non-header snap exists, it may happen that a change does not fall
-          within the syntactic range of that last snap but still modifies it by appending tokens.
+           within the syntactic range of that last snap but still modifies it by appending tokens.
-          We check for this here. We do not currently handle crazy grammars in which an appended
+           We check for this here. We do not currently handle crazy grammars in which an appended
-          token can merge two or more previous commands into one. To do so would require reparsing
+           token can merge two or more previous commands into one. To do so would require reparsing
-          the entire file. -/
+           the entire file. -/
-      have : validSnaps.length ≥ 2 := Nat.gt_of_not_le h
+        have : validSnaps.length ≥ 2 := Nat.gt_of_not_le h
-      let mut lastSnap := validSnaps.getLast (by subst ·; simp at h)
+        let mut lastSnap := validSnaps.getLast (by subst ·; simp at h)
-      let preLastSnap :=
+        let preLastSnap :=
-        have : 0 < validSnaps.length := Nat.lt_of_lt_of_le (by decide) this
+          have : 0 < validSnaps.length := Nat.lt_of_lt_of_le (by decide) this
-        have : validSnaps.length - 2 < validSnaps.length := Nat.sub_lt this (by decide)
+          have : validSnaps.length - 2 < validSnaps.length := Nat.sub_lt this (by decide)
-        validSnaps[validSnaps.length - 2]
+          validSnaps[validSnaps.length - 2]
-      let newLastStx ← parseNextCmd newMeta.mkInputContext preLastSnap
+        let newLastStx ← parseNextCmd newMeta.mkInputContext preLastSnap
-      if newLastStx != lastSnap.stx then
+        if newLastStx != lastSnap.stx then
-        validSnaps := validSnaps.dropLast
+          validSnaps := validSnaps.dropLast
-    -- wait for a bit, giving the initial `cancelTk.check` in `nextCmdSnap` time to trigger
+      -- wait for a bit, giving the initial `cancelTk.check` in `nextCmdSnap` time to trigger
-    -- before kicking off any expensive elaboration (TODO: make expensive elaboration cancelable)
+      -- before kicking off any expensive elaboration (TODO: make expensive elaboration cancelable)
-    unfoldCmdSnaps newMeta validSnaps.toArray cancelTk s ctx
+      unfoldSnaps newMeta validSnaps.toArray cancelTk s ctx
-      (startAfterMs := ctx.initParams.editDelay.toUInt32)
+        (startAfterMs := ctx.initParams.editDelay.toUInt32)
-  StateT.lift <| modify fun st => { st with
+    StateT.lift <| modify fun st => { st with
-    doc := { meta := newMeta, cmdSnaps := AsyncList.delayed newSnaps, cancelTk }}
+      doc := { meta := newMeta, cmdSnaps := AsyncList.delayed newSnaps, cancelTk }}
 
 end Updates
 
 section Initialization
 
-def DocumentMeta.mkInputContext (doc : DocumentMeta) : Parser.InputContext where
+  def DocumentMeta.mkInputContext (doc : DocumentMeta) : Parser.InputContext where
-  input    := "" -- No header!
+    input    := "" -- No header!
-  fileName := (System.Uri.fileUriToPath? doc.uri).getD doc.uri |>.toString
+    fileName := (System.Uri.fileUriToPath? doc.uri).getD doc.uri |>.toString
-  fileMap  := default
+    fileMap  := default
 
-/-- `gameDir` and `module` were added.
+  def compileHeader (m : DocumentMeta) (hOut : FS.Stream) (opts : Options) (hasWidgets : Bool)
+      (gameDir : String) (module : Name):
+      IO (Syntax × Task (Except Error (Snapshot × SearchPath))) := do
+    -- Determine search paths of the game project by running `lake env printenv LEAN_PATH`.
+    let out ← IO.Process.output
+      { cwd := gameDir, cmd := "lake", args := #["env","printenv","LEAN_PATH"] }
+    if out.exitCode != 0 then
+      throwServerError s!"Error while running Lake: {out.stderr}"
 
-TODO: In general this resembles little similarity with the
+    -- Make the paths relative to the current directory
-original code, and I don't know why...
+    let paths : List System.FilePath := System.SearchPath.parse out.stdout.trim
--/
+    let currentDir ← IO.currentDir
--- @[inherit_doc Lean.Server.FileWorker.compileHeader]
+    let paths := paths.map fun p => currentDir / (gameDir : System.FilePath) / p
-def compileHeader (m : DocumentMeta) (hOut : FS.Stream) (opts : Options) (hasWidgets : Bool)
-    (gameDir : String) (module : Name):
-    IO (Syntax × Task (Except Error (Snapshot × SearchPath))) := do
-  -- Determine search paths of the game project by running `lake env printenv LEAN_PATH`.
-  let out ← IO.Process.output
-    { cwd := gameDir, cmd := "lake", args := #["env","printenv","LEAN_PATH"] }
-  if out.exitCode != 0 then
-    throwServerError s!"Error while running Lake: {out.stderr}"
 
-  -- Make the paths relative to the current directory
+    -- Set the search path
-  let paths : List System.FilePath := System.SearchPath.parse out.stdout.trim
+    Lean.searchPathRef.set paths
-  let currentDir ← IO.currentDir
-  let paths := paths.map fun p => currentDir / (gameDir : System.FilePath) / p
 
-  -- Set the search path
+    let env ← importModules' #[{ module := `Init : Import }, { module := module : Import }]
-  Lean.searchPathRef.set paths
 
-  let env ← importModules' #[{ module := `Init : Import }, { module := module : Import }]
+    -- use empty header
+    let (headerStx, headerParserState, msgLog) ← Parser.parseHeader
+      {m.mkInputContext with
+        input := ""
+        fileMap := FileMap.ofString ""}
+    (headerStx, ·) <$> EIO.asTask do
+      let mut srcSearchPath : SearchPath := paths --← initSrcSearchPath (← getBuildDir)
+      let headerEnv := env
+      let mut headerEnv := headerEnv
+      try
+        if let some path := System.Uri.fileUriToPath? m.uri then
+          headerEnv := headerEnv.setMainModule (← moduleNameOfFileName path none)
+      catch _ => pure ()
+      let cmdState := Elab.Command.mkState headerEnv {} opts
+      let cmdState := { cmdState with infoState := {
+        enabled := true
+        trees := #[Elab.InfoTree.context ({
+          env     := headerEnv
+          fileMap := m.text
+          ngen    := { namePrefix := `_worker }
+        }) (Elab.InfoTree.node
+            (Elab.Info.ofCommandInfo { elaborator := `header, stx := headerStx })
+            (headerStx[1].getArgs.toList.map (fun importStx =>
+              Elab.InfoTree.node (Elab.Info.ofCommandInfo {
+                elaborator := `import
+                stx := importStx
+              }) #[].toPArray'
+            )).toPArray'
+        )].toPArray'
+      }}
+      let headerSnap := {
+        beginPos := 0
+        stx := headerStx
+        mpState := {}
+        cmdState := cmdState
+        interactiveDiags := ← cmdState.messages.msgs.mapM (Widget.msgToInteractiveDiagnostic m.text · hasWidgets)
+        tacticCache := (← IO.mkRef {})
+      }
+      publishDiagnostics m headerSnap.diagnostics.toArray hOut
+      return (headerSnap, srcSearchPath)
 
-  -- use empty header
+  def initializeWorker (meta : DocumentMeta) (i o e : FS.Stream) (initParams : InitializeParams) (opts : Options)
-  let (headerStx, headerParserState, msgLog) ← Parser.parseHeader
+      (gameDir : String) (gameWorkerState : GameWorkerState) : IO (WorkerContext × WorkerState) := do
-    {m.mkInputContext with
+    let clientHasWidgets := initParams.initializationOptions?.bind (·.hasWidgets?) |>.getD false
-      input := ""
-      fileMap := FileMap.ofString ""}
-  (headerStx, ·) <$> EIO.asTask do
-    let mut srcSearchPath : SearchPath := paths --← initSrcSearchPath (← getBuildDir)
-    let headerEnv := env
-    let mut headerEnv := headerEnv
-    try
-      if let some path := System.Uri.fileUriToPath? m.uri then
-        headerEnv := headerEnv.setMainModule (← moduleNameOfFileName path none)
-    catch _ => pure ()
-    let cmdState := Elab.Command.mkState headerEnv {} opts
-    let cmdState := { cmdState with infoState := {
-      enabled := true
-      trees := #[Elab.InfoTree.context (.commandCtx {
-        env     := headerEnv
-        fileMap := m.text
-        ngen    := { namePrefix := `_worker }
-      }) (Elab.InfoTree.node
-          (Elab.Info.ofCommandInfo { elaborator := `header, stx := headerStx })
-          (headerStx[1].getArgs.toList.map (fun importStx =>
-            Elab.InfoTree.node (Elab.Info.ofCommandInfo {
-              elaborator := `import
-              stx := importStx
-            }) #[].toPArray'
-          )).toPArray'
-      )].toPArray'
-    }}
-    let headerSnap := {
-      beginPos := 0
-      stx := headerStx
-      mpState := {} -- was `headerParserState`
-      cmdState := cmdState
-      interactiveDiags := ← cmdState.messages.msgs.mapM (Widget.msgToInteractiveDiagnostic m.text · hasWidgets)
-      tacticCache := (← IO.mkRef {})
-    }
-    publishDiagnostics m headerSnap.diagnostics.toArray hOut
-    return (headerSnap, srcSearchPath)
 
-/-- Copied from `Lean.Server.FileWorker.initializeWorker`. Added `gameDir` and
+    let (headerStx, headerTask) ← compileHeader meta o opts (hasWidgets := clientHasWidgets)
-`gameWorkerState` arguments and use custom `unfoldCmdSnaps`. -/
+      gameDir gameWorkerState.levelInfo.module
--- @[inherit_doc Lean.Server.FileWorker.initializeWorker]
+    let cancelTk ← CancelToken.new
-def initializeWorker (meta : DocumentMeta) (i o e : FS.Stream) (initParams : InitializeParams) (opts : Options)
+    let ctx :=
-    (gameDir : String) (gameWorkerState : WorkerState) : IO (WorkerContext × Server.FileWorker.WorkerState) := do
+      { hIn  := i
-  let clientHasWidgets := initParams.initializationOptions?.bind (·.hasWidgets?) |>.getD false
+        hOut := o
-  let (headerStx, headerTask) ← compileHeader meta o opts (hasWidgets := clientHasWidgets)
+        hLog := e
-    (gameDir := gameDir) (module := gameWorkerState.levelInfo.module)
+        headerTask
-  let cancelTk ← CancelToken.new
+        initParams
-  let ctx := {
+        clientHasWidgets
-    hIn  := i
+      }
-    hOut := o
+    let cmdSnaps ← EIO.mapTask (t := headerTask) (match · with
-    hLog := e
+      | Except.ok (s, _) => unfoldSnaps meta #[s] cancelTk gameWorkerState ctx (startAfterMs := 0)
-    headerTask
+      | Except.error e   => throw (e : ElabTaskError))
-    initParams
+    let doc : EditableDocument := { meta, cmdSnaps := AsyncList.delayed cmdSnaps, cancelTk }
-    clientHasWidgets
+    return (ctx,
-  }
+    { doc             := doc
-  let cmdSnaps ← EIO.mapTask (t := headerTask) (match · with
+      initHeaderStx   := headerStx
-    | Except.ok (s, _) => unfoldCmdSnaps meta #[s] cancelTk gameWorkerState ctx (startAfterMs := 0)
+      pendingRequests := RBMap.empty
-    | Except.error e   => throw (e : ElabTaskError))
+      rpcSessions     := RBMap.empty
-  let doc : EditableDocument := { meta, cmdSnaps := AsyncList.delayed cmdSnaps, cancelTk }
+    })
-  return (ctx, {
-    doc                := doc
-    initHeaderStx      := headerStx
-    currHeaderStx      := headerStx
-    importCachingTask? := none
-    pendingRequests    := RBMap.empty
-    rpcSessions        := RBMap.empty
-  })
 
 end Initialization
 
 section NotificationHandling
 
-/-- Copied from `Lean.Server.FileWorker.handleDidChange` but with our custom `WorkerM` and
+  def handleDidChange (p : DidChangeTextDocumentParams) : GameWorkerM Unit := do
-`updateDocument` -/
+    let docId := p.textDocument
--- @[inherit_doc Lean.Server.FileWorker.handleDidChange]
+    let changes := p.contentChanges
-def handleDidChange (p : DidChangeTextDocumentParams) : WorkerM Unit := do
+    let oldDoc := (← StateT.lift get).doc
-  let docId := p.textDocument
+    let some newVersion ← pure docId.version?
-  let changes := p.contentChanges
+      | throwServerError "Expected version number"
-  let oldDoc := (← StateT.lift get).doc -- needed a lift to our custom `WorkerM`
+    if newVersion ≤ oldDoc.meta.version then
-  let newVersion := docId.version?.getD 0
+      -- TODO(WN): This happens on restart sometimes.
-  if ¬ changes.isEmpty then
+      IO.eprintln s!"Got outdated version number: {newVersion} ≤ {oldDoc.meta.version}"
-    let newDocText := foldDocumentChanges changes oldDoc.meta.text
+    else if ¬ changes.isEmpty then
-    -- modification: set the `DependencyBuildMode` from
+      let newDocText := foldDocumentChanges changes oldDoc.meta.text
-    -- `oldDoc.meta.dependencyBuildMode` to `.always`
+      updateDocument ⟨docId.uri, newVersion, newDocText, .always⟩
-    updateDocument ⟨docId.uri, newVersion, newDocText, .always⟩
 
 end NotificationHandling
 
 section MessageHandling
 
-
+  def handleNotification (method : String) (params : Json) : GameWorkerM Unit := do
-/--
+    let handle := fun paramType [FromJson paramType] (handler : paramType → GameWorkerM Unit) =>
-Modified notification handler.
+      (StateT.lift <| parseParams paramType params) >>= handler
-
+    match method with
-Compare to `Lean.Server.FileWorker.handleNotification`.
+    | "textDocument/didChange" => handle DidChangeTextDocumentParams (handleDidChange)
-We use the modified `WorkerM` and use our custom `handleDidChange`.
+    | "$/cancelRequest"        => handle CancelParams (handleCancelRequest ·)
-
+    | "$/setTrace"        => pure ()
--/
+    | "$/lean/rpc/release"     => handle RpcReleaseParams (handleRpcRelease ·)
-def handleNotification (method : String) (params : Json) : WorkerM Unit := do
+    | "$/lean/rpc/keepAlive"   => handle RpcKeepAliveParams (handleRpcKeepAlive ·)
-  let handle := fun paramType [FromJson paramType] (handler : paramType → WorkerM Unit) =>
+    | _                        => throwServerError s!"Got unsupported notification method: {method}"
-    (StateT.lift <| parseParams paramType params) >>= handler
-  match method with
-  -- Modified `textDocument/didChange`, using a custom `handleDidChange`
-  | "textDocument/didChange" => handle DidChangeTextDocumentParams (handleDidChange)
-  -- unmodified
-  | "$/cancelRequest"        => handle CancelParams (handleCancelRequest ·)
-  -- unmodified
-  | "$/lean/rpc/release"     => handle RpcReleaseParams (handleRpcRelease ·)
-  -- unmodified
-  | "$/lean/rpc/keepAlive"   => handle RpcKeepAliveParams (handleRpcKeepAlive ·)
-  -- New. TODO: What is this for?
-  | "$/setTrace"        => pure ()
-  | _                        => throwServerError s!"Got unsupported notification method: {method}"
 
 end MessageHandling
 
 section MainLoop
+  partial def mainLoop : GameWorkerM Unit := do
+    let ctx ← read
+    let mut st ← StateT.lift get
+    let msg ← ctx.hIn.readLspMessage
+    let filterFinishedTasks (acc : PendingRequestMap) (id : RequestID) (task : Task (Except IO.Error Unit))
+        : IO PendingRequestMap := do
+      if (← hasFinished task) then
+        /- Handler tasks are constructed so that the only possible errors here
+        are failures of writing a response into the stream. -/
+        if let Except.error e := task.get then
+          throwServerError s!"Failed responding to request {id}: {e}"
+        pure <| acc.erase id
+      else pure acc
+    let pendingRequests ← st.pendingRequests.foldM (fun acc id task => filterFinishedTasks acc id task) st.pendingRequests
+    st := { st with pendingRequests }
 
-/--
+    -- Opportunistically (i.e. when we wake up on messages) check if any RPC session has expired.
-The main-loop. Copied from `Lean.Server.FileWorker.mainLoop`. Use custom `WorkerM` as well
+    for (id, seshRef) in st.rpcSessions do
-as custom `handleNotification`.
+      let sesh ← seshRef.get
--/
+      if (← sesh.hasExpired) then
---@[inherit_doc Lean.Server.FileWorker.mainLoop]
+        st := { st with rpcSessions := st.rpcSessions.erase id }
-partial def mainLoop : WorkerM Unit := do
-  let ctx ← read
-  let mut st ← StateT.lift get
-  let msg ← ctx.hIn.readLspMessage
-  -- Erase finished tasks if there are no errors.
-  let filterFinishedTasks (acc : PendingRequestMap) (id : RequestID) (task : Task (Except IO.Error Unit))
-      : IO PendingRequestMap := do
-    if (← hasFinished task) then
-      if let Except.error e := task.get then
-        throwServerError s!"Failed responding to request {id}: {e}"
-      pure <| acc.erase id
-    else pure acc
-  let pendingRequests ← st.pendingRequests.foldM (fun acc id task => filterFinishedTasks acc id task) st.pendingRequests
-  st := { st with pendingRequests }
-  for (id, seshRef) in st.rpcSessions do
-    let sesh ← seshRef.get
-    if (← sesh.hasExpired) then
-      st := { st with rpcSessions := st.rpcSessions.erase id }
-
-  set st
-  -- Process the RPC-message and restart main-loop.
-  match msg with
-  | Message.request id "shutdown" none =>
-    --added. TODO: why do we need that? Or has it just removed in Lean since when we started?
-    ctx.hOut.writeLspResponse ⟨id, Json.null⟩
-    mainLoop
-  | Message.request id method (some params) =>
-    -- Requests are handled by the unmodified lean server.
-    handleRequest id method (toJson params)
-    mainLoop
-  | Message.notification "exit" none =>
-    let doc := st.doc
-    doc.cancelTk.set
-    doc.cmdSnaps.cancel
-    return ()
-  | Message.notification method (some params) =>
-    -- Custom notification handler
-    handleNotification method (toJson params)
-    mainLoop
-  | _ =>
-    throwServerError s!"Got invalid JSON-RPC message: {toJson msg}"
 
+    set st
+    match msg with
+    | Message.request id method (some params) =>
+      handleRequest id method (toJson params)
+      mainLoop
+    | Message.notification "exit" none =>
+      let doc := st.doc
+      doc.cancelTk.set
+      return ()
+    | Message.request id "shutdown" none =>
+      ctx.hOut.writeLspResponse ⟨id, Json.null⟩
+      mainLoop
+    | Message.notification method (some params) =>
+      handleNotification method (toJson params)
+      mainLoop
+    | _ => throwServerError s!"Got invalid JSON-RPC message: {toJson msg}"
 end MainLoop
 
-/-- Modified from `Lean.Server.FileWorker.initAndRunWorker`.
-Added `gameDir` argument, -/
--- @[inherit_doc Lean.Server.FileWorker.initAndRunWorker]
 def initAndRunWorker (i o e : FS.Stream) (opts : Options) (gameDir : String) : IO UInt32 := do
   let i ← maybeTee "fwIn.txt" false i
   let o ← maybeTee "fwOut.txt" true o
-
-
-  -- BIG MODIFICATION
   let initRequest ← i.readLspRequestAs "initialize" Game.InitializeParams
   o.writeLspResponse {
     id     := initRequest.id
@@ -727,16 +586,16 @@ def initAndRunWorker (i o e : FS.Stream) (opts : Options) (gameDir : String) : I
   discard $ i.readLspNotificationAs "initialized" InitializedParams
   let ⟨_, param⟩ ← i.readLspNotificationAs "textDocument/didOpen" DidOpenTextDocumentParams
 
-
   let doc := param.textDocument
-  -- modification: using `.always`
+  /- NOTE(WN): `toFileMap` marks line beginnings as immediately following
+    "\n", which should be enough to handle both LF and CRLF correctly.
+    This is because LSP always refers to characters by (line, column),
+    so if we get the line number correct it shouldn't matter that there
+    is a CR there. -/
   let meta : DocumentMeta := ⟨doc.uri, doc.version, doc.text.toFileMap, .always⟩
   let e := e.withPrefix s!"[{param.textDocument.uri}] "
   let _ ← IO.setStderr e
   try
-
-
-    -- BIG MODIFICATION
     let game ← loadGameData gameDir
     -- TODO: We misuse the `rootUri` field to the gameName
     let rootUri? : Option String := some (toString game.name)
@@ -747,17 +606,14 @@ def initAndRunWorker (i o e : FS.Stream) (opts : Options) (gameDir : String) : I
     let levelInfo ← loadLevelData gameDir levelId.world levelId.level
     let some initializationOptions := initRequest.param.initializationOptions?
       | throwServerError "no initialization options found"
-    let gameWorkerState : WorkerState := {
+    let gameWorkerState : GameWorkerState:= {
       inventory := initializationOptions.inventory
       difficulty := initializationOptions.difficulty
       levelInfo
     }
     let (ctx, st) ← initializeWorker meta i o e initParams opts gameDir gameWorkerState
-    -- Run the main loop
     let _ ← StateRefT'.run (s := st) <| ReaderT.run (r := ctx) <|
       StateT.run (s := gameWorkerState) <| (mainLoop)
-
-
     return (0 : UInt32)
   catch e =>
     IO.eprintln e
@@ -767,15 +623,6 @@ def initAndRunWorker (i o e : FS.Stream) (opts : Options) (gameDir : String) : I
       message := e.toString }] o
     return (1 : UInt32)
 
-/--
-The main function. Simply wrapping `initAndRunWorker`.
-
-Copied from `Lean.Server.FileWorker.workerMain`. We add `args` as an argument to pass on
-the `gameDir`.
-
-TODO: The first arg `args[0]` is always expected to be `--server`. We could drop this completely.
--/
--- @[inherit_doc Lean.Server.FileWorker.workerMain]
 def workerMain (opts : Options) (args : List String): IO UInt32 := do
   let i ← IO.getStdin
   let o ← IO.getStdout
@@ -783,6 +630,8 @@ def workerMain (opts : Options) (args : List String): IO UInt32 := do
   try
     let some gameDir := args[1]? | throwServerError "Expected second argument: gameDir"
     let exitCode ← initAndRunWorker i o e opts gameDir
+    -- HACK: all `Task`s are currently "foreground", i.e. we join on them on main thread exit, but we definitely don't
+    -- want to do that in the case of the worker processes, which can produce non-terminating tasks evaluating user code
     o.flush
     e.flush
     IO.Process.exit exitCode.toUInt8
@@ -790,4 +639,4 @@ def workerMain (opts : Options) (args : List String): IO UInt32 := do
     e.putStrLn s!"worker initialization error: {err}"
     return (1 : UInt32)
 
-end GameServer.FileWorker
+end MyServer.FileWorker

server/GameServer/Helpers.lean

@@ -4,6 +4,8 @@ import Lean
 
 open Lean Meta Elab Command
 
+syntax hintArg := atomic(" (" (&"strict" <|> &"hidden") " := " withoutPosition(term) ")")
+
 /-! ## Doc Comment Parsing -/
 
 /-- Read a doc comment and get its content. Return `""` if no doc comment available. -/
@@ -83,6 +85,23 @@ def getStatementString (name : Name) : CommandElabM String := do
 syntax statementAttr := "(" &"attr" ":=" Parser.Term.attrInstance,* ")"
 -- TODO
 
+
+/-- Remove any spaces at the beginning of a new line -/
+partial def removeIndentation (s : String) : String :=
+  let rec loop (i : String.Pos) (acc : String) (removeSpaces := false) : String :=
+    let c := s.get i
+    let i := s.next i
+    if s.atEnd i then
+      acc.push c
+    else if removeSpaces && c == ' ' then
+      loop i acc (removeSpaces := true)
+    else if c == '\n' then
+      loop i (acc.push c) (removeSpaces := true)
+    else
+      loop i (acc.push c)
+  loop ⟨0⟩ ""
+
+
 /-! ## Loops in Graph-like construct
 
 TODO: Why are we not using graphs here but our own construct `HashMap Name (HashSet Name)`?

server/GameServer/Hints.lean

@@ -1,54 +0,0 @@
-import GameServer.AbstractCtx
-
-/-!
-This file contains anything related to the `Hint` tactic used to add hints to a game level.
--/
-
-open Lean Meta Elab
-
-namespace GameServer
-
-syntax hintArg := atomic(" (" (&"strict" <|> &"hidden") " := " withoutPosition(term) ")")
-
-/-- A hint to help the user with a specific goal state -/
-structure GoalHintEntry where
-  goal : AbstractCtxResult
-  /-- Text of the hint as an expression of type `Array Expr → MessageData` -/
-  text : Expr
-  rawText : String
-  /-- If true, then hint should be hidden and only be shown on player's request -/
-  hidden : Bool := false
-  /-- If true, then the goal must contain only the assumptions specified in `goal` and no others -/
-  strict : Bool := false
-
-instance : Repr GoalHintEntry := {
-  reprPrec := fun a n => reprPrec a.text n
-}
-
-/-- For a hint `(hint : GoalHintEntry)` one uses `(← evalHintMessage hint.text) x`
- where `(x : Array Expr)` contains the names of all the variables that should be inserted
- in the text.
-
- TODO: explain better. -/
-unsafe def evalHintMessageUnsafe : Expr → MetaM (Array Expr → MessageData) :=
-  evalExpr (Array Expr → MessageData)
-    (.forallE default (mkApp (mkConst ``Array [levelZero]) (mkConst ``Expr))
-      (mkConst ``MessageData) .default)
-
-@[implemented_by evalHintMessageUnsafe]
-def evalHintMessage : Expr → MetaM (Array Expr → MessageData) := fun _ => pure (fun _ => "")
-
-/-- Remove any spaces at the beginning of a new line -/
-partial def removeIndentation (s : String) : String :=
-  let rec loop (i : String.Pos) (acc : String) (removeSpaces := false) : String :=
-    let c := s.get i
-    let i := s.next i
-    if s.atEnd i then
-      acc.push c
-    else if removeSpaces && c == ' ' then
-      loop i acc (removeSpaces := true)
-    else if c == '\n' then
-      loop i (acc.push c) (removeSpaces := true)
-    else
-      loop i (acc.push c)
-  loop ⟨0⟩ ""

server/GameServer/InteractiveGoal.lean

@@ -1,19 +1,74 @@
-import GameServer.Structures
+/- This file is mostly copied from `Lean/Widget/InteractiveGoal.lean`. -/
 
-/-!
+import Lean.Widget.InteractiveGoal
-This file is a modified copy of `Lean.Widget.InteractiveGoal`.
 
-Note that the structures have been moved to `Structures.lean`, but most of the
+/-! Functionality related to tactic-mode and term-mode goals with embedded `CodeWithInfos`. -/
-functions here must be duplicated from `Lean.Widget.InteractiveGoal` in order
-to use the duplicated structures.
--/
 
 namespace GameServer
-
 open Lean Lean.Widget Lean.Server
 
--- duplicated with custom `InteractiveGoalCore`
+structure GameHint where
--- @[inherit_doc Lean.Widget.InteractiveGoalCore.pretty]
+  text : String
+  hidden : Bool
+deriving FromJson, ToJson
+
+/-- In the infoview, if multiple hypotheses `h₁`, `h₂` have the same type `α`, they are rendered
+as `h₁ h₂ : α`. We call this a 'hypothesis bundle'. We use `none` instead of `some false` for
+booleans to save space in the json encoding. -/
+structure InteractiveHypothesisBundle where
+  /-- The user-friendly name for each hypothesis. -/
+  names : Array Name
+  /-- The ids for each variable. Should have the same length as `names`. -/
+  fvarIds : Array FVarId
+  type : CodeWithInfos
+  /-- The value, in the case the hypothesis is a `let`-binder. -/
+  val? : Option CodeWithInfos := none
+  /-- The hypothesis is a typeclass instance. -/
+  isInstance? : Option Bool := none
+  /-- The hypothesis is a type. -/
+  isType? : Option Bool := none
+  /-- The hypothesis's type is of type `Prop` -/
+  isAssumption? : Option Bool := none
+  /-- If true, the hypothesis was not present on the previous tactic state.
+  Only present in tactic-mode goals. -/
+  isInserted? : Option Bool := none
+  /-- If true, the hypothesis will be removed in the next tactic state.
+  Only present in tactic-mode goals. -/
+  isRemoved? : Option Bool := none
+  deriving Inhabited, RpcEncodable
+
+/-- The shared parts of interactive term-mode and tactic-mode goals. -/
+structure InteractiveGoalCore where
+  hyps : Array InteractiveHypothesisBundle
+  /-- The target type. -/
+  type : CodeWithInfos
+  /-- Metavariable context that the goal is well-typed in. -/
+  ctx : WithRpcRef Elab.ContextInfo
+
+/-- An interactive tactic-mode goal. -/
+structure InteractiveGoal extends InteractiveGoalCore where
+  /-- The name `foo` in `case foo`, if any. -/
+  userName? : Option String
+  /-- The symbol to display before the target type. Usually `⊢ ` but `conv` goals use `∣ `
+  and it could be extended. -/
+  goalPrefix : String
+  /-- Identifies the goal (ie with the unique name of the MVar that it is a goal for.) -/
+  mvarId : MVarId
+  /-- If true, the goal was not present on the previous tactic state. -/
+  isInserted? : Option Bool := none
+  /-- If true, the goal will be removed on the next tactic state. -/
+  isRemoved? : Option Bool := none
+  hints : Array GameHint := #[]
+  deriving RpcEncodable
+
+/-- An interactive term-mode goal. -/
+structure InteractiveTermGoal extends InteractiveGoalCore where
+  /-- Syntactic range of the term. -/
+  range : Lsp.Range
+  /-- Information about the term whose type is the term-mode goal. -/
+  term : WithRpcRef Elab.TermInfo
+  deriving RpcEncodable
+
 def InteractiveGoalCore.pretty (g : InteractiveGoalCore) (userName? : Option String)
     (goalPrefix : String) : Format := Id.run do
   let indent := 2 -- Use option
@@ -24,7 +79,8 @@ def InteractiveGoalCore.pretty (g : InteractiveGoalCore) (userName? : Option Str
     ret := addLine ret
     let names := hyp.names
         |>.toList
-        |>.filter (· != toString Name.anonymous)
+        |>.filter (not ∘ Name.isAnonymous)
+        |>.map toString
         |> " ".intercalate
     match names with
     | "" =>
@@ -41,24 +97,16 @@ where
   addLine (fmt : Format) : Format :=
     if fmt.isNil then fmt else fmt ++ Format.line
 
--- duplicated with custom `InteractiveGoal`
--- @[inherit_doc Lean.Widget.InteractiveGoal.pretty]
 def InteractiveGoal.pretty (g : InteractiveGoal) : Format :=
   g.toInteractiveGoalCore.pretty g.userName? g.goalPrefix
 
--- duplicated with custom `InteractiveTermGoal`
--- @[inherit_doc Lean.Widget.InteractiveTermGoal.pretty]
 def InteractiveTermGoal.pretty (g : InteractiveTermGoal) : Format :=
   g.toInteractiveGoalCore.pretty none "⊢ "
 
--- duplicated with custom `InteractiveGoal`
--- @[inherit_doc Lean.Widget.InteractiveGoals]
 structure InteractiveGoals where
   goals : Array InteractiveGoal
   deriving RpcEncodable
 
--- duplicated with custom `InteractiveGoals`
--- @[inherit_doc Lean.Widget.InteractiveGoals.append]
 def InteractiveGoals.append (l r : InteractiveGoals) : InteractiveGoals where
   goals := l.goals ++ r.goals
 
@@ -66,10 +114,9 @@ instance : Append InteractiveGoals := ⟨InteractiveGoals.append⟩
 instance : EmptyCollection InteractiveGoals := ⟨{goals := #[]}⟩
 
 open Meta in
--- duplicated with custom `InteractiveHypothesisBundle` and therefore added `isAssumption?`
+/-- Extend an array of hypothesis bundles with another bundle. -/
-@[inherit_doc Lean.Widget.addInteractiveHypothesisBundle]
 def addInteractiveHypothesisBundle (hyps : Array InteractiveHypothesisBundle)
-    (ids : Array (String × FVarId)) (type : Expr) (value? : Option Expr := none) :
+    (ids : Array (Name × FVarId)) (type : Expr) (value? : Option Expr := none) :
     MetaM (Array InteractiveHypothesisBundle) := do
   if ids.size == 0 then
     throwError "Can only add a nonzero number of ids as an InteractiveHypothesisBundle."
@@ -78,12 +125,11 @@ def addInteractiveHypothesisBundle (hyps : Array InteractiveHypothesisBundle)
   return hyps.push {
     names
     fvarIds
-    type        := (← ppExprTagged type)
+    type           := (← ppExprTagged type)
-    val?        := (← value?.mapM ppExprTagged)
+    val?           := (← value?.mapM ppExprTagged)
-    isInstance? := if (← isClass? type).isSome then true else none
+    isInstance?    := if (← isClass? type).isSome then true else none
-    isType?     := if (← instantiateMVars type).isSort then true else none
+    isType?        := if (← instantiateMVars type).isSort then true else none
-    -- Added:
+    isAssumption?  := if (← inferType type).isProp then true else none
-    isAssumption? := if (← inferType type).isProp then true else none
   }
 
 open Meta in
@@ -96,15 +142,13 @@ def withGoalCtx (goal : MVarId) (action : LocalContext → MetavarDecl → n α)
   withLCtx lctx mvarDecl.localInstances (action lctx mvarDecl)
 
 open Meta in
-
+/-- A variant of `Meta.ppGoal` which preserves subexpression information for interactivity. -/
--- Duplicated from `Lean.Widget.goalToInteractive` with custom structures
+def goalToInteractive (mvarId : MVarId) (hints : Array GameHint): MetaM InteractiveGoal := do
-@[inherit_doc Lean.Widget.goalToInteractive]
-def goalToInteractive (mvarId : MVarId) : MetaM InteractiveGoal := do
   let ppAuxDecls := pp.auxDecls.get (← getOptions)
   let ppImplDetailHyps := pp.implementationDetailHyps.get (← getOptions)
   let showLetValues := pp.showLetValues.get (← getOptions)
   withGoalCtx mvarId fun lctx mvarDecl => do
-    let pushPending (ids : Array (String × FVarId)) (type? : Option Expr) (hyps : Array InteractiveHypothesisBundle)
+    let pushPending (ids : Array (Name × FVarId)) (type? : Option Expr) (hyps : Array InteractiveHypothesisBundle)
         : MetaM (Array InteractiveHypothesisBundle) :=
       if ids.isEmpty then
         pure hyps
@@ -112,7 +156,7 @@ def goalToInteractive (mvarId : MVarId) : MetaM InteractiveGoal := do
         match type? with
         | none      => pure hyps
         | some type => addInteractiveHypothesisBundle hyps ids type
-    let mut varNames : Array (String × FVarId) := #[]
+    let mut varNames : Array (Name × FVarId) := #[]
     let mut prevType? : Option Expr := none
     let mut hyps : Array InteractiveHypothesisBundle := #[]
     for localDecl in lctx do
@@ -121,7 +165,7 @@ def goalToInteractive (mvarId : MVarId) : MetaM InteractiveGoal := do
       else
         match localDecl with
         | LocalDecl.cdecl _index fvarId varName type _ _ =>
-          let varName := toString varName
+          let varName := varName.simpMacroScopes
           let type ← instantiateMVars type
           if prevType? == none || prevType? == some type then
             varNames := varNames.push (varName, fvarId)
@@ -130,7 +174,7 @@ def goalToInteractive (mvarId : MVarId) : MetaM InteractiveGoal := do
             varNames := #[(varName, fvarId)]
           prevType? := some type
         | LocalDecl.ldecl _index fvarId varName type val _ _ => do
-          let varName := toString varName
+          let varName := varName.simpMacroScopes
           hyps ← pushPending varNames prevType? hyps
           let type ← instantiateMVars type
           let val? ← if showLetValues then pure (some (← instantiateMVars val)) else pure none
@@ -146,10 +190,11 @@ def goalToInteractive (mvarId : MVarId) : MetaM InteractiveGoal := do
     return {
       hyps
       type := goalFmt
-      ctx := ⟨{← Elab.CommandContextInfo.save with }⟩
+      ctx := ⟨← Elab.ContextInfo.save⟩
       userName?
       goalPrefix := getGoalPrefix mvarDecl
       mvarId
+      hints
     }
 
 end GameServer

server/GameServer/Inventory.lean

@@ -121,7 +121,7 @@ partial def collectUsedInventory (stx : Syntax) (acc : UsedInventory := {}) : Co
   | .atom _info val =>
     -- ignore syntax elements that do not start with a letter
     -- and ignore some standard keywords
-    let allowed := GameServer.ALLOWED_KEYWORDS
+    let allowed := ["with", "fun", "at", "only", "by"]
     if 0 < val.length ∧ val.data[0]!.isAlpha ∧ not (allowed.contains val) then
       let val := val.dropRightWhile (fun c => c == '!' || c == '?') -- treat `simp?` and `simp!` like `simp`
       return {acc with tactics := acc.tactics.insert val}

server/GameServer/RpcHandlers.lean

@@ -1,7 +1,5 @@
 import GameServer.EnvExtensions
 import GameServer.InteractiveGoal
-import Std.Data.Array.Init.Basic
-import GameServer.Hints
 
 open Lean
 open Server
@@ -9,6 +7,7 @@ open Widget
 open RequestM
 open Meta
 
+
 /-! ## GameGoal -/
 
 namespace GameServer
@@ -104,234 +103,49 @@ def matchDecls (patterns : Array Expr) (fvars : Array Expr) (strict := true) (in
   then return some bij
   else return none
 
+unsafe def evalHintMessageUnsafe : Expr → MetaM (Array Expr → MessageData) :=
+  evalExpr (Array Expr → MessageData)
+    (.forallE default (mkApp (mkConst ``Array [levelZero]) (mkConst ``Expr))
+      (mkConst ``MessageData) .default)
+
+@[implemented_by evalHintMessageUnsafe]
+def evalHintMessage : Expr → MetaM (Array Expr → MessageData) := fun _ => pure (fun _ => "")
+
 open Meta in
 /-- Find all hints whose trigger matches the current goal -/
-def findHints (goal : MVarId) (m : DocumentMeta) (initParams : Lsp.InitializeParams) : MetaM (Array GameHint) := do
+def findHints (goal : MVarId) (doc : FileWorker.EditableDocument) (initParams : Lsp.InitializeParams) : MetaM (Array GameHint) := do
   goal.withContext do
-    let some level ← getLevelByFileName? initParams m.mkInputContext.fileName
+    let some level ← getLevelByFileName? initParams doc.meta.mkInputContext.fileName
-      | throwError "Level not found: {m.mkInputContext.fileName}"
+      | throwError "Level not found: {doc.meta.mkInputContext.fileName}"
     let hints ← level.hints.filterMapM fun hint => do
       openAbstractCtxResult hint.goal fun hintFVars hintGoal => do
         if let some fvarBij := matchExpr (← instantiateMVars $ hintGoal) (← instantiateMVars $ ← inferType $ mkMVar goal)
         then
-
+          let lctx := (← goal.getDecl).lctx
-          -- NOTE: This code for `hintFVarsNames` is also duplicated in the
+          if let some bij ← matchDecls hintFVars lctx.getFVars (strict := hint.strict) (initBij := fvarBij)
-          -- "Statement" command, where `hint.rawText` is created. They need to be matching.
-          -- NOTE: This is a bit a hack of somebody who does not know how meta-programming works.
-          -- All we want here is a list of `userNames` for the `FVarId`s in `hintFVars`...
-          -- and we wrap them in `«{}»` here since I don't know how to do it later.
-          let mut hintFVarsNames : Array Expr := #[]
-          for fvar in hintFVars do
-            let name₁ ← fvar.fvarId!.getUserName
-            hintFVarsNames := hintFVarsNames.push <| Expr.fvar ⟨s!"«\{{name₁}}»"⟩
-
-          let lctx := (← goal.getDecl).lctx -- the player's local context
-          if let some bij ← matchDecls hintFVars lctx.getFVars
-            (strict := hint.strict) (initBij := fvarBij)
           then
             let userFVars := hintFVars.map fun v => bij.forward.findD v.fvarId! v.fvarId!
-            -- Evaluate the text in the player's context to get the new variable names.
             let text := (← evalHintMessage hint.text) (userFVars.map Expr.fvar)
             let ctx := {env := ← getEnv, mctx := ← getMCtx, lctx := lctx, opts := {}}
             let text ← (MessageData.withContext ctx text).toString
-
+            return some { text := text, hidden := hint.hidden }
-            -- Here we map the goal's variable names to the player's variable names.
-            let mut varNames : Array <| Name × Name := #[]
-            for (fvar₁, fvar₂) in bij.forward.toArray do
-              -- get the `userName` of the fvar in the opened local context of the hint.
-              let name₁ ← fvar₁.getUserName
-              -- get the `userName` in the player's local context.
-              let name₂ := (lctx.get! fvar₂).userName
-              varNames := varNames.push (name₁, name₂)
-
-            return some {
-              text := text,
-              hidden := hint.hidden,
-              rawText := hint.rawText,
-              varNames := varNames }
-
           else return none
         else
           return none
     return hints
 
--- TODO: no need to have `RequestM`, just anything where `mut` works
+open RequestM in
-/-- Add custom diagnostics about whether the level is completed. -/
+def getInteractiveGoals (p : Lsp.PlainGoalParams) : RequestM (RequestTask (Option InteractiveGoals)) := do
-def completionDiagnostics (goalCount : Nat) (prevGoalCount : Nat) (completed : Bool)
-    (completedWithWarnings : Bool) (pos : Lsp.Position)
-    (startDiags : Array InteractiveDiagnostic := #[]) :
-    RequestM <| Array InteractiveDiagnostic := do
-  let mut out : Array InteractiveDiagnostic := startDiags
-  if goalCount == 0 then
-    if completed then
-      out := out.push {
-        message := .text "level completed! 🎉"
-        range := {
-          start := pos
-          «end» := pos
-          }
-        severity? := Lsp.DiagnosticSeverity.information }
-    else if completedWithWarnings then
-      out := out.push {
-        message := .text "level completed with warnings… 🎭"
-        range := {
-          start := pos
-          «end» := pos
-          }
-        severity? := Lsp.DiagnosticSeverity.information }
-    else
-      pure ()
-  else if goalCount < prevGoalCount then
-    out := out.push {
-      message := .text "intermediate goal solved! 🎉"
-      range := {
-        start := pos
-        «end» := pos
-        }
-      severity? := Lsp.DiagnosticSeverity.information
-    }
-  return out
-
-def filterUnsolvedGoal (a : Array InteractiveDiagnostic) :
-    Array InteractiveDiagnostic :=
-  a.filter (fun d => match d.message with
-  | .append ⟨(.text x) :: _⟩ => x != "unsolved goals"
-  | _ => true)
-
-/-- Request that returns the goals at the end of each line of the tactic proof
-plus the diagnostics (i.e. warnings/errors) for the proof.
- -/
-def getProofState (_ : Lsp.PlainGoalParams) : RequestM (RequestTask (Option ProofState)) := do
   let doc ← readDoc
   let rc ← readThe RequestContext
   let text := doc.meta.text
-
-  -- BUG: trimming here is a problem, since the snap might already be evaluated before
-  -- the trimming and then the positions don't match anymore :((
-
-  withWaitFindSnap
-    doc
-    -- TODO (Alex): I couldn't find a good condition to find the correct snap. So we are looking
-    -- for the first snap with goals here.
-    -- NOTE (Jon): The entire proof is in one snap, so hoped that Position `0` is good enough.
-    (fun snap => ¬ (snap.infoTree.goalsAt? doc.meta.text 0).isEmpty)
-    (notFoundX := return none)
-    fun snap => do
-      -- `snap` is the one snapshot containing the entire proof.
-      let mut steps : Array <| InteractiveGoalsWithHints := #[]
-
-      -- Question: Is there a difference between the diags of this snap and the last snap?
-      -- Should we get the diags from there?
-      -- Answer: The last snap only copied the diags from the end of this snap
-      let mut diag : Array InteractiveDiagnostic := snap.interactiveDiags.toArray
-
-      -- Level is completed if there are no errrors or warnings
-      let completedWithWarnings : Bool := ¬ diag.any (·.severity? == some .error)
-      let completed : Bool := completedWithWarnings ∧ ¬ diag.any (·.severity? == some .warning)
-
-      let mut intermediateGoalCount := 0
-
-      -- only the positions that have non-whitespace characters since the last position
-      -- should add a new proof step.
-      let positionsWithSource : Array (String.Pos × String) :=
-        text.positions.zipWithIndex.filterMap (
-          fun (pos, i) => match i with
-          | 0 => some (pos, "")
-          | i' + 1 =>
-            let source : String := Substring.toString ⟨text.source, text.positions.get! i', pos⟩
-            if source.trim.length == 0 then
-              none
-            else
-              some (pos, source))
-
-      -- Drop the last position as we ensured that there is always a newline at the end
-      for ((pos, source), i) in positionsWithSource.zipWithIndex do
-        -- iterate over all steps in the proof and get the goals and hints at each position
-
-        -- diags are labeled in Lsp-positions, which differ from the lean-internal
-        -- positions by `1`.
-        let lspPosAt := text.utf8PosToLspPos pos
-
-        let mut diagsAtPos : Array InteractiveDiagnostic := filterUnsolvedGoal <|
-          -- `+1` for getting the errors after the line.
-          match i with
-          | 0 =>
-            -- `lspPosAt` is `(0, 0)`
-            diag.filter (fun d => d.range.start == lspPosAt )
-          | i' + 1 =>
-            diag.filter (fun d =>
-              ((text.utf8PosToLspPos <| (positionsWithSource.get! i').1) ≤ d.range.start) ∧
-              d.range.start < lspPosAt )
-
-        if let goalsAtResult@(_ :: _) := snap.infoTree.goalsAt? doc.meta.text pos then
-          let goalsAtPos' : List <| List InteractiveGoalWithHints ← goalsAtResult.mapM
-            fun { ctxInfo := ci, tacticInfo := tacticInfo, useAfter := useAfter, .. } => do
-              -- TODO: What does this function body do?
-              -- let ciAfter := { ci with mctx := ti.mctxAfter }
-              let ci := if useAfter then
-                  { ci with mctx := tacticInfo.mctxAfter }
-                else
-                  { ci with mctx := tacticInfo.mctxBefore }
-              -- compute the interactive goals
-              let goalMvars : List MVarId ← ci.runMetaM {} do
-                return if useAfter then tacticInfo.goalsAfter else tacticInfo.goalsBefore
-
-              let interactiveGoals : List InteractiveGoalWithHints ← ci.runMetaM {} do
-                goalMvars.mapM fun goal => do
-                  let hints ← findHints goal doc.meta rc.initParams
-                  let interactiveGoal ← goalToInteractive goal
-                  return ⟨interactiveGoal, hints⟩
-              -- TODO: This code is way old, can it be deleted?
-              -- compute the goal diff
-              -- let goals ← ciAfter.runMetaM {} (do
-              --     try
-              --       Widget.diffInteractiveGoals useAfter ti goals
-              --     catch _ =>
-              --       -- fail silently, since this is just a bonus feature
-              --       return goals
-              -- )
-              return interactiveGoals
-          let goalsAtPos : Array InteractiveGoalWithHints := ⟨goalsAtPos'.foldl (· ++ ·) []⟩
-
-          diagsAtPos ← completionDiagnostics goalsAtPos.size intermediateGoalCount
-            completed completedWithWarnings lspPosAt diagsAtPos
-
-          intermediateGoalCount := goalsAtPos.size
-
-          steps := steps.push ⟨goalsAtPos, source, diagsAtPos, lspPosAt.line, lspPosAt.character⟩
-        else
-          -- No goals present
-          steps := steps.push ⟨#[], source, diagsAtPos, lspPosAt.line, none⟩
-
-      -- Filter out the "unsolved goals" message
-      diag := filterUnsolvedGoal diag
-
-      let lastPos := text.utf8PosToLspPos positionsWithSource.back.1
-      let remainingDiags : Array InteractiveDiagnostic :=
-        diag.filter (fun d => lastPos ≤ d.range.start)
-
-      return some {
-        steps := steps,
-        diagnostics := remainingDiags,
-        completed := completed,
-        completedWithWarnings := completedWithWarnings,
-        lastPos := lastPos.line
-        }
-
-open RequestM in
-
--- The editor apparently uses this
-def getInteractiveGoals (p : Lsp.PlainGoalParams) : RequestM (RequestTask (Option <| InteractiveGoals)) := do
-  let doc ← readDoc
-  -- let rc ← readThe RequestContext
-  let text := doc.meta.text
   let hoverPos := text.lspPosToUtf8Pos p.position
   -- TODO: I couldn't find a good condition to find the correct snap. So we are looking
   -- for the first snap with goals here:
   withWaitFindSnap doc (fun s => ¬ (s.infoTree.goalsAt? doc.meta.text hoverPos).isEmpty)
     (notFoundX := return none) fun snap => do
       if let rs@(_ :: _) := snap.infoTree.goalsAt? doc.meta.text hoverPos then
-        let goals : List <| Array InteractiveGoal ← rs.mapM fun { ctxInfo := ci, tacticInfo := ti, useAfter := useAfter, .. } => do
+        let goals : List InteractiveGoals ← rs.mapM fun { ctxInfo := ci, tacticInfo := ti, useAfter := useAfter, .. } => do
           let ciAfter := { ci with mctx := ti.mctxAfter }
           let ci := if useAfter then ciAfter else { ci with mctx := ti.mctxBefore }
           -- compute the interactive goals
@@ -339,8 +153,8 @@ def getInteractiveGoals (p : Lsp.PlainGoalParams) : RequestM (RequestTask (Optio
             return List.toArray <| if useAfter then ti.goalsAfter else ti.goalsBefore
           let goals ← ci.runMetaM {} do
              goals.mapM fun goal => do
-              -- let hints ← findHints goal doc.meta rc.initParams
+              let hints ← findHints goal doc rc.initParams
-              return ← goalToInteractive goal
+              return ← goalToInteractive goal hints
           -- compute the goal diff
           -- let goals ← ciAfter.runMetaM {} (do
           --     try
@@ -349,8 +163,8 @@ def getInteractiveGoals (p : Lsp.PlainGoalParams) : RequestM (RequestTask (Optio
           --       -- fail silently, since this is just a bonus feature
           --       return goals
           -- )
-          return goals
+          return {goals}
-        return some <| ⟨goals.foldl (· ++ ·) #[]⟩
+        return some <| goals.foldl (· ++ ·) ⟨#[]⟩
       else
         return none
 
@@ -358,16 +172,7 @@ builtin_initialize
   registerBuiltinRpcProcedure
     `Game.getInteractiveGoals
     Lsp.PlainGoalParams
-    (Option <| InteractiveGoals
+    (Option InteractiveGoals)
-    )
     getInteractiveGoals
 
-builtin_initialize
-  registerBuiltinRpcProcedure
-    `Game.getProofState
-    Lsp.PlainGoalParams
-    (Option ProofState)
-    getProofState
-
-
 end GameServer

server/GameServer/SaveData.lean

@@ -1,8 +1,8 @@
 import GameServer.EnvExtensions
-import I18n
 
 open Lean Meta Elab Command
 
+
 /-! ## Copy images -/
 
 open IO.FS System FilePath in
@@ -59,9 +59,6 @@ def saveGameData (allItemsByType : HashMap InventoryType (HashSet Name))
 
   IO.FS.writeFile (path / inventoryFileName) (toString (toJson inventory))
 
-  -- write PO file for translation
-  I18n.createPOTemplate
-
 open GameData
 
 def loadData (f : System.FilePath) (α : Type) [FromJson α] : IO α := do

server/GameServer/Structures.lean

@@ -1,102 +0,0 @@
-import Lean.Widget.InteractiveGoal
-import Lean.Widget.InteractiveDiagnostic
-import Lean.Data.Lsp.Diagnostics
-
-/-!
-This file contains the custom data structures use by the server.
-
-Some of them overwrite built-in structures from Lean.
-
-In particular, the structures from `Lean.Widget.InteractiveGoal` are duplicated with
-the following extension:
-
-* `isAssumption?` in `InteractiveHypothesisBundle`: stores if a hypothesis is of type `Prop`.
-
-NOTE: Changes here need to be reflected in  the corresponding `interface` in `rcp_api.ts`
-on the client-side.
--/
-
-open Lean Server Widget
-
-namespace GameServer
-
-/-- Extend the interactive hypothesis bundle with an option to distinguish
-"assumptions" from "objects". "Assumptions" are hypotheses of type `Prop`. -/
--- @[inherit_doc Lean.Widget.InteractiveHypothesisBundle]
-structure InteractiveHypothesisBundle extends Lean.Widget.InteractiveHypothesisBundle where
-  /-- The hypothesis's type is of type `Prop` -/
-  isAssumption? : Option Bool := none
-deriving RpcEncodable
-
--- duplicated but with custom `InteractiveHypothesisBundle`
-@[inherit_doc Lean.Widget.InteractiveGoalCore]
-structure InteractiveGoalCore where
-  hyps : Array InteractiveHypothesisBundle
-  type : CodeWithInfos
-  ctx : WithRpcRef Elab.ContextInfo
-
--- duplicated but with custom `InteractiveGoalCore`
-@[inherit_doc Lean.Widget.InteractiveGoal]
-structure InteractiveGoal extends InteractiveGoalCore where
-  userName? : Option String
-  goalPrefix : String
-  mvarId : MVarId
-  isInserted? : Option Bool := none
-  isRemoved? : Option Bool := none
-deriving RpcEncodable
-
--- duplicated with custom `InteractiveGoalCore`
-@[inherit_doc Lean.Widget.InteractiveTermGoal]
-structure InteractiveTermGoal extends InteractiveGoalCore where
-  range : Lsp.Range
-  term : WithRpcRef Elab.TermInfo
-deriving RpcEncodable
-
-/-- A hint in the game at the corresponding goal. -/
-structure GameHint where
-  /-- The text with the variable names already inserted.
-
-  Note: This is in theory superfluous and will be completely replaced by `rawText`. We just left
-  it in for debugging for now. -/
-  text : String
-  /-- Flag whether the hint should be hidden initially. -/
-  hidden : Bool
-  /-- The text with the variables not inserted yet. -/
-  rawText : String
-  /-- The assignment of variable names in the `rawText` to the ones the player used. -/
-  varNames : Array <| Name × Name
-deriving FromJson, ToJson
-
-/-- Bundled `InteractiveGoal` together with an array of hints that apply at this stage. -/
-structure InteractiveGoalWithHints where
-  goal : InteractiveGoal
-  /-- Extended the `InteractiveGoal` by an array of hints at that goal. -/
-  hints : Array GameHint
-deriving RpcEncodable
-
-structure InteractiveGoalsWithHints where
-  goals : Array InteractiveGoalWithHints
-  /-- The content of the line evaluated. -/
-  command : String
-  diags : Array InteractiveDiagnostic := default
-  line : Option Nat -- only for debugging
-  column : Option Nat -- only for debugging
-
-deriving RpcEncodable
-
-instance : Inhabited InteractiveGoalsWithHints := ⟨default, default, default, none, none⟩
-
-/-- Collected goals throughout the proof. Used for communication with the game client. -/
-structure ProofState where
-  /-- goals after each line. includes the hints. -/
-  steps : Array <| InteractiveGoalsWithHints
-  /-- diagnostics contains all errors and warnings.
-
-  TODO: I think they contain information about which line they belong to. Verify this.
-  -/
-  diagnostics : Array InteractiveDiagnostic := default
-  /-- Whether the level is considered solved. -/
-  completed : Bool
-  completedWithWarnings : Bool
-  lastPos : Nat -- only for debugging
-deriving RpcEncodable

server/lake-manifest.json

@@ -4,19 +4,10 @@
  [{"url": "https://github.com/leanprover/std4.git",
    "type": "git",
    "subDir": null,
-   "rev": "a7543d1a6934d52086971f510e482d743fe30cf3",
+   "rev": "2e4a3586a8f16713f16b2d2b3af3d8e65f3af087",
    "name": "std",
    "manifestFile": "lake-manifest.json",
-   "inputRev": "v4.6.0",
+   "inputRev": "v4.3.0",
-   "inherited": false,
-   "configFile": "lakefile.lean"},
-  {"url": "https://github.com/hhu-adam/lean-i18n.git",
-   "type": "git",
-   "subDir": null,
-   "rev": "c5b84feffb28dbd5b1ac74b3bf63271296fabfa5",
-   "name": "i18n",
-   "manifestFile": "lake-manifest.json",
-   "inputRev": "v4.6.0",
    "inherited": false,
    "configFile": "lakefile.lean"}],
  "name": "GameServer",

server/lakefile.lean

@@ -7,7 +7,6 @@ package GameServer
 def leanVersion : String := s!"v{Lean.versionString}"
 
 require std from git "https://github.com/leanprover/std4.git" @ leanVersion
-require i18n from git "https://github.com/hhu-adam/lean-i18n.git" @ leanVersion
 
 lean_lib GameServer
 

server/lean-toolchain

@@ -1 +1 @@
-leanprover/lean4:v4.6.0
+leanprover/lean4:v4.3.0

tsconfig.json

@@ -11,9 +11,6 @@
     "downlevelIteration": true,
     "experimentalDecorators": true,
     "allowSyntheticDefaultImports": true,
-    "lib": [
-      "ES2021.String"
-    ]
   },
   "exclude": ["server", "relay"]
 }

wasm.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+
+cd server
+
+mkdir -p .lake/toolchains
+if [ ! -f .lake/toolchains/lean-4.3.0-rc2-linux_wasm32.tar.zst  ]
+then
+    wget -P .lake/toolchains https://github.com/leanprover/lean4/releases/download/v4.3.0-rc2/lean-4.3.0-rc2-linux_wasm32.tar.zst
+    tar --use-compress-program=unzstd -xvf .lake/toolchains/lean-4.3.0-rc2-linux_wasm32.tar.zst -C .lake/toolchains
+fi
+if [ ! -f .lake/toolchains/lean-4.3.0-rc2-linux_x86.tar.zst  ]
+then
+    wget -P .lake/toolchains https://github.com/leanprover/lean4/releases/download/v4.3.0-rc2/lean-4.3.0-rc2-linux_x86.tar.zst
+    tar --use-compress-program=unzstd -xvf .lake/toolchains/lean-4.3.0-rc2-linux_x86.tar.zst -C .lake/toolchains
+fi
+
+# Linking will fail, but that's ok. We only need the c files.
+.lake/toolchains/lean-4.3.0-rc2-linux_x86/bin/lake build -f=lakefile32.lean
+
+
+lake build
+
+
+OUT_DIR=../client/public
+LEAN_SYSROOT=.lake/toolchains/lean-4.3.0-rc2-linux_wasm32
+LEAN_LIBDIR=$LEAN_SYSROOT/lib/lean
+
+emcc -o $OUT_DIR/server.js main.c -I $LEAN_SYSROOT/include -L $LEAN_LIBDIR .lake/build/ir/GameServer/*.c -lInit -lLean -lleancpp -lleanrt \
+  -sFORCE_FILESYSTEM -lnodefs.js -s EXIT_RUNTIME=0 -s MAIN_MODULE=1 -s LINKABLE=1 -s EXPORT_ALL=1 -s ALLOW_MEMORY_GROWTH=1 -fwasm-exceptions -pthread -flto \
+  -sPTHREAD_POOL_SIZE_STRICT=2 \
+  --preload-file "${LEAN_SYSROOT}/lib/lean/Init"@/lib/Init \
+  --preload-file "${LEAN_SYSROOT}/lib/lean/Init.olean"@/lib/Init.olean \
+  --preload-file "${LEAN_SYSROOT}/lib/lean/Init.ilean"@/lib/Init.ilean \
+  --preload-file "${LEAN_SYSROOT}/lib/lean/Lean"@/lib/Lean \
+  --preload-file "${LEAN_SYSROOT}/lib/lean/Lean.olean"@/lib/Lean.olean \
+  --preload-file "${LEAN_SYSROOT}/lib/lean/Lean.ilean"@/lib/Lean.ilean \
+  --preload-file "./.lake/build32/lib"@/gamelib