docs: Update commands help messages

Signed-off-by: Awiteb <a@4rs.nl>

CHANGELOG.md

@@ -15,9 +15,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Make subject mandatory and optional content - by Awiteb
 
+### Documentation
+
+- Update commands help messages - by Awiteb
+
 ### Fixed
 
 - Check the nip07 signer in `CliOptions::ensure_signer` - by Awiteb
+- Required the `applied_commits` - by Awiteb
 
 ## [0.4.0] - 2025-08-08
 

docs/issue/close.md

@@ -12,7 +12,7 @@ Arguments:
   <ISSUE_ID>  The open issue id to close it
 
 Options:
-      --repo <NADDR-NIP05-OR-SET>  Repository address in `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`
+      --repo <NADDR-NIP05-OR-SET>  Repository addresses
 ```
 
 Issue a kind `1632` (Close status) for the specified issue. The issue have to

docs/issue/list.md

@@ -9,7 +9,7 @@ List the repositories issues
 Usage: n34 issue list [OPTIONS] [NADDR-NIP05-OR-SET]...
 
 Arguments:
-  [NADDR-NIP05-OR-SET]...  Repository address in `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`
+  [NADDR-NIP05-OR-SET]...  Repository addresses
 
 Options:
       --limit <LIMIT>  Maximum number of issues to list [default: 15]

docs/issue/new.md

@@ -9,7 +9,7 @@ Create a new repository issue
 Usage: n34 issue new [OPTIONS] <--content <CONTENT>|--editor>
 
 Options:
-      --repo <NADDR-NIP05-OR-SET>  Repository address in `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`
+      --repo <NADDR-NIP05-OR-SET>  Repository addresses
   -c, --content <CONTENT>          Markdown content for the issue. Cannot be used together with the `--editor` flag
   -e, --editor                     Opens the user's default editor to write issue content. The first line will be used as the issue subject
       --subject <SUBJECT>          The issue subject. Cannot be used together with the `--editor` flag

docs/issue/reopen.md

@@ -12,7 +12,7 @@ Arguments:
   <ISSUE_ID>  The ID of the closed issue to reopen
 
 Options:
-      --repo <NADDR-NIP05-OR-SET>  Repository address in `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`
+      --repo <NADDR-NIP05-OR-SET>  Repository addresses
 ```
 
 Issue a kind `1630` (Open status) for the specified issue. The issue have to

docs/issue/resolve.md

@@ -12,7 +12,7 @@ Arguments:
   <ISSUE_ID>  The issue id to resolve it
 
 Options:
-      --repo <NADDR-NIP05-OR-SET>  Repository address in `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`
+      --repo <NADDR-NIP05-OR-SET>  Repository addresses
 ```
 
 Issue a kind `1631` (Resolved status) event for the specified issue.

docs/issue/view.md

@@ -12,7 +12,7 @@ Arguments:
   <ISSUE_ID>  The issue id to view it
 
 Options:
-      --repo <NADDR-NIP05-OR-SET>  Repository address in `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`
+      --repo <NADDR-NIP05-OR-SET>  Repository addresses
 ```
 
 Simply provide the issue ID in `note` or `nevent` format to retrieve and display

docs/patch/apply.md

@@ -13,7 +13,7 @@ Arguments:
   [APPLIED_COMMITS]...  The applied commits
 
 Options:
-      --repo <NADDR-NIP05-OR-SET>  Repository address in `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`
+      --repo <NADDR-NIP05-OR-SET>  Repository addresses
       --patches <PATCH-EVENT-ID>   Patches that have been applied. Use this when only some patches have been applied, not all
 ```
 

docs/patch/close.md

@@ -12,7 +12,7 @@ Arguments:
   <PATCH_ID>  The open/drafted patch id to close it. Must be orignal root patch
 
 Options:
-      --repo <NADDR-NIP05-OR-SET>  Repository address in `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`
+      --repo <NADDR-NIP05-OR-SET>  Repository addresses
 ```
 
 Issue a kind `1632` (Close status) for the specified patch. The patch have to

docs/patch/draft.md

@@ -12,7 +12,7 @@ Arguments:
   <PATCH_ID>  The open patch id to draft it. Must be orignal root patch
 
 Options:
-      --repo <NADDR-NIP05-OR-SET>  Repository address in `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`
+      --repo <NADDR-NIP05-OR-SET>  Repository addresses
 ```
 
 Issue a kind `1633` (Draft status) for the specified patch. The patch have to

docs/patch/fetch.md

@@ -12,7 +12,7 @@ Arguments:
   <PATCH_ID>  The patch id to fetch it
 
 Options:
-      --repo <NADDR-NIP05-OR-SET>  Repository address in `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`
+      --repo <NADDR-NIP05-OR-SET>  Repository addresses
   -o, --output <PATH>              Output directory for the patches. Default to the current directory
 ```
 

docs/patch/list.md

@@ -9,7 +9,7 @@ List the repositories patches
 Usage: n34 patch list [OPTIONS] [NADDR-NIP05-OR-SET]...
 
 Arguments:
-  [NADDR-NIP05-OR-SET]...  Repository address in `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`
+  [NADDR-NIP05-OR-SET]...  Repository addresses
 
 Options:
       --limit <LIMIT>  Maximum number of patches to list [default: 15]

docs/patch/merge.md

@@ -13,7 +13,7 @@ Arguments:
   <MERGE_COMMIT>  The merge commit id
 
 Options:
-      --repo <NADDR-NIP05-OR-SET>  Repository address in `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`
+      --repo <NADDR-NIP05-OR-SET>  Repository addresses
       --patches <PATCH-EVENT-ID>   Patches that have been merged. Use this when only some patches have been merged, not all
 ```
 

docs/patch/reopen.md

@@ -12,7 +12,7 @@ Arguments:
   <PATCH_ID>  The closed/drafted patch id to reopen it. Must be orignal root patch
 
 Options:
-      --repo <NADDR-NIP05-OR-SET>  Repository address in `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`
+      --repo <NADDR-NIP05-OR-SET>  Repository addresses
 ```
 
 Issue a kind `1632` (Close status) for the specified patch. The patch have to

docs/patch/send.md

@@ -12,7 +12,7 @@ Arguments:
   <PATCH-PATH>...  List of patch files to send (space separated)
 
 Options:
-      --repo <NADDR-NIP05-OR-SET>  Repository address in `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`
+      --repo <NADDR-NIP05-OR-SET>  Repository addresses
       --original-patch <EVENT-ID>  Original patch ID if this is a revision of it
 ```
 

docs/reply.md

@@ -13,7 +13,7 @@ Arguments:
 
 Options:
       --quote-to                   Quote the replied-to event in the editor
-      --repo <NADDR-NIP05-OR-SET>  Repository address in `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`
+      --repo <NADDR-NIP05-OR-SET>  Repository addresses
   -c, --comment <COMMENT>          The comment (cannot be used with --editor)
   -e, --editor                     Open editor to write comment (cannot be used with --content)
 ```

docs/repo/state.md

@@ -12,7 +12,7 @@ Arguments:
   <HEAD>  Name of the repository's primary branch, such as 'master' or 'main'
 
 Options:
-      --repo <NADDR-NIP05-OR-SET>  Repository address in `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`
+      --repo <NADDR-NIP05-OR-SET>  Repository addresses
       --tags <TAGS>                Tags to announce a state for, in the format `<tag-name>=<commit-id>`. Separated by comma
       --branches <BRANCHES>        Branches to announce a state for, in the format `<branch-name>=<commit-id>`. Separated by comma
 ```

docs/repo/view.md

@@ -9,7 +9,7 @@ View details of a nostr git repository
 Usage: n34 repo view [NADDR-NIP05-OR-SET]...
 
 Arguments:
-  [NADDR-NIP05-OR-SET]...  Repository address in `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`
+  [NADDR-NIP05-OR-SET]...  Repository addresses
 ```
 
 This command prints repository details to standard output. If no arguments

docs/sets/new.md

@@ -13,7 +13,7 @@ Arguments:
 
 Options:
       --set-relay <RELAYS>         Optional relay to add it to the set, either as URL or set name to extract its relays. [aliases: `--sr`]
-      --repo <NADDR-NIP05-OR-SET>  Repository address in `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`
+      --repo <NADDR-NIP05-OR-SET>  Repository addresses
 ```
 
 Each set requires a unique name, provided as the final argument to the command.

docs/sets/remove.md

@@ -13,7 +13,7 @@ Arguments:
 
 Options:
       --set-relay <RELAYS>         Specific relay to remove it from the set, either as URL or set name to extract its relays. [aliases: `--sr`]
-      --repo <NADDR-NIP05-OR-SET>  Repository address in `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`
+      --repo <NADDR-NIP05-OR-SET>  Repository addresses
 ```
 
 Removes an entire set, or specific repositories and relays from it.

docs/sets/update.md

@@ -13,7 +13,7 @@ Arguments:
 
 Options:
       --set-relay <RELAYS>         Add relay to the set, either as URL or set name to extract its relays. [aliases: `--sr`]
-      --repo <NADDR-NIP05-OR-SET>  Repository address in `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`
+      --repo <NADDR-NIP05-OR-SET>  Repository addresses
       --override                   Replace existing relays/repositories instead of adding to them
 ```
 

src/cli/commands/issue/close.rs

@@ -28,11 +28,17 @@ use crate::{
 
 #[derive(Debug, Args)]
 pub struct CloseArgs {
-    /// Repository address in `naddr` format (`naddr1...`), NIP-05 format
+    /// Repository addresses
-    /// (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`.
+    ///
+    /// In `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or
+    /// `_@4rs.nl/n34`), or a set name like `kernel`, separated by commas.
     ///
     /// If omitted, looks for a `nostr-address` file.
-    #[arg(value_name = "NADDR-NIP05-OR-SET", long = "repo")]
+    #[arg(
+        value_name = "NADDR-NIP05-OR-SET",
+        long = "repo",
+        value_delimiter = ','
+    )]
     naddrs:   Option<Vec<NaddrOrSet>>,
     /// The open issue id to close it
     issue_id: NostrEvent,

src/cli/commands/issue/list.rs

@@ -25,11 +25,13 @@ use crate::{
 
 #[derive(Debug, Args)]
 pub struct ListArgs {
-    /// Repository address in `naddr` format (`naddr1...`), NIP-05 format
+    /// Repository addresses
-    /// (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`.
+    ///
+    /// In `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or
+    /// `_@4rs.nl/n34`), or a set name like `kernel`, separated by commas.
     ///
     /// If omitted, looks for a `nostr-address` file.
-    #[arg(value_name = "NADDR-NIP05-OR-SET")]
+    #[arg(value_name = "NADDR-NIP05-OR-SET", value_delimiter = ',')]
     naddrs: Option<Vec<NaddrOrSet>>,
     /// Maximum number of issues to list
     #[arg(long, default_value = "15")]

src/cli/commands/issue/new.rs

@@ -43,11 +43,17 @@ use crate::{
     )
 )]
 pub struct NewArgs {
-    /// Repository address in `naddr` format (`naddr1...`), NIP-05 format
+    /// Repository addresses
-    /// (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`.
+    ///
+    /// In `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or
+    /// `_@4rs.nl/n34`), or a set name like `kernel`, separated by commas.
     ///
     /// If omitted, looks for a `nostr-address` file.
-    #[arg(value_name = "NADDR-NIP05-OR-SET", long = "repo")]
+    #[arg(
+        value_name = "NADDR-NIP05-OR-SET",
+        long = "repo",
+        value_delimiter = ','
+    )]
     naddrs:  Option<Vec<NaddrOrSet>>,
     /// Markdown content for the issue. Cannot be used together with the
     /// `--editor` flag.
@@ -115,10 +121,7 @@ impl CommandRunner for NewArgs {
             relays,
             naddrs.extract_relays(),
             utils::add_write_relays(relays_list.as_ref()),
-            client
+            repos.extract_relays(),
-                .fetch_repos(&naddrs.into_coordinates())
-                .await?
-                .extract_relays(),
             // Include read relays for each maintainer (if found)
             client.read_relays_from_users(&maintainers).await,
             content_details

src/cli/commands/issue/reopen.rs

@@ -28,11 +28,17 @@ use crate::{
 
 #[derive(Debug, Args)]
 pub struct ReopenArgs {
-    /// Repository address in `naddr` format (`naddr1...`), NIP-05 format
+    /// Repository addresses
-    /// (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`.
+    ///
+    /// In `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or
+    /// `_@4rs.nl/n34`), or a set name like `kernel`, separated by commas.
     ///
     /// If omitted, looks for a `nostr-address` file.
-    #[arg(value_name = "NADDR-NIP05-OR-SET", long = "repo")]
+    #[arg(
+        value_name = "NADDR-NIP05-OR-SET",
+        long = "repo",
+        value_delimiter = ','
+    )]
     naddrs:   Option<Vec<NaddrOrSet>>,
     /// The closed issue id to reopen it
     issue_id: NostrEvent,

src/cli/commands/issue/resolve.rs

@@ -28,11 +28,17 @@ use crate::{
 
 #[derive(Debug, Args)]
 pub struct ResolveArgs {
-    /// Repository address in `naddr` format (`naddr1...`), NIP-05 format
+    /// Repository addresses
-    /// (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`.
+    ///
+    /// In `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or
+    /// `_@4rs.nl/n34`), or a set name like `kernel`, separated by commas.
     ///
     /// If omitted, looks for a `nostr-address` file.
-    #[arg(value_name = "NADDR-NIP05-OR-SET", long = "repo")]
+    #[arg(
+        value_name = "NADDR-NIP05-OR-SET",
+        long = "repo",
+        value_delimiter = ','
+    )]
     naddrs:   Option<Vec<NaddrOrSet>>,
     /// The issue id to resolve it
     issue_id: NostrEvent,

src/cli/commands/issue/view.rs

@@ -33,11 +33,17 @@ use crate::{
 
 #[derive(Debug, Args)]
 pub struct ViewArgs {
-    /// Repository address in `naddr` format (`naddr1...`), NIP-05 format
+    /// Repository addresses
-    /// (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`.
+    ///
+    /// In `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or
+    /// `_@4rs.nl/n34`), or a set name like `kernel`, separated by commas.
     ///
     /// If omitted, looks for a `nostr-address` file.
-    #[arg(value_name = "NADDR-NIP05-OR-SET", long = "repo")]
+    #[arg(
+        value_name = "NADDR-NIP05-OR-SET",
+        long = "repo",
+        value_delimiter = ','
+    )]
     naddrs:   Option<Vec<NaddrOrSet>>,
     /// The issue id to view it
     issue_id: NostrEvent,

src/cli/commands/mod.rs

@@ -73,8 +73,8 @@ pub struct CliOptions {
     #[arg(short = '7', long, group = "signer")]
     pub nip07:      bool,
     /// Fallbacks relay to write and read from it. Multiple relays can be
-    /// passed.
+    /// passed, separated by commas.
-    #[arg(short, long)]
+    #[arg(short, long, value_delimiter = ',')]
     pub relays:     Vec<RelayOrSet>,
     /// Proof of Work difficulty when creatring events
     #[arg(long, value_name = "DIFFICULTY")]

src/cli/commands/patch/apply.rs

@@ -29,11 +29,17 @@ use crate::{
 
 #[derive(Debug, Args)]
 pub struct ApplyArgs {
-    /// Repository address in `naddr` format (`naddr1...`), NIP-05 format
+    /// Repository addresses
-    /// (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`.
+    ///
+    /// In `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or
+    /// `_@4rs.nl/n34`), or a set name like `kernel`, separated by commas.
     ///
     /// If omitted, looks for a `nostr-address` file.
-    #[arg(value_name = "NADDR-NIP05-OR-SET", long = "repo")]
+    #[arg(
+        value_name = "NADDR-NIP05-OR-SET",
+        long = "repo",
+        value_delimiter = ','
+    )]
     naddrs:          Option<Vec<NaddrOrSet>>,
     /// The open patch id to apply it. Must be orignal root patch or
     /// revision root

src/cli/commands/patch/close.rs

@@ -28,11 +28,17 @@ use crate::{
 
 #[derive(Debug, Args)]
 pub struct CloseArgs {
-    /// Repository address in `naddr` format (`naddr1...`), NIP-05 format
+    /// Repository addresses
-    /// (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`.
+    ///
+    /// In `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or
+    /// `_@4rs.nl/n34`), or a set name like `kernel`, separated by commas.
     ///
     /// If omitted, looks for a `nostr-address` file.
-    #[arg(value_name = "NADDR-NIP05-OR-SET", long = "repo")]
+    #[arg(
+        value_name = "NADDR-NIP05-OR-SET",
+        long = "repo",
+        value_delimiter = ','
+    )]
     naddrs:   Option<Vec<NaddrOrSet>>,
     /// The open/drafted patch id to close it. Must be orignal root patch
     patch_id: NostrEvent,

src/cli/commands/patch/draft.rs

@@ -28,11 +28,17 @@ use crate::{
 
 #[derive(Debug, Args)]
 pub struct DraftArgs {
-    /// Repository address in `naddr` format (`naddr1...`), NIP-05 format
+    /// Repository addresses
-    /// (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`.
+    ///
+    /// In `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or
+    /// `_@4rs.nl/n34`), or a set name like `kernel`, separated by commas.
     ///
     /// If omitted, looks for a `nostr-address` file.
-    #[arg(value_name = "NADDR-NIP05-OR-SET", long = "repo")]
+    #[arg(
+        value_name = "NADDR-NIP05-OR-SET",
+        long = "repo",
+        value_delimiter = ','
+    )]
     naddrs:   Option<Vec<NaddrOrSet>>,
     /// The open patch id to draft it. Must be orignal root patch
     patch_id: NostrEvent,

src/cli/commands/patch/fetch.rs

@@ -43,11 +43,17 @@ use crate::{
 
 #[derive(Debug, Args)]
 pub struct FetchArgs {
-    /// Repository address in `naddr` format (`naddr1...`), NIP-05 format
+    /// Repository addresses
-    /// (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`.
+    ///
+    /// In `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or
+    /// `_@4rs.nl/n34`), or a set name like `kernel`, separated by commas.
     ///
     /// If omitted, looks for a `nostr-address` file.
-    #[arg(value_name = "NADDR-NIP05-OR-SET", long = "repo")]
+    #[arg(
+        value_name = "NADDR-NIP05-OR-SET",
+        long = "repo",
+        value_delimiter = ','
+    )]
     naddrs:   Option<Vec<NaddrOrSet>>,
     /// Output directory for the patches. Default to the current directory
     #[arg(short, long, value_name = "PATH")]

src/cli/commands/patch/list.rs

@@ -25,11 +25,13 @@ use crate::{
 
 #[derive(Debug, Args)]
 pub struct ListArgs {
-    /// Repository address in `naddr` format (`naddr1...`), NIP-05 format
+    /// Repository addresses
-    /// (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`.
+    ///
+    /// In `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or
+    /// `_@4rs.nl/n34`), or a set name like `kernel`, separated by commas.
     ///
     /// If omitted, looks for a `nostr-address` file.
-    #[arg(value_name = "NADDR-NIP05-OR-SET")]
+    #[arg(value_name = "NADDR-NIP05-OR-SET", value_delimiter = ',')]
     naddrs: Option<Vec<NaddrOrSet>>,
     /// Maximum number of patches to list
     #[arg(long, default_value = "15")]

src/cli/commands/patch/merge.rs

@@ -29,11 +29,17 @@ use crate::{
 
 #[derive(Debug, Args)]
 pub struct MergeArgs {
-    /// Repository address in `naddr` format (`naddr1...`), NIP-05 format
+    /// Repository addresses
-    /// (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`.
+    ///
+    /// In `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or
+    /// `_@4rs.nl/n34`), or a set name like `kernel`, separated by commas.
     ///
     /// If omitted, looks for a `nostr-address` file.
-    #[arg(value_name = "NADDR-NIP05-OR-SET", long = "repo")]
+    #[arg(
+        value_name = "NADDR-NIP05-OR-SET",
+        long = "repo",
+        value_delimiter = ','
+    )]
     naddrs:         Option<Vec<NaddrOrSet>>,
     /// The open patch id to merge it. Must be orignal root patch or
     /// revision root

src/cli/commands/patch/reopen.rs

@@ -28,11 +28,17 @@ use crate::{
 
 #[derive(Debug, Args)]
 pub struct ReopenArgs {
-    /// Repository address in `naddr` format (`naddr1...`), NIP-05 format
+    /// Repository addresses
-    /// (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`.
+    ///
+    /// In `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or
+    /// `_@4rs.nl/n34`), or a set name like `kernel`, separated by commas.
     ///
     /// If omitted, looks for a `nostr-address` file.
-    #[arg(value_name = "NADDR-NIP05-OR-SET", long = "repo")]
+    #[arg(
+        value_name = "NADDR-NIP05-OR-SET",
+        long = "repo",
+        value_delimiter = ','
+    )]
     naddrs:   Option<Vec<NaddrOrSet>>,
     /// The closed/drafted patch id to reopen it. Must be orignal root patch
     patch_id: NostrEvent,

src/cli/commands/patch/send.rs

@@ -47,11 +47,17 @@ const PATCH_ALT_PREFIX: &str = "git patch: ";
 
 #[derive(Args, Debug)]
 pub struct SendArgs {
-    /// Repository address in `naddr` format (`naddr1...`), NIP-05 format
+    /// Repository addresses
-    /// (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`.
+    ///
+    /// In `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or
+    /// `_@4rs.nl/n34`), or a set name like `kernel`, separated by commas.
     ///
     /// If omitted, looks for a `nostr-address` file.
-    #[arg(value_name = "NADDR-NIP05-OR-SET", long = "repo")]
+    #[arg(
+        value_name = "NADDR-NIP05-OR-SET",
+        long = "repo",
+        value_delimiter = ','
+    )]
     naddrs:         Option<Vec<NaddrOrSet>>,
     /// List of patch files to send (space separated).
     ///

src/cli/commands/reply.rs

@@ -62,11 +62,17 @@ pub struct ReplyArgs {
     /// Quote the replied-to event in the editor
     #[arg(long)]
     quote_to: bool,
-    /// Repository address in `naddr` format (`naddr1...`), NIP-05 format
+    /// Repository addresses
-    /// (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`.
+    ///
+    /// In `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or
+    /// `_@4rs.nl/n34`), or a set name like `kernel`, separated by commas.
     ///
     /// If omitted, looks for a `nostr-address` file.
-    #[arg(value_name = "NADDR-NIP05-OR-SET", long = "repo")]
+    #[arg(
+        value_name = "NADDR-NIP05-OR-SET",
+        long = "repo",
+        value_delimiter = ','
+    )]
     naddrs:   Option<Vec<NaddrOrSet>>,
     /// The comment (cannot be used with --editor)
     #[arg(short, long)]

src/cli/commands/repo/state.rs

@@ -48,11 +48,17 @@ const HEAD_TAG_KIND: TagKind = TagKind::Custom(Cow::Borrowed("HEAD"));
 /// Arguments for the `repo state` command
 #[derive(Args, Debug)]
 pub struct StateArgs {
-    /// Repository address in `naddr` format (`naddr1...`), NIP-05 format
+    /// Repository addresses
-    /// (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`.
+    ///
+    /// In `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or
+    /// `_@4rs.nl/n34`), or a set name like `kernel`, separated by commas.
     ///
     /// If omitted, looks for a `nostr-address` file.
-    #[arg(value_name = "NADDR-NIP05-OR-SET", long = "repo")]
+    #[arg(
+        value_name = "NADDR-NIP05-OR-SET",
+        long = "repo",
+        value_delimiter = ','
+    )]
     naddrs:   Option<Vec<NaddrOrSet>>,
     /// Tags to announce a state for, in the format `<tag-name>=<commit-id>`.
     /// Separated by comma.

src/cli/commands/repo/view.rs

@@ -33,11 +33,13 @@ use crate::{
 /// Arguments for the `repo view` command
 #[derive(Args, Debug)]
 pub struct ViewArgs {
-    /// Repository address in `naddr` format (`naddr1...`), NIP-05 format
+    /// Repository addresses
-    /// (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`.
+    ///
+    /// In `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or
+    /// `_@4rs.nl/n34`), or a set name like `kernel`, separated by commas.
     ///
     /// If omitted, looks for a `nostr-address` file.
-    #[arg(value_name = "NADDR-NIP05-OR-SET")]
+    #[arg(value_name = "NADDR-NIP05-OR-SET", value_delimiter = ',')]
     naddrs: Option<Vec<NaddrOrSet>>,
 }
 

src/cli/commands/sets/new.rs

@@ -31,12 +31,18 @@ pub struct NewArgs {
     /// Unique name for the set
     name:   String,
     /// Optional relay to add it to the set, either as URL or set name to
-    /// extract its relays. [aliases: `--sr`]
+    /// extract its relays, separated by commas. [aliases: `--sr`]
-    #[arg(long = "set-relay", alias("sr"))]
+    #[arg(long = "set-relay", alias("sr"), value_delimiter = ',')]
     relays: Vec<RelayOrSet>,
-    /// Repository address in `naddr` format (`naddr1...`), NIP-05 format
+    /// Repository addresses
-    /// (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`.
+    ///
-    #[arg(value_name = "NADDR-NIP05-OR-SET", long = "repo")]
+    /// In `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or
+    /// `_@4rs.nl/n34`), or a set name like `kernel`, separated by commas.
+    #[arg(
+        value_name = "NADDR-NIP05-OR-SET",
+        long = "repo",
+        value_delimiter = ','
+    )]
     naddrs: Vec<NaddrOrSet>,
 }
 

src/cli/commands/sets/remove.rs

@@ -30,13 +30,19 @@ pub struct RemoveArgs {
     /// Set name to delete
     name:   String,
     /// Specific relay to remove it from the set, either as URL or set name to
-    /// extract its relays. [aliases: `--sr`]
+    /// extract its relays, separated by commas. [aliases: `--sr`]
-    #[arg(long = "set-relay", alias("sr"))]
+    #[arg(long = "set-relay", alias("sr"), value_delimiter = ',')]
     relays: Vec<RelayOrSet>,
 
-    /// Repository address in `naddr` format (`naddr1...`), NIP-05 format
+    /// Repository addresses
-    /// (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`.
+    ///
-    #[arg(value_name = "NADDR-NIP05-OR-SET", long = "repo")]
+    /// In `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or
+    /// `_@4rs.nl/n34`), or a set name like `kernel`, separated by commas.
+    #[arg(
+        value_name = "NADDR-NIP05-OR-SET",
+        long = "repo",
+        value_delimiter = ','
+    )]
     naddrs: Vec<NaddrOrSet>,
 }
 

src/cli/commands/sets/update.rs

@@ -31,13 +31,19 @@ use crate::{
 pub struct UpdateArgs {
     /// Name of the set to update
     name:         String,
-    /// Add relay to the set, either as URL or set name to extract its relays.
+    /// Add relay to the set, either as URL or set name to extract its relays,
-    /// [aliases: `--sr`]
+    /// separated by commas. [aliases: `--sr`]
-    #[arg(long = "set-relay", alias("sr"))]
+    #[arg(long = "set-relay", alias("sr"), value_delimiter = ',')]
     relays:       Vec<RelayOrSet>,
-    /// Repository address in `naddr` format (`naddr1...`), NIP-05 format
+    /// Repository addresses
-    /// (`4rs.nl/n34` or `_@4rs.nl/n34`), or a set name like `kernel`.
+    ///
-    #[arg(value_name = "NADDR-NIP05-OR-SET", long = "repo")]
+    /// In `naddr` format (`naddr1...`), NIP-05 format (`4rs.nl/n34` or
+    /// `_@4rs.nl/n34`), or a set name like `kernel`, separated by commas.
+    #[arg(
+        value_name = "NADDR-NIP05-OR-SET",
+        long = "repo",
+        value_delimiter = ','
+    )]
     naddrs:       Vec<NaddrOrSet>,
     /// Replace existing relays/repositories instead of adding to them
     #[arg(long = "override")]