diff --git a/src/renderer/src/lib/launch-agent-session-continuation.test.ts b/src/renderer/src/lib/launch-agent-session-continuation.test.ts
index 84021bd14e9..44ddc5f1de9 100644
--- a/src/renderer/src/lib/launch-agent-session-continuation.test.ts
+++ b/src/renderer/src/lib/launch-agent-session-continuation.test.ts
@@ -72,7 +72,7 @@ describe('launchAgentSessionContinuation', () => {
         worktreeId: 'wt-1',
         groupId: 'group-1',
         initialCwd: '/repo/worktree/packages/app',
-        promptDelivery: 'submit-after-ready'
+        promptDelivery: 'draft'
       })
     )
   })
@@ -129,6 +129,9 @@ describe('launchAgentSessionContinuation', () => {
       launchSource: 'sidebar'
     })
 
+    expect(launchAgentInNewTab).toHaveBeenCalledWith(
+      expect.objectContaining({ agent: 'codex', promptDelivery: 'submit-after-ready' })
+    )
     await vi.waitFor(() =>
       expect(toast.error).toHaveBeenCalledWith(
         'The new Codex session started, but its context could not be sent.'
diff --git a/src/renderer/src/lib/launch-agent-session-continuation.ts b/src/renderer/src/lib/launch-agent-session-continuation.ts
index 55795b9888a..0a13622be64 100644
--- a/src/renderer/src/lib/launch-agent-session-continuation.ts
+++ b/src/renderer/src/lib/launch-agent-session-continuation.ts
@@ -90,7 +90,7 @@ export async function launchAgentSessionContinuation({
     worktreeId,
     ...(groupId ? { groupId } : {}),
     prompt,
-    promptDelivery: 'submit-after-ready',
+    promptDelivery: agent === 'claude' ? 'draft' : 'submit-after-ready',
     launchSource,
     ...(initialCwd ? { initialCwd } : {}),
     onPromptDelivered: () =>