Prepare UnixNotis v1.1.0

.github/workflows/release.yml

@@ -5,7 +5,7 @@ on:
   workflow_dispatch:
     inputs:
       tag:
-        description: Release tag to package, such as v1.0.0
+        description: Release tag to package, such as v1.1.0
         required: true
         type: string
 

CONTRIBUTING.md

@@ -178,7 +178,7 @@ If docs live in the Wiki and are not updated in the PR, note what needs to be up
 
 ## Releases
 
-UnixNotis releases are cut from `master` with tags such as `v1.0.0`.
+UnixNotis releases are cut from `master` with tags such as `v1.1.0`.
 
 Before tagging a release:
 
@@ -192,7 +192,7 @@ Before tagging a release:
 Build the release archive manually before creating the GitHub release:
 
 ```sh
-scripts/package-release.sh v1.0.0
+scripts/package-release.sh v1.1.0
 ```
 
 The same packaging step can be run from the manual **Release Package** GitHub Actions workflow. It

Cargo.toml

@@ -11,7 +11,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "1.0.0"
+version = "1.1.0"
 edition = "2021"
 license = "MIT"
 

README.md

@@ -84,7 +84,7 @@ reports when a newer GitHub release is available.
 Maintainers can build a local release archive manually:
 
 ```sh
-scripts/package-release.sh v1.0.0
+scripts/package-release.sh v1.1.0
 ```
 
 ## Development

crates/noticenterctl/src/app.rs

@@ -0,0 +1,95 @@
+//! Application runner for noticenterctl
+
+use anyhow::{Context, Result};
+use clap::Parser;
+use unixnotis_core::ControlProxy;
+use zbus::Connection;
+
+use crate::cli::{Args, Command};
+
+pub(crate) async fn run() -> Result<()> {
+    // Parse CLI arguments before any daemon work starts
+    let args = Args::parse();
+    let command = args.command;
+
+    if command.is_local_only() {
+        // Local commands must work even when the daemon is not running
+        handle_local_command(command, crate::css_check::run, crate::preset::run_preset)?;
+        return Ok(());
+    }
+
+    // Control commands need the session bus and the daemon proxy
+    let connection = Connection::session()
+        .await
+        .context("connect to session bus")?;
+    let proxy = ControlProxy::new(&connection)
+        .await
+        .context("connect to unixnotis control interface")?;
+
+    crate::dbus::handle_command(&proxy, command).await
+}
+
+fn handle_local_command(
+    command: Command,
+    mut run_css: impl FnMut() -> Result<()>,
+    mut run_preset: impl FnMut(crate::cli::PresetCommand) -> Result<()>,
+) -> Result<()> {
+    match command {
+        Command::CssCheck => run_css(),
+        Command::Preset { command } => run_preset(command).context("preset command failed"),
+        _ => Ok(()),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::cell::Cell;
+
+    use anyhow::Result;
+
+    use crate::cli::{Command, PresetCommand};
+
+    use super::handle_local_command;
+
+    #[test]
+    fn handle_local_command_runs_css_check_branch() {
+        let css_called = Cell::new(false);
+
+        handle_local_command(
+            Command::CssCheck,
+            || {
+                css_called.set(true);
+                Ok(())
+            },
+            |_| -> Result<()> { panic!("preset runner should not be called for css check") },
+        )
+        .expect("css check should dispatch");
+
+        assert!(css_called.get());
+    }
+
+    #[test]
+    fn handle_local_command_runs_preset_branch_with_command_payload() {
+        let preset_called = Cell::new(false);
+
+        handle_local_command(
+            Command::Preset {
+                command: PresetCommand::Inspect {
+                    input: "theme.unixnotis".to_string(),
+                },
+            },
+            || -> Result<()> { panic!("css runner should not be called for preset command") },
+            |command| {
+                let PresetCommand::Inspect { input } = command else {
+                    panic!("expected inspect preset command");
+                };
+                assert_eq!(input, "theme.unixnotis");
+                preset_called.set(true);
+                Ok(())
+            },
+        )
+        .expect("preset should dispatch");
+
+        assert!(preset_called.get());
+    }
+}

crates/noticenterctl/src/cli/args.rs

@@ -0,0 +1,89 @@
+use clap::{Parser, Subcommand, ValueEnum};
+use unixnotis_core::{PanelDebugLevel, INHIBIT_SCOPE_ALL, INHIBIT_SCOPE_POPUPS};
+
+use super::command::Command;
+
+#[derive(Parser, Debug)]
+#[command(author, version, about)]
+pub(crate) struct Args {
+    // Subcommands map 1:1 to the daemon control surface
+    #[command(subcommand)]
+    pub(crate) command: Command,
+}
+
+#[derive(ValueEnum, Debug, Clone, Copy)]
+pub(crate) enum DebugLevelArg {
+    // Only critical diagnostic output
+    Critical,
+    // Warnings and above
+    Warn,
+    // Informational output
+    Info,
+    // Verbose diagnostics
+    Verbose,
+}
+
+impl From<DebugLevelArg> for PanelDebugLevel {
+    fn from(value: DebugLevelArg) -> Self {
+        match value {
+            DebugLevelArg::Critical => PanelDebugLevel::Critical,
+            DebugLevelArg::Warn => PanelDebugLevel::Warn,
+            DebugLevelArg::Info => PanelDebugLevel::Info,
+            DebugLevelArg::Verbose => PanelDebugLevel::Verbose,
+        }
+    }
+}
+
+#[derive(ValueEnum, Debug, Clone, Copy)]
+pub(crate) enum DndState {
+    // Explicitly enable DND
+    On,
+    // Explicitly disable DND
+    Off,
+    // Toggle based on current daemon state
+    Toggle,
+}
+
+#[derive(ValueEnum, Debug, Clone, Copy)]
+pub(crate) enum InhibitScopeArg {
+    // Suppress both panel and popup updates
+    All,
+    // Suppress popup updates only
+    Popups,
+}
+
+impl InhibitScopeArg {
+    pub(crate) fn as_scope(self) -> u32 {
+        // Map CLI scope to the daemon bitmask value
+        match self {
+            Self::All => INHIBIT_SCOPE_ALL,
+            Self::Popups => INHIBIT_SCOPE_POPUPS,
+        }
+    }
+}
+
+#[derive(Subcommand, Debug)]
+pub(crate) enum PresetCommand {
+    // Export the current config tree into one shareable bundle file
+    Export {
+        output: String,
+        #[arg(long = "except", value_name = "PATH")]
+        except: Vec<String>,
+        #[arg(long)]
+        force: bool,
+    },
+    // Import a bundle into the current config tree
+    Import {
+        input: String,
+        #[arg(long = "except", value_name = "PATH")]
+        except: Vec<String>,
+        #[arg(long)]
+        dry_run: bool,
+        #[arg(long)]
+        allow_exec: bool,
+    },
+    // Print bundle metadata and included files without writing anything
+    Inspect {
+        input: String,
+    },
+}

crates/noticenterctl/src/cli/command.rs

@@ -0,0 +1,69 @@
+use clap::Subcommand;
+
+use super::args::{DebugLevelArg, DndState, InhibitScopeArg, PresetCommand};
+
+#[derive(Subcommand, Debug)]
+pub(crate) enum Command {
+    // Toggle the panel visibility without changing other state
+    TogglePanel,
+    // Open the panel, optionally enabling debug logging for live diagnostics
+    OpenPanel {
+        #[arg(long, value_enum, num_args = 0..=1, default_missing_value = "info")]
+        debug: Option<DebugLevelArg>,
+    },
+    // Close the panel if it is visible
+    ClosePanel,
+    // Set or toggle Do Not Disturb mode
+    Dnd {
+        #[arg(value_enum)]
+        state: DndState,
+    },
+    // Clear active notifications and saved history
+    Clear,
+    // Clear active notifications and saved history
+    ClearAll,
+    // Clear active notifications without deleting saved history
+    ClearActive,
+    // Clear saved history without closing active notifications
+    ClearHistory,
+    // Dismiss a single notification by identifier
+    Dismiss {
+        id: u32,
+    },
+    // List active notifications; full output requires diagnostic mode
+    ListActive {
+        #[arg(long)]
+        full: bool,
+    },
+    // List notification history; full output requires diagnostic mode
+    ListHistory {
+        #[arg(long)]
+        full: bool,
+    },
+    // Create a new inhibitor token
+    Inhibit {
+        reason: String,
+        #[arg(long, value_enum, default_value = "all")]
+        scope: InhibitScopeArg,
+    },
+    // Remove an inhibitor by token
+    Uninhibit {
+        id: u64,
+    },
+    // Print current inhibitors to stdout
+    ListInhibitors,
+    // Validate theme CSS files without touching D-Bus
+    CssCheck,
+    // Export, inspect, or import a shareable preset bundle
+    Preset {
+        #[command(subcommand)]
+        command: PresetCommand,
+    },
+}
+
+impl Command {
+    pub(crate) fn is_local_only(&self) -> bool {
+        // Local-only commands should not fail just because D-Bus is unavailable
+        matches!(self, Command::CssCheck | Command::Preset { .. })
+    }
+}

crates/noticenterctl/src/cli/mod.rs

@@ -0,0 +1,12 @@
+//! Command-line argument types for noticenterctl
+
+mod args;
+mod command;
+
+pub(crate) use args::{Args, DndState, PresetCommand};
+#[cfg(test)]
+pub(crate) use args::{DebugLevelArg, InhibitScopeArg};
+pub(crate) use command::Command;
+
+#[cfg(test)]
+mod tests;