From edfb5558afe13e1e9922d65cb381cbe262a25030 Mon Sep 17 00:00:00 2001
From: Alec Ames <dev@alecames.com>
Date: Sat, 31 Jan 2026 15:32:42 -0500
Subject: [PATCH] roughly match viewer-editor scroll location

---
 src-tauri/Cargo.lock             | 254 ++++++++++++-------------------
 src-tauri/Cargo.toml             |   2 +-
 src-tauri/src/lib.rs             |   1 +
 src/lib/MarkdownViewer.svelte    | 110 +++++++++++--
 src/lib/components/Editor.svelte |  44 +++++-
 src/lib/stores/tabs.svelte.ts    |  87 ++++++++---
 6 files changed, 307 insertions(+), 191 deletions(-)

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 213c5f9..ba4d583 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -65,15 +65,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "anstream"
 version = "0.6.21"
@@ -290,17 +281,6 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.5.0"
@@ -328,6 +308,21 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "bit-set"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
+dependencies = [
+ "bit-vec",
+]
+
+[[package]]
+name = "bit-vec"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -559,19 +554,45 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "2.34.0"
+version = "4.5.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
+checksum = "a75ca66430e33a14957acc24c5077b503e7d374151b2b4b3a10c83b4ceb4be0e"
 dependencies = [
- "ansi_term",
- "atty",
- "bitflags 1.3.2",
- "strsim 0.8.0",
- "textwrap",
- "unicode-width",
- "vec_map",
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.56"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793207c7fa6300a0608d1080b858e5fdbe713cdc1c8db9fb17777d8a13e63df0"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+ "terminal_size",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.55"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a92793da1a46a5f2a02a6f4c46c6496b28c43638adea8306fcb0caa1634f24e5"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.114",
 ]
 
+[[package]]
+name = "clap_lex"
+version = "0.7.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32"
+
 [[package]]
 name = "colorchoice"
 version = "1.0.4"
@@ -590,19 +611,18 @@ dependencies = [
 
 [[package]]
 name = "comrak"
-version = "0.12.1"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff3c476e1a33eb4df1212a02db79d0f788bbd760901f34f5897644623e0e4e74"
+checksum = "482aa5695bca086022be453c700a40c02893f1ba7098a2c88351de55341ae894"
 dependencies = [
  "clap",
  "entities",
- "lazy_static",
- "pest",
- "pest_derive",
+ "memchr",
+ "once_cell",
  "regex",
  "shell-words",
+ "slug",
  "syntect",
- "twoway",
  "typed-arena",
  "unicode_categories",
  "xdg",
@@ -773,7 +793,7 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote",
- "strsim 0.11.1",
+ "strsim",
  "syn 2.0.114",
 ]
 
@@ -822,6 +842,12 @@ dependencies = [
  "syn 2.0.114",
 ]
 
+[[package]]
+name = "deunicode"
+version = "1.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abd57806937c9cc163efc8ea3910e00a62e2aeb0b8119f1793a978088f8f6b04"
+
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -1092,6 +1118,17 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "fancy-regex"
+version = "0.16.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "998b056554fbe42e03ae0e152895cd1a7e1002aec800fdc6635d20270260c46f"
+dependencies = [
+ "bit-set",
+ "regex-automata",
+ "regex-syntax",
+]
+
 [[package]]
 name = "fastrand"
 version = "2.3.0"
@@ -1614,15 +1651,6 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "hermit-abi"
 version = "0.5.2"
@@ -2137,12 +2165,6 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
 [[package]]
 name = "libappindicator"
 version = "0.9.0"
@@ -2820,49 +2842,6 @@ version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
-[[package]]
-name = "pest"
-version = "2.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c9eb05c21a464ea704b53158d358a31e6425db2f63a1a7312268b05fe2b75f7"
-dependencies = [
- "memchr",
- "ucd-trie",
-]
-
-[[package]]
-name = "pest_derive"
-version = "2.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68f9dbced329c441fa79d80472764b1a2c7e57123553b8519b36663a2fb234ed"
-dependencies = [
- "pest",
- "pest_generator",
-]
-
-[[package]]
-name = "pest_generator"
-version = "2.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bb96d5051a78f44f43c8f712d8e810adb0ebf923fc9ed2655a7f66f63ba8ee5"
-dependencies = [
- "pest",
- "pest_meta",
- "proc-macro2",
- "quote",
- "syn 2.0.114",
-]
-
-[[package]]
-name = "pest_meta"
-version = "2.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "602113b5b5e8621770cfd490cfd90b9f84ab29bd2b0e49ad83eb6d186cef2365"
-dependencies = [
- "pest",
- "sha2",
-]
-
 [[package]]
 name = "phf"
 version = "0.8.0"
@@ -3060,7 +3039,7 @@ checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218"
 dependencies = [
  "cfg-if",
  "concurrent-queue",
- "hermit-abi 0.5.2",
+ "hermit-abi",
  "pin-project-lite",
  "rustix",
  "windows-sys 0.61.2",
@@ -3359,7 +3338,7 @@ dependencies = [
  "aho-corasick",
  "memchr",
  "regex-automata",
- "regex-syntax 0.8.8",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -3370,15 +3349,9 @@ checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.8",
+ "regex-syntax",
 ]
 
-[[package]]
-name = "regex-syntax"
-version = "0.6.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
 [[package]]
 name = "regex-syntax"
 version = "0.8.8"
@@ -3799,6 +3772,16 @@ version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
 
+[[package]]
+name = "slug"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "882a80f72ee45de3cc9a5afeb2da0331d58df69e4e7d8eeb5d3c7784ae67e724"
+dependencies = [
+ "deunicode",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "smallvec"
 version = "1.15.1"
@@ -3894,12 +3877,6 @@ dependencies = [
  "quote",
 ]
 
-[[package]]
-name = "strsim"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-
 [[package]]
 name = "strsim"
 version = "0.11.1"
@@ -3982,22 +3959,22 @@ dependencies = [
 
 [[package]]
 name = "syntect"
-version = "4.6.0"
+version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b20815bbe80ee0be06e6957450a841185fcf690fe0178f14d77a05ce2caa031"
+checksum = "656b45c05d95a5704399aeef6bd0ddec7b2b3531b7c9e900abbf7c4d2190c925"
 dependencies = [
  "bincode",
- "bitflags 1.3.2",
+ "fancy-regex",
  "flate2",
  "fnv",
- "lazy_static",
- "lazycell",
+ "once_cell",
  "onig",
  "plist",
- "regex-syntax 0.6.29",
+ "regex-syntax",
  "serde",
  "serde_derive",
  "serde_json",
+ "thiserror 2.0.17",
  "walkdir",
  "yaml-rust",
 ]
@@ -4436,12 +4413,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "textwrap"
-version = "0.11.0"
+name = "terminal_size"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+checksum = "60b8cb979cb11c32ce1603f8137b22262a9d131aaa5c37b5678025f22b8becd0"
 dependencies = [
- "unicode-width",
+ "rustix",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -4752,21 +4730,11 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
-[[package]]
-name = "twoway"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c57ffb460d7c24cd6eda43694110189030a3d1dfe418416d9468fd1c1d290b47"
-dependencies = [
- "memchr",
- "unchecked-index",
-]
-
 [[package]]
 name = "typed-arena"
-version = "1.7.0"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9b2228007eba4120145f785df0f6c92ea538f5a3635a612ecf4e334c8c1446d"
+checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
 
 [[package]]
 name = "typeid"
@@ -4780,12 +4748,6 @@ version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
 
-[[package]]
-name = "ucd-trie"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
-
 [[package]]
 name = "uds_windows"
 version = "1.1.0"
@@ -4797,12 +4759,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "unchecked-index"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eeba86d422ce181a719445e51872fa30f1f7413b62becb52e95ec91aa262d85c"
-
 [[package]]
 name = "unic-char-property"
 version = "0.9.0"
@@ -4856,12 +4812,6 @@ version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 
-[[package]]
-name = "unicode-width"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
-
 [[package]]
 name = "unicode_categories"
 version = "0.1.1"
@@ -4923,12 +4873,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
 [[package]]
 name = "version-compare"
 version = "0.2.1"
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 4da88ee..88ff88b 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -28,7 +28,7 @@ tauri-plugin-dialog = "2"
 tauri-plugin-single-instance = "2"
 tauri-plugin-window-state = "2"
 serde = { version = "1", features = ["derive"] }
-comrak = "0.12"
+comrak = "0.18"
 serde_json = "1"
 tauri-plugin-prevent-default = "2.0.0-rc.1"
 notify = "6"
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 634c56c..a5eee45 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -40,6 +40,7 @@ fn open_markdown(path: String) -> Result<String, String> {
     };
     options.render.unsafe_ = true;
     options.render.hardbreaks = true;
+    options.render.sourcepos = true;
 
     let html_output = markdown_to_html(&content, &options);
 
diff --git a/src/lib/MarkdownViewer.svelte b/src/lib/MarkdownViewer.svelte
index 8555e2d..0da8a69 100644
--- a/src/lib/MarkdownViewer.svelte
+++ b/src/lib/MarkdownViewer.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { invoke, convertFileSrc } from '@tauri-apps/api/core';
 	import { listen } from '@tauri-apps/api/event';
-	import { onMount, tick } from 'svelte';
+	import { onMount, tick, untrack } from 'svelte';
 	import { openUrl } from '@tauri-apps/plugin-opener';
 	import { open, save, ask } from '@tauri-apps/plugin-dialog';
 	import Installer from './Installer.svelte';
@@ -263,10 +263,104 @@
 	});
 
 	$effect(() => {
-		const tab = tabManager.activeTab;
-		if (tab && markdownBody) markdownBody.scrollTop = tab.scrollTop;
+		// Depend on the ID and body existence to trigger restore
+		const id = tabManager.activeTabId;
+		if (id && markdownBody) {
+			untrack(() => {
+				const tab = tabManager.tabs.find((t) => t.id === id);
+				if (tab) {
+					let scrolled = false;
+
+					if (tab.anchorLine > 0) {
+						// Interpolated Restore
+						// Find element containing the anchor line
+						const children = Array.from(markdownBody.children) as HTMLElement[];
+						for (const el of children) {
+							const sourcepos = el.dataset.sourcepos;
+							if (sourcepos) {
+								const [start, end] = sourcepos.split('-');
+								const startLine = parseInt(start.split(':')[0]);
+								const endLine = parseInt(end.split(':')[0]);
+
+								if (!isNaN(startLine) && !isNaN(endLine)) {
+									if (tab.anchorLine >= startLine && tab.anchorLine <= endLine) {
+										// Found the container
+										const totalLines = endLine - startLine; // Can be 0 for single line
+										let ratio = 0;
+										if (totalLines > 0) {
+											ratio = (tab.anchorLine - startLine) / totalLines;
+										}
+
+										// Calculate target pixel position
+										// We want the anchor line to be roughly at offset 60
+										const targetOffset = el.offsetTop + el.offsetHeight * ratio - 60;
+										markdownBody.scrollTop = Math.max(0, targetOffset);
+										scrolled = true;
+										break;
+									}
+								}
+							}
+						}
+					}
+
+					if (!scrolled) {
+						if (markdownBody.scrollHeight > markdownBody.clientHeight && tab.scrollPercentage > 0) {
+							const targetScroll = tab.scrollPercentage * (markdownBody.scrollHeight - markdownBody.clientHeight);
+							markdownBody.scrollTop = targetScroll;
+						} else {
+							markdownBody.scrollTop = tab.scrollTop;
+						}
+					}
+				}
+			});
+		}
 	});
 
+	// ... (helper functions if needed) ...
+
+	function handleScroll(e: Event) {
+		const target = e.target as HTMLElement;
+		if (tabManager.activeTabId) {
+			// Update raw scroll pos
+			tabManager.updateTabScroll(tabManager.activeTabId, target.scrollTop);
+
+			// Percentage fallback
+			if (target.scrollHeight > target.clientHeight) {
+				const percentage = target.scrollTop / (target.scrollHeight - target.clientHeight);
+				tabManager.updateTabScrollPercentage(tabManager.activeTabId, percentage);
+			}
+
+			// Interpolated Anchor Calculation
+			const anchorOffset = target.scrollTop + 60;
+			const children = Array.from(markdownBody?.children || []);
+
+			for (const child of children) {
+				const el = child as HTMLElement;
+				// Check intersection
+				if (el.offsetTop <= anchorOffset && el.offsetTop + el.offsetHeight > anchorOffset) {
+					const sourcepos = el.dataset.sourcepos;
+					if (sourcepos) {
+						const [start, end] = sourcepos.split('-');
+						const startLine = parseInt(start.split(':')[0]);
+						const endLine = parseInt(end.split(':')[0]);
+
+						if (!isNaN(startLine) && !isNaN(endLine)) {
+							// Calculate relative position within element
+							const relativeOffset = anchorOffset - el.offsetTop;
+							const ratio = relativeOffset / el.offsetHeight;
+
+							const totalLines = endLine - startLine;
+							const estimatedLine = startLine + Math.round(totalLines * ratio);
+
+							tabManager.updateTabAnchorLine(tabManager.activeTabId, estimatedLine);
+						}
+					}
+					break;
+				}
+			}
+		}
+	}
+
 	function saveRecentFile(path: string) {
 		let files = [...recentFiles].filter((f) => f !== path);
 		files.unshift(path);
@@ -530,12 +624,6 @@
 		}
 	}
 
-	function handleScroll(e: Event) {
-		if (tabManager.activeTabId) {
-			tabManager.updateTabScroll(tabManager.activeTabId, (e.target as HTMLElement).scrollTop);
-		}
-	}
-
 	let zoomLevel = $state(100);
 
 	function handleWheel(e: WheelEvent) {
@@ -895,12 +983,12 @@
 		}} />
 
 	{#if tabManager.activeTab && (tabManager.activeTab.path !== '' || tabManager.activeTab.title !== 'Recents') && !showHome}
-		{#key currentFile}
+		{#key tabManager.activeTabId}
 			<div class="markdown-container" style="zoom: {isEditing ? 1 : zoomLevel / 100}" onwheel={handleWheel} role="presentation">
 				{#if isEditing}
 					<div class="editor-wrapper">
 						<Editor
-							bind:value={rawContent}
+							bind:value={tabManager.activeTab.rawContent}
 							language={editorLanguage}
 							onsave={saveContent}
 							bind:zoomLevel
diff --git a/src/lib/components/Editor.svelte b/src/lib/components/Editor.svelte
index 16396a5..446ac2a 100644
--- a/src/lib/components/Editor.svelte
+++ b/src/lib/components/Editor.svelte
@@ -37,13 +37,14 @@
 		ontoggleLive?: () => void;
 		onhome?: () => void;
 		onnextTab?: () => void;
-		onprevTab?: () => void; // Using 'prev' to match common naming
+		onprevTab?: () => void;
 		onundoClose?: () => void;
 		zoomLevel?: number;
 	}>();
 
 	let container: HTMLDivElement;
 	let editor: monaco.editor.IStandaloneCodeEditor;
+	const currentTabId = tabManager.activeTabId;
 
 	self.MonacoEnvironment = {
 		getWorker: function (_moduleId: any, label: string) {
@@ -102,6 +103,27 @@
 			lineNumbers: settings.lineNumbers as 'on' | 'off' | 'relative' | 'interval',
 		});
 
+		if (tabManager.activeTab?.editorViewState) {
+			editor.restoreViewState(tabManager.activeTab.editorViewState);
+		}
+
+		let scrolled = false;
+		if (tabManager.activeTab) {
+			if (tabManager.activeTab.anchorLine > 0) {
+				editor.revealLineNearTop(Math.max(1, tabManager.activeTab.anchorLine - 2), monaco.editor.ScrollType.Smooth);
+				scrolled = true;
+			}
+
+			if (!scrolled) {
+				const scrollHeight = editor.getScrollHeight();
+				const clientHeight = editor.getLayoutInfo().height;
+				if (scrollHeight > clientHeight) {
+					const targetScroll = tabManager.activeTab.scrollPercentage * (scrollHeight - clientHeight);
+					editor.setScrollTop(targetScroll);
+				}
+			}
+		}
+
 		editor.addAction({
 			id: 'toggle-minimap',
 			label: 'Toggle Minimap',
@@ -358,6 +380,26 @@
 			mediaQuery.removeEventListener('change', updateTheme);
 			container.removeEventListener('wheel', wheelListener, { capture: true });
 
+			if (editor && currentTabId) {
+				const state = editor.saveViewState();
+				tabManager.updateTabEditorState(currentTabId, state);
+
+				const scrollHeight = editor.getScrollHeight();
+				const clientHeight = editor.getLayoutInfo().height;
+				if (scrollHeight > clientHeight) {
+					const percentage = editor.getScrollTop() / (scrollHeight - clientHeight);
+					tabManager.updateTabScrollPercentage(currentTabId, percentage);
+				}
+
+				const ranges = editor.getVisibleRanges();
+				if (ranges.length > 0) {
+					const startLine = ranges[0].startLineNumber;
+					// Anchor to 3rd line
+					const anchorLine = startLine + 2;
+					tabManager.updateTabAnchorLine(currentTabId, anchorLine);
+				}
+			}
+
 			editor.dispose();
 		};
 	});
diff --git a/src/lib/stores/tabs.svelte.ts b/src/lib/stores/tabs.svelte.ts
index e6c4cc1..55c8892 100644
--- a/src/lib/stores/tabs.svelte.ts
+++ b/src/lib/stores/tabs.svelte.ts
@@ -10,6 +10,9 @@ export interface Tab {
 	isEditing: boolean;
 	history: string[];
 	historyIndex: number;
+	editorViewState: any; // monaco.editor.ICodeEditorViewState | null
+	scrollPercentage: number;
+	anchorLine: number;
 }
 
 class TabManager {
@@ -20,65 +23,80 @@ class TabManager {
 		return this.tabs.find((t) => t.id === this.activeTabId);
 	}
 
-	addTab(path: string, content: string = '', rawContent: string = '') {
-		const existing = this.tabs.find((t) => t.path === path);
-		if (existing) {
-			this.activeTabId = existing.id;
-			return;
-		}
-
+	addTab(path: string, content: string = '') {
 		const id = crypto.randomUUID();
-		const title = path.split(/[/\\]/).pop() || 'Untitled';
+		const filename = path.split('\\').pop()?.split('/').pop() || 'Untitled';
 
 		this.tabs.push({
 			id,
 			path,
-			title,
+			title: filename,
 			content,
-			rawContent,
-			originalContent: rawContent,
+			rawContent: content,
+			originalContent: content,
 			scrollTop: 0,
 			isDirty: false,
 			isEditing: false,
-			history: [path],
-			historyIndex: 0
+			history: [content],
+			historyIndex: 0,
+			editorViewState: null,
+			scrollPercentage: 0,
+			anchorLine: 0
 		});
+
 		this.activeTabId = id;
 	}
 
 	addNewTab() {
 		const id = crypto.randomUUID();
+		const content = '';
+
 		this.tabs.push({
 			id,
 			path: '',
 			title: 'Untitled',
-			content: '',
-			rawContent: '',
-			originalContent: '',
+			content,
+			rawContent: content,
+			originalContent: content,
 			scrollTop: 0,
 			isDirty: false,
-			isEditing: true,
-			history: [''],
-			historyIndex: 0
+			isEditing: true, // Start in edit mode
+			history: [content],
+			historyIndex: 0,
+			editorViewState: null,
+			scrollPercentage: 0,
+			anchorLine: 0
 		});
+
 		this.activeTabId = id;
 	}
 
 	addHomeTab() {
+		// Check if home tab exists
+		const homeTab = this.tabs.find(t => t.path === 'HOME');
+		if (homeTab) {
+			this.activeTabId = homeTab.id;
+			return;
+		}
+
 		const id = crypto.randomUUID();
 		this.tabs.push({
 			id,
-			path: '',
-			title: 'Recents',
+			path: 'HOME',
+			title: 'Home',
 			content: '',
 			rawContent: '',
 			originalContent: '',
 			scrollTop: 0,
 			isDirty: false,
 			isEditing: false,
-			history: [''],
-			historyIndex: 0
+			history: [],
+			historyIndex: 0,
+			editorViewState: null,
+			scrollPercentage: 0,
+			anchorLine: 0
 		});
+
 		this.activeTabId = id;
 	}
 
@@ -138,6 +156,29 @@ class TabManager {
 		}
 	}
 
+	updateTabEditorState(id: string, viewState: any) {
+		const tab = this.tabs.find((t) => t.id === id);
+		if (tab) {
+			tab.editorViewState = viewState;
+		}
+	}
+
+	updateTabScrollPercentage(id: string, percentage: number) {
+		const tab = this.tabs.find((t) => t.id === id);
+		if (tab) {
+			tab.scrollPercentage = percentage;
+		}
+	}
+
+	updateTabAnchorLine(id: string, line: number) {
+		const tab = this.tabs.find((t) => t.id === id);
+		if (tab) {
+			tab.anchorLine = line;
+		}
+	}
+
+
+
 	reorderTabs(fromIndex: number, toIndex: number) {
 		if (fromIndex === toIndex) return;
 		const [moved] = this.tabs.splice(fromIndex, 1);