@@ -289,7 +289,7 @@ FROM ExecutionHistory eh
                     createTablesCommand.ExecuteNonQuery();
 
                     // Migrate existing text file history if it exists
-                    // MigrateTextHistoryToSQLite(connection);
+                    MigrateTextHistoryToSQLite(connection);
                 }
             }
             catch (SqliteException ex)
@@ -304,16 +304,15 @@ FROM ExecutionHistory eh
 
         private void MigrateTextHistoryToSQLite(SqliteConnection connection)
         {
-            // Check if text history file exists
-            string textHistoryPath = _options.HistorySavePath.Replace(".sqlite", ".txt");
+            // Derive the text history path from the SQLite path.
+            // Both files share the same directory and host prefix:
+            //   ConsoleHost_history.txt  (text)
+            //   ConsoleHost_history.db   (SQLite)
+            // By the time this runs, HistorySavePath is already the .db path.
+            string textHistoryPath = Path.ChangeExtension(_options.HistorySavePath, ".txt");
             if (!File.Exists(textHistoryPath))
             {
-                // Try default history path pattern
-                textHistoryPath = Path.ChangeExtension(_options.HistorySavePath, ".txt");
-                if (!File.Exists(textHistoryPath))
-                {
-                    return; // No text history to migrate
-                }
+                return; // No text history to migrate
             }
 
             try
@@ -518,12 +517,15 @@ private long GetOrCreateCommandId(SqliteConnection connection, string commandLin
             using var insertCommand = connection.CreateCommand();
             insertCommand.CommandText = @"
 INSERT INTO Commands (CommandLine, CommandHash) 
-VALUES (@CommandLine, @CommandHash)
-RETURNING Id";
+VALUES (@CommandLine, @CommandHash)";
             insertCommand.Parameters.AddWithValue("@CommandLine", commandLine);
             insertCommand.Parameters.AddWithValue("@CommandHash", commandHash);
+            insertCommand.ExecuteNonQuery();
 
-            return Convert.ToInt64(insertCommand.ExecuteScalar());
+            // Get the inserted row ID
+            using var lastIdCommand = connection.CreateCommand();
+            lastIdCommand.CommandText = "SELECT last_insert_rowid()";
+            return Convert.ToInt64(lastIdCommand.ExecuteScalar());
         }
 
         // Helper method to get or create a location ID
@@ -544,11 +546,14 @@ private long GetOrCreateLocationId(SqliteConnection connection, string location)
             using var insertCommand = connection.CreateCommand();
             insertCommand.CommandText = @"
 INSERT INTO Locations (Path) 
-VALUES (@Path)
-RETURNING Id";
+VALUES (@Path)";
             insertCommand.Parameters.AddWithValue("@Path", location);
+            insertCommand.ExecuteNonQuery();
 
-            return Convert.ToInt64(insertCommand.ExecuteScalar());
+            // Get the inserted row ID
+            using var lastIdCommand = connection.CreateCommand();
+            lastIdCommand.CommandText = "SELECT last_insert_rowid()";
+            return Convert.ToInt64(lastIdCommand.ExecuteScalar());
         }
 
         private void WriteHistoryToSQLite(int start, int end)
@@ -1442,17 +1447,7 @@ private void HistoryRecall(int direction)
             }
             _recallHistoryCommandCount += 1;
 
-            // For SQLite/location-filtered history, allow returning to the current line
-            if (_options.HistoryType == HistoryType.SQLite &&
-                (newHistoryIndex < 0 || newHistoryIndex >= _history.Count))
-            {
-                _currentHistoryIndex = _history.Count;
-                var moveCursor = InViCommandMode() && !_options.HistorySearchCursorMovesToEnd
-                    ? HistoryMoveCursor.ToBeginning
-                    : HistoryMoveCursor.ToEnd;
-                UpdateFromHistory(moveCursor);
-            }
-            else if (newHistoryIndex >= 0 && newHistoryIndex <= _history.Count)
+            if (newHistoryIndex >= 0 && newHistoryIndex <= _history.Count)
             {
                 _currentHistoryIndex = newHistoryIndex;
                 var moveCursor = InViCommandMode() && !_options.HistorySearchCursorMovesToEnd
 
@@ -24,14 +24,6 @@
     <PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.4" />
     <PackageReference Include="Microsoft.PowerShell.Pager" Version="1.0.0" />
     <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.11" />
-    
-    <!-- Platform-specific SQLite bundles -->
-    <!-- Use Windows system SQLite on Windows -->
-    <PackageReference Include="SQLitePCLRaw.bundle_winsqlite3" Version="2.1.11" Condition="$([MSBuild]::IsOSPlatform('Windows'))" />
-    <!-- Use embedded SQLite with all native libraries for Linux/macOS -->
-    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.11" Condition="!$([MSBuild]::IsOSPlatform('Windows'))" />
-    
-    <ProjectReference Include="..\Polyfill\Polyfill.csproj" />
   </ItemGroup>
 
   <ItemGroup>
 
@@ -1221,30 +1221,5 @@ public void HistoryCount()
             Test("cccc", Keys("cccc"));
             Test("aaaa", Keys(Enumerable.Repeat(_.UpArrow, 4)));
         }
-
-        [SkippableFact]
-        public void SetPSReadLineOption_HistoryType_AcceptsSQLite()
-        {
-            var method = typeof(PSConsoleReadLine).GetMethod("SetOptions");
-            Assert.NotNull(method);
-
-            var optionsType = typeof(SetPSReadLineOption);
-            var historyTypeProperty = optionsType.GetProperty("HistoryType");
-            Assert.NotNull(historyTypeProperty);
-
-            var options = new SetPSReadLineOption();
-            historyTypeProperty.SetValue(options, HistoryType.SQLite);
-
-            Exception ex = Record.Exception(() => PSConsoleReadLine.SetOptions(options));
-            Assert.Null(ex);
-
-            Assert.Equal(HistoryType.SQLite, historyTypeProperty.GetValue(options));
-
-            // Set the history type back to the default.
-            historyTypeProperty.SetValue(options, HistoryType.Text);
-            Assert.Equal(HistoryType.Text, historyTypeProperty.GetValue(options));
-        }
-
-        
     }
 }