refactor(generator): include commit spaces in generated words (@miodec, @Leonabcd123) by Miodec · Pull Request #8157 · monkeytypegame/monkeytype

Miodec · 2026-06-24T09:40:53Z

Reworks the generation to include commit/separation character in the target word.

Words now carry their commit separator as a trailing space emitted by the generator (getNextWord) instead of being added retroactively to the previous word in Words.push. The old retroactive model assumed the next word was always generated before the current one was committed, which is false for plus_zero (toPush:1, zero lookahead): the current word was read bare during live validation, breaking commit, stop-on-error, expert, and quick-end. - strip prev words inside getNextWord so trailing separators don't leak into dedup/punctuation/capitalization feedback - guard the separator append for nospace mode and newline-terminated words - strip the trailing separator from the final word once generation is complete, covering the bulk, section, and lazy addWord paths (final word stays bare) - restore the expert-mode guard so a leading separator (empty input) never fails - move areAllTestWordsGenerated -> areAllWordsGenerated in words-generator Update test-words/validation/fail-or-finish specs to the new contracts. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Copilot

Pull request overview

Refactors test word generation + input/navigation to treat the commit/separator (space/newline, plus nospace “implicit commit”) as part of the target word, and updates stats/replay/export + tests accordingly.

Changes:

Generator now appends a trailing separator and words model stores it as textWithCommit / commit.
Input pipeline updated to detect “commit characters” and decide navigation via shouldGoToNextWord.
Event log/replay/export paths switched to use textWithCommit; tests updated/added.

Reviewed changes

Copilot reviewed 23 out of 23 changed files in this pull request and generated 3 comments.

Show a summary per file

File	Description
frontend/src/ts/test/words-generator.ts	Appends trailing separator on generated words; adds `areAllWordsGenerated()`.
frontend/src/ts/test/test-words.ts	Splits trailing separator into `commit` + `textWithCommit`; adds last-word commit stripping helper.
frontend/src/ts/test/test-ui.ts	Adjusts word HTML handling/comments; changes input UI update flow (currently includes debug spam).
frontend/src/ts/test/test-logic.ts	Uses generator-level `areAllWordsGenerated`; strips last-word separator when generation complete.
frontend/src/ts/test/replay-ui.ts	Replays with `textWithCommit`.
frontend/src/ts/test/pace-caret.ts	Updates pace-caret indexing/correction math for new word representation.
frontend/src/ts/test/events/stats.ts	Simplifies target-word lookup; adjusts char counting + missed-words logic.
frontend/src/ts/test/events/helpers.ts	Stops trimming end on last-word incorrect commit case.
frontend/src/ts/test/events/data.ts	Stops trimming end in `getInputForWord`; event log targetWords now `textWithCommit`.
frontend/src/ts/input/listeners/input.ts	Switches completion check to `areAllWordsGenerated`.
frontend/src/ts/input/helpers/word-navigation.ts	Simplifies previous-word nav signature; handles trailing separator when restoring input.
frontend/src/ts/input/helpers/validation.ts	Replaces old “space insertion” logic with `shouldGoToNextWord`.
frontend/src/ts/input/helpers/util.ts	New helper to detect “commit character” (space/newline/nospace completion).
frontend/src/ts/input/helpers/fail-or-finish.ts	Updates difficulty/finish helpers to use commit-character + navigation semantics.
frontend/src/ts/input/handlers/insert-text.ts	Refactors commit/navigation logic around commit-characters + separator-in-target-word model.
frontend/src/ts/input/handlers/delete.ts	Updates previous-word navigation call sites.
frontend/src/ts/input/handlers/before-insert-text.ts	Updates over-limit + line-wrap prevention using commit-character logic.
frontend/src/ts/elements/caret.ts	Import ordering only.
frontend/src/ts/commandline/lists/result-screen.ts	Copies typed words using `textWithCommit` and joins without adding spaces.
frontend/tests/test/test-words.spec.ts	New unit tests for separator splitting + stripping behavior.
frontend/tests/test/events/stats.spec.ts	Updates stats target-word tests for simplified behavior.
frontend/tests/input/helpers/validation.spec.ts	Updates tests for new `shouldGoToNextWord` contract + separator correctness.
frontend/tests/input/helpers/fail-or-finish.spec.ts	Updates difficulty/finish tests for commit-character based logic.

  const commitCorrect = noSpaceForce
    ? testInput + data === currentWord
    : correct;


Copilot

Pull request overview

Copilot reviewed 23 out of 23 changed files in this pull request and generated 8 comments.

+  removeCommitCharacterFromLastWord(): void {
+    if (this.length === 0) return;
+    const lastWord = this.list[this.length - 1];
+    if (lastWord === undefined) return;
+    if (
+      lastWord.textWithCommit.endsWith(" ") ||
+      lastWord.textWithCommit.endsWith("\n")
+    ) {
+      lastWord.textWithCommit = lastWord.textWithCommit.slice(0, -1);
+      lastWord.display = lastWord.textWithCommit;
+    }
+  }


    const word = getInputForWord(TestState.activeWordIndex);
    if (nospaceEnabled) {
      setInputElementValue(word.slice(0, -1));
-    } else if (word.endsWith("\n")) {
+    } else if (word.endsWith("\n") || word.endsWith(" ")) {
      setInputElementValue(word.slice(0, -1));


-  const { data, inputValue, targetWord } = options;
-  if (!isSpace(data)) {
-    return null;
+  const correct = inputValue + data === targetWord;


+  if (goingToNextWord) {
    const result = await goToNextWord({
-      correctInsert: commitCorrect,
+      correctInsert: testInput + data === currentWord,
      isCompositionEnding: isCompositionEnding === true,
-      zenNewline: charIsNewline && Config.mode === "zen",
+      zenNewline: data === "\n" && Config.mode === "zen",


+      const bareWord = word;
+      missedWords[bareWord] = (missedWords[bareWord] ?? 0) + 1;


+  return eventLog.context.targetWords[wordIndex];
 }

 function computeBurst(events: TestEventNoMs[], now?: number): number {


  // is char correct
-  const charCorrect = isCharCorrect({
+  const correct = isCharCorrect({
    data,
    inputValue: testInput,
    targetWord: currentWord,
    correctShiftUsed,
  });


+  // the stored trailing separator space is not rendered as a letter
  const chars = Strings.splitIntoCharacters(word);
  for (const char of chars) {
    if (funbox) {


Copilot

Pull request overview

Copilot reviewed 23 out of 23 changed files in this pull request and generated 3 comments.

Comments suppressed due to low confidence (1)

frontend/src/ts/test/practise-words.ts:70

If getMissedWords is keyed by bare words (no trailing commit separator), this lookup should also use the bare word. Using textWithCommit here will fail to match and can also inject trailing separators into the generated practice text.

      const missedWord = TestWords.words.get(i)?.textWithCommit;

      if (missedWord === undefined) continue; // won't happen, but ts complains

      const missedWordCount = missedWords[missedWord];

Copilot

Pull request overview

Copilot reviewed 23 out of 23 changed files in this pull request and generated 2 comments.

Copilot

Pull request overview

Copilot reviewed 22 out of 22 changed files in this pull request and generated 4 comments.

+  //strict space
+  if (
+    inputValue.length === 0 &&
+    (Config.strictSpace || Config.difficulty !== "normal")
+  ) {
+    return false;
+  }


@@ -0,0 +1,26 @@
+import { isFunboxActiveWithProperty } from "../../test/funbox/active";


+  Space/word-navigation variables:
+   - charIsSpace / charIsNewline: was the input a space or a newline?
+   - goingToNextWord: should this input commit the current word and move on?
+     The separator is part of the target word (stored as a trailing space), so a
+     space/newline matches it positionally; navigation can still be blocked by
+     stop-on-error, strict space, or opposite shift (removeLastChar).
+   - increasedWordIndex: only set because on the last word we don't move on.


  //nospace cant be handled here becauseword index
  // is already increased at this point



Miodec added 9 commits June 22, 2026 09:30

ai

363f445

dont use test words

c0b526a

update

6d98407

Merge branch 'master' into commit-character-in-generator

a8d27be

cleanup

f558b5d

fix tests

ab9264f

cleanup

c65bf3c

rename

df9d115

Merge branch 'master' into commit-character-in-generator

204cf85

monkeytypegeorge added the frontend User interface or web stuff label Jun 24, 2026

Merge branch 'master' into commit-character-in-generator

2487aca

Miodec commented Jun 24, 2026

View reviewed changes

Comment thread frontend/src/ts/elements/caret.ts

Miodec added 6 commits June 24, 2026 12:01

revert

f8c8955

fix

8e80756

fix

2f58b15

refacto

d00f3fa

blindly following instructions

79aed3d

yes honey

53aaba2

Leonabcd123 mentioned this pull request Jun 24, 2026

fix: nospace and newline word navigation issues (@Leonabcd123) #8148

Closed

Miodec changed the title ~~refactor(generator): include commit spaces in generated words (@miodec)~~ refactor(generator): include commit spaces in generated words (@miodec, @Leonabcd123) Jun 24, 2026

Miodec and others added 10 commits June 24, 2026 19:12

update command

324a6d1

update

26f4c8d

rename

e31babb

rework

ab1b46d

remake

7467489

fix tests

bc27c48

better type

a016f7a

use text

f4a2675

def 1

adc7548

github-actions Bot added the waiting for review Pull requests that require a review before continuing label Jun 27, 2026

Copilot started reviewing on behalf of Miodec June 27, 2026 17:07 View session

Copilot AI reviewed Jun 27, 2026

View reviewed changes

Comment thread frontend/src/ts/test/test-ui.ts Outdated

Comment thread frontend/src/ts/input/handlers/insert-text.ts Outdated

Comment on lines 240 to 242

const commitCorrect = noSpaceForce

? testInput + data === currentWord

: correct;

Comment thread frontend/src/ts/test/events/stats.ts

Miodec added 5 commits June 27, 2026 19:15

remove debug

26423b4

fix replay

e9625b0

use text with commit

02a1122

trim

c28107f

correctInsert

0881ed9

Miodec requested a review from Copilot June 27, 2026 18:59

Copilot started reviewing on behalf of Miodec June 27, 2026 18:59 View session

Copilot AI reviewed Jun 27, 2026

View reviewed changes

Miodec added 4 commits June 27, 2026 21:28

refactor addWord to use new Word object structure from push method

0c02f1a

fix

d7c5f4f

cleanup

cb43350

cleanup

d70afb7

Miodec requested a review from Copilot June 27, 2026 19:56

Copilot started reviewing on behalf of Miodec June 27, 2026 19:57 View session

remove comment

ced40f5

Copilot AI reviewed Jun 27, 2026

View reviewed changes

Comment thread frontend/src/ts/test/test-ui.ts Outdated

Comment thread frontend/src/ts/test/events/stats.ts

Comment thread frontend/src/ts/input/handlers/insert-text.ts

Miodec added 2 commits June 27, 2026 22:50

fix

474295a

trim

f5484c7

Miodec requested a review from Copilot June 27, 2026 20:55

Copilot started reviewing on behalf of Miodec June 27, 2026 20:55 View session

Copilot AI reviewed Jun 27, 2026

View reviewed changes

Comment thread frontend/src/ts/input/handlers/insert-text.ts Outdated

Comment thread frontend/src/ts/test/test-logic.ts

Miodec added 3 commits June 27, 2026 23:02

use text

5248a7c

fix opposite shift

3db589c

fix

76076c5

Miodec requested a review from Copilot June 27, 2026 21:17

Copilot started reviewing on behalf of Miodec June 27, 2026 21:17 View session

Copilot AI reviewed Jun 27, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

refactor(generator): include commit spaces in generated words (@miodec, @Leonabcd123)#8157

refactor(generator): include commit spaces in generated words (@miodec, @Leonabcd123)#8157
Miodec wants to merge 46 commits into
masterfrom
commit-character-in-generator

Miodec commented Jun 24, 2026

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		const bareWord = word;
		missedWords[bareWord] = (missedWords[bareWord] ?? 0) + 1;

		@@ -0,0 +1,26 @@
		import { isFunboxActiveWithProperty } from "../../test/funbox/active";

		//nospace cant be handled here becauseword index
		// is already increased at this point

Uh oh!

Uh oh!

Conversation

Miodec commented Jun 24, 2026

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants