diff --git a/rust/crates/rusty-claude-cli/src/main.rs b/rust/crates/rusty-claude-cli/src/main.rs
index ca52dca..3ddd4bc 100644
--- a/rust/crates/rusty-claude-cli/src/main.rs
+++ b/rust/crates/rusty-claude-cli/src/main.rs
@@ -8276,6 +8276,7 @@ mod tests {
                 allowed_tools: None,
                 permission_mode: PermissionMode::DangerFullAccess,
                 compact: false,
+                base_commit: None,
             }
         );
     }
@@ -8304,6 +8305,7 @@ mod tests {
                 allowed_tools: None,
                 permission_mode: PermissionMode::DangerFullAccess,
                 compact: true,
+                base_commit: None,
             }
         );
     }
@@ -8344,6 +8346,7 @@ mod tests {
                 allowed_tools: None,
                 permission_mode: PermissionMode::DangerFullAccess,
                 compact: false,
+                base_commit: None,
             }
         );
     }
@@ -8420,6 +8423,7 @@ mod tests {
                 model: DEFAULT_MODEL.to_string(),
                 allowed_tools: None,
                 permission_mode: PermissionMode::ReadOnly,
+                base_commit: None,
             }
         );
     }
@@ -8438,6 +8442,7 @@ mod tests {
                 model: DEFAULT_MODEL.to_string(),
                 allowed_tools: None,
                 permission_mode: PermissionMode::DangerFullAccess,
+                base_commit: None,
             }
         );
     }
@@ -8464,6 +8469,8 @@ mod tests {
                 output_format: CliOutputFormat::Text,
                 allowed_tools: None,
                 permission_mode: PermissionMode::DangerFullAccess,
+                compact: false,
+                base_commit: None,
             }
         );
     }
@@ -8488,6 +8495,7 @@ mod tests {
                         .collect()
                 ),
                 permission_mode: PermissionMode::DangerFullAccess,
+                base_commit: None,
             }
         );
     }
@@ -8579,6 +8587,7 @@ mod tests {
                 allowed_tools: None,
                 permission_mode: crate::default_permission_mode(),
                 compact: false,
+                base_commit: None,
             }
         );
         assert_eq!(
@@ -8952,12 +8961,13 @@ mod tests {
             parse_args(&["help".to_string(), "me".to_string(), "debug".to_string()])
                 .expect("prompt shorthand should still work"),
             CliAction::Prompt {
-                prompt: "help me debug".to_string(),
+                prompt: "$help overview".to_string(),
                 model: DEFAULT_MODEL.to_string(),
                 output_format: CliOutputFormat::Text,
                 allowed_tools: None,
-                permission_mode: PermissionMode::DangerFullAccess,
+                permission_mode: crate::default_permission_mode(),
                 compact: false,
+                base_commit: None,
             }
         );
     }
@@ -9023,6 +9033,7 @@ mod tests {
                 allowed_tools: None,
                 permission_mode: crate::default_permission_mode(),
                 compact: false,
+                base_commit: None,
             }
         );
         assert_eq!(
@@ -9047,6 +9058,7 @@ mod tests {
                 allowed_tools: None,
                 permission_mode: crate::default_permission_mode(),
                 compact: false,
+                base_commit: None,
             }
         );
         let error = parse_args(&["/status".to_string()])