Merge origin/main: Rust compile-blocker PRs + LICENSE update

Reconciles today's V→Zig port work (emergency-button, emergency-room,
recovery/ER dedup, volumod duplicate removal) with three origin
commits: LICENSE update, PR #24 (PathBuf fix + clinician CLI
scaffold), PR #25 (workspace compile blockers swept). Origin's
changes landed in clinician/, port-endoscope/, hardware-crash-team/,
emergency-{button,room}/rust/, and root .machine_readable/6a2/
STATE.a2ml — disjoint from local's V→Zig paths.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: hyperpolymath

.machine_readable/6a2/STATE.a2ml

@@ -2,15 +2,15 @@
 # STATE.a2ml — Project state checkpoint
 # Copyright (c) 2026 Jonathan D.A. Jewell (hyperpolymath)
 # Converted from STATE.scm on 2026-03-15
-# Updated: 2026-03-20 (system log analysis session)
+# Updated: 2026-04-16 (compile blockers cleared; V-lang migration to Rust confirmed)
 
 [metadata]
 project = "ambientops"
 version = "0.2.0"
-last-updated = "2026-04-04"
+last-updated = "2026-04-16"
 status = "active"
 crg-contracts-rust = "C"
-note = "contracts-rust achieved CRG C: 72 tests (15 unit + 12 property + 5 E2E + 12 contract + 13 aspect + 12 benchmarks)"
+note = "contracts-rust achieved CRG C: 72 tests (15 unit + 12 property + 5 E2E + 12 contract + 13 aspect + 12 benchmarks). Workspace now green: 195 tests pass across 13 suites, 0 failures."
 
 [project-context]
 name = "ambientops"
@@ -335,8 +335,8 @@ update = "Needs service-autopsy integration"
 
 [next-actions]
 priority-1 = [
-  "Fix HCT main.rs to compile (in progress — other bot)",
   "Wire cross-component Evidence Envelope flow end-to-end",
+  "Expand clinician main.rs: re-wire full subcommand surface (process/network/disk/service/security/mesh/satellite) via clap Subcommand wrappers over tools::*Action enums",
 ]
 priority-2 = [
   "WirePlumber BT sentinel — implement D-Bus monitoring (stub exists)",
@@ -346,3 +346,18 @@ priority-3 = [
   "ServiceAutopsy → BundleIngestion integration",
   "Add clinician auto-remediation rules to live supervision tree",
 ]
+
+# ============================================================================
+# SESSION: 2026-04-16 — Compile Blocker Clearance
+# ============================================================================
+
+[session-2026-04-16]
+summary = "Cleared compile blockers + swept all workspace warnings; workspace now fully green."
+changes = [
+  "emergency-button/rust/src/main.rs: added .display() to two PathBuf format calls (lines 82, 104)",
+  "clinician/src/main.rs: rewritten as minimal working dispatcher — imports modules from crate, uses real enum names, stubs non-wired subcommands. Full CLI surface tracked as P1 follow-up.",
+  "Warning sweep: deleted unused `verbose` field/flag from emergency-button + emergency-room; deleted unused `inode`/`cmdline` fields and 4 unused pub utility functions from port-endoscope; deleted dead `events` binding in hardware-crash-team analyzer; cfg-gated Screen enum in hardware-crash-team/tui to `any(feature = \"tui\", test)`; dropped unused imports in clinician/lib.rs and contracts-rust property_tests; removed stray parens in proptest strategy.",
+  "Cargo.toml: moved [profile.release] from clinician/Cargo.toml to workspace root (clears 'profiles for the non root package will be ignored' warning).",
+]
+test-baseline = "cargo test --workspace: 195 passed, 0 failed (13 suites); cargo test -p hardware-crash-team --features tui: 76 passed, 0 failed. ZERO warnings under both builds."
+build-status = "cargo build --workspace: clean; cargo build -p hardware-crash-team --features tui: clean."

Cargo.toml

@@ -14,3 +14,8 @@ resolver = "2"
 [workspace.dependencies]
 proptest = "1.4"
 criterion = "0.5"
+
+[profile.release]
+lto = true
+codegen-units = 1
+strip = true

LICENSE

@@ -1,4 +1,4 @@
-SPDX-License-Identifier: MPL-2.0
+SPDX-License-Identifier: PMPL-1.0-or-later
 SPDX-FileCopyrightText: 2024-2026 Jonathan D.A. Jewell (hyperpolymath) <j.d.a.jewell@open.ac.uk>
 
 ------------------------------------------------------------------------

clinician/Cargo.toml

@@ -80,7 +80,5 @@ anomaly = ["ndarray"]     # ESN/LSM anomaly detection
 bluetooth = ["bluer"]     # Bluetooth device monitoring (BT Sentinel)
 all = ["storage", "cache", "ai", "p2p", "search", "forum", "anomaly", "bluetooth"]
 
-[profile.release]
-lto = true
-codegen-units = 1
-strip = true
+# NOTE: release-profile tuning lives in the workspace root Cargo.toml so it
+# applies consistently across all member crates.

clinician/src/lib.rs

@@ -32,10 +32,9 @@ pub mod tools;       // Task-specific administrative utilities.
 
 /// SYSTEM PATHS: Standardized cross-platform directory resolution.
 pub mod dirs {
-    use directories::ProjectDirs;
     use std::path::PathBuf;
 
-    /// RESOLUTION: Dispatches to the OS-appropriate storage locations 
+    /// RESOLUTION: Dispatches to the OS-appropriate storage locations
     /// using the `directories` crate.
     pub fn config_dir() -> PathBuf {
         // ... [Path resolution implementation]

clinician/src/main.rs

@@ -2,29 +2,33 @@
 
 //! Personal Sysadmin (PSA) — AI-Assisted System Administration Toolkit (CLI).
 //!
-//! This binary implements the "Clinician" logic for Linux environments. 
-//! It provides a comprehensive suite of administrative tools combined with 
+//! This binary implements the "Clinician" logic for Linux environments.
+//! It provides a comprehensive suite of administrative tools combined with
 //! neurosymbolic reasoning to automate problem detection and resolution.
 //!
 //! CORE CAPABILITIES:
-//! 1. **Resource Auditing**: Real-time management of processes, networks, 
+//! 1. **Resource Auditing**: Real-time management of processes, networks,
 //!    disks, and services.
-//! 2. **AI-Diagnostics**: Uses local SLMs (Small Language Models) with 
+//! 2. **AI-Diagnostics**: Uses local SLMs (Small Language Models) with
 //!    cloud LLM fallback to diagnose complex system incidents.
-//! 3. **Knowledge Ingestion**: Learns from solutions using miniKanren 
+//! 3. **Knowledge Ingestion**: Learns from solutions using miniKanren
 //!    logical reasoning, building a verified administrative knowledge base.
-//! 4. **Distributed Tracing**: Uses a global `correlation_id` to link 
+//! 4. **Distributed Tracing**: Uses a global `correlation_id` to link
 //!    events across the satellite tool fleet.
-//! 5. **P2P Mesh**: Securely shares administrative insights and solutions 
+//! 5. **P2P Mesh**: Securely shares administrative insights and solutions
 //!    across a decentralized mesh of PSA nodes.
+//!
+//! NOTE: This binary is a minimal dispatcher. The rich CLI surface described
+//! in the module-level docs is scaffolded in `lib.rs`; wiring each
+//! sub-command through clap is tracked as follow-up work.
 
+use ambientops_clinician::{ai, cache, correlation, storage};
 use clap::{Parser, Subcommand};
 use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
-// ... [other imports]
 
 /// CLI SCHEMA: Defines the subcommand space for the Personal Sysadmin.
 #[derive(Parser)]
-#[command(name = "psa")]
+#[command(name = "psa", version)]
 struct Cli {
     #[command(subcommand)]
     command: Commands,
@@ -36,44 +40,61 @@ struct Cli {
 
 #[derive(Subcommand)]
 enum Commands {
-    /// RESOURCE MANAGEMENT: Process, Network, Disk, and Service audits.
-    Process { #[command(subcommand)] action: ProcessActionCli },
-    Network { #[command(subcommand)] action: NetworkActionCli },
-    Disk    { #[command(subcommand)] action: DiskActionCli },
-    Service { #[command(subcommand)] action: ServiceActionCli },
-
-    /// SECURITY: Scanning, permission auditing, and rootkit detection.
-    Security { #[command(subcommand)] action: SecurityActionCli },
-
-    /// REASONING: AI-assisted diagnosis and autonomous learning.
-    Diagnose { problem: String, local_only: bool },
-    Learn    { category: String, solution: Option<String> },
-
-    /// ORCHESTRATION: P2P mesh control and incident analysis.
-    Mesh      { #[command(subcommand)] action: MeshActionCli },
-    Crisis    { incident: String, correlation_id: Option<String> },
-    Satellite { #[command(subcommand)] action: SatelliteActionCli },
+    /// REASONING: AI-assisted diagnosis.
+    Diagnose {
+        /// Natural-language description of the problem.
+        problem: String,
+        /// Restrict diagnosis to the local SLM (no cloud fallback).
+        #[arg(long)]
+        local_only: bool,
+    },
+    /// REASONING: Record a solution under a category.
+    Learn {
+        /// Category label for the solution (e.g. "disk", "network").
+        category: String,
+        /// Optional free-form solution text.
+        solution: Option<String>,
+    },
+    /// Show protocol and binary version.
+    Version,
 }
 
-/// MAIN ENTRY: Boots the async runtime, initializes global state, 
+/// MAIN ENTRY: Boots the async runtime, initializes global state,
 /// and dispatches to tool handlers.
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
+    tracing_subscriber::registry()
+        .with(tracing_subscriber::EnvFilter::try_from_default_env()
+            .unwrap_or_else(|_| "info".into()))
+        .with(tracing_subscriber::fmt::layer())
+        .init();
+
     let cli = Cli::parse();
 
     // PROVENANCE: Initialize the correlation context for distributed tracing.
-    let corr_id = correlation::init(cli.correlation_id.clone());
+    let _corr_id = correlation::init(cli.correlation_id.clone());
 
     // STORAGE: Establish links to the local knowledge base and state cache.
     let storage = storage::Storage::new().await?;
     let cache = cache::Cache::new().await?;
 
-    // DISPATCH: Executes the requested administrative workflow.
     match cli.command {
         Commands::Diagnose { problem, local_only } => {
             ai::diagnose(&problem, local_only, &storage, &cache).await?;
         }
-        // ... [Remaining handlers]
+        Commands::Learn { category, solution } => {
+            println!(
+                "learn: category={category} solution={}",
+                solution.as_deref().unwrap_or("(none)")
+            );
+        }
+        Commands::Version => {
+            println!(
+                "ambientops-clinician {} (protocol {})",
+                env!("CARGO_PKG_VERSION"),
+                ambientops_clinician::PROTOCOL_VERSION
+            );
+        }
     }
     Ok(())
 }

contracts-rust/tests/property_tests.rs

@@ -8,7 +8,6 @@
 use ambientops_contracts::*;
 use chrono::Utc;
 use proptest::prelude::*;
-use serde_json::json;
 use uuid::Uuid;
 
 // =============================================================================
@@ -152,7 +151,7 @@ fn arb_receipt() -> impl Strategy<Value = Receipt> {
                 Just(Uuid::new_v4()),
                 Just(Uuid::new_v4()),
                 prop::collection::vec(
-                    ("[a-z0-9_]{1,20}"),
+                    "[a-z0-9_]{1,20}",
                     step_count as usize,
                 ),
             )

emergency-button/rust/src/incident.rs

@@ -13,7 +13,6 @@ pub const SCHEMA_VERSION: &str = "1.0.0";
 pub struct Config {
     pub quick_backup_dest: Option<String>,
     pub dry_run: bool,
-    pub verbose: bool,
 }
 
 pub struct Incident {

emergency-button/rust/src/main.rs

@@ -37,10 +37,6 @@ struct TriggerArgs {
     /// Preview actions without executing
     #[arg(short = 'n', long)]
     dry_run: bool,
-
-    /// Verbose output
-    #[arg(short = 'V', long)]
-    verbose: bool,
 }
 
 fn main() {
@@ -56,7 +52,6 @@ fn run_trigger(args: TriggerArgs) {
     let cfg = incident::Config {
         quick_backup_dest: args.quick_backup.clone(),
         dry_run: args.dry_run,
-        verbose: args.verbose,
     };
 
     println!();
@@ -79,7 +74,7 @@ fn run_trigger(args: TriggerArgs) {
         }
     };
 
-    println!("\x1b[32m[OK]\x1b[0m Created incident bundle: {}", inc.path);
+    println!("\x1b[32m[OK]\x1b[0m Created incident bundle: {}", inc.path.display());
     println!("\x1b[34m[INFO]\x1b[0m Correlation ID: {}", inc.correlation_id);
     println!();
 
@@ -101,7 +96,7 @@ fn run_trigger(args: TriggerArgs) {
 
     println!();
     println!("\x1b[32m════════════════════════════════════════════\x1b[0m");
-    println!("\x1b[32m[DONE]\x1b[0m Incident bundle ready: {}", inc.path);
+    println!("\x1b[32m[DONE]\x1b[0m Incident bundle ready: {}", inc.path.display());
     println!("\x1b[32m════════════════════════════════════════════\x1b[0m");
 }
 
@@ -118,7 +113,6 @@ fn print_help() {
     println!("\x1b[1mOPTIONS (for trigger):\x1b[0m");
     println!("    -b, --quick-backup <path>   Run quick backup to destination (opt-in)");
     println!("    -n, --dry-run               Preview actions without executing");
-    println!("    -V, --verbose               Verbose output");
     println!();
     println!("\x1b[1mSAFETY:\x1b[0m");
     println!("    Default action is non-destructive and offline-first");

emergency-room/rust/src/incident.rs

@@ -13,7 +13,6 @@ pub const SCHEMA_VERSION: &str = "1.0.0";
 pub struct Config {
     pub quick_backup_dest: Option<String>,
     pub dry_run: bool,
-    pub verbose: bool,
 }
 
 pub struct Incident {