Skip to content

Commit 547a6ef

Browse files
committed
fix(desktop): preserve workflow trigger retries and show settled feedback
Signed-off-by: Logan Johnson <[email protected]>
1 parent 1b1922d commit 547a6ef

27 files changed

Lines changed: 1172 additions & 120 deletions

‎TESTING.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,3 +367,14 @@ CLI-side, only two matter for testing:
367367
| ACP logs `discovered 0 channel(s)` / `no channel subscriptions resolved` | Agent identity isn't a member of any channel | `buzz channels add-member --channel "$CHANNEL" --pubkey "$AGENT_PUBKEY" --role member` from another identity |
368368
| `GOOSE_MODE` warning, agent hangs | Not set | `export GOOSE_MODE=auto` |
369369
| Tests pass locally but CI fails | Forgot to run `just ci` | `just ci` runs the gate (fmt, clippy, unit tests, desktop/web builds) |
370+
371+
### Workflow fixture repository/cache isolation
372+
373+
`AppState::new` initializes `GitPackCache`, whose startup sweeps stale
374+
`session-*` directories under `config.git_pack_cache_path`. Workflow unit-test fixture states
375+
therefore own a temporary repository/cache directory, outside the worktree.
376+
Integration binaries must likewise set `BUZZ_GIT_REPO_PATH` and
377+
`BUZZ_GIT_PACK_CACHE_PATH` to disposable external paths **before** reading
378+
`Config::from_env`; the default is `./repos/.pack-cache`. Never infer cache
379+
preservation from a clean Git status: Git does not inventory empty directories.
380+
Capture an inventory before tests when pre-existing untracked files matter.

‎crates/buzz-relay/src/api/workflows.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,7 @@ mod postgres_tests {
301301
let redis_url =
302302
std::env::var("REDIS_URL").unwrap_or_else(|_| "redis://127.0.0.1:6379".to_string());
303303
let mut config = crate::config::Config::from_env().expect("config from env");
304+
let test_git_directory = AppState::workflow_test_git_directory(&mut config);
304305
config.database_url = database_url.clone();
305306
config.redis_url = redis_url.clone();
306307
config.relay_url = format!("wss://{host}");
@@ -331,7 +332,7 @@ mod postgres_tests {
331332
buzz_workflow::WorkflowConfig::default(),
332333
));
333334
let media_storage = buzz_media::MediaStorage::new(&config.media).expect("media storage");
334-
let (state, _audit_shutdown) = AppState::new(
335+
let (mut state, _audit_shutdown) = AppState::new(
335336
config,
336337
db,
337338
redis_pool,
@@ -343,6 +344,7 @@ mod postgres_tests {
343344
Keys::generate(),
344345
media_storage,
345346
);
347+
state.test_git_directory = Some(test_git_directory);
346348
Arc::new(state)
347349
}
348350

‎crates/buzz-relay/src/handlers/command_executor.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1701,6 +1701,7 @@ mod postgres_tests {
17011701
.expect("connect one-connection workflow trigger pool");
17021702
let db = buzz_db::Db::from_pool(pool.clone());
17031703
let mut config = crate::config::Config::from_env().expect("config from env");
1704+
let test_git_directory = AppState::workflow_test_git_directory(&mut config);
17041705
config.database_url = url;
17051706
config.redis_url = "redis://127.0.0.1:1".to_string();
17061707
config.relay_url = format!("wss://{host}");
@@ -1721,7 +1722,7 @@ mod postgres_tests {
17211722
buzz_workflow::WorkflowConfig::default(),
17221723
));
17231724
let media_storage = buzz_media::MediaStorage::new(&config.media).expect("media storage");
1724-
let (state, _audit_shutdown) = AppState::new(
1725+
let (mut state, _audit_shutdown) = AppState::new(
17251726
config,
17261727
db,
17271728
redis_pool,
@@ -1733,6 +1734,7 @@ mod postgres_tests {
17331734
Keys::generate(),
17341735
media_storage,
17351736
);
1737+
state.test_git_directory = Some(test_git_directory);
17361738
setup_pool.close().await;
17371739
(
17381740
Arc::new(state),

‎crates/buzz-relay/src/state.rs‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -628,6 +628,9 @@ impl Default for ConnectionManager {
628628
/// Shared application state, cloned cheaply via inner `Arc` fields.
629629
#[derive(Clone)]
630630
pub struct AppState {
631+
// Keep unit-test repository/cache paths alive until the state is dropped.
632+
#[cfg(test)]
633+
pub(crate) test_git_directory: Option<Arc<tempfile::TempDir>>,
631634
/// Relay configuration.
632635
pub config: Arc<Config>,
633636
/// Database connection pool.
@@ -781,6 +784,16 @@ pub struct AppState {
781784
}
782785

783786
impl AppState {
787+
/// Isolate workflow fixture caches before constructing state: cache startup
788+
/// sweeps stale sessions, so inherited/default paths are not safe fixtures.
789+
#[cfg(test)]
790+
pub(crate) fn workflow_test_git_directory(config: &mut Config) -> Arc<tempfile::TempDir> {
791+
let directory = Arc::new(tempfile::tempdir().expect("isolated workflow fixture git paths"));
792+
config.git_repo_path = directory.path().join("repos");
793+
config.git_pack_cache_path = directory.path().join("pack-cache");
794+
directory
795+
}
796+
784797
/// Constructs `AppState` from its component services.
785798
///
786799
/// Returns `(state, audit_shutdown)`. The caller should call
@@ -921,6 +934,8 @@ impl AppState {
921934
)),
922935
git_store,
923936
git_pack_cache,
937+
#[cfg(test)]
938+
test_git_directory: None,
924939
audio_rooms: Arc::new(AudioRoomManager::new()),
925940
shutting_down: Arc::new(AtomicBool::new(false)),
926941
readiness: Arc::new(crate::readiness::ReadinessCoordinator::default()),
@@ -2541,3 +2556,36 @@ pub(crate) mod tests {
25412556
}
25422557
}
25432558
}
2559+
2560+
#[cfg(test)]
2561+
#[test]
2562+
fn workflow_fixture_cache_does_not_sweep_inherited_sessions() {
2563+
let inherited = tempfile::tempdir().expect("external inherited cache");
2564+
let session = inherited.path().join("session-existing");
2565+
std::fs::create_dir(&session).expect("session");
2566+
let sentinel = session.join("sentinel");
2567+
std::fs::write(&sentinel, b"preserve").expect("sentinel");
2568+
let heartbeat = std::fs::File::create(session.join(".heartbeat")).expect("heartbeat");
2569+
heartbeat
2570+
.set_times(
2571+
std::fs::FileTimes::new()
2572+
.set_modified(std::time::SystemTime::now() - std::time::Duration::from_secs(3600)),
2573+
)
2574+
.expect("stale heartbeat");
2575+
let mut config = Config::from_env().expect("config");
2576+
config.git_pack_cache_path = inherited.path().to_path_buf();
2577+
let directory = AppState::workflow_test_git_directory(&mut config);
2578+
assert!(config.git_pack_cache_path.starts_with(directory.path()));
2579+
assert!(config.git_repo_path.starts_with(directory.path()));
2580+
let cache =
2581+
crate::api::git::pack_cache::GitPackCache::new(&config.git_pack_cache_path, 1024, 1)
2582+
.expect("cache");
2583+
assert_eq!(
2584+
std::fs::read(&sentinel).expect("inherited session survives"),
2585+
b"preserve"
2586+
);
2587+
let disposable = directory.path().to_path_buf();
2588+
drop(cache);
2589+
drop(directory);
2590+
assert!(!disposable.exists());
2591+
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ mod teams;
7272
mod updater;
7373
mod window_chrome;
7474
mod window_vibrancy;
75+
mod workflow_trigger;
7576
mod workflows;
7677
mod workspace;
7778

@@ -130,5 +131,6 @@ pub use teams::*;
130131
pub use updater::*;
131132
pub use window_chrome::*;
132133
pub use window_vibrancy::*;
134+
pub use workflow_trigger::*;
133135
pub use workflows::*;
134136
pub use workspace::*;
Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
//! A manual run is prepared once, then submitted/retried as the same signed event.
2+
//! The renderer owns the operation (including ambiguous failures); native code
3+
//! never silently rebuilds a submitted trigger. No restart recovery is promised.
4+
use nostr::Event;
5+
use serde::Deserialize;
6+
use tauri::State;
7+
8+
use super::workflows::{trigger_wire_from_message, WorkflowTriggerWire};
9+
use crate::{app_state::AppState, events, relay};
10+
11+
fn trigger_scope(
12+
state: &AppState,
13+
expected_relay_url: &str,
14+
expected_signer_pubkey: &str,
15+
) -> Result<(String, nostr::Keys), String> {
16+
if expected_relay_url.trim().is_empty() || expected_signer_pubkey.trim().is_empty() {
17+
return Err("workflow trigger requires a community and identity".to_string());
18+
}
19+
let base = relay::relay_api_base_url_with_override(state);
20+
let keys = state.signing_keys()?;
21+
relay::assert_expected_relay_scope(Some(expected_relay_url), &base)?;
22+
relay::assert_expected_signer(Some(expected_signer_pubkey), &keys.public_key().to_hex())?;
23+
Ok((base, keys))
24+
}
25+
26+
/// Resolve and sign without publishing. Losing this response cannot create a run.
27+
#[tauri::command]
28+
pub async fn prepare_workflow_trigger(
29+
workflow_id: String,
30+
expected_relay_url: String,
31+
expected_signer_pubkey: String,
32+
state: State<'_, AppState>,
33+
) -> Result<Event, String> {
34+
prepare_trigger(
35+
&workflow_id,
36+
&expected_relay_url,
37+
&expected_signer_pubkey,
38+
&state,
39+
)
40+
.await
41+
}
42+
43+
async fn prepare_trigger(
44+
workflow_id: &str,
45+
expected_relay_url: &str,
46+
expected_signer_pubkey: &str,
47+
state: &AppState,
48+
) -> Result<Event, String> {
49+
#[derive(Deserialize)]
50+
struct Revision {
51+
id: String,
52+
}
53+
let id = uuid::Uuid::parse_str(workflow_id).map_err(|_| "invalid workflow id".to_string())?;
54+
let (base, keys) = trigger_scope(state, expected_relay_url, expected_signer_pubkey)?;
55+
// Neither the GET authentication nor the event signer re-reads active scope
56+
// after the await. A concurrent switch cannot combine tenant A with key B.
57+
let revision: Revision = relay::get_relay_json_at_with_keys(
58+
state,
59+
&format!("/workflows/{id}/revision"),
60+
&base,
61+
&keys,
62+
)
63+
.await?;
64+
events::build_workflow_trigger(&id.to_string(), &revision.id)?
65+
.sign_with_keys(&keys)
66+
.map_err(|error| format!("failed to sign trigger: {error}"))
67+
}
68+
69+
/// Submit the caller-retained event verbatim, including its original signature.
70+
#[tauri::command]
71+
pub async fn trigger_workflow(
72+
workflow_id: String,
73+
event: Event,
74+
expected_relay_url: String,
75+
expected_signer_pubkey: String,
76+
state: State<'_, AppState>,
77+
) -> Result<WorkflowTriggerWire, String> {
78+
submit_trigger(
79+
workflow_id,
80+
&event,
81+
&expected_relay_url,
82+
&expected_signer_pubkey,
83+
&state,
84+
)
85+
.await
86+
}
87+
88+
async fn submit_trigger(
89+
workflow_id: String,
90+
event: &Event,
91+
expected_relay_url: &str,
92+
expected_signer_pubkey: &str,
93+
state: &AppState,
94+
) -> Result<WorkflowTriggerWire, String> {
95+
let (base, keys) = trigger_scope(state, expected_relay_url, expected_signer_pubkey)?;
96+
if event.kind != nostr::Kind::Custom(46020)
97+
|| !event
98+
.tags
99+
.iter()
100+
.any(|tag| tag.as_slice() == ["d", workflow_id.as_str()])
101+
{
102+
return Err("signed trigger does not match the workflow".to_string());
103+
}
104+
event
105+
.verify()
106+
.map_err(|error| format!("invalid signed trigger: {error}"))?;
107+
let result = relay::submit_signed_event_at_with_keys(event, state, &base, &keys).await?;
108+
if result.event_id != event.id.to_hex() {
109+
return Err("relay acknowledged a different trigger event".to_string());
110+
}
111+
trigger_wire_from_message(workflow_id, &result.message)
112+
}
113+
114+
#[cfg(test)]
115+
#[path = "workflow_trigger_tests.rs"]
116+
mod tests;

0 commit comments

Comments
 (0)