Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/apps/desktop/src/api/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ pub mod app_state;
pub mod browser_api;
pub mod browser_control_api;
pub mod btw_api;
#[cfg(not(target_env = "ohos"))]
pub mod canvas_api;
pub mod clipboard_file_api;
pub mod commands;
Expand Down
2 changes: 1 addition & 1 deletion src/apps/desktop/src/api/remote_connect_api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2563,7 +2563,7 @@ pub async fn account_connect_devices() -> Result<Vec<OnlineDeviceInfo>, String>
emit_device_presence(&pairs);
// Another device came online — pull cloud settings if needed.
if devices.len() > 1 {
tauri::async_runtime::spawn(async {
tauri::async_runtime::spawn(async move {
pull_and_reconcile(account_generation).await;
});
}
Expand Down
4 changes: 0 additions & 4 deletions src/apps/desktop/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1436,10 +1436,6 @@ pub async fn _run() {
api::miniapp_api::miniapp_runtime_status,
api::miniapp_api::miniapp_worker_call,
api::miniapp_api::miniapp_host_call,
api::canvas_api::load_canvas_artifact,
api::canvas_api::load_canvas_state,
api::canvas_api::report_canvas_runtime_error,
api::canvas_api::save_canvas_state,
api::miniapp_api::miniapp_worker_stop,
api::miniapp_api::miniapp_worker_list_running,
api::miniapp_api::miniapp_install_deps,
Expand Down
1 change: 1 addition & 0 deletions src/crates/assembly/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ canvas-runtime = [
]
runtime-services = []
service-integrations = [
"dep:tauri",
"dep:aes-gcm",
"dep:axum",
"dep:git2",
Expand Down
4 changes: 3 additions & 1 deletion src/crates/assembly/core/src/agentic/agents/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,9 @@ pub fn shared_coding_mode_tools() -> Vec<String> {
"PageDeploy".to_string(),
"PagePublish".to_string(),
];
append_provider_group_tools(&mut tools, "core.canvas");
// Canvas provider group tools disabled: canvas-runtime cannot be compiled
// on the OHOS target. Re-enable when canvas-runtime is available.
// append_provider_group_tools(&mut tools, "core.canvas");
tools
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ pub fn start_settings_sync_engine(hooks: SettingsSyncHooks) {
let _ = HOOKS.set(hooks);
let (tx, rx) = mpsc::unbounded_channel::<()>();
let _ = PUSH_TX.set(tx);
tokio::spawn(settings_sync_loop(rx));
tauri::async_runtime::spawn(settings_sync_loop(rx));
}

/// Notify the engine that local settings changed (config set / import /
Expand Down
16 changes: 10 additions & 6 deletions src/crates/assembly/product-capabilities/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1041,12 +1041,16 @@ const DEFAULT_PRODUCT_CAPABILITY_PACKS: &[ProductCapabilityPack] = &[
INTEGRATION_TOOL_GROUPS,
MINIAPP_HARNESS_PROVIDERS,
),
ProductCapabilityPack::new(
ProductCapabilityId::Canvas,
CANVAS_SERVICES,
CANVAS_TOOL_GROUPS,
NO_HARNESS_PROVIDERS,
),
// Canvas pack disabled: canvas-runtime cannot be compiled on the OHOS
// target (oxc dependency), and the core.canvas provider group would
// trigger materialization panics. Re-enable when canvas-runtime is
// available on all supported targets.
// ProductCapabilityPack::new(
// ProductCapabilityId::Canvas,
// CANVAS_SERVICES,
// CANVAS_TOOL_GROUPS,
// NO_HARNESS_PROVIDERS,
// ),
];
const EMPTY_PRODUCT_CAPABILITY_PACKS: &[ProductCapabilityPack] = &[];

Expand Down
Loading