Skip to content

Reason Network: your team's coding agents, talking to each other. The engine behind `reason network`.

Menu bar icon on macOS, and less context for agents

Lars Talian978fc1f2fbac
diff --git a/Cargo.lock b/Cargo.lock
index 66c7d87..216996d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -17,6 +17,12 @@ dependencies = [
"tracing",
]
+[[package]]
+name = "adler2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+
[[package]]
name = "aead"
version = "0.5.2"
@@ -408,7 +414,7 @@ dependencies = [
[[package]]
name = "company-comms"
-version = "0.2.0"
+version = "0.3.0"
dependencies = [
"anyhow",
"blake3",
@@ -419,6 +425,9 @@ dependencies = [
"iroh",
"iroh-mdns-address-lookup",
"libc",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
"rmcp",
"rusqlite",
"schemars",
@@ -427,6 +436,7 @@ dependencies = [
"tokio",
"toml",
"toml_edit",
+ "tray-icon",
"ulid",
]
@@ -507,12 +517,36 @@ dependencies = [
"libc",
]
+[[package]]
+name = "crc32fast"
+version = "1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01a7799fd6b852db0e61728dde9a204c423b44d689dbd432522543614b490e78"
+dependencies = [
+ "cfg-if",
+]
+
[[package]]
name = "critical-section"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b"
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98b0cc327b5bc766e7fda9c9260cc0fa81b43a8e240440422dff70788e3f9ef1"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a31eee39dddec8330830986fcd7625edb5a24ec90ea038215273bbc3adb08ac6"
+
[[package]]
name = "crypto-common"
version = "0.1.7"
@@ -730,6 +764,12 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "dpi"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
+
[[package]]
name = "dyn-clone"
version = "1.0.20"
@@ -826,6 +866,15 @@ version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223"
+[[package]]
+name = "fdeflate"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c"
+dependencies = [
+ "simd-adler32",
+]
+
[[package]]
name = "fiat-crypto"
version = "0.3.0"
@@ -838,6 +887,17 @@ version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aedcfb3409746eddb02b9e19ebda1c3394f759a152e48ee875a0844d1b955484"
+[[package]]
+name = "flate2"
+version = "1.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e634e2e0ebac1ee034020da1ca582e17ffe4e0f5e985823721e168928136dcb"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide 0.9.1",
+ "zlib-rs",
+]
+
[[package]]
name = "fnv"
version = "1.0.7"
@@ -1788,6 +1848,16 @@ dependencies = [
"wasm-bindgen",
]
+[[package]]
+name = "keyboard-types"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fbe853b403ae61a04233030ae8a79d94975281ed9770a1f9e246732b534b28d"
+dependencies = [
+ "bitflags",
+ "serde",
+]
+
[[package]]
name = "lazy_static"
version = "1.5.1"
@@ -1881,6 +1951,26 @@ version = "2.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
+[[package]]
+name = "miniz_oxide"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+dependencies = [
+ "adler2",
+ "simd-adler32",
+]
+
+[[package]]
+name = "miniz_oxide"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b63fbc4a50860e98e7b2aa7804ded1db5cbc3aff9193adaff57a6931bf7c4b4c"
+dependencies = [
+ "adler2",
+ "simd-adler32",
+]
+
[[package]]
name = "mio"
version = "1.2.4"
@@ -1892,6 +1982,24 @@ dependencies = [
"windows-sys 0.61.2",
]
+[[package]]
+name = "muda"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4340e89c178916e62879c5c36b7f699019369be413e496178a6983ce91b8bc03"
+dependencies = [
+ "crossbeam-channel",
+ "dpi",
+ "keyboard-types",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-core-foundation",
+ "objc2-foundation",
+ "png",
+ "thiserror 2.0.21",
+ "windows-sys 0.61.2",
+]
+
[[package]]
name = "n0-dns-resolver"
version = "0.1.0"
@@ -2261,6 +2369,18 @@ dependencies = [
"objc2-encode",
]
+[[package]]
+name = "objc2-app-kit"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
+dependencies = [
+ "bitflags",
+ "objc2",
+ "objc2-core-foundation",
+ "objc2-foundation",
+]
+
[[package]]
name = "objc2-core-foundation"
version = "0.3.2"
@@ -2274,6 +2394,16 @@ dependencies = [
"objc2",
]
+[[package]]
+name = "objc2-core-graphics"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
+dependencies = [
+ "bitflags",
+ "objc2-core-foundation",
+]
+
[[package]]
name = "objc2-core-wlan"
version = "0.3.2"
@@ -2501,6 +2631,19 @@ dependencies = [
"time",
]
+[[package]]
+name = "png"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
+dependencies = [
+ "bitflags",
+ "crc32fast",
+ "fdeflate",
+ "flate2",
+ "miniz_oxide 0.8.9",
+]
+
[[package]]
name = "polyval"
version = "0.6.2"
@@ -3185,6 +3328,12 @@ dependencies = [
"rand_core 0.10.1",
]
+[[package]]
+name = "simd-adler32"
+version = "0.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a219298ac11a56ea9a6d2120044824d6f01aeb034955e7af7bc16858527deea"
+
[[package]]
name = "simd_cesu8"
version = "1.2.0"
@@ -3758,6 +3907,25 @@ dependencies = [
"tracing-log",
]
+[[package]]
+name = "tray-icon"
+version = "0.26.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f5cc5858ecf9574ddd8f0032a2ff7ffd6f7724d2b81e48b9374984b3fd6ddc9"
+dependencies = [
+ "crossbeam-channel",
+ "muda",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
+ "objc2-foundation",
+ "once_cell",
+ "png",
+ "thiserror 2.0.21",
+ "windows-sys 0.61.2",
+]
+
[[package]]
name = "try-lock"
version = "0.2.5"
@@ -4522,6 +4690,12 @@ dependencies = [
"syn 3.0.7",
]
+[[package]]
+name = "zlib-rs"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b268e58e7c693d7c271f93ffc4ba3b380412554231c85bf61ca7af91042a4112"
+
[[package]]
name = "zmij"
version = "1.0.23"
diff --git a/Cargo.toml b/Cargo.toml
index b75d1ee..6fb3dd5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "company-comms"
-version = "0.2.0"
+version = "0.3.0"
edition = "2024"
description = "Team directory and message bus for coding agents across machines"
license = "MIT OR Apache-2.0"
@@ -31,6 +31,12 @@ toml = "0.9"
toml_edit = "0.25"
ulid = "1"
+[target.'cfg(target_os = "macos")'.dependencies]
+tray-icon = { version = "0.26", default-features = false }
+objc2 = "0.6"
+objc2-app-kit = { version = "0.3", default-features = false, features = ["std", "NSApplication", "NSResponder", "NSEvent", "NSImage", "NSStatusItem", "NSStatusBarButton", "NSButton", "NSControl", "NSView", "NSCell", "NSRunningApplication"] }
+objc2-foundation = { version = "0.3", default-features = false, features = ["std", "NSDate", "NSString", "NSRunLoop", "NSObjCRuntime"] }
+
[profile.release]
lto = true
codegen-units = 1
diff --git a/README.md b/README.md
index 485c22c..5c8c63c 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,10 @@ continue". Gemini CLI only runs hooks and MCP servers in trusted folders.
Agents (or scripts) can do it all without prompts: `comms join <link> --as <name>`, `comms init <team>`.
+On a Mac, comms sits in the menu bar while it runs: two speech bubbles, filled while a teammate is connected,
+with the number of messages waiting for you. Its menu lists each machine's sessions and what they're doing,
+and copies the team link. "Hide menu bar icon" turns it off (`comms setup` turns it back on).
+
## What agents get
| Tool | |
@@ -117,7 +121,7 @@ comms leave # leave the team on this machine
sam = "hold"
```
- Each sender is also limited to 30 messages a minute.
+ Each machine is also limited to 60 messages a minute.
- **The team link** carries the team's join secret and a few members' keys (after the `#`, which browsers never
send to the server). Anyone holding it can join, so treat it like a group-chat invite; `comms link --new`
replaces it. One-time four-word codes (`comms invite --code`) are for reading out loud or adding your own
@@ -136,6 +140,7 @@ comms leave # leave the team on this machine
| `person` | `$USER` | your name (set by `init`/`join`) |
| `share_paths` | `false` | show teammates full working directories |
| `share_unmanaged` | `false` | show teammates Claude Code sessions that don't have comms loaded |
+| `tray` | `true` | macOS: show the menu bar icon while the background service runs |
| `lan` | `true` | find teammates on the local network (mDNS) |
| `inbound` | accept | see above |
diff --git a/src/client.rs b/src/client.rs
index 87a2551..4db2716 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -36,11 +36,22 @@ pub struct Link {
/// Where pushed events go. `None` for one-shot clients, which also don't reconnect.
events: Option<mpsc::UnboundedSender<Event>>,
next_id: AtomicU64,
+ /// Start the daemon when it isn't running.
+ start: bool,
}
impl Link {
pub fn new(events: Option<mpsc::UnboundedSender<Event>>) -> Arc<Self> {
- Arc::new(Link { conn: Default::default(), regs: Default::default(), events, next_id: AtomicU64::new(1) })
+ Self::with(events, true)
+ }
+
+ /// A one-shot client that never starts the daemon: it fails while none is running.
+ pub fn existing() -> Arc<Self> {
+ Self::with(None, false)
+ }
+
+ fn with(events: Option<mpsc::UnboundedSender<Event>>, start: bool) -> Arc<Self> {
+ Arc::new(Link { conn: Default::default(), regs: Default::default(), events, next_id: AtomicU64::new(1), start })
}
pub async fn call<T: DeserializeOwned>(self: &Arc<Self>, req: Request) -> Result<T> {
@@ -80,7 +91,7 @@ impl Link {
{
return Ok(c.clone());
}
- let c = self.spawn_io(connect_or_start().await?);
+ let c = self.spawn_io(connect_or_start(self.start).await?);
let regs: Vec<SessionReg> = self.regs.lock().unwrap().values().cloned().collect();
for reg in regs {
self.raw(&c, &Request::Register { session: reg }).await?;
@@ -137,11 +148,14 @@ async fn reconnect(link: Weak<Link>) {
}
}
-async fn connect_or_start() -> Result<UnixStream> {
+async fn connect_or_start(start: bool) -> Result<UnixStream> {
let sock = paths::socket();
if let Ok(s) = UnixStream::connect(&sock).await {
return Ok(s);
}
+ if !start {
+ bail!("the comms daemon isn't running");
+ }
start_daemon()?;
for _ in 0..60 {
tokio::time::sleep(Duration::from_millis(50)).await;
diff --git a/src/config.rs b/src/config.rs
index 1f94fda..979906c 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -14,6 +14,8 @@ pub struct Config {
pub share_unmanaged: bool,
/// Find teammates on the local network with mDNS.
pub lan: bool,
+ /// Show the menu bar icon (macOS, while the background service runs).
+ pub tray: bool,
pub inbound: Inbound,
}
@@ -37,7 +39,7 @@ pub enum Policy {
impl Default for Config {
fn default() -> Self {
- Config { person: None, share_paths: false, share_unmanaged: false, lan: true, inbound: Inbound::default() }
+ Config { person: None, share_paths: false, share_unmanaged: false, lan: true, tray: true, inbound: Inbound::default() }
}
}
@@ -86,4 +88,8 @@ impl Config {
pub fn lan(&self) -> bool {
self.lan && std::env::var_os("COMMS_NO_MDNS").is_none()
}
+
+ pub fn tray(&self) -> bool {
+ cfg!(target_os = "macos") && self.tray && std::env::var_os("COMMS_NO_TRAY").is_none()
+ }
}
diff --git a/src/daemon/directory.rs b/src/daemon/directory.rs
index ef165e6..b9ba9a9 100644
--- a/src/daemon/directory.rs
+++ b/src/daemon/directory.rs
@@ -324,8 +324,8 @@ impl Daemon {
let pool: Vec<&&Cand> = if live.is_empty() { found.iter().collect() } else { live };
match pool.as_slice() {
[] => bail!(
- "no session called '{spec}'. Run list_team to see who is around (sessions marked 'not on comms' \
- can't receive)."
+ "no session called '{spec}'. Run list_team to see who is around (sessions without comms can't \
+ receive)."
),
[one] => Ok(vec![target(one)]),
many => {
diff --git a/src/daemon/mod.rs b/src/daemon/mod.rs
index 0eebb1b..7ee3d65 100644
--- a/src/daemon/mod.rs
+++ b/src/daemon/mod.rs
@@ -54,12 +54,28 @@ pub async fn run(service: bool) -> Result<()> {
{
log(&format!("network not started: {e:#}"));
}
+ if service && daemon.cfg.tray() {
+ tokio::spawn(tray());
+ }
loop {
let (stream, _) = listener.accept().await?;
tokio::spawn(daemon.clone().serve(stream));
}
}
+/// Keeps the menu bar icon up while we run. It exits 0 when the user hides it, and on its own when we exit.
+async fn tray() {
+ let Ok(exe) = std::env::current_exe() else { return };
+ for _ in 0..5 {
+ match tokio::process::Command::new(&exe).arg("tray").stdin(std::process::Stdio::null()).status().await {
+ Ok(st) if st.success() => return,
+ Ok(st) => log(&format!("menu bar icon exited ({st}); restarting it")),
+ Err(e) => return log(&format!("menu bar icon not started: {e}")),
+ }
+ tokio::time::sleep(Duration::from_secs(5)).await;
+ }
+}
+
fn log(msg: &str) {
eprintln!("[{}] {msg}", util::now_ms());
}
@@ -205,7 +221,7 @@ impl Daemon {
Request::Who { me, filter, all } => json!(self.who(me, filter, all).await?),
Request::Send { from, to, body, reply_to, wake } => json!(self.send(from, &to, &body, reply_to, wake).await?),
Request::Inbox { key, wait_secs, peek } => json!(self.inbox(key, wait_secs.min(MAX_WAIT), peek).await?),
- Request::Unread { key } => json!(self.unread(&key)?),
+ Request::Unread { key } => json!(self.unread(key.as_deref())?),
Request::Delivered { ids, .. } => {
let mut g = self.inner.lock().unwrap();
g.store.mark_read(&ids, util::now_ms())?;
diff --git a/src/daemon/sessions.rs b/src/daemon/sessions.rs
index 2a422b3..f3fc234 100644
--- a/src/daemon/sessions.rs
+++ b/src/daemon/sessions.rs
@@ -113,12 +113,13 @@ impl Daemon {
Ok(Registered { name: live.name.clone(), unread: g.store.unread_count(&address)?, address })
}
- pub(super) fn unread(&self, key: &str) -> Result<Unread> {
+ pub(super) fn unread(&self, key: Option<&str>) -> Result<Unread> {
let mut g = self.inner.lock().unwrap();
- let Some(l) = g.live.get(key) else {
- return Ok(Unread { count: 0, from: Vec::new() });
+ let address = match key.map(|k| g.live.get(k)) {
+ None => self.person.clone(),
+ Some(Some(l)) => self.addr(&l.name),
+ Some(None) => return Ok(Unread { count: 0, from: Vec::new() }),
};
- let address = self.addr(&l.name);
let msgs = g.pending(&address)?;
let mut from: Vec<String> = Vec::new();
for m in &msgs {
diff --git a/src/main.rs b/src/main.rs
index 4355289..24abdc4 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -14,6 +14,7 @@ mod render;
mod setup;
mod store;
mod team;
+mod tray;
mod util;
mod wizard;
@@ -190,6 +191,9 @@ enum Cmd {
Stop,
/// Run the MCP server on stdio (what agents launch)
Mcp,
+ /// The menu bar icon (macOS; the background service starts it)
+ #[command(hide = true)]
+ Tray,
}
#[tokio::main]
@@ -197,6 +201,8 @@ async fn main() -> Result<()> {
match Cli::parse().cmd {
Some(Cmd::Daemon { service }) => daemon::run(service).await,
Some(Cmd::Mcp) => mcp::run().await,
+ // Blocks this (the main) thread with AppKit's event loop; its daemon calls run on the runtime's workers.
+ Some(Cmd::Tray) => tray::run(),
Some(Cmd::Hook { agent, event, session, state }) => {
hook::run(&agent, &event, session, state).await;
// Don't wait on anything left behind (a stuck stdin read): the agent is waiting on us.
@@ -236,7 +242,7 @@ async fn cli(cmd: Cmd) -> Result<()> {
if json {
println!("{}", serde_json::to_string_pretty(&d)?);
} else {
- print!("{}", render::directory(&d));
+ print!("{}", render::directory(&d, false));
}
}
Cmd::Send { to, message, reply_to, fyi } => {
@@ -389,7 +395,7 @@ async fn cli(cmd: Cmd) -> Result<()> {
println!("The daemon is not running.");
}
}
- Cmd::Daemon { .. } | Cmd::Mcp | Cmd::Hook { .. } => unreachable!("handled in main"),
+ Cmd::Daemon { .. } | Cmd::Mcp | Cmd::Hook { .. } | Cmd::Tray => unreachable!("handled in main"),
}
Ok(())
}
diff --git a/src/mcp.rs b/src/mcp.rs
index b2c9737..922dcde 100644
--- a/src/mcp.rs
+++ b/src/mcp.rs
@@ -140,7 +140,7 @@ impl CommsMcp {
Err(e) => return Ok(failure(e)),
};
let req = Request::Who { me: Some(key.clone()), filter: a.filter, all: a.all.unwrap_or(false) };
- let res = self.link.call::<Directory>(req).await.map(|d| render::directory(&d));
+ let res = self.link.call::<Directory>(req).await.map(|d| render::directory(&d, true));
Ok(self.finish(&key, res, true).await)
}
@@ -276,7 +276,7 @@ impl CommsMcp {
match res {
Ok(mut text) => {
if notice
- && let Ok(u) = self.link.call::<Unread>(Request::Unread { key: key.to_string() }).await
+ && let Ok(u) = self.link.call::<Unread>(Request::Unread { key: Some(key.to_string()) }).await
&& let Some(n) = render::unread_notice(&u)
{
text.push_str("\n\n");
diff --git a/src/proto.rs b/src/proto.rs
index 6f80656..0e1e47b 100644
--- a/src/proto.rs
+++ b/src/proto.rs
@@ -97,8 +97,10 @@ pub enum Request {
#[serde(default)]
peek: bool,
},
+ /// Unread messages for a session, or (`None`) for the human here.
Unread {
- key: String,
+ #[serde(default)]
+ key: Option<String>,
},
/// The client injected these messages into its agent's conversation.
Delivered {
diff --git a/src/render.rs b/src/render.rs
index 4f457e7..ffcb498 100644
--- a/src/render.rs
+++ b/src/render.rs
@@ -3,7 +3,8 @@
use crate::{proto::*, util};
use std::fmt::Write;
-pub fn directory(d: &Directory) -> String {
+/// The team directory. For an agent (`agent`), sessions without comms are only counted: it can't message them.
+pub fn directory(d: &Directory, agent: bool) -> String {
let now = util::now_ms();
let mut out = String::new();
let team = d.team.as_deref().map_or_else(|| "no team yet (this machine only)".to_string(), |t| format!("team {t}"));
@@ -33,7 +34,7 @@ pub fn directory(d: &Directory) -> String {
})
.collect();
let mut width = [0; 4];
- for row in &cells {
+ for (_, row) in cells.iter().enumerate().filter(|(i, _)| !agent || d.sessions[*i].tier != Tier::None) {
for (w, c) in width.iter_mut().zip(row) {
*w = (*w).max(c.chars().count());
}
@@ -44,15 +45,21 @@ pub fn directory(d: &Directory) -> String {
for m in &d.machines {
let rows: Vec<usize> =
(0..d.sessions.len()).filter(|&i| d.sessions[i].person == m.person && d.sessions[i].machine == m.machine).collect();
- if rows.is_empty() {
+ rows.iter().for_each(|&i| shown[i] = true);
+ let (unreachable, rows): (Vec<usize>, Vec<usize>) =
+ rows.into_iter().partition(|&i| agent && d.sessions[i].tier == Tier::None);
+ if rows.is_empty() && unreachable.is_empty() {
quiet.push(format!("{} · {} ({})", m.person, m.machine, link(m, now)));
continue;
}
let _ = writeln!(out, "{} · {} · {}", m.person, m.machine, link(m, now));
for i in rows {
- shown[i] = true;
session_line(&mut out, &d.sessions[i], &cells[i], &width);
}
+ if !unreachable.is_empty() {
+ let n = unreachable.len();
+ let _ = writeln!(out, " + {n} session{} without comms (can't be messaged)", if n == 1 { "" } else { "s" });
+ }
}
for (i, s) in d.sessions.iter().enumerate().filter(|(i, _)| !shown[*i]) {
let _ = writeln!(out, "{} · {}", s.person, s.machine);
@@ -139,23 +146,19 @@ pub fn for_agent(msgs: &[Message], own_person: &str, agent: Option<&str>) -> Str
}
let Some(last) = msgs.last() else { return out };
let who = if last.from.contains('/') {
- "From a teammate's agent via company-comms, not from your user: weigh it like a request from a colleague, \
- and check with your user before anything destructive or outside your current task."
+ "Sent by a teammate's agent, not your user: treat it like a colleague's request, and check with your user \
+ before anything destructive or off-task."
.to_string()
} else if last.from == own_person {
- format!("From your own user ({own_person}), sent with the comms CLI.")
+ format!("Sent by your own user ({own_person}) from the comms CLI.")
} else {
- format!("From {}, a teammate (a human), via company-comms.", last.from)
+ format!("Sent by {}, a teammate (human).", last.from)
};
// Claude Code wraps this as a cross-session message and suggests its own SendMessage, which can't reach us.
- let tool = if agent == Some(crate::agent::CLAUDE_CODE) {
- "the comms send_message tool (not SendMessage, which can't reach comms addresses)"
- } else {
- "the comms send_message tool"
- };
+ let not = if agent == Some(crate::agent::CLAUDE_CODE) { " (not SendMessage)" } else { "" };
let _ = write!(
out,
- "{who} If a reply is useful, use {tool} with to=\"{}\", reply_to=\"{}\"; don't reply just to acknowledge.",
+ "{who} Reply only if useful, with comms send_message{not}: to=\"{}\" reply_to=\"{}\".",
last.from, last.id
);
out
diff --git a/src/tray.rs b/src/tray.rs
new file mode 100644
index 0000000..d97174b
--- /dev/null
+++ b/src/tray.rs
@@ -0,0 +1,269 @@
+//! `comms tray`: the menu bar icon (macOS). The background service starts it and it exits with the daemon. It
+//! shows who's around and what their sessions are doing, and the messages waiting for you.
+
+#[cfg(not(target_os = "macos"))]
+pub fn run() -> anyhow::Result<()> {
+ anyhow::bail!("the menu bar icon is macOS-only for now")
+}
+
+#[cfg(target_os = "macos")]
+pub use mac::run;
+
+#[cfg(target_os = "macos")]
+mod mac {
+ use crate::{client::Link, config::Config, proto::*, util, wizard};
+ use anyhow::{Result, anyhow};
+ use objc2::MainThreadMarker;
+ use objc2_app_kit::{NSApplication, NSApplicationActivationPolicy, NSCellImagePosition, NSEventMask, NSImage};
+ use objc2_foundation::{NSDate, NSDefaultRunLoopMode, NSString};
+ use std::{
+ sync::mpsc,
+ time::{Duration, Instant},
+ };
+ use tokio::sync::mpsc as amsc;
+ use tray_icon::{
+ TrayIcon, TrayIconBuilder,
+ menu::{IsMenuItem, Menu, MenuEvent, MenuItem, PredefinedMenuItem, Submenu},
+ };
+
+ /// What the daemon says, every couple of seconds.
+ struct View {
+ /// Everything shown, to rebuild the menu only when something changed.
+ key: String,
+ team: Option<String>,
+ me: String,
+ machines: Vec<(MachineInfo, Vec<SessionInfo>, usize)>,
+ unread: Unread,
+ }
+
+ enum Update {
+ View(Box<View>),
+ Flash(&'static str),
+ /// The daemon is gone for good.
+ Gone,
+ }
+
+ enum Action {
+ Copy(String),
+ CopyLink,
+ }
+
+ pub fn run() -> Result<()> {
+ let mtm = MainThreadMarker::new().ok_or_else(|| anyhow!("the menu bar icon needs the main thread"))?;
+ let app = NSApplication::sharedApplication(mtm);
+ // A menu bar item only: no Dock icon, no app menu.
+ app.setActivationPolicy(NSApplicationActivationPolicy::Accessory);
+ app.finishLaunching();
+
+ let (tx, updates) = mpsc::channel();
+ let (act, actions) = amsc::unbounded_channel();
+ tokio::spawn(poll(tx, actions));
+
+ let tray = TrayIconBuilder::new()
+ .with_tooltip("comms")
+ .with_autosave_name("dev.company-comms.tray")
+ .with_menu(Box::new(Menu::new()))
+ .build()?;
+ set_icon(&tray, false, None, mtm);
+ let parent = util::parent_pid();
+ let mut shown: Option<Box<View>> = None;
+ let mut flash: Option<(&str, Instant)> = None;
+ loop {
+ let until = NSDate::dateWithTimeIntervalSinceNow(0.5);
+ // SAFETY: the main thread's event loop, with AppKit's own run loop mode.
+ let ev = unsafe { app.nextEventMatchingMask_untilDate_inMode_dequeue(NSEventMask::Any, Some(&until), NSDefaultRunLoopMode, true) };
+ if let Some(ev) = ev {
+ app.sendEvent(&ev);
+ }
+ while let Ok(ev) = MenuEvent::receiver().try_recv() {
+ match ev.id.as_ref() {
+ "link" => {
+ let _ = act.send(Action::CopyLink);
+ }
+ "hide" => hide(),
+ id => {
+ if let Some(addr) = id.strip_prefix("copy:") {
+ let _ = act.send(Action::Copy(addr.to_string()));
+ }
+ }
+ }
+ }
+ let mut changed = false;
+ while let Ok(u) = updates.try_recv() {
+ match u {
+ Update::View(v) if shown.as_ref().is_none_or(|s| s.key != v.key) => {
+ tray.set_menu(Some(Box::new(menu(&v))));
+ shown = Some(v);
+ changed = true;
+ }
+ Update::View(_) => {}
+ Update::Flash(text) => {
+ flash = Some((text, Instant::now()));
+ changed = true;
+ }
+ Update::Gone => std::process::exit(0),
+ }
+ }
+ if flash.is_some_and(|(_, at)| at.elapsed() > Duration::from_secs(2)) {
+ flash = None;
+ changed = true;
+ }
+ if changed {
+ let v = shown.as_deref();
+ let online = v.is_some_and(|v| v.machines.iter().any(|(m, ..)| m.online && !m.is_me));
+ let count = v.map_or(0, |v| v.unread.count);
+ let title = flash.map(|(t, _)| t.to_string()).or_else(|| (count > 0).then(|| count.to_string()));
+ set_icon(&tray, online, title.as_deref(), mtm);
+ }
+ // Our daemon exited (we were handed to launchd): go with it.
+ if util::parent_pid() != parent {
+ std::process::exit(0);
+ }
+ }
+ }
+
+ /// Two speech bubbles, filled while a teammate is connected, plus an optional title (the unread count).
+ fn set_icon(tray: &TrayIcon, online: bool, title: Option<&str>, mtm: MainThreadMarker) {
+ let name = if online { "bubble.left.and.bubble.right.fill" } else { "bubble.left.and.bubble.right" };
+ if let Some(button) = tray.ns_status_item().and_then(|i| i.button(mtm)) {
+ let image =
+ NSImage::imageWithSystemSymbolName_accessibilityDescription(&NSString::from_str(name), Some(&NSString::from_str("comms")));
+ button.setImage(image.as_deref());
+ button.setImagePosition(NSCellImagePosition::ImageLeft);
+ }
+ // Also resizes the clickable area to fit the new image and title.
+ tray.set_title(title.map(|t| format!(" {t}")));
+ }
+
+ fn menu(v: &View) -> Menu {
+ let menu = Menu::new();
+ let info = |text: &str| MenuItem::new(text, false, None);
+ let sep = PredefinedMenuItem::separator;
+ let mut items: Vec<Box<dyn IsMenuItem>> = Vec::new();
+ match &v.team {
+ Some(t) => items.push(Box::new(info(&format!("{t} · you're {}", v.me)))),
+ None => {
+ items.push(Box::new(info("Not in a team yet")));
+ items.push(Box::new(info("Run `comms` in a terminal to set up")));
+ }
+ }
+ items.push(Box::new(sep()));
+ for (m, sessions, without) in &v.machines {
+ let dot = if m.online || m.is_me { "●" } else { "○" };
+ let label = format!("{dot} {} · {} · {}", m.person, m.machine, how(m));
+ if sessions.is_empty() && *without == 0 {
+ // Enabled (it does nothing): a greyed-out line would read as offline.
+ items.push(Box::new(MenuItem::with_id("none", label, true, None)));
+ continue;
+ }
+ let sub = Submenu::new(label, true);
+ for s in sessions {
+ let place = match (&s.repo, &s.branch) {
+ (Some(r), Some(b)) => format!("{r}@{b}"),
+ (Some(r), None) => r.clone(),
+ _ => s.cwd.clone(),
+ };
+ let _ = sub.append(&MenuItem::with_id(
+ format!("copy:{}", s.address),
+ format!("{} · {} · {} · {place}", s.name, s.agent, s.status),
+ true,
+ None,
+ ));
+ if let Some(doing) = &s.doing {
+ let doing: String = doing.chars().take(70).collect();
+ let _ = sub.append(&info(&format!(" {doing}")));
+ }
+ }
+ if *without > 0 {
+ let _ = sub.append(&info(&format!("+ {without} without comms")));
+ }
+ let _ = sub.append(&sep());
+ let _ = sub.append(&info("Click a session to copy its address"));
+ items.push(Box::new(sub));
+ }
+ items.push(Box::new(sep()));
+ if v.unread.count > 0 {
+ let s = if v.unread.count == 1 { "" } else { "s" };
+ items.push(Box::new(info(&format!("{} message{s} for you from {}", v.unread.count, v.unread.from.join(", ")))));
+ items.push(Box::new(info("Read them with `comms inbox`")));
+ items.push(Box::new(sep()));
+ }
+ if v.team.is_some() {
+ items.push(Box::new(MenuItem::with_id("link", "Copy team link", true, None)));
+ }
+ items.push(Box::new(MenuItem::with_id("hide", "Hide menu bar icon", true, None)));
+ let refs: Vec<&dyn IsMenuItem> = items.iter().map(|i| i.as_ref()).collect();
+ let _ = menu.append_items(&refs);
+ menu
+ }
+
+ fn how(m: &MachineInfo) -> String {
+ if m.is_me {
+ return "this Mac".into();
+ }
+ match (m.online, &m.link, m.rtt_ms, m.last_seen) {
+ (true, Some(l), Some(r), _) => format!("{l} {r}ms"),
+ (true, ..) => "connected".into(),
+ (false, _, _, Some(t)) => format!("offline {}", util::ago(t, util::now_ms())),
+ _ => "not seen yet".into(),
+ }
+ }
+
+ /// Hidden for good: `comms setup` brings it back.
+ fn hide() -> ! {
+ if let Ok(mut cfg) = Config::load_strict() {
+ cfg.tray = false;
+ let _ = cfg.save();
+ }
+ std::process::exit(0)
+ }
+
+ async fn poll(tx: mpsc::Sender<Update>, mut actions: amsc::UnboundedReceiver<Action>) {
+ let link = Link::existing();
+ let mut tick = tokio::time::interval(Duration::from_secs(2));
+ let mut fails = 0;
+ loop {
+ let update = tokio::select! {
+ _ = tick.tick() => match view(&link).await {
+ Ok(v) => {
+ fails = 0;
+ Update::View(Box::new(v))
+ }
+ Err(_) if fails >= 15 => Update::Gone,
+ Err(_) => {
+ fails += 1;
+ continue;
+ }
+ },
+ Some(a) = actions.recv() => match a {
+ Action::Copy(text) => Update::Flash(if wizard::copy(&text) { "copied" } else { "couldn't copy" }),
+ Action::CopyLink => match link.call::<LinkInfo>(Request::Link { new: false }).await {
+ Ok(l) if wizard::copy(&l.url) => Update::Flash("team link copied"),
+ _ => Update::Flash("couldn't copy"),
+ },
+ },
+ };
+ if tx.send(update).is_err() {
+ return;
+ }
+ }
+ }
+
+ async fn view(link: &std::sync::Arc<Link>) -> Result<View> {
+ let d: Directory = link.call(Request::Who { me: None, filter: None, all: false }).await?;
+ let unread: Unread = link.call(Request::Unread { key: None }).await?;
+ let machines = d
+ .machines
+ .iter()
+ .map(|m| {
+ let mine = |s: &&SessionInfo| s.person == m.person && s.machine == m.machine;
+ let on: Vec<SessionInfo> = d.sessions.iter().filter(mine).filter(|s| s.tier != Tier::None).cloned().collect();
+ let without = d.sessions.iter().filter(mine).filter(|s| s.tier == Tier::None).count();
+ (m.clone(), on, without)
+ })
+ .collect();
+ let me = format!("{} on {}", d.person, d.machine);
+ let key = serde_json::to_string(&(&d.team, &me, &machines, &unread))?;
+ Ok(View { key, team: d.team, me, machines, unread })
+ }
+}
diff --git a/src/wizard.rs b/src/wizard.rs
index f9f477d..bc12b68 100644
--- a/src/wizard.rs
+++ b/src/wizard.rs
@@ -167,6 +167,9 @@ pub async fn agents_and_preferences() -> Result<()> {
cfg.share_paths = confirm("Show teammates your full working directories? (otherwise just the folder name)")
.initial_value(cfg.share_paths)
.interact()?;
+ if cfg!(target_os = "macos") && service {
+ cfg.tray = confirm("Show comms in the menu bar?").initial_value(cfg.tray).interact()?;
+ }
cfg.save()?;
let remove: Vec<&str> = found.iter().filter(|f| f.wired && !chosen.contains(&f.id)).map(|f| f.id).collect();