Skip to content
This repository was archived by the owner on Oct 19, 2026. It is now read-only.

Commit 66361ef

Browse files
committed
chore: format runtime shared layers
1 parent 77aec95 commit 66361ef

10 files changed

Lines changed: 151 additions & 100 deletions

File tree

‎apps/desktop/runtime/src/ai_history_normalized/history_sources/mimo.rs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
use super::*;
22

3-
pub const DRIVER: HistorySourceDriver = file_history_source_driver(
4-
"mimo",
5-
mimo_history_paths,
6-
parse_opencode_history_file,
7-
);
3+
pub const DRIVER: HistorySourceDriver =
4+
file_history_source_driver("mimo", mimo_history_paths, parse_opencode_history_file);
85

96
fn mimo_history_paths(_project: &AIHistoryProjectRequest, home: &Path) -> Vec<PathBuf> {
107
[

‎apps/desktop/runtime/src/remote/crypto.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,4 +164,3 @@ fn remote_e2e_private_key(value: &str) -> Option<StaticSecret> {
164164
let array: [u8; 32] = bytes.as_slice().try_into().ok()?;
165165
Some(StaticSecret::from(array))
166166
}
167-

‎apps/desktop/runtime/src/remote/host.rs‎

Lines changed: 46 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,16 @@ use super::crypto::{remote_base64_url_decode, remote_host_name};
33
use super::pairing::remote_summary_show_pending_pairing;
44
use super::protocol::{
55
REMOTE_AI_STATS, REMOTE_DEVICE_CONNECTED, REMOTE_DEVICE_DISCONNECTED, REMOTE_ERROR,
6-
REMOTE_FILE_DELETE, REMOTE_FILE_DELETED, REMOTE_FILE_LIST, REMOTE_FILE_READ, REMOTE_FILE_RENAME,
7-
REMOTE_FILE_RENAMED, REMOTE_FILE_WRITE, REMOTE_FILE_WRITTEN, REMOTE_GIT_STATUS,
8-
REMOTE_HOST_INFO, REMOTE_HOST_OFFLINE, REMOTE_PAIRING_CONFIRMED, REMOTE_PAIRING_REJECTED,
9-
REMOTE_PROJECT_ADD, REMOTE_PROJECT_EDIT,
10-
REMOTE_PROJECT_LIST, REMOTE_PROJECT_REMOVE, REMOTE_PROJECT_SELECT, REMOTE_PROJECT_SELECTED,
11-
REMOTE_PROJECT_UPDATED, REMOTE_RESOURCE_AI_STATS, REMOTE_RESOURCE_GIT_STATUS,
12-
REMOTE_RESOURCE_PROJECTS, REMOTE_RESOURCE_SUBSCRIBE, REMOTE_RESOURCE_TERMINALS,
13-
REMOTE_RESOURCE_UNSUBSCRIBE, REMOTE_RESOURCE_WORKTREES, REMOTE_TERMINAL_BUFFER,
14-
REMOTE_TERMINAL_BUFFER_MAX_CHARS, REMOTE_TERMINAL_CLOSE, REMOTE_TERMINAL_CLOSED,
15-
REMOTE_TERMINAL_CREATE, REMOTE_TERMINAL_CREATED, REMOTE_TERMINAL_INPUT,
16-
REMOTE_TERMINAL_INPUT_ACK, REMOTE_TERMINAL_LIST, REMOTE_TERMINAL_OUTPUT,
6+
REMOTE_FILE_DELETE, REMOTE_FILE_DELETED, REMOTE_FILE_LIST, REMOTE_FILE_READ,
7+
REMOTE_FILE_RENAME, REMOTE_FILE_RENAMED, REMOTE_FILE_WRITE, REMOTE_FILE_WRITTEN,
8+
REMOTE_GIT_STATUS, REMOTE_HOST_INFO, REMOTE_HOST_OFFLINE, REMOTE_PAIRING_CONFIRMED,
9+
REMOTE_PAIRING_REJECTED, REMOTE_PROJECT_ADD, REMOTE_PROJECT_EDIT, REMOTE_PROJECT_LIST,
10+
REMOTE_PROJECT_REMOVE, REMOTE_PROJECT_SELECT, REMOTE_PROJECT_SELECTED, REMOTE_PROJECT_UPDATED,
11+
REMOTE_RESOURCE_AI_STATS, REMOTE_RESOURCE_GIT_STATUS, REMOTE_RESOURCE_PROJECTS,
12+
REMOTE_RESOURCE_SUBSCRIBE, REMOTE_RESOURCE_TERMINALS, REMOTE_RESOURCE_UNSUBSCRIBE,
13+
REMOTE_RESOURCE_WORKTREES, REMOTE_TERMINAL_BUFFER, REMOTE_TERMINAL_BUFFER_MAX_CHARS,
14+
REMOTE_TERMINAL_CLOSE, REMOTE_TERMINAL_CLOSED, REMOTE_TERMINAL_CREATE, REMOTE_TERMINAL_CREATED,
15+
REMOTE_TERMINAL_INPUT, REMOTE_TERMINAL_INPUT_ACK, REMOTE_TERMINAL_LIST, REMOTE_TERMINAL_OUTPUT,
1716
REMOTE_TERMINAL_OUTPUT_ACK, REMOTE_TERMINAL_RESIZE, REMOTE_TERMINAL_SIGNAL,
1817
REMOTE_TERMINAL_SUBSCRIBE, REMOTE_TERMINAL_UNSUBSCRIBE, REMOTE_TERMINAL_UPLOAD,
1918
REMOTE_TERMINAL_UPLOAD_ACK, REMOTE_TERMINAL_UPLOAD_CANCEL, REMOTE_TERMINAL_UPLOAD_CHUNK,
@@ -31,8 +30,8 @@ use super::relay::{remote_pairing_ticket_payload, remote_server_url, remote_stun
3130
use super::transport::RemoteTransport;
3231
use super::transport_factory::RemoteTransportFactory;
3332
use super::types::{
34-
RemoteDeviceSettings, RemoteEnvelope, RemotePairingInfo, RemotePairingPollResult,
35-
RemoteHostEvent, RemoteSummary, RemoteTerminalLayoutChanged, RemoteTransportCandidate,
33+
RemoteDeviceSettings, RemoteEnvelope, RemoteHostEvent, RemotePairingInfo,
34+
RemotePairingPollResult, RemoteSummary, RemoteTerminalLayoutChanged, RemoteTransportCandidate,
3635
RemoteTransportPairingRequest,
3736
};
3837
use crate::ai_history_indexer::{AIHistoryIndexer, AIHistoryProjectState};
@@ -237,7 +236,10 @@ impl RemoteHostRuntime {
237236
}
238237

239238
fn publish_remote_terminal_layout_changed(&self) {
240-
let generation = self.remote_terminal_layout_generation.fetch_add(1, Ordering::Relaxed) + 1;
239+
let generation = self
240+
.remote_terminal_layout_generation
241+
.fetch_add(1, Ordering::Relaxed)
242+
+ 1;
241243
self.push_event(RemoteHostEvent::TerminalLayoutChanged(
242244
RemoteTerminalLayoutChanged { generation },
243245
));
@@ -1089,7 +1091,12 @@ impl RemoteHostRuntime {
10891091
return;
10901092
};
10911093
match remote_file_read(path) {
1092-
Ok(payload) => self.send(REMOTE_FILE_READ, envelope.device_id.as_deref(), None, payload),
1094+
Ok(payload) => self.send(
1095+
REMOTE_FILE_READ,
1096+
envelope.device_id.as_deref(),
1097+
None,
1098+
payload,
1099+
),
10931100
Err(error) => self.send_error(envelope, &error),
10941101
}
10951102
}
@@ -2455,7 +2462,12 @@ impl RemoteHostRuntime {
24552462
}
24562463
let payload = json!({ "terminals": self.remote_terminals() });
24572464
for device_id in device_ids {
2458-
self.send(REMOTE_TERMINAL_LIST, Some(&device_id), None, payload.clone());
2465+
self.send(
2466+
REMOTE_TERMINAL_LIST,
2467+
Some(&device_id),
2468+
None,
2469+
payload.clone(),
2470+
);
24592471
}
24602472
}
24612473

@@ -4395,10 +4407,12 @@ mod tests {
43954407
project_b.to_string_lossy(),
43964408
worktree_b_path.to_string_lossy()
43974409
);
4398-
assert!(runtime.drain_events().iter().any(|event| matches!(
4399-
event,
4400-
RemoteHostEvent::TerminalLayoutChanged(_)
4401-
)));
4410+
assert!(
4411+
runtime
4412+
.drain_events()
4413+
.iter()
4414+
.any(|event| matches!(event, RemoteHostEvent::TerminalLayoutChanged(_)))
4415+
);
44024416

44034417
fs::remove_dir_all(support_dir).ok();
44044418
}
@@ -5130,10 +5144,12 @@ mod tests {
51305144
let layout_key = terminal_layout_storage_key("project-b", "worktree-b");
51315145
let layout = TerminalLayoutService::new(support_dir.clone()).load(Some(&layout_key));
51325146
assert_eq!(layout.tabs.len(), 1);
5133-
assert!(runtime.drain_events().iter().any(|event| matches!(
5134-
event,
5135-
RemoteHostEvent::TerminalLayoutChanged(_)
5136-
)));
5147+
assert!(
5148+
runtime
5149+
.drain_events()
5150+
.iter()
5151+
.any(|event| matches!(event, RemoteHostEvent::TerminalLayoutChanged(_)))
5152+
);
51375153

51385154
fs::remove_dir_all(support_dir).ok();
51395155
}
@@ -5204,10 +5220,12 @@ mod tests {
52045220
assert_eq!(layout.top_panes.len(), 1);
52055221
assert_eq!(layout.top_panes[0].terminal_id, session_a);
52065222
assert!(terminals.snapshot(&session_b).is_err());
5207-
assert!(runtime.drain_events().iter().any(|event| matches!(
5208-
event,
5209-
RemoteHostEvent::TerminalLayoutChanged(_)
5210-
)));
5223+
assert!(
5224+
runtime
5225+
.drain_events()
5226+
.iter()
5227+
.any(|event| matches!(event, RemoteHostEvent::TerminalLayoutChanged(_)))
5228+
);
52115229

52125230
runtime.handle_terminal_close(&RemoteEnvelope {
52135231
kind: "terminal.close".to_string(),

‎apps/desktop/runtime/src/remote/tests.rs‎

Lines changed: 37 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -300,18 +300,24 @@ fn remote_e2e_crypto_matches_tauri_envelope_shape() {
300300
encrypted.get("alg").and_then(serde_json::Value::as_str),
301301
Some("X25519-HKDF-SHA256-AES-256-GCM")
302302
);
303-
assert!(encrypted
304-
.get("nonce")
305-
.and_then(serde_json::Value::as_str)
306-
.is_some());
307-
assert!(encrypted
308-
.get("ciphertext")
309-
.and_then(serde_json::Value::as_str)
310-
.is_some());
311-
assert!(encrypted
312-
.get("tag")
313-
.and_then(serde_json::Value::as_str)
314-
.is_some());
303+
assert!(
304+
encrypted
305+
.get("nonce")
306+
.and_then(serde_json::Value::as_str)
307+
.is_some()
308+
);
309+
assert!(
310+
encrypted
311+
.get("ciphertext")
312+
.and_then(serde_json::Value::as_str)
313+
.is_some()
314+
);
315+
assert!(
316+
encrypted
317+
.get("tag")
318+
.and_then(serde_json::Value::as_str)
319+
.is_some()
320+
);
315321

316322
let decrypted =
317323
remote_e2e_decrypt(&encrypted, &device_key, "host-1", "device-1").expect("decrypt");
@@ -674,11 +680,13 @@ fn remote_file_read_write_and_rename_match_tauri_mobile_limits() {
674680
);
675681
assert!(remote_file_read(dir.to_str().unwrap()).is_err());
676682

677-
assert!(remote_file_rename(
678-
source.to_str().unwrap(),
679-
other.join("note.txt").to_str().unwrap()
680-
)
681-
.is_err());
683+
assert!(
684+
remote_file_rename(
685+
source.to_str().unwrap(),
686+
other.join("note.txt").to_str().unwrap()
687+
)
688+
.is_err()
689+
);
682690
remote_file_rename(source.to_str().unwrap(), renamed.to_str().unwrap()).expect("rename");
683691
assert!(renamed.exists());
684692

@@ -715,21 +723,25 @@ fn remote_ai_stats_payload_matches_tauri_empty_snapshot_shape() {
715723
.and_then(serde_json::Value::as_str),
716724
Some("Project One")
717725
);
718-
assert!(payload
719-
.get("projectSummary")
720-
.and_then(serde_json::Value::as_object)
721-
.is_some());
726+
assert!(
727+
payload
728+
.get("projectSummary")
729+
.and_then(serde_json::Value::as_object)
730+
.is_some()
731+
);
722732
assert_eq!(
723733
payload
724734
.get("sessions")
725735
.and_then(serde_json::Value::as_array)
726736
.map(Vec::len),
727737
Some(0)
728738
);
729-
assert!(payload
730-
.get("updatedAt")
731-
.and_then(serde_json::Value::as_str)
732-
.is_some());
739+
assert!(
740+
payload
741+
.get("updatedAt")
742+
.and_then(serde_json::Value::as_str)
743+
.is_some()
744+
);
733745
}
734746

735747
#[test]

‎apps/desktop/runtime/src/runtime_state/mod.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ use crate::{
55
},
66
ai_history_indexer::{AIHistoryEvent, AIHistoryIndexer, AIHistoryProjectState},
77
ai_history_normalized::{
8-
global_today_normalized_tokens_at, indexed_sessions_since_at,
9-
normalized_project_totals_since_at, AIGlobalHistorySnapshot, AIHistoryProjectRequest,
8+
AIGlobalHistorySnapshot, AIHistoryProjectRequest, global_today_normalized_tokens_at,
9+
indexed_sessions_since_at, normalized_project_totals_since_at,
1010
},
1111
ai_runtime::{
1212
AIRuntimeBridge, AIRuntimeBridgeSnapshot, AIRuntimeContextSnapshot, AIRuntimeProbeRequest,
@@ -51,10 +51,10 @@ use crate::{
5151
},
5252
performance::{PerformanceService, PerformanceSummary},
5353
pet::{
54-
refresh_input_from_indexed_history, PetCatalog, PetClaimInput, PetCustomPet,
55-
PetCustomPetInstallPreview, PetCustomPetInstallRequest, PetProjectTokenTotal,
56-
PetRefreshInput, PetRenameRequest, PetRestoreRequest, PetService, PetSnapshot, PetStore,
57-
PetSummary,
54+
PetCatalog, PetClaimInput, PetCustomPet, PetCustomPetInstallPreview,
55+
PetCustomPetInstallRequest, PetProjectTokenTotal, PetRefreshInput, PetRenameRequest,
56+
PetRestoreRequest, PetService, PetSnapshot, PetStore, PetSummary,
57+
refresh_input_from_indexed_history,
5858
},
5959
power::{PowerManager, PowerService, PowerSummary},
6060
project_activity::{ProjectActivityCoordinator, ProjectActivityEvent, ProjectActivitySnapshot},
@@ -73,12 +73,12 @@ use crate::{
7373
runtime_event::{RuntimeEventService, RuntimeEventSummary},
7474
runtime_paths,
7575
settings::{
76-
sync_process_locale_preference, AppSettings, AppSettingsStore, SettingsService,
77-
SettingsSummary,
76+
AppSettings, AppSettingsStore, SettingsService, SettingsSummary,
77+
sync_process_locale_preference,
7878
},
7979
ssh::{
80-
render_ssh_launch_context_from_support_dir, SSHLaunchCommand, SSHProfileTestResult,
81-
SSHProfileUpsertRequest, SSHProfilesSnapshot, SSHService, SSHStore, SSHSummary,
80+
SSHLaunchCommand, SSHProfileTestResult, SSHProfileUpsertRequest, SSHProfilesSnapshot,
81+
SSHService, SSHStore, SSHSummary, render_ssh_launch_context_from_support_dir,
8282
},
8383
terminal_layout::{TerminalLayoutService, TerminalLayoutSummary},
8484
terminal_pty::TerminalManager,
@@ -91,10 +91,10 @@ use crate::{
9191
},
9292
};
9393
use codux_terminal_core::{
94-
runtime_scope_key, RuntimeModel, RuntimeProject, RuntimeWorktree, RuntimeWorktreeState,
94+
RuntimeModel, RuntimeProject, RuntimeWorktree, RuntimeWorktreeState, runtime_scope_key,
9595
};
9696
use serde::Deserialize;
97-
use serde_json::{json, Value};
97+
use serde_json::{Value, json};
9898
use std::{
9999
collections::{HashMap, HashSet, VecDeque},
100100
path::{Path, PathBuf},

‎crates/codux-protocol-ffi/src/protocol_exports.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use crate::common::{c_to_string, string_to_c};
22
use codux_protocol::{
3-
REMOTE_AI_STATS, REMOTE_ERROR, REMOTE_FILE_DELETE, REMOTE_FILE_DELETED, REMOTE_FILE_LIST,
4-
REMOTE_FILE_READ, REMOTE_FILE_RENAME, REMOTE_FILE_RENAMED, REMOTE_FILE_WRITE,
5-
REMOTE_DEVICE_CONNECTED, REMOTE_DEVICE_DISCONNECTED, REMOTE_DEVICE_INFO, REMOTE_FILE_WRITTEN,
6-
REMOTE_GIT_STATUS, REMOTE_HELLO, REMOTE_HOST_INFO, REMOTE_HOST_OFFLINE, REMOTE_PROJECT_ADD,
7-
REMOTE_PAIRING_CONFIRMED, REMOTE_PAIRING_REJECTED, REMOTE_PAIRING_REQUEST, REMOTE_PROJECT_EDIT,
8-
REMOTE_PROJECT_LIST, REMOTE_PROJECT_REMOVE, REMOTE_PROJECT_SELECT,
3+
REMOTE_AI_STATS, REMOTE_DEVICE_CONNECTED, REMOTE_DEVICE_DISCONNECTED, REMOTE_DEVICE_INFO,
4+
REMOTE_ERROR, REMOTE_FILE_DELETE, REMOTE_FILE_DELETED, REMOTE_FILE_LIST, REMOTE_FILE_READ,
5+
REMOTE_FILE_RENAME, REMOTE_FILE_RENAMED, REMOTE_FILE_WRITE, REMOTE_FILE_WRITTEN,
6+
REMOTE_GIT_STATUS, REMOTE_HELLO, REMOTE_HOST_INFO, REMOTE_HOST_OFFLINE,
7+
REMOTE_PAIRING_CONFIRMED, REMOTE_PAIRING_REJECTED, REMOTE_PAIRING_REQUEST, REMOTE_PROJECT_ADD,
8+
REMOTE_PROJECT_EDIT, REMOTE_PROJECT_LIST, REMOTE_PROJECT_REMOVE, REMOTE_PROJECT_SELECT,
99
REMOTE_PROJECT_SELECTED, REMOTE_PROJECT_UPDATED, REMOTE_PROTOCOL_VERSION, REMOTE_RELAY_ERROR,
1010
REMOTE_RESOURCE_AI_STATS, REMOTE_RESOURCE_FILES, REMOTE_RESOURCE_GIT_STATUS,
1111
REMOTE_RESOURCE_PROJECTS, REMOTE_RESOURCE_SUBSCRIBE, REMOTE_RESOURCE_TERMINALS,

‎crates/codux-remote-crypto/src/lib.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,7 @@ mod tests {
195195
let plaintext = b"{\"type\":\"hello\"}";
196196
// Host encrypts -> device decrypts.
197197
let payload = remote_e2e_encrypt(plaintext, &host_key, "host-1", "device-1").unwrap();
198-
let recovered =
199-
remote_e2e_decrypt(&payload, &device_key, "host-1", "device-1").unwrap();
198+
let recovered = remote_e2e_decrypt(&payload, &device_key, "host-1", "device-1").unwrap();
200199
assert_eq!(recovered, plaintext);
201200
}
202201

‎crates/codux-terminal-core/src/headless_screen.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1279,7 +1279,10 @@ mod tests {
12791279
let replies = replies.take();
12801280
let text = String::from_utf8_lossy(&replies);
12811281
assert!(text.contains("\x1b[1;3R"), "missing CPR reply: {text:?}");
1282-
assert!(text.contains("\x1b[?2004;2$y"), "missing DECRQM reply: {text:?}");
1282+
assert!(
1283+
text.contains("\x1b[?2004;2$y"),
1284+
"missing DECRQM reply: {text:?}"
1285+
);
12831286
assert!(text.contains("\x1b[?62;"), "missing DA1 reply: {text:?}");
12841287
}
12851288

0 commit comments

Comments
 (0)