4 files changed, 79 insertions, 20 deletions

diff --git a/src/bin/ngit/cli.rs b/src/bin/ngit/cli.rs
index b9b274e..37d85a2 100644
--- a/src/bin/ngit/cli.rs
+++ b/src/bin/ngit/cli.rs
@@ -270,6 +270,15 @@ pub enum PrCommands {
         #[arg(long)]
         offline: bool,
     },
+    /// convert a PR back to draft (author or maintainer only)
+    Draft {
+        /// Proposal event-id (hex) or nevent (bech32)
+        #[arg(value_name = "ID|nevent")]
+        id: String,
+        /// Use local cache only, skip network fetch
+        #[arg(long)]
+        offline: bool,
+    },
     /// add a comment to a PR
     Comment {
         /// Proposal event-id (hex) or nevent (bech32)
@@ -373,11 +382,29 @@ pub enum IssueCommands {
         #[arg(long = "label", value_name = "LABEL")]
         labels: Vec<String>,
     },
-    /// close an issue (author or maintainer only)
+    /// close an issue without resolving it (author or maintainer only)
     Close {
         /// Issue event-id (hex) or nevent (bech32)
         #[arg(value_name = "ID|nevent")]
         id: String,
+        /// Optional reason (e.g. wontfix, duplicate, invalid)
+        #[arg(long)]
+        reason: Option<String>,
+        /// Use local cache only, skip network fetch
+        #[arg(long)]
+        offline: bool,
+    },
+    /// mark an issue as resolved (author or maintainer only)
+    #[command(
+        long_about = "mark an issue as resolved (author or maintainer only)\n\nuse this when the issue has been fixed or addressed, as distinct from closing without resolution"
+    )]
+    Resolved {
+        /// Issue event-id (hex) or nevent (bech32)
+        #[arg(value_name = "ID|nevent")]
+        id: String,
+        /// Optional reason or resolution summary
+        #[arg(long)]
+        reason: Option<String>,
         /// Use local cache only, skip network fetch
         #[arg(long)]
         offline: bool,
diff --git a/src/bin/ngit/main.rs b/src/bin/ngit/main.rs
index b0cf375..a0cb3e6 100644
--- a/src/bin/ngit/main.rs
+++ b/src/bin/ngit/main.rs
@@ -111,6 +111,9 @@ async fn main() {
                 PrCommands::Ready { id, offline } => {
                     sub_commands::pr_status::launch_ready(id, *offline).await
                 }
+                PrCommands::Draft { id, offline } => {
+                    sub_commands::pr_status::launch_draft(id, *offline).await
+                }
                 PrCommands::Comment {
                     id,
                     body,
@@ -178,8 +181,12 @@ async fn main() {
                     sub_commands::issue_create::launch(title.clone(), body.clone(), labels.clone())
                         .await
                 }
-                IssueCommands::Close { id, offline } => {
-                    sub_commands::issue_status::launch_close(id, *offline).await
+                IssueCommands::Close { id, reason, offline } => {
+                    sub_commands::issue_status::launch_close(id, *offline, reason.as_deref()).await
+                }
+                IssueCommands::Resolved { id, reason, offline } => {
+                    sub_commands::issue_status::launch_resolved(id, *offline, reason.as_deref())
+                        .await
                 }
                 IssueCommands::Reopen { id, offline } => {
                     sub_commands::issue_status::launch_reopen(id, *offline).await
diff --git a/src/bin/ngit/sub_commands/issue_status.rs b/src/bin/ngit/sub_commands/issue_status.rs
index 3facee3..840ab8e 100644
--- a/src/bin/ngit/sub_commands/issue_status.rs
+++ b/src/bin/ngit/sub_commands/issue_status.rs
@@ -30,7 +30,13 @@ fn parse_event_id(id: &str) -> Result<EventId> {
 }
 
 #[allow(clippy::too_many_lines)]
-async fn launch_status(id: &str, offline: bool, new_kind: Kind, action: &str) -> Result<()> {
+async fn launch_status(
+    id: &str,
+    offline: bool,
+    new_kind: Kind,
+    action: &str,
+    reason: Option<&str>,
+) -> Result<()> {
     let event_id = parse_event_id(id)?;
 
     let git_repo = Repo::discover().context("failed to find a git repository")?;
@@ -64,7 +70,7 @@ async fn launch_status(id: &str, offline: bool, new_kind: Kind, action: &str) ->
 
     // Only author or maintainer may change status
     if issue.pubkey != user_pubkey && !repo_ref.maintainers.contains(&user_pubkey) {
-        bail!("only the issue author or a repository maintainer can {action} an issue");
+        bail!("only the issue author or a repository maintainer can change the status of an issue");
     }
 
     // Fetch existing statuses to check current state
@@ -96,6 +102,7 @@ async fn launch_status(id: &str, offline: bool, new_kind: Kind, action: &str) ->
         let status_str = match new_kind {
             Kind::GitStatusOpen => "open",
             Kind::GitStatusClosed => "closed",
+            Kind::GitStatusApplied => "resolved",
             _ => "unknown",
         };
         println!("issue is already {status_str}");
@@ -105,6 +112,7 @@ async fn launch_status(id: &str, offline: bool, new_kind: Kind, action: &str) ->
     let alt_text = match new_kind {
         Kind::GitStatusOpen => "issue reopened",
         Kind::GitStatusClosed => "issue closed",
+        Kind::GitStatusApplied => "issue resolved",
         _ => "issue status updated",
     };
 
@@ -112,8 +120,10 @@ async fn launch_status(id: &str, offline: bool, new_kind: Kind, action: &str) ->
         repo_ref.maintainers.iter().copied().collect();
     public_keys.insert(issue.pubkey);
 
+    let content = reason.unwrap_or("").to_string();
+
     let status_event = sign_event(
-        EventBuilder::new(new_kind, "").tags(
+        EventBuilder::new(new_kind, content).tags(
             [
                 vec![
                     Tag::custom(
@@ -147,7 +157,7 @@ async fn launch_status(id: &str, offline: bool, new_kind: Kind, action: &str) ->
             .concat(),
         ),
         &signer,
-        format!("{action} issue"),
+        format!("issue {action}"),
     )
     .await?;
 
@@ -165,14 +175,18 @@ async fn launch_status(id: &str, offline: bool, new_kind: Kind, action: &str) ->
     )
     .await?;
 
-    println!("issue {} {}d", &event_id.to_hex()[..8], action,);
+    println!("issue {} {action}", &event_id.to_hex()[..8]);
     Ok(())
 }
 
-pub async fn launch_close(id: &str, offline: bool) -> Result<()> {
-    launch_status(id, offline, Kind::GitStatusClosed, "close").await
+pub async fn launch_close(id: &str, offline: bool, reason: Option<&str>) -> Result<()> {
+    launch_status(id, offline, Kind::GitStatusClosed, "closed", reason).await
 }
 
 pub async fn launch_reopen(id: &str, offline: bool) -> Result<()> {
-    launch_status(id, offline, Kind::GitStatusOpen, "reopen").await
+    launch_status(id, offline, Kind::GitStatusOpen, "reopened", None).await
+}
+
+pub async fn launch_resolved(id: &str, offline: bool, reason: Option<&str>) -> Result<()> {
+    launch_status(id, offline, Kind::GitStatusApplied, "resolved", reason).await
 }
diff --git a/src/bin/ngit/sub_commands/pr_status.rs b/src/bin/ngit/sub_commands/pr_status.rs
index e84117d..12aafb7 100644
--- a/src/bin/ngit/sub_commands/pr_status.rs
+++ b/src/bin/ngit/sub_commands/pr_status.rs
@@ -30,7 +30,13 @@ fn parse_event_id(id: &str) -> Result<EventId> {
 }
 
 #[allow(clippy::too_many_lines)]
-async fn launch_status(id: &str, offline: bool, new_kind: Kind, action: &str) -> Result<()> {
+async fn launch_status(
+    id: &str,
+    offline: bool,
+    new_kind: Kind,
+    action: &str,
+    reason: Option<&str>,
+) -> Result<()> {
     let event_id = parse_event_id(id)?;
 
     let git_repo = Repo::discover().context("failed to find a git repository")?;
@@ -65,7 +71,7 @@ async fn launch_status(id: &str, offline: bool, new_kind: Kind, action: &str) ->
 
     // Only author or maintainer may change status
     if proposal.pubkey != user_pubkey && !repo_ref.maintainers.contains(&user_pubkey) {
-        bail!("only the PR author or a repository maintainer can {action} a PR");
+        bail!("only the PR author or a repository maintainer can change the status of a PR");
     }
 
     // Fetch existing statuses to check current state
@@ -124,8 +130,10 @@ async fn launch_status(id: &str, offline: bool, new_kind: Kind, action: &str) ->
         repo_ref.maintainers.iter().copied().collect();
     public_keys.insert(proposal.pubkey);
 
+    let content = reason.unwrap_or("").to_string();
+
     let status_event = sign_event(
-        EventBuilder::new(new_kind, "").tags(
+        EventBuilder::new(new_kind, content).tags(
             [
                 vec![
                     Tag::custom(
@@ -159,7 +167,7 @@ async fn launch_status(id: &str, offline: bool, new_kind: Kind, action: &str) ->
             .concat(),
         ),
         &signer,
-        format!("{action} PR"),
+        format!("PR {action}"),
     )
     .await?;
 
@@ -178,22 +186,25 @@ async fn launch_status(id: &str, offline: bool, new_kind: Kind, action: &str) ->
     .await?;
 
     println!(
-        "PR {} {}d: {}",
+        "PR {} {action}: {}",
         &event_id.to_hex()[..8],
-        action,
         proposal.pubkey.to_bech32().unwrap_or_default()
     );
     Ok(())
 }
 
 pub async fn launch_close(id: &str, offline: bool) -> Result<()> {
-    launch_status(id, offline, Kind::GitStatusClosed, "close").await
+    launch_status(id, offline, Kind::GitStatusClosed, "closed", None).await
 }
 
 pub async fn launch_reopen(id: &str, offline: bool) -> Result<()> {
-    launch_status(id, offline, Kind::GitStatusOpen, "reopen").await
+    launch_status(id, offline, Kind::GitStatusOpen, "reopened", None).await
 }
 
 pub async fn launch_ready(id: &str, offline: bool) -> Result<()> {
-    launch_status(id, offline, Kind::GitStatusOpen, "mark as ready").await
+    launch_status(id, offline, Kind::GitStatusOpen, "marked as ready", None).await
+}
+
+pub async fn launch_draft(id: &str, offline: bool) -> Result<()> {
+    launch_status(id, offline, Kind::GitStatusDraft, "converted to draft", None).await
 }