@@ -7,11 +7,14 @@ import (
 	"net/http"
 	"net/url"
 	"slices"
+	"strings"
 	"time"
 
 	"github.com/google/uuid"
 	"golang.org/x/xerrors"
 
+	"github.com/coder/coder/v2/coderd/taskname"
+
 	aiagentapi "github.com/coder/agentapi-sdk-go"
 	"github.com/coder/coder/v2/coderd/audit"
 	"github.com/coder/coder/v2/coderd/database"
@@ -22,7 +25,6 @@ import (
 	"github.com/coder/coder/v2/coderd/rbac"
 	"github.com/coder/coder/v2/coderd/rbac/policy"
 	"github.com/coder/coder/v2/coderd/searchquery"
-	"github.com/coder/coder/v2/coderd/taskname"
 	"github.com/coder/coder/v2/coderd/util/ptr"
 	"github.com/coder/coder/v2/coderd/util/slice"
 	strutil "github.com/coder/coder/v2/coderd/util/strings"
@@ -108,11 +110,26 @@ func (api *API) tasksCreate(rw http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	displayName := ""
-	if taskName == "" {
+	taskDisplayName := strings.TrimSpace(req.DisplayName)
+	if taskDisplayName != "" {
+		if len(taskDisplayName) > 64 {
+			httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
+				Message: "Display name must be 64 characters or less.",
+			})
+			return
+		}
+	}
+
+	// Generate task name and display name if either is not provided
+	if taskName == "" || taskDisplayName == "" {
 		generatedTaskName := taskname.Generate(ctx, req.Input)
-		taskName = generatedTaskName.Name
-		displayName = generatedTaskName.DisplayName
+
+		if taskName == "" {
+			taskName = generatedTaskName.Name
+		}
+		if taskDisplayName == "" {
+			taskDisplayName = generatedTaskName.DisplayName
+		}
 	}
 
 	// Check if the template defines the AI Prompt parameter.
@@ -204,7 +221,7 @@ func (api *API) tasksCreate(rw http.ResponseWriter, r *http.Request) {
 				OrganizationID:     templateVersion.OrganizationID,
 				OwnerID:            owner.ID,
 				Name:               taskName,
-				DisplayName:        displayName,
+				DisplayName:        taskDisplayName,
 				WorkspaceID:        uuid.NullUUID{}, // Will be set after workspace creation.
 				TemplateVersionID:  templateVersion.ID,
 				TemplateParameters: []byte("{}"),
 
@@ -844,14 +844,17 @@ func TestTasksCreate(t *testing.T) {
 		t.Parallel()
 
 		tests := []struct {
-			name               string
-			taskName           string
-			expectFallbackName bool
-			expectError        string
+			name                      string
+			taskName                  string
+			taskDisplayName           string
+			expectFallbackName        bool
+			expectFallbackDisplayName bool
+			expectError               string
 		}{
 			{
-				name:     "ValidName",
-				taskName: "a-valid-task-name",
+				name:                      "ValidName",
+				taskName:                  "a-valid-task-name",
+				expectFallbackDisplayName: true,
 			},
 			{
 				name:        "NotValidName",
@@ -861,8 +864,37 @@ func TestTasksCreate(t *testing.T) {
 			{
 				name:               "NoNameProvided",
 				taskName:           "",
+				taskDisplayName:    "A valid task display name",
 				expectFallbackName: true,
 			},
+			{
+				name:               "ValidDisplayName",
+				taskDisplayName:    "A valid task display name",
+				expectFallbackName: true,
+			},
+			{
+				name:            "NotValidDisplayName",
+				taskDisplayName: "This is a task display name with a length greater than 64 characters.",
+				expectError:     "Display name must be 64 characters or less.",
+			},
+			{
+				name:                      "NoDisplayNameProvided",
+				taskName:                  "a-valid-task-name",
+				taskDisplayName:           "",
+				expectFallbackDisplayName: true,
+			},
+			{
+				name:            "ValidNameAndDisplayName",
+				taskName:        "a-valid-task-name",
+				taskDisplayName: "A valid task display name",
+			},
+			{
+				name:                      "NoNameAndDisplayNameProvided",
+				taskName:                  "",
+				taskDisplayName:           "",
+				expectFallbackName:        true,
+				expectFallbackDisplayName: true,
+			},
 		}
 
 		for _, tt := range tests {
@@ -893,6 +925,7 @@ func TestTasksCreate(t *testing.T) {
 					TemplateVersionID: template.ActiveVersionID,
 					Input:             "Some prompt",
 					Name:              tt.taskName,
+					DisplayName:       tt.taskDisplayName,
 				})
 				if tt.expectError == "" {
 					require.NoError(t, err)
@@ -906,8 +939,17 @@ func TestTasksCreate(t *testing.T) {
 					if !tt.expectFallbackName {
 						require.Equal(t, tt.taskName, task.Name)
 					}
+
+					// Then: We expect the correct display name to have been picked.
+					require.NotEmpty(t, task.DisplayName)
+					if !tt.expectFallbackDisplayName {
+						require.Equal(t, tt.taskDisplayName, task.DisplayName)
+					}
 				} else {
-					require.ErrorContains(t, err, tt.expectError)
+					var apiErr *codersdk.Error
+					require.ErrorAs(t, err, &apiErr)
+					require.Equal(t, http.StatusBadRequest, apiErr.StatusCode())
+					require.Equal(t, apiErr.Message, tt.expectError)
 				}
 			})
 		}
 
@@ -35,6 +35,7 @@ type CreateTaskRequest struct {
 	TemplateVersionPresetID uuid.UUID `json:"template_version_preset_id,omitempty" format:"uuid"`
 	Input                   string    `json:"input"`
 	Name                    string    `json:"name,omitempty"`
+	DisplayName             string    `json:"display_name,omitempty"`
 }
 
 // CreateTask creates a new task.
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ type CreateTaskRequest struct {`
`35`	`35`	TemplateVersionPresetID uuid.UUID `json:"template_version_preset_id,omitempty" format:"uuid"`
`36`	`36`	Input string `json:"input"`
`37`	`37`	Name string `json:"name,omitempty"`
	`38`	+ DisplayName string `json:"display_name,omitempty"`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`// CreateTask creates a new task.`