Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
chore(cache): switch to upstream turso (#5885)
Sean Aye0bc589033e16
diff --git a/Cargo.lock b/Cargo.lockindex 25dcfed822..3c24ee5451 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -16491,7 +16491,7 @@ dependencies = [[[package]]name = "turso_core"version = "0.8.0-pre.3"-source = "git+https://github.com/seanaye/turso?rev=be9acfe9e5e6efb17911af84047e4855cace53a3#be9acfe9e5e6efb17911af84047e4855cace53a3"+source = "git+https://github.com/tursodatabase/turso?rev=79163249538197d01dec5ea7f65519454ed792e2#79163249538197d01dec5ea7f65519454ed792e2"dependencies = ["aegis","aes",@@ -16562,7 +16562,7 @@ dependencies = [[[package]]name = "turso_ext"version = "0.8.0-pre.3"-source = "git+https://github.com/seanaye/turso?rev=be9acfe9e5e6efb17911af84047e4855cace53a3#be9acfe9e5e6efb17911af84047e4855cace53a3"+source = "git+https://github.com/tursodatabase/turso?rev=79163249538197d01dec5ea7f65519454ed792e2#79163249538197d01dec5ea7f65519454ed792e2"dependencies = ["chrono","getrandom 0.4.2",@@ -16572,7 +16572,7 @@ dependencies = [[[package]]name = "turso_macros"version = "0.8.0-pre.3"-source = "git+https://github.com/seanaye/turso?rev=be9acfe9e5e6efb17911af84047e4855cace53a3#be9acfe9e5e6efb17911af84047e4855cace53a3"+source = "git+https://github.com/tursodatabase/turso?rev=79163249538197d01dec5ea7f65519454ed792e2#79163249538197d01dec5ea7f65519454ed792e2"dependencies = ["proc-macro2","quote",@@ -16582,7 +16582,7 @@ dependencies = [[[package]]name = "turso_parser"version = "0.8.0-pre.3"-source = "git+https://github.com/seanaye/turso?rev=be9acfe9e5e6efb17911af84047e4855cace53a3#be9acfe9e5e6efb17911af84047e4855cace53a3"+source = "git+https://github.com/tursodatabase/turso?rev=79163249538197d01dec5ea7f65519454ed792e2#79163249538197d01dec5ea7f65519454ed792e2"dependencies = ["bitflags 2.11.1","memchr",diff --git a/Cargo.toml b/Cargo.tomlindex ff421905d5..3c2d35aac1 100644--- a/Cargo.toml+++ b/Cargo.toml@@ -294,9 +294,9 @@ tracing = "0.1.44"tracing-opentelemetry = "0.32.1"tracing-subscriber = { version = "0.3.22", features = ["env-filter", "json"] }tracing-tree = "0.4.0"-# Exact remotely available Turso fork revision approved by the browser cache G0.-# Its source tree is identical to the locally verified cf7de761 revision.-turso_core = { git = "https://github.com/seanaye/turso", rev = "be9acfe9e5e6efb17911af84047e4855cace53a3", default-features = false }+# Pin the official upstream revision used by the browser cache. Cache writes use+# deferred transactions so browser WASM does not initialize Turso's temp database.+turso_core = { git = "https://github.com/tursodatabase/turso", rev = "79163249538197d01dec5ea7f65519454ed792e2", default-features = false }tungstenite = { version = "0.28", features = ["url"] }unsynn = "0.3"urlencoding = "2.1.3"diff --git a/apps/web/tauri/Cargo.lock b/apps/web/tauri/Cargo.lockindex 401566c268..d835b79503 100644--- a/apps/web/tauri/Cargo.lock+++ b/apps/web/tauri/Cargo.lock@@ -7251,7 +7251,7 @@ dependencies = [[[package]]name = "turso_core"version = "0.8.0-pre.3"-source = "git+https://github.com/seanaye/turso?rev=be9acfe9e5e6efb17911af84047e4855cace53a3#be9acfe9e5e6efb17911af84047e4855cace53a3"+source = "git+https://github.com/tursodatabase/turso?rev=79163249538197d01dec5ea7f65519454ed792e2#79163249538197d01dec5ea7f65519454ed792e2"dependencies = ["aegis","aes",@@ -7322,7 +7322,7 @@ dependencies = [[[package]]name = "turso_ext"version = "0.8.0-pre.3"-source = "git+https://github.com/seanaye/turso?rev=be9acfe9e5e6efb17911af84047e4855cace53a3#be9acfe9e5e6efb17911af84047e4855cace53a3"+source = "git+https://github.com/tursodatabase/turso?rev=79163249538197d01dec5ea7f65519454ed792e2#79163249538197d01dec5ea7f65519454ed792e2"dependencies = ["chrono","getrandom 0.4.2",@@ -7332,7 +7332,7 @@ dependencies = [[[package]]name = "turso_macros"version = "0.8.0-pre.3"-source = "git+https://github.com/seanaye/turso?rev=be9acfe9e5e6efb17911af84047e4855cace53a3#be9acfe9e5e6efb17911af84047e4855cace53a3"+source = "git+https://github.com/tursodatabase/turso?rev=79163249538197d01dec5ea7f65519454ed792e2#79163249538197d01dec5ea7f65519454ed792e2"dependencies = ["proc-macro2","quote",@@ -7342,7 +7342,7 @@ dependencies = [[[package]]name = "turso_parser"version = "0.8.0-pre.3"-source = "git+https://github.com/seanaye/turso?rev=be9acfe9e5e6efb17911af84047e4855cace53a3#be9acfe9e5e6efb17911af84047e4855cace53a3"+source = "git+https://github.com/tursodatabase/turso?rev=79163249538197d01dec5ea7f65519454ed792e2#79163249538197d01dec5ea7f65519454ed792e2"dependencies = ["bitflags 2.11.1","memchr",diff --git a/crates/client/cache-turso/src/driver.rs b/crates/client/cache-turso/src/driver.rsindex 3c621b9efa..b89041428d 100644--- a/crates/client/cache-turso/src/driver.rs+++ b/crates/client/cache-turso/src/driver.rs@@ -175,7 +175,12 @@ pub(crate) fn write_transaction<T>(connection: &Arc<Connection>,operation: impl FnOnce() -> Result<T, TursoStorageError>,) -> Result<T, TursoStorageError> {- transaction(connection, "BEGIN IMMEDIATE", operation)+ // BEGIN IMMEDIATE eagerly initializes Turso's temp database, which reads+ // std::time::Instant and is unsupported in browser WASM. The connection is+ // cache-local and operations are serialized, so a deferred write+ // transaction provides the required atomicity without reserving the writer+ // lock before the first write statement.+ transaction(connection, "BEGIN", operation)}fn transaction<T>(diff --git a/crates/client/cache-turso/src/storage/test.rs b/crates/client/cache-turso/src/storage/test.rsindex b47f3d265f..748405e94e 100644--- a/crates/client/cache-turso/src/storage/test.rs+++ b/crates/client/cache-turso/src/storage/test.rs@@ -948,10 +948,7 @@ fn reset_health_latch_blocks_every_method_without_touching_turso() {#[test]fn statement_cleanup_failures_are_uncertain_and_begin_cleanup_attempts_rollback() {block_on(async {- for (name, sql) in [- ("begin-reset", "BEGIN IMMEDIATE"),- ("write-reset", RECORD_UPSERT),- ] {+ for (name, sql) in [("begin-reset", "BEGIN"), ("write-reset", RECORD_UPSERT)] {let database = TursoMemoryDatabase::new(format!("{name}.db"));let mut storage = database.open("scope").unwrap();driver::clear_control_trace();diff --git a/nix-support/root-cargo-output-hashes.nix b/nix-support/root-cargo-output-hashes.nixindex 9f96b4a07a..cf35d8a39f 100644--- a/nix-support/root-cargo-output-hashes.nix+++ b/nix-support/root-cargo-output-hashes.nix@@ -1,6 +1,6 @@{- "git+https://github.com/seanaye/turso?rev=be9acfe9e5e6efb17911af84047e4855cace53a3#be9acfe9e5e6efb17911af84047e4855cace53a3" =- "sha256-BTS0ypmcVWne+m0BQp/VT2O6mOFB/cc9F1TgQMo48aM=";+ "git+https://github.com/tursodatabase/turso?rev=79163249538197d01dec5ea7f65519454ed792e2#79163249538197d01dec5ea7f65519454ed792e2" =+ "sha256-7Noz7RMN+4nhlU5BBLzxZZ53nNFGewrr8BFMO1adkCo=";"git+https://github.com/whutchinson98/jsonwebtoken#c8c0d19511a0e7ba9d456e21437a79d321e99f16" ="sha256-jllT52SAIiNpTPg7Vm3wmT79w/CIz9NnVKM81oQq8dM=";"git+https://github.com/macro-inc/rig?branch=feat/responses-api-non-strict-tools#6deadfc6f9b432c849ea79733a549f46407530b7" =diff --git a/nix/tauri-desktop.nix b/nix/tauri-desktop.nixindex d36fec5e7e..e4f675416b 100644--- a/nix/tauri-desktop.nix+++ b/nix/tauri-desktop.nix@@ -149,8 +149,8 @@"sha256-5ErLW2po5ZlTTuJjsCExwC//rHYcQo2tKXiyz3w/0kQ=";"git+https://github.com/macro-inc/plugins-workspace?rev=06474e4c446600627cf37a11f0c22c27bcf764ca#06474e4c446600627cf37a11f0c22c27bcf764ca" ="sha256-ngH5sltERe8DlP/zjsin9jmlGOZFeABk8SxJ5AnZG18=";- "git+https://github.com/seanaye/turso?rev=be9acfe9e5e6efb17911af84047e4855cace53a3#be9acfe9e5e6efb17911af84047e4855cace53a3" =- "sha256-BTS0ypmcVWne+m0BQp/VT2O6mOFB/cc9F1TgQMo48aM=";+ "git+https://github.com/tursodatabase/turso?rev=79163249538197d01dec5ea7f65519454ed792e2#79163249538197d01dec5ea7f65519454ed792e2" =+ "sha256-7Noz7RMN+4nhlU5BBLzxZZ53nNFGewrr8BFMO1adkCo=";"git+https://github.com/seanaye/tauri?rev=95a7521b#95a7521b8c565cfba568319ddd8ba79c9ce244e2" ="sha256-5HamTWAZPtUSWOfP3TgtiqFJvunlPXy9/C0TLHQpXlU=";"git+https://github.com/voxelbee/tauri-plugin-virtual-keyboard?branch=main#70e8e8325b5ff7d681ef5f3b996ac083d4fc5a01" =