Skip to content

Commit c6770b6

Browse files
author
Meli
committed
fix(desktop): checkpoint relay-primary agent recovery repairs
Bootstrap bounded owner history before private-config publication; retain cross-kind deletion watermarks and fail closed on unavailable authority. Journal exact local/inbound deletion cleanup before destructive work. Resolve current authority at launch, restore, rollback, read, export, and persona propagation boundaries while preserving tracked-process Stop. Expose bootstrap recovery and local lifecycle capabilities in the UI; carry portable effort and document the private-config encryption exception. This is an additive repair checkpoint, not merge readiness. Provider invocation/settlement journaling, cancellation-safe deletion composition, snapshot-bound consent, unavailable-config summary UI, and final smoke/live acceptance remain open. The separate provider repair stack is not included. Co-authored-by: Meli <5aaa86bce934fc3445fc254aab560a40923f10252f92107e665073dede0e04d3@buzz.block.builderlab.xyz> Signed-off-by: Meli <5aaa86bce934fc3445fc254aab560a40923f10252f92107e665073dede0e04d3@buzz.block.builderlab.xyz>
1 parent d133aed commit c6770b6

68 files changed

Lines changed: 4231 additions & 700 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎VISION.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ Auth is simple — authenticated or not. Channel membership gates content visibi
9999

100100
One model. TLS in transit. At-rest encryption delegated to the storage layer (e.g., Postgres TDE, volume encryption). Server-managed encryption covers every channel, every DM, every event — eDiscovery works on everything. End-to-end encryption (NIP-44) is a future consideration for DMs.
101101

102+
One deliberate exception: kind `30179`, an owner's private managed-agent config (agent private keys and API credentials), is NIP-44 ciphertext from the owner's key to itself. Its content is unavailable to relay-side discovery; the event's existence, tags, public agent projections, and the agent's own messages stay server-readable. See [NIP-PMA](docs/nips/NIP-PMA.md#encryption-exception).
103+
102104
---
103105

104106
## Huddles

‎crates/buzz-core/src/kind.rs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,14 @@ pub const KIND_EVENT_REMINDER: u32 = 30300;
108108
/// dedicated push lease tables.
109109
pub const KIND_PUSH_LEASE: u32 = 30350;
110110

111-
/// NIP-PMA: owner-encrypted private managed-agent aggregate.
111+
/// NIP-PMA: owner-encrypted private managed-agent config.
112112
///
113-
/// Addressed by `(owner pubkey, kind, agent pubkey)`. The signed outer tags
114-
/// expose only the agent coordinate, CAS generation/predecessor, and active/deleted
115-
/// state required for relay enforcement. Content is NIP-44 v2 encrypted from
116-
/// the owner's key to itself and contains the runnable identity/configuration
117-
/// plus exact public projection bindings. See `docs/nips/NIP-PMA.md`.
113+
/// Addressed by `(owner pubkey, kind, agent pubkey)` and resolved by ordinary
114+
/// NIP-33 last-write-wins. The signed outer tags expose only the agent
115+
/// coordinate plus an advisory generation/predecessor pair (validated for
116+
/// shape, never CAS-enforced). Content is NIP-44 v2 encrypted from the owner's
117+
/// key to itself and contains the agent nsec, optional NIP-OA attestation, and
118+
/// the portable runnable configuration. See `docs/nips/NIP-PMA.md`.
118119
pub const KIND_PRIVATE_MANAGED_AGENT: u32 = 30179;
119120

120121
/// Kinds whose stored events are readable only by their author.

‎crates/buzz-core/src/private_managed_agent.rs‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ pub const MAX_ENV_VALUE_BYTES: usize = 16_384;
4040
pub const MAX_AGENT_ARGS: usize = 256;
4141
/// Maximum UTF-8 bytes in one argument.
4242
pub const MAX_AGENT_ARG_BYTES: usize = 8_192;
43+
/// Maximum UTF-8 bytes in a portable effort level (a short runtime keyword).
44+
pub const MAX_EFFORT_LEVEL_BYTES: usize = 256;
4345
/// Maximum serialized bytes accepted for an extension/recovery/config value.
4446
pub const MAX_VALUE_BYTES: usize = 32_768;
4547

@@ -154,6 +156,12 @@ pub struct PrivateConfig {
154156
/// Versioned provider/definition relay-mesh marker.
155157
#[serde(default, skip_serializing_if = "Option::is_none")]
156158
pub relay_mesh: Option<Value>,
159+
/// Canonical harness-agnostic effort level (`ManagedAgentRecord.effort_level`).
160+
/// Carried verbatim; each device normalizes it against the destination
161+
/// runtime at spawn. `None` = inherit. Absent in payloads authored before
162+
/// this field existed, which deserialize as `None`.
163+
#[serde(default, skip_serializing_if = "Option::is_none")]
164+
pub effort_level: Option<String>,
157165
/// Unknown JSON members preserved verbatim for forward compatibility.
158166
///
159167
/// A newer Desktop may author config keys this version does not model; they
@@ -425,6 +433,13 @@ fn validate_identity_and_config(
425433
if config.name.is_empty() || config.name.len() > 4096 {
426434
return Err(Error::InvalidPayload("invalid name length".into()));
427435
}
436+
if config
437+
.effort_level
438+
.as_deref()
439+
.is_some_and(|effort| effort.len() > MAX_EFFORT_LEVEL_BYTES)
440+
{
441+
return Err(Error::InvalidPayload("invalid effort_level length".into()));
442+
}
428443
if config.agent_args.len() > MAX_AGENT_ARGS
429444
|| config
430445
.agent_args
@@ -696,6 +711,7 @@ mod tests {
696711
team_id: None,
697712
persona_name_in_team: None,
698713
relay_mesh: None,
714+
effort_level: None,
699715
extra: serde_json::Map::new(),
700716
},
701717
extensions: BTreeMap::new(),
@@ -776,6 +792,37 @@ mod tests {
776792
validate_payload(&candidate).unwrap();
777793
}
778794

795+
// `effort_level` is a typed portable field: it round-trips through the
796+
// owner-self codec, is bounded, and a pre-field payload (key absent)
797+
// decodes to `None` rather than being rejected.
798+
#[test]
799+
fn effort_level_is_typed_bounded_and_backward_compatible() {
800+
let owner = Keys::generate();
801+
let agent = Keys::generate();
802+
let mut expected = payload(&owner, &agent);
803+
expected.config.effort_level = Some("high".into());
804+
let event = build_event(&owner, &expected, 1_785_780_000).unwrap();
805+
let (_, actual) = validate_and_decrypt(&event, &owner).unwrap();
806+
assert_eq!(actual.config.effort_level.as_deref(), Some("high"));
807+
assert!(!actual.config.extra.contains_key("effort_level"));
808+
809+
let mut oversized = payload(&owner, &agent);
810+
oversized.config.effort_level = Some("x".repeat(MAX_EFFORT_LEVEL_BYTES + 1));
811+
assert!(matches!(
812+
validate_payload(&oversized),
813+
Err(Error::InvalidPayload(message)) if message.contains("effort_level")
814+
));
815+
816+
let mut legacy = serde_json::to_value(payload(&owner, &agent)).unwrap();
817+
let config = legacy["config"].as_object_mut().unwrap();
818+
assert!(
819+
config.remove("effort_level").is_none(),
820+
"None must serialize as absent"
821+
);
822+
let decoded: Payload = serde_json::from_value(legacy).unwrap();
823+
assert_eq!(decoded.config.effort_level, None);
824+
}
825+
779826
#[test]
780827
fn valid_owner_attestation_passes_and_binds_agent() {
781828
let owner = Keys::generate();

‎desktop/playwright.config.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ export default defineConfig({
5050
"**/channel-activity-popover.spec.ts",
5151
"**/active-turn-resilience.spec.ts",
5252
"**/agent-control-regressions.spec.ts",
53+
"**/agent-sync-warning.spec.ts",
5354
"**/profile-active-turn.spec.ts",
5455
"**/config-bridge-screenshots.spec.ts",
5556
"**/observer-feed-screenshots.spec.ts",

‎desktop/src-tauri/src/app_state.rs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@ pub struct AppState {
4545
/// Never perform network I/O while holding this lock.
4646
pub managed_agent_runtime_transition: Mutex<()>,
4747
pub managed_agents_store_lock: Mutex<()>,
48+
/// False until retained private authority hydrates for the active scope.
49+
/// Scope changes clear this under managed_agents_store_lock; inbound heads
50+
/// alone cannot establish that every retained coordinate was recovered.
51+
pub(crate) managed_agent_authority_ready: AtomicBool,
52+
/// Last bootstrap error, scoped by retention path; readable until retry succeeds.
53+
pub(crate) managed_agent_bootstrap_error: Mutex<Option<(std::path::PathBuf, String)>>,
4854
pub(crate) private_managed_agent_overlay:
4955
Mutex<crate::managed_agents::private_config_overlay::PrivateConfigOverlay>,
5056
pub channel_templates_store_lock: Mutex<()>,
@@ -211,6 +217,8 @@ pub fn build_app_state() -> AppState {
211217
managed_agent_runtime_transition: Mutex::new(()),
212218
identity_mutation: Mutex::new(()),
213219
managed_agents_store_lock: Mutex::new(()),
220+
managed_agent_authority_ready: AtomicBool::new(false),
221+
managed_agent_bootstrap_error: Mutex::new(None),
214222
private_managed_agent_overlay: Mutex::new(Default::default()),
215223
channel_templates_store_lock: Mutex::new(()),
216224
managed_agent_processes: Mutex::new(HashMap::new()),

‎desktop/src-tauri/src/commands/agent_config.rs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ pub async fn get_agent_config_surface(
258258
app: AppHandle,
259259
state: State<'_, AppState>,
260260
) -> Result<RuntimeConfigSurface, String> {
261-
let record = {
261+
let (record, workspace_relay) = {
262262
let _store_guard = state
263263
.managed_agents_store_lock
264264
.lock()
@@ -276,21 +276,20 @@ pub async fn get_agent_config_surface(
276276
for pubkey in &exited_pubkeys {
277277
state.clear_agent_session_caches(pubkey);
278278
}
279-
records
280-
.into_iter()
281-
.find(|r| r.pubkey == pubkey)
282-
.ok_or_else(|| format!("agent {pubkey} not found"))?
279+
(
280+
crate::managed_agents::private_config_overlay::resolved_record_for_read(
281+
&state, &records, &pubkey,
282+
)?,
283+
crate::relay::relay_ws_url_with_override(&state),
284+
)
283285
};
284286

285287
let personas = load_personas(&app).unwrap_or_default();
286288
let effective_cmd = crate::managed_agents::record_agent_command(&record, &personas);
287289
let runtime_meta = known_acp_runtime(&effective_cmd);
288290
let runtime_key = ManagedAgentRuntimeKey::new(
289291
pubkey.clone(),
290-
&crate::relay::effective_agent_relay_url(
291-
&record.relay_url,
292-
&crate::relay::relay_ws_url_with_override(&state),
293-
),
292+
&crate::relay::effective_agent_relay_url(&record.relay_url, &workspace_relay),
294293
)?;
295294
let session_cache = state.get_session_cache(&runtime_key);
296295
let global = crate::managed_agents::load_global_agent_config(&app).unwrap_or_default();

‎desktop/src-tauri/src/commands/agent_models.rs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,9 @@ pub async fn get_agent_models(
5757
state.clear_agent_session_caches(pubkey);
5858
}
5959

60-
let record = records
61-
.iter()
62-
.find(|r| r.pubkey == pubkey)
63-
.ok_or_else(|| format!("agent {pubkey} not found"))?;
60+
let record = crate::managed_agents::private_config_overlay::resolved_record_for_read(
61+
&state, &records, &pubkey,
62+
)?;
6463

6564
let resolved = resolve_command(&record.acp_command)
6665
.ok_or_else(|| missing_command_message(&record.acp_command, "ACP harness command"))?;
@@ -75,7 +74,7 @@ pub async fn get_agent_models(
7574
// resolver, packaged so the linked-agent regression test binds the
7675
// exact values this command consumes. Returns Err on dangling harness
7776
// id, propagating it to the caller.
78-
let discovery = agent_model_discovery_config(record, &personas, &global)
77+
let discovery = agent_model_discovery_config(&record, &personas, &global)
7978
.map_err(|e| model_discovery_error(&pubkey, &e))?;
8079

8180
let resolved_agent = resolve_command(&discovery.command)

‎desktop/src-tauri/src/commands/agent_models_update.rs‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,8 @@ pub async fn update_managed_agent(
169169
// the raw disk record republishes every OTHER field from stale disk
170170
// and LWW makes that the new relay head. Ordering is load-bearing:
171171
// resolving AFTER the patch would discard the user's edit instead.
172-
if let Ok(resolved) =
173-
crate::managed_agents::private_config_overlay::resolved_local_record(&state, record)
174-
{
175-
*record = resolved;
176-
}
172+
*record =
173+
crate::managed_agents::private_config_overlay::resolved_local_record(&state, record)?;
177174
let previous_record = record.clone();
178175

179176
let mut name_changed = false;
@@ -341,7 +338,7 @@ pub async fn update_managed_agent(
341338
// Publish the edit to the relay. After-save, inside the lock, before
342339
// any .await. The retention upsert hashes the opt-IN projection, so an
343340
// update that touched only runtime/local fields is a no-op publish.
344-
super::super::agents::retain_managed_agent_pending(&app, &state, record);
341+
super::super::agents::retain_managed_agent_pending(&app, &state, record)?;
345342

346343
let sync_params = if name_changed {
347344
let agent_keys = Keys::parse(&record.private_key_nsec)
@@ -377,8 +374,17 @@ pub async fn update_managed_agent(
377374
};
378375

379376
let summary = { super::super::agents::summarize_from_disk(&app, record, &runtimes)? };
380-
let rollback = name_changed
381-
.then(|| AgentUpdateRollback::new(previous_record, record, access_policy_changed));
377+
let rollback = if name_changed {
378+
Some(
379+
AgentUpdateRollback::new(previous_record, record, access_policy_changed)
380+
.with_scope(
381+
crate::managed_agents::retention::active_retention_scope(&app, &state)?
382+
.db_path,
383+
),
384+
)
385+
} else {
386+
None
387+
};
382388
(
383389
summary,
384390
sync_params,
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
use tauri::Manager;
2+
3+
/// Read the current community's bootstrap warning without hiding cached agents
4+
/// (in particular, a tracked child must remain visible and stoppable).
5+
#[tauri::command]
6+
pub fn get_managed_agent_sync_error(app: tauri::AppHandle) -> Result<Option<String>, String> {
7+
managed_agent_sync_error(&app)
8+
}
9+
10+
pub(crate) fn managed_agent_sync_error<R: tauri::Runtime>(
11+
app: &tauri::AppHandle<R>,
12+
) -> Result<Option<String>, String> {
13+
let state = app.state::<crate::app_state::AppState>();
14+
let _store = state
15+
.managed_agents_store_lock
16+
.lock()
17+
.map_err(|e| e.to_string())?;
18+
let scope = crate::managed_agents::retention::active_retention_scope(app, &state)?;
19+
let error = state
20+
.managed_agent_bootstrap_error
21+
.lock()
22+
.map_err(|e| e.to_string())?;
23+
Ok(error
24+
.as_ref()
25+
.filter(|(path, _)| *path == scope.db_path)
26+
.map(|(_, error)| error.clone()))
27+
}

‎desktop/src-tauri/src/commands/agent_update_rollback.rs‎

Lines changed: 75 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ pub(super) struct AgentUpdateRollback {
1212
attempted_record: ManagedAgentRecord,
1313
previous_record: ManagedAgentRecord,
1414
preserve_access_policy: bool,
15+
scope: Option<std::path::PathBuf>,
1516
}
1617

1718
impl AgentUpdateRollback {
@@ -24,14 +25,18 @@ impl AgentUpdateRollback {
2425
attempted_record: attempted.clone(),
2526
previous_record,
2627
preserve_access_policy,
28+
scope: None,
2729
}
2830
}
31+
32+
pub(super) fn with_scope(mut self, scope: std::path::PathBuf) -> Self {
33+
self.scope = Some(scope);
34+
self
35+
}
2936
}
3037

3138
fn copy_runtime_state(from: &ManagedAgentRecord, to: &mut ManagedAgentRecord) {
3239
to.runtime_pid = from.runtime_pid;
33-
to.backend = from.backend.clone();
34-
to.backend_agent_id.clone_from(&from.backend_agent_id);
3540
to.provider_binary_path
3641
.clone_from(&from.provider_binary_path);
3742
to.last_started_at.clone_from(&from.last_started_at);
@@ -85,6 +90,22 @@ fn restore_agent_update(
8590
Ok(())
8691
}
8792

93+
// Caller holds store: compare against current relay config, not its stale disk
94+
// mirror. Backend and resource identity are config, never normalized as runtime.
95+
fn restore_authoritative_update(
96+
state: &AppState,
97+
records: &mut [ManagedAgentRecord],
98+
pubkey: &str,
99+
rollback: AgentUpdateRollback,
100+
) -> Result<(), String> {
101+
let record = records
102+
.iter_mut()
103+
.find(|record| record.pubkey == pubkey)
104+
.ok_or_else(|| format!("agent {pubkey} not found while rolling back failed rename"))?;
105+
*record = crate::managed_agents::private_config_overlay::resolved_local_record(state, record)?;
106+
restore_agent_update(records, pubkey, rollback)
107+
}
108+
88109
pub(super) fn rollback_failed_agent_update(
89110
app: &AppHandle,
90111
state: &AppState,
@@ -96,14 +117,20 @@ pub(super) fn rollback_failed_agent_update(
96117
.managed_agents_store_lock
97118
.lock()
98119
.map_err(|error| error.to_string())?;
120+
let scope = crate::managed_agents::retention::active_retention_scope(app, state)?;
121+
if rollback.scope.as_deref() != Some(scope.db_path.as_path()) {
122+
return Err("workspace changed before failed rename rollback; not restored".into());
123+
}
99124
let mut records = load_managed_agents(app)?;
100-
restore_agent_update(&mut records, pubkey, rollback)?;
101-
save_managed_agents(app, &records)?;
125+
restore_authoritative_update(state, &mut records, pubkey, rollback)?;
102126
let restored = records
103127
.iter()
104128
.find(|record| record.pubkey == pubkey)
105129
.ok_or_else(|| format!("agent {pubkey} not found after failed rename rollback"))?;
106-
super::agents::retain_managed_agent_pending(app, state, restored);
130+
// Commit authority before its disk mirror. A disk-save failure must not
131+
// leave the old retained head shadowing a rollback reported as saved.
132+
super::agents::retain_managed_agent_pending(app, state, restored)?;
133+
save_managed_agents(app, &records)?;
107134
}
108135
try_regenerate_nest(app);
109136
Ok(())
@@ -228,4 +255,47 @@ mod tests {
228255
assert_eq!(records[0].last_error.as_deref(), Some("harness exited"));
229256
assert_eq!(records[0].updated_at, "runtime-change");
230257
}
258+
#[test]
259+
fn relay_changes_and_backend_identity_fence_failed_rename_rollback() {
260+
use crate::managed_agents::private_config_overlay::{
261+
test_relay_payload, PrivateConfigOverlay,
262+
};
263+
let state = crate::app_state::build_app_state();
264+
state
265+
.managed_agent_authority_ready
266+
.store(true, std::sync::atomic::Ordering::Release);
267+
let pubkey = "ac".repeat(32);
268+
let mut payload = test_relay_payload(&pubkey);
269+
let mut overlay = PrivateConfigOverlay::default();
270+
overlay.insert(payload.clone()).unwrap();
271+
let attempted = overlay.materialize_relay_only_record(&pubkey, &[]).unwrap();
272+
let mut previous = attempted.clone();
273+
previous.name = "previous name".into();
274+
for change in ["prompt", "backend", "resource"] {
275+
let mut records = vec![attempted.clone()];
276+
payload = test_relay_payload(&pubkey);
277+
match change {
278+
"prompt" => payload.config.system_prompt = Some("newer relay prompt".into()),
279+
"backend" => {
280+
payload.config.backend =
281+
serde_json::json!({"type":"provider","id":"remote","config":{}})
282+
}
283+
_ => payload.config.backend_agent_id = Some("newer resource".into()),
284+
}
285+
state
286+
.private_managed_agent_overlay
287+
.lock()
288+
.unwrap()
289+
.insert(payload.clone())
290+
.unwrap();
291+
let error = restore_authoritative_update(
292+
&state,
293+
&mut records,
294+
&pubkey,
295+
AgentUpdateRollback::new(previous.clone(), &attempted, false),
296+
)
297+
.unwrap_err();
298+
assert!(error.contains("changed again"), "{change}: {error}");
299+
}
300+
}
231301
}

0 commit comments

Comments
 (0)