S179: discovery renames — remove deprecated primal-named socket/IPC functions, capability-based validation messages

Deprecated socket path fallback removal (5 files):
- Removed resolve_beardog/songbird/nestgate_socket_fallback, resolve_squirrel_socket
- Callers migrated to resolve_capability_socket_fallback() / resolve_routing_socket()

Deprecated IPC alias removal (4 files):
- Removed get_default_songbird_socket, register_with_songbird
- Removed SONGBIRD_SOCKET env var fallback from resolve_coordination_socket()
- Updated re-exports in ipc_helpers/mod.rs and ipc/mod.rs

Validation message evolution (4 files):
- Songbird/BearDog/NestGate/Squirrel → Coordination/Security/Storage/AI-routing service

Quality: Clippy clean, 21,624 tests, 0 failures
Made-with: Cursor

Author: westgate

crates/core/common/src/primal_sockets/mod.rs

@@ -12,7 +12,7 @@
 //! ## TRUE PRIMAL Architecture
 //!
 //! - **No HTTP**: All primal communication via unix sockets
-//! - **Songbird Handles External**: Only Songbird uses HTTP/TLS for external
+//! - **Coordination service (Songbird) handles external**: Only the coordination service (Songbird) uses HTTP/TLS for external
 //! - **Local IPC**: Fast, secure, pure Rust
 //! - **Discovery-Based**: Socket paths from environment/runtime
 
@@ -33,11 +33,8 @@ pub use discovery::{
     discover_socket_for_capability, discover_storage_socket,
 };
 pub use env::SocketPathEnv;
-#[allow(deprecated)]
 pub use paths::{
-    resolve_beardog_socket_fallback, resolve_biomeos_dir, resolve_capability_socket_fallback,
-    resolve_family_id, resolve_nestgate_socket_fallback, resolve_nucleus_socket,
-    resolve_routing_socket, resolve_runtime_dir, resolve_socket_path_for_service,
-    resolve_songbird_socket_fallback, resolve_squirrel_socket, resolve_toadstool_socket,
-    service_label_to_capability_id,
+    resolve_biomeos_dir, resolve_capability_socket_fallback, resolve_family_id,
+    resolve_nucleus_socket, resolve_routing_socket, resolve_runtime_dir,
+    resolve_socket_path_for_service, resolve_toadstool_socket, service_label_to_capability_id,
 };

crates/core/common/src/primal_sockets/paths.rs

@@ -81,52 +81,12 @@ pub fn resolve_capability_socket_fallback(capability: &str, env: &SocketPathEnv)
     resolve_biomeos_dir(env).join(format!("{cap}.sock"))
 }
 
-/// Pure logic: resolve crypto capability socket fallback (non-discovery path).
-#[deprecated(
-    since = "0.92.0",
-    note = "Use resolve_capability_socket_fallback(\"crypto\", env)"
-)]
-#[must_use]
-pub fn resolve_beardog_socket_fallback(env: &SocketPathEnv) -> PathBuf {
-    resolve_capability_socket_fallback("crypto", env)
-}
-
-/// Pure logic: resolve coordination capability socket fallback (non-discovery path).
-#[deprecated(
-    since = "0.92.0",
-    note = "Use resolve_capability_socket_fallback(\"coordination\", env)"
-)]
-#[must_use]
-pub fn resolve_songbird_socket_fallback(env: &SocketPathEnv) -> PathBuf {
-    resolve_capability_socket_fallback("coordination", env)
-}
-
-/// Pure logic: resolve storage capability socket fallback (non-discovery path).
-#[deprecated(
-    since = "0.92.0",
-    note = "Use resolve_capability_socket_fallback(\"storage\", env)"
-)]
-#[must_use]
-pub fn resolve_nestgate_socket_fallback(env: &SocketPathEnv) -> PathBuf {
-    resolve_capability_socket_fallback("storage", env)
-}
-
 /// Pure logic: resolve routing capability socket (non-discovery path).
 #[must_use]
 pub fn resolve_routing_socket(env: &SocketPathEnv) -> PathBuf {
     resolve_capability_socket_fallback("routing", env)
 }
 
-/// Pure logic: resolve legacy “squirrel” routing socket — same as [`resolve_routing_socket`].
-#[deprecated(
-    since = "0.92.0",
-    note = "Use resolve_routing_socket(env) or resolve_capability_socket_fallback(\"routing\", env)"
-)]
-#[must_use]
-pub fn resolve_squirrel_socket(env: &SocketPathEnv) -> PathBuf {
-    resolve_routing_socket(env)
-}
-
 /// Pure logic: resolve nucleus socket
 #[must_use]
 pub fn resolve_nucleus_socket(env: &SocketPathEnv) -> PathBuf {
@@ -247,35 +207,32 @@ mod tests {
     }
 
     #[test]
-    #[allow(deprecated)]
     fn test_resolve_beardog_socket_with_env_override() {
         let env = SocketPathEnv {
             beardog_socket: Some("/custom/beardog.sock".to_string()),
             ..test_env()
         };
-        let path = resolve_beardog_socket_fallback(&env);
+        let path = resolve_capability_socket_fallback("crypto", &env);
         assert_eq!(path, PathBuf::from("/custom/beardog.sock"));
     }
 
     #[test]
-    #[allow(deprecated)]
     fn test_resolve_songbird_socket_with_env_override() {
         let env = SocketPathEnv {
             songbird_socket: Some("/custom/songbird.sock".to_string()),
             ..test_env()
         };
-        let path = resolve_songbird_socket_fallback(&env);
+        let path = resolve_capability_socket_fallback("coordination", &env);
         assert_eq!(path, PathBuf::from("/custom/songbird.sock"));
     }
 
     #[test]
-    #[allow(deprecated)]
     fn test_resolve_nestgate_socket_with_env_override() {
         let env = SocketPathEnv {
             nestgate_socket: Some("/custom/nestgate.sock".to_string()),
             ..test_env()
         };
-        let path = resolve_nestgate_socket_fallback(&env);
+        let path = resolve_capability_socket_fallback("storage", &env);
         assert_eq!(path, PathBuf::from("/custom/nestgate.sock"));
     }
 

crates/core/common/src/primal_sockets/tests.rs

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //! Primal sockets tests
-#![allow(deprecated)]
 
 use std::path::PathBuf;
 
@@ -91,7 +90,7 @@ fn resolve_beardog_socket_uses_env_override() {
         ..test_env()
     };
     assert_eq!(
-        resolve_beardog_socket_fallback(&env),
+        resolve_capability_socket_fallback("crypto", &env),
         PathBuf::from("/custom/beardog.sock")
     );
 }
@@ -100,7 +99,7 @@ fn resolve_beardog_socket_uses_env_override() {
 fn resolve_beardog_socket_uses_biomeos_fallback() {
     let env = test_env();
     assert_eq!(
-        resolve_beardog_socket_fallback(&env),
+        resolve_capability_socket_fallback("crypto", &env),
         PathBuf::from("/run/user/1000/biomeos/crypto.sock")
     );
 }
@@ -112,7 +111,7 @@ fn resolve_songbird_socket_uses_env_override() {
         ..test_env()
     };
     assert_eq!(
-        resolve_songbird_socket_fallback(&env),
+        resolve_capability_socket_fallback("coordination", &env),
         PathBuf::from("/custom/songbird.sock")
     );
 }
@@ -121,7 +120,7 @@ fn resolve_songbird_socket_uses_env_override() {
 fn resolve_songbird_socket_uses_biomeos_fallback() {
     let env = test_env();
     assert_eq!(
-        resolve_songbird_socket_fallback(&env),
+        resolve_capability_socket_fallback("coordination", &env),
         PathBuf::from("/run/user/1000/biomeos/coordination.sock")
     );
 }
@@ -133,7 +132,7 @@ fn resolve_nestgate_socket_uses_env_override() {
         ..test_env()
     };
     assert_eq!(
-        resolve_nestgate_socket_fallback(&env),
+        resolve_capability_socket_fallback("storage", &env),
         PathBuf::from("/custom/nestgate.sock")
     );
 }
@@ -142,7 +141,7 @@ fn resolve_nestgate_socket_uses_env_override() {
 fn resolve_nestgate_socket_uses_biomeos_fallback() {
     let env = test_env();
     assert_eq!(
-        resolve_nestgate_socket_fallback(&env),
+        resolve_capability_socket_fallback("storage", &env),
         PathBuf::from("/run/user/1000/biomeos/storage.sock")
     );
 }
@@ -154,7 +153,7 @@ fn resolve_squirrel_socket_uses_env_override() {
         ..test_env()
     };
     assert_eq!(
-        resolve_squirrel_socket(&env),
+        resolve_routing_socket(&env),
         PathBuf::from("/custom/squirrel.sock")
     );
 }
@@ -163,7 +162,7 @@ fn resolve_squirrel_socket_uses_env_override() {
 fn resolve_squirrel_socket_uses_biomeos_fallback() {
     let env = test_env();
     assert_eq!(
-        resolve_squirrel_socket(&env),
+        resolve_routing_socket(&env),
         PathBuf::from("/run/user/1000/biomeos/routing.sock")
     );
 }
@@ -235,7 +234,6 @@ fn resolve_toadstool_socket_uses_biomeos_fallback() {
 }
 
 #[test]
-#[allow(deprecated)]
 fn resolve_service_socket_override_takes_precedence() {
     let env = test_env();
     let override_path = PathBuf::from("/override/custom.sock");
@@ -244,23 +242,20 @@ fn resolve_service_socket_override_takes_precedence() {
 }
 
 #[test]
-#[allow(deprecated)]
 fn resolve_service_socket_beardog() {
     let env = test_env();
     let result = resolve_socket_path_for_service("beardog", &env, None);
     assert_eq!(result, PathBuf::from("/run/user/1000/biomeos/crypto.sock"));
 }
 
 #[test]
-#[allow(deprecated)]
 fn resolve_service_socket_beardog_alias() {
     let env = test_env();
     let result = resolve_socket_path_for_service("bear-dog", &env, None);
     assert_eq!(result, PathBuf::from("/run/user/1000/biomeos/crypto.sock"));
 }
 
 #[test]
-#[allow(deprecated)]
 fn resolve_service_socket_songbird() {
     let env = test_env();
     let result = resolve_socket_path_for_service("songbird", &env, None);
@@ -271,7 +266,6 @@ fn resolve_service_socket_songbird() {
 }
 
 #[test]
-#[allow(deprecated)]
 fn resolve_service_socket_toadstool() {
     let env = test_env();
     let result = resolve_socket_path_for_service("toadstool", &env, None);
@@ -282,15 +276,13 @@ fn resolve_service_socket_toadstool() {
 }
 
 #[test]
-#[allow(deprecated)]
 fn resolve_service_socket_nucleus() {
     let env = test_env();
     let result = resolve_socket_path_for_service("nucleus", &env, None);
     assert_eq!(result, PathBuf::from("/run/user/1000/biomeos/nucleus.sock"));
 }
 
 #[test]
-#[allow(deprecated)]
 fn resolve_service_socket_unknown_falls_through() {
     let env = test_env();
     let result = resolve_socket_path_for_service("myservice", &env, None);
@@ -301,7 +293,6 @@ fn resolve_service_socket_unknown_falls_through() {
 }
 
 #[test]
-#[allow(deprecated)]
 fn resolve_service_socket_case_insensitive() {
     let env = test_env();
     let result = resolve_socket_path_for_service("BearDog", &env, None);
@@ -398,10 +389,7 @@ fn test_ensure_biomeos_dir_creates_dir() {
 #[test]
 fn test_resolve_socket_path_for_service_unknown_with_env_override() {
     let service_name = format!("testsvc_{}", std::process::id());
-    let env_var = format!(
-        "{}_SOCKET",
-        service_name.to_uppercase().replace('-', "_")
-    );
+    let env_var = format!("{}_SOCKET", service_name.to_uppercase().replace('-', "_"));
     let custom_path = "/tmp/custom-test.sock";
     temp_env::with_var(&env_var, Some(custom_path), || {
         let env = SocketPathEnv::from_env();
@@ -412,7 +400,6 @@ fn test_resolve_socket_path_for_service_unknown_with_env_override() {
 }
 
 #[test]
-#[allow(deprecated)]
 fn test_resolve_service_socket_empty_service_name() {
     let env = test_env();
     let result = resolve_socket_path_for_service("", &env, None);

crates/core/common/tests/discovery_coverage_s155_tests.rs

@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: AGPL-3.0-only
-#![allow(deprecated)]
 //! Discovery coverage tests for primal discovery, service discovery, primal sockets,
 //! primal identity, universal adapter, and capability provider modules.
 
@@ -16,10 +15,9 @@ use toadstool_common::primal_identity::{
     DiscoveryCapability, ServiceEndpoint, StorageCapability,
 };
 use toadstool_common::primal_sockets::{
-    SocketDiscoveryError, SocketPathEnv, resolve_beardog_socket_fallback, resolve_biomeos_dir,
-    resolve_family_id, resolve_nestgate_socket_fallback, resolve_nucleus_socket,
-    resolve_runtime_dir, resolve_socket_path_for_service, resolve_songbird_socket_fallback,
-    resolve_squirrel_socket, resolve_toadstool_socket,
+    SocketDiscoveryError, SocketPathEnv, resolve_biomeos_dir, resolve_capability_socket_fallback,
+    resolve_family_id, resolve_nucleus_socket, resolve_routing_socket, resolve_runtime_dir,
+    resolve_socket_path_for_service, resolve_toadstool_socket,
 };
 use toadstool_common::service_discovery::{
     DiscoveredService, DiscoveryMethod as SvcDiscoveryMethod,
@@ -304,28 +302,28 @@ fn test_resolve_beardog_socket() {
         beardog_socket: Some("/custom/beardog.sock".to_string()),
         ..test_socket_env()
     };
-    let path = resolve_beardog_socket_fallback(&env);
+    let path = resolve_capability_socket_fallback("crypto", &env);
     assert_eq!(path, PathBuf::from("/custom/beardog.sock"));
 }
 
 #[test]
 fn test_resolve_songbird_socket() {
     let env = test_socket_env();
-    let path = resolve_songbird_socket_fallback(&env);
+    let path = resolve_capability_socket_fallback("coordination", &env);
     assert!(path.to_string_lossy().contains("coordination"));
 }
 
 #[test]
 fn test_resolve_nestgate_socket() {
     let env = test_socket_env();
-    let path = resolve_nestgate_socket_fallback(&env);
+    let path = resolve_capability_socket_fallback("storage", &env);
     assert!(path.to_string_lossy().contains("storage"));
 }
 
 #[test]
-fn test_resolve_squirrel_socket() {
+fn test_resolve_routing_socket() {
     let env = test_socket_env();
-    let path = resolve_squirrel_socket(&env);
+    let path = resolve_routing_socket(&env);
     assert!(path.to_string_lossy().contains("routing"));
 }