diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index b597920..9ade88d 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -12,7 +12,9 @@ this file is the curated, human-readable summary. remains visible. DMS stays an ordinary Gentoo package updated by Portage; no DMS updater fork or patch is maintained. Existing Mango profiles gain the shortcut once without replacing a user binding. The live image now - includes both Assistant and Updates desktop entries. + includes both Assistant and Updates desktop entries. Mango also floats the + Updates view at 900×650; the running QEMU playground confirmed that Super+U + opens the view and shows 20 Portage updates. - **Frame and OS launcher logo defaults (2026-10-02).** New DMS profiles start with the Frame layout and the OS logo on the bar and dock launcher diff --git a/docs/HANDOFF.md b/docs/HANDOFF.md index d7fdac1..5e8833e 100644 --- a/docs/HANDOFF.md +++ b/docs/HANDOFF.md @@ -11,7 +11,16 @@ commit it. It should be short and current; use `git log` for detail. profiles unless Super+U is already bound. The live image now installs the Assistant and Updates desktop entries. Host checks pass; the new graphical flow still needs a fresh VM check when `make doctor`'s 20 GiB disk-space - gate is met (currently 10 GiB free). + gate is met (currently 10 GiB free). The visible disposable VM was updated + through user-local overrides (`~/.local/bin/phoebus-assistant`, + `~/.local/share/applications/phoebus-updates.desktop`, and + `~/.config/quickshell/phoebus-assistant`) because its root assets require + authentication; the previous QML was backed up beside that directory. The + user QML overrides `/etc/xdg` in this playground and should be refreshed or + removed after its root-owned assets are updated. + Super+U opened the Updates view, reported 20 Portage updates, and a new + Mango rule kept its window at 900×650. The review/apply button was not used + on that VM, so no package transaction ran. - **Frame and OS launcher logo defaults (2026-10-02):** DMS 1.6.2's layout picker sets `frameEnabled=true`; its launcher button logo uses diff --git a/docs/STATUS.md b/docs/STATUS.md index 4b007f2..cec5eb6 100644 --- a/docs/STATUS.md +++ b/docs/STATUS.md @@ -58,7 +58,10 @@ updater widget is absent from the default bar; custom user bar layouts are preserved. The installed desktop entry has a provisioning test, and the launcher script, desktop entry and Rust suite have host checks. A fresh graphical ISO/install is not VM verified because `make doctor` reports 10 GiB -free versus the 20 GiB VM gate. +free versus the 20 GiB VM gate. The running disposable VM has a user-local +copy of the launcher, Assistant QML and Mango binding/window rule; Super+U +opened Phoebus Updates as a 900×650 floating view and listed 20 Portage +updates. The VM's root-owned installed assets were not replaced. Frame and launcher defaults (2026-10-02): the session now seeds DMS 1.6.2's `frameEnabled=true`, `launcherLogoMode=os`, and `dockLauncherLogoMode=os` only diff --git a/installer-rs/crates/phoebus-core/src/system.rs b/installer-rs/crates/phoebus-core/src/system.rs index cff9f24..11f86b2 100644 --- a/installer-rs/crates/phoebus-core/src/system.rs +++ b/installer-rs/crates/phoebus-core/src/system.rs @@ -1470,6 +1470,14 @@ if [ ! -e "$updates_binding_marker" ] && [ -w "$mango_conf" ]; then : > "$updates_binding_marker" fi fi +updates_window_marker="$HOME/.config/mango/dms/.phoebus-updates-window-v1" +if [ ! -e "$updates_window_marker" ] && [ -w "$mango_conf" ]; then + if grep -Fq 'title:^Phoebus Updates$' "$mango_conf"; then + : > "$updates_window_marker" + elif printf '\n# Keep Phoebus Updates in a floating window.\nwindowrule=isfloating:1,width:900,height:650,title:^Phoebus Updates$\n' >> "$mango_conf"; then + : > "$updates_window_marker" + fi +fi # DMS manages these fragments; they must exist before Mango sources them. for f in colors layout outputs cursor; do [ -e "$HOME/.config/mango/dms/$f.conf" ] || : > "$HOME/.config/mango/dms/$f.conf" @@ -1769,6 +1777,7 @@ windowrule=isfloating:1,appid:^com.danklinux.dms$ # Size Settings to the current output; DMS switches to compact navigation below 700 px. windowrule=width:0.65,height:0.8,ignore_maximize:0,appid:^com.danklinux.dms$,title:^Settings$ windowrule=isfloating:1,width:900,height:650,title:^Phoebus Assistant$ +windowrule=isfloating:1,width:900,height:650,title:^Phoebus Updates$ windowrule=isfloating:1,width:720,height:600,title:^Welcome to Phoebus OS$ windowrule=isfullscreen:1,title:^Install Phoebus OS$ diff --git a/installer-rs/crates/phoebus-executor/tests/session_script.rs b/installer-rs/crates/phoebus-executor/tests/session_script.rs index 4aa36be..6dbdc68 100644 --- a/installer-rs/crates/phoebus-executor/tests/session_script.rs +++ b/installer-rs/crates/phoebus-executor/tests/session_script.rs @@ -160,15 +160,22 @@ fn existing_mango_profiles_gain_updates_shortcut_once_and_keep_custom_bindings() let _ = fixture.run(); let content = std::fs::read_to_string(&config).unwrap(); assert_eq!(content.matches("bind=SUPER,u,").count(), 1); + assert_eq!(content.matches("title:^Phoebus Updates$").count(), 1); let custom = Fixture::new(MANGO_FAIL); let custom_config = custom.dir.path().join(".config/mango/config.conf"); std::fs::create_dir_all(custom_config.parent().unwrap()).unwrap(); - std::fs::write(&custom_config, "bind=SUPER,u,spawn,my-updater\n").unwrap(); + std::fs::write( + &custom_config, + "bind=SUPER,u,spawn,my-updater\nwindowrule=isfloating:1,width:700,height:500,title:^Phoebus Updates$\n", + ) + .unwrap(); let _ = custom.run(); let custom_content = std::fs::read_to_string(&custom_config).unwrap(); assert!(custom_content.contains("bind=SUPER,u,spawn,my-updater")); assert!(!custom_content.contains("bind=SUPER,u,spawn,phoebus-assistant")); + assert!(custom_content.contains("width:700,height:500,title:^Phoebus Updates$")); + assert_eq!(custom_content.matches("title:^Phoebus Updates$").count(), 1); } #[test]