fix(webviews): relay local daemon peer state events

Packages/macOS/CmuxNext/Sources/CmuxNextAgentPane/AcpmuxPaneMethods+Params.swift

@@ -70,6 +70,7 @@ nonisolated extension AcpmuxPaneMethods {
         // grants nothing (the same probes acpmux runs in the background), so no gesture rule.
         "_acpmux/models": (["refresh"], []),
         "_acpmux/status": ([], []),
+        "_acpmux/peers": ([], []),
         "_acpmux/draft_get": (["sessionId"], []),
         "_acpmux/draft_set": (["sessionId", "text"], []),
         "_acpmux/bookmark_get": (["sessionId"], []),

Packages/macOS/CmuxNext/Sources/CmuxNextAgentPane/AcpmuxPaneMethods+ReplyShapes.swift

@@ -27,6 +27,10 @@ nonisolated extension AcpmuxPaneMethods {
     /// tell a chat on a machine that is not connected (with when it was last seen) from a deleted
     /// one, and from one whose machine is still connecting (chatUnavailable.ts).
     public static let replyShapes: [String: ReplyShape] = [
+        // The local/app connection's peer state snapshot; never transport URLs or credentials.
+        "_acpmux/peers": .object(["peers": .list(.object([
+            "name": .string, "state": .string, "lastSeen": .number, "error": .string,
+        ]))]),
         "_acpmux/status": .object([
             "peers": .list(.object([
                 "name": .string, "transport": .scheme(from: "url"), "connected": .bool,

Packages/macOS/CmuxNext/Sources/CmuxNextAgentPane/AcpmuxPaneMethods.swift

@@ -46,7 +46,7 @@ nonisolated enum AcpmuxPaneMethods {
         // Take Over a View Only chat (direct.ts takeOver): the chat runs the conversation from then on.
         "_acpmux/watch_take_over",
         // Read-only, and its reply is filtered to ``replyShapes`` (ad349).
-        "_acpmux/status", "_acpmux/draft_get",
+        "_acpmux/status", "_acpmux/peers", "_acpmux/draft_get",
         // Session-scoped draft writes are kept separate from the filtered replies above.
         "_acpmux/draft_set",
         // The thread minimap's prompt bookmarks of a chat in the pane's scope (direct.ts

Packages/macOS/CmuxNext/Tests/CmuxNextAgentPaneTests/AcpmuxPanePeerSnapshotTests.swift

@@ -0,0 +1,23 @@
+import Foundation
+import Testing
+@testable import CmuxNextAgentPane
+
+@Suite struct AcpmuxPanePeerSnapshotTests {
+    @Test func peerSnapshotAcceptsNoParameters() {
+        #expect(AcpmuxPaneMethods.requests.contains("_acpmux/peers"))
+        #expect(!AcpmuxPaneMethods.breaksParamsRule(["method": "_acpmux/peers", "params": [:]], modeFields: nil))
+        for params in [["command": "pwd"], ["peer": "other"], ["url": "ssh://private"]] {
+            #expect(AcpmuxPaneMethods.breaksParamsRule(["method": "_acpmux/peers", "params": params], modeFields: nil))
+        }
+    }
+
+    @Test func peerSnapshotKeepsOnlyDisplayFields() throws {
+        let shape = try #require(AcpmuxPaneMethods.replyShapes["_acpmux/peers"])
+        let value: [String: Any] = ["peers": [["name": "studio-mac", "state": "offline", "lastSeen": 5,
+                                              "error": "removed", "url": "ssh://private", "token": "secret"]]]
+        let filtered = try #require(AcpmuxPaneMethods.filtered(value, to: shape) as? [String: Any])
+        let peer = try #require((filtered["peers"] as? [[String: Any]])?.first)
+        #expect(Set(peer.keys) == ["name", "state", "lastSeen", "error"])
+        #expect(peer["error"] as? String == "removed")
+    }
+}

cmux-tui/crates/cmux-agent-pane-policy/policy.json

@@ -7,7 +7,7 @@
     "_acpmux/watch", "_acpmux/sessions", "_acpmux/events", "_acpmux/attachment", "_acpmux/attach", "_acpmux/detach", "_acpmux/view", "_acpmux/typing", "_acpmux/warm",
     "_acpmux/peer_snapshot", "_acpmux/peer_reconnect", "_acpmux/retry",
     "_acpmux/kill", "_acpmux/prewarm", "_acpmux/harnesses", "_acpmux/models", "_acpmux/permission_respond",
-    "_acpmux/status", "_acpmux/draft_get", "_acpmux/draft_set", "_acpmux/bookmark_get", "_acpmux/bookmark_set", "_acpmux/btw", "_acpmux/queue_remove", "_acpmux/queue_edit",
+    "_acpmux/status", "_acpmux/peers", "_acpmux/draft_get", "_acpmux/draft_set", "_acpmux/bookmark_get", "_acpmux/bookmark_set", "_acpmux/btw", "_acpmux/queue_remove", "_acpmux/queue_edit",
     "_acpmux/handoff_prepare", "_acpmux/handoff_get", "_acpmux/handoff_draft", "_acpmux/handoff_start",
     "_acpmux/handoff_discard",
     "_acpmux/permission_groups", "_acpmux/permission_group_respond", "_acpmux/permission_chat_revoke",
@@ -78,6 +78,7 @@
     "_acpmux/harnesses": {"params": ["cwd"], "acpmux": []},
     "_acpmux/models": {"params": ["refresh"], "acpmux": []},
     "_acpmux/status": {"params": [], "acpmux": []},
+    "_acpmux/peers": {"params": [], "acpmux": []},
     "_acpmux/draft_get": {"params": ["sessionId"], "acpmux": []},
     "_acpmux/draft_set": {"params": ["sessionId", "text"], "acpmux": []},
     "_acpmux/bookmark_get": {"params": ["sessionId"], "acpmux": []},
@@ -125,7 +126,8 @@
   },
   "reply_shapes": {
     "_acpmux/status": {"object": {"peers": {"list": {"object": {"name": "string"}}}}},
-    "_acpmux/peer_reconnect": {"object": {"peers": {"list": {"object": {"name": "string", "state": "string", "error": "string"}}}}}
+    "_acpmux/peer_reconnect": {"object": {"peers": {"list": {"object": {"name": "string", "state": "string", "error": "string"}}}}},
+    "_acpmux/peers": {"object": {"peers": {"list": {"object": {"name": "string", "state": "string", "lastSeen": "number", "error": "string"}}}}}
   },
   "history_replies": ["_acpmux/attach", "_acpmux/events"],
   "path_keys": ["cwd", "path", "additionalDirectories", "directory", "directories", "workingDirectory",

cmux-tui/crates/cmux-agent-pane-policy/src/data.rs

@@ -53,6 +53,8 @@ pub struct QuestionAnswers {
 #[derive(Clone, Debug, PartialEq)]
 pub enum ReplyShape {
     String,
+    /// A finite number, never a boolean (Swift's `.number`).
+    Number,
     Object(BTreeMap<String, ReplyShape>),
     List(Box<ReplyShape>),
 }
@@ -62,6 +64,9 @@ impl ReplyShape {
         if v.as_str() == Some("string") {
             return Some(ReplyShape::String);
         }
+        if v.as_str() == Some("number") {
+            return Some(ReplyShape::Number);
+        }
         let o = v.as_object()?;
         if let Some(fields) = o.get("object").and_then(Value::as_object) {
             let fields = fields

cmux-tui/crates/cmux-agent-pane-policy/src/reply.rs

@@ -10,6 +10,8 @@ use serde_json::{Map, Value, json};
 pub fn filtered(value: &Value, shape: &ReplyShape) -> Option<Value> {
     match shape {
         ReplyShape::String => value.as_str().map(|s| Value::String(s.to_owned())),
+        // serde_json keeps no NaN or infinity, and a boolean is not a number.
+        ReplyShape::Number => value.is_number().then(|| value.clone()),
         ReplyShape::List(item) => value
             .as_array()
             .map(|a| Value::Array(a.iter().filter_map(|v| filtered(v, item)).collect())),

cmux-tui/crates/cmux-agent-pane-policy/tests/cases/frames.json

@@ -446,6 +446,15 @@
    "send": "unchanged"
   }
  },
+ {
+  "name": "request _acpmux/peers passes",
+  "text": "{\"jsonrpc\":\"2.0\",\"id\":1,\"method\":\"_acpmux/peers\",\"params\":{}}",
+  "first": false,
+  "token": "abc",
+  "expect": {
+   "send": "unchanged"
+  }
+ },
  {
   "name": "request _acpmux/warm passes",
   "text": "{\"jsonrpc\":\"2.0\",\"id\":1,\"method\":\"_acpmux/warm\",\"params\":{}}",
@@ -643,24 +652,24 @@
   }
  },
  {
-  "name": "escaped '_acpmux/peers' refused",
-  "text": "{\"jsonrpc\":\"2.0\",\"id\":505,\"method\":\"\\u005f\\u0061\\u0063\\u0070\\u006d\\u0075\\u0078\\u002f\\u0070\\u0065\\u0065\\u0072\\u0073\",\"params\":{}}",
+  "name": "escaped '_acpmux/peer_remove' refused",
+  "text": "{\"jsonrpc\":\"2.0\",\"id\":505,\"method\":\"\\u005f\\u0061\\u0063\\u0070\\u006d\\u0075\\u0078\\u002f\\u0070\\u0065\\u0065\\u0072\\u005f\\u0072\\u0065\\u006d\\u006f\\u0076\\u0065\",\"params\":{}}",
   "first": false,
   "token": null,
   "expect": {
    "refuse": "transport.method_refused",
-   "method": "_acpmux/peers",
+   "method": "_acpmux/peer_remove",
    "id": "505"
   }
  },
  {
-  "name": "notification '_acpmux/peers' refused",
-  "text": "{\"jsonrpc\":\"2.0\",\"method\":\"_acpmux/peers\",\"params\":{}}",
+  "name": "notification '_acpmux/peer_remove' refused",
+  "text": "{\"jsonrpc\":\"2.0\",\"method\":\"_acpmux/peer_remove\",\"params\":{}}",
   "first": false,
   "token": null,
   "expect": {
    "refuse": "transport.method_refused",
-   "method": "_acpmux/peers",
+   "method": "_acpmux/peer_remove",
    "id": null
   }
  },

cmux-tui/crates/cmux-agent-pane-policy/tests/cases/params.json

@@ -1949,5 +1949,29 @@
   },
   "mode_fields": null,
   "breaks": true
+ },
+ {
+  "name": "_acpmux/peers every known param",
+  "frame": {
+   "jsonrpc": "2.0",
+   "id": 1,
+   "method": "_acpmux/peers",
+   "params": {}
+  },
+  "mode_fields": null,
+  "breaks": false
+ },
+ {
+  "name": "_acpmux/peers refuses any param",
+  "frame": {
+   "jsonrpc": "2.0",
+   "id": 1,
+   "method": "_acpmux/peers",
+   "params": {
+    "peer": "other"
+   }
+  },
+  "mode_fields": null,
+  "breaks": true
  }
 ]

cmux-tui/crates/cmux-agent-pane-policy/tests/cases/replies.json

@@ -160,5 +160,52 @@
     ]
    }
   }
+ },
+ {
+  "name": "peer snapshot keeps each peer's name, state, lastSeen and error, never its endpoint or a boolean lastSeen",
+  "method": "_acpmux/peers",
+  "page_id": "9",
+  "reply": {
+   "jsonrpc": "2.0",
+   "id": 42,
+   "result": {
+    "peers": [
+     {
+      "name": "studio",
+      "url": "ssh://studio",
+      "token": "s",
+      "state": "restarting",
+      "lastSeen": 1793357781599,
+      "error": "daemon restarting",
+      "attempts": 2
+     },
+     {
+      "name": "box",
+      "state": "connected",
+      "lastSeen": true,
+      "error": null
+     }
+    ],
+    "token": "s"
+   }
+  },
+  "expected": {
+   "jsonrpc": "2.0",
+   "id": 9,
+   "result": {
+    "peers": [
+     {
+      "name": "studio",
+      "state": "restarting",
+      "lastSeen": 1793357781599,
+      "error": "daemon restarting"
+     },
+     {
+      "name": "box",
+      "state": "connected"
+     }
+    ]
+   }
+  }
  }
 ]

webviews/src/agent-session/acpmux/chatUnavailable.ts

@@ -15,7 +15,7 @@
 /// One peer as `_acpmux/status` last said.
 export type PeerStatus = {
   connected?: boolean;
-  /// acpmux's link state: `connecting`, `connected`, `degraded`, `reconnecting` or `offline`.
+  /// acpmux's link state: `connecting`, `connected`, `degraded`, `reconnecting`, `restarting` or `offline`.
   state?: string;
   /// When the peer last answered, in milliseconds since the epoch.
   lastSeen?: number;
@@ -64,10 +64,11 @@ function settled(status: PeerStatus): boolean {
 }
 
 /// A peer still on its way up: acpmux's first attempt (`connecting`), a socket whose handshake has
-/// not finished (`degraded`), or a saved peer a restarted daemon has not tried yet.
+/// not finished (`degraded`), a peer whose daemon announced a restart (`restarting`), or a saved
+/// peer a restarted daemon has not tried yet.
 function stillConnecting(status: PeerStatus): boolean {
   if (settled(status)) return false;
-  if (status.state === "connecting" || status.state === "degraded") return true;
+  if (status.state === "connecting" || status.state === "degraded" || status.state === "restarting") return true;
   return status.state === "reconnecting" && (status.attempts ?? 0) === 0;
 }