Skip to content
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
c56c8b9
Add durable provider notice delivery
lawrencecchen Jul 26, 2026
dbd0bea
Merge external pairing into durable notice delivery
lawrencecchen Jul 26, 2026
8a1598e
Merge commit 'c936aba61ea5905908cdb7126c2252721300adb3' into feat-clo…
lawrencecchen Jul 26, 2026
b4699fa
Merge commit '8e39976768c0c4d87993744c2867fae157751954' into feat-clo…
lawrencecchen Jul 26, 2026
7d7df96
Merge commit 'b13d7b74a0027120e626e004cd3ef2dd748d004c' into feat-clo…
lawrencecchen Jul 26, 2026
66d8600
Fix durable cloud notice delivery safeguards
lawrencecchen Jul 26, 2026
c21d5a9
Merge commit '54c141190a3713ebe32dfed3390e6f80c577388f' into feat-clo…
lawrencecchen Jul 26, 2026
c10f0f4
Merge external pairing candidate into feat-cloud-usage-warning-events
lawrencecchen Jul 26, 2026
1611718
Bind durable notice prompt fixture to local route
lawrencecchen Jul 26, 2026
906c5a2
Merge remote-tracking branch 'origin/main' into verify-pr8942-chain
lawrencecchen Jul 26, 2026
a32e911
Test scope change cancels ambiguous pairing
lawrencecchen Jul 26, 2026
c2e413a
Cancel ambiguous pairing on provider selection
lawrencecchen Jul 26, 2026
642ac9e
Document durable notice click handling
lawrencecchen Jul 26, 2026
82aa6c3
Test replay waits for durable cursor
lawrencecchen Jul 26, 2026
d45ef4d
Buffer durable replay until resume cursor
lawrencecchen Jul 26, 2026
62fbb98
Test durable ack waits for machine action
lawrencecchen Jul 26, 2026
db49438
Defer notice acks during machine actions
lawrencecchen Jul 26, 2026
29a9b5f
Test snapshot invalidation burst coalescing
lawrencecchen Jul 26, 2026
c3a18d4
Coalesce provider snapshot invalidations
lawrencecchen Jul 26, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
186 changes: 185 additions & 1 deletion cmux-tui/crates/cmux-tui-machine-protocol/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ pub const EXTERNAL_MACHINE_CONNECT_CAPABILITY: &str = "connect-external-machine-
pub const MACHINE_LIFECYCLE_CAPABILITY: &str = "machine-lifecycle-v1";
pub const WORKSPACE_LIFECYCLE_CAPABILITY: &str = "workspace-lifecycle-v1";
pub const WORKSPACE_MIRROR_AUTHORITY_CAPABILITY: &str = "workspace-mirror-authority-v1";
pub const DURABLE_NOTICES_CAPABILITY: &str = "durable-notices-v1";
pub const MIN_WORKSPACE_MIRROR_AUTHORITY_BYTES: usize = 32;

const MAX_OPAQUE_ID_BYTES: usize = 512;
Expand Down Expand Up @@ -317,6 +318,8 @@ impl RequestEnvelope {
#[serde(tag = "method", content = "params", rename_all = "snake_case")]
pub enum ProviderRequest {
Hello(HelloParams),
SubscribeNotices(SubscribeNoticesParams),
AcknowledgeNotice(AcknowledgeNoticeParams),
Snapshot(SnapshotParams),
OpenMachine(OpenMachineParams),
SelectScope(SelectScopeParams),
Expand Down Expand Up @@ -460,13 +463,19 @@ pub enum ProviderResponse<T> {
pub struct EventEnvelope {
pub protocol: Protocol,
pub version: Version,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub delivery: Option<NoticeDelivery>,
#[serde(flatten)]
pub event: ProviderEvent,
}

impl EventEnvelope {
pub fn new(event: ProviderEvent) -> Self {
Self { protocol: Protocol, version: Version, event }
Self { protocol: Protocol, version: Version, delivery: None, event }
}

pub fn with_delivery(event: ProviderEvent, delivery: NoticeDelivery) -> Self {
Self { protocol: Protocol, version: Version, delivery: Some(delivery), event }
}
}

Expand Down Expand Up @@ -501,6 +510,31 @@ pub struct HelloResult {
pub negotiated_version: Version,
}

#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(deny_unknown_fields)]
pub struct SubscribeNoticesParams {
pub consumer_id: OpaqueId,
}

#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
#[serde(deny_unknown_fields)]
pub struct SubscribeNoticesResult {
pub sequence: u64,
}

#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(deny_unknown_fields)]
pub struct AcknowledgeNoticeParams {
pub notice_id: OpaqueId,
pub sequence: u64,
}

#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
#[serde(deny_unknown_fields)]
pub struct AcknowledgeNoticeResult {
pub sequence: u64,
}

#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
#[serde(deny_unknown_fields)]
pub struct SnapshotParams {
Expand Down Expand Up @@ -969,6 +1003,13 @@ pub struct ProviderNotice {
pub message: String,
}

#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(deny_unknown_fields)]
pub struct NoticeDelivery {
pub notice_id: OpaqueId,
pub sequence: u64,
}

#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "snake_case")]
pub enum NoticeLevel {
Expand Down Expand Up @@ -1174,6 +1215,56 @@ mod tests {
assert_eq!(serde_json::from_value::<RequestEnvelope>(expected).unwrap(), request);
}

#[test]
fn durable_notice_requests_match_the_v1_golden_documents() {
let subscribe = RequestEnvelope::new(
id("subscribe-1"),
ProviderRequest::SubscribeNotices(SubscribeNoticesParams {
consumer_id: id("cmux-process-1"),
}),
);
let subscribe_document = json!({
"protocol": "cmux.machine-provider",
"version": 1,
"id": "subscribe-1",
"method": "subscribe_notices",
"params": {
"consumer_id": "cmux-process-1"
}
});
assert_eq!(serde_json::to_value(&subscribe).unwrap(), subscribe_document);
assert_eq!(
serde_json::from_value::<RequestEnvelope>(subscribe_document).unwrap(),
subscribe
);

let acknowledge = RequestEnvelope::new(
id("ack-1"),
ProviderRequest::AcknowledgeNotice(AcknowledgeNoticeParams {
notice_id: id("usage-warning-80"),
sequence: 42,
}),
);
let acknowledge_document = json!({
"protocol": "cmux.machine-provider",
"version": 1,
"id": "ack-1",
"method": "acknowledge_notice",
"params": {
"notice_id": "usage-warning-80",
"sequence": 42
}
});
assert_eq!(serde_json::to_value(&acknowledge).unwrap(), acknowledge_document);
assert_eq!(
serde_json::from_value::<RequestEnvelope>(acknowledge_document).unwrap(),
acknowledge
);

assert_response_round_trip(SubscribeNoticesResult { sequence: 41 });
assert_response_round_trip(AcknowledgeNoticeResult { sequence: 42 });
}

#[test]
fn connect_external_machine_request_matches_the_v1_golden_document() {
let request = RequestEnvelope::new(
Expand Down Expand Up @@ -1383,6 +1474,99 @@ mod tests {
);
}

#[test]
fn durable_notice_metadata_is_additive_to_the_legacy_notice_event() {
#[derive(Debug, Deserialize, PartialEq, Eq)]
struct LegacyEventEnvelope {
protocol: Protocol,
version: Version,
#[serde(flatten)]
event: ProviderEvent,
}

let event = EventEnvelope::with_delivery(
ProviderEvent::Notice(ProviderNotice {
level: NoticeLevel::Warning,
message: "Trial compute is almost exhausted".into(),
}),
NoticeDelivery { notice_id: id("usage-warning-80"), sequence: 42 },
);
let document = json!({
"protocol": "cmux.machine-provider",
"version": 1,
"delivery": {
"notice_id": "usage-warning-80",
"sequence": 42
},
"event": "notice",
"params": {
"level": "warning",
"message": "Trial compute is almost exhausted"
}
});
assert_eq!(serde_json::to_value(&event).unwrap(), document);
assert_eq!(serde_json::from_value::<EventEnvelope>(document.clone()).unwrap(), event);

let legacy: LegacyEventEnvelope = serde_json::from_value(document).unwrap();
assert_eq!(legacy.protocol, Protocol);
assert_eq!(legacy.version, Version);
assert_eq!(legacy.event, event.event);

let legacy_event = EventEnvelope::new(ProviderEvent::Notice(ProviderNotice {
level: NoticeLevel::Info,
message: "Legacy notice".into(),
}));
assert_eq!(
serde_json::to_value(legacy_event).unwrap(),
json!({
"protocol": "cmux.machine-provider",
"version": 1,
"event": "notice",
"params": {
"level": "info",
"message": "Legacy notice"
}
})
);
}

#[test]
fn durable_notice_metadata_is_strict_while_event_metadata_remains_additive() {
let future_metadata = json!({
"protocol": "cmux.machine-provider",
"version": 1,
"delivery": {
"notice_id": "usage-warning-80",
"sequence": 42
},
"future_trace": "trace-1",
"event": "notice",
"params": {
"level": "warning",
"message": "Trial compute is almost exhausted"
}
});
assert!(serde_json::from_value::<EventEnvelope>(future_metadata).is_ok());

for invalid_delivery in [
json!({ "notice_id": "usage-warning-80" }),
json!({ "notice_id": "usage-warning-80", "sequence": 42, "future": true }),
json!({ "notice_id": "", "sequence": 42 }),
] {
let document = json!({
"protocol": "cmux.machine-provider",
"version": 1,
"delivery": invalid_delivery,
"event": "notice",
"params": {
"level": "warning",
"message": "Trial compute is almost exhausted"
}
});
assert!(serde_json::from_value::<EventEnvelope>(document).is_err());
}
}

#[test]
fn open_machine_authority_opt_in_preserves_legacy_v1_shape() {
let legacy = RequestEnvelope::new(
Expand Down
Loading