From b28ac4e6460a13dd234bc4a17e2c4b10b17fb97f Mon Sep 17 00:00:00 2001
From: Luc Mcgrady <lucmcgrady@gmail.com>
Date: Sun, 23 Feb 2025 15:02:25 +0000
Subject: [PATCH 01/16] Added: Leech suspend to simulator

---
 proto/anki/scheduler.proto                   | 2 ++
 rslib/src/scheduler/fsrs/retention.rs        | 1 +
 rslib/src/scheduler/fsrs/simulator.rs        | 4 ++++
 ts/routes/deck-options/SimulatorModal.svelte | 9 +++++++++
 4 files changed, 16 insertions(+)

diff --git a/proto/anki/scheduler.proto b/proto/anki/scheduler.proto
index b657ff3fa24..42befe816dc 100644
--- a/proto/anki/scheduler.proto
+++ b/proto/anki/scheduler.proto
@@ -393,6 +393,7 @@ message SimulateFsrsReviewRequest {
   bool new_cards_ignore_review_limit = 9;
   repeated float easy_days_percentages = 10;
   deck_config.DeckConfig.Config.ReviewCardOrder review_order = 11;
+  optional uint32 suspend_after_lapse_count = 12;
 }
 
 message SimulateFsrsReviewResponse {
@@ -409,6 +410,7 @@ message ComputeOptimalRetentionRequest {
   string search = 4;
   double loss_aversion = 5;
   repeated float easy_days_percentages = 6;
+  optional uint32 suspend_after_lapse_count = 7;
 }
 
 message ComputeOptimalRetentionResponse {
diff --git a/rslib/src/scheduler/fsrs/retention.rs b/rslib/src/scheduler/fsrs/retention.rs
index c89c08aab52..45980e266eb 100644
--- a/rslib/src/scheduler/fsrs/retention.rs
+++ b/rslib/src/scheduler/fsrs/retention.rs
@@ -78,6 +78,7 @@ impl Collection {
                     learn_limit,
                     review_limit: usize::MAX,
                     new_cards_ignore_review_limit: true,
+                    suspend_after_lapses: None,
                     post_scheduling_fn,
                     review_priority_fn: None,
                 },
diff --git a/rslib/src/scheduler/fsrs/simulator.rs b/rslib/src/scheduler/fsrs/simulator.rs
index 1cfc2e959bc..2da5097b95c 100644
--- a/rslib/src/scheduler/fsrs/simulator.rs
+++ b/rslib/src/scheduler/fsrs/simulator.rs
@@ -147,6 +147,7 @@ impl Collection {
                 last_date: f32::NEG_INFINITY, // Treated as a new card in simulation
                 due: ((introduced_today_count + i) / req.new_limit as usize) as f32,
                 interval: f32::NEG_INFINITY,
+                lapses: 0
             });
             converted_cards.extend(new_cards);
         }
@@ -198,6 +199,7 @@ impl Collection {
             learn_limit: req.new_limit as usize,
             review_limit: req.review_limit as usize,
             new_cards_ignore_review_limit: req.new_cards_ignore_review_limit,
+            suspend_after_lapses: req.suspend_after_lapse_count,
             post_scheduling_fn,
             review_priority_fn,
         };
@@ -239,6 +241,7 @@ impl Card {
                         last_date,
                         due: relative_due as f32,
                         interval: card.interval as f32,
+                        lapses: card.lapses
                     })
                 }
                 CardQueue::New => None,
@@ -249,6 +252,7 @@ impl Card {
                         last_date: 0.0,
                         due: 0.0,
                         interval: card.interval as f32,
+                        lapses: card.lapses
                     })
                 }
                 CardQueue::PreviewRepeat => None,
diff --git a/ts/routes/deck-options/SimulatorModal.svelte b/ts/routes/deck-options/SimulatorModal.svelte
index 6bb30620c53..84b314e906c 100644
--- a/ts/routes/deck-options/SimulatorModal.svelte
+++ b/ts/routes/deck-options/SimulatorModal.svelte
@@ -28,6 +28,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import SpinBoxFloatRow from "./SpinBoxFloatRow.svelte";
     import { reviewOrderChoices } from "./choices";
     import EnumSelectorRow from "$lib/components/EnumSelectorRow.svelte";
+    import { DeckConfig_Config_LeechAction } from "@generated/anki/deck_config_pb";
 
     export let shown = false;
     export let state: DeckOptionsState;
@@ -48,6 +49,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     let points: Point[] = [];
     const newCardsIgnoreReviewLimit = state.newCardsIgnoreReviewLimit;
     let smooth = true;
+    let suspendLeeches = $config.leechAction == DeckConfig_Config_LeechAction.SUSPEND;
 
     $: daysToSimulate = 365;
     $: deckSize = 0;
@@ -75,6 +77,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         let resp: SimulateFsrsReviewResponse | undefined;
         simulateFsrsRequest.daysToSimulate = daysToSimulate;
         simulateFsrsRequest.deckSize = deckSize;
+        simulateFsrsRequest.suspendAfterLapseCount = suspendLeeches ? $config.leechThreshold : undefined
         try {
             await runWithBackendProgress(
                 async () => {
@@ -271,6 +274,12 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                     </SettingTitle>
                 </SwitchRow>
 
+                <SwitchRow bind:value={suspendLeeches} defaultValue={suspendLeeches}>
+                    <SettingTitle on:click={() => openHelpModal("simulateFsrsReview")}>
+                        {"Suspend Leeches"}
+                    </SettingTitle>
+                </SwitchRow>
+
                 <button
                     class="btn {computing ? 'btn-warning' : 'btn-primary'}"
                     disabled={computing}

From c0abc5537ce6494a5f4d32b616df27b9a639d4a4 Mon Sep 17 00:00:00 2001
From: Luc Mcgrady <lucmcgrady@gmail.com>
Date: Sun, 23 Feb 2025 15:12:06 +0000
Subject: [PATCH 02/16] Added: leech threshold spin box

---
 ts/routes/deck-options/SimulatorModal.svelte | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/ts/routes/deck-options/SimulatorModal.svelte b/ts/routes/deck-options/SimulatorModal.svelte
index 84b314e906c..595441d3a61 100644
--- a/ts/routes/deck-options/SimulatorModal.svelte
+++ b/ts/routes/deck-options/SimulatorModal.svelte
@@ -50,6 +50,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     const newCardsIgnoreReviewLimit = state.newCardsIgnoreReviewLimit;
     let smooth = true;
     let suspendLeeches = $config.leechAction == DeckConfig_Config_LeechAction.SUSPEND;
+    let leechThreshold = $config.leechThreshold
 
     $: daysToSimulate = 365;
     $: deckSize = 0;
@@ -77,7 +78,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         let resp: SimulateFsrsReviewResponse | undefined;
         simulateFsrsRequest.daysToSimulate = daysToSimulate;
         simulateFsrsRequest.deckSize = deckSize;
-        simulateFsrsRequest.suspendAfterLapseCount = suspendLeeches ? $config.leechThreshold : undefined
+        simulateFsrsRequest.suspendAfterLapseCount = suspendLeeches ? leechThreshold : undefined
         try {
             await runWithBackendProgress(
                 async () => {
@@ -274,12 +275,25 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                     </SettingTitle>
                 </SwitchRow>
 
-                <SwitchRow bind:value={suspendLeeches} defaultValue={suspendLeeches}>
+                <SwitchRow bind:value={suspendLeeches} defaultValue={$config.leechAction == DeckConfig_Config_LeechAction.SUSPEND}>
                     <SettingTitle on:click={() => openHelpModal("simulateFsrsReview")}>
                         {"Suspend Leeches"}
                     </SettingTitle>
                 </SwitchRow>
 
+                {#if suspendLeeches}                    
+                    <SpinBoxRow
+                        bind:value={leechThreshold}
+                        defaultValue={$config.leechThreshold}
+                        min={1}
+                        max={9999}
+                    >
+                        <SettingTitle on:click={() => openHelpModal("simulateFsrsReview")}>
+                            {tr.schedulingLeechThreshold()}
+                        </SettingTitle>
+                    </SpinBoxRow>
+                {/if}
+
                 <button
                     class="btn {computing ? 'btn-warning' : 'btn-primary'}"
                     disabled={computing}

From abff38b025b8bc692134c5caaa0d4c4d6f10c1e2 Mon Sep 17 00:00:00 2001
From: Luc Mcgrady <lucmcgrady@gmail.com>
Date: Thu, 27 Feb 2025 09:50:01 +0000
Subject: [PATCH 03/16] Update git rev

---
 Cargo.lock | 2 +-
 Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 63078a33435..b52c6d47641 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2099,7 +2099,7 @@ dependencies = [
 [[package]]
 name = "fsrs"
 version = "3.0.0"
-source = "git+https://github.com/open-spaced-repetition/fsrs-rs.git?rev=96520531415e032781adfe212f8a5eed216006be#96520531415e032781adfe212f8a5eed216006be"
+source = "git+https://github.com/open-spaced-repetition/fsrs-rs.git?rev=034ca9dabe1d429f157b31fa2a97d1156e770816#034ca9dabe1d429f157b31fa2a97d1156e770816"
 dependencies = [
  "burn",
  "itertools 0.12.1",
diff --git a/Cargo.toml b/Cargo.toml
index 6bd0c35e183..a1a3be2d5dc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,7 +37,7 @@ rev = "184b2ca50ed39ca43da13f0b830a463861adb9ca"
 [workspace.dependencies.fsrs]
 # version = "=2.0.3"
 git = "https://github.com/open-spaced-repetition/fsrs-rs.git"
-rev = "96520531415e032781adfe212f8a5eed216006be"
+rev = "034ca9dabe1d429f157b31fa2a97d1156e770816"
 # path = "../open-spaced-repetition/fsrs-rs"
 
 [workspace.dependencies]

From 914cd1e78e66fbbfe8e43d3fd138b021afeb2e30 Mon Sep 17 00:00:00 2001
From: Luc Mcgrady <lucmcgrady@gmail.com>
Date: Thu, 27 Feb 2025 09:54:56 +0000
Subject: [PATCH 04/16] Added: Save to preset options

---
 ts/routes/deck-options/SimulatorModal.svelte | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ts/routes/deck-options/SimulatorModal.svelte b/ts/routes/deck-options/SimulatorModal.svelte
index 595441d3a61..320c6e8a40e 100644
--- a/ts/routes/deck-options/SimulatorModal.svelte
+++ b/ts/routes/deck-options/SimulatorModal.svelte
@@ -321,6 +321,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                         $newCardsIgnoreReviewLimit =
                             simulateFsrsRequest.newCardsIgnoreReviewLimit;
                         $config.reviewOrder = simulateFsrsRequest.reviewOrder;
+                        $config.leechAction = suspendLeeches ?  DeckConfig_Config_LeechAction.SUSPEND :  DeckConfig_Config_LeechAction.TAG_ONLY;
+                        $config.leechThreshold = leechThreshold;
                         onPresetChange();
                     }}
                 >

From 87664828ae5f82a3a34626c32c46cf50b216eb53 Mon Sep 17 00:00:00 2001
From: Luc Mcgrady <lucmcgrady@gmail.com>
Date: Thu, 27 Feb 2025 09:59:28 +0000
Subject: [PATCH 05/16] ./check

---
 rslib/src/scheduler/fsrs/simulator.rs        |  6 +++---
 ts/routes/deck-options/SimulatorModal.svelte | 22 ++++++++++++++------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/rslib/src/scheduler/fsrs/simulator.rs b/rslib/src/scheduler/fsrs/simulator.rs
index 2da5097b95c..96b234f1857 100644
--- a/rslib/src/scheduler/fsrs/simulator.rs
+++ b/rslib/src/scheduler/fsrs/simulator.rs
@@ -147,7 +147,7 @@ impl Collection {
                 last_date: f32::NEG_INFINITY, // Treated as a new card in simulation
                 due: ((introduced_today_count + i) / req.new_limit as usize) as f32,
                 interval: f32::NEG_INFINITY,
-                lapses: 0
+                lapses: 0,
             });
             converted_cards.extend(new_cards);
         }
@@ -241,7 +241,7 @@ impl Card {
                         last_date,
                         due: relative_due as f32,
                         interval: card.interval as f32,
-                        lapses: card.lapses
+                        lapses: card.lapses,
                     })
                 }
                 CardQueue::New => None,
@@ -252,7 +252,7 @@ impl Card {
                         last_date: 0.0,
                         due: 0.0,
                         interval: card.interval as f32,
-                        lapses: card.lapses
+                        lapses: card.lapses,
                     })
                 }
                 CardQueue::PreviewRepeat => None,
diff --git a/ts/routes/deck-options/SimulatorModal.svelte b/ts/routes/deck-options/SimulatorModal.svelte
index 320c6e8a40e..cda196987c9 100644
--- a/ts/routes/deck-options/SimulatorModal.svelte
+++ b/ts/routes/deck-options/SimulatorModal.svelte
@@ -50,7 +50,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     const newCardsIgnoreReviewLimit = state.newCardsIgnoreReviewLimit;
     let smooth = true;
     let suspendLeeches = $config.leechAction == DeckConfig_Config_LeechAction.SUSPEND;
-    let leechThreshold = $config.leechThreshold
+    let leechThreshold = $config.leechThreshold;
 
     $: daysToSimulate = 365;
     $: deckSize = 0;
@@ -78,7 +78,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         let resp: SimulateFsrsReviewResponse | undefined;
         simulateFsrsRequest.daysToSimulate = daysToSimulate;
         simulateFsrsRequest.deckSize = deckSize;
-        simulateFsrsRequest.suspendAfterLapseCount = suspendLeeches ? leechThreshold : undefined
+        simulateFsrsRequest.suspendAfterLapseCount = suspendLeeches
+            ? leechThreshold
+            : undefined;
         try {
             await runWithBackendProgress(
                 async () => {
@@ -275,20 +277,26 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                     </SettingTitle>
                 </SwitchRow>
 
-                <SwitchRow bind:value={suspendLeeches} defaultValue={$config.leechAction == DeckConfig_Config_LeechAction.SUSPEND}>
+                <SwitchRow
+                    bind:value={suspendLeeches}
+                    defaultValue={$config.leechAction ==
+                        DeckConfig_Config_LeechAction.SUSPEND}
+                >
                     <SettingTitle on:click={() => openHelpModal("simulateFsrsReview")}>
                         {"Suspend Leeches"}
                     </SettingTitle>
                 </SwitchRow>
 
-                {#if suspendLeeches}                    
+                {#if suspendLeeches}
                     <SpinBoxRow
                         bind:value={leechThreshold}
                         defaultValue={$config.leechThreshold}
                         min={1}
                         max={9999}
                     >
-                        <SettingTitle on:click={() => openHelpModal("simulateFsrsReview")}>
+                        <SettingTitle
+                            on:click={() => openHelpModal("simulateFsrsReview")}
+                        >
                             {tr.schedulingLeechThreshold()}
                         </SettingTitle>
                     </SpinBoxRow>
@@ -321,7 +329,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                         $newCardsIgnoreReviewLimit =
                             simulateFsrsRequest.newCardsIgnoreReviewLimit;
                         $config.reviewOrder = simulateFsrsRequest.reviewOrder;
-                        $config.leechAction = suspendLeeches ?  DeckConfig_Config_LeechAction.SUSPEND :  DeckConfig_Config_LeechAction.TAG_ONLY;
+                        $config.leechAction = suspendLeeches
+                            ? DeckConfig_Config_LeechAction.SUSPEND
+                            : DeckConfig_Config_LeechAction.TAG_ONLY;
                         $config.leechThreshold = leechThreshold;
                         onPresetChange();
                     }}

From c08af64537adaf00c982a10b4e6a2fa2b965bdf2 Mon Sep 17 00:00:00 2001
From: Luc Mcgrady <lucmcgrady@gmail.com>
Date: Thu, 27 Feb 2025 14:08:53 +0000
Subject: [PATCH 06/16] Added: "Advanced settings" dropdown

---
 ts/routes/deck-options/SimulatorModal.svelte | 126 +++++++++++--------
 1 file changed, 75 insertions(+), 51 deletions(-)

diff --git a/ts/routes/deck-options/SimulatorModal.svelte b/ts/routes/deck-options/SimulatorModal.svelte
index cda196987c9..165250519d9 100644
--- a/ts/routes/deck-options/SimulatorModal.svelte
+++ b/ts/routes/deck-options/SimulatorModal.svelte
@@ -241,66 +241,81 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                     </SettingTitle>
                 </SpinBoxRow>
 
-                <SpinBoxRow
-                    bind:value={simulateFsrsRequest.maxInterval}
-                    defaultValue={$config.maximumReviewInterval}
-                    min={1}
-                    max={36500}
-                >
-                    <SettingTitle on:click={() => openHelpModal("simulateFsrsReview")}>
-                        {tr.schedulingMaximumInterval()}
-                    </SettingTitle>
-                </SpinBoxRow>
-
-                <EnumSelectorRow
-                    bind:value={simulateFsrsRequest.reviewOrder}
-                    defaultValue={$config.reviewOrder}
-                    choices={reviewOrderChoices($fsrs)}
-                >
-                    <SettingTitle on:click={() => openHelpModal("simulateFsrsReview")}>
-                        {tr.deckConfigReviewSortOrder()}
-                    </SettingTitle>
-                </EnumSelectorRow>
+                <details>
+                    <summary>{"Advanced settings"}</summary>
+                    <SpinBoxRow
+                        bind:value={simulateFsrsRequest.maxInterval}
+                        defaultValue={$config.maximumReviewInterval}
+                        min={1}
+                        max={36500}
+                    >
+                        <SettingTitle
+                            on:click={() => openHelpModal("simulateFsrsReview")}
+                        >
+                            {tr.schedulingMaximumInterval()}
+                        </SettingTitle>
+                    </SpinBoxRow>
 
-                <SwitchRow
-                    bind:value={simulateFsrsRequest.newCardsIgnoreReviewLimit}
-                    defaultValue={$newCardsIgnoreReviewLimit}
-                >
-                    <SettingTitle on:click={() => openHelpModal("simulateFsrsReview")}>
-                        <GlobalLabel title={tr.deckConfigNewCardsIgnoreReviewLimit()} />
-                    </SettingTitle>
-                </SwitchRow>
+                    <EnumSelectorRow
+                        bind:value={simulateFsrsRequest.reviewOrder}
+                        defaultValue={$config.reviewOrder}
+                        choices={reviewOrderChoices($fsrs)}
+                    >
+                        <SettingTitle
+                            on:click={() => openHelpModal("simulateFsrsReview")}
+                        >
+                            {tr.deckConfigReviewSortOrder()}
+                        </SettingTitle>
+                    </EnumSelectorRow>
 
-                <SwitchRow bind:value={smooth} defaultValue={true}>
-                    <SettingTitle on:click={() => openHelpModal("simulateFsrsReview")}>
-                        {"Smooth Graph"}
-                    </SettingTitle>
-                </SwitchRow>
+                    <SwitchRow
+                        bind:value={simulateFsrsRequest.newCardsIgnoreReviewLimit}
+                        defaultValue={$newCardsIgnoreReviewLimit}
+                    >
+                        <SettingTitle
+                            on:click={() => openHelpModal("simulateFsrsReview")}
+                        >
+                            <GlobalLabel
+                                title={tr.deckConfigNewCardsIgnoreReviewLimit()}
+                            />
+                        </SettingTitle>
+                    </SwitchRow>
 
-                <SwitchRow
-                    bind:value={suspendLeeches}
-                    defaultValue={$config.leechAction ==
-                        DeckConfig_Config_LeechAction.SUSPEND}
-                >
-                    <SettingTitle on:click={() => openHelpModal("simulateFsrsReview")}>
-                        {"Suspend Leeches"}
-                    </SettingTitle>
-                </SwitchRow>
+                    <SwitchRow bind:value={smooth} defaultValue={true}>
+                        <SettingTitle
+                            on:click={() => openHelpModal("simulateFsrsReview")}
+                        >
+                            {"Smooth Graph"}
+                        </SettingTitle>
+                    </SwitchRow>
 
-                {#if suspendLeeches}
-                    <SpinBoxRow
-                        bind:value={leechThreshold}
-                        defaultValue={$config.leechThreshold}
-                        min={1}
-                        max={9999}
+                    <SwitchRow
+                        bind:value={suspendLeeches}
+                        defaultValue={$config.leechAction ==
+                            DeckConfig_Config_LeechAction.SUSPEND}
                     >
                         <SettingTitle
                             on:click={() => openHelpModal("simulateFsrsReview")}
                         >
-                            {tr.schedulingLeechThreshold()}
+                            {"Suspend Leeches"}
                         </SettingTitle>
-                    </SpinBoxRow>
-                {/if}
+                    </SwitchRow>
+
+                    {#if suspendLeeches}
+                        <SpinBoxRow
+                            bind:value={leechThreshold}
+                            defaultValue={$config.leechThreshold}
+                            min={1}
+                            max={9999}
+                        >
+                            <SettingTitle
+                                on:click={() => openHelpModal("simulateFsrsReview")}
+                            >
+                                {tr.schedulingLeechThreshold()}
+                            </SettingTitle>
+                        </SpinBoxRow>
+                    {/if}
+                </details>
 
                 <button
                     class="btn {computing ? 'btn-warning' : 'btn-primary'}"
@@ -407,4 +422,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     .btn {
         margin-bottom: 0.375rem;
     }
+
+    details {
+        margin-bottom: 1em;
+        padding-left: 1em;
+    }
+
+    summary {
+        margin-bottom: 0.5em;
+    }
 </style>

From f95023a31b6b320fb98f23ef54d619a1585d4c04 Mon Sep 17 00:00:00 2001
From: Luc Mcgrady <lucmcgrady@gmail.com>
Date: Thu, 27 Feb 2025 14:33:49 +0000
Subject: [PATCH 07/16] Removed: Indent

---
 ts/routes/deck-options/SimulatorModal.svelte | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ts/routes/deck-options/SimulatorModal.svelte b/ts/routes/deck-options/SimulatorModal.svelte
index 165250519d9..0278dcef2a0 100644
--- a/ts/routes/deck-options/SimulatorModal.svelte
+++ b/ts/routes/deck-options/SimulatorModal.svelte
@@ -425,7 +425,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     details {
         margin-bottom: 1em;
-        padding-left: 1em;
     }
 
     summary {

From a978353b7065eef844755945b6e622ad454c2354 Mon Sep 17 00:00:00 2001
From: Luc Mcgrady <lucmcgrady@gmail.com>
Date: Fri, 28 Feb 2025 12:08:18 +0000
Subject: [PATCH 08/16] Added: Easy days

---
 ts/routes/deck-options/EasyDays.svelte       | 82 +-----------------
 ts/routes/deck-options/EasyDaysInput.svelte  | 91 ++++++++++++++++++++
 ts/routes/deck-options/SimulatorModal.svelte | 15 ++++
 3 files changed, 108 insertions(+), 80 deletions(-)
 create mode 100644 ts/routes/deck-options/EasyDaysInput.svelte

diff --git a/ts/routes/deck-options/EasyDays.svelte b/ts/routes/deck-options/EasyDays.svelte
index aea4e026e04..e1fe4507d67 100644
--- a/ts/routes/deck-options/EasyDays.svelte
+++ b/ts/routes/deck-options/EasyDays.svelte
@@ -9,6 +9,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import TitledContainer from "$lib/components/TitledContainer.svelte";
     import type { DeckOptionsState } from "./lib";
     import Warning from "./Warning.svelte";
+    import EasyDaysInput from "./EasyDaysInput.svelte";
 
     export let state: DeckOptionsState;
     export let api: Record<string, never>;
@@ -35,16 +36,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         easyDaysChanged && !($fsrsEnabled && $reschedule)
             ? tr.deckConfigEasyDaysChange()
             : "";
-
-    const easyDays = [
-        tr.deckConfigEasyDaysMonday(),
-        tr.deckConfigEasyDaysTuesday(),
-        tr.deckConfigEasyDaysWednesday(),
-        tr.deckConfigEasyDaysThursday(),
-        tr.deckConfigEasyDaysFriday(),
-        tr.deckConfigEasyDaysSaturday(),
-        tr.deckConfigEasyDaysSunday(),
-    ];
 </script>
 
 <datalist id="easy_day_steplist">
@@ -53,43 +44,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 <TitledContainer title={tr.deckConfigEasyDaysTitle()}>
     <DynamicallySlottable slotHost={Item} {api}>
-        <Item>
-            <div class="easy-days-settings">
-                <table>
-                    <thead>
-                        <tr>
-                            <th></th>
-                            <th class="header min-col">
-                                <span>{tr.deckConfigEasyDaysMinimum()}</span>
-                            </th>
-                            <th class="header text-center">
-                                <span>{tr.deckConfigEasyDaysReduced()}</span>
-                            </th>
-                            <th class="header normal-col">
-                                <span>{tr.deckConfigEasyDaysNormal()}</span>
-                            </th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {#each easyDays as day, index}
-                            <tr>
-                                <td class="day">{day}</td>
-                                <td colspan="3">
-                                    <input
-                                        type="range"
-                                        bind:value={$config.easyDaysPercentages[index]}
-                                        step={0.5}
-                                        max={1.0}
-                                        min={0.0}
-                                        list="easy_day_steplist"
-                                    />
-                                </td>
-                            </tr>
-                        {/each}
-                    </tbody>
-                </table>
-            </div>
-        </Item>
+        <EasyDaysInput bind:values={$config.easyDaysPercentages} />
         <Item>
             <Warning warning={noNormalDay} />
         </Item>
@@ -98,36 +53,3 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         </Item>
     </DynamicallySlottable>
 </TitledContainer>
-
-<style>
-    .easy-days-settings table {
-        width: 100%;
-        border-collapse: collapse;
-        table-layout: fixed;
-    }
-    .easy-days-settings th,
-    .easy-days-settings td {
-        padding: 8px;
-        border-bottom: var(--border) solid 1px;
-    }
-    .header {
-        word-wrap: break-word;
-        font-size: smaller;
-    }
-    .easy-days-settings input[type="range"] {
-        width: 100%;
-    }
-
-    .day {
-        word-wrap: break-word;
-        font-size: smaller;
-    }
-
-    .min-col {
-        text-align: start;
-    }
-
-    .normal-col {
-        text-align: end;
-    }
-</style>
diff --git a/ts/routes/deck-options/EasyDaysInput.svelte b/ts/routes/deck-options/EasyDaysInput.svelte
new file mode 100644
index 00000000000..a7c13e2e211
--- /dev/null
+++ b/ts/routes/deck-options/EasyDaysInput.svelte
@@ -0,0 +1,91 @@
+<!--
+Copyright: Ankitects Pty Ltd and contributors
+License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+-->
+<script>
+    import * as tr from "@generated/ftl";
+    import Item from "$lib/components/Item.svelte";
+
+    const easyDays = [
+        tr.deckConfigEasyDaysMonday(),
+        tr.deckConfigEasyDaysTuesday(),
+        tr.deckConfigEasyDaysWednesday(),
+        tr.deckConfigEasyDaysThursday(),
+        tr.deckConfigEasyDaysFriday(),
+        tr.deckConfigEasyDaysSaturday(),
+        tr.deckConfigEasyDaysSunday(),
+    ];
+
+    export let values = [0, 0, 0, 0, 0, 0, 0];
+</script>
+
+<Item>
+    <div class="easy-days-settings">
+        <table>
+            <thead>
+                <tr>
+                    <th></th>
+                    <th class="header min-col">
+                        <span>{tr.deckConfigEasyDaysMinimum()}</span>
+                    </th>
+                    <th class="header text-center">
+                        <span>{tr.deckConfigEasyDaysReduced()}</span>
+                    </th>
+                    <th class="header normal-col">
+                        <span>{tr.deckConfigEasyDaysNormal()}</span>
+                    </th>
+                </tr>
+            </thead>
+            <tbody>
+                {#each easyDays as day, index}
+                    <tr>
+                        <td class="day">{day}</td>
+                        <td colspan="3">
+                            <input
+                                type="range"
+                                bind:value={values[index]}
+                                step={0.5}
+                                max={1.0}
+                                min={0.0}
+                                list="easy_day_steplist"
+                            />
+                        </td>
+                    </tr>
+                {/each}
+            </tbody>
+        </table>
+    </div>
+</Item>
+
+<style>
+    .easy-days-settings table {
+        width: 100%;
+        border-collapse: collapse;
+        table-layout: fixed;
+    }
+    .easy-days-settings th,
+    .easy-days-settings td {
+        padding: 8px;
+        border-bottom: var(--border) solid 1px;
+    }
+    .header {
+        word-wrap: break-word;
+        font-size: smaller;
+    }
+    .easy-days-settings input[type="range"] {
+        width: 100%;
+    }
+
+    .day {
+        word-wrap: break-word;
+        font-size: smaller;
+    }
+
+    .min-col {
+        text-align: start;
+    }
+
+    .normal-col {
+        text-align: end;
+    }
+</style>
diff --git a/ts/routes/deck-options/SimulatorModal.svelte b/ts/routes/deck-options/SimulatorModal.svelte
index 0278dcef2a0..590311ad4fd 100644
--- a/ts/routes/deck-options/SimulatorModal.svelte
+++ b/ts/routes/deck-options/SimulatorModal.svelte
@@ -29,6 +29,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { reviewOrderChoices } from "./choices";
     import EnumSelectorRow from "$lib/components/EnumSelectorRow.svelte";
     import { DeckConfig_Config_LeechAction } from "@generated/anki/deck_config_pb";
+    import EasyDaysInput from "./EasyDaysInput.svelte";
 
     export let shown = false;
     export let state: DeckOptionsState;
@@ -81,6 +82,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         simulateFsrsRequest.suspendAfterLapseCount = suspendLeeches
             ? leechThreshold
             : undefined;
+        simulateFsrsRequest.easyDaysPercentages = easyDayPercentages;
         try {
             await runWithBackendProgress(
                 async () => {
@@ -175,6 +177,11 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             simulateSubgraph,
         );
     }
+
+    let easyDayPercentages = [...$config.easyDaysPercentages];
+    config.subscribe(($config) => {
+        easyDayPercentages = [...$config.easyDaysPercentages];
+    });
 </script>
 
 <div class="modal" class:show={shown} class:d-block={shown} tabindex="-1">
@@ -315,6 +322,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                             </SettingTitle>
                         </SpinBoxRow>
                     {/if}
+
+                    <details>
+                        <summary>{tr.deckConfigEasyDaysTitle()}</summary>
+                        {#key easyDayPercentages}
+                            <EasyDaysInput bind:values={easyDayPercentages} />
+                        {/key}
+                    </details>
                 </details>
 
                 <button
@@ -348,6 +362,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                             ? DeckConfig_Config_LeechAction.SUSPEND
                             : DeckConfig_Config_LeechAction.TAG_ONLY;
                         $config.leechThreshold = leechThreshold;
+                        $config.easyDaysPercentages = [...easyDayPercentages];
                         onPresetChange();
                     }}
                 >

From 4479ea2238e4680d7e4f88e126504b66fe44e103 Mon Sep 17 00:00:00 2001
From: Luc Mcgrady <lucmcgrady@gmail.com>
Date: Fri, 28 Feb 2025 12:17:52 +0000
Subject: [PATCH 09/16] Added: Sticky header

---
 ts/routes/deck-options/SimulatorModal.svelte | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ts/routes/deck-options/SimulatorModal.svelte b/ts/routes/deck-options/SimulatorModal.svelte
index 590311ad4fd..90efb13d4bf 100644
--- a/ts/routes/deck-options/SimulatorModal.svelte
+++ b/ts/routes/deck-options/SimulatorModal.svelte
@@ -426,6 +426,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         background-color: rgba(0, 0, 0, 0.5);
     }
 
+    .modal-header {
+        position: sticky;
+        top: 0;
+        background-color: var(--bs-body-bg);
+        z-index: 100;
+    }
+
     :global(.modal-xl) {
         max-width: 100vw;
     }

From 8086edca5e19f8d02cf97072d4c3453142fd2bdd Mon Sep 17 00:00:00 2001
From: Luc Mcgrady <lucmcgrady@gmail.com>
Date: Fri, 28 Feb 2025 12:28:53 +0000
Subject: [PATCH 10/16] Removed: Easy Day updating without saving

---
 ts/routes/deck-options/SimulatorModal.svelte | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ts/routes/deck-options/SimulatorModal.svelte b/ts/routes/deck-options/SimulatorModal.svelte
index 90efb13d4bf..c2f3178b765 100644
--- a/ts/routes/deck-options/SimulatorModal.svelte
+++ b/ts/routes/deck-options/SimulatorModal.svelte
@@ -179,9 +179,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     }
 
     let easyDayPercentages = [...$config.easyDaysPercentages];
-    config.subscribe(($config) => {
-        easyDayPercentages = [...$config.easyDaysPercentages];
-    });
 </script>
 
 <div class="modal" class:show={shown} class:d-block={shown} tabindex="-1">

From 14dc2885e02bcecaa783095171337a78d66b6d64 Mon Sep 17 00:00:00 2001
From: Luc Mcgrady <lucmcgrady@gmail.com>
Date: Mon, 10 Mar 2025 13:49:50 +0000
Subject: [PATCH 11/16] un-nest disclosure

---
 ts/routes/deck-options/SimulatorModal.svelte | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/ts/routes/deck-options/SimulatorModal.svelte b/ts/routes/deck-options/SimulatorModal.svelte
index c2f3178b765..429d59402f1 100644
--- a/ts/routes/deck-options/SimulatorModal.svelte
+++ b/ts/routes/deck-options/SimulatorModal.svelte
@@ -319,13 +319,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                             </SettingTitle>
                         </SpinBoxRow>
                     {/if}
+                </details>
 
-                    <details>
-                        <summary>{tr.deckConfigEasyDaysTitle()}</summary>
-                        {#key easyDayPercentages}
-                            <EasyDaysInput bind:values={easyDayPercentages} />
-                        {/key}
-                    </details>
+                <details>
+                    <summary>{tr.deckConfigEasyDaysTitle()}</summary>
+                    {#key easyDayPercentages}
+                        <EasyDaysInput bind:values={easyDayPercentages} />
+                    {/key}
                 </details>
 
                 <button
@@ -442,10 +442,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         margin-bottom: 0.375rem;
     }
 
-    details {
-        margin-bottom: 1em;
-    }
-
     summary {
         margin-bottom: 0.5em;
     }

From ed31e7381decb8f9e51517cb75a54e7f6b7df9bf Mon Sep 17 00:00:00 2001
From: Luc Mcgrady <lucmcgrady@gmail.com>
Date: Thu, 13 Mar 2025 14:16:47 +0000
Subject: [PATCH 12/16] bump fsrs

---
 Cargo.lock                            | 2 +-
 Cargo.toml                            | 2 +-
 rslib/src/scheduler/fsrs/retention.rs | 4 ++--
 rslib/src/scheduler/fsrs/simulator.rs | 7 +++++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b52c6d47641..4e65ccf08d6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2099,7 +2099,7 @@ dependencies = [
 [[package]]
 name = "fsrs"
 version = "3.0.0"
-source = "git+https://github.com/open-spaced-repetition/fsrs-rs.git?rev=034ca9dabe1d429f157b31fa2a97d1156e770816#034ca9dabe1d429f157b31fa2a97d1156e770816"
+source = "git+https://github.com/open-spaced-repetition/fsrs-rs.git?rev=f7a746306b5d98712705912d8e0a8846cfb113b2#f7a746306b5d98712705912d8e0a8846cfb113b2"
 dependencies = [
  "burn",
  "itertools 0.12.1",
diff --git a/Cargo.toml b/Cargo.toml
index a1a3be2d5dc..41374092374 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,7 +37,7 @@ rev = "184b2ca50ed39ca43da13f0b830a463861adb9ca"
 [workspace.dependencies.fsrs]
 # version = "=2.0.3"
 git = "https://github.com/open-spaced-repetition/fsrs-rs.git"
-rev = "034ca9dabe1d429f157b31fa2a97d1156e770816"
+rev = "f7a746306b5d98712705912d8e0a8846cfb113b2"
 # path = "../open-spaced-repetition/fsrs-rs"
 
 [workspace.dependencies]
diff --git a/rslib/src/scheduler/fsrs/retention.rs b/rslib/src/scheduler/fsrs/retention.rs
index 45980e266eb..23df5b33a1e 100644
--- a/rslib/src/scheduler/fsrs/retention.rs
+++ b/rslib/src/scheduler/fsrs/retention.rs
@@ -44,9 +44,9 @@ impl Collection {
         let post_scheduling_fn: Option<PostSchedulingFn> =
             if self.get_config_bool(BoolKey::LoadBalancerEnabled) {
                 Some(PostSchedulingFn(Arc::new(
-                    move |interval, max_interval, today, due_cnt_per_day, rng| {
+                    move |card, max_interval, today, due_cnt_per_day, rng| {
                         apply_load_balance_and_easy_days(
-                            interval,
+                            card.interval,
                             max_interval,
                             today,
                             due_cnt_per_day,
diff --git a/rslib/src/scheduler/fsrs/simulator.rs b/rslib/src/scheduler/fsrs/simulator.rs
index 96b234f1857..87c84e73ebc 100644
--- a/rslib/src/scheduler/fsrs/simulator.rs
+++ b/rslib/src/scheduler/fsrs/simulator.rs
@@ -142,6 +142,7 @@ impl Collection {
             .min(req.new_limit as usize);
         if req.new_limit > 0 {
             let new_cards = (0..new_cards).map(|i| fsrs::Card {
+                id: -(i as i32),
                 difficulty: f32::NEG_INFINITY,
                 stability: 1e-8,              // Not filtered by fsrs-rs
                 last_date: f32::NEG_INFINITY, // Treated as a new card in simulation
@@ -160,9 +161,9 @@ impl Collection {
         let post_scheduling_fn: Option<PostSchedulingFn> =
             if self.get_config_bool(BoolKey::LoadBalancerEnabled) {
                 Some(PostSchedulingFn(Arc::new(
-                    move |interval, max_interval, today, due_cnt_per_day, rng| {
+                    move |card, max_interval, today, due_cnt_per_day, rng| {
                         apply_load_balance_and_easy_days(
-                            interval,
+                            card.interval,
                             max_interval,
                             today,
                             due_cnt_per_day,
@@ -236,6 +237,7 @@ impl Card {
                     let relative_due = due - days_elapsed;
                     let last_date = (relative_due - card.interval as i32).min(0) as f32;
                     Some(fsrs::Card {
+                        id: card.id.0 as i32,
                         difficulty: state.difficulty,
                         stability: state.stability,
                         last_date,
@@ -247,6 +249,7 @@ impl Card {
                 CardQueue::New => None,
                 CardQueue::Learn | CardQueue::SchedBuried | CardQueue::UserBuried => {
                     Some(fsrs::Card {
+                        id: card.id.0 as i32,
                         difficulty: state.difficulty,
                         stability: state.stability,
                         last_date: 0.0,

From c3e0717e2680eed0a50bc617191701a3f88caf2f Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Fri, 14 Mar 2025 13:44:10 +0700
Subject: [PATCH 13/16] Update a VSCode setting to match recent releases

---
 .vscode.dist/settings.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vscode.dist/settings.json b/.vscode.dist/settings.json
index a3338ec6462..690b5bda024 100644
--- a/.vscode.dist/settings.json
+++ b/.vscode.dist/settings.json
@@ -2,7 +2,7 @@
     "editor.formatOnSave": true,
     "[python]": {
         "editor.codeActionsOnSave": {
-            "source.organizeImports": true
+            "source.organizeImports": "explicit"
         }
     },
     "files.watcherExclude": {

From 1f2562d662d1670f6f744ef0bac45c4d66af10d0 Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Fri, 14 Mar 2025 13:44:29 +0700
Subject: [PATCH 14/16] Move Easy Days above the Advanced settings

I think it's a bit more logical to have Advanced come last.
---
 ts/routes/deck-options/SimulatorModal.svelte | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ts/routes/deck-options/SimulatorModal.svelte b/ts/routes/deck-options/SimulatorModal.svelte
index 429d59402f1..1f40437c55a 100644
--- a/ts/routes/deck-options/SimulatorModal.svelte
+++ b/ts/routes/deck-options/SimulatorModal.svelte
@@ -245,6 +245,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                     </SettingTitle>
                 </SpinBoxRow>
 
+                <details>
+                    <summary>{tr.deckConfigEasyDaysTitle()}</summary>
+                    {#key easyDayPercentages}
+                        <EasyDaysInput bind:values={easyDayPercentages} />
+                    {/key}
+                </details>
+
                 <details>
                     <summary>{"Advanced settings"}</summary>
                     <SpinBoxRow
@@ -321,13 +328,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                     {/if}
                 </details>
 
-                <details>
-                    <summary>{tr.deckConfigEasyDaysTitle()}</summary>
-                    {#key easyDayPercentages}
-                        <EasyDaysInput bind:values={easyDayPercentages} />
-                    {/key}
-                </details>
-
                 <button
                     class="btn {computing ? 'btn-warning' : 'btn-primary'}"
                     disabled={computing}

From f37206a5ef63c83584e7bd7f206ba4f4efe7936a Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Fri, 14 Mar 2025 14:44:26 +0700
Subject: [PATCH 15/16] Ensure graph fits inside screen height

---
 ts/routes/deck-options/SimulatorModal.svelte | 34 ++++++++++++++------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/ts/routes/deck-options/SimulatorModal.svelte b/ts/routes/deck-options/SimulatorModal.svelte
index 1f40437c55a..1b587c98540 100644
--- a/ts/routes/deck-options/SimulatorModal.svelte
+++ b/ts/routes/deck-options/SimulatorModal.svelte
@@ -401,15 +401,17 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                         </InputBox>
                     </div>
 
-                    <svg
-                        bind:this={svg}
-                        viewBox={`0 0 ${bounds.width} ${bounds.height}`}
-                    >
-                        <CumulativeOverlay />
-                        <HoverColumns />
-                        <AxisTicks {bounds} />
-                        <NoDataOverlay {bounds} />
-                    </svg>
+                    <div class="svg-container">
+                        <svg
+                            bind:this={svg}
+                            viewBox={`0 0 ${bounds.width} ${bounds.height}`}
+                        >
+                            <CumulativeOverlay />
+                            <HoverColumns />
+                            <AxisTicks {bounds} />
+                            <NoDataOverlay {bounds} />
+                        </svg>
+                    </div>
 
                     <TableData {tableData} />
                 </Graph>
@@ -421,6 +423,20 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 <style>
     .modal {
         background-color: rgba(0, 0, 0, 0.5);
+        --bs-modal-margin: 0;
+    }
+
+    .svg-container {
+        width: 100%;
+        max-height: calc(100vh - 400px); /* Account for modal header, controls, etc */
+        aspect-ratio: 600 / 250;
+        display: flex;
+        align-items: center;
+    }
+
+    svg {
+        width: 100%;
+        height: 100%;
     }
 
     .modal-header {

From 0cb768293bfd0eb934cd641e318a2c6836c9380b Mon Sep 17 00:00:00 2001
From: Luc Mcgrady <lucmcgrady@gmail.com>
Date: Fri, 14 Mar 2025 11:20:09 +0000
Subject: [PATCH 16/16] Bump fsrs version

---
 Cargo.lock                            | 2 +-
 Cargo.toml                            | 2 +-
 rslib/src/scheduler/fsrs/simulator.rs | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4e65ccf08d6..6d665180005 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2099,7 +2099,7 @@ dependencies = [
 [[package]]
 name = "fsrs"
 version = "3.0.0"
-source = "git+https://github.com/open-spaced-repetition/fsrs-rs.git?rev=f7a746306b5d98712705912d8e0a8846cfb113b2#f7a746306b5d98712705912d8e0a8846cfb113b2"
+source = "git+https://github.com/open-spaced-repetition/fsrs-rs.git?rev=22f8e453c120f5bc5996f86558a559c6b7abfc49#22f8e453c120f5bc5996f86558a559c6b7abfc49"
 dependencies = [
  "burn",
  "itertools 0.12.1",
diff --git a/Cargo.toml b/Cargo.toml
index 41374092374..e3299a740e1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,7 +37,7 @@ rev = "184b2ca50ed39ca43da13f0b830a463861adb9ca"
 [workspace.dependencies.fsrs]
 # version = "=2.0.3"
 git = "https://github.com/open-spaced-repetition/fsrs-rs.git"
-rev = "f7a746306b5d98712705912d8e0a8846cfb113b2"
+rev = "22f8e453c120f5bc5996f86558a559c6b7abfc49"
 # path = "../open-spaced-repetition/fsrs-rs"
 
 [workspace.dependencies]
diff --git a/rslib/src/scheduler/fsrs/simulator.rs b/rslib/src/scheduler/fsrs/simulator.rs
index 87c84e73ebc..34bec1317f9 100644
--- a/rslib/src/scheduler/fsrs/simulator.rs
+++ b/rslib/src/scheduler/fsrs/simulator.rs
@@ -142,7 +142,7 @@ impl Collection {
             .min(req.new_limit as usize);
         if req.new_limit > 0 {
             let new_cards = (0..new_cards).map(|i| fsrs::Card {
-                id: -(i as i32),
+                id: -(i as i64),
                 difficulty: f32::NEG_INFINITY,
                 stability: 1e-8,              // Not filtered by fsrs-rs
                 last_date: f32::NEG_INFINITY, // Treated as a new card in simulation
@@ -237,7 +237,7 @@ impl Card {
                     let relative_due = due - days_elapsed;
                     let last_date = (relative_due - card.interval as i32).min(0) as f32;
                     Some(fsrs::Card {
-                        id: card.id.0 as i32,
+                        id: card.id.0,
                         difficulty: state.difficulty,
                         stability: state.stability,
                         last_date,
@@ -249,7 +249,7 @@ impl Card {
                 CardQueue::New => None,
                 CardQueue::Learn | CardQueue::SchedBuried | CardQueue::UserBuried => {
                     Some(fsrs::Card {
-                        id: card.id.0 as i32,
+                        id: card.id.0,
                         difficulty: state.difficulty,
                         stability: state.stability,
                         last_date: 0.0,