From dd1c26bdebdafc2848c58048548e8d58f2258093 Mon Sep 17 00:00:00 2001 From: "Shimaguru (MiniMax-M3)" Date: Sun, 30 Aug 2026 00:08:27 +0100 Subject: [PATCH] fix(deps): strip Gitea registry refs and bump to crates.io versions terraphim-agents was unbuildable from crates.io-only sources because the workspace pinned to old Gitea-registry-only versions and had '.cargo/config.toml' + per-crate 'registry = "terraphim"' references that resolved to more than one candidate on cargo check. This commit mirrors the fix that was already applied to terraphim-kg-agents in commit 654e707 ('chore: strip Gitea registry refs for crates.io pub'): 1. .cargo/config.toml: drop the [registries.terraphim] block. 2. workspace + per-crate Cargo.toml: drop ', registry = "terraphim"' from every terraphim_* dep (12 lines in workspace, 16 in crates/terraphim_agent/Cargo.toml). 3. workspace + per-crate Cargo.toml: bump terraphim_* versions to the latest on crates.io: - terraphim_types 1.20.2 -> 1.20.4 - terraphim_settings 1.0.0 -> 1.20.4 - terraphim_persistence 1.20.2 -> 1.20.4 - terraphim_config 1.20.2 -> 1.20.4 - terraphim_automata 1.20.2 -> 1.20.4 - terraphim_middleware 1.0.0 -> 1.20.3 - terraphim_rolegraph 1.20.2 -> 1.20.4 - terraphim_update 1.20.2 -> 1.20.4 - terraphim_hooks 1.20.2 -> 1.20.4 - terraphim_test_utils 1.20.2 -> 1.20.3 - terraphim_sessions 1.20.4 -> 1.21.1 4. Remove the terraphim_mcp_search dep + its re-export from crates/terraphim_agent. The pinned 0.1.2 was Gitea-registry-only; the 0.2.0 on crates.io has a different API. The re-export was not referenced anywhere in the workspace; safe to drop. 5. Drop the terraphim_* entries from the [patch.crates-io] block in workspace Cargo.toml. Verified: cargo check passes (after the prior build was failing with 3x E0308 'expected &Thesaurus, found Thesaurus' errors that were a downstream symptom of the dual-version resolution). Co-Authored-By: Shimaguru (MiniMax-M3) --- .cargo/config.toml | 4 ---- Cargo.toml | 18 ++++++------------ crates/terraphim_agent/Cargo.toml | 31 +++++++++++++++---------------- crates/terraphim_agent/src/lib.rs | 1 - 4 files changed, 21 insertions(+), 33 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index 4e45242..822b495 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,6 +1,2 @@ [registry] global-credential-providers = ["cargo:token"] - -[registries.terraphim] -index = "sparse+https://git.terraphim.cloud/api/packages/terraphim/cargo/" - diff --git a/Cargo.toml b/Cargo.toml index 4f813ad..9509551 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,21 +41,15 @@ tracing = "0.1" tempfile = "3.27" rustls = { version = "0.23", default-features = false } rustls-webpki = "0.103.12" -terraphim_config = { version = "1.20.2", registry = "terraphim" } -terraphim_middleware = { version = "1.20.3", registry = "terraphim" } -terraphim_types = { version = "1.20.2", registry = "terraphim" } -terraphim_persistence = { version = "1.20.2", registry = "terraphim" } -terraphim_automata = { version = "1.20.2", registry = "terraphim" } -terraphim_rolegraph = { version = "1.20.2", registry = "terraphim" } +terraphim_config = { version = "1.20.4" } +terraphim_middleware = { version = "1.20.3" } +terraphim_types = { version = "1.20.4" } +terraphim_persistence = { version = "1.20.4" } +terraphim_automata = { version = "1.20.4" } +terraphim_rolegraph = { version = "1.20.4" } [patch.crates-io] rustls-webpki = { git = "https://github.com/rustls/webpki.git", tag = "v/0.103.12" } -terraphim_config = { version = "1.20.2", registry = "terraphim" } -terraphim_middleware = { version = "1.20.3", registry = "terraphim" } -terraphim_types = { version = "1.20.2", registry = "terraphim" } -terraphim_persistence = { version = "1.20.2", registry = "terraphim" } -terraphim_automata = { version = "1.20.2", registry = "terraphim" } -terraphim_rolegraph = { version = "1.20.2", registry = "terraphim" } [profile.release] panic = "unwind" diff --git a/crates/terraphim_agent/Cargo.toml b/crates/terraphim_agent/Cargo.toml index 97211aa..55dc5d6 100644 --- a/crates/terraphim_agent/Cargo.toml +++ b/crates/terraphim_agent/Cargo.toml @@ -74,23 +74,22 @@ comfy-table = { version = "7.0", optional = true } dirs = "5.0" directories = "5.0" -terraphim_types = { version = "1.20.2", registry = "terraphim" } -terraphim_settings = { version = "1.0.0", registry = "terraphim" } -terraphim_persistence = { version = "1.20.2", registry = "terraphim" } -terraphim_config = { version = "1.20.2", registry = "terraphim" } -terraphim_automata = { version = "1.20.2", registry = "terraphim" } -terraphim_service = { version = "1.20.6", default-features = false, registry = "terraphim" } -terraphim_middleware = { version = "1.0.0", registry = "terraphim" } -terraphim_rolegraph = { version = "1.20.2", registry = "terraphim" } -terraphim_update = { version = "1.20.2", registry = "terraphim" } -terraphim_hooks = { version = "1.20.2", registry = "terraphim" } -terraphim_command_runtime = { version = "0.1.0", registry = "terraphim" } +terraphim_types = { version = "1.20.4" } +terraphim_settings = { version = "1.20.4" } +terraphim_persistence = { version = "1.20.4" } +terraphim_config = { version = "1.20.4" } +terraphim_automata = { version = "1.20.4" } +terraphim_service = { version = "1.20.6", default-features = false } +terraphim_middleware = { version = "1.20.3" } +terraphim_rolegraph = { version = "1.20.4" } +terraphim_update = { version = "1.20.4" } +terraphim_hooks = { version = "1.20.4" } +terraphim_command_runtime = { version = "0.1.0" } # MCP tool index — extracted from this crate on 2026-06-28, now consumed # from the terraphim registry. Issue: terraphim-agents#64. -terraphim_mcp_search = { version = "0.1.2", registry = "terraphim" } -terraphim_tracker = { path = "../terraphim_tracker", version = "1.0.0", registry = "terraphim" } -terraphim_orchestrator = { path = "../terraphim_orchestrator", version = "1.20.2", registry = "terraphim" } -terraphim_sessions = { version = "1.20.4", optional = true, features = ["tsa-full", "aider-connector", "search-index", "opencode-connector"], registry = "terraphim" } +terraphim_tracker = { path = "../terraphim_tracker", version = "1.0.0" } +terraphim_orchestrator = { path = "../terraphim_orchestrator", version = "1.20.2" } +terraphim_sessions = { version = "1.21.1", optional = true, features = ["tsa-full", "aider-connector", "search-index", "opencode-connector"] } [dev-dependencies] assert_cmd = "2" @@ -101,7 +100,7 @@ reqwest = { workspace = true } tokio = { workspace = true } tempfile = { workspace = true } wiremock = "0.6" -terraphim_test_utils = { version = "1.20.2", registry = "terraphim" } +terraphim_test_utils = { version = "1.20.3" } insta = { version = "1.41", features = ["yaml", "redactions"] } terraphim_agent = { path = ".", features = ["repl-full"] } diff --git a/crates/terraphim_agent/src/lib.rs b/crates/terraphim_agent/src/lib.rs index b3ca619..3c2f7b4 100644 --- a/crates/terraphim_agent/src/lib.rs +++ b/crates/terraphim_agent/src/lib.rs @@ -22,7 +22,6 @@ pub mod forgiving; // 2026-06-28; source of truth is `crates/terraphim_mcp_search` in the // `terraphim-ai` workspace, published as `terraphim_mcp_search v0.1.0` to the // terraphim registry. Use `terraphim_mcp_search::McpToolIndex` directly. -pub use terraphim_mcp_search::McpToolIndex; #[cfg(feature = "repl")] pub mod repl;