agent: lumotia — v0.1 release-completion run
Closes the code-side v0.1 ship gate. All quality gates green: cargo fmt/clippy/test (~327 tests), npm check (0/0), vitest 13/13, scripts/dogfood-rebrand-drill.sh 8/8. Phase F — first-run onboarding promoted to v0.1 - FirstRunPage with skip-to-main + failure recovery + event recording - Six onboarding commands (record/list/has-completed + lumotia_events) - Storage migration v17 (onboarding_events + lumotia_events tables) UI hardening (in-scope items from v0.1-ui-hardening.md) - StatusPill + PostCaptureCard components, 21st preview entry - Sidebar recording-as-sacred-state (opacity + aria-disabled, reduced-motion) - Settings 6-section regroup + Help section + Activation log + Privacy toggle - Error-state copy sweep (DictationPage + SettingsPage, plain-language) - Global :focus-visible rule, textarea outlines restored - Ctrl+K / Ctrl+, / Escape bindings in +layout LLM resilience - rule_based_extract_tasks (regex-free imperative-verb extractor) + extract_tasks_with_fallback wrapper — task extraction never returns zero - tokio::time::timeout(120s) wraps cleanup/tags/tasks commands Release artefacts - LICENSE (canonical AGPL-3.0), CHANGELOG (Keep-a-Changelog format) - v0.1-release-notes, privacy-and-ai-use, install-warnings, tester-onboarding-kit, tester-acceptance-runbook, code-signing-setup, apple-silicon-rb08-runbook, virtual-audio-setup, v0.1-contrast-audit - Workspace versioning + AGPL spdx; npm exact-pin (10 ranges removed) - AppImage SHA-256 sidecar in build.yml - README v0.1 section + Reporting-issues; canonical repo slug Closure pass — items moved from human-required to code-complete - KI-02 Linux idle inhibit: zbus 5 → org.freedesktop.login1.Manager.Inhibit - KI-03 Windows sleep prevention: SetThreadExecutionState(ES_CONTINUOUS|...) - acquire/release_idle_inhibit Tauri commands, wired in DictationPage - Diagnostic-bundle frontend wire-up (Settings → Help button) - WCAG-AA contrast fix via .btn-filled-text utility (no token changes) - 8 destructive-action sites wrapped in plain-language confirm() guards - KNOWN-ISSUES.md + v0.1-known-limitations.md updated (KI-02/03 fixed) Scripts - pre-tag-verify.sh, tag-day.sh, smoke-linux + driver - parse-diagnostic-bundle.sh, parse-activation-log.py Per-item audit trail: docs/release/v0.1-completion-status.md Remaining: W-01…W-08 (signing certs, hardware probes, smoke matrix, tester recruitment) — see docs/release/v0.1-known-limitations.md.
This commit is contained in:
@@ -13,27 +13,27 @@
|
||||
//! Runtime verification on Apple Silicon against actual idle-throttling
|
||||
//! is still pending. See `KNOWN-ISSUES.md` (KI-01).
|
||||
//!
|
||||
//! On Linux and Windows, `PowerAssertion::begin` is currently a no-op
|
||||
//! that registers a snapshot in the process-wide registry for diagnostics
|
||||
//! but does not inhibit OS-level idle throttling. The planned
|
||||
//! implementations are:
|
||||
//! On Linux (KI-02) we call `org.freedesktop.login1.Manager.Inhibit` via
|
||||
//! D-Bus (zbus blocking API). The returned file descriptor is the inhibit
|
||||
//! lock; closing it releases the lock. A global `OnceLock<Mutex<Option<Fd>>>`
|
||||
//! holds the descriptor for the duration of recording.
|
||||
//!
|
||||
//! - Linux: systemd-logind / GNOME session idle inhibit via
|
||||
//! `org.freedesktop.login1.Inhibit` where available.
|
||||
//! - Windows: `SetThreadExecutionState(ES_CONTINUOUS | ES_SYSTEM_REQUIRED
|
||||
//! | ES_AWAYMODE_REQUIRED)` on begin and `ES_CONTINUOUS` alone on end.
|
||||
//! On Windows (KI-03) we call
|
||||
//! `SetThreadExecutionState(ES_CONTINUOUS | ES_SYSTEM_REQUIRED)` to prevent
|
||||
//! the system from sleeping. `ES_CONTINUOUS` alone resets that on release.
|
||||
//!
|
||||
//! Until those land, long sessions on Linux and Windows can still be
|
||||
//! idled by the OS. See `KNOWN-ISSUES.md` (KI-02, KI-03) for workarounds.
|
||||
//!
|
||||
//! All paths return a guard so the caller's code is unchanged. Failures
|
||||
//! to acquire a real assertion are logged so the diagnostics bundle has
|
||||
//! a breadcrumb.
|
||||
//! All paths return `Ok(())` on failure — errors are logged but never block
|
||||
//! recording. The workarounds in `KNOWN-ISSUES.md` remain valid for edge cases
|
||||
//! (non-systemd Linux containers, policy-locked Windows images).
|
||||
|
||||
use std::collections::HashMap;
|
||||
use std::sync::atomic::{AtomicUsize, Ordering};
|
||||
use std::sync::{Mutex, OnceLock};
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Shared snapshot registry (all platforms)
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct PowerAssertionSnapshot {
|
||||
pub id: usize,
|
||||
@@ -78,7 +78,8 @@ pub fn active_assertions_snapshot() -> Vec<PowerAssertionSnapshot> {
|
||||
impl PowerAssertion {
|
||||
/// Begin a power assertion for the given reason. On macOS this
|
||||
/// pins beginActivityWithOptions; on Linux/Windows it logs only
|
||||
/// today (stub).
|
||||
/// (the OS-level inhibit is managed separately via the
|
||||
/// `acquire_idle_inhibit` / `release_idle_inhibit` Tauri commands).
|
||||
pub fn begin(reason: &'static str) -> Self {
|
||||
let id = NEXT_ID.fetch_add(1, Ordering::Relaxed);
|
||||
|
||||
@@ -96,18 +97,23 @@ impl PowerAssertion {
|
||||
tracing::warn!(reason, "macOS App Nap guard could not begin activity");
|
||||
}
|
||||
|
||||
#[cfg(not(target_os = "macos"))]
|
||||
{
|
||||
// No-op on non-macOS today; #9 acceptance text only cites
|
||||
// macOS App Nap. Linux/Windows placeholder handled if
|
||||
// future feedback requires it.
|
||||
let _ = reason;
|
||||
}
|
||||
#[cfg(target_os = "linux")]
|
||||
let backend = "linux-logind";
|
||||
#[cfg(target_os = "linux")]
|
||||
let acquired = true; // actual inhibit is managed by acquire_idle_inhibit command
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
let backend = "windows-ste";
|
||||
#[cfg(target_os = "windows")]
|
||||
let acquired = true; // actual STE call is managed by acquire_idle_inhibit command
|
||||
|
||||
#[cfg(not(any(target_os = "macos", target_os = "linux", target_os = "windows")))]
|
||||
let backend = "noop";
|
||||
#[cfg(not(any(target_os = "macos", target_os = "linux", target_os = "windows")))]
|
||||
let acquired = false;
|
||||
|
||||
#[cfg(not(target_os = "macos"))]
|
||||
let backend = "noop";
|
||||
#[cfg(not(target_os = "macos"))]
|
||||
let acquired = false;
|
||||
let _ = reason;
|
||||
|
||||
assertion_registry().lock().unwrap().insert(
|
||||
id,
|
||||
@@ -147,6 +153,10 @@ impl Drop for PowerAssertion {
|
||||
}
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// macOS: NSProcessInfo activity (unchanged — KI-01, not touched here)
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
#[cfg(target_os = "macos")]
|
||||
mod objc_bridge {
|
||||
use objc2::rc::Retained;
|
||||
@@ -175,6 +185,164 @@ mod objc_bridge {
|
||||
}
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Linux: systemd-logind D-Bus inhibit (KI-02)
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
/// The global inhibit lock file descriptor. `Some(fd)` while recording;
|
||||
/// `None` when not inhibiting. Dropping the inner `OwnedFd` releases the
|
||||
/// systemd-logind inhibit lock automatically.
|
||||
#[cfg(target_os = "linux")]
|
||||
fn linux_inhibit_lock() -> &'static Mutex<Option<std::os::unix::io::OwnedFd>> {
|
||||
static LOCK: OnceLock<Mutex<Option<std::os::unix::io::OwnedFd>>> = OnceLock::new();
|
||||
LOCK.get_or_init(|| Mutex::new(None))
|
||||
}
|
||||
|
||||
#[cfg(target_os = "linux")]
|
||||
mod linux_inhibit {
|
||||
use std::os::unix::io::OwnedFd;
|
||||
use zbus::blocking::Connection;
|
||||
use zbus::zvariant::OwnedFd as ZOwnedFd;
|
||||
|
||||
/// Acquires a systemd-logind idle+sleep inhibit lock.
|
||||
/// Returns the file descriptor whose lifetime IS the lock.
|
||||
/// Drops (closes) the fd to release.
|
||||
pub fn acquire() -> Result<OwnedFd, String> {
|
||||
let conn =
|
||||
Connection::system().map_err(|e| format!("zbus: connect to system bus failed: {e}"))?;
|
||||
|
||||
let reply = conn
|
||||
.call_method(
|
||||
Some("org.freedesktop.login1"),
|
||||
"/org/freedesktop/login1",
|
||||
Some("org.freedesktop.login1.Manager"),
|
||||
"Inhibit",
|
||||
&(
|
||||
"idle:sleep:handle-lid-switch",
|
||||
"Lumotia",
|
||||
"Active dictation in progress",
|
||||
"block",
|
||||
),
|
||||
)
|
||||
.map_err(|e| format!("zbus: Inhibit call failed: {e}"))?;
|
||||
|
||||
let fd: ZOwnedFd = reply
|
||||
.body()
|
||||
.deserialize()
|
||||
.map_err(|e| format!("zbus: Inhibit reply deserialize failed: {e}"))?;
|
||||
|
||||
// Convert zvariant's OwnedFd to std's OwnedFd
|
||||
Ok(fd.into())
|
||||
}
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Windows: SetThreadExecutionState (KI-03)
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
mod windows_inhibit {
|
||||
use windows::Win32::System::Power::{
|
||||
SetThreadExecutionState, ES_CONTINUOUS, ES_SYSTEM_REQUIRED,
|
||||
};
|
||||
|
||||
/// Prevents the system from sleeping by setting ES_CONTINUOUS | ES_SYSTEM_REQUIRED.
|
||||
/// Display sleep is intentionally NOT blocked — the user is dictating, not watching.
|
||||
pub fn acquire() {
|
||||
unsafe {
|
||||
SetThreadExecutionState(ES_CONTINUOUS | ES_SYSTEM_REQUIRED);
|
||||
}
|
||||
}
|
||||
|
||||
/// Releases the sleep prevention by resetting to ES_CONTINUOUS alone.
|
||||
pub fn release() {
|
||||
unsafe {
|
||||
SetThreadExecutionState(ES_CONTINUOUS);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Tauri commands: acquire_idle_inhibit / release_idle_inhibit
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
/// Acquire an OS-level idle/sleep inhibit lock for the duration of recording.
|
||||
///
|
||||
/// - Linux: calls `org.freedesktop.login1.Manager.Inhibit` and holds the fd.
|
||||
/// - Windows: calls `SetThreadExecutionState(ES_CONTINUOUS | ES_SYSTEM_REQUIRED)`.
|
||||
/// - macOS: no-op here; App Nap is handled by `PowerAssertion::begin`.
|
||||
/// - Other: no-op.
|
||||
///
|
||||
/// Errors are logged and swallowed — recording must never be blocked by a
|
||||
/// failed power assertion.
|
||||
#[tauri::command]
|
||||
pub async fn acquire_idle_inhibit() -> Result<(), String> {
|
||||
#[cfg(target_os = "linux")]
|
||||
{
|
||||
// The zbus blocking call must not run on the Tokio executor thread.
|
||||
let result = tokio::task::spawn_blocking(linux_inhibit::acquire)
|
||||
.await
|
||||
.unwrap_or_else(|e| Err(format!("spawn_blocking panic: {e}")));
|
||||
|
||||
match result {
|
||||
Ok(fd) => {
|
||||
*linux_inhibit_lock().lock().unwrap() = Some(fd);
|
||||
tracing::info!("Linux idle inhibit acquired (logind block)");
|
||||
}
|
||||
Err(e) => {
|
||||
tracing::warn!(
|
||||
error = %e,
|
||||
"Linux idle inhibit not acquired — recording continues unaffected"
|
||||
);
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
{
|
||||
windows_inhibit::acquire();
|
||||
tracing::info!("Windows sleep prevention engaged (ES_CONTINUOUS | ES_SYSTEM_REQUIRED)");
|
||||
Ok(())
|
||||
}
|
||||
|
||||
// macOS: App Nap guard is managed by PowerAssertion in the live session path.
|
||||
// Other platforms: no-op.
|
||||
#[cfg(not(any(target_os = "linux", target_os = "windows")))]
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Release the OS-level idle/sleep inhibit lock acquired during recording.
|
||||
///
|
||||
/// Safe to call even if no lock was held (idempotent).
|
||||
#[tauri::command]
|
||||
pub async fn release_idle_inhibit() -> Result<(), String> {
|
||||
#[cfg(target_os = "linux")]
|
||||
{
|
||||
// Dropping the OwnedFd closes the file descriptor, which releases
|
||||
// the systemd-logind inhibit lock.
|
||||
let prev = linux_inhibit_lock().lock().unwrap().take();
|
||||
if prev.is_some() {
|
||||
tracing::info!("Linux idle inhibit released (fd closed)");
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
{
|
||||
windows_inhibit::release();
|
||||
tracing::info!("Windows sleep prevention released (ES_CONTINUOUS)");
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[cfg(not(any(target_os = "linux", target_os = "windows")))]
|
||||
Ok(())
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Tests
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
Reference in New Issue
Block a user