diff --git a/internal/common/task_utils_test.go b/internal/common/task_utils_test.go
index 0e9f6e1..2c3c064 100644
--- a/internal/common/task_utils_test.go
+++ b/internal/common/task_utils_test.go
@@ -149,6 +149,15 @@ func TestAugmentArgsForTask_IdleOnCompletePrecedence(t *testing.T) {
 			opts:     TaskAugmentOptions{},
 			expected: []string{"agent", "run", "--idle-on-complete"},
 		},
+		{
+			name: "does not forward --conversation even when AgentConversationID is set; the embedded warp CLI reads it off task metadata",
+			task: &types.Task{
+				AgentConfigSnapshot: &types.AmbientAgentConfig{},
+				AgentConversationID: strPtr("abc-123"),
+			},
+			opts:     TaskAugmentOptions{},
+			expected: []string{"agent", "run", "--idle-on-complete"},
+		},
 		{
 			name: "skips --share public when public_access is nil",
 			task: &types.Task{
diff --git a/internal/types/messages.go b/internal/types/messages.go
index 7a3d818..532f27e 100644
--- a/internal/types/messages.go
+++ b/internal/types/messages.go
@@ -41,8 +41,6 @@ type TaskAssignmentMessage struct {
 	EnvVars map[string]string `json:"env_vars,omitempty"`
 	// AdditionalSidecars is a list of extra sidecar images to mount into the task container.
 	AdditionalSidecars []SidecarMount `json:"additional_sidecars,omitempty"`
-	// ConversationID is the UUID of an existing AI conversation to continue.
-	ConversationID string `json:"conversation_id,omitempty"`
 }
 
 // TaskClaimedMessage is sent from worker to server after successfully claiming a task
@@ -132,4 +130,5 @@ type Task struct {
 	CreatedAt           time.Time           `json:"created_at"`
 	UpdatedAt           time.Time           `json:"updated_at"`
 	AgentConfigSnapshot *AmbientAgentConfig `json:"agent_config_snapshot,omitempty"`
+	AgentConversationID *string             `json:"agent_conversation_id,omitempty"`
 }
diff --git a/internal/worker/worker.go b/internal/worker/worker.go
index 8214fdc..038c7ce 100644
--- a/internal/worker/worker.go
+++ b/internal/worker/worker.go
@@ -375,9 +375,6 @@ func (w *Worker) prepareTaskParams(assignment *types.TaskAssignmentMessage) *Tas
 		"--server-root-url",
 		w.config.ServerRootURL,
 	}
-	if assignment.ConversationID != "" {
-		baseArgs = append(baseArgs, "--conversation", assignment.ConversationID)
-	}
 	baseArgs = common.AugmentArgsForTask(task, baseArgs, common.TaskAugmentOptions{
 		IdleOnComplete: w.config.IdleOnComplete,
 	})