From 708e6b23b212e9908eae777164b5fd5a35983803 Mon Sep 17 00:00:00 2001
From: 2witstudios <2witstudios@gmail.com>
Date: Sat, 7 Mar 2026 21:55:11 -0600
Subject: [PATCH 1/2] fix: Replace bare unwrap() with expect() for clarity

Aligns id.rs random_id() with the expect() pattern already used by
root_agent_name() and worktree_agent_name() in the same file. Adds
descriptive expect messages to template.rs file_name() calls.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 crates/pu-core/src/id.rs       |  2 +-
 crates/pu-core/src/template.rs | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/crates/pu-core/src/id.rs b/crates/pu-core/src/id.rs
index e4a9b1d..8da205d 100644
--- a/crates/pu-core/src/id.rs
+++ b/crates/pu-core/src/id.rs
@@ -8,7 +8,7 @@ const ID_LEN: usize = 8;
 fn random_id(prefix: &str) -> String {
     let mut rng = rand::rng();
     let suffix: String = (0..ID_LEN)
-        .map(|_| *ALPHABET.choose(&mut rng).unwrap() as char)
+        .map(|_| *ALPHABET.choose(&mut rng).expect("ALPHABET is non-empty") as char)
         .collect();
     format!("{prefix}{suffix}")
 }
diff --git a/crates/pu-core/src/template.rs b/crates/pu-core/src/template.rs
index 582de67..c5865db 100644
--- a/crates/pu-core/src/template.rs
+++ b/crates/pu-core/src/template.rs
@@ -230,7 +230,11 @@ fn scan_dir(dir: &Path, source: &str) -> Vec<Template> {
         let path = entry.path();
         if path.extension().and_then(|e| e.to_str()) == Some("md") {
             if let Ok(content) = std::fs::read_to_string(&path) {
-                let file_name = path.file_name().unwrap().to_string_lossy().to_string();
+                let file_name = path
+                    .file_name()
+                    .expect("dir entry has file name")
+                    .to_string_lossy()
+                    .to_string();
                 let mut tpl = parse_template(&content, &file_name);
                 tpl.source = source.to_string();
                 templates.push(tpl);
@@ -247,7 +251,11 @@ fn find_in_dir(dir: &Path, name: &str, source: &str) -> Option<Template> {
     let path = dir.join(format!("{name}.md"));
     if path.is_file() {
         if let Ok(content) = std::fs::read_to_string(&path) {
-            let file_name = path.file_name().unwrap().to_string_lossy().to_string();
+            let file_name = path
+                .file_name()
+                .expect("path has file name")
+                .to_string_lossy()
+                .to_string();
             let mut tpl = parse_template(&content, &file_name);
             tpl.source = source.to_string();
             return Some(tpl);

From cf26051f4345afc6f961c973cb639a9f91e06418 Mon Sep 17 00:00:00 2001
From: 2witstudios <2witstudios@gmail.com>
Date: Sun, 8 Mar 2026 15:17:13 -0500
Subject: [PATCH 2/2] fix: Handle unused Result from print_response to fix CI

- bench.rs: propagate print_response errors with ?
- output.rs: use let _ = in test where result is intentionally unused

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 crates/pu-cli/src/commands/bench.rs | 4 ++--
 crates/pu-cli/src/output.rs         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/pu-cli/src/commands/bench.rs b/crates/pu-cli/src/commands/bench.rs
index 24055f8..db4a35b 100644
--- a/crates/pu-cli/src/commands/bench.rs
+++ b/crates/pu-cli/src/commands/bench.rs
@@ -57,7 +57,7 @@ pub async fn run_bench(
         }
     }
 
-    output::print_response(&resp, json);
+    output::print_response(&resp, json)?;
     Ok(())
 }
 
@@ -75,6 +75,6 @@ pub async fn run_play(socket: &Path, agent_id: &str, json: bool) -> Result<(), C
     )
     .await?;
     let resp = output::check_response(resp, json)?;
-    output::print_response(&resp, json);
+    output::print_response(&resp, json)?;
     Ok(())
 }
diff --git a/crates/pu-cli/src/output.rs b/crates/pu-cli/src/output.rs
index 5421c3e..8579a93 100644
--- a/crates/pu-cli/src/output.rs
+++ b/crates/pu-cli/src/output.rs
@@ -719,7 +719,7 @@ mod tests {
     #[test]
     fn given_empty_suspend_result_should_not_panic() {
         let resp = Response::SuspendResult { suspended: vec![] };
-        print_response(&resp, false);
+        let _ = print_response(&resp, false);
     }
 
     #[test]