From 931b97caabeeb69ee6c33946389ab3020fad68d7 Mon Sep 17 00:00:00 2001
From: Susana Ferreira <susana@coder.com>
Date: Thu, 24 Jul 2025 16:44:36 +0100
Subject: [PATCH 1/4] feat(cli): add CLI support for listing presets (#18910)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Description

This PR introduces a new `list presets` command to display the presets
associated with a given template.
By default, it displays the presets for the template's active version,
unless a `--template-version` flag is provided.

## Changes

* Added a new `list presets` command under `coder templates presets` to
display presets associated with a template.
* By default, the command lists presets from the template’s active
version.
* Users can override the default behavior by providing the
`--template-version` flag to target a specific version.

```
> coder templates versions presets list --help

USAGE:
  coder templates presets list [flags] <template>

  List all presets of the specified template. Defaults to the active template version.

OPTIONS:
  -O, --org string, $CODER_ORGANIZATION
          Select which organization (uuid or name) to use.

  -c, --column [name|parameters|default|desired prebuild instances] (default: name,parameters,default,desired prebuild instances)
          Columns to display in table output.

  -o, --output table|json (default: table)
          Output format.

      --template-version string
          Specify a template version to list presets for. Defaults to the active version.
```

Related PR: https://github.com/coder/coder/pull/18912 - please consider
both PRs together as they’re part of the same workflow
Relates to issue: https://github.com/coder/coder/issues/16594

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

* **New Features**
* Added CLI commands to manage and list presets for specific template
versions, supporting tabular and JSON output.
* Introduced a new CLI subcommand group for template version presets,
including detailed help and documentation.
* Added support for displaying and managing the desired number of
prebuild instances for presets in CLI, API, and UI.

* **Documentation**
* Updated and expanded CLI and API documentation to describe new
commands, options, and the desired prebuild instances field in presets.
* Added new help output and reference files for template version presets
commands.

* **Bug Fixes**
* Ensured correct handling and display of the desired prebuild instances
property for presets across CLI, API, and UI.

* **Tests**
* Introduced end-to-end tests for listing template version presets,
covering scenarios with and without presets.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
---
 cli/templatepresets.go                        | 168 +++++++++++++
 cli/templatepresets_test.go                   | 228 ++++++++++++++++++
 cli/templates.go                              |   1 +
 cli/testdata/coder_templates_--help.golden    |   1 +
 .../coder_templates_presets_--help.golden     |  24 ++
 ...coder_templates_presets_list_--help.golden |  24 ++
 coderd/apidoc/docs.go                         |   3 +
 coderd/apidoc/swagger.json                    |   3 +
 coderd/presets.go                             |  16 +-
 codersdk/presets.go                           |   9 +-
 docs/manifest.json                            |  10 +
 docs/reference/api/schemas.md                 |  14 +-
 docs/reference/api/templates.md               |  20 +-
 docs/reference/cli/templates.md               |   1 +
 docs/reference/cli/templates_presets.md       |  32 +++
 docs/reference/cli/templates_presets_list.md  |  47 ++++
 site/src/api/typesGenerated.ts                |   1 +
 .../CreateWorkspacePageView.stories.tsx       |   4 +
 18 files changed, 584 insertions(+), 22 deletions(-)
 create mode 100644 cli/templatepresets.go
 create mode 100644 cli/templatepresets_test.go
 create mode 100644 cli/testdata/coder_templates_presets_--help.golden
 create mode 100644 cli/testdata/coder_templates_presets_list_--help.golden
 create mode 100644 docs/reference/cli/templates_presets.md
 create mode 100644 docs/reference/cli/templates_presets_list.md

diff --git a/cli/templatepresets.go b/cli/templatepresets.go
new file mode 100644
index 0000000000000..ab0d49725b99a
--- /dev/null
+++ b/cli/templatepresets.go
@@ -0,0 +1,168 @@
+package cli
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+
+	"golang.org/x/xerrors"
+
+	"github.com/coder/coder/v2/cli/cliui"
+	"github.com/coder/coder/v2/codersdk"
+	"github.com/coder/serpent"
+)
+
+func (r *RootCmd) templatePresets() *serpent.Command {
+	cmd := &serpent.Command{
+		Use:     "presets",
+		Short:   "Manage presets of the specified template",
+		Aliases: []string{"preset"},
+		Long: FormatExamples(
+			Example{
+				Description: "List presets for the active version of a template",
+				Command:     "coder templates presets list my-template",
+			},
+			Example{
+				Description: "List presets for a specific version of a template",
+				Command:     "coder templates presets list my-template --template-version my-template-version",
+			},
+		),
+		Handler: func(inv *serpent.Invocation) error {
+			return inv.Command.HelpHandler(inv)
+		},
+		Children: []*serpent.Command{
+			r.templatePresetsList(),
+		},
+	}
+
+	return cmd
+}
+
+func (r *RootCmd) templatePresetsList() *serpent.Command {
+	defaultColumns := []string{
+		"name",
+		"parameters",
+		"default",
+		"desired prebuild instances",
+	}
+	formatter := cliui.NewOutputFormatter(
+		cliui.TableFormat([]templatePresetRow{}, defaultColumns),
+		cliui.JSONFormat(),
+	)
+	client := new(codersdk.Client)
+	orgContext := NewOrganizationContext()
+
+	var templateVersion string
+
+	cmd := &serpent.Command{
+		Use: "list <template>",
+		Middleware: serpent.Chain(
+			serpent.RequireNArgs(1),
+			r.InitClient(client),
+		),
+		Short: "List all presets of the specified template. Defaults to the active template version.",
+		Options: serpent.OptionSet{
+			{
+				Name:        "template-version",
+				Description: "Specify a template version to list presets for. Defaults to the active version.",
+				Flag:        "template-version",
+				Value:       serpent.StringOf(&templateVersion),
+			},
+		},
+		Handler: func(inv *serpent.Invocation) error {
+			organization, err := orgContext.Selected(inv, client)
+			if err != nil {
+				return xerrors.Errorf("get current organization: %w", err)
+			}
+
+			template, err := client.TemplateByName(inv.Context(), organization.ID, inv.Args[0])
+			if err != nil {
+				return xerrors.Errorf("get template by name: %w", err)
+			}
+
+			// If a template version is specified via flag, fetch that version by name
+			var version codersdk.TemplateVersion
+			if len(templateVersion) > 0 {
+				version, err = client.TemplateVersionByName(inv.Context(), template.ID, templateVersion)
+				if err != nil {
+					return xerrors.Errorf("get template version by name: %w", err)
+				}
+			} else {
+				// Otherwise, use the template's active version
+				version, err = client.TemplateVersion(inv.Context(), template.ActiveVersionID)
+				if err != nil {
+					return xerrors.Errorf("get active template version: %w", err)
+				}
+			}
+
+			presets, err := client.TemplateVersionPresets(inv.Context(), version.ID)
+			if err != nil {
+				return xerrors.Errorf("get template versions presets by template version: %w", err)
+			}
+
+			if len(presets) == 0 {
+				cliui.Infof(
+					inv.Stdout,
+					"No presets found for template %q and template-version %q.\n", template.Name, version.Name,
+				)
+				return nil
+			}
+
+			cliui.Infof(
+				inv.Stdout,
+				"Showing presets for template %q and template version %q.\n", template.Name, version.Name,
+			)
+			rows := templatePresetsToRows(presets...)
+			out, err := formatter.Format(inv.Context(), rows)
+			if err != nil {
+				return xerrors.Errorf("render table: %w", err)
+			}
+
+			_, err = fmt.Fprintln(inv.Stdout, out)
+			return err
+		},
+	}
+
+	orgContext.AttachOptions(cmd)
+	formatter.AttachOptions(&cmd.Options)
+	return cmd
+}
+
+type templatePresetRow struct {
+	// For json format:
+	TemplatePreset codersdk.Preset `table:"-"`
+
+	// For table format:
+	Name                     string `json:"-" table:"name,default_sort"`
+	Parameters               string `json:"-" table:"parameters"`
+	Default                  bool   `json:"-" table:"default"`
+	DesiredPrebuildInstances string `json:"-" table:"desired prebuild instances"`
+}
+
+func formatPresetParameters(params []codersdk.PresetParameter) string {
+	var paramsStr []string
+	for _, p := range params {
+		paramsStr = append(paramsStr, fmt.Sprintf("%s=%s", p.Name, p.Value))
+	}
+	return strings.Join(paramsStr, ",")
+}
+
+// templatePresetsToRows converts a list of presets to a list of rows
+// for outputting.
+func templatePresetsToRows(presets ...codersdk.Preset) []templatePresetRow {
+	rows := make([]templatePresetRow, len(presets))
+	for i, preset := range presets {
+		prebuildInstances := "-"
+		if preset.DesiredPrebuildInstances != nil {
+			prebuildInstances = strconv.Itoa(*preset.DesiredPrebuildInstances)
+		}
+		rows[i] = templatePresetRow{
+			Name:                     preset.Name,
+			Parameters:               formatPresetParameters(preset.Parameters),
+			Default:                  preset.Default,
+			DesiredPrebuildInstances: prebuildInstances,
+		}
+	}
+
+	return rows
+}
diff --git a/cli/templatepresets_test.go b/cli/templatepresets_test.go
new file mode 100644
index 0000000000000..47d34af2dcf2d
--- /dev/null
+++ b/cli/templatepresets_test.go
@@ -0,0 +1,228 @@
+package cli_test
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/coder/coder/v2/cli/clitest"
+	"github.com/coder/coder/v2/coderd/coderdtest"
+	"github.com/coder/coder/v2/codersdk"
+	"github.com/coder/coder/v2/provisioner/echo"
+	"github.com/coder/coder/v2/provisionersdk/proto"
+	"github.com/coder/coder/v2/pty/ptytest"
+	"github.com/coder/coder/v2/testutil"
+)
+
+func TestTemplatePresets(t *testing.T) {
+	t.Parallel()
+
+	t.Run("NoPresets", func(t *testing.T) {
+		t.Parallel()
+
+		client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
+		owner := coderdtest.CreateFirstUser(t, client)
+		member, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
+
+		// Given: a template version without presets
+		version := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, templateWithPresets([]*proto.Preset{}))
+		_ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
+		template := coderdtest.CreateTemplate(t, client, owner.OrganizationID, version.ID)
+
+		// When: listing presets for that template
+		inv, root := clitest.New(t, "templates", "presets", "list", template.Name)
+		clitest.SetupConfig(t, member, root)
+
+		pty := ptytest.New(t).Attach(inv)
+		doneChan := make(chan struct{})
+		var runErr error
+		go func() {
+			defer close(doneChan)
+			runErr = inv.Run()
+		}()
+		<-doneChan
+		require.NoError(t, runErr)
+
+		// Should return a message when no presets are found for the given template and version.
+		notFoundMessage := fmt.Sprintf("No presets found for template %q and template-version %q.", template.Name, version.Name)
+		pty.ExpectRegexMatch(notFoundMessage)
+	})
+
+	t.Run("ListsPresetsForDefaultTemplateVersion", func(t *testing.T) {
+		t.Parallel()
+
+		client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
+		owner := coderdtest.CreateFirstUser(t, client)
+		member, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
+
+		// Given: an active template version that includes presets
+		presets := []*proto.Preset{
+			{
+				Name: "preset-multiple-params",
+				Parameters: []*proto.PresetParameter{
+					{
+						Name:  "k1",
+						Value: "v1",
+					}, {
+						Name:  "k2",
+						Value: "v2",
+					},
+				},
+			},
+			{
+				Name:    "preset-default",
+				Default: true,
+				Parameters: []*proto.PresetParameter{
+					{
+						Name:  "k1",
+						Value: "v2",
+					},
+				},
+				Prebuild: &proto.Prebuild{
+					Instances: 0,
+				},
+			},
+			{
+				Name:       "preset-prebuilds",
+				Parameters: []*proto.PresetParameter{},
+				Prebuild: &proto.Prebuild{
+					Instances: 2,
+				},
+			},
+		}
+		version := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, templateWithPresets(presets))
+		_ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
+		template := coderdtest.CreateTemplate(t, client, owner.OrganizationID, version.ID)
+		require.Equal(t, version.ID, template.ActiveVersionID)
+
+		// When: listing presets for that template
+		inv, root := clitest.New(t, "templates", "presets", "list", template.Name)
+		clitest.SetupConfig(t, member, root)
+
+		pty := ptytest.New(t).Attach(inv)
+		doneChan := make(chan struct{})
+		var runErr error
+		go func() {
+			defer close(doneChan)
+			runErr = inv.Run()
+		}()
+
+		<-doneChan
+		require.NoError(t, runErr)
+
+		// Should: return the active version's presets sorted by name
+		message := fmt.Sprintf("Showing presets for template %q and template version %q.", template.Name, version.Name)
+		pty.ExpectMatch(message)
+		pty.ExpectRegexMatch(`preset-default\s+k1=v2\s+true\s+0`)
+		// The parameter order is not guaranteed in the output, so we match both possible orders
+		pty.ExpectRegexMatch(`preset-multiple-params\s+(k1=v1,k2=v2)|(k2=v2,k1=v1)\s+false\s+-`)
+		pty.ExpectRegexMatch(`preset-prebuilds\s+\s+false\s+2`)
+	})
+
+	t.Run("ListsPresetsForSpecifiedTemplateVersion", func(t *testing.T) {
+		t.Parallel()
+
+		ctx := testutil.Context(t, testutil.WaitMedium)
+
+		client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
+		owner := coderdtest.CreateFirstUser(t, client)
+		member, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
+
+		// Given: a template with an active version that has no presets,
+		// and another template version that includes presets
+		presets := []*proto.Preset{
+			{
+				Name: "preset-multiple-params",
+				Parameters: []*proto.PresetParameter{
+					{
+						Name:  "k1",
+						Value: "v1",
+					}, {
+						Name:  "k2",
+						Value: "v2",
+					},
+				},
+			},
+			{
+				Name:    "preset-default",
+				Default: true,
+				Parameters: []*proto.PresetParameter{
+					{
+						Name:  "k1",
+						Value: "v2",
+					},
+				},
+				Prebuild: &proto.Prebuild{
+					Instances: 0,
+				},
+			},
+			{
+				Name:       "preset-prebuilds",
+				Parameters: []*proto.PresetParameter{},
+				Prebuild: &proto.Prebuild{
+					Instances: 2,
+				},
+			},
+		}
+		// Given: first template version with presets
+		version := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, templateWithPresets(presets))
+		_ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
+		template := coderdtest.CreateTemplate(t, client, owner.OrganizationID, version.ID)
+		// Given: second template version without presets
+		activeVersion := coderdtest.UpdateTemplateVersion(t, client, owner.OrganizationID, templateWithPresets([]*proto.Preset{}), template.ID)
+		_ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, activeVersion.ID)
+		// Given: second template version is the active version
+		err := client.UpdateActiveTemplateVersion(ctx, template.ID, codersdk.UpdateActiveTemplateVersion{
+			ID: activeVersion.ID,
+		})
+		require.NoError(t, err)
+		updatedTemplate, err := client.Template(ctx, template.ID)
+		require.NoError(t, err)
+		require.Equal(t, activeVersion.ID, updatedTemplate.ActiveVersionID)
+		// Given: template has two versions
+		templateVersions, err := client.TemplateVersionsByTemplate(ctx, codersdk.TemplateVersionsByTemplateRequest{
+			TemplateID: updatedTemplate.ID,
+		})
+		require.NoError(t, err)
+		require.Len(t, templateVersions, 2)
+
+		// When: listing presets for a specific template and its specified version
+		inv, root := clitest.New(t, "templates", "presets", "list", updatedTemplate.Name, "--template-version", version.Name)
+		clitest.SetupConfig(t, member, root)
+
+		pty := ptytest.New(t).Attach(inv)
+		doneChan := make(chan struct{})
+		var runErr error
+		go func() {
+			defer close(doneChan)
+			runErr = inv.Run()
+		}()
+
+		<-doneChan
+		require.NoError(t, runErr)
+
+		// Should: return the specified version's presets sorted by name
+		message := fmt.Sprintf("Showing presets for template %q and template version %q.", template.Name, version.Name)
+		pty.ExpectMatch(message)
+		pty.ExpectRegexMatch(`preset-default\s+k1=v2\s+true\s+0`)
+		// The parameter order is not guaranteed in the output, so we match both possible orders
+		pty.ExpectRegexMatch(`preset-multiple-params\s+(k1=v1,k2=v2)|(k2=v2,k1=v1)\s+false\s+-`)
+		pty.ExpectRegexMatch(`preset-prebuilds\s+\s+false\s+2`)
+	})
+}
+
+func templateWithPresets(presets []*proto.Preset) *echo.Responses {
+	return &echo.Responses{
+		Parse: echo.ParseComplete,
+		ProvisionPlan: []*proto.Response{
+			{
+				Type: &proto.Response_Plan{
+					Plan: &proto.PlanComplete{
+						Presets: presets,
+					},
+				},
+			},
+		},
+	}
+}
diff --git a/cli/templates.go b/cli/templates.go
index 4843ca89deeef..3eca3df99c10e 100644
--- a/cli/templates.go
+++ b/cli/templates.go
@@ -33,6 +33,7 @@ func (r *RootCmd) templates() *serpent.Command {
 			r.templateList(),
 			r.templatePush(),
 			r.templateVersions(),
+			r.templatePresets(),
 			r.templateDelete(),
 			r.templatePull(),
 			r.archiveTemplateVersions(),
diff --git a/cli/testdata/coder_templates_--help.golden b/cli/testdata/coder_templates_--help.golden
index a198a6772313f..2c09f2951d999 100644
--- a/cli/testdata/coder_templates_--help.golden
+++ b/cli/testdata/coder_templates_--help.golden
@@ -23,6 +23,7 @@ SUBCOMMANDS:
     edit        Edit the metadata of a template by name.
     init        Get started with a templated template.
     list        List all the templates available for the organization
+    presets     Manage presets of the specified template
     pull        Download the active, latest, or specified version of a template
                 to a path.
     push        Create or update a template from the current directory or as
diff --git a/cli/testdata/coder_templates_presets_--help.golden b/cli/testdata/coder_templates_presets_--help.golden
new file mode 100644
index 0000000000000..0aad71383edd4
--- /dev/null
+++ b/cli/testdata/coder_templates_presets_--help.golden
@@ -0,0 +1,24 @@
+coder v0.0.0-devel
+
+USAGE:
+  coder templates presets
+
+  Manage presets of the specified template
+
+  Aliases: preset
+
+    - List presets for the active version of a template:
+  
+       $ coder templates presets list my-template
+  
+    - List presets for a specific version of a template:
+  
+       $ coder templates presets list my-template --template-version
+  my-template-version
+
+SUBCOMMANDS:
+    list    List all presets of the specified template. Defaults to the active
+            template version.
+
+———
+Run `coder --help` for a list of global options.
diff --git a/cli/testdata/coder_templates_presets_list_--help.golden b/cli/testdata/coder_templates_presets_list_--help.golden
new file mode 100644
index 0000000000000..81445df03cc97
--- /dev/null
+++ b/cli/testdata/coder_templates_presets_list_--help.golden
@@ -0,0 +1,24 @@
+coder v0.0.0-devel
+
+USAGE:
+  coder templates presets list [flags] <template>
+
+  List all presets of the specified template. Defaults to the active template
+  version.
+
+OPTIONS:
+  -O, --org string, $CODER_ORGANIZATION
+          Select which organization (uuid or name) to use.
+
+  -c, --column [name|parameters|default|desired prebuild instances] (default: name,parameters,default,desired prebuild instances)
+          Columns to display in table output.
+
+  -o, --output table|json (default: table)
+          Output format.
+
+      --template-version string
+          Specify a template version to list presets for. Defaults to the active
+          version.
+
+———
+Run `coder --help` for a list of global options.
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
index db44c2d2fb8a3..3192860d6a0ca 100644
--- a/coderd/apidoc/docs.go
+++ b/coderd/apidoc/docs.go
@@ -14880,6 +14880,9 @@ const docTemplate = `{
                 "default": {
                     "type": "boolean"
                 },
+                "desiredPrebuildInstances": {
+                    "type": "integer"
+                },
                 "id": {
                     "type": "string"
                 },
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
index c4164d9dc4ed1..26ee0c0cd05e4 100644
--- a/coderd/apidoc/swagger.json
+++ b/coderd/apidoc/swagger.json
@@ -13487,6 +13487,9 @@
 				"default": {
 					"type": "boolean"
 				},
+				"desiredPrebuildInstances": {
+					"type": "integer"
+				},
 				"id": {
 					"type": "string"
 				},
diff --git a/coderd/presets.go b/coderd/presets.go
index 151a1e7d5a904..c8d84baec4bf3 100644
--- a/coderd/presets.go
+++ b/coderd/presets.go
@@ -1,6 +1,7 @@
 package coderd
 
 import (
+	"database/sql"
 	"net/http"
 
 	"github.com/coder/coder/v2/coderd/httpapi"
@@ -38,12 +39,21 @@ func (api *API) templateVersionPresets(rw http.ResponseWriter, r *http.Request)
 		return
 	}
 
+	convertPrebuildInstances := func(desiredInstances sql.NullInt32) *int {
+		if desiredInstances.Valid {
+			value := int(desiredInstances.Int32)
+			return &value
+		}
+		return nil
+	}
+
 	var res []codersdk.Preset
 	for _, preset := range presets {
 		sdkPreset := codersdk.Preset{
-			ID:      preset.ID,
-			Name:    preset.Name,
-			Default: preset.IsDefault,
+			ID:                       preset.ID,
+			Name:                     preset.Name,
+			Default:                  preset.IsDefault,
+			DesiredPrebuildInstances: convertPrebuildInstances(preset.DesiredInstances),
 		}
 		for _, presetParam := range presetParams {
 			if presetParam.TemplateVersionPresetID != preset.ID {
diff --git a/codersdk/presets.go b/codersdk/presets.go
index 60253d6595c51..2d94aa3baabb6 100644
--- a/codersdk/presets.go
+++ b/codersdk/presets.go
@@ -11,10 +11,11 @@ import (
 )
 
 type Preset struct {
-	ID         uuid.UUID
-	Name       string
-	Parameters []PresetParameter
-	Default    bool
+	ID                       uuid.UUID
+	Name                     string
+	Parameters               []PresetParameter
+	Default                  bool
+	DesiredPrebuildInstances *int
 }
 
 type PresetParameter struct {
diff --git a/docs/manifest.json b/docs/manifest.json
index c4af214212dde..0305105c029fd 100644
--- a/docs/manifest.json
+++ b/docs/manifest.json
@@ -1651,6 +1651,16 @@
 							"description": "List all the templates available for the organization",
 							"path": "reference/cli/templates_list.md"
 						},
+						{
+							"title": "templates presets",
+							"description": "Manage presets of the specified template",
+							"path": "reference/cli/templates_presets.md"
+						},
+						{
+							"title": "templates presets list",
+							"description": "List all presets of the specified template. Defaults to the active template version.",
+							"path": "reference/cli/templates_presets_list.md"
+						},
 						{
 							"title": "templates pull",
 							"description": "Download the active, latest, or specified version of a template to a path.",
diff --git a/docs/reference/api/schemas.md b/docs/reference/api/schemas.md
index c8f1c37b45b53..8370233d2bdd5 100644
--- a/docs/reference/api/schemas.md
+++ b/docs/reference/api/schemas.md
@@ -5513,6 +5513,7 @@ Only certain features set these fields: - FeatureManagedAgentLimit|
 ```json
 {
   "default": true,
+  "desiredPrebuildInstances": 0,
   "id": "string",
   "name": "string",
   "parameters": [
@@ -5526,12 +5527,13 @@ Only certain features set these fields: - FeatureManagedAgentLimit|
 
 ### Properties
 
-| Name         | Type                                                          | Required | Restrictions | Description |
-|--------------|---------------------------------------------------------------|----------|--------------|-------------|
-| `default`    | boolean                                                       | false    |              |             |
-| `id`         | string                                                        | false    |              |             |
-| `name`       | string                                                        | false    |              |             |
-| `parameters` | array of [codersdk.PresetParameter](#codersdkpresetparameter) | false    |              |             |
+| Name                       | Type                                                          | Required | Restrictions | Description |
+|----------------------------|---------------------------------------------------------------|----------|--------------|-------------|
+| `default`                  | boolean                                                       | false    |              |             |
+| `desiredPrebuildInstances` | integer                                                       | false    |              |             |
+| `id`                       | string                                                        | false    |              |             |
+| `name`                     | string                                                        | false    |              |             |
+| `parameters`               | array of [codersdk.PresetParameter](#codersdkpresetparameter) | false    |              |             |
 
 ## codersdk.PresetParameter
 
diff --git a/docs/reference/api/templates.md b/docs/reference/api/templates.md
index 4c21b3644be2d..8d84623a15c8e 100644
--- a/docs/reference/api/templates.md
+++ b/docs/reference/api/templates.md
@@ -2914,6 +2914,7 @@ curl -X GET http://coder-server:8080/api/v2/templateversions/{templateversion}/p
 [
   {
     "default": true,
+    "desiredPrebuildInstances": 0,
     "id": "string",
     "name": "string",
     "parameters": [
@@ -2936,15 +2937,16 @@ curl -X GET http://coder-server:8080/api/v2/templateversions/{templateversion}/p
 
 Status Code **200**
 
-| Name           | Type    | Required | Restrictions | Description |
-|----------------|---------|----------|--------------|-------------|
-| `[array item]` | array   | false    |              |             |
-| `» default`    | boolean | false    |              |             |
-| `» id`         | string  | false    |              |             |
-| `» name`       | string  | false    |              |             |
-| `» parameters` | array   | false    |              |             |
-| `»» name`      | string  | false    |              |             |
-| `»» value`     | string  | false    |              |             |
+| Name                         | Type    | Required | Restrictions | Description |
+|------------------------------|---------|----------|--------------|-------------|
+| `[array item]`               | array   | false    |              |             |
+| `» default`                  | boolean | false    |              |             |
+| `» desiredPrebuildInstances` | integer | false    |              |             |
+| `» id`                       | string  | false    |              |             |
+| `» name`                     | string  | false    |              |             |
+| `» parameters`               | array   | false    |              |             |
+| `»» name`                    | string  | false    |              |             |
+| `»» value`                   | string  | false    |              |             |
 
 To perform this operation, you must be authenticated. [Learn more](authentication.md).
 
diff --git a/docs/reference/cli/templates.md b/docs/reference/cli/templates.md
index 99052aa6c3e20..e1141f5db8571 100644
--- a/docs/reference/cli/templates.md
+++ b/docs/reference/cli/templates.md
@@ -33,6 +33,7 @@ workspaces:
 | [<code>list</code>](./templates_list.md)         | List all the templates available for the organization                            |
 | [<code>push</code>](./templates_push.md)         | Create or update a template from the current directory or as specified by flag   |
 | [<code>versions</code>](./templates_versions.md) | Manage different versions of the specified template                              |
+| [<code>presets</code>](./templates_presets.md)   | Manage presets of the specified template                                         |
 | [<code>delete</code>](./templates_delete.md)     | Delete templates                                                                 |
 | [<code>pull</code>](./templates_pull.md)         | Download the active, latest, or specified version of a template to a path.       |
 | [<code>archive</code>](./templates_archive.md)   | Archive unused or failed template versions from a given template(s)              |
diff --git a/docs/reference/cli/templates_presets.md b/docs/reference/cli/templates_presets.md
new file mode 100644
index 0000000000000..a03f206366f20
--- /dev/null
+++ b/docs/reference/cli/templates_presets.md
@@ -0,0 +1,32 @@
+<!-- DO NOT EDIT | GENERATED CONTENT -->
+# templates presets
+
+Manage presets of the specified template
+
+Aliases:
+
+* preset
+
+## Usage
+
+```console
+coder templates presets
+```
+
+## Description
+
+```console
+  - List presets for the active version of a template:
+
+     $ coder templates presets list my-template
+
+  - List presets for a specific version of a template:
+
+     $ coder templates presets list my-template --template-version my-template-version
+```
+
+## Subcommands
+
+| Name                                             | Purpose                                                                              |
+|--------------------------------------------------|--------------------------------------------------------------------------------------|
+| [<code>list</code>](./templates_presets_list.md) | List all presets of the specified template. Defaults to the active template version. |
diff --git a/docs/reference/cli/templates_presets_list.md b/docs/reference/cli/templates_presets_list.md
new file mode 100644
index 0000000000000..69dd12faadc7b
--- /dev/null
+++ b/docs/reference/cli/templates_presets_list.md
@@ -0,0 +1,47 @@
+<!-- DO NOT EDIT | GENERATED CONTENT -->
+# templates presets list
+
+List all presets of the specified template. Defaults to the active template version.
+
+## Usage
+
+```console
+coder templates presets list [flags] <template>
+```
+
+## Options
+
+### --template-version
+
+|      |                     |
+|------|---------------------|
+| Type | <code>string</code> |
+
+Specify a template version to list presets for. Defaults to the active version.
+
+### -O, --org
+
+|             |                                  |
+|-------------|----------------------------------|
+| Type        | <code>string</code>              |
+| Environment | <code>$CODER_ORGANIZATION</code> |
+
+Select which organization (uuid or name) to use.
+
+### -c, --column
+
+|         |                                                                      |
+|---------|----------------------------------------------------------------------|
+| Type    | <code>[name\|parameters\|default\|desired prebuild instances]</code> |
+| Default | <code>name,parameters,default,desired prebuild instances</code>      |
+
+Columns to display in table output.
+
+### -o, --output
+
+|         |                          |
+|---------|--------------------------|
+| Type    | <code>table\|json</code> |
+| Default | <code>table</code>       |
+
+Output format.
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
index 421cf0872a6b9..412fb1e7f0a8c 100644
--- a/site/src/api/typesGenerated.ts
+++ b/site/src/api/typesGenerated.ts
@@ -1997,6 +1997,7 @@ export interface Preset {
 	readonly Name: string;
 	readonly Parameters: readonly PresetParameter[];
 	readonly Default: boolean;
+	readonly DesiredPrebuildInstances: number | null;
 }
 
 // From codersdk/presets.go
diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.stories.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.stories.tsx
index d061b604f6b42..3e3f58f00f58c 100644
--- a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.stories.tsx
+++ b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.stories.tsx
@@ -133,6 +133,7 @@ export const PresetsButNoneSelected: Story = {
 						Value: "preset 1 override",
 					},
 				],
+				DesiredPrebuildInstances: null,
 			},
 			{
 				ID: "preset-2",
@@ -144,6 +145,7 @@ export const PresetsButNoneSelected: Story = {
 						Value: "42",
 					},
 				],
+				DesiredPrebuildInstances: null,
 			},
 		],
 		parameters: [
@@ -257,6 +259,7 @@ export const PresetsWithDefault: Story = {
 						Value: "preset 1 override",
 					},
 				],
+				DesiredPrebuildInstances: null,
 			},
 			{
 				ID: "preset-2",
@@ -268,6 +271,7 @@ export const PresetsWithDefault: Story = {
 						Value: "150189",
 					},
 				],
+				DesiredPrebuildInstances: null,
 			},
 		],
 		parameters: [

From 5c31b983e5a3b05d2b5429412eef9513f4d9c5dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=82=B1=E3=82=A4=E3=83=A9?= <mckayla@hey.com>
Date: Thu, 24 Jul 2025 09:48:05 -0600
Subject: [PATCH 2/4] chore: update logo in index.html (#19017)

---
 site/index.html | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/site/index.html b/site/index.html
index e3a5389efbdd0..3b2c5083ecb95 100644
--- a/site/index.html
+++ b/site/index.html
@@ -1,11 +1,13 @@
 <!doctype html>
 
 <!--
-    ▄█▀    ▀█▄
-     ▄▄ ▀▀▀  █▌   ██▀▀█▄          ▐█
- ▄▄██▀▀█▄▄▄  ██  ██      █▀▀█ ▐█▀▀██ ▄█▀▀█ █▀▀
-█▌   ▄▌   ▐█ █▌  ▀█▄▄▄█▌ █  █ ▐█  ██ ██▀▀  █
-     ██████▀▄█    ▀▀▀▀   ▀▀▀▀  ▀▀▀▀▀  ▀▀▀▀ ▀
+      -#######          +######-      ########+       ##########  ########+.      ###########
+   +#####--######    +#####--#####+   ############    ##########  ####+++#####-   ###########
+  ####-      -####  ####-      #####  ####     ####+  ####        ####    .####   ###########
+ .####              ####        ####  ####      ####  #########   ####...+##+     ###########
+  ####.      .####  ####       +####  ####     +####  ####        ####+#######    ###########
+   #####-  -#####    ######..######   ############-   ##########  ####    #####   ###########
+     .########+        -########.     #########+      ##########  ####    .####   ###########
   -->
 
 <head>

From 9a05a8a28a6b36468db2ba70354c8eeeacca8574 Mon Sep 17 00:00:00 2001
From: Cian Johnston <cian@coder.com>
Date: Thu, 24 Jul 2025 20:19:33 +0100
Subject: [PATCH 3/4] feat: add preset selector in TasksPage (#19012)

* Adds a preset selector in TasksPage with the default preset pre-selected and at the top of the list.
* If no default preset exists, the user is prompted to select one.
* If a preset defines an AI Prompt, it will override the textarea.
---
 .../src/pages/TasksPage/TasksPage.stories.tsx | 145 ++++++++-----
 site/src/pages/TasksPage/TasksPage.tsx        | 205 +++++++++++++++---
 site/src/testHelpers/entities.ts              | 103 +++++++++
 3 files changed, 364 insertions(+), 89 deletions(-)

diff --git a/site/src/pages/TasksPage/TasksPage.stories.tsx b/site/src/pages/TasksPage/TasksPage.stories.tsx
index 1b1770f586768..0bdc9d27a7eed 100644
--- a/site/src/pages/TasksPage/TasksPage.stories.tsx
+++ b/site/src/pages/TasksPage/TasksPage.stories.tsx
@@ -4,12 +4,14 @@ import { API } from "api/api";
 import { MockUsers } from "pages/UsersPage/storybookData/users";
 import { reactRouterParameters } from "storybook-addon-remix-react-router";
 import {
+	MockAIPromptPresets,
+	MockNewTaskData,
+	MockPresets,
+	MockTasks,
 	MockTemplate,
 	MockTemplateVersionExternalAuthGithub,
 	MockTemplateVersionExternalAuthGithubAuthenticated,
 	MockUserOwner,
-	MockWorkspace,
-	MockWorkspaceAppStatus,
 	mockApiError,
 } from "testHelpers/entities";
 import {
@@ -31,6 +33,7 @@ const meta: Meta<typeof TasksPage> = {
 	},
 	beforeEach: () => {
 		spyOn(API, "getTemplateVersionExternalAuth").mockResolvedValue([]);
+		spyOn(API, "getTemplateVersionPresets").mockResolvedValue(null);
 		spyOn(API, "getUsers").mockResolvedValue({
 			users: MockUsers,
 			count: MockUsers.length,
@@ -53,7 +56,7 @@ type Story = StoryObj<typeof TasksPage>;
 export const LoadingAITemplates: Story = {
 	beforeEach: () => {
 		spyOn(data, "fetchAITemplates").mockImplementation(
-			() => new Promise((res) => 1000 * 60 * 60),
+			() => new Promise(() => 1000 * 60 * 60),
 		);
 	},
 };
@@ -79,7 +82,7 @@ export const LoadingTasks: Story = {
 	beforeEach: () => {
 		spyOn(data, "fetchAITemplates").mockResolvedValue([MockTemplate]);
 		spyOn(data, "fetchTasks").mockImplementation(
-			() => new Promise((res) => 1000 * 60 * 60),
+			() => new Promise(() => 1000 * 60 * 60),
 		);
 	},
 	play: async ({ canvasElement, step }) => {
@@ -119,15 +122,77 @@ export const LoadedTasks: Story = {
 	},
 };
 
-const newTaskData = {
-	prompt: "Create a new task",
-	workspace: {
-		...MockWorkspace,
-		id: "workspace-4",
-		latest_app_status: {
-			...MockWorkspaceAppStatus,
-			message: "Task created successfully!",
-		},
+export const LoadedTasksWithPresets: Story = {
+	decorators: [withProxyProvider()],
+	beforeEach: () => {
+		const mockTemplateWithPresets = {
+			...MockTemplate,
+			id: "test-template-2",
+			name: "template-with-presets",
+			display_name: "Template with Presets",
+		};
+
+		spyOn(data, "fetchAITemplates").mockResolvedValue([
+			MockTemplate,
+			mockTemplateWithPresets,
+		]);
+		spyOn(data, "fetchTasks").mockResolvedValue(MockTasks);
+		spyOn(API, "getTemplateVersionPresets").mockImplementation(
+			async (versionId) => {
+				// Return presets only for the second template
+				if (versionId === mockTemplateWithPresets.active_version_id) {
+					return MockPresets;
+				}
+				return null;
+			},
+		);
+	},
+};
+
+export const LoadedTasksWithAIPromptPresets: Story = {
+	decorators: [withProxyProvider()],
+	beforeEach: () => {
+		const mockTemplateWithPresets = {
+			...MockTemplate,
+			id: "test-template-2",
+			name: "template-with-presets",
+			display_name: "Template with AI Prompt Presets",
+		};
+
+		spyOn(data, "fetchAITemplates").mockResolvedValue([
+			MockTemplate,
+			mockTemplateWithPresets,
+		]);
+		spyOn(data, "fetchTasks").mockResolvedValue(MockTasks);
+		spyOn(API, "getTemplateVersionPresets").mockImplementation(
+			async (versionId) => {
+				// Return presets only for the second template
+				if (versionId === mockTemplateWithPresets.active_version_id) {
+					return MockAIPromptPresets;
+				}
+				return null;
+			},
+		);
+	},
+};
+
+export const LoadedTasksEdgeCases: Story = {
+	decorators: [withProxyProvider()],
+	beforeEach: () => {
+		spyOn(data, "fetchAITemplates").mockResolvedValue([MockTemplate]);
+		spyOn(data, "fetchTasks").mockResolvedValue(MockTasks);
+
+		// Test various edge cases for presets
+		spyOn(API, "getTemplateVersionPresets").mockImplementation(async () => {
+			return [
+				{
+					ID: "malformed",
+					Name: "Malformed Preset",
+					Default: true,
+				},
+				// biome-ignore lint/suspicious/noExplicitAny: Testing malformed data edge cases
+			] as any;
+		});
 	},
 };
 
@@ -154,15 +219,15 @@ export const CreateTaskSuccessfully: Story = {
 		spyOn(data, "fetchAITemplates").mockResolvedValue([MockTemplate]);
 		spyOn(data, "fetchTasks")
 			.mockResolvedValueOnce(MockTasks)
-			.mockResolvedValue([newTaskData, ...MockTasks]);
-		spyOn(data, "createTask").mockResolvedValue(newTaskData);
+			.mockResolvedValue([MockNewTaskData, ...MockTasks]);
+		spyOn(data, "createTask").mockResolvedValue(MockNewTaskData);
 	},
 	play: async ({ canvasElement, step }) => {
 		const canvas = within(canvasElement);
 
 		await step("Run task", async () => {
 			const prompt = await canvas.findByLabelText(/prompt/i);
-			await userEvent.type(prompt, newTaskData.prompt);
+			await userEvent.type(prompt, MockNewTaskData.prompt);
 			const submitButton = canvas.getByRole("button", { name: /run task/i });
 			await waitFor(() => expect(submitButton).toBeEnabled());
 			await userEvent.click(submitButton);
@@ -208,8 +273,8 @@ export const WithAuthenticatedExternalAuth: Story = {
 	beforeEach: () => {
 		spyOn(data, "fetchTasks")
 			.mockResolvedValueOnce(MockTasks)
-			.mockResolvedValue([newTaskData, ...MockTasks]);
-		spyOn(data, "createTask").mockResolvedValue(newTaskData);
+			.mockResolvedValue([MockNewTaskData, ...MockTasks]);
+		spyOn(data, "createTask").mockResolvedValue(MockNewTaskData);
 		spyOn(API, "getTemplateVersionExternalAuth").mockResolvedValue([
 			MockTemplateVersionExternalAuthGithubAuthenticated,
 		]);
@@ -235,8 +300,8 @@ export const MissingExternalAuth: Story = {
 	beforeEach: () => {
 		spyOn(data, "fetchTasks")
 			.mockResolvedValueOnce(MockTasks)
-			.mockResolvedValue([newTaskData, ...MockTasks]);
-		spyOn(data, "createTask").mockResolvedValue(newTaskData);
+			.mockResolvedValue([MockNewTaskData, ...MockTasks]);
+		spyOn(data, "createTask").mockResolvedValue(MockNewTaskData);
 		spyOn(API, "getTemplateVersionExternalAuth").mockResolvedValue([
 			MockTemplateVersionExternalAuthGithub,
 		]);
@@ -246,7 +311,7 @@ export const MissingExternalAuth: Story = {
 
 		await step("Submit is disabled", async () => {
 			const prompt = await canvas.findByLabelText(/prompt/i);
-			await userEvent.type(prompt, newTaskData.prompt);
+			await userEvent.type(prompt, MockNewTaskData.prompt);
 			const submitButton = canvas.getByRole("button", { name: /run task/i });
 			expect(submitButton).toBeDisabled();
 		});
@@ -262,8 +327,8 @@ export const ExternalAuthError: Story = {
 	beforeEach: () => {
 		spyOn(data, "fetchTasks")
 			.mockResolvedValueOnce(MockTasks)
-			.mockResolvedValue([newTaskData, ...MockTasks]);
-		spyOn(data, "createTask").mockResolvedValue(newTaskData);
+			.mockResolvedValue([MockNewTaskData, ...MockTasks]);
+		spyOn(data, "createTask").mockResolvedValue(MockNewTaskData);
 		spyOn(API, "getTemplateVersionExternalAuth").mockRejectedValue(
 			mockApiError({
 				message: "Failed to load external auth",
@@ -275,7 +340,7 @@ export const ExternalAuthError: Story = {
 
 		await step("Submit is disabled", async () => {
 			const prompt = await canvas.findByLabelText(/prompt/i);
-			await userEvent.type(prompt, newTaskData.prompt);
+			await userEvent.type(prompt, MockNewTaskData.prompt);
 			const submitButton = canvas.getByRole("button", { name: /run task/i });
 			expect(submitButton).toBeDisabled();
 		});
@@ -308,35 +373,3 @@ export const NonAdmin: Story = {
 		});
 	},
 };
-
-const MockTasks = [
-	{
-		workspace: {
-			...MockWorkspace,
-			latest_app_status: MockWorkspaceAppStatus,
-		},
-		prompt: "Create competitors page",
-	},
-	{
-		workspace: {
-			...MockWorkspace,
-			id: "workspace-2",
-			latest_app_status: {
-				...MockWorkspaceAppStatus,
-				message: "Avatar size fixed!",
-			},
-		},
-		prompt: "Fix user avatar size",
-	},
-	{
-		workspace: {
-			...MockWorkspace,
-			id: "workspace-3",
-			latest_app_status: {
-				...MockWorkspaceAppStatus,
-				message: "Accessibility issues fixed!",
-			},
-		},
-		prompt: "Fix accessibility issues",
-	},
-];
diff --git a/site/src/pages/TasksPage/TasksPage.tsx b/site/src/pages/TasksPage/TasksPage.tsx
index d678098affd17..4866dbfb49222 100644
--- a/site/src/pages/TasksPage/TasksPage.tsx
+++ b/site/src/pages/TasksPage/TasksPage.tsx
@@ -2,7 +2,11 @@ import Skeleton from "@mui/material/Skeleton";
 import { API } from "api/api";
 import { getErrorDetail, getErrorMessage } from "api/errors";
 import { disabledRefetchOptions } from "api/queries/util";
-import type { Template, TemplateVersionExternalAuth } from "api/typesGenerated";
+import type {
+	Preset,
+	Template,
+	TemplateVersionExternalAuth,
+} from "api/typesGenerated";
 import { ErrorAlert } from "components/Alert/ErrorAlert";
 import { Avatar } from "components/Avatar/Avatar";
 import { AvatarData } from "components/Avatar/AvatarData";
@@ -36,6 +40,7 @@ import {
 	TableRowSkeleton,
 } from "components/TableLoader/TableLoader";
 
+import { templateVersionPresets } from "api/queries/templates";
 import { ExternalImage } from "components/ExternalImage/ExternalImage";
 import { FeatureStageBadge } from "components/FeatureStageBadge/FeatureStageBadge";
 import {
@@ -50,7 +55,7 @@ import { RedoIcon, RotateCcwIcon, SendIcon } from "lucide-react";
 import { AI_PROMPT_PARAMETER_NAME, type Task } from "modules/tasks/tasks";
 import { WorkspaceAppStatus } from "modules/workspaces/WorkspaceAppStatus/WorkspaceAppStatus";
 import { generateWorkspaceName } from "modules/workspaces/generateWorkspaceName";
-import { type FC, type ReactNode, useState } from "react";
+import { type FC, type ReactNode, useEffect, useState } from "react";
 import { Helmet } from "react-helmet-async";
 import { useMutation, useQuery, useQueryClient } from "react-query";
 import { Link as RouterLink, useNavigate } from "react-router-dom";
@@ -210,7 +215,11 @@ const TaskFormSection: FC<{
 	);
 };
 
-type CreateTaskMutationFnProps = { prompt: string; templateVersionId: string };
+type CreateTaskMutationFnProps = {
+	prompt: string;
+	templateVersionId: string;
+	presetId: string | null;
+};
 
 type TaskFormProps = {
 	templates: Template[];
@@ -223,15 +232,49 @@ const TaskForm: FC<TaskFormProps> = ({ templates, onSuccess }) => {
 	const [selectedTemplateId, setSelectedTemplateId] = useState<string>(
 		templates[0].id,
 	);
+	const [selectedPresetId, setSelectedPresetId] = useState<string | null>(null);
 	const selectedTemplate = templates.find(
 		(t) => t.id === selectedTemplateId,
 	) as Template;
+
 	const {
 		externalAuth,
 		externalAuthError,
 		isPollingExternalAuth,
 		isLoadingExternalAuth,
 	} = useExternalAuth(selectedTemplate.active_version_id);
+
+	// Fetch presets when template changes
+	const { data: presetsData, isLoading: isLoadingPresets } = useQuery<
+		Preset[] | null,
+		Error
+	>(templateVersionPresets(selectedTemplate.active_version_id));
+
+	// Handle preset selection when data changes
+	useEffect(() => {
+		if (presetsData === undefined) {
+			// Still loading
+			return;
+		}
+
+		if (!presetsData || presetsData.length === 0) {
+			setSelectedPresetId(null);
+			return;
+		}
+
+		// Always select the default preset when new data arrives
+		const defaultPreset = presetsData.find((p: Preset) => p.Default);
+		const defaultPresetID = defaultPreset?.ID || null;
+		setSelectedPresetId(defaultPresetID);
+	}, [presetsData]);
+
+	// Extract AI prompt from selected preset
+	const selectedPreset = presetsData?.find((p) => p.ID === selectedPresetId);
+	const presetAIPrompt = selectedPreset?.Parameters?.find(
+		(param) => param.Name === AI_PROMPT_PARAMETER_NAME,
+	)?.Value;
+	const isPromptReadOnly = !!presetAIPrompt;
+
 	const missedExternalAuth = externalAuth?.filter(
 		(auth) => !auth.optional && !auth.authenticated,
 	);
@@ -243,8 +286,9 @@ const TaskForm: FC<TaskFormProps> = ({ templates, onSuccess }) => {
 		mutationFn: async ({
 			prompt,
 			templateVersionId,
+			presetId,
 		}: CreateTaskMutationFnProps) =>
-			data.createTask(prompt, user.id, templateVersionId),
+			data.createTask(prompt, user.id, templateVersionId, presetId),
 		onSuccess: async (task) => {
 			await queryClient.invalidateQueries({
 				queryKey: ["tasks"],
@@ -258,13 +302,13 @@ const TaskForm: FC<TaskFormProps> = ({ templates, onSuccess }) => {
 
 		const form = e.currentTarget;
 		const formData = new FormData(form);
-		const prompt = formData.get("prompt") as string;
-		const templateID = formData.get("templateID") as string;
+		const prompt = presetAIPrompt || (formData.get("prompt") as string);
 
 		try {
 			await createTaskMutation.mutateAsync({
 				prompt,
 				templateVersionId: selectedTemplate.active_version_id,
+				presetId: selectedPresetId,
 			});
 		} catch (error) {
 			const message = getErrorMessage(error, "Error creating task");
@@ -285,39 +329,113 @@ const TaskForm: FC<TaskFormProps> = ({ templates, onSuccess }) => {
 				className="border border-border border-solid rounded-lg p-4"
 				disabled={createTaskMutation.isPending}
 			>
-				<label htmlFor="prompt" className="sr-only">
-					Prompt
+				<label
+					htmlFor="prompt"
+					className={
+						isPromptReadOnly
+							? "text-xs font-medium text-content-primary mb-2 block"
+							: "sr-only"
+					}
+				>
+					{isPromptReadOnly ? "Prompt defined by preset" : "Prompt"}
 				</label>
 				<TextareaAutosize
 					required
 					id="prompt"
 					name="prompt"
+					value={presetAIPrompt || undefined}
+					readOnly={isPromptReadOnly}
 					placeholder={textareaPlaceholder}
 					className={`border-0 resize-none w-full h-full bg-transparent rounded-lg outline-none flex min-h-[60px]
-						text-sm shadow-sm text-content-primary placeholder:text-content-secondary md:text-sm`}
+						text-sm shadow-sm text-content-primary placeholder:text-content-secondary md:text-sm ${
+							isPromptReadOnly ? "opacity-60 cursor-not-allowed" : ""
+						}`}
 				/>
 				<div className="flex items-center justify-between pt-2">
-					<Select
-						name="templateID"
-						onValueChange={(value) => setSelectedTemplateId(value)}
-						defaultValue={templates[0].id}
-						required
-					>
-						<SelectTrigger className="w-52 text-xs [&_svg]:size-icon-xs border-0 bg-surface-secondary h-8 px-3">
-							<SelectValue placeholder="Select a template" />
-						</SelectTrigger>
-						<SelectContent>
-							{templates.map((template) => {
-								return (
-									<SelectItem value={template.id} key={template.id}>
-										<span className="overflow-hidden text-ellipsis block">
-											{template.display_name || template.name}
-										</span>
-									</SelectItem>
-								);
-							})}
-						</SelectContent>
-					</Select>
+					<div className="flex items-center gap-4">
+						<div className="flex flex-col gap-1">
+							<label
+								htmlFor="templateID"
+								className="text-xs font-medium text-content-primary"
+							>
+								Template
+							</label>
+							<Select
+								name="templateID"
+								onValueChange={(value) => setSelectedTemplateId(value)}
+								defaultValue={templates[0].id}
+								required
+							>
+								<SelectTrigger
+									id="templateID"
+									className="w-80 text-xs [&_svg]:size-icon-xs border-0 bg-surface-secondary h-8 px-3"
+								>
+									<SelectValue placeholder="Select a template" />
+								</SelectTrigger>
+								<SelectContent>
+									{templates.map((template) => {
+										return (
+											<SelectItem value={template.id} key={template.id}>
+												<span className="overflow-hidden text-ellipsis block">
+													{template.display_name || template.name}
+												</span>
+											</SelectItem>
+										);
+									})}
+								</SelectContent>
+							</Select>
+						</div>
+
+						<div className="flex flex-col gap-1">
+							<label
+								htmlFor="presetID"
+								className="text-xs font-medium text-content-primary"
+							>
+								Preset
+							</label>
+							{isLoadingPresets ? (
+								<Skeleton variant="rounded" width={320} height={32} />
+							) : (
+								<Select
+									key={`preset-select-${selectedTemplate.active_version_id}`}
+									name="presetID"
+									value={selectedPresetId || undefined}
+									onValueChange={(value) => setSelectedPresetId(value || null)}
+									disabled={!presetsData || presetsData.length === 0}
+								>
+									<SelectTrigger
+										id="presetID"
+										className="w-80 text-xs [&_svg]:size-icon-xs border-0 bg-surface-secondary h-8 px-3"
+									>
+										<SelectValue
+											placeholder={
+												!presetsData || presetsData.length === 0
+													? "None"
+													: "Select a preset"
+											}
+										/>
+									</SelectTrigger>
+									<SelectContent>
+										{presetsData && presetsData.length > 0 ? (
+											sortedPresets(presetsData).map((preset) => (
+												<SelectItem value={preset.ID} key={preset.ID}>
+													<span className="overflow-hidden text-ellipsis block">
+														{preset.Name} {preset.Default && "(Default)"}
+													</span>
+												</SelectItem>
+											))
+										) : (
+											<SelectItem value="none" disabled>
+												<span className="overflow-hidden text-ellipsis block">
+													No presets available
+												</span>
+											</SelectItem>
+										)}
+									</SelectContent>
+								</Select>
+							)}
+						</div>
+					</div>
 
 					<div className="flex items-center gap-2">
 						{missedExternalAuth && (
@@ -608,13 +726,22 @@ export const data = {
 		prompt: string,
 		userId: string,
 		templateVersionId: string,
+		presetId: string | null = null,
 	): Promise<Task> {
-		const presets = await API.getTemplateVersionPresets(templateVersionId);
-		const defaultPreset = presets?.find((p) => p.Default);
+		// If no preset is selected, get the default preset
+		let preset_id = presetId;
+		if (!preset_id) {
+			const presets = await API.getTemplateVersionPresets(templateVersionId);
+			const defaultPreset = presets?.find((p) => p.Default);
+			if (defaultPreset) {
+				preset_id = defaultPreset.ID;
+			}
+		}
+
 		const workspace = await API.createWorkspace(userId, {
 			name: `task-${generateWorkspaceName()}`,
 			template_version_id: templateVersionId,
-			template_version_preset_id: defaultPreset?.ID,
+			template_version_preset_id: preset_id || undefined,
 			rich_parameter_values: [
 				{ name: AI_PROMPT_PARAMETER_NAME, value: prompt },
 			],
@@ -627,4 +754,16 @@ export const data = {
 	},
 };
 
+// sortedPresets sorts presets with the default preset first,
+// followed by the rest sorted alphabetically by name ascending.
+const sortedPresets = (presets: Preset[]): Preset[] => {
+	return presets.sort((a, b) => {
+		// Default preset should come first
+		if (a.Default && !b.Default) return -1;
+		if (!a.Default && b.Default) return 1;
+		// Otherwise, sort alphabetically by name
+		return a.Name.localeCompare(b.Name);
+	});
+};
+
 export default TasksPage;
diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts
index 045d6ad06ddeb..14fbb2d2913af 100644
--- a/site/src/testHelpers/entities.ts
+++ b/site/src/testHelpers/entities.ts
@@ -4571,3 +4571,106 @@ export function createTimestamp(minuteOffset: number, secondOffset: number) {
 	baseDate.setSeconds(baseDate.getSeconds() + secondOffset);
 	return baseDate.toISOString();
 }
+
+// Mock Presets for AI Tasks
+export const MockPresets: TypesGen.Preset[] = [
+	{
+		ID: "preset-1",
+		Name: "Development",
+		Parameters: [
+			{ Name: "cpu", Value: "4" },
+			{ Name: "memory", Value: "8GB" },
+		],
+		Default: true,
+		DesiredPrebuildInstances: 0,
+	},
+	{
+		ID: "preset-2",
+		Name: "Testing",
+		Parameters: [
+			{ Name: "cpu", Value: "2" },
+			{ Name: "memory", Value: "4GB" },
+		],
+		Default: false,
+		DesiredPrebuildInstances: 0,
+	},
+	{
+		ID: "preset-3",
+		Name: "Production",
+		Parameters: [
+			{ Name: "cpu", Value: "8" },
+			{ Name: "memory", Value: "16GB" },
+		],
+		Default: false,
+		DesiredPrebuildInstances: 0,
+	},
+];
+
+export const MockAIPromptPresets: TypesGen.Preset[] = [
+	{
+		ID: "ai-preset-1",
+		Name: "Code Review",
+		Parameters: [
+			{ Name: "AI Prompt", Value: "Review the code for best practices" },
+			{ Name: "cpu", Value: "4" },
+			{ Name: "memory", Value: "8GB" },
+		],
+		Default: true,
+		DesiredPrebuildInstances: 0,
+	},
+	{
+		ID: "ai-preset-2",
+		Name: "Custom Prompt",
+		Parameters: [
+			{ Name: "cpu", Value: "4" },
+			{ Name: "memory", Value: "8GB" },
+		],
+		Default: false,
+		DesiredPrebuildInstances: 0,
+	},
+];
+
+// Mock Tasks for AI Tasks page
+export const MockTasks = [
+	{
+		workspace: {
+			...MockWorkspace,
+			latest_app_status: MockWorkspaceAppStatus,
+		},
+		prompt: "Create competitors page",
+	},
+	{
+		workspace: {
+			...MockWorkspace,
+			id: "workspace-2",
+			latest_app_status: {
+				...MockWorkspaceAppStatus,
+				message: "Avatar size fixed!",
+			},
+		},
+		prompt: "Fix user avatar size",
+	},
+	{
+		workspace: {
+			...MockWorkspace,
+			id: "workspace-3",
+			latest_app_status: {
+				...MockWorkspaceAppStatus,
+				message: "Accessibility issues fixed!",
+			},
+		},
+		prompt: "Fix accessibility issues",
+	},
+];
+
+export const MockNewTaskData = {
+	prompt: "Create a new task",
+	workspace: {
+		...MockWorkspace,
+		id: "workspace-4",
+		latest_app_status: {
+			...MockWorkspaceAppStatus,
+			message: "Task created successfully!",
+		},
+	},
+};

From 38755e204d037b392137eaaae877f5268a6b9a30 Mon Sep 17 00:00:00 2001
From: Steven Masley <Emyrk@users.noreply.github.com>
Date: Thu, 24 Jul 2025 14:52:03 -0500
Subject: [PATCH 4/4] chore: remove actDef function, had no value (#19019)

---
 coderd/rbac/policy/policy.go      | 252 ++++++++++++++----------------
 scripts/typegen/rbacobject.gotmpl |   2 +-
 2 files changed, 121 insertions(+), 133 deletions(-)

diff --git a/coderd/rbac/policy/policy.go b/coderd/rbac/policy/policy.go
index a10abfb9605ca..8f05bbdbe544f 100644
--- a/coderd/rbac/policy/policy.go
+++ b/coderd/rbac/policy/policy.go
@@ -40,39 +40,27 @@ type PermissionDefinition struct {
 	Comment string
 }
 
-type ActionDefinition struct {
-	// Human friendly description to explain the action.
-	Description string
-}
-
-func (d ActionDefinition) String() string {
-	return d.Description
-}
-
-func actDef(description string) ActionDefinition {
-	return ActionDefinition{
-		Description: description,
-	}
-}
+// Human friendly description to explain the action.
+type ActionDefinition string
 
 var workspaceActions = map[Action]ActionDefinition{
-	ActionCreate: actDef("create a new workspace"),
-	ActionRead:   actDef("read workspace data to view on the UI"),
+	ActionCreate: "create a new workspace",
+	ActionRead:   "read workspace data to view on the UI",
 	// TODO: Make updates more granular
-	ActionUpdate: actDef("edit workspace settings (scheduling, permissions, parameters)"),
-	ActionDelete: actDef("delete workspace"),
+	ActionUpdate: "edit workspace settings (scheduling, permissions, parameters)",
+	ActionDelete: "delete workspace",
 
 	// Workspace provisioning. Start & stop are different so dormant workspaces can be
 	// stopped, but not stared.
-	ActionWorkspaceStart: actDef("allows starting a workspace"),
-	ActionWorkspaceStop:  actDef("allows stopping a workspace"),
+	ActionWorkspaceStart: "allows starting a workspace",
+	ActionWorkspaceStop:  "allows stopping a workspace",
 
 	// Running a workspace
-	ActionSSH:                actDef("ssh into a given workspace"),
-	ActionApplicationConnect: actDef("connect to workspace apps via browser"),
+	ActionSSH:                "ssh into a given workspace",
+	ActionApplicationConnect: "connect to workspace apps via browser",
 
-	ActionCreateAgent: actDef("create a new workspace agent"),
-	ActionDeleteAgent: actDef("delete an existing workspace agent"),
+	ActionCreateAgent: "create a new workspace agent",
+	ActionDeleteAgent: "delete an existing workspace agent",
 }
 
 // RBACPermissions is indexed by the type
@@ -86,13 +74,13 @@ var RBACPermissions = map[string]PermissionDefinition{
 	"user": {
 		Actions: map[Action]ActionDefinition{
 			// Actions deal with site wide user objects.
-			ActionRead:   actDef("read user data"),
-			ActionCreate: actDef("create a new user"),
-			ActionUpdate: actDef("update an existing user"),
-			ActionDelete: actDef("delete an existing user"),
+			ActionRead:   "read user data",
+			ActionCreate: "create a new user",
+			ActionUpdate: "update an existing user",
+			ActionDelete: "delete an existing user",
 
-			ActionReadPersonal:   actDef("read personal user data like user settings and auth links"),
-			ActionUpdatePersonal: actDef("update personal data"),
+			ActionReadPersonal:   "read personal user data like user settings and auth links",
+			ActionUpdatePersonal: "update personal data",
 		},
 	},
 	"workspace": {
@@ -112,126 +100,126 @@ var RBACPermissions = map[string]PermissionDefinition{
 		// If the user lacks prebuilt_workspace update or delete permissions,
 		// the authorization will always fall back to the corresponding permissions on workspace.
 		Actions: map[Action]ActionDefinition{
-			ActionUpdate: actDef("update prebuilt workspace settings"),
-			ActionDelete: actDef("delete prebuilt workspace"),
+			ActionUpdate: "update prebuilt workspace settings",
+			ActionDelete: "delete prebuilt workspace",
 		},
 	},
 	"workspace_proxy": {
 		Actions: map[Action]ActionDefinition{
-			ActionCreate: actDef("create a workspace proxy"),
-			ActionDelete: actDef("delete a workspace proxy"),
-			ActionUpdate: actDef("update a workspace proxy"),
-			ActionRead:   actDef("read and use a workspace proxy"),
+			ActionCreate: "create a workspace proxy",
+			ActionDelete: "delete a workspace proxy",
+			ActionUpdate: "update a workspace proxy",
+			ActionRead:   "read and use a workspace proxy",
 		},
 	},
 	"license": {
 		Actions: map[Action]ActionDefinition{
-			ActionCreate: actDef("create a license"),
-			ActionRead:   actDef("read licenses"),
-			ActionDelete: actDef("delete license"),
+			ActionCreate: "create a license",
+			ActionRead:   "read licenses",
+			ActionDelete: "delete license",
 			// Licenses are immutable, so update makes no sense
 		},
 	},
 	"audit_log": {
 		Actions: map[Action]ActionDefinition{
-			ActionRead:   actDef("read audit logs"),
-			ActionCreate: actDef("create new audit log entries"),
+			ActionRead:   "read audit logs",
+			ActionCreate: "create new audit log entries",
 		},
 	},
 	"connection_log": {
 		Actions: map[Action]ActionDefinition{
-			ActionRead:   actDef("read connection logs"),
-			ActionUpdate: actDef("upsert connection log entries"),
+			ActionRead:   "read connection logs",
+			ActionUpdate: "upsert connection log entries",
 		},
 	},
 	"deployment_config": {
 		Actions: map[Action]ActionDefinition{
-			ActionRead:   actDef("read deployment config"),
-			ActionUpdate: actDef("updating health information"),
+			ActionRead:   "read deployment config",
+			ActionUpdate: "updating health information",
 		},
 	},
 	"deployment_stats": {
 		Actions: map[Action]ActionDefinition{
-			ActionRead: actDef("read deployment stats"),
+			ActionRead: "read deployment stats",
 		},
 	},
 	"replicas": {
 		Actions: map[Action]ActionDefinition{
-			ActionRead: actDef("read replicas"),
+			ActionRead: "read replicas",
 		},
 	},
 	"template": {
 		Actions: map[Action]ActionDefinition{
-			ActionCreate:       actDef("create a template"),
-			ActionUse:          actDef("use the template to initially create a workspace, then workspace lifecycle permissions take over"),
-			ActionRead:         actDef("read template"),
-			ActionUpdate:       actDef("update a template"),
-			ActionDelete:       actDef("delete a template"),
-			ActionViewInsights: actDef("view insights"),
+			ActionCreate:       "create a template",
+			ActionUse:          "use the template to initially create a workspace, then workspace lifecycle permissions take over",
+			ActionRead:         "read template",
+			ActionUpdate:       "update a template",
+			ActionDelete:       "delete a template",
+			ActionViewInsights: "view insights",
 		},
 	},
 	"group": {
 		Actions: map[Action]ActionDefinition{
-			ActionCreate: actDef("create a group"),
-			ActionRead:   actDef("read groups"),
-			ActionDelete: actDef("delete a group"),
-			ActionUpdate: actDef("update a group"),
+			ActionCreate: "create a group",
+			ActionRead:   "read groups",
+			ActionDelete: "delete a group",
+			ActionUpdate: "update a group",
 		},
 	},
 	"group_member": {
 		Actions: map[Action]ActionDefinition{
-			ActionRead: actDef("read group members"),
+			ActionRead: "read group members",
 		},
 	},
 	"file": {
 		Actions: map[Action]ActionDefinition{
-			ActionCreate: actDef("create a file"),
-			ActionRead:   actDef("read files"),
+			ActionCreate: "create a file",
+			ActionRead:   "read files",
 		},
 	},
 	"provisioner_daemon": {
 		Actions: map[Action]ActionDefinition{
-			ActionCreate: actDef("create a provisioner daemon/key"),
+			ActionCreate: "create a provisioner daemon/key",
 			// TODO: Move to use?
-			ActionRead:   actDef("read provisioner daemon"),
-			ActionUpdate: actDef("update a provisioner daemon"),
-			ActionDelete: actDef("delete a provisioner daemon/key"),
+			ActionRead:   "read provisioner daemon",
+			ActionUpdate: "update a provisioner daemon",
+			ActionDelete: "delete a provisioner daemon/key",
 		},
 	},
 	"provisioner_jobs": {
 		Actions: map[Action]ActionDefinition{
-			ActionRead:   actDef("read provisioner jobs"),
-			ActionUpdate: actDef("update provisioner jobs"),
-			ActionCreate: actDef("create provisioner jobs"),
+			ActionRead:   "read provisioner jobs",
+			ActionUpdate: "update provisioner jobs",
+			ActionCreate: "create provisioner jobs",
 		},
 	},
 	"organization": {
 		Actions: map[Action]ActionDefinition{
-			ActionCreate: actDef("create an organization"),
-			ActionRead:   actDef("read organizations"),
-			ActionUpdate: actDef("update an organization"),
-			ActionDelete: actDef("delete an organization"),
+			ActionCreate: "create an organization",
+			ActionRead:   "read organizations",
+			ActionUpdate: "update an organization",
+			ActionDelete: "delete an organization",
 		},
 	},
 	"organization_member": {
 		Actions: map[Action]ActionDefinition{
-			ActionCreate: actDef("create an organization member"),
-			ActionRead:   actDef("read member"),
-			ActionUpdate: actDef("update an organization member"),
-			ActionDelete: actDef("delete member"),
+			ActionCreate: "create an organization member",
+			ActionRead:   "read member",
+			ActionUpdate: "update an organization member",
+			ActionDelete: "delete member",
 		},
 	},
 	"debug_info": {
 		Actions: map[Action]ActionDefinition{
-			ActionRead: actDef("access to debug routes"),
+			ActionRead: "access to debug routes",
 		},
 	},
 	"system": {
 		Actions: map[Action]ActionDefinition{
-			ActionCreate: actDef("create system resources"),
-			ActionRead:   actDef("view system resources"),
-			ActionUpdate: actDef("update system resources"),
-			ActionDelete: actDef("delete system resources"),
+			ActionCreate: "create system resources",
+			ActionRead:   "view system resources",
+			ActionUpdate: "update system resources",
+			ActionDelete: "delete system resources",
 		},
 		Comment: `
 	// DEPRECATED: New resources should be created for new things, rather than adding them to System, which has become
@@ -240,119 +228,119 @@ var RBACPermissions = map[string]PermissionDefinition{
 	},
 	"api_key": {
 		Actions: map[Action]ActionDefinition{
-			ActionCreate: actDef("create an api key"),
-			ActionRead:   actDef("read api key details (secrets are not stored)"),
-			ActionDelete: actDef("delete an api key"),
-			ActionUpdate: actDef("update an api key, eg expires"),
+			ActionCreate: "create an api key",
+			ActionRead:   "read api key details (secrets are not stored)",
+			ActionDelete: "delete an api key",
+			ActionUpdate: "update an api key, eg expires",
 		},
 	},
 	"tailnet_coordinator": {
 		Actions: map[Action]ActionDefinition{
-			ActionCreate: actDef("create a Tailnet coordinator"),
-			ActionRead:   actDef("view info about a Tailnet coordinator"),
-			ActionUpdate: actDef("update a Tailnet coordinator"),
-			ActionDelete: actDef("delete a Tailnet coordinator"),
+			ActionCreate: "create a Tailnet coordinator",
+			ActionRead:   "view info about a Tailnet coordinator",
+			ActionUpdate: "update a Tailnet coordinator",
+			ActionDelete: "delete a Tailnet coordinator",
 		},
 	},
 	"assign_role": {
 		Actions: map[Action]ActionDefinition{
-			ActionAssign:   actDef("assign user roles"),
-			ActionUnassign: actDef("unassign user roles"),
-			ActionRead:     actDef("view what roles are assignable"),
+			ActionAssign:   "assign user roles",
+			ActionUnassign: "unassign user roles",
+			ActionRead:     "view what roles are assignable",
 		},
 	},
 	"assign_org_role": {
 		Actions: map[Action]ActionDefinition{
-			ActionAssign:   actDef("assign org scoped roles"),
-			ActionUnassign: actDef("unassign org scoped roles"),
-			ActionCreate:   actDef("create/delete custom roles within an organization"),
-			ActionRead:     actDef("view what roles are assignable within an organization"),
-			ActionUpdate:   actDef("edit custom roles within an organization"),
-			ActionDelete:   actDef("delete roles within an organization"),
+			ActionAssign:   "assign org scoped roles",
+			ActionUnassign: "unassign org scoped roles",
+			ActionCreate:   "create/delete custom roles within an organization",
+			ActionRead:     "view what roles are assignable within an organization",
+			ActionUpdate:   "edit custom roles within an organization",
+			ActionDelete:   "delete roles within an organization",
 		},
 	},
 	"oauth2_app": {
 		Actions: map[Action]ActionDefinition{
-			ActionCreate: actDef("make an OAuth2 app"),
-			ActionRead:   actDef("read OAuth2 apps"),
-			ActionUpdate: actDef("update the properties of the OAuth2 app"),
-			ActionDelete: actDef("delete an OAuth2 app"),
+			ActionCreate: "make an OAuth2 app",
+			ActionRead:   "read OAuth2 apps",
+			ActionUpdate: "update the properties of the OAuth2 app",
+			ActionDelete: "delete an OAuth2 app",
 		},
 	},
 	"oauth2_app_secret": {
 		Actions: map[Action]ActionDefinition{
-			ActionCreate: actDef("create an OAuth2 app secret"),
-			ActionRead:   actDef("read an OAuth2 app secret"),
-			ActionUpdate: actDef("update an OAuth2 app secret"),
-			ActionDelete: actDef("delete an OAuth2 app secret"),
+			ActionCreate: "create an OAuth2 app secret",
+			ActionRead:   "read an OAuth2 app secret",
+			ActionUpdate: "update an OAuth2 app secret",
+			ActionDelete: "delete an OAuth2 app secret",
 		},
 	},
 	"oauth2_app_code_token": {
 		Actions: map[Action]ActionDefinition{
-			ActionCreate: actDef("create an OAuth2 app code token"),
-			ActionRead:   actDef("read an OAuth2 app code token"),
-			ActionDelete: actDef("delete an OAuth2 app code token"),
+			ActionCreate: "create an OAuth2 app code token",
+			ActionRead:   "read an OAuth2 app code token",
+			ActionDelete: "delete an OAuth2 app code token",
 		},
 	},
 	"notification_message": {
 		Actions: map[Action]ActionDefinition{
-			ActionCreate: actDef("create notification messages"),
-			ActionRead:   actDef("read notification messages"),
-			ActionUpdate: actDef("update notification messages"),
-			ActionDelete: actDef("delete notification messages"),
+			ActionCreate: "create notification messages",
+			ActionRead:   "read notification messages",
+			ActionUpdate: "update notification messages",
+			ActionDelete: "delete notification messages",
 		},
 	},
 	"notification_template": {
 		Actions: map[Action]ActionDefinition{
-			ActionRead:   actDef("read notification templates"),
-			ActionUpdate: actDef("update notification templates"),
+			ActionRead:   "read notification templates",
+			ActionUpdate: "update notification templates",
 		},
 	},
 	"notification_preference": {
 		Actions: map[Action]ActionDefinition{
-			ActionRead:   actDef("read notification preferences"),
-			ActionUpdate: actDef("update notification preferences"),
+			ActionRead:   "read notification preferences",
+			ActionUpdate: "update notification preferences",
 		},
 	},
 	"webpush_subscription": {
 		Actions: map[Action]ActionDefinition{
-			ActionCreate: actDef("create webpush subscriptions"),
-			ActionRead:   actDef("read webpush subscriptions"),
-			ActionDelete: actDef("delete webpush subscriptions"),
+			ActionCreate: "create webpush subscriptions",
+			ActionRead:   "read webpush subscriptions",
+			ActionDelete: "delete webpush subscriptions",
 		},
 	},
 	"inbox_notification": {
 		Actions: map[Action]ActionDefinition{
-			ActionCreate: actDef("create inbox notifications"),
-			ActionRead:   actDef("read inbox notifications"),
-			ActionUpdate: actDef("update inbox notifications"),
+			ActionCreate: "create inbox notifications",
+			ActionRead:   "read inbox notifications",
+			ActionUpdate: "update inbox notifications",
 		},
 	},
 	"crypto_key": {
 		Actions: map[Action]ActionDefinition{
-			ActionRead:   actDef("read crypto keys"),
-			ActionUpdate: actDef("update crypto keys"),
-			ActionDelete: actDef("delete crypto keys"),
-			ActionCreate: actDef("create crypto keys"),
+			ActionRead:   "read crypto keys",
+			ActionUpdate: "update crypto keys",
+			ActionDelete: "delete crypto keys",
+			ActionCreate: "create crypto keys",
 		},
 	},
 	// idpsync_settings should always be org scoped
 	"idpsync_settings": {
 		Actions: map[Action]ActionDefinition{
-			ActionRead:   actDef("read IdP sync settings"),
-			ActionUpdate: actDef("update IdP sync settings"),
+			ActionRead:   "read IdP sync settings",
+			ActionUpdate: "update IdP sync settings",
 		},
 	},
 	"workspace_agent_resource_monitor": {
 		Actions: map[Action]ActionDefinition{
-			ActionRead:   actDef("read workspace agent resource monitor"),
-			ActionCreate: actDef("create workspace agent resource monitor"),
-			ActionUpdate: actDef("update workspace agent resource monitor"),
+			ActionRead:   "read workspace agent resource monitor",
+			ActionCreate: "create workspace agent resource monitor",
+			ActionUpdate: "update workspace agent resource monitor",
 		},
 	},
 	"workspace_agent_devcontainers": {
 		Actions: map[Action]ActionDefinition{
-			ActionCreate: actDef("create workspace agent devcontainers"),
+			ActionCreate: "create workspace agent devcontainers",
 		},
 	},
 }
diff --git a/scripts/typegen/rbacobject.gotmpl b/scripts/typegen/rbacobject.gotmpl
index ee89a8801eaca..37aec00dc8b83 100644
--- a/scripts/typegen/rbacobject.gotmpl
+++ b/scripts/typegen/rbacobject.gotmpl
@@ -14,7 +14,7 @@ var (
 		// Resource{{ $Name }}
 		// Valid Actions
 		{{- range $action, $value := .Actions }}
-		//  - "{{ actionEnum $action }}" :: {{ $value.Description }}
+		//  - "{{ actionEnum $action }}" :: {{ $value }}
 		{{- end }}
 		{{- .Comment }}
 		Resource{{ $Name }} = Object {