ci: merge web+rust into single job and apply rustfmt

The previous workflow had Rust and Web as parallel jobs, but the
Rust build needs web/dist/ at compile time (rust-embed embeds the
SPA into the binary). Without the web build running first, both
clippy and test fail in CI on a fresh checkout.

Fixed by:
- Single 'build' job: npm ci + npm run build → cargo fmt --check
  → cargo clippy → cargo test
- Added Swatinem/rust-cache for faster incremental CI
- Added Node + npm cache via setup-node
- Dropped the macOS matrix entry to halve runtime (ubuntu is
  representative enough for a personal project)
- Applied cargo fmt to existing source (one block in skills.rs
  was out of style)

Verified locally: fmt clean, clippy clean (-D warnings),
22/22 tests pass.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: anbei.yuan

.github/workflows/ci.yml

@@ -1,19 +1,38 @@
 name: CI
 on: [push, pull_request]
+
+env:
+  CARGO_TERM_COLOR: always
+
 jobs:
-  rust:
-    runs-on: ${{ matrix.os }}
-    strategy: { matrix: { os: [ubuntu-latest, macos-latest] } }
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
-      - run: cargo fmt --all -- --check
-      - run: cargo clippy --all-targets -- -D warnings
-      - run: cargo test --locked
-  web:
+  build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+
       - uses: actions/setup-node@v4
-        with: { node-version: 20 }
-      - run: cd web && npm ci && npm run build
+        with:
+          node-version: 20
+          cache: npm
+          cache-dependency-path: web/package-lock.json
+
+      - name: Build web bundle
+        working-directory: web
+        run: |
+          npm ci
+          npm run build
+
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          components: rustfmt, clippy
+
+      - uses: Swatinem/rust-cache@v2
+
+      - name: cargo fmt --check
+        run: cargo fmt --all -- --check
+
+      - name: cargo clippy
+        run: cargo clippy --all-targets --workspace -- -D warnings
+
+      - name: cargo test
+        run: cargo test --workspace --locked

crates/pawscope-claude/src/lib.rs

@@ -8,12 +8,12 @@
 //! Active detection: Claude Code writes no PID lock; we mark a session "active" when
 //! its file mtime is within the last 5 minutes.
 
+use async_trait::async_trait;
+use chrono::{DateTime, Utc};
 use pawscope_core::{
     AgentAdapter, AgentKind, CoreError, Result, SessionDetail, SessionEvent, SessionMeta,
     SessionStatus,
 };
-use async_trait::async_trait;
-use chrono::{DateTime, Utc};
 use std::collections::HashMap;
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, RwLock};

crates/pawscope-codex/src/lib.rs

@@ -1,9 +1,9 @@
+use async_trait::async_trait;
+use chrono::{DateTime, TimeZone, Utc};
 use pawscope_core::{
     AgentAdapter, AgentKind, CoreError, Result, SessionDetail, SessionEvent, SessionMeta,
     SessionStatus,
 };
-use async_trait::async_trait;
-use chrono::{DateTime, TimeZone, Utc};
 use rusqlite::Connection;
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, Mutex};

crates/pawscope-copilot/src/lib.rs

@@ -3,11 +3,11 @@ pub mod lock;
 pub mod watcher;
 pub mod workspace;
 
+use async_trait::async_trait;
 use pawscope_core::{
     AgentAdapter, AgentKind, CoreError, Result, SessionDetail, SessionEvent, SessionMeta,
     SessionStatus,
 };
-use async_trait::async_trait;
 use std::collections::HashMap;
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, RwLock};

crates/pawscope-copilot/src/watcher.rs

@@ -1,6 +1,6 @@
 use crate::events;
-use pawscope_core::{CoreError, Result, SessionEvent};
 use notify::{Config, PollWatcher, RecursiveMode, Watcher};
+use pawscope_core::{CoreError, Result, SessionEvent};
 use std::collections::{HashMap, HashSet};
 use std::path::PathBuf;
 use std::sync::{Arc, RwLock};

crates/pawscope-server/src/api.rs

@@ -1,11 +1,11 @@
 use crate::AppState;
-use pawscope_core::SessionStatus;
 use axum::{
     Json,
     extract::{Path, State},
     http::StatusCode,
     response::IntoResponse,
 };
+use pawscope_core::SessionStatus;
 use std::collections::HashMap;
 
 pub async fn list_sessions(State(s): State<AppState>) -> impl IntoResponse {

crates/pawscope-server/src/lib.rs

@@ -1,5 +1,8 @@
+use axum::{
+    Router,
+    routing::{get, post},
+};
 use pawscope_core::AgentAdapter;
-use axum::{Router, routing::{get, post}};
 use std::sync::Arc;
 use tokio::sync::broadcast;
 
@@ -59,8 +62,8 @@ pub fn spawn_watcher(state: AppState) {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use pawscope_core::*;
     use async_trait::async_trait;
+    use pawscope_core::*;
     use std::sync::Arc;
     use tokio::sync::mpsc;
 

crates/pawscope-server/src/multi.rs

@@ -1,7 +1,7 @@
 //! Fan-out adapter that combines multiple `AgentAdapter`s into one.
 
-use pawscope_core::{AgentAdapter, Result, SessionDetail, SessionEvent, SessionMeta};
 use async_trait::async_trait;
+use pawscope_core::{AgentAdapter, Result, SessionDetail, SessionEvent, SessionMeta};
 use std::collections::HashMap;
 use std::sync::Arc;
 use tokio::sync::mpsc;
@@ -37,8 +37,7 @@ impl AgentAdapter for MultiAdapter {
                 Err(e) => last_err = Some(e),
             }
         }
-        Err(last_err
-            .unwrap_or_else(|| pawscope_core::CoreError::NotFound(session_id.to_string())))
+        Err(last_err.unwrap_or_else(|| pawscope_core::CoreError::NotFound(session_id.to_string())))
     }
 
     async fn session_activity_hourly(&self, session_id: &str, hours: u32) -> Result<Vec<u64>> {

crates/pawscope-server/src/skills.rs

@@ -39,9 +39,18 @@ pub async fn list_skills(State(state): State<AppState>) -> Json<SkillsResponse>
 
     let home = std::env::var("HOME").unwrap_or_default();
     let sources = vec![
-        ("copilot-superpowers", PathBuf::from(format!("{home}/.copilot/installed-plugins"))),
-        ("claude-skills", PathBuf::from(format!("{home}/.claude/skills"))),
-        ("agents-skills", PathBuf::from(format!("{home}/.agents/skills"))),
+        (
+            "copilot-superpowers",
+            PathBuf::from(format!("{home}/.copilot/installed-plugins")),
+        ),
+        (
+            "claude-skills",
+            PathBuf::from(format!("{home}/.claude/skills")),
+        ),
+        (
+            "agents-skills",
+            PathBuf::from(format!("{home}/.agents/skills")),
+        ),
     ];
 
     let mut skills = Vec::new();
@@ -56,10 +65,18 @@ pub async fn list_skills(State(state): State<AppState>) -> Json<SkillsResponse>
     for s in &mut skills {
         s.invocations = invocations.get(&s.name).copied().unwrap_or(0);
     }
-    skills.sort_by(|a, b| b.invocations.cmp(&a.invocations).then_with(|| a.name.cmp(&b.name)));
+    skills.sort_by(|a, b| {
+        b.invocations
+            .cmp(&a.invocations)
+            .then_with(|| a.name.cmp(&b.name))
+    });
 
     let total = skills.len();
-    Json(SkillsResponse { skills, total, by_source })
+    Json(SkillsResponse {
+        skills,
+        total,
+        by_source,
+    })
 }
 
 fn scan_skills_recursive(root: &Path, source: &str, max_depth: usize) -> Vec<SkillEntry> {
@@ -288,7 +305,11 @@ pub async fn skill_usage(
         .into_iter()
         .map(|(name, sessions)| SkillCoOccurrence { name, sessions })
         .collect();
-    cooccurring.sort_by(|a, b| b.sessions.cmp(&a.sessions).then_with(|| a.name.cmp(&b.name)));
+    cooccurring.sort_by(|a, b| {
+        b.sessions
+            .cmp(&a.sessions)
+            .then_with(|| a.name.cmp(&b.name))
+    });
     cooccurring.truncate(12);
 
     Ok(Json(SkillUsage {