Merge pull request #2987 from spacedriveapp/cursor/device-proxy-pairing-651c

Proxy pairing

Author: jamiepine

.github/workflows/release.yml

@@ -259,6 +259,15 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Verify native deps were downloaded
+        if: runner.os == 'Linux'
+        run: |
+          echo "Checking apps/.deps directory:"
+          ls -la apps/.deps/ || echo "Directory doesn't exist"
+          echo "Checking apps/.deps/lib directory:"
+          ls -la apps/.deps/lib/ || echo "lib/ subdirectory doesn't exist - creating empty dir"
+          mkdir -p apps/.deps/lib
+
       - name: Build
         working-directory: apps/tauri
         run: |

TODO

@@ -32,7 +32,7 @@ Journey to v2.0.0-pre.1:
 ✔ Fix volume reactivity @done(26-01-20 14:59)
 ☐ Merge ephemeral results with indexed results to enable showing hidden files on demand
 ☐ Mobile explorer
-	☐ search
+	✔ search @done(26-01-22 12:21)
 	☐ inspector
 	☐ context menu
 	☐ view settings

apps/cli/src/domains/events/mod.rs

@@ -441,6 +441,26 @@ fn summarize_event(event: &Event) -> String {
 			format!("Sync error: {}", message)
 		}
 
+	// Proxy pairing events
+	Event::ProxyPairingConfirmationRequired {
+		vouchee_device_name,
+		voucher_device_name,
+		..
+	} => {
+		format!(
+			"Proxy pairing confirmation required: {} vouched by {}",
+			vouchee_device_name, voucher_device_name
+		)
+	}
+	Event::ProxyPairingVouchingReady {
+		vouchee_device_id, ..
+	} => {
+		format!("Proxy pairing vouching ready for device {}", vouchee_device_id)
+	}
+
+	// Config events
+	Event::ConfigChanged { .. } => "Configuration changed".to_string(),
+
 		// Custom events
 		Event::Custom { event_type, data } => {
 			format!("Custom event: {} - {:?}", event_type, data)
@@ -452,3 +472,4 @@ fn summarize_event(event: &Event) -> String {
 		}
 	}
 }
+}

apps/cli/src/domains/sync/mod.rs

@@ -24,10 +24,14 @@ pub enum SyncCmd {
 
 	/// Export sync event log
 	Events(SyncEventsArgs),
+
+	/// Show computed sync partners for this library
+	Partners,
 }
 
 pub async fn run(ctx: &Context, cmd: SyncCmd) -> Result<()> {
 	match cmd {
+		SyncCmd::Partners => show_partners(ctx).await?,
 		SyncCmd::Events(args) => export_events(ctx, args).await?,
 		SyncCmd::Metrics(args) => {
 			// Parse time filters
@@ -590,3 +594,95 @@ fn format_events_markdown(
 
 	output
 }
+
+async fn show_partners(ctx: &Context) -> Result<()> {
+	let library_id = ctx.library_id.ok_or_else(|| {
+		anyhow::anyhow!("No library selected. Use 'sd library switch' to select a library first.")
+	})?;
+
+	// Create input for the operation
+	let input = sd_core::ops::sync::get_sync_partners::GetSyncPartnersInput {};
+
+	let json_response = ctx.core.query(&input, Some(library_id)).await?;
+	let output: sd_core::ops::sync::get_sync_partners::GetSyncPartnersOutput =
+		serde_json::from_value(json_response)?;
+
+	println!("\n{}", "Sync Partners for Current Library".bold());
+	println!("{}", "═".repeat(60));
+	println!();
+
+	if output.partners.is_empty() {
+		println!("  {} No connected sync partners found", "●".red());
+		println!();
+		println!("  Possible reasons:");
+		println!("  - No other devices paired with this device");
+		println!("  - Paired devices are not in this library's devices table");
+		println!("  - Paired devices do not have sync_enabled=true");
+		println!();
+	} else {
+		println!("  {} {} sync partner(s) available", "●".green(), output.partners.len());
+		println!();
+
+		let mut table = Table::new();
+		table
+			.load_preset(UTF8_FULL)
+			.set_content_arrangement(ContentArrangement::Dynamic)
+			.set_header(Row::from(vec![
+				Cell::new("Device UUID").add_attribute(Attribute::Bold),
+				Cell::new("Name").add_attribute(Attribute::Bold),
+				Cell::new("Status").add_attribute(Attribute::Bold),
+			]));
+
+		for partner in &output.partners {
+			table.add_row(vec![
+				partner.device_uuid.to_string(),
+				partner.device_name.clone(),
+				if partner.is_paired {
+					"✓ Paired".green().to_string()
+				} else {
+					"○ Not Paired".dark_grey().to_string()
+				},
+			]);
+		}
+
+		println!("{}", table);
+		println!();
+	}
+
+	// Show debug info
+	println!("{}", "Library Membership Debug".dark_grey().bold());
+	println!("{}", "─".repeat(60).dark_grey());
+	println!();
+	println!("  Total devices in library: {}", output.debug_info.total_devices);
+	println!("  Devices with sync_enabled: {}", output.debug_info.sync_enabled_devices);
+	println!("  Devices with NodeId mapping: {}", output.debug_info.paired_devices);
+	println!("  Final sync partners: {}", output.debug_info.final_sync_partners);
+	println!();
+
+	if !output.debug_info.device_details.is_empty() {
+		let mut debug_table = Table::new();
+		debug_table
+			.load_preset(UTF8_FULL)
+			.set_content_arrangement(ContentArrangement::Dynamic)
+			.set_header(Row::from(vec![
+				Cell::new("Device").add_attribute(Attribute::Bold).fg(Color::DarkGrey),
+				Cell::new("Sync Enabled").add_attribute(Attribute::Bold).fg(Color::DarkGrey),
+				Cell::new("Has NodeId").add_attribute(Attribute::Bold).fg(Color::DarkGrey),
+				Cell::new("NodeId").add_attribute(Attribute::Bold).fg(Color::DarkGrey),
+			]));
+
+		for device in &output.debug_info.device_details {
+			debug_table.add_row(vec![
+				Cell::new(&device.name).fg(Color::DarkGrey),
+				Cell::new(if device.sync_enabled { "✓" } else { "✗" }).fg(Color::DarkGrey),
+				Cell::new(if device.has_node_id { "✓" } else { "✗" }).fg(Color::DarkGrey),
+				Cell::new(device.node_id.as_deref().unwrap_or("-")).fg(Color::DarkGrey),
+			]);
+		}
+
+		println!("{}", debug_table);
+		println!();
+	}
+
+	Ok(())
+}

apps/mobile/src/screens/overview/components/DevicePanel.tsx

@@ -20,7 +20,7 @@ import { useVolumeIndexingStore } from "../../../stores";
 
 // Temporary type extension
 type DeviceWithConnection = Device & {
-	connection_method?: "Direct" | "Relay" | "Mixed" | null;
+	connection_method?: "LocalNetwork" | "DirectInternet" | "RelayProxy" | null;
 };
 
 function formatBytes(bytes: number): string {
@@ -194,14 +194,14 @@ export function DevicePanel({ onLocationSelect }: DevicePanelProps = {}) {
 }
 
 interface ConnectionBadgeProps {
-	method: "Direct" | "Relay" | "Mixed";
+	method: "LocalNetwork" | "DirectInternet" | "RelayProxy";
 }
 
 function ConnectionBadge({ method }: ConnectionBadgeProps) {
 	const labels = {
-		Direct: "Local",
-		Relay: "Relay",
-		Mixed: "Mixed",
+		LocalNetwork: "Local",
+		DirectInternet: "Direct",
+		RelayProxy: "Relay",
 	};
 
 	return (

core/examples/library_demo.rs

@@ -97,7 +97,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 			created_at: Set(device.created_at),
 			updated_at: Set(device.updated_at),
 			sync_enabled: Set(false),
-			last_sync_at: Set(None),
 		};
 		let inserted_device = device_model.insert(db.conn()).await?;
 		println!("   ✓ Device registered");

core/src/bin/daemon.rs

@@ -32,7 +32,7 @@ struct Args {
 }
 
 #[tokio::main]
-async fn main() -> Result<(), Box<dyn std::error::Error>> {
+async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
 	let args = Args::parse();
 
 	// Resolve base data directory

core/src/config/app_config.rs

@@ -37,6 +37,10 @@ pub struct AppConfig {
 	/// Daemon logging configuration with multi-stream support
 	#[serde(default)]
 	pub logging: LoggingConfig,
+
+	/// Proxy pairing configuration
+	#[serde(default)]
+	pub proxy_pairing: ProxyPairingConfig,
 }
 
 /// Configuration for core services
@@ -134,6 +138,33 @@ pub struct LoggingConfig {
 	pub streams: Vec<LogStreamConfig>,
 }
 
+/// Proxy pairing configuration
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ProxyPairingConfig {
+	/// Automatically accept vouches from trusted devices
+	pub auto_accept_vouched: bool,
+	/// Automatically vouch new devices to all paired devices
+	pub auto_vouch_to_all: bool,
+	/// Maximum age of vouch signatures in seconds
+	pub vouch_signature_max_age: u64,
+	/// Timeout for proxy confirmation in seconds
+	pub vouch_response_timeout: u64,
+	/// Maximum retries for queued vouches
+	pub vouch_queue_retry_limit: u32,
+}
+
+impl Default for ProxyPairingConfig {
+	fn default() -> Self {
+		Self {
+			auto_accept_vouched: true,
+			auto_vouch_to_all: false,
+			vouch_signature_max_age: 300,
+			vouch_response_timeout: 60,
+			vouch_queue_retry_limit: 5,
+		}
+	}
+}
+
 impl Default for LoggingConfig {
 	fn default() -> Self {
 		Self {
@@ -210,6 +241,7 @@ impl AppConfig {
 			job_logging: JobLoggingConfig::default(),
 			services: ServiceConfig::default(),
 			logging: LoggingConfig::default(),
+			proxy_pairing: ProxyPairingConfig::default(),
 		}
 	}
 
@@ -273,7 +305,7 @@ impl Migrate for AppConfig {
 	}
 
 	fn target_version() -> u32 {
-		4 // Updated schema version for multi-stream logging
+		5 // Added proxy pairing configuration
 	}
 
 	fn migrate(&mut self) -> Result<()> {
@@ -301,7 +333,13 @@ impl Migrate for AppConfig {
 				self.version = 4;
 				Ok(())
 			}
-			4 => Ok(()), // Already at target version
+			4 => {
+				// Migration from v4 to v5: Add proxy pairing configuration
+				self.proxy_pairing = ProxyPairingConfig::default();
+				self.version = 5;
+				Ok(())
+			}
+			5 => Ok(()), // Already at target version
 			v => Err(anyhow!("Unknown config version: {}", v)),
 		}
 	}

core/src/device/manager.rs

@@ -345,7 +345,6 @@ impl DeviceManager {
 			is_online: true,
 			last_seen_at: chrono::Utc::now(),
 			sync_enabled: true,
-			last_sync_at: None,
 			created_at: chrono::Utc::now(),
 			updated_at: chrono::Utc::now(),
 			// Ephemeral fields