Release v0.3.0

Author: jiweiyeah

Cargo.lock

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["crates/agentmonitor"]
 
 [workspace.package]
-version = "0.2.0"
+version = "0.3.0"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/jiweiyeah/AgentMonitor"

Cargo.toml

@@ -61,8 +61,19 @@ impl AgentAdapter for ClaudeAdapter {
         self.root.iter().cloned().collect()
     }
     fn matches_process(&self, cmd: &[String], _exe: Option<&Path>) -> bool {
-        cmd.iter()
-            .any(|s| s.ends_with("/bin/claude") || s == "claude" || s.contains("/.claude/local/"))
+        // Cross-platform match: handles Unix paths (`/usr/local/bin/claude`,
+        // `/.claude/local/...`), bare names (`claude`, `claude.exe`,
+        // `claude.cmd`), Windows backslash paths (`C:\...\.claude\local\...`),
+        // and the npm-installed case where `node.exe` runs
+        // `node_modules\@anthropic-ai\claude-code\cli.js`. The original
+        // Unix-only matching silently rejected every running agent on
+        // Windows so the Live Processes panel was always empty.
+        cmd.iter().any(|s| {
+            super::process_match::path_ends_with(s, "/bin/claude")
+                || super::process_match::bare_name_matches(s, "claude")
+                || super::process_match::path_contains(s, "/.claude/local/")
+                || super::process_match::path_contains(s, "/@anthropic-ai/claude-code")
+        })
     }
 
     async fn parse_meta_fast(&self, path: &Path) -> Result<SessionMeta> {
@@ -1065,4 +1076,57 @@ mod tests {
             .with_timezone(&Utc);
         assert_eq!(meta.updated_at, Some(expected));
     }
+
+    #[test]
+    fn matches_claude_cli_unix_paths() {
+        let adapter = ClaudeAdapter::new(None);
+        // Bare invocation (PATH-resolved).
+        assert!(adapter.matches_process(&["claude".to_string()], None));
+        // Standard /usr/local/bin form.
+        assert!(adapter.matches_process(&["/usr/local/bin/claude".to_string()], None));
+        // The `~/.claude/local/...` install (volta / nvm-style shim).
+        assert!(adapter.matches_process(
+            &["/Users/u/.claude/local/node_modules/.bin/claude".to_string()],
+            None,
+        ));
+        // Should NOT match unrelated names.
+        assert!(!adapter.matches_process(&["claudette".to_string()], None));
+        assert!(!adapter.matches_process(&["/usr/bin/codex".to_string()], None));
+    }
+
+    #[test]
+    fn matches_claude_cli_windows_paths() {
+        // Regression: the Live Processes panel on Windows was always empty
+        // because the original Unix-only `s == "claude" || s.ends_with("/bin/claude")`
+        // check rejected every Windows-shaped argv entry. These forms are
+        // what `sysinfo` actually returns for a running Claude Code on
+        // Windows under different install methods.
+        let adapter = ClaudeAdapter::new(None);
+        // Bare exe (PATH-resolved, native installer drops claude.exe).
+        assert!(adapter.matches_process(&["claude.exe".to_string()], None));
+        // Common case: npm-installed CLI runs as `node.exe` with the cli.js
+        // as argv[1]. The .cmd shim never appears as a long-running process,
+        // so we match the @anthropic-ai/claude-code package path instead.
+        assert!(adapter.matches_process(
+            &[
+                "C:\\Program Files\\nodejs\\node.exe".to_string(),
+                "C:\\Users\\yjw\\AppData\\Roaming\\npm\\node_modules\\@anthropic-ai\\claude-code\\cli.js".to_string(),
+            ],
+            None,
+        ));
+        // Local `.claude\local\...` install with backslashes (the install
+        // script puts the runtime under `~/.claude/local/`).
+        assert!(adapter.matches_process(
+            &[
+                "C:\\Users\\yjw\\.claude\\local\\node.exe".to_string(),
+                "C:\\Users\\yjw\\.claude\\local\\node_modules\\@anthropic-ai\\claude-code\\cli.js".to_string(),
+            ],
+            None,
+        ));
+        // Mixed-separator path (some tools normalize even on Windows).
+        assert!(adapter.matches_process(
+            &["C:/Users/yjw/.claude/local/bin/claude.exe".to_string()],
+            None,
+        ));
+    }
 }

crates/agentmonitor/src/adapter/claude.rs

@@ -43,10 +43,17 @@ impl CodexAdapter {
 }
 
 fn is_codex_cli_process_arg(arg: &str) -> bool {
-    arg.ends_with("/bin/codex")
-        || arg == "codex"
-        || arg.contains("/@openai/codex-")
-        || arg.contains("/codex-cli/")
+    // Cross-platform: `path_ends_with` and `path_contains` normalize
+    // backslashes and strip `.exe`/`.cmd` so Windows `codex.exe`,
+    // `codex.cmd`, and `C:\...\@openai\codex-...` arguments all match.
+    // `bare_name_matches` is restricted to no-path forms so the VSCode
+    // chatgpt extension's bundled `bin/macos-aarch64/codex` "app-server"
+    // process — which has basename `codex` but lives under a non-`bin`
+    // parent — still doesn't get scooped up.
+    super::process_match::path_ends_with(arg, "/bin/codex")
+        || super::process_match::bare_name_matches(arg, "codex")
+        || super::process_match::path_contains(arg, "/@openai/codex-")
+        || super::process_match::path_contains(arg, "/codex-cli/")
 }
 
 fn is_codex_desktop_process(path: &Path) -> bool {
@@ -830,4 +837,39 @@ mod tests {
 
         assert!(!adapter.matches_process(&cmd, None));
     }
+
+    #[test]
+    fn matches_codex_cli_windows_paths() {
+        // Regression: Live Processes was empty on Windows because the
+        // pre-existing patterns required forward-slash separators and a bare
+        // `codex` literal — neither of which sysinfo emits for a Windows
+        // npm-installed CLI.
+        let adapter = CodexAdapter::new(None);
+        // Bare exe (native installer / PATH-resolved).
+        assert!(adapter.matches_process(&["codex.exe".to_string()], None));
+        // npm-installed CLI runs as node.exe with cli.js. The /codex-cli/
+        // substring catches the @openai/codex-cli package path.
+        assert!(adapter.matches_process(
+            &[
+                "C:\\Program Files\\nodejs\\node.exe".to_string(),
+                "C:\\Users\\yjw\\AppData\\Roaming\\npm\\node_modules\\@openai\\codex-cli\\bin\\codex.js"
+                    .to_string(),
+            ],
+            None,
+        ));
+        // The /@openai/codex- substring also catches alternative package layouts.
+        assert!(adapter.matches_process(
+            &[
+                "C:\\Program Files\\nodejs\\node.exe".to_string(),
+                "C:\\Users\\yjw\\AppData\\Roaming\\npm\\node_modules\\@openai\\codex-foo\\index.js"
+                    .to_string(),
+            ],
+            None,
+        ));
+        // Negative: unrelated exe must not match.
+        assert!(!adapter.matches_process(
+            &["C:\\Windows\\System32\\notepad.exe".to_string()],
+            None,
+        ));
+    }
 }

crates/agentmonitor/src/adapter/codex.rs

@@ -70,10 +70,13 @@ impl AgentAdapter for GeminiAdapter {
     }
 
     fn matches_process(&self, cmd: &[String], _exe: Option<&Path>) -> bool {
+        // Cross-platform: handle Windows `.exe`/`.cmd` wrappers and
+        // backslash separators in the npm install path. See
+        // adapter/process_match.rs for the rationale.
         cmd.iter().any(|s| {
-            s.ends_with("/gemini")
-                || s == "gemini"
-                || s.contains("/@google/gemini-cli")
+            super::process_match::path_ends_with(s, "/gemini")
+                || super::process_match::bare_name_matches(s, "gemini")
+                || super::process_match::path_contains(s, "/@google/gemini-cli")
         })
     }
 
@@ -538,6 +541,26 @@ mod tests {
         ));
     }
 
+    #[test]
+    fn test_matches_process_windows() {
+        // Regression: gemini was invisible in Live Processes on Windows
+        // because the matchers required `/`-prefixed paths and a bare
+        // `gemini` literal.
+        let adapter = GeminiAdapter::new(None);
+        // Bare exe.
+        assert!(adapter.matches_process(&["gemini.exe".to_string()], None));
+        // npm-installed CLI: node.exe runs the cli script. The
+        // /@google/gemini-cli substring catches the package path.
+        assert!(adapter.matches_process(
+            &[
+                "C:\\Program Files\\nodejs\\node.exe".to_string(),
+                "C:\\Users\\yjw\\AppData\\Roaming\\npm\\node_modules\\@google\\gemini-cli\\dist\\index.js"
+                    .to_string(),
+            ],
+            None
+        ));
+    }
+
     #[test]
     fn test_infer_status_active() {
         let t = Utc::now() - chrono::Duration::seconds(30);

crates/agentmonitor/src/adapter/gemini.rs

@@ -105,11 +105,15 @@ impl AgentAdapter for HermesAdapter {
     }
 
     fn matches_process(&self, cmd: &[String], _exe: Option<&Path>) -> bool {
+        // Cross-platform: backslash-separator and `.exe`/`.cmd`/`.bat` wrapper
+        // matching for Windows. The `hermes_cli.main` substring already works
+        // verbatim on Windows because Python module dotted-paths don't carry
+        // path separators.
         cmd.iter().any(|s| {
-            s == "hermes"
-                || s.ends_with("/hermes")
+            super::process_match::bare_name_matches(s, "hermes")
+                || super::process_match::path_ends_with(s, "/hermes")
                 || s.contains("hermes_cli.main")
-                || s.contains("hermes_cli/main.py")
+                || super::process_match::path_contains(s, "hermes_cli/main.py")
         })
     }
 
@@ -738,6 +742,32 @@ mod tests {
         assert!(!adapter.matches_process(&["claude".to_string()], None));
     }
 
+    #[test]
+    fn matches_hermes_process_windows() {
+        let adapter = HermesAdapter::new(None);
+        // Bare exe.
+        assert!(adapter.matches_process(&["hermes.exe".to_string()], None));
+        // Windows venv `python.exe -m hermes_cli.main` (the dotted module
+        // path is identical across OSes).
+        assert!(adapter.matches_process(
+            &[
+                "C:\\Users\\u\\.hermes\\hermes-agent\\venv\\Scripts\\python.exe".to_string(),
+                "-m".to_string(),
+                "hermes_cli.main".to_string(),
+                "chat".to_string(),
+            ],
+            None,
+        ));
+        // Windows venv with the script form (`hermes_cli/main.py` substring).
+        assert!(adapter.matches_process(
+            &[
+                "C:\\Users\\u\\.hermes\\hermes-agent\\venv\\Scripts\\python.exe".to_string(),
+                "C:\\Users\\u\\.hermes\\hermes-agent\\hermes_cli\\main.py".to_string(),
+            ],
+            None,
+        ));
+    }
+
     #[test]
     fn pick_updated_at_prefers_last_message_then_ended() {
         // last_msg > ended > started — last_msg wins.

crates/agentmonitor/src/adapter/hermes.rs

@@ -5,6 +5,7 @@ pub mod conversation;
 pub mod gemini;
 pub mod hermes;
 pub mod opencode;
+pub(crate) mod process_match;
 pub mod types;
 
 use std::path::Path;

crates/agentmonitor/src/adapter/mod.rs

@@ -82,8 +82,11 @@ impl AgentAdapter for OpencodeAdapter {
     }
 
     fn matches_process(&self, cmd: &[String], _exe: Option<&Path>) -> bool {
-        cmd.iter()
-            .any(|s| s == "opencode" || s.contains("/opencode") || s.ends_with("opencode"))
+        // Cross-platform: handle Windows backslash paths and exe wrappers.
+        cmd.iter().any(|s| {
+            super::process_match::bare_name_matches(s, "opencode")
+                || super::process_match::path_contains(s, "/opencode")
+        })
     }
 
     fn needs_fs_stat(&self) -> bool {
@@ -619,6 +622,27 @@ mod tests {
         assert!(!adapter.matches_process(&["claude".to_string()], None));
     }
 
+    #[test]
+    fn matches_opencode_process_windows() {
+        let adapter = OpencodeAdapter::new(None);
+        // Bare exe.
+        assert!(adapter.matches_process(&["opencode.exe".to_string()], None));
+        // node-launched cli with /opencode/ in the path.
+        assert!(adapter.matches_process(
+            &[
+                "C:\\Program Files\\nodejs\\node.exe".to_string(),
+                "C:\\Users\\yjw\\AppData\\Roaming\\npm\\node_modules\\opencode\\bin\\opencode.js"
+                    .to_string(),
+            ],
+            None,
+        ));
+        // Native installer drop point.
+        assert!(adapter.matches_process(
+            &["C:\\Program Files\\opencode\\opencode.exe".to_string()],
+            None,
+        ));
+    }
+
     #[test]
     fn infer_status_active() {
         let now = Some(Utc::now());