diff --git a/crates/pu-cli/src/commands/agent_def.rs b/crates/pu-cli/src/commands/agent_def.rs
index d615311..198f269 100644
--- a/crates/pu-cli/src/commands/agent_def.rs
+++ b/crates/pu-cli/src/commands/agent_def.rs
@@ -7,7 +7,7 @@ use crate::error::CliError;
 use crate::output;
 use pu_core::protocol::Request;
 
-/// Parse comma-separated tags string into a Vec<String>.
+/// Parse comma-separated tags string into a `Vec<String>`.
 /// Empty string returns empty vec. Whitespace around each tag is trimmed.
 fn parse_tags(tags: &str) -> Vec<String> {
     if tags.is_empty() {
diff --git a/crates/pu-core/src/protocol.rs b/crates/pu-core/src/protocol.rs
index d35cf56..6f4245f 100644
--- a/crates/pu-core/src/protocol.rs
+++ b/crates/pu-core/src/protocol.rs
@@ -5,7 +5,7 @@ use crate::types::{AgentStatus, WorktreeEntry};
 
 pub const PROTOCOL_VERSION: u32 = 2;
 
-/// Serde helper: encode Vec<u8> as hex in JSON for binary PTY data.
+/// Serde helper: encode `Vec<u8>` as hex in JSON for binary PTY data.
 mod hex_bytes {
     use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
diff --git a/crates/pu-core/src/template.rs b/crates/pu-core/src/template.rs
index 582de67..d30ed93 100644
--- a/crates/pu-core/src/template.rs
+++ b/crates/pu-core/src/template.rs
@@ -230,7 +230,10 @@ 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 Some(file_name) = path.file_name() else {
+                    continue;
+                };
+                let file_name = 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 +250,7 @@ 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()?.to_string_lossy().to_string();
             let mut tpl = parse_template(&content, &file_name);
             tpl.source = source.to_string();
             return Some(tpl);