feat: session restore — persist open tab URLs + active index to session.json (Store::SaveSession/GetSessionTabs), restore on normal launch (skip if only a single new-tab). Saved on navigation (OnBrowserAddressChange) and tab close (RemoveTabAt).

Author: nyxthelobster

shell/src/browser_window.cc

@@ -476,8 +476,31 @@ void BrowserWindow::OnWindowCreated(CefRefPtr<CefWindow> window) {
   // Push the theme colors into the freshly-built view hierarchy.
   window_->ThemeChanged();
 
-  // First tab.
-  CreateTab(pending_initial_url_, /*select=*/true);
+  // First tab(s). If a previous session was saved and the caller didn't ask
+  // for a specific URL (i.e. a normal launch), restore the saved tabs.
+  bool restored = false;
+  if (pending_initial_url_ == GetNewTabURL()) {
+    std::vector<std::string> saved = OpenNyxStore::Get()->GetSessionTabs();
+    // Don't bother restoring a single new-tab page.
+    const bool trivial =
+        saved.empty() ||
+        (saved.size() == 1 && (saved[0] == GetNewTabURL() ||
+                               saved[0] == "opennyx://newtab"));
+    if (!trivial) {
+      size_t active = OpenNyxStore::Get()->GetSessionActiveIndex();
+      for (size_t i = 0; i < saved.size(); ++i) {
+        CreateTab(saved[i], /*select=*/false);
+      }
+      if (active >= saved.size()) {
+        active = 0;
+      }
+      SelectTab(active);
+      restored = true;
+    }
+  }
+  if (!restored) {
+    CreateTab(pending_initial_url_, /*select=*/true);
+  }
   pending_initial_url_.clear();
 
   window_->Show();
@@ -1051,6 +1074,24 @@ void BrowserWindow::ZoomActiveTab(int delta) {
   host->SetZoomLevel(level);
 }
 
+void BrowserWindow::SaveSessionState() {
+  CEF_REQUIRE_UI_THREAD();
+  std::vector<std::string> urls;
+  urls.reserve(tabs_.size());
+  for (const auto& t : tabs_) {
+    std::string url;
+    if (t.browser_view && t.browser_view->GetBrowser() &&
+        t.browser_view->GetBrowser()->GetMainFrame()) {
+      url = t.browser_view->GetBrowser()->GetMainFrame()->GetURL().ToString();
+    }
+    if (url.empty()) {
+      url = GetNewTabURL();
+    }
+    urls.push_back(url);
+  }
+  OpenNyxStore::Get()->SaveSession(urls, active_tab_);
+}
+
 void BrowserWindow::DragPoll(int seq) {
   CEF_REQUIRE_UI_THREAD();
 #if defined(_WIN32)
@@ -1196,6 +1237,8 @@ void BrowserWindow::OnBrowserAddressChange(CefRefPtr<CefBrowser> browser,
     SetAddressBarText(ShouldHideUrlInAddressBar(spec) ? "" : spec);
   }
   UpdateChrome();
+  // Persist the session whenever a tab navigates somewhere new.
+  SaveSessionState();
 }
 
 void BrowserWindow::OnBrowserLoadingStateChange(CefRefPtr<CefBrowser> browser,
@@ -1452,6 +1495,8 @@ void BrowserWindow::RemoveTabAt(size_t index) {
     SelectTab(active_tab_);
   }
   window_->InvalidateLayout();
+  // Persist the smaller tab set so a closed tab doesn't come back on restore.
+  SaveSessionState();
 }
 
 void BrowserWindow::SelectTab(size_t index) {

shell/src/browser_window.h

@@ -246,6 +246,10 @@ class BrowserWindow : public CefWindowDelegate,
   // Applies a zoom step to the active tab. delta = +1 (in), -1 (out), 0 (reset
   // to 100%). Zoom uses CEF's logarithmic level: each step is ~1.2x.
   void ZoomActiveTab(int delta);
+
+  // Persists the current open-tab URLs + active index so they can be restored
+  // on next launch. Cheap; called whenever tabs change.
+  void SaveSessionState();
   // Frameless window controls.
   CefRefPtr<CefPanel> caption_spacer_;  // flexible drag area
   CefRefPtr<CefLabelButton> minimize_button_;

shell/src/store.cc

@@ -212,6 +212,53 @@ void OpenNyxStore::LoadLocked() {
       }
     }
   }
+
+  // ---- session (open tabs) ----
+  {
+    const std::string raw = ReadFile(PathFor("session.json"));
+    if (!raw.empty()) {
+      json j = json::parse(raw, nullptr, false);
+      if (j.is_object()) {
+        session_active_ = j.value("active", (size_t)0);
+        const auto& tabs = j["tabs"];
+        if (tabs.is_array()) {
+          for (const auto& t : tabs) {
+            if (t.is_string()) {
+              session_tabs_.push_back(t.get<std::string>());
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+void OpenNyxStore::SaveSession(const std::vector<std::string>& tab_urls,
+                               size_t active_index) {
+  std::lock_guard<std::mutex> lock(mutex_);
+  EnsureLoaded();
+  session_tabs_ = tab_urls;
+  session_active_ = active_index;
+  json j;
+  j["active"] = active_index;
+  json arr = json::array();
+  for (const auto& u : tab_urls) {
+    arr.push_back(u);
+  }
+  j["tabs"] = arr;
+  WriteFileAtomic(PathFor("session.json"), j.dump(2));
+}
+
+std::vector<std::string> OpenNyxStore::GetSessionTabs() {
+  std::lock_guard<std::mutex> lock(mutex_);
+  EnsureLoaded();
+  return session_tabs_;
+}
+
+size_t OpenNyxStore::GetSessionActiveIndex() {
+  std::lock_guard<std::mutex> lock(mutex_);
+  EnsureLoaded();
+  return session_active_;
 }
 
 void OpenNyxStore::SaveConfigLocked() {

shell/src/store.h

@@ -90,6 +90,15 @@ class OpenNyxStore {
   std::vector<DownloadEntry> GetDownloads();
   void ClearDownloads();
 
+  // ---- Session (open tabs, for restore-on-startup) ----
+  // Persists the list of currently-open tab URLs (in tab order). Called by the
+  // browser window whenever tabs change.
+  void SaveSession(const std::vector<std::string>& tab_urls,
+                   size_t active_index);
+  // Returns the previously-saved open-tab URLs (empty if none).
+  std::vector<std::string> GetSessionTabs();
+  size_t GetSessionActiveIndex();
+
   // ---- Bulk ----
   // Clears history + downloads (leaves bookmarks + config intact). Cookies /
   // cache are cleared separately by the browser layer.
@@ -116,6 +125,8 @@ class OpenNyxStore {
   std::vector<HistoryEntry> history_;    // newest last.
   std::vector<Bookmark> bookmarks_;      // newest last.
   std::vector<DownloadEntry> downloads_;  // newest last.
+  std::vector<std::string> session_tabs_;  // open tab URLs (tab order).
+  size_t session_active_ = 0;
 };
 
 #endif  // OPENNYX_SHELL_SRC_STORE_H_