fix(jobs): admit channel-scoped job events

Signed-off-by: ScaleLeanChris <chris@scalelean.com>
Signed-off-by: Brad Groux <bradgroux@hotmail.com>
Signed-off-by: Brad Groux <3053586+BradGroux@users.noreply.github.com>

Author: ScaleLeanChris

crates/buzz-relay/src/handlers/ingest.rs

@@ -21,21 +21,21 @@ use buzz_core::kind::{
     KIND_GIT_STATUS_CLOSED, KIND_GIT_STATUS_DRAFT, KIND_GIT_STATUS_MERGED, KIND_GIT_STATUS_OPEN,
     KIND_HUDDLE_ENDED, KIND_HUDDLE_GUIDELINES, KIND_HUDDLE_PARTICIPANT_JOINED,
     KIND_HUDDLE_PARTICIPANT_LEFT, KIND_HUDDLE_STARTED, KIND_IA_ARCHIVE_REQUEST,
-    KIND_IA_UNARCHIVE_REQUEST, KIND_LONG_FORM, KIND_MANAGED_AGENT,
+    KIND_IA_UNARCHIVE_REQUEST, KIND_JOB_ACCEPTED, KIND_JOB_CANCEL, KIND_JOB_ERROR,
+    KIND_JOB_PROGRESS, KIND_JOB_REQUEST, KIND_JOB_RESULT, KIND_LONG_FORM, KIND_MANAGED_AGENT,
     KIND_MEMBER_ADDED_NOTIFICATION, KIND_MEMBER_REMOVED_NOTIFICATION, KIND_MODERATION_BAN,
     KIND_MODERATION_RESOLVE_REPORT, KIND_MODERATION_TIMEOUT, KIND_MODERATION_UNBAN,
     KIND_MODERATION_UNTIMEOUT, KIND_MUTE_LIST, KIND_NIP29_CREATE_GROUP, KIND_NIP29_DELETE_EVENT,
     KIND_NIP29_DELETE_GROUP, KIND_NIP29_EDIT_METADATA, KIND_NIP29_JOIN_REQUEST,
     KIND_NIP29_LEAVE_REQUEST, KIND_NIP29_PUT_USER, KIND_NIP29_REMOVE_USER,
     KIND_NIP43_LEAVE_REQUEST, KIND_NIP65_RELAY_LIST_METADATA, KIND_PERSONA, KIND_PIN_LIST,
     KIND_PRESENCE_UPDATE, KIND_PRIVATE_MANAGED_AGENT, KIND_PRODUCT_FEEDBACK, KIND_PROFILE,
-    KIND_PROJECT, KIND_REACTION,
-    KIND_READ_STATE, KIND_REPORT, KIND_STREAM_MESSAGE, KIND_STREAM_MESSAGE_BOOKMARKED,
-    KIND_STREAM_MESSAGE_DIFF, KIND_STREAM_MESSAGE_EDIT, KIND_STREAM_MESSAGE_PINNED,
-    KIND_STREAM_MESSAGE_SCHEDULED, KIND_STREAM_MESSAGE_V2, KIND_STREAM_REMINDER, KIND_TEAM,
-    KIND_TEAM_CATALOG, KIND_TEXT_NOTE, KIND_USER_STATUS, KIND_WORKFLOW_DEF, KIND_WORKFLOW_TRIGGER,
-    RELAY_ADMIN_ADD_MEMBER, RELAY_ADMIN_CHANGE_ROLE, RELAY_ADMIN_REMOVE_MEMBER,
-    RELAY_ADMIN_SET_WORKSPACE_PROFILE,
+    KIND_PROJECT, KIND_REACTION, KIND_READ_STATE, KIND_REPORT, KIND_STREAM_MESSAGE,
+    KIND_STREAM_MESSAGE_BOOKMARKED, KIND_STREAM_MESSAGE_DIFF, KIND_STREAM_MESSAGE_EDIT,
+    KIND_STREAM_MESSAGE_PINNED, KIND_STREAM_MESSAGE_SCHEDULED, KIND_STREAM_MESSAGE_V2,
+    KIND_STREAM_REMINDER, KIND_TEAM, KIND_TEAM_CATALOG, KIND_TEXT_NOTE, KIND_USER_STATUS,
+    KIND_WORKFLOW_DEF, KIND_WORKFLOW_TRIGGER, RELAY_ADMIN_ADD_MEMBER, RELAY_ADMIN_CHANGE_ROLE,
+    RELAY_ADMIN_REMOVE_MEMBER, RELAY_ADMIN_SET_WORKSPACE_PROFILE,
 };
 use buzz_core::tenant::TenantContext;
 use buzz_core::verification::verify_event;
@@ -482,7 +482,13 @@ fn required_scope_for_kind(kind: u32, event: &Event) -> Result<Scope, &'static s
         | KIND_STREAM_MESSAGE_DIFF
         | KIND_FORUM_POST
         | KIND_FORUM_VOTE
-        | KIND_FORUM_COMMENT => Ok(Scope::MessagesWrite),
+        | KIND_FORUM_COMMENT
+        | KIND_JOB_REQUEST
+        | KIND_JOB_ACCEPTED
+        | KIND_JOB_PROGRESS
+        | KIND_JOB_RESULT
+        | KIND_JOB_ERROR
+        | KIND_JOB_CANCEL => Ok(Scope::MessagesWrite),
         KIND_NIP29_PUT_USER | KIND_NIP29_REMOVE_USER | KIND_NIP29_DELETE_GROUP => {
             Ok(Scope::AdminChannels)
         }
@@ -720,6 +726,12 @@ pub(crate) fn requires_h_channel_scope(kind: u32) -> bool {
             | KIND_FORUM_POST
             | KIND_FORUM_VOTE
             | KIND_FORUM_COMMENT
+            | KIND_JOB_REQUEST
+            | KIND_JOB_ACCEPTED
+            | KIND_JOB_PROGRESS
+            | KIND_JOB_RESULT
+            | KIND_JOB_ERROR
+            | KIND_JOB_CANCEL
             // NIP-29 admin kinds (except CREATE_GROUP which creates the channel)
             | KIND_NIP29_PUT_USER
             | KIND_NIP29_REMOVE_USER

crates/buzz-test-client/tests/e2e_relay.rs

@@ -22,6 +22,11 @@ use std::time::Duration;
 
 use base64::engine::general_purpose::STANDARD as BASE64;
 use base64::Engine;
+use buzz_core::job::{
+    JobDisposition, JobResultPayload, JobVerification, JobVerificationStatus,
+    JOB_RESULT_SCHEMA_VERSION,
+};
+use buzz_core::kind::{KIND_JOB_REQUEST, KIND_JOB_RESULT};
 use buzz_test_client::{BuzzTestClient, RelayMessage, TestClientError};
 use nostr::{Alphabet, EventBuilder, Filter, Keys, Kind, SingleLetterTag, Tag};
 use sha2::{Digest, Sha256};
@@ -414,6 +419,101 @@ async fn test_send_event_and_receive_via_subscription() {
     client_b.disconnect().await.expect("disconnect B");
 }
 
+#[tokio::test]
+#[ignore]
+async fn test_structured_and_legacy_job_results_round_trip() {
+    let url = relay_url();
+    let keys = Keys::generate();
+    let channel = create_test_channel(&keys).await;
+    let channel_id = Uuid::parse_str(&channel).expect("channel UUID");
+    let mut client = BuzzTestClient::connect(&url, &keys).await.expect("connect");
+
+    let request = EventBuilder::new(
+        Kind::Custom(KIND_JOB_REQUEST as u16),
+        "Prepare the release handoff",
+    )
+    .tags([Tag::parse(["h", channel.as_str()]).expect("request h tag")])
+    .sign_with_keys(&keys)
+    .expect("sign job request");
+    let ok = client
+        .send_event(request.clone())
+        .await
+        .expect("send job request");
+    assert!(ok.accepted, "relay rejected job request: {}", ok.message);
+
+    let payload = JobResultPayload {
+        schema_version: JOB_RESULT_SCHEMA_VERSION,
+        job_request: request.id.to_hex(),
+        requested_outcome: "Prepare the release handoff".into(),
+        outcome: "Release handoff is ready".into(),
+        last_progress: Some("Verified the release checklist".into()),
+        disposition: JobDisposition::NoArtifact,
+        artifacts: Vec::new(),
+        verification: vec![JobVerification {
+            label: "Release checklist".into(),
+            status: JobVerificationStatus::Passed,
+            evidence: Some("All required items passed".into()),
+        }],
+        blocker: None,
+    };
+    let structured = buzz_sdk::build_job_result(channel_id, request.id, &payload)
+        .expect("build structured result")
+        .sign_with_keys(&keys)
+        .expect("sign structured result");
+    let ok = client
+        .send_event(structured.clone())
+        .await
+        .expect("send structured result");
+    assert!(
+        ok.accepted,
+        "relay rejected structured result: {}",
+        ok.message
+    );
+
+    let legacy_content = "Release handoff completed. Checklist passed.";
+    let legacy = EventBuilder::new(Kind::Custom(KIND_JOB_RESULT as u16), legacy_content)
+        .tags([
+            Tag::parse(["h", channel.as_str()]).expect("legacy h tag"),
+            Tag::parse(["e", &request.id.to_hex(), "", "reply"]).expect("legacy reply tag"),
+        ])
+        .sign_with_keys(&keys)
+        .expect("sign legacy result");
+    let ok = client
+        .send_event(legacy.clone())
+        .await
+        .expect("send legacy result");
+    assert!(ok.accepted, "relay rejected legacy result: {}", ok.message);
+
+    let sid = sub_id("job-result-round-trip");
+    let filter = Filter::new()
+        .kind(Kind::Custom(KIND_JOB_RESULT as u16))
+        .custom_tags(SingleLetterTag::lowercase(Alphabet::H), [channel.as_str()]);
+    client
+        .subscribe(&sid, vec![filter])
+        .await
+        .expect("subscribe to job results");
+    let events = client
+        .collect_until_eose(&sid, Duration::from_secs(5))
+        .await
+        .expect("query job results");
+
+    let stored_structured = events
+        .iter()
+        .find(|event| event.id == structured.id)
+        .expect("structured result returned by relay");
+    assert_eq!(
+        stored_structured.content,
+        payload.to_json().expect("payload JSON")
+    );
+    let stored_legacy = events
+        .iter()
+        .find(|event| event.id == legacy.id)
+        .expect("legacy result returned by relay");
+    assert_eq!(stored_legacy.content, legacy_content);
+
+    client.disconnect().await.expect("disconnect");
+}
+
 #[tokio::test]
 #[ignore]
 async fn test_large_event_frame_below_configured_limit_is_accepted() {