diff --git a/src/agent/oneshot.rs b/src/agent/oneshot.rs
index 81bcc91..cc590bb 100644
--- a/src/agent/oneshot.rs
+++ b/src/agent/oneshot.rs
@@ -193,7 +193,7 @@ impl AutoAgent {
 
         if next_step < self.steps.len() {
             backend.push_node(
-                AstNode::user_msg(&self.steps[next_step].prompt)).await;
+                AstNode::system_msg(&self.steps[next_step].prompt)).await;
             next_step += 1;
         }
 
@@ -218,8 +218,8 @@ impl AutoAgent {
             let text = result.text;
             if text.is_empty() {
                 dbglog!("[auto] {} empty response, retrying", self.name);
-                backend.push_node(AstNode::user_msg(
-                    "[system] Your previous response was empty. \
+                backend.push_node(AstNode::system_msg(
+                    "Your previous response was empty. \
                      Please respond with text or use a tool."
                 )).await;
                 continue;
@@ -234,7 +234,7 @@ impl AutoAgent {
                 }
                 self.current_phase = self.steps[next_step].phase.clone();
                 backend.push_node(
-                    AstNode::user_msg(&self.steps[next_step].prompt)).await;
+                    AstNode::system_msg(&self.steps[next_step].prompt)).await;
                 next_step += 1;
                 dbglog!("[auto] {} step {}/{}",
                     self.name, next_step, self.steps.len());