fix(transport): make DM-listing/follow-up fetches transport-aware (Codex review)

Addresses the Codex P2 on PR #177: the range-order child-order follow-up
fetched after a `release` (send_msg.rs) used `create_filter(DirectMessagesUser,
…)`, whose DirectMessages branch hard-coded `Kind::GiftWrap`. On a v2 node the
child `NewOrder` is a kind-14 event authored by Mostro, so it was never fetched
and `print_commands_results` never ran.

Fix: make `create_filter` transport-aware for the `DirectMessages*` kinds —
`transport.event_kind()` plus an `author = mostro_pubkey` pin on v2 (new
`mostro_pubkey` param threaded through its call sites + the integration test).
This also makes the `get-dm` historical listing v2-aware, so the whole
interactive path is fully v2 (spec note updated; the item is no longer deferred
to Phase 3).

cargo build/test/clippy --all-targets --all-features -D warnings/fmt all clean.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: grunch

docs/TRANSPORT_V2_SPEC.md

@@ -121,11 +121,12 @@ Tests: `Transport::from_str` → `event_kind` mapping, and a
 `wrap_message_with(Nip44Direct) → unwrap_incoming` roundtrip (kind 14, author =
 trade key, message round-trips). Full suite green; clippy + fmt clean.
 
-Known gap (deferred to Phase 3): the `get-dm` **historical listing** filter
-(`create_filter` for the `DirectMessages*` kinds) still hard-codes gift wrap,
-so listing past Mostro DMs on a v2 node returns nothing. The interactive
-request/response path (the one that exercises the daemon's anti-spam gate) is
-fully v2.
+- **Listing / follow-up fetches:** `create_filter` for the `DirectMessages*`
+  kinds is transport-aware as well — it uses `transport.event_kind()` and pins
+  `author = mostro_pubkey` on v2 (new `mostro_pubkey` param). This covers both
+  the `get-dm` historical listing **and** the range-order child-order follow-up
+  fetched after a `release` (which a v2 node delivers as a kind-14 event
+  authored by Mostro), so the whole interactive path is fully v2.
 
 Acceptance: against a `transport = "nip44"` daemon, run the CLI with
 `--transport nip44` and a full `new-order → take → add-invoice → fiat-sent →
@@ -141,9 +142,6 @@ gates.
 
 ### Phase 3 — Capability auto-detection + docs/UX — PENDING
 
-- Make the `get-dm` historical-listing filter transport-aware
-  (`create_filter` for the `DirectMessages*` kinds: kind 14 + `author =
-  mostro_pubkey` on v2), closing the Phase 2 known gap.
 - Read the node's `protocol_versions` tag from its kind-`38385` info event
   (same fetch path as the existing `pow` probe) and, when `--transport` is not
   given, auto-select the matching transport — warning on a mismatch

src/cli/send_msg.rs

@@ -120,10 +120,13 @@ pub async fn execute_send_msg(
                     // Get the correct keys for decoding the child order message
                     let next_trade_key = User::get_trade_keys(&ctx.pool, *index as i64).await?;
                     // Fake timestamp for giftwraps
+                    // Transport-aware so the v2 child-order event (kind 14,
+                    // authored by Mostro) is fetched too, not just gift wraps.
                     let subscription = create_filter(
                         ListKind::DirectMessagesUser,
                         next_trade_key.public_key,
                         None,
+                        ctx.mostro_pubkey,
                     )?;
 
                     // Wait for potential new order message from Mostro

src/util/events.rs

@@ -42,6 +42,7 @@ pub fn create_filter(
     list_kind: ListKind,
     pubkey: PublicKey,
     since: Option<&i64>,
+    mostro_pubkey: PublicKey,
 ) -> Result<Filter> {
     match list_kind {
         ListKind::Orders => create_seven_days_filter(
@@ -58,10 +59,20 @@ pub fn create_filter(
         ),
         ListKind::DirectMessagesAdmin | ListKind::DirectMessagesUser => {
             let fake_timestamp = create_fake_timestamp()?;
-            Ok(Filter::new()
-                .kind(nostr_sdk::Kind::GiftWrap)
+            // Mostro→user/admin DMs travel on the node's transport: gift wrap
+            // (v1, kind 1059) or NIP-44 direct (v2, kind 14). On v2 the reply
+            // is authored by Mostro's own key, so pin the author to keep it
+            // distinct from NIP-17 peer chat that shares kind 14
+            // (docs/TRANSPORT_V2_SPEC.md §2).
+            let transport = crate::util::messaging::parse_transport_env()?;
+            let mut filter = Filter::new()
+                .kind(transport.event_kind())
                 .pubkey(pubkey)
-                .since(fake_timestamp))
+                .since(fake_timestamp);
+            if transport == Transport::Nip44Direct {
+                filter = filter.author(mostro_pubkey);
+            }
+            Ok(filter)
         }
         ListKind::PrivateDirectMessagesUser => {
             let since = if let Some(mins) = since {
@@ -175,7 +186,7 @@ pub async fn fetch_events_list(
 ) -> Result<Vec<Event>> {
     match list_kind {
         ListKind::Orders => {
-            let filters = create_filter(list_kind, ctx.mostro_pubkey, None)?;
+            let filters = create_filter(list_kind, ctx.mostro_pubkey, None, ctx.mostro_pubkey)?;
             let fetched_events = ctx
                 .client
                 .fetch_events(filters, FETCH_EVENTS_TIMEOUT)
@@ -187,7 +198,8 @@ pub async fn fetch_events_list(
             // Get admin keys
             let admin_keys = get_admin_keys(ctx)?;
             // Create filter
-            let filters = create_filter(list_kind, admin_keys.public_key(), None)?;
+            let filters =
+                create_filter(list_kind, admin_keys.public_key(), None, ctx.mostro_pubkey)?;
             let fetched_events = ctx
                 .client
                 .fetch_events(filters, FETCH_EVENTS_TIMEOUT)
@@ -209,6 +221,7 @@ pub async fn fetch_events_list(
                     ListKind::PrivateDirectMessagesUser,
                     trade_key.public_key(),
                     None,
+                    ctx.mostro_pubkey,
                 )?;
                 let fetched_user_messages = ctx
                     .client
@@ -230,8 +243,12 @@ pub async fn fetch_events_list(
             let mut direct_messages: Vec<(Message, u64, PublicKey)> = Vec::new();
             for index in 1..=ctx.trade_index {
                 let trade_key = User::get_trade_keys(&ctx.pool, index).await?;
-                let filter =
-                    create_filter(ListKind::DirectMessagesUser, trade_key.public_key(), None)?;
+                let filter = create_filter(
+                    ListKind::DirectMessagesUser,
+                    trade_key.public_key(),
+                    None,
+                    ctx.mostro_pubkey,
+                )?;
                 let fetched_user_messages = ctx
                     .client
                     .fetch_events(filter, FETCH_EVENTS_TIMEOUT)
@@ -248,7 +265,7 @@ pub async fn fetch_events_list(
                 .collect())
         }
         ListKind::Disputes => {
-            let filters = create_filter(list_kind, ctx.mostro_pubkey, None)?;
+            let filters = create_filter(list_kind, ctx.mostro_pubkey, None, ctx.mostro_pubkey)?;
             let fetched_events = ctx
                 .client
                 .fetch_events(filters, FETCH_EVENTS_TIMEOUT)

tests/integration_tests.rs

@@ -64,6 +64,7 @@ async fn test_filter_creation_integration() {
         mostro_client::util::ListKind::Orders,
         ctx.mostro_pubkey,
         None,
+        ctx.mostro_pubkey,
     )
     .unwrap();