From 880fb10905cd9f65f4e244fe1a272b7b8975977b Mon Sep 17 00:00:00 2001
From: Jon Gaul <jgaul3@gmail.com>
Date: Thu, 2 Jul 2026 17:45:36 +0900
Subject: [PATCH 1/4] feat(ui): allow user to customize PR title

Signed-off-by: Jon Gaul <jgaul3@gmail.com>
---
 internal/info/flipt.go                        | 12 +++++
 internal/info/flipt_test.go                   | 45 ++++++++++++++++
 .../branches/CreateMergeProposalModal.tsx     | 52 ++++++++++++++++++-
 ui/src/types/Meta.ts                          |  6 +++
 4 files changed, 113 insertions(+), 2 deletions(-)

diff --git a/internal/info/flipt.go b/internal/info/flipt.go
index 3003060875..d0aa471bea 100644
--- a/internal/info/flipt.go
+++ b/internal/info/flipt.go
@@ -49,6 +49,12 @@ func WithConfig(cfg *config.Config) Option {
 		f.Authentication = &Authentication{Required: cfg.Authentication.Required}
 		f.Analytics = &Analytics{Enabled: cfg.Analytics.Enabled()}
 		f.UI = &UI{Theme: cfg.UI.DefaultTheme, TopbarColor: cfg.UI.Topbar.Color}
+		if cfg.Templates.ProposalTitle != "" || cfg.Templates.ProposalBody != "" {
+			f.Templates = &Templates{
+				ProposalTitle: cfg.Templates.ProposalTitle,
+				ProposalBody:  cfg.Templates.ProposalBody,
+			}
+		}
 	}
 }
 
@@ -84,12 +90,18 @@ type UI struct {
 	TopbarColor string         `json:"topbarColor,omitempty"`
 }
 
+type Templates struct {
+	ProposalTitle string `json:"proposalTitle,omitempty"`
+	ProposalBody  string `json:"proposalBody,omitempty"`
+}
+
 type Flipt struct {
 	licenseManager license.Manager
 	Build          *Build          `json:"build,omitempty"`
 	Authentication *Authentication `json:"authentication,omitempty"`
 	Analytics      *Analytics      `json:"analytics,omitempty"`
 	UI             *UI             `json:"ui,omitempty"`
+	Templates      *Templates      `json:"templates,omitempty"`
 }
 
 func (f Flipt) IsDevelopment() bool {
diff --git a/internal/info/flipt_test.go b/internal/info/flipt_test.go
index 8ba59fa786..f75bd84743 100644
--- a/internal/info/flipt_test.go
+++ b/internal/info/flipt_test.go
@@ -30,6 +30,51 @@ func TestNew(t *testing.T) {
 	assert.False(t, f.Analytics.Enabled)
 }
 
+func TestWithConfig_Templates(t *testing.T) {
+	t.Run("no templates configured", func(t *testing.T) {
+		f := New(WithConfig(config.Default()))
+		assert.Nil(t, f.Templates)
+	})
+
+	t.Run("proposal title configured", func(t *testing.T) {
+		cfg := config.Default()
+		cfg.Templates.ProposalTitle = "Flipt: {{.Base.Ref}} from {{.Branch.Ref}}"
+		f := New(WithConfig(cfg))
+		assert.NotNil(t, f.Templates)
+		assert.Equal(t, "Flipt: {{.Base.Ref}} from {{.Branch.Ref}}", f.Templates.ProposalTitle)
+		assert.Empty(t, f.Templates.ProposalBody)
+	})
+
+	t.Run("both templates configured", func(t *testing.T) {
+		cfg := config.Default()
+		cfg.Templates.ProposalTitle = "title template"
+		cfg.Templates.ProposalBody = "body template"
+		f := New(WithConfig(cfg))
+		assert.NotNil(t, f.Templates)
+		assert.Equal(t, "title template", f.Templates.ProposalTitle)
+		assert.Equal(t, "body template", f.Templates.ProposalBody)
+	})
+
+	t.Run("templates marshaled to JSON", func(t *testing.T) {
+		cfg := config.Default()
+		cfg.Templates.ProposalTitle = "custom title"
+
+		mockLicenseManager := license.NewMockManager(t)
+		mockLicenseManager.EXPECT().Product().Return(product.OSS)
+
+		f := New(WithConfig(cfg), WithLicenseManager(mockLicenseManager))
+		data, err := json.Marshal(f)
+		assert.NoError(t, err)
+
+		var out map[string]any
+		assert.NoError(t, json.Unmarshal(data, &out))
+
+		templates, ok := out["templates"].(map[string]any)
+		assert.True(t, ok)
+		assert.Equal(t, "custom title", templates["proposalTitle"])
+	})
+}
+
 func TestFlipt_ProductField_Marshaling(t *testing.T) {
 	tests := []struct {
 		name    string
diff --git a/ui/src/components/environments/branches/CreateMergeProposalModal.tsx b/ui/src/components/environments/branches/CreateMergeProposalModal.tsx
index 07af9a51b9..d968820533 100644
--- a/ui/src/components/environments/branches/CreateMergeProposalModal.tsx
+++ b/ui/src/components/environments/branches/CreateMergeProposalModal.tsx
@@ -22,6 +22,7 @@ import Loading from '~/components/Loading';
 import { IEnvironment } from '~/types/Environment';
 
 import { useError } from '~/data/hooks/error';
+import { useAppSelector } from '~/data/hooks/store';
 import { useSuccess } from '~/data/hooks/success';
 
 interface CreateMergeProposalModalProps {
@@ -31,6 +32,10 @@ interface CreateMergeProposalModalProps {
 }
 
 const validationSchema = Yup.object().shape({
+  title: Yup.string()
+    .optional()
+    .max(200, 'Title must be at most 200 characters')
+    .trim(),
   description: Yup.string()
     .optional()
     .max(500, 'Description must be at most 500 characters')
@@ -38,6 +43,9 @@ const validationSchema = Yup.object().shape({
   draft: Yup.boolean()
 });
 
+const BUILTIN_TITLE_TEMPLATE =
+  'Flipt: Update features {{with .Base.Directory}}in {{.}} {{end}}on {{.Base.Ref}}';
+
 const MAX_COMMITS = 10;
 
 export function CreateMergeProposalModal({
@@ -56,9 +64,15 @@ export function CreateMergeProposalModal({
   const { setError, clearError } = useError();
   const { setSuccess } = useSuccess();
 
+  const { info } = useAppSelector((state) => state.meta);
+
   const [proposeEnvironment] = useProposeEnvironmentMutation();
 
+  const defaultTitle =
+    info.templates?.proposalTitle ?? BUILTIN_TITLE_TEMPLATE;
+
   const handleProposeEnvironment = async (values: {
+    title: string;
     description: string;
     draft: boolean;
   }) => {
@@ -66,6 +80,7 @@ export function CreateMergeProposalModal({
       await proposeEnvironment({
         environmentKey: environment.configuration?.base ?? '',
         key: environment.key,
+        title: values.title || undefined,
         body: values.description,
         draft: values.draft
       }).unwrap();
@@ -155,11 +170,16 @@ export function CreateMergeProposalModal({
           </div>
         )}
         <Formik
-          initialValues={{ description: '', draft: false }}
+          initialValues={{ title: defaultTitle, description: '', draft: false }}
           validationSchema={validationSchema}
           onSubmit={async (values, actions) => {
+            const trimmedTitle = values.title.trim().slice(0, 200);
             const trimmed = values.description.trim().slice(0, 500);
-            const submitValues = { ...values, description: trimmed };
+            const submitValues = {
+              ...values,
+              title: trimmedTitle,
+              description: trimmed
+            };
             await handleProposeEnvironment(submitValues);
             actions.setSubmitting(false);
           }}
@@ -171,6 +191,34 @@ export function CreateMergeProposalModal({
               data?.changes?.length == 0;
             return (
               <Form>
+                <div className="mb-3">
+                  <label
+                    className="block text-sm font-medium mb-1"
+                    htmlFor="proposal-title"
+                  >
+                    Proposal Title{' '}
+                    <span className="text-muted-foreground">(optional)</span>
+                  </label>
+                  <Field
+                    type="text"
+                    id="proposal-title"
+                    name="title"
+                    className="w-full rounded-md border-input bg-secondary/20 dark:bg-input/20 px-3 py-2 text-sm focus:ring-2 focus:ring-brand focus:border-brand transition disabled:opacity-80 disabled:cursor-not-allowed"
+                    placeholder="Enter a title for this merge proposal..."
+                    maxLength={200}
+                    onChange={formik.handleChange}
+                    value={formik.values.title}
+                    disabled={isError}
+                  />
+                  <div className="text-xs text-muted-foreground text-right mt-1">
+                    {formik.values.title.trim().length}/200
+                  </div>
+                  {formik.errors.title && formik.touched.title && (
+                    <div className="text-xs text-destructive mt-1">
+                      {formik.errors.title}
+                    </div>
+                  )}
+                </div>
                 <div>
                   <label
                     className="block text-sm font-medium mb-1"
diff --git a/ui/src/types/Meta.ts b/ui/src/types/Meta.ts
index 9ed3220464..18cc5462f4 100644
--- a/ui/src/types/Meta.ts
+++ b/ui/src/types/Meta.ts
@@ -1,10 +1,16 @@
 import { Theme } from './Preferences';
 
+export interface ITemplates {
+  proposalTitle?: string;
+  proposalBody?: string;
+}
+
 export interface IInfo {
   build: IBuild;
   analytics?: IAnalytics;
   ui?: IUI;
   product?: Product;
+  templates?: ITemplates;
 }
 
 export interface IBuild {

From 00829398585f3b6b55b722e0892b58e42c65d081 Mon Sep 17 00:00:00 2001
From: Mark Phelps <209477+markphelps@users.noreply.github.com>
Date: Tue, 7 Jul 2026 15:43:38 -0400
Subject: [PATCH 2/4] feat: render hydrated proposal defaults for editable
 title/body

Render the merge-proposal title and body on the backend from the hydrated
templates (built-in defaults overlaid with server- and repository-level
overrides) and return them via ListBranchedEnvironmentChanges so the UI can
pre-fill the form. Users may override the rendered defaults; caller-supplied
values continue to be used verbatim.

This replaces exposing the raw, unrendered server template through /meta/info,
which could not reflect real branch refs or repo-level overrides and led to
unrendered template syntax appearing in proposal titles.

Also fixes a pre-existing Input.tsx ref type error surfaced by the UI build.

Signed-off-by: Mark Phelps <209477+markphelps@users.noreply.github.com>
---
 .../coss/storage/environments/git/store.go    | 111 +++++++++++-------
 internal/info/flipt.go                        |  12 --
 internal/info/flipt_test.go                   |  45 -------
 rpc/v2/environments/environments.pb.go        |  29 ++++-
 rpc/v2/environments/environments.proto        |   7 ++
 rpc/v2/environments/openapi.yaml              |  11 ++
 ui/src/app/environments/environmentsApi.ts    |   2 +-
 .../branches/CreateMergeProposalModal.tsx     |  40 ++++---
 ui/src/components/forms/Input.tsx             |   2 +-
 ui/src/types/Meta.ts                          |   6 -
 10 files changed, 135 insertions(+), 130 deletions(-)

diff --git a/internal/coss/storage/environments/git/store.go b/internal/coss/storage/environments/git/store.go
index be51493a50..c6e4d4194d 100644
--- a/internal/coss/storage/environments/git/store.go
+++ b/internal/coss/storage/environments/git/store.go
@@ -21,6 +21,13 @@ import (
 
 var _ serverenvs.Environment = (*Environment)(nil)
 
+// templateContext is the data made available to the proposal title and body
+// templates when they are rendered.
+type templateContext struct {
+	Base   *environments.EnvironmentConfiguration
+	Branch *environments.EnvironmentConfiguration
+}
+
 type SCM interface {
 	Propose(context.Context, ProposalRequest) (*environments.EnvironmentProposalDetails, error)
 	ListChanges(context.Context, ListChangesRequest) (*environments.ListBranchedEnvironmentChangesResponse, error)
@@ -66,29 +73,34 @@ func (e *Environment) ListBranchedChanges(ctx context.Context, branch serverenvs
 		return nil, errors.ErrInvalidf("environment %q is not a based on environment %q", e.Key(), branch.Key())
 	}
 
-	return e.SCM.ListChanges(ctx, ListChangesRequest{
+	resp, err = e.SCM.ListChanges(ctx, ListChangesRequest{
 		Base:  baseCfg.Ref,
 		Head:  branchCfg.Ref,
 		Limit: 10,
 	})
-}
-
-func (e *Environment) Propose(ctx context.Context, base serverenvs.Environment, opts serverenvs.ProposalOptions) (resp *environments.EnvironmentProposalDetails, err error) {
-	var (
-		baseCfg   = e.Configuration()
-		branchCfg = base.Configuration()
-	)
-
-	if branchCfg.Base != nil && *branchCfg.Base != e.Key() {
-		return nil, errors.ErrInvalidf("environment %q is not a based on environment %q", e.Key(), base.Key())
+	if err != nil {
+		return nil, err
 	}
 
-	type templateContext struct {
-		Base   *environments.EnvironmentConfiguration
-		Branch *environments.EnvironmentConfiguration
+	// Render the hydrated proposal defaults so the UI can pre-fill (and let the
+	// user override) the title and body. Failures here should not prevent the
+	// caller from listing changes, so degrade gracefully.
+	title, body, rerr := e.renderProposalDefaults(ctx, baseCfg, branchCfg)
+	if rerr != nil {
+		e.logger.Warn("rendering proposal defaults", zap.Error(rerr))
+	} else {
+		resp.ProposalTitle = title
+		resp.ProposalBody = body
 	}
 
-	if err := e.Repository().View(ctx, branchCfg.Ref, func(hash plumbing.Hash, src environmentsfs.Filesystem) error {
+	return resp, nil
+}
+
+// renderProposalDefaults renders the default proposal title and body for the
+// given branch by executing the hydrated templates (built-in defaults overlaid
+// with server-level and repository-level overrides) against the branch context.
+func (e *Environment) renderProposalDefaults(ctx context.Context, baseCfg, branchCfg *environments.EnvironmentConfiguration) (title, body string, err error) {
+	err = e.Repository().View(ctx, branchCfg.Ref, func(hash plumbing.Hash, src environmentsfs.Filesystem) error {
 		// chroot our filesystem to the configured directory
 		dir := ""
 		if baseCfg.Directory != nil {
@@ -101,43 +113,56 @@ func (e *Environment) Propose(ctx context.Context, base serverenvs.Environment,
 			return err
 		}
 
-		var (
-			title = &bytes.Buffer{}
-			body  = &bytes.Buffer{}
-		)
-
 		tmplCtx := templateContext{Base: baseCfg, Branch: branchCfg}
 
-		if opts.Title != "" {
-			title.WriteString(opts.Title)
-		} else {
-			if err := conf.Templates.ProposalTitleTemplate.Execute(title, tmplCtx); err != nil {
-				return err
-			}
+		var titleBuf, bodyBuf bytes.Buffer
+		if err := conf.Templates.ProposalTitleTemplate.Execute(&titleBuf, tmplCtx); err != nil {
+			return err
 		}
-
-		if opts.Body != "" {
-			body.WriteString(opts.Body)
-		} else {
-			if err := conf.Templates.ProposalBodyTemplate.Execute(body, tmplCtx); err != nil {
-				return err
-			}
+		if err := conf.Templates.ProposalBodyTemplate.Execute(&bodyBuf, tmplCtx); err != nil {
+			return err
 		}
 
-		resp, err = e.SCM.Propose(ctx, ProposalRequest{
-			Base:  baseCfg.Ref,
-			Head:  branchCfg.Ref,
-			Title: title.String(),
-			Body:  body.String(),
-			Draft: opts.Draft,
-		})
+		title, body = titleBuf.String(), bodyBuf.String()
+		return nil
+	})
 
-		return err
-	}); err != nil {
+	return title, body, err
+}
+
+func (e *Environment) Propose(ctx context.Context, base serverenvs.Environment, opts serverenvs.ProposalOptions) (resp *environments.EnvironmentProposalDetails, err error) {
+	var (
+		baseCfg   = e.Configuration()
+		branchCfg = base.Configuration()
+	)
+
+	if branchCfg.Base != nil && *branchCfg.Base != e.Key() {
+		return nil, errors.ErrInvalidf("environment %q is not a based on environment %q", e.Key(), base.Key())
+	}
+
+	// Start from the hydrated defaults, then let any caller-supplied title/body
+	// override them. Supplied values are used verbatim (already rendered by the
+	// UI), matching the previous behavior.
+	title, body, err := e.renderProposalDefaults(ctx, baseCfg, branchCfg)
+	if err != nil {
 		return nil, err
 	}
 
-	return
+	if opts.Title != "" {
+		title = opts.Title
+	}
+
+	if opts.Body != "" {
+		body = opts.Body
+	}
+
+	return e.SCM.Propose(ctx, ProposalRequest{
+		Base:  baseCfg.Ref,
+		Head:  branchCfg.Ref,
+		Title: title,
+		Body:  body,
+		Draft: opts.Draft,
+	})
 }
 
 func (e *Environment) ListBranches(ctx context.Context) (*environments.ListEnvironmentBranchesResponse, error) {
diff --git a/internal/info/flipt.go b/internal/info/flipt.go
index d0aa471bea..3003060875 100644
--- a/internal/info/flipt.go
+++ b/internal/info/flipt.go
@@ -49,12 +49,6 @@ func WithConfig(cfg *config.Config) Option {
 		f.Authentication = &Authentication{Required: cfg.Authentication.Required}
 		f.Analytics = &Analytics{Enabled: cfg.Analytics.Enabled()}
 		f.UI = &UI{Theme: cfg.UI.DefaultTheme, TopbarColor: cfg.UI.Topbar.Color}
-		if cfg.Templates.ProposalTitle != "" || cfg.Templates.ProposalBody != "" {
-			f.Templates = &Templates{
-				ProposalTitle: cfg.Templates.ProposalTitle,
-				ProposalBody:  cfg.Templates.ProposalBody,
-			}
-		}
 	}
 }
 
@@ -90,18 +84,12 @@ type UI struct {
 	TopbarColor string         `json:"topbarColor,omitempty"`
 }
 
-type Templates struct {
-	ProposalTitle string `json:"proposalTitle,omitempty"`
-	ProposalBody  string `json:"proposalBody,omitempty"`
-}
-
 type Flipt struct {
 	licenseManager license.Manager
 	Build          *Build          `json:"build,omitempty"`
 	Authentication *Authentication `json:"authentication,omitempty"`
 	Analytics      *Analytics      `json:"analytics,omitempty"`
 	UI             *UI             `json:"ui,omitempty"`
-	Templates      *Templates      `json:"templates,omitempty"`
 }
 
 func (f Flipt) IsDevelopment() bool {
diff --git a/internal/info/flipt_test.go b/internal/info/flipt_test.go
index f75bd84743..8ba59fa786 100644
--- a/internal/info/flipt_test.go
+++ b/internal/info/flipt_test.go
@@ -30,51 +30,6 @@ func TestNew(t *testing.T) {
 	assert.False(t, f.Analytics.Enabled)
 }
 
-func TestWithConfig_Templates(t *testing.T) {
-	t.Run("no templates configured", func(t *testing.T) {
-		f := New(WithConfig(config.Default()))
-		assert.Nil(t, f.Templates)
-	})
-
-	t.Run("proposal title configured", func(t *testing.T) {
-		cfg := config.Default()
-		cfg.Templates.ProposalTitle = "Flipt: {{.Base.Ref}} from {{.Branch.Ref}}"
-		f := New(WithConfig(cfg))
-		assert.NotNil(t, f.Templates)
-		assert.Equal(t, "Flipt: {{.Base.Ref}} from {{.Branch.Ref}}", f.Templates.ProposalTitle)
-		assert.Empty(t, f.Templates.ProposalBody)
-	})
-
-	t.Run("both templates configured", func(t *testing.T) {
-		cfg := config.Default()
-		cfg.Templates.ProposalTitle = "title template"
-		cfg.Templates.ProposalBody = "body template"
-		f := New(WithConfig(cfg))
-		assert.NotNil(t, f.Templates)
-		assert.Equal(t, "title template", f.Templates.ProposalTitle)
-		assert.Equal(t, "body template", f.Templates.ProposalBody)
-	})
-
-	t.Run("templates marshaled to JSON", func(t *testing.T) {
-		cfg := config.Default()
-		cfg.Templates.ProposalTitle = "custom title"
-
-		mockLicenseManager := license.NewMockManager(t)
-		mockLicenseManager.EXPECT().Product().Return(product.OSS)
-
-		f := New(WithConfig(cfg), WithLicenseManager(mockLicenseManager))
-		data, err := json.Marshal(f)
-		assert.NoError(t, err)
-
-		var out map[string]any
-		assert.NoError(t, json.Unmarshal(data, &out))
-
-		templates, ok := out["templates"].(map[string]any)
-		assert.True(t, ok)
-		assert.Equal(t, "custom title", templates["proposalTitle"])
-	})
-}
-
 func TestFlipt_ProductField_Marshaling(t *testing.T) {
 	tests := []struct {
 		name    string
diff --git a/rpc/v2/environments/environments.pb.go b/rpc/v2/environments/environments.pb.go
index 3ce8beba31..788de051e1 100644
--- a/rpc/v2/environments/environments.pb.go
+++ b/rpc/v2/environments/environments.pb.go
@@ -967,7 +967,14 @@ func (x *ListBranchedEnvironmentChangesRequest) GetLimit() int32 {
 type ListBranchedEnvironmentChangesResponse struct {
 	state protoimpl.MessageState `protogen:"open.v1"`
 	// The list of changes.
-	Changes       []*Change `protobuf:"bytes,1,rep,name=changes,proto3" json:"changes,omitempty"`
+	Changes []*Change `protobuf:"bytes,1,rep,name=changes,proto3" json:"changes,omitempty"`
+	// The hydrated default proposal title for this branch, rendered from the
+	// applicable (built-in, server, or repository-level) template. The UI uses
+	// this as an editable default when opening a merge proposal.
+	ProposalTitle string `protobuf:"bytes,2,opt,name=proposal_title,json=proposalTitle,proto3" json:"proposal_title,omitempty"`
+	// The hydrated default proposal body for this branch, rendered from the
+	// applicable template.
+	ProposalBody  string `protobuf:"bytes,3,opt,name=proposal_body,json=proposalBody,proto3" json:"proposal_body,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -1009,6 +1016,20 @@ func (x *ListBranchedEnvironmentChangesResponse) GetChanges() []*Change {
 	return nil
 }
 
+func (x *ListBranchedEnvironmentChangesResponse) GetProposalTitle() string {
+	if x != nil {
+		return x.ProposalTitle
+	}
+	return ""
+}
+
+func (x *ListBranchedEnvironmentChangesResponse) GetProposalBody() string {
+	if x != nil {
+		return x.ProposalBody
+	}
+	return ""
+}
+
 // Namespace represents a grouping of related flags and segments.
 type Namespace struct {
 	state protoimpl.MessageState `protogen:"open.v1"`
@@ -2089,9 +2110,11 @@ const file_environments_environments_proto_rawDesc = "" +
 	"\x04from\x18\x03 \x01(\tH\x00R\x04from\x88\x01\x01\x12\x19\n" +
 	"\x05limit\x18\x04 \x01(\x05H\x01R\x05limit\x88\x01\x01B\a\n" +
 	"\x05_fromB\b\n" +
-	"\x06_limit\"X\n" +
+	"\x06_limit\"\xa4\x01\n" +
 	"&ListBranchedEnvironmentChangesResponse\x12.\n" +
-	"\achanges\x18\x01 \x03(\v2\x14.environments.ChangeR\achanges\"\x99\x01\n" +
+	"\achanges\x18\x01 \x03(\v2\x14.environments.ChangeR\achanges\x12%\n" +
+	"\x0eproposal_title\x18\x02 \x01(\tR\rproposalTitle\x12#\n" +
+	"\rproposal_body\x18\x03 \x01(\tR\fproposalBody\"\x99\x01\n" +
 	"\tNamespace\x12\x10\n" +
 	"\x03key\x18\x01 \x01(\tR\x03key\x12\x12\n" +
 	"\x04name\x18\x02 \x01(\tR\x04name\x12%\n" +
diff --git a/rpc/v2/environments/environments.proto b/rpc/v2/environments/environments.proto
index eb112316dc..516c20e911 100644
--- a/rpc/v2/environments/environments.proto
+++ b/rpc/v2/environments/environments.proto
@@ -291,6 +291,13 @@ message ListBranchedEnvironmentChangesRequest {
 message ListBranchedEnvironmentChangesResponse {
   // The list of changes.
   repeated Change changes = 1;
+  // The hydrated default proposal title for this branch, rendered from the
+  // applicable (built-in, server, or repository-level) template. The UI uses
+  // this as an editable default when opening a merge proposal.
+  string proposal_title = 2;
+  // The hydrated default proposal body for this branch, rendered from the
+  // applicable template.
+  string proposal_body = 3;
 }
 
 /* Namespace */
diff --git a/rpc/v2/environments/openapi.yaml b/rpc/v2/environments/openapi.yaml
index 3b246a3824..8f40ec7ed7 100644
--- a/rpc/v2/environments/openapi.yaml
+++ b/rpc/v2/environments/openapi.yaml
@@ -660,6 +660,17 @@ components:
                     items:
                         $ref: '#/components/schemas/Change'
                     description: The list of changes.
+                proposalTitle:
+                    type: string
+                    description: |-
+                        The hydrated default proposal title for this branch, rendered from the
+                         applicable (built-in, server, or repository-level) template. The UI uses
+                         this as an editable default when opening a merge proposal.
+                proposalBody:
+                    type: string
+                    description: |-
+                        The hydrated default proposal body for this branch, rendered from the
+                         applicable template.
             description: The response message for listing changes in a branched environment.
         ListEnvironmentBranchesResponse:
             type: object
diff --git a/ui/src/app/environments/environmentsApi.ts b/ui/src/app/environments/environmentsApi.ts
index 8a1f68ad70..9bbe3d243a 100644
--- a/ui/src/app/environments/environmentsApi.ts
+++ b/ui/src/app/environments/environmentsApi.ts
@@ -168,7 +168,7 @@ export const environmentsApi = createApi({
       ]
     }),
     listBranchEnvironmentChanges: builder.query<
-      { changes: IChange[] },
+      { changes: IChange[]; proposalTitle?: string; proposalBody?: string },
       { environmentKey: string; key: string }
     >({
       query: ({ environmentKey, key }) =>
diff --git a/ui/src/components/environments/branches/CreateMergeProposalModal.tsx b/ui/src/components/environments/branches/CreateMergeProposalModal.tsx
index d968820533..7dc28c43a3 100644
--- a/ui/src/components/environments/branches/CreateMergeProposalModal.tsx
+++ b/ui/src/components/environments/branches/CreateMergeProposalModal.tsx
@@ -22,7 +22,6 @@ import Loading from '~/components/Loading';
 import { IEnvironment } from '~/types/Environment';
 
 import { useError } from '~/data/hooks/error';
-import { useAppSelector } from '~/data/hooks/store';
 import { useSuccess } from '~/data/hooks/success';
 
 interface CreateMergeProposalModalProps {
@@ -31,21 +30,21 @@ interface CreateMergeProposalModalProps {
   environment: IEnvironment;
 }
 
+const MAX_TITLE = 256;
+const MAX_BODY = 10000;
+
 const validationSchema = Yup.object().shape({
   title: Yup.string()
     .optional()
-    .max(200, 'Title must be at most 200 characters')
+    .max(MAX_TITLE, `Title must be at most ${MAX_TITLE} characters`)
     .trim(),
   description: Yup.string()
     .optional()
-    .max(500, 'Description must be at most 500 characters')
+    .max(MAX_BODY, `Description must be at most ${MAX_BODY} characters`)
     .trim(),
   draft: Yup.boolean()
 });
 
-const BUILTIN_TITLE_TEMPLATE =
-  'Flipt: Update features {{with .Base.Directory}}in {{.}} {{end}}on {{.Base.Ref}}';
-
 const MAX_COMMITS = 10;
 
 export function CreateMergeProposalModal({
@@ -64,12 +63,12 @@ export function CreateMergeProposalModal({
   const { setError, clearError } = useError();
   const { setSuccess } = useSuccess();
 
-  const { info } = useAppSelector((state) => state.meta);
-
   const [proposeEnvironment] = useProposeEnvironmentMutation();
 
-  const defaultTitle =
-    info.templates?.proposalTitle ?? BUILTIN_TITLE_TEMPLATE;
+  // Hydrated defaults rendered by the server from the applicable proposal
+  // templates for this branch. Used to pre-fill the form; the user may override.
+  const defaultTitle = data?.proposalTitle ?? '';
+  const defaultDescription = data?.proposalBody ?? '';
 
   const handleProposeEnvironment = async (values: {
     title: string;
@@ -170,15 +169,18 @@ export function CreateMergeProposalModal({
           </div>
         )}
         <Formik
-          initialValues={{ title: defaultTitle, description: '', draft: false }}
+          enableReinitialize
+          initialValues={{
+            title: defaultTitle,
+            description: defaultDescription,
+            draft: false
+          }}
           validationSchema={validationSchema}
           onSubmit={async (values, actions) => {
-            const trimmedTitle = values.title.trim().slice(0, 200);
-            const trimmed = values.description.trim().slice(0, 500);
             const submitValues = {
               ...values,
-              title: trimmedTitle,
-              description: trimmed
+              title: values.title.trim().slice(0, MAX_TITLE),
+              description: values.description.trim().slice(0, MAX_BODY)
             };
             await handleProposeEnvironment(submitValues);
             actions.setSubmitting(false);
@@ -205,13 +207,13 @@ export function CreateMergeProposalModal({
                     name="title"
                     className="w-full rounded-md border-input bg-secondary/20 dark:bg-input/20 px-3 py-2 text-sm focus:ring-2 focus:ring-brand focus:border-brand transition disabled:opacity-80 disabled:cursor-not-allowed"
                     placeholder="Enter a title for this merge proposal..."
-                    maxLength={200}
+                    maxLength={MAX_TITLE}
                     onChange={formik.handleChange}
                     value={formik.values.title}
                     disabled={isError}
                   />
                   <div className="text-xs text-muted-foreground text-right mt-1">
-                    {formik.values.title.trim().length}/200
+                    {formik.values.title.trim().length}/{MAX_TITLE}
                   </div>
                   {formik.errors.title && formik.touched.title && (
                     <div className="text-xs text-destructive mt-1">
@@ -234,13 +236,13 @@ export function CreateMergeProposalModal({
                     className="w-full rounded-md border-input bg-secondary/20 dark:bg-input/20 px-3 py-2 text-sm focus:ring-2 focus:ring-brand focus:border-brand transition disabled:opacity-80 disabled:cursor-not-allowed"
                     rows={3}
                     placeholder="Add context or reasoning for this merge proposal..."
-                    maxLength={500}
+                    maxLength={MAX_BODY}
                     onChange={formik.handleChange}
                     value={formik.values.description}
                     disabled={isError}
                   />
                   <div className="text-xs text-muted-foreground text-right mt-1">
-                    {formik.values.description.trim().length}/500
+                    {formik.values.description.trim().length}/{MAX_BODY}
                   </div>
                   {formik.errors.description && formik.touched.description && (
                     <div className="text-xs text-destructive mt-1">
diff --git a/ui/src/components/forms/Input.tsx b/ui/src/components/forms/Input.tsx
index 0d300a74c5..637ddfb72c 100644
--- a/ui/src/components/forms/Input.tsx
+++ b/ui/src/components/forms/Input.tsx
@@ -8,7 +8,7 @@ type InputProps = {
   type?: string;
   className?: string;
   autoComplete?: boolean;
-  forwardRef?: React.RefObject<HTMLInputElement | null>;
+  forwardRef?: React.Ref<HTMLInputElement>;
   onChange?: (e: React.ChangeEvent<HTMLInputElement>) => void;
 } & React.InputHTMLAttributes<HTMLInputElement>;
 
diff --git a/ui/src/types/Meta.ts b/ui/src/types/Meta.ts
index 18cc5462f4..9ed3220464 100644
--- a/ui/src/types/Meta.ts
+++ b/ui/src/types/Meta.ts
@@ -1,16 +1,10 @@
 import { Theme } from './Preferences';
 
-export interface ITemplates {
-  proposalTitle?: string;
-  proposalBody?: string;
-}
-
 export interface IInfo {
   build: IBuild;
   analytics?: IAnalytics;
   ui?: IUI;
   product?: Product;
-  templates?: ITemplates;
 }
 
 export interface IBuild {

From 5943424ef67862e44a5af9639187b66908d5d2d0 Mon Sep 17 00:00:00 2001
From: Mark Phelps <209477+markphelps@users.noreply.github.com>
Date: Tue, 7 Jul 2026 20:24:01 -0400
Subject: [PATCH 3/4] fix(ci): pin buf action version

Signed-off-by: Mark Phelps <209477+markphelps@users.noreply.github.com>
---
 .github/workflows/proto-push.yml | 4 ++++
 .github/workflows/proto.yml      | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/.github/workflows/proto-push.yml b/.github/workflows/proto-push.yml
index 5efcf5457b..8e974b6d1b 100644
--- a/.github/workflows/proto-push.yml
+++ b/.github/workflows/proto-push.yml
@@ -16,22 +16,26 @@ jobs:
 
       - uses: bufbuild/buf-action@v1
         with:
+          version: 1.70.0
           setup_only: true
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - uses: bufbuild/buf-action@v1
         with:
+          version: 1.70.0
           input: "rpc/v2"
           lint: true
 
       - uses: bufbuild/buf-action@v1
         with:
+          version: 1.70.0
           input: "rpc/v2"
           breaking: true
           breaking_against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=v2"
 
       - uses: bufbuild/buf-action@v1
         with:
+          version: 1.70.0
           input: "rpc/v2"
           push: true
           token: ${{ secrets.BUF_TOKEN }}
diff --git a/.github/workflows/proto.yml b/.github/workflows/proto.yml
index 0f2f382f88..3bccb4ece9 100644
--- a/.github/workflows/proto.yml
+++ b/.github/workflows/proto.yml
@@ -25,6 +25,7 @@ jobs:
 
       - uses: bufbuild/buf-action@v1
         with:
+          version: 1.70.0
           lint: true
 
   proto-check:
@@ -36,6 +37,7 @@ jobs:
 
       - uses: bufbuild/buf-action@v1
         with:
+          version: 1.70.0
           setup_only: true
           github_token: ${{ secrets.GITHUB_TOKEN }}
 

From 4de80aadff1f6749301942d17c3c922e8142dc93 Mon Sep 17 00:00:00 2001
From: Roman Dmytrenko <rdmytrenko@gmail.com>
Date: Wed, 8 Jul 2026 21:20:12 +0100
Subject: [PATCH 4/4] update CI to use buf v1.71.0, matching the mise
 configuration.

Signed-off-by: Roman Dmytrenko <rdmytrenko@gmail.com>
---
 .github/workflows/proto-push.yml | 8 ++++----
 .github/workflows/proto.yml      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/proto-push.yml b/.github/workflows/proto-push.yml
index 8e974b6d1b..28b973cdd5 100644
--- a/.github/workflows/proto-push.yml
+++ b/.github/workflows/proto-push.yml
@@ -16,26 +16,26 @@ jobs:
 
       - uses: bufbuild/buf-action@v1
         with:
-          version: 1.70.0
+          version: 1.71.0
           setup_only: true
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - uses: bufbuild/buf-action@v1
         with:
-          version: 1.70.0
+          version: 1.71.0
           input: "rpc/v2"
           lint: true
 
       - uses: bufbuild/buf-action@v1
         with:
-          version: 1.70.0
+          version: 1.71.0
           input: "rpc/v2"
           breaking: true
           breaking_against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=v2"
 
       - uses: bufbuild/buf-action@v1
         with:
-          version: 1.70.0
+          version: 1.71.0
           input: "rpc/v2"
           push: true
           token: ${{ secrets.BUF_TOKEN }}
diff --git a/.github/workflows/proto.yml b/.github/workflows/proto.yml
index 3bccb4ece9..33647b2502 100644
--- a/.github/workflows/proto.yml
+++ b/.github/workflows/proto.yml
@@ -25,7 +25,7 @@ jobs:
 
       - uses: bufbuild/buf-action@v1
         with:
-          version: 1.70.0
+          version: 1.71.0
           lint: true
 
   proto-check:
@@ -37,7 +37,7 @@ jobs:
 
       - uses: bufbuild/buf-action@v1
         with:
-          version: 1.70.0
+          version: 1.71.0
           setup_only: true
           github_token: ${{ secrets.GITHUB_TOKEN }}