13 files changed, 54 insertions, 34 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a826f096..7fe1688c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,20 @@ All notable changes to this project will be documented in this file.
 
 ## [unreleased]
 
+### Features
+
+- *(stats)* Add jj to default common subcommands ([#2708](https://github.com/atuinsh/atuin/issues/2708))
+- Delete duplicate history ([#2697](https://github.com/atuinsh/atuin/issues/2697))
+
+
+### Miscellaneous Tasks
+
+- Use native github arm64 runner ([#2690](https://github.com/atuinsh/atuin/issues/2690))
+- Fix typos ([#2668](https://github.com/atuinsh/atuin/issues/2668))
+
+
+## [18.5.0] - 2025-04-09
+
 ### Bug Fixes
 
 - *(1289)* Clear terminal area if inline ([#2600](https://github.com/atuinsh/atuin/issues/2600))
@@ -25,6 +39,7 @@ All notable changes to this project will be documented in this file.
 - Add redundant clones to clippy and cleanup instances of it ([#2654](https://github.com/atuinsh/atuin/issues/2654))
 - Allow -ve values for timezone ([#2609](https://github.com/atuinsh/atuin/issues/2609))
 - Fish up binding bug ([#2677](https://github.com/atuinsh/atuin/issues/2677))
+- Switch to astral cargo-dist ([#2687](https://github.com/atuinsh/atuin/issues/2687))
 
 
 ### Documentation
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 283d0981..da47d98d 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1,5 +1,6 @@
 0x4A6F <0x4A6F@users.noreply.github.com>
 Aleks Bunin <sashkab@users.noreply.github.com>
+Alex Hamilton <1622250+Aehmlo@users.noreply.github.com>
 Alexandre GV. <contact@alexandregv.fr>
 Aloxaf <bailong104@gmail.com>
 Alpha Chen <alpha@kejadlen.dev>
@@ -29,6 +30,7 @@ chitao1234 <1139954766@qq.com>
 Chris Rose <offline@offby1.net>
 Conrad Ludgate <conradludgate@gmail.com>
 CosmicHorror <LovecraftianHorror@pm.me>
+Cristian Le <git@lecris.dev>
 Cristian Le <github@lecris.me>
 CULT PONY <67918945+cultpony@users.noreply.github.com>
 cyqsimon <28627918+cyqsimon@users.noreply.github.com>
@@ -43,6 +45,7 @@ David Jack Wange Olrik <david@olrik.dk>
 David Legrand <1110600+davlgd@users.noreply.github.com>
 Dennis Trautwein <git@dtrautwein.eu>
 dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
+Devin Buhl <onedr0p@users.noreply.github.com>
 Dhruv Thakur <13575379+dhth@users.noreply.github.com>
 Diego Carrasco Gubernatis <557703+dacog@users.noreply.github.com>
 Dieter Eickstaedt <eickstaedt@deicon.de>
@@ -104,6 +107,7 @@ JT <547158+jntrnr@users.noreply.github.com>
 Julien P <julien@caffeine.lu>
 Justin Su <injustsu@gmail.com>
 János Illés <ijanos@gmail.com>
+Kian-Meng Ang <kianmeng.ang@gmail.com>
 Kjetil Jørgensen <kjetijor+github@gmail.com>
 Klas Mellbourn <klas@mellbourn.net>
 Koichi Murase <myoga.murase@gmail.com>
diff --git a/Cargo.lock b/Cargo.lock
index 1aea1c5e..207f455f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -221,7 +221,7 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "atuin"
-version = "18.5.0"
+version = "18.6.0-beta.1"
 dependencies = [
  "arboard",
  "async-trait",
@@ -268,7 +268,7 @@ dependencies = [
 
 [[package]]
 name = "atuin-client"
-version = "18.5.0"
+version = "18.6.0-beta.1"
 dependencies = [
  "async-trait",
  "atuin-common",
@@ -323,7 +323,7 @@ dependencies = [
 
 [[package]]
 name = "atuin-common"
-version = "18.5.0"
+version = "18.6.0-beta.1"
 dependencies = [
  "base64 0.22.1",
  "directories",
@@ -343,7 +343,7 @@ dependencies = [
 
 [[package]]
 name = "atuin-daemon"
-version = "18.5.0"
+version = "18.6.0-beta.1"
 dependencies = [
  "atuin-client",
  "atuin-dotfiles",
@@ -370,7 +370,7 @@ dependencies = [
 
 [[package]]
 name = "atuin-dotfiles"
-version = "18.5.0"
+version = "18.6.0-beta.1"
 dependencies = [
  "atuin-client",
  "atuin-common",
@@ -384,7 +384,7 @@ dependencies = [
 
 [[package]]
 name = "atuin-history"
-version = "18.5.0"
+version = "18.6.0-beta.1"
 dependencies = [
  "atuin-client",
  "crossterm",
@@ -397,7 +397,7 @@ dependencies = [
 
 [[package]]
 name = "atuin-scripts"
-version = "18.5.0"
+version = "18.6.0-beta.1"
 dependencies = [
  "atuin-client",
  "atuin-common",
@@ -419,7 +419,7 @@ dependencies = [
 
 [[package]]
 name = "atuin-server"
-version = "18.5.0"
+version = "18.6.0-beta.1"
 dependencies = [
  "argon2",
  "async-trait",
@@ -448,7 +448,7 @@ dependencies = [
 
 [[package]]
 name = "atuin-server-database"
-version = "18.5.0"
+version = "18.6.0-beta.1"
 dependencies = [
  "async-trait",
  "atuin-common",
@@ -460,7 +460,7 @@ dependencies = [
 
 [[package]]
 name = "atuin-server-postgres"
-version = "18.5.0"
+version = "18.6.0-beta.1"
 dependencies = [
  "async-trait",
  "atuin-common",
diff --git a/Cargo.toml b/Cargo.toml
index 32d98d42..73152513 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,7 +5,7 @@ resolver = "2"
 exclude = ["ui/backend"]
 
 [workspace.package]
-version = "18.5.0"
+version = "18.6.0-beta.1"
 authors = ["Ellie Huxtable <ellie@atuin.sh>"]
 rust-version = "1.86"
 license = "MIT"
diff --git a/crates/atuin-client/Cargo.toml b/crates/atuin-client/Cargo.toml
index cdeded3d..34b63ef6 100644
--- a/crates/atuin-client/Cargo.toml
+++ b/crates/atuin-client/Cargo.toml
@@ -19,7 +19,7 @@ daemon = []
 check-update = []
 
 [dependencies]
-atuin-common = { path = "../atuin-common", version = "18.5.0" }
+atuin-common = { path = "../atuin-common", version = "18.6.0-beta.1" }
 
 log = { workspace = true }
 base64 = { workspace = true }
diff --git a/crates/atuin-daemon/Cargo.toml b/crates/atuin-daemon/Cargo.toml
index 8c2beb18..be7f7c2b 100644
--- a/crates/atuin-daemon/Cargo.toml
+++ b/crates/atuin-daemon/Cargo.toml
@@ -14,9 +14,9 @@ readme.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-atuin-client = { path = "../atuin-client", version = "18.5.0" }
-atuin-dotfiles = { path = "../atuin-dotfiles", version = "18.5.0" }
-atuin-history = { path = "../atuin-history", version = "18.5.0" }
+atuin-client = { path = "../atuin-client", version = "18.6.0-beta.1" }
+atuin-dotfiles = { path = "../atuin-dotfiles", version = "18.6.0-beta.1" }
+atuin-history = { path = "../atuin-history", version = "18.6.0-beta.1" }
 
 time = { workspace = true }
 uuid = { workspace = true }
diff --git a/crates/atuin-dotfiles/Cargo.toml b/crates/atuin-dotfiles/Cargo.toml
index 1ba73e63..3760ddac 100644
--- a/crates/atuin-dotfiles/Cargo.toml
+++ b/crates/atuin-dotfiles/Cargo.toml
@@ -14,8 +14,8 @@ readme.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-atuin-common = { path = "../atuin-common", version = "18.5.0" }
-atuin-client = { path = "../atuin-client", version = "18.5.0" }
+atuin-common = { path = "../atuin-common", version = "18.6.0-beta.1" }
+atuin-client = { path = "../atuin-client", version = "18.6.0-beta.1" }
 
 eyre = { workspace = true }
 tokio = { workspace = true }
diff --git a/crates/atuin-history/Cargo.toml b/crates/atuin-history/Cargo.toml
index 5df613a8..4643456a 100644
--- a/crates/atuin-history/Cargo.toml
+++ b/crates/atuin-history/Cargo.toml
@@ -14,7 +14,7 @@ readme.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-atuin-client = { path = "../atuin-client", version = "18.5.0" }
+atuin-client = { path = "../atuin-client", version = "18.6.0-beta.1" }
 
 time = { workspace = true }
 serde = { workspace = true }
diff --git a/crates/atuin-scripts/Cargo.toml b/crates/atuin-scripts/Cargo.toml
index 4d868757..d522d689 100644
--- a/crates/atuin-scripts/Cargo.toml
+++ b/crates/atuin-scripts/Cargo.toml
@@ -14,8 +14,8 @@ readme.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-atuin-client = { path = "../atuin-client", version = "18.5.0-beta.1" }
-atuin-common = { path = "../atuin-common", version = "18.5.0-beta.1" }
+atuin-client = { path = "../atuin-client", version = "18.6.0-beta.1" }
+atuin-common = { path = "../atuin-common", version = "18.6.0-beta.1" }
 
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
@@ -30,4 +30,5 @@ sql-builder = { workspace = true }
 sqlx = { workspace = true }
 tempfile = { workspace = true }
 minijinja = { workspace = true }
-serde_json = { workspace = true }
-\ No newline at end of file
+serde_json = { workspace = true }
+
diff --git a/crates/atuin-server-database/Cargo.toml b/crates/atuin-server-database/Cargo.toml
index c122991f..fc71e09d 100644
--- a/crates/atuin-server-database/Cargo.toml
+++ b/crates/atuin-server-database/Cargo.toml
@@ -10,7 +10,7 @@ homepage = { workspace = true }
 repository = { workspace = true }
 
 [dependencies]
-atuin-common = { path = "../atuin-common", version = "18.5.0" }
+atuin-common = { path = "../atuin-common", version = "18.6.0-beta.1" }
 
 tracing = { workspace = true }
 time = { workspace = true }
diff --git a/crates/atuin-server-postgres/Cargo.toml b/crates/atuin-server-postgres/Cargo.toml
index 9b0f1f7a..0ebffa16 100644
--- a/crates/atuin-server-postgres/Cargo.toml
+++ b/crates/atuin-server-postgres/Cargo.toml
@@ -10,8 +10,8 @@ homepage = { workspace = true }
 repository = { workspace = true }
 
 [dependencies]
-atuin-common = { path = "../atuin-common", version = "18.5.0" }
-atuin-server-database = { path = "../atuin-server-database", version = "18.5.0" }
+atuin-common = { path = "../atuin-common", version = "18.6.0-beta.1" }
+atuin-server-database = { path = "../atuin-server-database", version = "18.6.0-beta.1" }
 
 eyre = { workspace = true }
 tracing = { workspace = true }
diff --git a/crates/atuin-server/Cargo.toml b/crates/atuin-server/Cargo.toml
index 1445a8ab..6efb101b 100644
--- a/crates/atuin-server/Cargo.toml
+++ b/crates/atuin-server/Cargo.toml
@@ -11,8 +11,8 @@ homepage = { workspace = true }
 repository = { workspace = true }
 
 [dependencies]
-atuin-common = { path = "../atuin-common", version = "18.5.0" }
-atuin-server-database = { path = "../atuin-server-database", version = "18.5.0" }
+atuin-common = { path = "../atuin-common", version = "18.6.0-beta.1" }
+atuin-server-database = { path = "../atuin-server-database", version = "18.6.0-beta.1" }
 
 tracing = { workspace = true }
 time = { workspace = true }
diff --git a/crates/atuin/Cargo.toml b/crates/atuin/Cargo.toml
index a31d3df7..07a2c691 100644
--- a/crates/atuin/Cargo.toml
+++ b/crates/atuin/Cargo.toml
@@ -42,14 +42,14 @@ clipboard = ["arboard"]
 check-update = ["atuin-client/check-update"]
 
 [dependencies]
-atuin-server-postgres = { path = "../atuin-server-postgres", version = "18.5.0", optional = true }
-atuin-server = { path = "../atuin-server", version = "18.5.0", optional = true }
-atuin-client = { path = "../atuin-client", version = "18.5.0", optional = true, default-features = false }
-atuin-common = { path = "../atuin-common", version = "18.5.0" }
-atuin-dotfiles = { path = "../atuin-dotfiles", version = "18.5.0" }
-atuin-history = { path = "../atuin-history", version = "18.5.0" }
-atuin-daemon = { path = "../atuin-daemon", version = "18.5.0", optional = true, default-features = false }
-atuin-scripts = { path = "../atuin-scripts", version = "18.5.0" }
+atuin-server-postgres = { path = "../atuin-server-postgres", version = "18.6.0-beta.1", optional = true }
+atuin-server = { path = "../atuin-server", version = "18.6.0-beta.1", optional = true }
+atuin-client = { path = "../atuin-client", version = "18.6.0-beta.1", optional = true, default-features = false }
+atuin-common = { path = "../atuin-common", version = "18.6.0-beta.1" }
+atuin-dotfiles = { path = "../atuin-dotfiles", version = "18.6.0-beta.1" }
+atuin-history = { path = "../atuin-history", version = "18.6.0-beta.1" }
+atuin-daemon = { path = "../atuin-daemon", version = "18.6.0-beta.1", optional = true, default-features = false }
+atuin-scripts = { path = "../atuin-scripts", version = "18.6.0-beta.1" }
 
 log = { workspace = true }
 time = { workspace = true }