Skip to content

chore(desktop): remove dead code warnings on non-Windows builds #1416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
swjnxyf merged 1 commit into from
Nov 10, 2026
Merged

chore(desktop): remove dead code warnings on non-Windows builds #1416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions apps/desktop/src-tauri/src/computer_control/presentation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
//! Native activity hints and local Escape detection never own execution authority.
#[cfg(windows)]
use std::sync::atomic::AtomicBool;
#[cfg(windows)]
use std::sync::atomic::Ordering;
#[cfg(windows)]
use tauri::{AppHandle, Manager};

#[derive(Default)]
pub struct Presentation {
#[cfg(windows)]
pub controlling: AtomicBool,
#[cfg(windows)]
pub shortcut_ready: AtomicBool,
}

#[cfg(windows)]
pub fn update_edge(app: &AppHandle, activity: bool) {
let monitors = app.available_monitors().unwrap_or_default();
for (index, monitor) in monitors.iter().enumerate().take(16) {
Expand Down
2 changes: 2 additions & 0 deletions apps/desktop/src-tauri/src/state/app_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
impl AppState {
#[cfg(test)]
pub fn new(data_dir: PathBuf, resource_dir: PathBuf) -> DesktopResult<Self> {
let desktop_data_dir = crate::desktop_data_dir::DesktopDataDir {
effective: data_dir,
Expand Down Expand Up @@ -391,6 +392,7 @@ impl AppState {
self.shutdown_with_deadline(deadline).await;
}

#[cfg(any(windows, test))]
pub(crate) async fn shutdown_until(&self, deadline: Deadline) {
self.shutdown_with_deadline(Some(deadline)).await;
}
Expand Down
272 changes: 0 additions & 272 deletions apps/desktop/src-tauri/src/state/desktop_core.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1007,255 +1007,6 @@ impl DesktopCore {
self.autostart_connections(cancellation).await?;
self.get_state().await
}
pub async fn configure_remote_setup(
&mut self,
server_url: &str,
pairing_code: &str,
project_path: &str,
cancellation: &CancellationContext,
) -> DesktopResult<DesktopStateSnapshot> {
cancellation.check()?;
self.preflight_providers()?;
let server_url = crate::webcodex::validate_server_url(server_url)?;
let project = self.adapter.inspect_project(project_path).await?;
cancellation.check()?;
let binaries = self.adapter.ensure_binaries(cancellation).await?.clone();
self.snapshot.binaries = Some(binaries.info());
crate::runtime_selection::verify_resolved_files(&binaries).await?;
let exposure = if server_url.starts_with("https://") {
Exposure::ExistingHttps {
url: server_url.clone(),
}
} else {
Exposure::None
};
let topology = RuntimeTopology {
experience: Experience::Full,
server: ServerTopology::Remote {
url: server_url.clone(),
},
runner: RunnerTopology::Local,
exposure,
enrollment: Enrollment::ManagedPairing,
};
self.snapshot.topology = Some(topology.clone());
self.stage_project_scope(project.clone());
self.config.topology = Some(topology.clone());
self.config.runtime_autostart = Some(true);
self.config.preferred_connection = Some(RegularConnectionPreference::NoChatGpt);
self.snapshot.readiness = aggregate_readiness(
ServerReadiness::Starting,
RunnerReadiness::Connecting,
if server_url.starts_with("https://") {
ExposureReadiness::Starting
} else {
ExposureReadiness::Degraded
},
ProjectReadiness::Configured,
);
self.activity.push(
ActivityEventKind::RemoteConnecting,
"desktop",
ActivityLevel::Info,
"Connecting this computer to the existing WebCodex Server",
);
self.publish_snapshot();

let reusable_identity = runner_identity_from_config(&self.config)
.filter(|identity| same_server(&identity.server_url, &server_url));
let saved_runner_client_id = stored_runner_client_id(&self.config);
let reusable_observation = match reusable_identity.as_ref() {
Some(identity) => self
.adapter
.observe_runner_connection(
identity,
saved_runner_client_id.as_deref(),
cancellation,
)
.await
.ok(),
None => None,
};
let (identity, identity_replaced, runner_client_id) = match (
reusable_identity,
reusable_observation,
) {
(Some(identity), Some(observation)) => (identity, false, observation.client_id),
_ => {
if !pairing_code.starts_with("wc_pair_") {
return Err(DesktopError::new(
"pairing_code_invalid",
"The saved Runner identity is not reusable and no new WebCodex pairing code was provided",
"Refresh this Runner connection with a new wc_pair_… code.",
));
}
let project_identity = self
.adapter
.login_with_pairing(
&server_url,
pairing_code,
&self.data_dir.join("connections"),
&project,
cancellation,
)
.await?;
let observation = self
.adapter
.observe_runner_connection(&project_identity, None, cancellation)
.await?;
// A remote pairing code is one-shot. Publish the newly
// validated connection identity before Runner/project
// activation so a later readiness failure can retry this
// same credential instead of forcing another pairing.
self.config.topology = Some(topology.clone());
self.store_identity(
&project,
&project_identity,
None,
Some(observation.client_id.clone()),
)
.await?;
cancellation.check()?;
(project_identity.runner, true, observation.client_id)
}
};

let server_deadline = Deadline::after(SERVER_READY_TIMEOUT);
let server_status = match self
.adapter
.server_status_until(
Some(&server_url),
None,
Some(&identity.user_token_file),
cancellation,
server_deadline,
)
.await
{
Ok(status) => status,
Err(error) => {
cancellation.check()?;
if server_deadline.is_elapsed() {
return Err(readiness_timeout_error(
"server_unreachable",
"The existing WebCodex Server did not respond before the readiness deadline",
"Check the Server URL and network path, then retry.",
));
}
return Err(error);
}
};
cancellation.check()?;
if !server_status.http_reachable {
return Err(DesktopError::new(
"server_unreachable",
"The existing WebCodex Server is not reachable",
"Check the Server URL and network path, then retry.",
));
}
let runner_deadline = Deadline::after(RUNNER_READY_TIMEOUT);
let replacing_owned_runner = identity_replaced
&& process_is_active(self.process_snapshot(ProcessKey::LocalRunner).await);
if replacing_owned_runner {
self.stop_process_until(ProcessKey::LocalRunner, runner_deadline)
.await;
cancellation.check()?;
}
let runner_ready = if identity_replaced {
false
} else {
self.adapter
.runner_ready_until(&identity, cancellation, runner_deadline)
.await
.unwrap_or(false)
};
cancellation.check()?;
let runner_started = if !runner_ready {
if runner_deadline.is_elapsed() {
return Err(readiness_timeout_error(
"runner_offline",
"Runner did not become connected",
"Check Server reachability and Runner diagnostics, then retry.",
));
}
self.spawn_configured_runner(&identity, cancellation)
.await?;
true
} else {
false
};
self.wait_for_runner(&identity, cancellation, runner_deadline, runner_started)
.await?;
let identity = match self
.adapter
.activate_project(&identity, &runner_client_id, &project, cancellation)
.await
{
Ok(identity) => identity,
Err(error)
if matches!(
error.code.as_str(),
"project_activation_capability_unavailable"
| "project_activation_restart_required"
) =>
{
if !can_refresh_legacy_runner(self.process_snapshot(ProcessKey::LocalRunner).await)
{
return Err(DesktopError::new(
"project_activation_legacy_runner",
"This Runner needs to be refreshed before the new project can be activated",
"Refresh the Runner, then select this project again.",
));
}
let legacy_identity = self
.adapter
.legacy_register_project(&identity, &runner_client_id, &project, cancellation)
.await?;
let legacy_deadline = Deadline::after(RUNNER_READY_TIMEOUT);
self.stop_process_until(ProcessKey::LocalRunner, legacy_deadline)
.await;
if legacy_deadline.is_elapsed() {
return Err(readiness_timeout_error(
"runner_offline",
"Desktop could not refresh its legacy Runner",
"Retry project setup after checking Runner diagnostics.",
));
}
self.spawn_configured_runner(&legacy_identity, cancellation)
.await?;
self.wait_for_runner(&legacy_identity, cancellation, legacy_deadline, true)
.await?;
legacy_identity
}
Err(error) => return Err(error),
};
self.wait_for_project(&identity, cancellation).await?;
cancellation.check()?;
self.config.topology = Some(topology);
self.store_identity(&project, &identity, None, Some(runner_client_id))
.await?;
self.snapshot.readiness = aggregate_readiness(
ServerReadiness::Ready,
RunnerReadiness::Ready,
if server_url.starts_with("https://") {
// HTTPS proves transport shape, not that ChatGPT can reach and
// authenticate to the MCP endpoint. D1 has no canonical remote
// MCP/handoff probe, so keep this explicitly unverified.
ExposureReadiness::Unknown
} else {
ExposureReadiness::Degraded
},
ProjectReadiness::Ready,
);
self.activity.push(
ActivityEventKind::RemoteConnected,
"desktop",
ActivityLevel::Info,
"This computer is connected to the existing WebCodex Server",
);
self.get_state().await
}

pub async fn start_quick_share(
&mut self,
project_path: &str,
Expand Down Expand Up @@ -1704,29 +1455,6 @@ impl DesktopCore {
}
}

async fn store_identity(
&mut self,
project: &ProjectSelection,
identity: &ProjectRuntimeIdentity,
server_env_file: Option<PathBuf>,
runner_client_id: Option<String>,
) -> DesktopResult<()> {
let mut project = project.clone();
project.runtime_project_id = Some(identity.runtime_project_id.clone());
self.config.project = Some(project.clone());
self.config.runtime = Some(StoredRuntime {
server_url: identity.server_url.clone(),
server_env_file,
runner_config: Some(identity.runner_config.clone()),
user_token_file: Some(identity.user_token_file.clone()),
runner_client_id,
project_id: Some(identity.project_id.clone()),
runtime_project_id: Some(identity.runtime_project_id.clone()),
});
self.snapshot.project = Some(project);
self.save_config().await
}

async fn save_config(&mut self) -> DesktopResult<()> {
tokio::fs::create_dir_all(&self.data_dir)
.await
Expand Down
Loading
Loading