diff --git a/packages/opencode/src/session/prompt.ts b/packages/opencode/src/session/prompt.ts
index 5f442cdb..6b77feb3 100644
--- a/packages/opencode/src/session/prompt.ts
+++ b/packages/opencode/src/session/prompt.ts
@@ -191,9 +191,13 @@ export namespace SessionPrompt {
     const session = await Session.get(input.sessionID)
     await SessionRevert.cleanup(session)
 
-    await createUserMessage(input)
+    const message = await createUserMessage(input)
     await Session.touch(input.sessionID)
 
+    if (input.noReply) {
+      return message
+    }
+
     return loop(input.sessionID)
   })