diff --git a/appview/pages/pages.go b/appview/pages/pages.go
index d0988ee2..9f8e5747 100644
--- a/appview/pages/pages.go
+++ b/appview/pages/pages.go
@@ -1225,15 +1225,34 @@ func (p *Pages) IssueCommentBodyFragment(w io.Writer, params IssueCommentBodyPar
 }
 
 type RepoNewPullParams struct {
-	LoggedInUser *oauth.MultiAccountUser
-	RepoInfo     repoinfo.RepoInfo
-	Branches     []types.Branch
-	Strategy     string
-	SourceBranch string
-	TargetBranch string
-	Title        string
-	Body         string
-	Active       string
+	LoggedInUser     *oauth.MultiAccountUser
+	RepoInfo         repoinfo.RepoInfo
+	Branches         []types.Branch
+	SourceBranches   []types.Branch
+	ForkBranches     []types.Branch
+	Forks            []models.Repo
+	Source           Source
+	SourceBranch     string
+	TargetBranch     string
+	Fork             string
+	Patch            string
+	Title            string
+	Body             string
+	IsStacked        bool
+	Comparison       *types.RepoFormatPatchResponse
+	Diff             *types.NiceDiff
+	PerCommitDiffs   []*types.NiceDiff
+	DiffOpts         types.DiffOpts
+	StackDiffOpts    []types.DiffOpts
+	EmailToDid       map[string]string
+	MergeCheck       *types.MergeCheckResponse
+	StackTitles      map[string]string
+	StackBodies      map[string]string
+	PrefillError     string
+	Active           string
+	LabelDefs        map[string]*models.LabelDefinition
+	LabelState       models.LabelState
+	StackLabelStates map[string]models.LabelState
 }
 
 func (p *Pages) RepoNewPull(w io.Writer, params RepoNewPullParams) error {
@@ -1241,6 +1260,14 @@ func (p *Pages) RepoNewPull(w io.Writer, params RepoNewPullParams) error {
 	return p.executeRepo("repo/pulls/new", w, params)
 }
 
+func (p *Pages) PullWizardHostFragment(w io.Writer, params RepoNewPullParams) error {
+	return p.executePlain("repo/pulls/fragments/pullWizardHost", w, params)
+}
+
+func (p *Pages) MarkdownPreviewFragment(w io.Writer, body string) error {
+	return p.executePlain("fragments/markdownPreview", w, body)
+}
+
 type RepoPullsParams struct {
 	LoggedInUser *oauth.MultiAccountUser
 	RepoInfo     repoinfo.RepoInfo
@@ -1335,44 +1362,6 @@ func (p *Pages) RepoPullInterdiffPage(w io.Writer, params RepoPullInterdiffParam
 	return p.execute("repo/pulls/interdiff", w, params)
 }
 
-type PullPatchUploadParams struct {
-	RepoInfo repoinfo.RepoInfo
-}
-
-func (p *Pages) PullPatchUploadFragment(w io.Writer, params PullPatchUploadParams) error {
-	return p.executePlain("repo/pulls/fragments/pullPatchUpload", w, params)
-}
-
-type PullCompareBranchesParams struct {
-	RepoInfo     repoinfo.RepoInfo
-	Branches     []types.Branch
-	SourceBranch string
-}
-
-func (p *Pages) PullCompareBranchesFragment(w io.Writer, params PullCompareBranchesParams) error {
-	return p.executePlain("repo/pulls/fragments/pullCompareBranches", w, params)
-}
-
-type PullCompareForkParams struct {
-	RepoInfo repoinfo.RepoInfo
-	Forks    []models.Repo
-	Selected string
-}
-
-func (p *Pages) PullCompareForkFragment(w io.Writer, params PullCompareForkParams) error {
-	return p.executePlain("repo/pulls/fragments/pullCompareForks", w, params)
-}
-
-type PullCompareForkBranchesParams struct {
-	RepoInfo       repoinfo.RepoInfo
-	SourceBranches []types.Branch
-	TargetBranches []types.Branch
-}
-
-func (p *Pages) PullCompareForkBranchesFragment(w io.Writer, params PullCompareForkBranchesParams) error {
-	return p.executePlain("repo/pulls/fragments/pullCompareForksBranches", w, params)
-}
-
 type PullResubmitParams struct {
 	LoggedInUser *oauth.MultiAccountUser
 	RepoInfo     repoinfo.RepoInfo
diff --git a/appview/pages/pulls_wizard.go b/appview/pages/pulls_wizard.go
new file mode 100644
index 00000000..1e0ab432
--- /dev/null
+++ b/appview/pages/pulls_wizard.go
@@ -0,0 +1,24 @@
+package pages
+
+import "strings"
+
+type Source string
+
+const (
+	SourcePatch  Source = "patch"
+	SourceBranch Source = "branch"
+	SourceFork   Source = "fork"
+)
+
+func ParseSource(s string) (Source, bool) {
+	switch strings.ToLower(s) {
+	case string(SourcePatch):
+		return SourcePatch, true
+	case string(SourceFork):
+		return SourceFork, true
+	case string(SourceBranch):
+		return SourceBranch, true
+	default:
+		return "", false
+	}
+}
diff --git a/appview/pages/templates/fragments/markdownPreview.html b/appview/pages/templates/fragments/markdownPreview.html
new file mode 100644
index 00000000..b65f13b3
--- /dev/null
+++ b/appview/pages/templates/fragments/markdownPreview.html
@@ -0,0 +1,9 @@
+{{ define "fragments/markdownPreview" }}
+    {{ if . }}
+        <div class="prose dark:prose-invert max-w-none">
+            {{ . | markdown }}
+        </div>
+    {{ else }}
+        <div class="text-gray-400 dark:text-gray-500 italic">Nothing to preview.</div>
+    {{ end }}
+{{ end }}
diff --git a/appview/pages/templates/repo/fragments/compareAllowPull.html b/appview/pages/templates/repo/fragments/compareAllowPull.html
index 870a3a9e..9cdf9374 100644
--- a/appview/pages/templates/repo/fragments/compareAllowPull.html
+++ b/appview/pages/templates/repo/fragments/compareAllowPull.html
@@ -9,7 +9,7 @@
             discussed.
         </p>
 
-        {{ $newPullUrl := printf "/%s/pulls/new?strategy=branch&targetBranch=%s&sourceBranch=%s" .RepoInfo.FullName .Base .Head }}
+        {{ $newPullUrl := printf "/%s/pulls/new?source=branch&sourceBranch=%s&targetBranch=%s" .RepoInfo.FullName (urlquery .Head) (urlquery .Base) }}
 
 
         <div class="flex justify-start items-center gap-2 mt-2">
diff --git a/appview/pages/templates/repo/fragments/diff.html b/appview/pages/templates/repo/fragments/diff.html
index ecc77798..6985a132 100644
--- a/appview/pages/templates/repo/fragments/diff.html
+++ b/appview/pages/templates/repo/fragments/diff.html
@@ -101,10 +101,11 @@
 {{ define "diffLayout" }}
   {{ $diff := index . 0 }}
   {{ $opts := index . 1 }}
+  {{ $padBottom := gt (len .) 2 }}
 
   <div class="flex col-span-full flex-grow">
     <!-- left panel -->
-    <div id="files" class="w-0 hidden md:block overflow-hidden sticky top-12 max-h-screen overflow-y-auto pb-12">
+    <div id="files" class="w-0 hidden md:block overflow-hidden sticky top-12 max-h-screen overflow-y-auto {{ if $padBottom }}pb-12{{ end }}">
       <section class="overflow-x-auto text-sm px-6 py-2 border border-gray-200 dark:border-gray-700 w-full mx-auto min-h-full rounded bg-white dark:bg-gray-800 drop-shadow-sm">
         {{ template "repo/fragments/fileTree" $diff.FileTree }}
       </section>
@@ -113,7 +114,7 @@
     {{ template "resize-grip" (list "resize-files" "files" "before") }}
 
     <!-- main content -->
-    <div id="diff-files" class="flex-1 min-w-0 sticky top-12 pb-12">
+    <div id="diff-files" class="flex-1 min-w-0 sticky top-12 {{ if $padBottom }}pb-12{{ end }}">
       {{ template "diffFiles" (list $diff $opts) }}
     </div>
 
@@ -214,7 +215,7 @@
 {{ end }}
 
 {{ define "filesCheckbox" }}
-  <input type="checkbox" id="filesToggle" class="peer/files hidden" checked/>
+  <input type="checkbox" id="filesToggle" class="peer/files hidden" {{ if gt (len .) 2 }}checked{{ end }}/>
 {{ end }}
 
 {{ define "filesToggle" }}
diff --git a/appview/pages/templates/repo/fragments/diffOpts.html b/appview/pages/templates/repo/fragments/diffOpts.html
index 64a6785a..c16714ea 100644
--- a/appview/pages/templates/repo/fragments/diffOpts.html
+++ b/appview/pages/templates/repo/fragments/diffOpts.html
@@ -4,28 +4,47 @@
     {{ $active = "split" }}
   {{ end }}
 
-  {{ $activeTab := "bg-white dark:bg-gray-700 shadow-sm" }}
+  {{ $activeTab := "bg-white dark:bg-gray-700 shadow-sm cursor-default" }}
   {{ $inactiveTab := "bg-gray-100 dark:bg-gray-800 shadow-inner" }}
+  {{ $usePost := ne .RefreshUrl "" }}
+  {{ $target := .Target }}
+  {{ if eq $target "" }}{{ $target = "#diff-files" }}{{ end }}
+  {{ $field := .Field }}
+  {{ if eq $field "" }}{{ $field = "diff" }}{{ end }}
 
   <div class="flex justify-between divide-x divide-gray-200 dark:divide-gray-700 rounded border border-gray-200 dark:border-gray-700 overflow-hidden"
-       hx-on::before-request="const t=event.target.closest('button'); if(!t||t.classList.contains('shadow-sm'))return event.preventDefault(); this.querySelectorAll('button').forEach(b => { const active=b===t; b.classList.toggle('bg-white',active); b.classList.toggle('dark:bg-gray-700',active); b.classList.toggle('shadow-sm',active); b.classList.toggle('bg-gray-100',!active); b.classList.toggle('dark:bg-gray-800',!active); b.classList.toggle('shadow-inner',!active); })">
+       hx-on::before-request="const t=event.target.closest('button'); if(!t||t.classList.contains('shadow-sm'))return event.preventDefault(); this.querySelectorAll('button').forEach(b => { const active=b===t; b.classList.toggle('bg-white',active); b.classList.toggle('dark:bg-gray-700',active); b.classList.toggle('shadow-sm',active); b.classList.toggle('cursor-default',active); b.classList.toggle('bg-gray-100',!active); b.classList.toggle('dark:bg-gray-800',!active); b.classList.toggle('shadow-inner',!active); })">
     <button
-       hx-get="?diff=unified"
-       hx-target="#diff-files"
-       hx-select="#diff-files"
-       hx-swap="outerHTML"
+       {{ if $usePost }}
+       hx-post="{{ .RefreshUrl }}"
+       hx-vals='{"{{ $field }}":"unified"}'
+       hx-include="closest form"
+       {{ else }}
+       hx-get="?{{ $field }}=unified"
        hx-push-url="true"
+       {{ end }}
+       hx-target="{{ $target }}"
+       hx-select="{{ $target }}"
+       hx-swap="outerHTML"
+       hx-indicator="this"
        class="group p-2 whitespace-nowrap flex justify-center items-center gap-2 text-sm w-full hover:no-underline text-center {{ if eq $active "unified" }} {{ $activeTab }} {{ else }} {{ $inactiveTab }} {{ end }}">
       {{ i "square-split-vertical" "size-4 inline group-[.htmx-request]:hidden" }}
       {{ i "loader-circle" "size-4 animate-spin hidden group-[.htmx-request]:inline" }}
       unified
     </button>
     <button
-       hx-get="?diff=split"
-       hx-target="#diff-files"
-       hx-select="#diff-files"
-       hx-swap="outerHTML"
+       {{ if $usePost }}
+       hx-post="{{ .RefreshUrl }}"
+       hx-vals='{"{{ $field }}":"split"}'
+       hx-include="closest form"
+       {{ else }}
+       hx-get="?{{ $field }}=split"
        hx-push-url="true"
+       {{ end }}
+       hx-target="{{ $target }}"
+       hx-select="{{ $target }}"
+       hx-swap="outerHTML"
+       hx-indicator="this"
        class="group p-2 whitespace-nowrap flex justify-center items-center gap-2 text-sm w-full hover:no-underline text-center {{ if eq $active "split" }} {{ $activeTab }} {{ else }} {{ $inactiveTab }} {{ end }}">
       {{ i "square-split-horizontal" "size-4 inline group-[.htmx-request]:hidden" }}
       {{ i "loader-circle" "size-4 animate-spin hidden group-[.htmx-request]:inline" }}
diff --git a/appview/pages/templates/repo/fragments/editLabelPanel.html b/appview/pages/templates/repo/fragments/editLabelPanel.html
index e121783d..9430df71 100644
--- a/appview/pages/templates/repo/fragments/editLabelPanel.html
+++ b/appview/pages/templates/repo/fragments/editLabelPanel.html
@@ -20,42 +20,56 @@
   {{ $defs := .Defs }}
   {{ $subject := .Subject }}
   {{ $state := .State }}
+  {{ $prefix := .Prefix }}
   {{ $labelStyle := "flex items-center gap-2 rounded py-1 px-2 border border-gray-200 dark:border-gray-700 text-sm bg-white dark:bg-gray-800 text-black dark:text-white" }}
-  <div>
-    {{ template "repo/fragments/labelSectionHeaderText" "Labels" }}
-
-    <div class="flex gap-1 items-center flex-wrap">
-      {{ range $k, $d := $defs }}
-        {{ $isChecked := $state.ContainsLabel $k }}
-        {{ if $d.ValueType.IsNull }}
-          {{ $fieldName := $d.AtUri }}
-          <label class="{{$labelStyle}}">
-            <input type="checkbox" id="{{ $fieldName }}" name="{{ $fieldName }}" value="null" {{if $isChecked}}checked{{end}}>
-            {{ template "labels/fragments/labelDef" $d }}
-          </label>
+  {{ $hasNullDefs := false }}
+  {{ range $k, $d := $defs }}
+    {{ if $d.ValueType.IsNull }}{{ $hasNullDefs = true }}{{ end }}
+  {{ end }}
+  {{ if or $hasNullDefs (not $defs) }}
+    <div>
+      {{ template "repo/fragments/labelSectionHeaderText" "Labels" }}
+
+      <div class="flex flex-col gap-1 items-start">
+        {{ range $k, $d := $defs }}
+          {{ $isChecked := $state.ContainsLabel $k }}
+          {{ if $d.ValueType.IsNull }}
+            {{ $fieldName := $d.AtUri.String }}
+            {{ if $prefix }}{{ $fieldName = printf "%s[%s]" $prefix $d.AtUri }}{{ end }}
+            <label class="{{$labelStyle}}">
+              <input type="checkbox" name="{{ $fieldName }}" value="null" {{if $isChecked}}checked{{end}}>
+              {{ template "labels/fragments/labelDef" $d }}
+            </label>
+          {{ end }}
+        {{ else }}
+          <p class="text-gray-500 dark:text-gray-400 text-sm py-1">
+            No labels defined yet. You can choose default labels or define custom
+            labels in <a class="underline" href="/{{ $.RepoInfo.FullName }}/settings">settings</a>.
+          </p>
         {{ end }}
-      {{ else }}
-        <p class="text-gray-500 dark:text-gray-400 text-sm py-1">
-          No labels defined yet. You can choose default labels or define custom
-          labels in <a class="underline" href="/{{ $.RepoInfo.FullName }}/settings">settings</a>.
-        </p>
-      {{ end }}
+      </div>
     </div>
-  </div>
+  {{ end }}
 {{ end }}
 
 {{ define "editKvLabels" }}
   {{ $defs := .Defs }}
   {{ $subject := .Subject }}
   {{ $state := .State }}
+  {{ $prefix := .Prefix }}
+  {{ $groupSuffix := "" }}
+  {{ if $prefix }}{{ $groupSuffix = printf "-%s" $prefix }}{{ end }}
   {{ $labelStyle := "font-normal normal-case flex items-center gap-2 p-0" }}
 
   {{ range $k, $d := $defs }}
     {{ if (not $d.ValueType.IsNull) }}
-      {{ $fieldName := $d.AtUri }}
+      {{ $fieldName := $d.AtUri.String }}
+      {{ if $prefix }}{{ $fieldName = printf "%s[%s]" $prefix $d.AtUri }}{{ end }}
       {{ $valset := $state.GetValSet $k }}
-      <div id="label-{{$d.Id}}" class="flex flex-col gap-1">
-        {{ template "repo/fragments/labelSectionHeaderText" $d.Name }}
+      <div id="label-{{$d.Id}}{{ $groupSuffix }}" class="flex flex-col gap-1">
+        {{ if not $d.ValueType.IsBool }}
+          {{ template "repo/fragments/labelSectionHeaderText" $d.Name }}
+        {{ end }}
           {{ if (and $d.Multiple $d.ValueType.IsEnum) }}
             <!-- checkbox -->
             {{ range $variant := $d.ValueType.Enum }}
@@ -67,11 +81,14 @@
           {{ else if $d.Multiple }}
             <!-- dynamically growing input fields -->
             {{ range $v, $s := $valset }}
-              {{ template "multipleInputField" (dict "def" $d "value" $v "key" $k) }}
+              {{ template "multipleInputField" (dict "def" $d "value" $v "key" $k "prefix" $prefix) }}
             {{ else }}
-              {{ template "multipleInputField" (dict "def" $d "value" "" "key" $k) }}
+              {{ template "multipleInputField" (dict "def" $d "value" "" "key" $k "prefix" $prefix) }}
+            {{ end }}
+            {{ template "addFieldButton" (dict "def" $d "prefix" $prefix "groupSuffix" $groupSuffix) }}
+            {{ if and $.LoggedInUser $d.ValueType.IsString $d.ValueType.IsDidFormat }}
+              {{ template "assignToMeButton" (dict "def" $d "user" $.LoggedInUser "groupSuffix" $groupSuffix) }}
             {{ end }}
-            {{ template "addFieldButton" $d }}
           {{ else if $d.ValueType.IsEnum }}
             <!-- radio buttons -->
             {{ $isUsed := $state.ContainsLabel $k }}
@@ -88,9 +105,9 @@
           {{ else }}
             <!-- single input field based on value type -->
             {{ range $v, $s := $valset }}
-              {{ template "valueTypeInput" (dict "def" $d "value" $v "key" $k) }}
+              {{ template "valueTypeInput" (dict "def" $d "value" $v "key" $k "prefix" $prefix) }}
             {{ else }}
-              {{ template "valueTypeInput" (dict "def" $d "value" "" "key" $k) }}
+              {{ template "valueTypeInput" (dict "def" $d "value" "" "key" $k "prefix" $prefix) }}
             {{ end }}
           {{ end }}
       </div>
@@ -100,16 +117,48 @@
 
 {{ define "multipleInputField" }}
   <div class="flex gap-1 items-stretch">
-    {{ template "valueTypeInput" . }}
+    <div class="flex-1 min-w-0">
+      {{ template "valueTypeInput" . }}
+    </div>
     {{ template "removeFieldButton" }}
   </div>
 {{ end }}
 
+{{ define "assignToMeButton" }}
+  {{ $def := .def }}
+  {{ $user := .user }}
+  {{ $groupSuffix := .groupSuffix }}
+  {{ $handle := trimPrefix (resolve $user.Did) "@" }}
+  <button type="button"
+    data-assign-to-me="{{ $def.Id }}{{ $groupSuffix }}"
+    data-handle="{{ $handle }}"
+    onclick="(() => {
+      const group = document.getElementById('label-' + this.dataset.assignToMe);
+      const handle = this.dataset.handle;
+      const inputs = group.querySelectorAll('input[type=text]');
+      const empty = Array.from(inputs).find(i => !i.value.trim());
+      if (empty) { empty.value = handle; return; }
+      if (Array.from(inputs).some(i => i.value.trim() === handle)) return;
+      const tpl = document.getElementById('tpl-' + this.dataset.assignToMe);
+      if (!tpl) return;
+      const addBtn = tpl.nextElementSibling;
+      addBtn.insertAdjacentHTML('beforebegin', tpl.innerHTML);
+      const newInput = addBtn.previousElementSibling.querySelector('input[type=text]');
+      if (newInput) newInput.value = handle;
+    })()"
+    class="text-xs text-gray-500 dark:text-gray-400 hover:underline self-end">
+    assign to me
+  </button>
+{{ end }}
+
 {{ define "addFieldButton" }}
-  <div style="display:none" id="tpl-{{ .Id }}">
-    {{ template "multipleInputField" (dict "def" . "value" "" "key" .AtUri.String) }}
+  {{ $def := .def }}
+  {{ $prefix := .prefix }}
+  {{ $groupSuffix := .groupSuffix }}
+  <div style="display:none" id="tpl-{{ $def.Id }}{{ $groupSuffix }}">
+    {{ template "multipleInputField" (dict "def" $def "value" "" "key" $def.AtUri.String "prefix" $prefix) }}
   </div>
-  <button type="button" onClick="this.insertAdjacentHTML('beforebegin', document.getElementById('tpl-{{ .Id }}').innerHTML)" class="w-full btn flex items-center gap-2">
+  <button type="button" onClick="this.insertAdjacentHTML('beforebegin', document.getElementById('tpl-{{ $def.Id }}{{ $groupSuffix }}').innerHTML)" class="w-full btn flex items-center gap-2">
     {{ i "plus" "size-4" }} add
   </button>
 {{ end }}
@@ -139,35 +188,31 @@
 
 {{ define "boolTypeInput" }}
   {{ $def := .def }}
-  {{ $fieldName := $def.AtUri }}
+  {{ $prefix := .prefix }}
+  {{ $fieldName := $def.AtUri.String }}
+  {{ if $prefix }}{{ $fieldName = printf "%s[%s]" $prefix $def.AtUri }}{{ end }}
   {{ $value := .value }}
-  {{ $labelStyle = "font-normal normal-case flex items-center gap-2" }}
-  <div class="flex flex-col gap-1">
-    <label class="{{$labelStyle}}">
-      <input type="radio" name="{{ $fieldName }}" value="true" {{ if not $value }}checked{{ end }}>
-      None
-    </label>
-    <label class="{{$labelStyle}}">
-      <input type="radio" name="{{ $fieldName }}" value="true" {{ if not $value }}checked{{ end }}>
-      None
-    </label>
-    <label class="{{$labelStyle}}">
-      <input type="radio" name="{{ $fieldName }}" value="true" {{ if not $value }}checked{{ end }}>
-      None
-    </label>
-  </div>
+  {{ $isOn := eq $value "true" }}
+  <label class="font-normal normal-case flex items-center gap-2">
+    <input type="checkbox" name="{{ $fieldName }}" value="true" {{ if $isOn }}checked{{ end }}>
+    {{ $def.Name }}
+  </label>
 {{ end }}
 
 {{ define "intTypeInput" }}
   {{ $def := .def }}
-  {{ $fieldName := $def.AtUri }}
+  {{ $prefix := .prefix }}
+  {{ $fieldName := $def.AtUri.String }}
+  {{ if $prefix }}{{ $fieldName = printf "%s[%s]" $prefix $def.AtUri }}{{ end }}
   {{ $value := .value }}
   <input class="p-1 w-full" type="number" name="{{$fieldName}}" value="{{$value}}">
 {{ end }}
 
 {{ define "stringTypeInput" }}
   {{ $def := .def }}
-  {{ $fieldName := $def.AtUri }}
+  {{ $prefix := .prefix }}
+  {{ $fieldName := $def.AtUri.String }}
+  {{ if $prefix }}{{ $fieldName = printf "%s[%s]" $prefix $def.AtUri }}{{ end }}
   {{ $valueType := $def.ValueType }}
   {{ $value := .value }}
 
@@ -192,7 +237,9 @@
 
 {{ define "nullTypeInput" }}
   {{ $def := .def }}
-  {{ $fieldName := $def.AtUri }}
+  {{ $prefix := .prefix }}
+  {{ $fieldName := $def.AtUri.String }}
+  {{ if $prefix }}{{ $fieldName = printf "%s[%s]" $prefix $def.AtUri }}{{ end }}
   <input class="p-1" type="hidden" name="{{$fieldName}}" value="null">
 {{ end }}
 
diff --git a/appview/pages/templates/repo/fragments/fileTree.html b/appview/pages/templates/repo/fragments/fileTree.html
index 186cffdd..d8a52939 100644
--- a/appview/pages/templates/repo/fragments/fileTree.html
+++ b/appview/pages/templates/repo/fragments/fileTree.html
@@ -1,4 +1,16 @@
 {{ define "repo/fragments/fileTree" }}
+  {{ template "fileTreeImpl" (dict "Node" . "Prefix" "file-") }}
+{{ end }}
+
+{{ define "repo/fragments/fileTreePrefixed" }}
+  {{ $prefix := .Prefix }}
+  {{ if eq $prefix "" }}{{ $prefix = "file-" }}{{ end }}
+  {{ template "fileTreeImpl" (dict "Node" .Tree "Prefix" $prefix) }}
+{{ end }}
+
+{{ define "fileTreeImpl" }}
+  {{ $n := .Node }}
+  {{ $prefix := .Prefix }}
   {{/* tailwind safelist:
     group/level-1 group/level-2 group/level-3 group/level-4 group/level-5 group/level-6
     group/level-7 group/level-8 group/level-9 group/level-10 group/level-11 group/level-12
@@ -7,29 +19,29 @@
     group-open/level-1:block group-open/level-2:block group-open/level-3:block group-open/level-4:block group-open/level-5:block group-open/level-6:block
     group-open/level-7:block group-open/level-8:block group-open/level-9:block group-open/level-10:block group-open/level-11:block group-open/level-12:block
     */}}
-  {{ if and .Name .IsDirectory }}
-    <details open class="group/level-{{ .Level }}">
+  {{ if and $n.Name $n.IsDirectory }}
+    <details open class="group/level-{{ $n.Level }}">
       <summary class="cursor-pointer list-none pt-1">
         <span class="tree-directory inline-flex items-center gap-2">
-          {{ i "folder" (printf "flex-shrink-0 size-4 group-open/level-%d:hidden" .Level)}}
-          {{ i "folder-open" (printf "flex-shrink-0 size-4 hidden group-open/level-%d:block" .Level)}}
-          <span class="filename truncate text-black dark:text-white">{{ .Name }}</span>
+          {{ i "folder" (printf "flex-shrink-0 size-4 group-open/level-%d:hidden" $n.Level)}}
+          {{ i "folder-open" (printf "flex-shrink-0 size-4 hidden group-open/level-%d:block" $n.Level)}}
+          <span class="filename truncate text-black dark:text-white">{{ $n.Name }}</span>
         </span>
       </summary>
       <div class="ml-1 pl-2 border-l border-gray-200 dark:border-gray-700">
-        {{ range $child := .Children }}
-          {{ template "repo/fragments/fileTree" $child }}
+        {{ range $child := $n.Children }}
+          {{ template "fileTreeImpl" (dict "Node" $child "Prefix" $prefix) }}
         {{ end }}
       </div>
     </details>
-  {{ else if .Name }}
+  {{ else if $n.Name }}
     <div class="tree-file flex items-center gap-2 pt-1">
       {{ i "file" "flex-shrink-0 size-4" }}
-      <a href="#file-{{ .Path }}" data-path="{{ .Path }}" class="filetree-link filename truncate text-black dark:text-white no-underline hover:underline">{{ .Name }}</a>
+      <a href="#{{ $prefix }}{{ $n.Path }}" data-path="{{ $n.Path }}" class="filetree-link filename truncate text-black dark:text-white no-underline hover:underline">{{ $n.Name }}</a>
     </div>
   {{ else }}
-    {{ range $child := .Children }}
-      {{ template "repo/fragments/fileTree" $child }}
+    {{ range $child := $n.Children }}
+      {{ template "fileTreeImpl" (dict "Node" $child "Prefix" $prefix) }}
     {{ end }}
   {{ end }}
 {{ end }}
diff --git a/appview/pages/templates/repo/fragments/labelSectionHeaderText.html b/appview/pages/templates/repo/fragments/labelSectionHeaderText.html
index 638fb11d..72cabe6e 100644
--- a/appview/pages/templates/repo/fragments/labelSectionHeaderText.html
+++ b/appview/pages/templates/repo/fragments/labelSectionHeaderText.html
@@ -1,3 +1,3 @@
 {{ define "repo/fragments/labelSectionHeaderText" }}
-  <span class="text-sm py-1 font-bold text-gray-500 dark:text-gray-400 capitalize">{{ . }}</span>
+  <span class="text-xs uppercase tracking-wide text-gray-800 dark:text-gray-200">{{ . }}</span>
 {{ end }}
diff --git a/appview/pages/templates/repo/pulls/fragments/pullCompareBranches.html b/appview/pages/templates/repo/pulls/fragments/pullCompareBranches.html
index bad7b045..c8b91aa3 100644
--- a/appview/pages/templates/repo/pulls/fragments/pullCompareBranches.html
+++ b/appview/pages/templates/repo/pulls/fragments/pullCompareBranches.html
@@ -1,45 +1,43 @@
 {{ define "repo/pulls/fragments/pullCompareBranches" }}
-    <div id="patch-upload">
-        <label for="targetBranch" class="dark:text-white">select a source branch</label>
-        <div class="flex flex-wrap gap-2 items-center">
-            <select
-                name="sourceBranch"
-                class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600"
-            >
-                <option disabled selected>source branch</option>
+    <div id="patch-upload" class="flex flex-wrap gap-2 items-center">
+        <select
+            id="sourceBranch"
+            name="sourceBranch"
+            hx-post="/{{ .RepoInfo.FullName }}/pulls/new/refresh"
+            hx-include="closest form"
+            hx-target="#wizard-host"
+            hx-swap="outerHTML"
+            hx-trigger="change"
+            hx-indicator="this"
+            class="peer p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600"
+        >
+            <option disabled {{ if not .SourceBranch }}selected{{ end }}>Source branch</option>
 
-                {{ $recent := index .Branches 0 }}
-                {{ range .Branches }}
-                    {{ $isRecent := eq .Reference.Name $recent.Reference.Name }}
-                    {{ $preset := false }}
-                    {{ if $.SourceBranch }}
-                        {{ $preset = eq .Reference.Name $.SourceBranch }}
-                    {{ else }}
-                        {{ $preset = $isRecent }}
-                    {{ end }}
-                    
-                    <option
-                        value="{{ .Reference.Name }}"
-                        {{ if $preset }}
-                            selected
-                        {{ end }}
-                        class="py-1"
-                    >
-                        {{ .Reference.Name }}
-                        {{ if $isRecent }}(new){{ end }}
-                    </option>
+            {{ $recent := "" }}
+            {{ if .SourceBranches }}
+                {{ $recent = (index .SourceBranches 0).Reference.Name }}
+            {{ end }}
+            {{ range .SourceBranches }}
+                {{ $isRecent := eq .Reference.Name $recent }}
+                {{ $preset := false }}
+                {{ if $.SourceBranch }}
+                    {{ $preset = eq .Reference.Name $.SourceBranch }}
+                {{ else }}
+                    {{ $preset = $isRecent }}
                 {{ end }}
-            </select>
-        </div>
-    </div>
 
-    <div class="flex items-center gap-2">
-      <input type="checkbox" id="isStacked" name="isStacked" value="on">
-      <label for="isStacked" class="my-0 py-0 normal-case font-normal">Submit as stacked PRs</label>
+                <option
+                    value="{{ .Reference.Name }}"
+                    {{ if $preset }}selected{{ end }}
+                    {{ if and $.TargetBranch (eq .Reference.Name $.TargetBranch) }}disabled{{ end }}
+                    class="py-1"
+                >
+                    {{ .Reference.Name }}
+                    {{ if $isRecent }}(new){{ end }}
+                    {{ if and $.TargetBranch (eq .Reference.Name $.TargetBranch) }}(target){{ end }}
+                </option>
+            {{ end }}
+        </select>
+        {{ i "loader-circle" "size-4 animate-spin hidden peer-[.htmx-request]:inline text-gray-500 dark:text-gray-400" }}
     </div>
-
-    <p class="mt-4">
-        Title and description are optional; if left out, they will be extracted
-        from the first commit.
-    </p>
 {{ end }}
diff --git a/appview/pages/templates/repo/pulls/fragments/pullCompareForks.html b/appview/pages/templates/repo/pulls/fragments/pullCompareForks.html
index e48cd4e0..9ef37377 100644
--- a/appview/pages/templates/repo/pulls/fragments/pullCompareForks.html
+++ b/appview/pages/templates/repo/pulls/fragments/pullCompareForks.html
@@ -1,53 +1,37 @@
 {{ define "repo/pulls/fragments/pullCompareForks" }}
-    <div id="patch-upload">
-        <label for="forkSelect" class="dark:text-white"
-            >select a fork to compare</label
-        >
-        selected: {{ .Selected }}
-        <div class="flex flex-wrap gap-4 items-center">
-            <div class="flex flex-wrap gap-2 items-center">
-                <select
-                    id="forkSelect"
-                    name="fork"
-                    required
-                    class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600"
-                    hx-get="/{{ $.RepoInfo.FullName }}/pulls/new/fork-branches"
-                    hx-target="#branch-selection"
-                    hx-vals='{"fork": this.value}'
-                    hx-swap="innerHTML"
-                    onchange="document.getElementById('hiddenForkInput').value = this.value;"
-                >
-                    <option disabled selected>select a fork</option>
-                    {{ range .Forks }}
-                        <option value="{{ .Did }}/{{ .Name }}" {{ if eq .Name $.Selected }}selected{{ end }} class="py-1">
-                            {{ .Did | resolve }}/{{ .Name }}
-                        </option>
-                    {{ end }}
-                </select>
-
-                <input
-                    type="hidden"
-                    id="hiddenForkInput"
-                    name="fork"
-                    value=""
-                />
-            </div>
+    <div id="patch-upload" class="flex flex-wrap items-center gap-2">
+        <div class="flex flex-wrap gap-2 items-center">
+            <select
+                id="forkSelect"
+                name="fork"
+                required
+                class="peer p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600"
+                hx-post="/{{ $.RepoInfo.FullName }}/pulls/new/refresh"
+                hx-include="closest form"
+                hx-target="#wizard-host"
+                hx-swap="outerHTML"
+                hx-trigger="change"
+                hx-indicator="this"
+            >
+                <option disabled {{ if not $.Fork }}selected{{ end }}>Select a fork</option>
+                {{ range .Forks }}
+                    {{ $ident := printf "%s/%s" .Did .Name }}
+                    <option value="{{ $ident }}" {{ if eq $ident $.Fork }}selected{{ end }} class="py-1">
+                        {{ .Did | resolve }}/{{ .Name }}
+                    </option>
+                {{ end }}
+            </select>
+            {{ i "loader-circle" "size-4 animate-spin hidden peer-[.htmx-request]:inline text-gray-500 dark:text-gray-400" }}
+        </div>
 
-            <div id="branch-selection">
+        <div id="branch-selection">
+            {{ if and .Fork .ForkBranches }}
+                {{ template "repo/pulls/fragments/pullCompareForksBranches" (dict "SourceBranches" .ForkBranches "SourceBranch" .SourceBranch "RepoInfo" .RepoInfo) }}
+            {{ else }}
                 <div class="text-sm text-gray-500 dark:text-gray-400">
                     Select a fork first to view available branches
                 </div>
-            </div>
+            {{ end }}
         </div>
     </div>
-
-    <div class="flex items-center gap-2">
-      <input type="checkbox" id="isStacked" name="isStacked" value="on">
-      <label for="isStacked" class="my-0 py-0 normal-case font-normal">Submit as stacked PRs</label>
-    </div>
-
-    <p class="mt-4">
-        Title and description are optional; if left out, they will be extracted
-        from the first commit.
-    </p>
 {{ end }}
diff --git a/appview/pages/templates/repo/pulls/fragments/pullCompareForksBranches.html b/appview/pages/templates/repo/pulls/fragments/pullCompareForksBranches.html
index cc426f5f..7ada1950 100644
--- a/appview/pages/templates/repo/pulls/fragments/pullCompareForksBranches.html
+++ b/appview/pages/templates/repo/pulls/fragments/pullCompareForksBranches.html
@@ -2,18 +2,31 @@
     <div class="flex flex-wrap gap-2 items-center">
         <select
             name="sourceBranch"
-            class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600"
+            hx-post="/{{ .RepoInfo.FullName }}/pulls/new/refresh"
+            hx-include="closest form"
+            hx-target="#wizard-host"
+            hx-swap="outerHTML"
+            hx-trigger="change"
+            hx-indicator="this"
+            class="peer p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600"
         >
-            <option disabled selected>source branch</option>
+            <option disabled {{ if not .SourceBranch }}selected{{ end }}>Source branch</option>
 
-            {{ $recent := index .SourceBranches 0 }}
+            {{ $recent := "" }}
+            {{ if .SourceBranches }}
+                {{ $recent = (index .SourceBranches 0).Reference.Name }}
+            {{ end }}
             {{ range .SourceBranches }}
-                {{ $isRecent := eq .Reference.Name $recent.Reference.Name }}
+                {{ $isRecent := eq .Reference.Name $recent }}
+                {{ $preset := false }}
+                {{ if $.SourceBranch }}
+                    {{ $preset = eq .Reference.Name $.SourceBranch }}
+                {{ else }}
+                    {{ $preset = $isRecent }}
+                {{ end }}
                 <option
                     value="{{ .Reference.Name }}"
-                    {{ if $isRecent }}
-                        selected
-                    {{ end }}
+                    {{ if $preset }}selected{{ end }}
                     class="py-1"
                 >
                     {{ .Reference.Name }}
@@ -21,5 +34,6 @@
                 </option>
             {{ end }}
         </select>
+        {{ i "loader-circle" "size-4 animate-spin hidden peer-[.htmx-request]:inline text-gray-500 dark:text-gray-400" }}
     </div>
 {{ end }}
diff --git a/appview/pages/templates/repo/pulls/fragments/pullPatchUpload.html b/appview/pages/templates/repo/pulls/fragments/pullPatchUpload.html
index 9f330a11..7748d814 100644
--- a/appview/pages/templates/repo/pulls/fragments/pullPatchUpload.html
+++ b/appview/pages/templates/repo/pulls/fragments/pullPatchUpload.html
@@ -1,13 +1,21 @@
 {{ define "repo/pulls/fragments/pullPatchUpload" }}
     <div id="patch-upload">
-        <p>
-            You can paste a <code>git diff</code> or a
-            <code>git format-patch</code> patch series here.
-        </p>
+        <div class="flex items-center justify-between gap-2">
+            <p class="my-0">
+                You can paste a <code>git diff</code> or a
+                <code>git format-patch</code> patch series here.
+            </p>
+            <span id="patch-spinner" class="group">
+                {{ i "loader-circle" "size-4 animate-spin hidden group-[.htmx-request]:inline text-gray-500 dark:text-gray-400" }}
+            </span>
+        </div>
         <textarea
-            hx-trigger="keyup changed delay:500ms, paste delay:500ms"
-            hx-post="/{{ .RepoInfo.FullName }}/pulls/new/validate-patch"
-            hx-swap="none"
+            hx-trigger="paste delay:100ms, change"
+            hx-post="/{{ .RepoInfo.FullName }}/pulls/new/refresh"
+            hx-include="closest form"
+            hx-target="#wizard-host"
+            hx-swap="outerHTML"
+            hx-indicator="#patch-spinner"
             name="patch"
             id="patch"
             rows="12"
@@ -16,6 +24,6 @@
 index 1234567..abcdefg 100644
 --- a/file.txt
 +++ b/file.txt"
-        ></textarea>
+        >{{ .Patch }}</textarea>
     </div>
 {{ end }}
diff --git a/appview/pages/templates/repo/pulls/fragments/pullStepDetails.html b/appview/pages/templates/repo/pulls/fragments/pullStepDetails.html
new file mode 100644
index 00000000..389fba8a
--- /dev/null
+++ b/appview/pages/templates/repo/pulls/fragments/pullStepDetails.html
@@ -0,0 +1,146 @@
+{{ define "repo/pulls/fragments/pullStepDetails" }}
+    {{ $hasSidePanel := and .LabelDefs .RepoInfo.Roles.IsPushAllowed }}
+    {{ $previewUrl := printf "/%s/pulls/new/preview" .RepoInfo.FullName }}
+    {{ $labelCtx := dict "Defs" .LabelDefs "State" .LabelState "RepoInfo" .RepoInfo "Subject" "" "LoggedInUser" .LoggedInUser }}
+
+    <section class="flex flex-col md:flex-row gap-6">
+        <div class="flex-1 min-w-0 flex flex-col gap-4">
+            {{ template "pullStepDetailsSingle" (dict "Root" . "PreviewUrl" $previewUrl) }}
+            {{ template "pullSubmitRow" . }}
+        </div>
+
+        {{ if $hasSidePanel }}
+            <aside class="w-full md:w-72 md:flex-shrink-0 flex flex-col gap-6">
+                {{ template "editBasicLabels" $labelCtx }}
+                {{ template "editKvLabels" $labelCtx }}
+            </aside>
+        {{ end }}
+    </section>
+
+    {{ template "markdownEditorScript" }}
+{{ end }}
+
+{{ define "pullStepDetailsSingle" }}
+    {{ $root := .Root }}
+    {{ $previewUrl := .PreviewUrl }}
+    <div class="flex flex-col gap-1">
+        <label for="title" class="text-xs uppercase tracking-wide text-gray-800 dark:text-gray-200">title</label>
+        <input
+            type="text"
+            name="title"
+            id="title"
+            value="{{ $root.Title }}"
+            class="w-full dark:bg-gray-700 dark:text-white dark:border-gray-600"
+            placeholder="One-line summary of your change."
+        />
+    </div>
+
+    {{ template "markdownEditor" (dict
+        "Id" "pull-body"
+        "Name" "body"
+        "Value" $root.Body
+        "Rows" 6
+        "Placeholder" "Describe your change. Markdown is supported."
+        "PreviewUrl" $previewUrl
+    ) }}
+{{ end }}
+
+{{ define "markdownEditor" }}
+    {{ $id := .Id }}
+    {{ $name := .Name }}
+    {{ $value := .Value }}
+    {{ $rows := .Rows }}
+    {{ $placeholder := .Placeholder }}
+    {{ $previewUrl := .PreviewUrl }}
+    <div class="flex flex-col gap-2" data-md-editor="{{ $id }}">
+        {{ $tabClasses := "group flex items-center gap-2 px-3 py-1.5 text-sm whitespace-nowrap hover:no-underline data-[active=true]:bg-white data-[active=true]:dark:bg-gray-700 data-[active=true]:shadow-sm data-[active=true]:cursor-default data-[active=false]:bg-gray-100 data-[active=false]:dark:bg-gray-800 data-[active=false]:shadow-inner" }}
+        <div class="flex divide-x divide-gray-200 dark:divide-gray-700 rounded border border-gray-200 dark:border-gray-700 overflow-hidden self-start">
+            <button type="button" data-md-mode="write"
+                data-active="true"
+                class="{{ $tabClasses }}">
+                {{ i "pencil" "w-3.5 h-3.5 inline group-[.htmx-request]:hidden" }}
+                Write
+            </button>
+            <button type="button" data-md-mode="preview"
+                data-active="false"
+                hx-post="{{ $previewUrl }}"
+                hx-vals='js:{body: document.querySelector("[data-md-editor=\"{{ $id }}\"] textarea").value}'
+                hx-params="body"
+                hx-target="[data-md-editor='{{ $id }}'] [data-md-preview]"
+                hx-swap="innerHTML"
+                hx-indicator="this"
+                class="{{ $tabClasses }}">
+                {{ i "eye" "w-3.5 h-3.5 inline group-[.htmx-request]:hidden" }}
+                {{ i "loader-circle" "w-3.5 h-3.5 animate-spin hidden group-[.htmx-request]:inline" }}
+                Preview
+            </button>
+        </div>
+        <div data-md-panel="write">
+            <textarea
+                id="{{ $id }}"
+                name="{{ $name }}"
+                rows="{{ $rows }}"
+                class="w-full resize-y dark:bg-gray-700 dark:text-white dark:border-gray-600"
+                placeholder="{{ $placeholder }}"
+            >{{ $value }}</textarea>
+        </div>
+        <div data-md-panel="preview" class="hidden">
+            <div data-md-preview class="min-h-[6rem] p-3 border border-gray-200 dark:border-gray-700 rounded bg-gray-50 dark:bg-gray-900/30">
+                <span class="text-gray-400 dark:text-gray-500 italic">Loading preview...</span>
+            </div>
+        </div>
+    </div>
+{{ end }}
+
+{{ define "pullSubmitRow" }}
+    <div class="flex items-center justify-end gap-4 mt-auto">
+        {{ if and .MergeCheck .MergeCheck.IsConflicted }}
+            <div class="flex items-center gap-2 text-sm">
+                <span class="inline-flex items-center gap-1 text-red-600 dark:text-red-400">
+                    {{ i "x" "w-4 h-4" }}
+                    Can't automatically merge
+                </span>
+                <span class="text-gray-500 dark:text-gray-400">You can still create the pull request</span>
+            </div>
+        {{ else if and .MergeCheck .MergeCheck.Error }}
+            <div class="flex items-center gap-2 text-sm text-red-600 dark:text-red-400">
+                {{ i "triangle-alert" "w-4 h-4" }}
+                Merge check failed
+            </div>
+        {{ end }}
+
+        <button
+            type="submit"
+            class="btn-create flex items-center gap-2"
+            hx-indicator="#create-pull-spinner"
+        >
+            {{ i "git-pull-request-create" "w-4 h-4" }}
+            Create pull request
+            <span id="create-pull-spinner" class="group">
+                {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
+            </span>
+        </button>
+    </div>
+{{ end }}
+
+{{ define "markdownEditorScript" }}
+    <script>
+    (() => {
+        if (window.__mdEditorWired) return;
+        window.__mdEditorWired = true;
+        document.body.addEventListener('click', (e) => {
+            const btn = e.target.closest('[data-md-mode]');
+            if (!btn) return;
+            const editor = btn.closest('[data-md-editor]');
+            if (!editor) return;
+            const mode = btn.dataset.mdMode;
+            editor.querySelectorAll('[data-md-panel]').forEach(p => {
+                p.classList.toggle('hidden', p.dataset.mdPanel !== mode);
+            });
+            editor.querySelectorAll('[data-md-mode]').forEach(b => {
+                b.dataset.active = (b === btn) ? 'true' : 'false';
+            });
+        });
+    })();
+    </script>
+{{ end }}
diff --git a/appview/pages/templates/repo/pulls/fragments/pullStepReview.html b/appview/pages/templates/repo/pulls/fragments/pullStepReview.html
new file mode 100644
index 00000000..9101fcc8
--- /dev/null
+++ b/appview/pages/templates/repo/pulls/fragments/pullStepReview.html
@@ -0,0 +1,435 @@
+{{ define "repo/pulls/fragments/pullStepReview" }}
+    <section class="flex flex-col gap-3">
+        {{ if not .Comparison }}
+            <div class="p-4 border border-yellow-200 dark:border-yellow-800 rounded bg-yellow-50 dark:bg-yellow-900/30 text-sm">
+                {{ if eq .Source "patch" }}
+                    Paste a patch above to see a comparison.
+                {{ else }}
+                    Pick a source and target above to see a comparison.
+                {{ end }}
+            </div>
+        {{ else }}
+            {{ $commits := .Comparison.FormatPatch }}
+            {{ if $commits }}
+                <div class="flex flex-col gap-2">
+                    <div class="flex items-center justify-between gap-3 min-w-0 text-sm text-gray-500 dark:text-gray-400">
+                        <span class="flex-shrink-0">{{ len $commits }} commit{{ if ne (len $commits) 1 }}s{{ end }}</span>
+                        {{ if and .SourceBranch .TargetBranch }}
+                            <span class="inline-flex items-center gap-2 font-mono text-gray-600 dark:text-gray-300 truncate">
+                                <span>{{ .TargetBranch }}</span>
+                                {{ i "arrow-left-right" "w-4 h-4 flex-shrink-0" }}
+                                <span>{{ .SourceBranch }}</span>
+                            </span>
+                        {{ end }}
+                    </div>
+                    {{ if .IsStacked }}
+                        {{ template "pullReviewStackedCommits" . }}
+                    {{ else }}
+                        {{ template "pullReviewFlatCommits" . }}
+                    {{ end }}
+                </div>
+            {{ else if ne .Source "patch" }}
+                <div class="p-4 border border-yellow-200 dark:border-yellow-800 rounded bg-yellow-50 dark:bg-yellow-900/30 text-sm">
+                    {{ if and .SourceBranch .TargetBranch (eq .SourceBranch .TargetBranch) }}
+                        Source and target are the same branch, nothing to merge.
+                    {{ else }}
+                        No commits between target and source. Make sure your source branch has commits not on the target.
+                    {{ end }}
+                </div>
+            {{ end }}
+
+            {{ if and .Diff (not .IsStacked) }}
+                {{ template "repo/fragments/diff" (list .Diff .DiffOpts) }}
+            {{ end }}
+
+            {{ if and .IsStacked $commits }}
+                {{ template "pullSubmitRow" . }}
+                {{ template "pullStackApplyAllScript" }}
+            {{ end }}
+        {{ end }}
+    </section>
+{{ end }}
+
+{{ define "pullStackApplyAllScript" }}
+    <script>
+    (() => {
+        if (window.__pullStackApplyAllWired) return;
+        window.__pullStackApplyAllWired = true;
+
+        const rowSelector = ':scope > .flex.gap-1.items-stretch';
+
+        const syncRowCount = (srcGroup, tgtGroup) => {
+            const tpl = tgtGroup.querySelector(':scope > [id^="tpl-"]');
+            if (!tpl) return;
+            const addBtn = tpl.nextElementSibling;
+            if (!addBtn) return;
+            const desired = srcGroup.querySelectorAll(rowSelector).length;
+            let rows = tgtGroup.querySelectorAll(rowSelector);
+            while (rows.length < desired) {
+                addBtn.insertAdjacentHTML('beforebegin', tpl.innerHTML);
+                rows = tgtGroup.querySelectorAll(rowSelector);
+            }
+            while (rows.length > desired) {
+                rows[rows.length - 1].remove();
+                rows = tgtGroup.querySelectorAll(rowSelector);
+            }
+        };
+
+        document.body.addEventListener('click', (e) => {
+            const btn = e.target.closest('[data-stack-apply-all]');
+            if (!btn) return;
+            const source = btn.closest('[data-stack-labels]');
+            if (!source) return;
+            e.preventDefault();
+
+            const targets = Array.from(document.querySelectorAll('[data-stack-labels]'))
+                .filter(t => t !== source);
+
+            const srcGroups = source.querySelectorAll('[id^="label-"]');
+            targets.forEach(target => {
+                const tgtGroups = target.querySelectorAll('[id^="label-"]');
+                srcGroups.forEach((srcGroup, idx) => {
+                    const tgtGroup = tgtGroups[idx];
+                    if (tgtGroup) syncRowCount(srcGroup, tgtGroup);
+                });
+            });
+
+            const sourceInputs = source.querySelectorAll('input, select, textarea');
+            const sourceState = Array.from(sourceInputs).map(i => ({
+                checked: i.checked,
+                value: i.value,
+            }));
+            targets.forEach(target => {
+                const targetInputs = target.querySelectorAll('input, select, textarea');
+                targetInputs.forEach((t, idx) => {
+                    const s = sourceState[idx];
+                    if (!s) return;
+                    if (t.type === 'checkbox' || t.type === 'radio') {
+                        t.checked = s.checked;
+                    } else {
+                        t.value = s.value;
+                    }
+                    t.dispatchEvent(new Event('change', { bubbles: true }));
+                });
+            });
+        });
+    })();
+    </script>
+{{ end }}
+
+{{ define "pullReviewFlatCommits" }}
+    {{ $commits := .Comparison.FormatPatch }}
+    <ul class="flex flex-col gap-2">
+        {{ range $commits }}
+            {{ $email := "" }}
+            {{ if .Author }}{{ $email = .Author.Email }}{{ end }}
+            {{ $did := "" }}
+            {{ if $.EmailToDid }}{{ $did = index $.EmailToDid $email }}{{ end }}
+            <li class="border border-gray-200 dark:border-gray-700 rounded bg-white dark:bg-gray-800 px-3 py-2 flex items-center gap-3">
+                {{ template "pullReviewCommitAuthor" (dict "Did" $did "Patch" .) }}
+                <span class="flex-1 min-w-0 truncate text-sm dark:text-gray-200">{{ .Title }}</span>
+                {{ template "pullReviewCommitMeta" (dict "Patch" . "RepoInfo" $.RepoInfo) }}
+            </li>
+        {{ end }}
+    </ul>
+{{ end }}
+
+{{ define "pullReviewStackedCommits" }}
+    {{ $root := . }}
+    {{ $commits := .Comparison.FormatPatch }}
+    {{ $previewUrl := printf "/%s/pulls/new/preview" .RepoInfo.FullName }}
+    <ul class="flex flex-col gap-2">
+        {{ range $idx, $p := $commits }}
+            {{ $cid := $p.ChangeIdOrEmpty }}
+            {{ $email := "" }}
+            {{ if $p.Author }}{{ $email = $p.Author.Email }}{{ end }}
+            {{ $did := "" }}
+            {{ if $root.EmailToDid }}{{ $did = index $root.EmailToDid $email }}{{ end }}
+            {{ $titleOverride := index $root.StackTitles $cid }}
+            {{ $bodyOverride := index $root.StackBodies $cid }}
+            {{ $displayTitle := $p.Title }}
+            {{ if $titleOverride }}{{ $displayTitle = $titleOverride }}{{ end }}
+            {{ $bodyValue := $p.Body }}
+            {{ if $bodyOverride }}{{ $bodyValue = $bodyOverride }}{{ end }}
+            {{ $perDiff := "" }}
+            {{ if lt $idx (len $root.PerCommitDiffs) }}
+                {{ $perDiff = index $root.PerCommitDiffs $idx }}
+            {{ end }}
+            {{ $perOpts := dict }}
+            {{ if lt $idx (len $root.StackDiffOpts) }}
+                {{ $perOpts = index $root.StackDiffOpts $idx }}
+            {{ end }}
+            <li>
+                <details class="group/stacked border border-gray-200 dark:border-gray-700 rounded bg-white dark:bg-gray-800">
+                    <summary class="p-3 cursor-pointer flex items-center gap-3 list-none">
+                        <span class="text-gray-400 dark:text-gray-500 flex-shrink-0">
+                            {{ i "chevron-right" "w-4 h-4 group-open/stacked:hidden inline" }}
+                            {{ i "chevron-down" "w-4 h-4 hidden group-open/stacked:inline" }}
+                        </span>
+                        {{ template "pullReviewCommitAuthor" (dict "Did" $did "Patch" $p) }}
+                        <span class="flex-1 min-w-0 truncate text-sm dark:text-gray-200">{{ $displayTitle }}</span>
+                        {{ template "pullReviewCommitMeta" (dict "Patch" $p "RepoInfo" $root.RepoInfo) }}
+                    </summary>
+                    {{ if $cid }}
+                        <div class="px-3 pb-3 pt-1 flex flex-col gap-3 border-t border-gray-100 dark:border-gray-700">
+                            {{ if $perDiff }}
+                                <div id="stack-diff-{{ $cid }}">
+                                    <input type="hidden" name="stackSplit[{{ $cid }}]" value="{{ if $perOpts.Split }}split{{ else }}unified{{ end }}" />
+                                    {{ template "pullStackedDiffArea" (dict "Diff" $perDiff "DiffOpts" $perOpts "Cid" $cid) }}
+                                </div>
+                            {{ end }}
+                            {{ $titleName := printf "stackTitle[%s]" $cid }}
+                            {{ $bodyName := printf "stackBody[%s]" $cid }}
+                            {{ $hasSidePanel := and $root.LabelDefs $root.RepoInfo.Roles.IsPushAllowed }}
+                            <div class="flex flex-col md:flex-row gap-6">
+                                <div class="flex-1 min-w-0 flex flex-col gap-3">
+                                    <div class="flex flex-col gap-1">
+                                        <label class="text-xs uppercase tracking-wide text-gray-800 dark:text-gray-200">title</label>
+                                        <input
+                                            type="text"
+                                            name="{{ $titleName }}"
+                                            value="{{ $displayTitle }}"
+                                            class="w-full dark:bg-gray-700 dark:text-white dark:border-gray-600"
+                                            placeholder="{{ $p.Title }}"
+                                        />
+                                    </div>
+                                    {{ template "markdownEditor" (dict
+                                        "Id" (printf "stack-body-%s" $cid)
+                                        "Name" $bodyName
+                                        "Value" $bodyValue
+                                        "Rows" 4
+                                        "Placeholder" "Describe this pull request. Markdown is supported."
+                                        "LabelText" "description"
+                                        "PreviewUrl" $previewUrl
+                                    ) }}
+                                </div>
+                                {{ if $hasSidePanel }}
+                                    <aside data-stack-labels="{{ $cid }}" class="w-full md:w-72 md:flex-shrink-0 flex flex-col gap-4">
+                                        {{ $labelState := $root.LabelState }}
+                                        {{ if $root.StackLabelStates }}
+                                            {{ $perCid := index $root.StackLabelStates $cid }}
+                                            {{ if $perCid }}{{ $labelState = $perCid }}{{ end }}
+                                        {{ end }}
+                                        {{ $labelCtx := dict "Defs" $root.LabelDefs "State" $labelState "RepoInfo" $root.RepoInfo "Subject" "" "LoggedInUser" $root.LoggedInUser "Prefix" (printf "stackLabel[%s]" $cid) }}
+                                        {{ template "editBasicLabels" $labelCtx }}
+                                        {{ template "editKvLabels" $labelCtx }}
+                                        <button
+                                            type="button"
+                                            data-stack-apply-all
+                                            class="text-xs text-gray-500 dark:text-gray-400 hover:underline self-end"
+                                            title="Copy these labels and assignees to every PR in the stack"
+                                        >
+                                            Apply labels &amp; assignees to all PRs in stack
+                                        </button>
+                                    </aside>
+                                {{ end }}
+                            </div>
+                        </div>
+                    {{ else }}
+                        <div class="px-3 pb-3 pt-1 text-sm text-yellow-700 dark:text-yellow-300 border-t border-gray-100 dark:border-gray-700">
+                            This commit has no <span class="font-mono">Change-Id</span> header and can't be stacked. Set one on the commit and re-push.
+                        </div>
+                    {{ end }}
+                </details>
+            </li>
+        {{ end }}
+    </ul>
+{{ end }}
+
+{{ define "pullReviewCommitAuthor" }}
+    {{ $did := .Did }}
+    {{ $p := .Patch }}
+    {{ if $did }}
+        <a href="/{{ $did }}" class="flex items-center gap-2 no-underline hover:underline flex-shrink-0">
+            <img src="{{ tinyAvatar $did }}" alt="" class="rounded-full h-6 w-6 border border-gray-300 dark:border-gray-700" />
+            <span class="text-sm dark:text-white">{{ resolve $did }}</span>
+        </a>
+    {{ else }}
+        <span class="flex items-center gap-2 flex-shrink-0">
+            {{ placeholderAvatar "tiny" }}
+            {{ if $p.Author }}
+                <a href="mailto:{{ $p.Author.Email }}" class="text-sm dark:text-white no-underline hover:underline">{{ $p.Author.Name }}</a>
+            {{ end }}
+        </span>
+    {{ end }}
+{{ end }}
+
+{{ define "pullReviewCommitMeta" }}
+    {{ $p := .Patch }}
+    {{ $repoInfo := .RepoInfo }}
+    <span class="flex items-center gap-2 text-xs text-gray-500 dark:text-gray-400 flex-shrink-0">
+        {{ if not $p.AuthorDate.IsZero }}
+            {{ template "repo/fragments/shortTimeAgo" $p.AuthorDate }}
+        {{ end }}
+        {{ if $p.SHA }}
+            <span class="font-mono bg-gray-100 dark:bg-gray-900 text-gray-700 dark:text-gray-300 px-2 py-0.5 rounded">{{ slice $p.SHA 0 8 }}</span>
+            <button type="button"
+                class="p-1 hover:bg-gray-100 dark:hover:bg-gray-700 rounded"
+                title="Copy SHA"
+                onclick="event.preventDefault(); event.stopPropagation(); navigator.clipboard.writeText('{{ $p.SHA }}'); this.innerHTML=`{{ i "copy-check" "w-4 h-4" }}`; setTimeout(() => this.innerHTML=`{{ i "copy" "w-4 h-4" }}`, 1500)">
+                {{ i "copy" "w-4 h-4" }}
+            </button>
+            <a href="/{{ $repoInfo.FullName }}/tree/{{ $p.SHA }}"
+               onclick="event.stopPropagation()"
+               class="p-1 hover:bg-gray-100 dark:hover:bg-gray-700 rounded"
+               title="Browse repository at this commit">
+                {{ i "folder-code" "w-4 h-4" }}
+            </a>
+        {{ end }}
+    </span>
+{{ end }}
+
+{{ define "pullStackedDiffArea" }}
+    {{ $diff := .Diff }}
+    {{ $opts := .DiffOpts }}
+    {{ $cid := .Cid }}
+    {{ $togId := printf "stack-%s-filesToggle" $cid }}
+    {{ $colId := printf "stack-%s-collapseToggle" $cid }}
+    {{ $filesId := printf "stack-%s-files" $cid }}
+    {{ $diffAreaId := printf "stack-%s-diff-area" $cid }}
+    {{ $filePrefix := printf "stack-%s-file-" $cid }}
+    {{ $stat := $diff.Stats }}
+    {{ $count := len $diff.ChangedFiles }}
+
+    <style>
+        #{{ $togId }}:checked ~ * label[for="{{ $togId }}"] .show-text { display: none; }
+        #{{ $togId }}:checked ~ * label[for="{{ $togId }}"] .hide-text { display: inline; }
+        #{{ $togId }}:not(:checked) ~ * label[for="{{ $togId }}"] .hide-text { display: none; }
+        #{{ $togId }}:checked ~ * div#{{ $filesId }} { width: fit-content; max-width: 15vw; }
+        #{{ $togId }}:not(:checked) ~ * div#{{ $filesId }} { width: 0; display: none; margin-right: 0; }
+    </style>
+
+    <input type="checkbox" id="{{ $togId }}" class="hidden"/>
+
+    <div id="{{ $diffAreaId }}">
+        <div class="bg-slate-100 dark:bg-gray-900 flex items-center gap-2 h-12 p-2 rounded-t border border-b-0 border-gray-200 dark:border-gray-700">
+            <label title="Toggle filetree panel" for="{{ $togId }}" class="hidden md:inline-flex items-center justify-center rounded cursor-pointer text-normal font-normal normal-case">
+                <span class="show-text">{{ i "panel-left-open" "size-4" }}</span>
+                <span class="hide-text">{{ i "panel-left-close" "size-4" }}</span>
+            </label>
+
+            {{ template "repo/fragments/diffStatPill" $stat }}
+            <span class="text-xs text-gray-600 dark:text-gray-400 hidden md:inline-flex">{{ $count }} changed file{{ if ne $count 1 }}s{{ end }}</span>
+
+            <div class="flex-grow"></div>
+
+            <label title="Expand/Collapse diffs" for="{{ $colId }}" class="btn font-normal normal-case p-2">
+                <input type="checkbox" id="{{ $colId }}" class="peer/collapse hidden" checked/>
+                <span class="peer-checked/collapse:hidden inline-flex items-center gap-2">
+                    {{ i "fold-vertical" "w-4 h-4" }}
+                    <span class="hidden md:inline">Expand all</span>
+                </span>
+                <span class="peer-checked/collapse:inline-flex hidden flex items-center gap-2">
+                    {{ i "unfold-vertical" "w-4 h-4" }}
+                    <span class="hidden md:inline">Collapse all</span>
+                </span>
+            </label>
+
+            <div class="w-44">
+                {{ template "repo/fragments/diffOpts" $opts }}
+            </div>
+        </div>
+
+        <div class="flex border border-gray-200 dark:border-gray-700 rounded-b">
+            <div id="{{ $filesId }}" class="hidden md:block overflow-hidden max-h-[60vh] overflow-y-auto">
+                <section class="overflow-x-auto text-sm px-3 py-2 w-full mx-auto">
+                    {{ template "repo/fragments/fileTreePrefixed" (dict "Tree" $diff.FileTree "Prefix" $filePrefix) }}
+                </section>
+            </div>
+
+            <div class="flex-1 min-w-0 p-2 border-l border-gray-200 dark:border-gray-700">
+                <div class="flex flex-col gap-2">
+                    {{ if eq $count 0 }}
+                        <div class="text-center text-gray-500 dark:text-gray-400 py-8">
+                            <p>No differences found.</p>
+                        </div>
+                    {{ else }}
+                        {{ range $idx, $file := $diff.ChangedFiles }}
+                            {{ template "stackedDiffFile" (dict "Idx" $idx "File" $file "IsSplit" $opts.Split "Prefix" $filePrefix) }}
+                        {{ end }}
+                    {{ end }}
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        (() => {
+            const cb = document.getElementById('{{ $colId }}');
+            const area = document.getElementById('{{ $diffAreaId }}');
+            if (!cb || !area) return;
+            const all = () => area.querySelectorAll('details[id^="{{ $filePrefix }}"]');
+            cb.addEventListener('change', () => {
+                all().forEach(d => { d.open = cb.checked; });
+            });
+            area.addEventListener('toggle', (e) => {
+                if (!e.target.matches('details[id^="{{ $filePrefix }}"]')) return;
+                const dets = Array.from(all());
+                const allOpen = dets.every(d => d.open);
+                const allClosed = dets.every(d => !d.open);
+                if (allOpen) cb.checked = true;
+                else if (allClosed) cb.checked = false;
+            }, true);
+        })();
+    </script>
+{{ end }}
+
+{{ define "stackedDiffFile" }}
+    {{ $idx := .Idx }}
+    {{ $file := .File }}
+    {{ $isSplit := .IsSplit }}
+    {{ $prefix := .Prefix }}
+    {{ $isGenerated := false }}
+    {{ $isDeleted := false }}
+    {{ with $file }}
+        {{ $n := .Names }}
+        {{ $isDeleted = and (eq $n.New "") (ne $n.Old "") }}
+        {{ if $n.New }}
+            {{ $isGenerated = isGenerated $n.New }}
+        {{ else if $n.Old }}
+            {{ $isGenerated = isGenerated $n.Old }}
+        {{ end }}
+        <details {{ if and (not $isGenerated) (not $isDeleted) }}open{{ end }} id="{{ $prefix }}{{ .Id }}" class="group border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm" tabindex="{{ add $idx 1 }}">
+            <summary class="list-none cursor-pointer group-open:border-b border-gray-200 dark:border-gray-700">
+                <div class="rounded cursor-pointer bg-white dark:bg-gray-800 flex justify-between">
+                    <div class="p-2 flex gap-2 items-center overflow-x-auto">
+                        <span class="group-open:hidden inline">{{ i "chevron-right" "w-4 h-4" }}</span>
+                        <span class="hidden group-open:inline">{{ i "chevron-down" "w-4 h-4" }}</span>
+                        {{ template "repo/fragments/diffStatPill" .Stats }}
+                        <div class="flex gap-2 items-center overflow-x-auto">
+                            {{ if and $n.New $n.Old (ne $n.New $n.Old)}}
+                                {{ $n.Old }} {{ i "arrow-right" "w-4 h-4" }} {{ $n.New }}
+                            {{ else if $n.New }}
+                                {{ $n.New }}
+                            {{ else }}
+                                {{ $n.Old }}
+                            {{ end }}
+                            {{ if $isDeleted }}
+                                <span class="text-gray-400 dark:text-gray-500" title="Deleted files are collapsed by default">
+                                    {{ i "circle-question-mark" "size-4" }}
+                                </span>
+                            {{ else if $isGenerated }}
+                                <span class="text-gray-400 dark:text-gray-500" title="Generated files are collapsed by default">
+                                    {{ i "circle-question-mark" "size-4" }}
+                                </span>
+                            {{ end }}
+                        </div>
+                    </div>
+                </div>
+            </summary>
+
+            <div class="transition-all duration-700 ease-in-out">
+                {{ $reason := .CanRender }}
+                {{ if $reason }}
+                    <p class="text-center text-gray-400 dark:text-gray-500 p-4">{{ $reason }}</p>
+                {{ else }}
+                    {{ if $isSplit }}
+                        {{- template "repo/fragments/splitDiff" .Split -}}
+                    {{ else }}
+                        {{- template "repo/fragments/unifiedDiff" . -}}
+                    {{ end }}
+                {{- end -}}
+            </div>
+        </details>
+    {{ end }}
+{{ end }}
diff --git a/appview/pages/templates/repo/pulls/fragments/pullStepSource.html b/appview/pages/templates/repo/pulls/fragments/pullStepSource.html
new file mode 100644
index 00000000..b956bbdd
--- /dev/null
+++ b/appview/pages/templates/repo/pulls/fragments/pullStepSource.html
@@ -0,0 +1,156 @@
+{{ define "repo/pulls/fragments/pullStepSource" }}
+    <section class="flex flex-col gap-3">
+        <input type="hidden" name="source" value="{{ .Source }}">
+
+        {{ template "pullSourceTabs" . }}
+
+        {{ if eq .Source "patch" }}
+            <div class="flex flex-col gap-1">
+                {{ template "repo/fragments/labelSectionHeaderText" "Merge into" }}
+                {{ template "pullTargetBranchSelect" . }}
+            </div>
+            {{ template "repo/pulls/fragments/pullPatchUpload" . }}
+        {{ else }}
+            <div class="flex flex-col md:flex-row md:flex-wrap gap-3">
+                <div class="flex flex-col gap-1">
+                    {{ template "repo/fragments/labelSectionHeaderText" "Merge into" }}
+                    {{ template "pullTargetBranchSelect" . }}
+                </div>
+                <div id="patch-strategy" class="flex flex-col gap-1">
+                    {{ template "repo/fragments/labelSectionHeaderText" "Pull from" }}
+                    {{ if eq .Source "fork" }}
+                        {{ template "repo/pulls/fragments/pullCompareForks" . }}
+                    {{ else }}
+                        {{ template "repo/pulls/fragments/pullCompareBranches" . }}
+                    {{ end }}
+                </div>
+            </div>
+        {{ end }}
+
+        <div id="patch-error" class="error dark:text-red-300 empty:hidden"></div>
+
+        {{ if ne .Source "patch" }}
+            <div class="flex items-center gap-2">
+                <input type="checkbox" id="mode-stack" name="mode" value="stack" autocomplete="off" {{ if .IsStacked }}checked{{ end }}
+                    hx-post="/{{ .RepoInfo.FullName }}/pulls/new/refresh"
+                    hx-include="closest form"
+                    hx-target="#wizard-host"
+                    hx-swap="outerHTML"
+                    hx-trigger="change"
+                    hx-indicator="this"
+                    class="peer">
+                <label for="mode-stack" class="my-0 py-0 normal-case font-normal dark:text-white">
+                    Submit as stacked PRs
+                </label>
+                <button
+                    type="button"
+                    popovertarget="stacked-explainer"
+                    aria-label="What are stacked PRs?"
+                    class="text-gray-500 hover:text-gray-900 dark:text-gray-400 dark:hover:text-white peer-[.htmx-request]:hidden"
+                >
+                    {{ i "circle-question-mark" "size-4" }}
+                </button>
+                {{ i "loader-circle" "size-4 animate-spin hidden peer-[.htmx-request]:inline text-gray-500 dark:text-gray-400" }}
+            </div>
+            {{ template "repo/pulls/fragments/stackedExplainer" . }}
+        {{ end }}
+    </section>
+{{ end }}
+
+{{ define "pullTargetBranchSelect" }}
+    <div class="flex flex-wrap gap-2 items-center">
+        <select
+            id="targetBranch"
+            name="targetBranch"
+            required
+            hx-post="/{{ .RepoInfo.FullName }}/pulls/new/refresh"
+            hx-include="closest form"
+            hx-target="#wizard-host"
+            hx-swap="outerHTML"
+            hx-trigger="change"
+            hx-indicator="this"
+            class="peer p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600"
+        >
+            <option disabled {{ if not .TargetBranch }}selected{{ end }}>Target branch</option>
+            {{ $disableSource := and (eq .Source "branch") $.SourceBranch }}
+            {{ range .Branches }}
+                {{ $preset := false }}
+                {{ if $.TargetBranch }}
+                    {{ $preset = eq .Reference.Name $.TargetBranch }}
+                {{ else }}
+                    {{ $preset = .IsDefault }}
+                {{ end }}
+                {{ $isSource := and $disableSource (eq .Reference.Name $.SourceBranch) }}
+                <option value="{{ .Reference.Name }}" class="py-1"
+                    {{ if $preset }}selected{{ end }}
+                    {{ if $isSource }}disabled{{ end }}>
+                    {{ .Reference.Name }}
+                    {{ if $isSource }}(source){{ end }}
+                </option>
+            {{ end }}
+        </select>
+        {{ i "loader-circle" "size-4 animate-spin hidden peer-[.htmx-request]:inline text-gray-500 dark:text-gray-400" }}
+    </div>
+{{ end }}
+
+{{ define "pullSourceTabs" }}
+    {{ $active := "bg-white dark:bg-gray-700 shadow-sm cursor-default" }}
+    {{ $inactive := "bg-gray-100 dark:bg-gray-800 shadow-inner" }}
+    {{ $shared := "group flex-1 p-3 text-left hover:no-underline flex flex-col gap-1" }}
+    {{ $titleCls := "font-medium text-sm dark:text-white flex items-center gap-2" }}
+    {{ $descCls := "text-xs text-gray-500 dark:text-gray-400" }}
+    {{ $fullName := .RepoInfo.FullName }}
+    <div class="flex divide-x divide-gray-200 dark:divide-gray-700 rounded border border-gray-200 dark:border-gray-700 overflow-hidden"
+         hx-on::before-request="const t=event.target.closest('button'); if(!t||t.classList.contains('shadow-sm'))return event.preventDefault();">
+        {{ if .RepoInfo.Roles.IsPushAllowed }}
+            <button
+                type="button"
+                class="{{ $shared }} {{ if eq .Source "branch" }}{{ $active }}{{ else }}{{ $inactive }}{{ end }}"
+                hx-post="/{{ $fullName }}/pulls/new/refresh"
+                hx-vals='{"source": "branch"}'
+                hx-include="closest form"
+                hx-target="#wizard-host"
+                hx-swap="outerHTML"
+                hx-indicator="this"
+            >
+                <span class="{{ $titleCls }}">
+                    Compare branches
+                    {{ i "loader-circle" "size-3 animate-spin hidden group-[.htmx-request]:inline" }}
+                </span>
+                <span class="{{ $descCls }}">Select a source branch</span>
+            </button>
+        {{ end }}
+        <button
+            type="button"
+            class="{{ $shared }} {{ if eq .Source "fork" }}{{ $active }}{{ else }}{{ $inactive }}{{ end }}"
+            hx-post="/{{ $fullName }}/pulls/new/refresh"
+            hx-vals='{"source": "fork"}'
+            hx-include="closest form"
+            hx-target="#wizard-host"
+            hx-swap="outerHTML"
+            hx-indicator="this"
+        >
+            <span class="{{ $titleCls }}">
+                Compare forks
+                {{ i "loader-circle" "size-3 animate-spin hidden group-[.htmx-request]:inline" }}
+            </span>
+            <span class="{{ $descCls }}">Select a fork and branch as the source</span>
+        </button>
+        <button
+            type="button"
+            class="{{ $shared }} {{ if eq .Source "patch" }}{{ $active }}{{ else }}{{ $inactive }}{{ end }}"
+            hx-post="/{{ $fullName }}/pulls/new/refresh"
+            hx-vals='{"source": "patch"}'
+            hx-include="closest form"
+            hx-target="#wizard-host"
+            hx-swap="outerHTML"
+            hx-indicator="this"
+        >
+            <span class="{{ $titleCls }}">
+                Paste patch
+                {{ i "loader-circle" "size-3 animate-spin hidden group-[.htmx-request]:inline" }}
+            </span>
+            <span class="{{ $descCls }}">Paste a <code class="font-mono">git diff</code> or <code class="font-mono">git format-patch</code></span>
+        </button>
+    </div>
+{{ end }}
diff --git a/appview/pages/templates/repo/pulls/fragments/pullWizardHost.html b/appview/pages/templates/repo/pulls/fragments/pullWizardHost.html
new file mode 100644
index 00000000..96b1ae9a
--- /dev/null
+++ b/appview/pages/templates/repo/pulls/fragments/pullWizardHost.html
@@ -0,0 +1,74 @@
+{{ define "repo/pulls/fragments/pullWizardHost" }}
+    <div id="wizard-host" class="flex flex-col">
+        {{ if .PrefillError }}
+            <div class="mb-4 p-3 border border-red-200 dark:border-red-800 rounded bg-red-50 dark:bg-red-900/30 text-sm text-red-800 dark:text-red-200 flex items-center gap-2">
+                {{ i "triangle-alert" "w-4 h-4 flex-shrink-0" }}
+                <span>{{ .PrefillError }}</span>
+            </div>
+        {{ end }}
+
+        {{ $hasCommits := and .Comparison .Comparison.FormatPatch }}
+        {{ $hasDiff := false }}
+        {{ if .Diff }}{{ if .Diff.Diff }}{{ $hasDiff = true }}{{ end }}{{ end }}
+        {{ $showDetails := and (or $hasCommits $hasDiff) (not .IsStacked) }}
+
+        <form
+            hx-post="/{{ .RepoInfo.FullName }}/pulls/new"
+            hx-trigger="submit, keydown[(ctrlKey || metaKey) && key=='Enter'] from:(#patch,#title,#body)"
+            hx-indicator="#create-pull-spinner"
+            hx-swap="none"
+            class="flex flex-col gap-6"
+        >
+            <section class="relative flex flex-col gap-3">
+                <div class="absolute left-3 -translate-x-1/2 top-3 -bottom-6 w-px bg-gray-200 dark:bg-gray-700"></div>
+                <div class="flex items-center gap-4 relative">
+                    <div class="flex-shrink-0 relative z-10">
+                        {{ template "pullWizardSectionNumber" 1 }}
+                    </div>
+                    <h3 class="uppercase text-sm tracking-wide font-bold my-0 dark:text-white">source</h3>
+                </div>
+                <div class="ml-10 flex flex-col gap-3">
+                    {{ template "repo/pulls/fragments/pullStepSource" . }}
+                </div>
+            </section>
+
+            <section class="relative flex flex-col gap-3">
+                {{ if $showDetails }}
+                    <div class="absolute left-3 -translate-x-1/2 -top-6 -bottom-6 w-px bg-gray-200 dark:bg-gray-700"></div>
+                {{ else }}
+                    <div class="absolute left-3 -translate-x-1/2 -top-6 -bottom-12 w-px bg-gray-200 dark:bg-gray-700 [mask-image:linear-gradient(to_bottom,black_calc(100%-1.5rem),transparent)]"></div>
+                {{ end }}
+                <div class="flex items-center gap-4 relative">
+                    <div class="flex-shrink-0 relative z-10">
+                        {{ template "pullWizardSectionNumber" 2 }}
+                    </div>
+                    <h3 class="uppercase text-sm tracking-wide font-bold my-0 dark:text-white">review</h3>
+                </div>
+                <div class="ml-10 flex flex-col gap-3">
+                    {{ template "repo/pulls/fragments/pullStepReview" . }}
+                </div>
+            </section>
+
+            {{ if $showDetails }}
+                <section class="relative flex flex-col gap-3">
+                    <div class="absolute left-3 -translate-x-1/2 -top-6 -bottom-12 w-px bg-gray-200 dark:bg-gray-700 [mask-image:linear-gradient(to_bottom,black_calc(100%-1.5rem),transparent)]"></div>
+                    <div class="flex items-center gap-4 relative">
+                        <div class="flex-shrink-0 relative z-10">
+                            {{ template "pullWizardSectionNumber" 3 }}
+                        </div>
+                        <h3 class="uppercase text-sm tracking-wide font-bold my-0 dark:text-white">details</h3>
+                    </div>
+                    <div class="ml-10 flex flex-col gap-3">
+                        {{ template "repo/pulls/fragments/pullStepDetails" . }}
+                    </div>
+                </section>
+            {{ end }}
+        </form>
+
+        <div id="pull" class="error dark:text-red-300 mt-4 ml-10"></div>
+    </div>
+{{ end }}
+
+{{ define "pullWizardSectionNumber" }}
+    <span class="inline-flex items-center justify-center w-6 h-6 rounded-full bg-gray-200 text-gray-600 dark:bg-gray-700 dark:text-gray-300 text-xs font-bold">{{ . }}</span>
+{{ end }}
diff --git a/appview/pages/templates/repo/pulls/fragments/stackedExplainer.html b/appview/pages/templates/repo/pulls/fragments/stackedExplainer.html
new file mode 100644
index 00000000..020a0c1d
--- /dev/null
+++ b/appview/pages/templates/repo/pulls/fragments/stackedExplainer.html
@@ -0,0 +1,51 @@
+{{ define "repo/pulls/fragments/stackedExplainer" }}
+    <div
+        id="stacked-explainer"
+        popover
+        class="bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700
+               dark:text-white backdrop:bg-gray-400/50 dark:backdrop:bg-gray-800/50
+               w-full md:w-96 p-4 rounded drop-shadow overflow-visible"
+    >
+        <div class="flex items-start justify-between gap-2 mb-2">
+            <h3 class="text-base font-semibold text-gray-900 dark:text-white my-0">
+                Stacked PRs
+            </h3>
+            <button
+                type="button"
+                popovertarget="stacked-explainer"
+                popovertargetaction="hide"
+                aria-label="Close"
+                class="text-gray-500 hover:text-gray-900 dark:text-gray-400 dark:hover:text-white -mt-0.5 -mr-1"
+            >
+                {{ i "x" "size-4" }}
+            </button>
+        </div>
+
+        <p class="text-sm text-gray-700 dark:text-gray-200 mb-2">
+            Each commit on your branch becomes its own pull request. Reviewers can
+            comment per commit, and Tangled tracks each PR across rewrites using
+            jujutsu change-ids. You can <code>jj edit</code> an old commit,
+            push, and the right PR advances to the next round.
+        </p>
+
+        <p class="text-sm text-gray-700 dark:text-gray-200 mb-2">
+            Without stacking, all changes land as one PR. Force-pushes turn opaque
+            and <code>git blame</code> clobbers across rounds.
+        </p>
+
+        <p class="text-sm text-gray-700 dark:text-gray-200 mb-3">
+            With stacking, edit/split/squash old commits freely, and descendants
+            will auto-rebase! Each PR shows an "interdiff" between rounds so
+            reviewers will see exactly what changed.
+        </p>
+
+        <a
+            href="https://blog.tangled.org/stacking"
+            target="_blank"
+            rel="noopener noreferrer"
+            class="text-sm text-blue-600 dark:text-blue-400 hover:underline"
+        >
+            Full write-up
+        </a>
+    </div>
+{{ end }}
diff --git a/appview/pages/templates/repo/pulls/new.html b/appview/pages/templates/repo/pulls/new.html
index cc0b8d92..b9c42886 100644
--- a/appview/pages/templates/repo/pulls/new.html
+++ b/appview/pages/templates/repo/pulls/new.html
@@ -1,156 +1,5 @@
 {{ define "title" }}new pull &middot; {{ .RepoInfo.FullName }}{{ end }}
 
 {{ define "repoContent" }}
-    <h2 class="font-bold text-sm mb-4 uppercase dark:text-white">
-        Create new pull request
-    </h2>
-
-    <form
-        hx-post="/{{ .RepoInfo.FullName }}/pulls/new"
-        hx-trigger="submit, keydown[(ctrlKey || metaKey) && key=='Enter'] from:(#patch,#title,#body)"
-        hx-indicator="#create-pull-spinner"
-        hx-swap="none"
-    >
-        <div class="flex flex-col gap-6">
-            <div class="flex gap-2 items-center">
-              <p>First, choose a target branch on {{ .RepoInfo.FullName }}:</p>
-              <div>
-                <select
-                  required
-                  name="targetBranch"
-                  class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600"
-                  >
-                  <option disabled selected>target branch</option>
-
-
-                  {{ range .Branches }}
-
-                  {{ $preset := false }}
-                  {{ if $.TargetBranch }}
-                    {{ $preset = eq .Reference.Name $.TargetBranch }}
-                  {{ else }}
-                    {{ $preset = .IsDefault }}
-                  {{ end }}
-
-                  <option value="{{ .Reference.Name }}" class="py-1" {{if $preset}}selected{{end}}>
-                  {{ .Reference.Name }}
-                  </option>
-                  {{ end }}
-                </select>
-              </div>
-            </div>
-
-            <div class="flex flex-col gap-2">
-              <h2 class="font-bold text-sm mb-4 uppercase dark:text-white">
-                  Choose pull strategy
-              </h2>
-              <nav class="flex space-x-4 items-center">
-                  <button
-                      type="button"
-                      class="btn"
-                      hx-get="/{{ .RepoInfo.FullName }}/pulls/new/patch-upload"
-                      hx-target="#patch-strategy"
-                      hx-swap="innerHTML"
-                  >
-                      paste patch
-                  </button>
-
-                  {{ if .RepoInfo.Roles.IsPushAllowed }}
-                      <span class="text-sm text-gray-500 dark:text-gray-400">
-                          or
-                      </span>
-                      <button
-                          type="button"
-                          class="btn"
-                          hx-get="/{{ .RepoInfo.FullName }}/pulls/new/compare-branches"
-                          hx-target="#patch-strategy"
-                          hx-swap="innerHTML"
-                      >
-                          compare branches
-                      </button>
-                  {{ end }}
-
-
-                  <span class="text-sm text-gray-500 dark:text-gray-400">
-                      or
-                  </span>
-                  <script>
-                    function getQueryParams() {
-                      return Object.fromEntries(new URLSearchParams(window.location.search));
-                    }
-                  </script>
-                  <!--
-                  since compare-forks need the server to load forks, we
-                  hx-get this button; unlike simply loading the pullCompareForks template
-                  as we do for the rest of the gang below. the hx-vals thing just populates
-                  the query params so the forks page gets it.
-                  -->
-                  <button
-                      type="button"
-                      class="btn"
-                      hx-get="/{{ .RepoInfo.FullName }}/pulls/new/compare-forks"
-                      hx-target="#patch-strategy"
-                      hx-swap="innerHTML"
-                      {{ if eq .Strategy "fork" }}
-                      hx-trigger="click, load"
-                      hx-vals='js:{...getQueryParams()}'
-                      {{ end }}
-                  >
-                      compare forks
-                  </button>
-
-
-              </nav>
-              <section id="patch-strategy" class="flex flex-col gap-2">
-                  {{ if eq .Strategy "patch" }}
-                    {{ template "repo/pulls/fragments/pullPatchUpload" . }}
-                  {{ else if eq .Strategy "branch" }}
-                    {{ template "repo/pulls/fragments/pullCompareBranches" . }}
-                  {{ else }}
-                    {{ template "repo/pulls/fragments/pullPatchUpload" . }}
-                  {{ end }}
-              </section>
-
-              <div id="patch-error" class="error dark:text-red-300"></div>
-            </div>
-
-            <div>
-                <label for="title" class="dark:text-white">write a title</label>
-
-                <input
-                    type="text"
-                    name="title"
-                    id="title"
-                    value="{{ .Title }}"
-                    class="w-full dark:bg-gray-700 dark:text-white dark:border-gray-600"
-                    placeholder="One-line summary of your change."
-                />
-            </div>
-
-            <div>
-                <label for="body" class="dark:text-white"
-                    >add a description</label
-                >
-
-                <textarea
-                    name="body"
-                    id="body"
-                    rows="6"
-                    class="w-full resize-y dark:bg-gray-700 dark:text-white dark:border-gray-600"
-                    placeholder="Describe your change. Markdown is supported."
-                >{{ .Body }}</textarea>
-            </div>
-
-            <div class="flex justify-start items-center gap-2 mt-4">
-                <button type="submit" class="btn-create flex items-center gap-2">
-                    {{ i "git-pull-request-create" "w-4 h-4" }}
-                    create pull
-                    <span id="create-pull-spinner" class="group">
-                      {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
-                    </span>
-                </button>
-            </div>
-        </div>
-        <div id="pull" class="error dark:text-red-300"></div>
-    </form>
+    {{ template "repo/pulls/fragments/pullWizardHost" . }}
 {{ end }}
diff --git a/appview/pages/wizard_parse_test.go b/appview/pages/wizard_parse_test.go
new file mode 100644
index 00000000..a5141ef4
--- /dev/null
+++ b/appview/pages/wizard_parse_test.go
@@ -0,0 +1,315 @@
+package pages
+
+import (
+	"bytes"
+	"io"
+	"log/slog"
+	"strings"
+	"testing"
+
+	"tangled.org/core/appview/config"
+	"tangled.org/core/appview/models"
+	"tangled.org/core/appview/pages/repoinfo"
+	"tangled.org/core/patchutil"
+	"tangled.org/core/types"
+)
+
+func TestPullWizardTemplatesParse(t *testing.T) {
+	cfg := &config.Config{}
+	p := NewPages(cfg, nil, nil, nil, slog.New(slog.NewTextHandler(io.Discard, nil)))
+
+	cases := []struct {
+		name  string
+		stack []string
+	}{
+		{"new.html via repo base", []string{"layouts/base", "layouts/repobase", "repo/pulls/new"}},
+		{"pullWizardHost", []string{"repo/pulls/fragments/pullWizardHost"}},
+		{"pullStepSource", []string{"repo/pulls/fragments/pullStepSource"}},
+		{"pullStepReview", []string{"repo/pulls/fragments/pullStepReview"}},
+		{"pullStepDetails", []string{"repo/pulls/fragments/pullStepDetails"}},
+		{"pullCompareForks", []string{"repo/pulls/fragments/pullCompareForks"}},
+		{"pullCompareBranches", []string{"repo/pulls/fragments/pullCompareBranches"}},
+		{"pullCompareForksBranches", []string{"repo/pulls/fragments/pullCompareForksBranches"}},
+		{"stackedExplainer", []string{"repo/pulls/fragments/stackedExplainer"}},
+	}
+
+	for _, c := range cases {
+		t.Run(c.name, func(t *testing.T) {
+			if _, err := p.rawParse(c.stack...); err != nil {
+				t.Fatalf("parse %v: %v", c.stack, err)
+			}
+		})
+	}
+}
+
+func TestPullWizardHostRender(t *testing.T) {
+	cfg := &config.Config{}
+	p := NewPages(cfg, nil, nil, nil, slog.New(slog.NewTextHandler(io.Discard, nil)))
+
+	base := RepoNewPullParams{
+		RepoInfo: repoinfo.RepoInfo{
+			OwnerDid: "did:plc:test",
+			Name:     "test-repo",
+		},
+	}
+
+	for _, source := range []Source{"", SourceBranch, SourceFork, SourcePatch} {
+		for _, stacked := range []bool{false, true} {
+			if source == SourcePatch && stacked {
+				continue
+			}
+			params := base
+			params.Source = source
+			params.IsStacked = stacked
+			name := string(source)
+			if name == "" {
+				name = "default"
+			}
+			if stacked {
+				name += "-stacked"
+			}
+			t.Run(name, func(t *testing.T) {
+				if err := p.PullWizardHostFragment(io.Discard, params); err != nil {
+					t.Fatalf("render source=%q stacked=%v: %v", source, stacked, err)
+				}
+			})
+		}
+	}
+}
+
+func TestPullWizardHostRenderWithData(t *testing.T) {
+	cfg := &config.Config{}
+	p := NewPages(cfg, nil, nil, nil, slog.New(slog.NewTextHandler(io.Discard, nil)))
+
+	sampleBranches := []types.Branch{
+		{Reference: types.Reference{Name: "feature"}},
+		{Reference: types.Reference{Name: "main"}, IsDefault: true},
+	}
+
+	formatPatch := `From 1111111111111111111111111111111111111111 Mon Sep 11 00:00:00 2001
+From: Test <test@best.fest>
+Date: Tue, 1 Jan 2020 00:00:00 +0000
+Subject: [PATCH] example commit
+
+---
+ a.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/a.txt b/a.txt
+index 0000000..1111111 100644
+--- a/a.txt
++++ b/a.txt
+@@ -0,0 +1 @@
++hello
+`
+	patches, err := patchutil.ExtractPatches(formatPatch)
+	if err != nil {
+		t.Fatalf("extract patches: %v", err)
+	}
+	comparison := &types.RepoFormatPatchResponse{
+		FormatPatchRaw: formatPatch,
+		FormatPatch:    patches,
+	}
+	diff := patchutil.AsNiceDiff(formatPatch, "main")
+
+	params := RepoNewPullParams{
+		RepoInfo: repoinfo.RepoInfo{
+			OwnerDid: "did:plc:test",
+			Name:     "test-repo",
+		},
+		Branches:       sampleBranches,
+		SourceBranches: []types.Branch{sampleBranches[0]},
+		ForkBranches:   []types.Branch{sampleBranches[0]},
+		Source:         SourceBranch,
+		SourceBranch:   "feature",
+		TargetBranch:   "main",
+		Comparison:     comparison,
+		Diff:           &diff,
+	}
+
+	if err := p.PullWizardHostFragment(io.Discard, params); err != nil {
+		t.Fatalf("render with data: %v", err)
+	}
+
+	params.IsStacked = true
+	if err := p.PullWizardHostFragment(io.Discard, params); err != nil {
+		t.Fatalf("render stacked: %v", err)
+	}
+
+	params.PrefillError = "branch not found"
+	params.Comparison = nil
+	params.Diff = nil
+	if err := p.PullWizardHostFragment(io.Discard, params); err != nil {
+		t.Fatalf("render with prefill error: %v", err)
+	}
+
+	bugDef := &models.LabelDefinition{
+		Did:       "did:plc:test",
+		Rkey:      "bug",
+		Name:      "bug",
+		ValueType: models.ValueType{Type: models.ConcreteTypeNull},
+		Scope:     []string{"sh.tangled.repo.pull"},
+	}
+	priorityDef := &models.LabelDefinition{
+		Did:       "did:plc:test",
+		Rkey:      "priority",
+		Name:      "priority",
+		ValueType: models.ValueType{Type: models.ConcreteTypeString, Enum: []string{"low", "med", "high"}},
+		Scope:     []string{"sh.tangled.repo.pull"},
+	}
+	assigneeDef := &models.LabelDefinition{
+		Did:       "did:plc:test",
+		Rkey:      "assignee",
+		Name:      "assignee",
+		ValueType: models.ValueType{Type: models.ConcreteTypeString, Format: models.ValueTypeFormatDid},
+		Scope:     []string{"sh.tangled.repo.pull"},
+		Multiple:  true,
+	}
+	labelDefs := map[string]*models.LabelDefinition{
+		bugDef.AtUri().String():      bugDef,
+		priorityDef.AtUri().String(): priorityDef,
+		assigneeDef.AtUri().String(): assigneeDef,
+	}
+
+	pushRepoInfo := repoinfo.RepoInfo{
+		OwnerDid: "did:plc:test",
+		Name:     "test-repo",
+		Roles:    repoinfo.RolesInRepo{Roles: []string{"repo:push"}},
+	}
+	params = RepoNewPullParams{
+		RepoInfo:       pushRepoInfo,
+		Branches:       sampleBranches,
+		SourceBranches: []types.Branch{sampleBranches[0]},
+		Source:         SourceBranch,
+		SourceBranch:   "feature",
+		TargetBranch:   "main",
+		Comparison:     comparison,
+		Diff:           &diff,
+		LabelDefs:      labelDefs,
+		LabelState:     models.NewLabelState(),
+	}
+	if err := p.PullWizardHostFragment(io.Discard, params); err != nil {
+		t.Fatalf("render with labels: %v", err)
+	}
+
+	params.IsStacked = true
+	if err := p.PullWizardHostFragment(io.Discard, params); err != nil {
+		t.Fatalf("render stacked with labels: %v", err)
+	}
+}
+
+func TestPullWizardLabelStateRoundTrip(t *testing.T) {
+	cfg := &config.Config{}
+	p := NewPages(cfg, nil, nil, nil, slog.New(slog.NewTextHandler(io.Discard, nil)))
+
+	sampleBranches := []types.Branch{
+		{Reference: types.Reference{Name: "feature"}},
+		{Reference: types.Reference{Name: "main"}, IsDefault: true},
+	}
+
+	bugDef := &models.LabelDefinition{
+		Did: "did:plc:test", Rkey: "bug", Name: "bug",
+		ValueType: models.ValueType{Type: models.ConcreteTypeNull},
+		Scope:     []string{"sh.tangled.repo.pull"},
+	}
+	priorityDef := &models.LabelDefinition{
+		Did: "did:plc:test", Rkey: "priority", Name: "priority",
+		ValueType: models.ValueType{Type: models.ConcreteTypeString, Enum: []string{"low", "med", "high"}},
+		Scope:     []string{"sh.tangled.repo.pull"},
+	}
+	bugKey := bugDef.AtUri().String()
+	priorityKey := priorityDef.AtUri().String()
+	labelDefs := map[string]*models.LabelDefinition{
+		bugKey:      bugDef,
+		priorityKey: priorityDef,
+	}
+
+	state := models.NewLabelState()
+	actx := &models.LabelApplicationCtx{Defs: labelDefs}
+	for _, op := range []models.LabelOp{
+		{OperandKey: bugKey, OperandValue: "null", Operation: models.LabelOperationAdd},
+		{OperandKey: priorityKey, OperandValue: "high", Operation: models.LabelOperationAdd},
+	} {
+		if err := actx.ApplyLabelOp(state, op); err != nil {
+			t.Fatalf("seed state: %v", err)
+		}
+	}
+
+	formatPatch := `From 1111111111111111111111111111111111111111 Mon Sep 11 00:00:00 2001
+From: Test <test@best.fest>
+Date: Tue, 1 Jan 2020 00:00:00 +0000
+Subject: [PATCH] example commit
+
+---
+ a.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/a.txt b/a.txt
+index 0000000..1111111 100644
+--- a/a.txt
++++ b/a.txt
+@@ -0,0 +1 @@
++hello
+`
+	patches, err := patchutil.ExtractPatches(formatPatch)
+	if err != nil {
+		t.Fatalf("extract patches: %v", err)
+	}
+	comparison := &types.RepoFormatPatchResponse{
+		FormatPatchRaw: formatPatch,
+		FormatPatch:    patches,
+	}
+
+	params := RepoNewPullParams{
+		RepoInfo: repoinfo.RepoInfo{
+			OwnerDid: "did:plc:test",
+			Name:     "test-repo",
+			Roles:    repoinfo.RolesInRepo{Roles: []string{"repo:push"}},
+		},
+		Branches:       sampleBranches,
+		SourceBranches: []types.Branch{sampleBranches[0]},
+		Source:         SourceBranch,
+		SourceBranch:   "feature",
+		TargetBranch:   "main",
+		Comparison:     comparison,
+		LabelDefs:      labelDefs,
+		LabelState:     state,
+	}
+
+	var buf bytes.Buffer
+	if err := p.PullWizardHostFragment(&buf, params); err != nil {
+		t.Fatalf("render: %v", err)
+	}
+	out := buf.String()
+	for _, want := range []string{
+		`value="null" checked`,
+		`value="high" checked`,
+	} {
+		if !strings.Contains(out, want) {
+			t.Errorf("missing pre-selection %q", want)
+		}
+	}
+}
+
+func TestParseSource(t *testing.T) {
+	cases := []struct {
+		in     string
+		want   Source
+		wantOk bool
+	}{
+		{"branch", SourceBranch, true},
+		{"BRANCH", SourceBranch, true},
+		{"fork", SourceFork, true},
+		{"patch", SourcePatch, true},
+		{"", "", false},
+		{"method", "", false},
+		{"strategy", "", false},
+		{"unknown", "", false},
+	}
+	for _, c := range cases {
+		got, ok := ParseSource(c.in)
+		if got != c.want || ok != c.wantOk {
+			t.Errorf("ParseSource(%q) = %q, %v; want %q, %v", c.in, got, ok, c.want, c.wantOk)
+		}
+	}
+}
diff --git a/appview/pulls/pulls.go b/appview/pulls/pulls.go
index 3faf8495..8082bcf7 100644
--- a/appview/pulls/pulls.go
+++ b/appview/pulls/pulls.go
@@ -9,8 +9,11 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"iter"
 	"log/slog"
+	"maps"
 	"net/http"
+	"net/url"
 	"slices"
 	"sort"
 	"strconv"
@@ -43,6 +46,7 @@ import (
 	"tangled.org/core/xrpc"
 
 	comatproto "github.com/bluesky-social/indigo/api/atproto"
+	"github.com/bluesky-social/indigo/atproto/atclient"
 	"github.com/bluesky-social/indigo/atproto/syntax"
 	lexutil "github.com/bluesky-social/indigo/lex/util"
 	indigoxrpc "github.com/bluesky-social/indigo/xrpc"
@@ -98,6 +102,14 @@ func New(
 	}
 }
 
+func (s *Pulls) knotClient(host string) *indigoxrpc.Client {
+	scheme := "https"
+	if s.config.Core.Dev {
+		scheme = "http"
+	}
+	return &indigoxrpc.Client{Host: fmt.Sprintf("%s://%s", scheme, host)}
+}
+
 // htmx fragment
 func (s *Pulls) PullActions(w http.ResponseWriter, r *http.Request) {
 	l := s.logger.With("handler", "PullActions")
@@ -328,15 +340,7 @@ func (s *Pulls) mergeCheck(r *http.Request, f *models.Repo, pull *models.Pull, s
 		return types.MergeCheckResponse{}
 	}
 
-	scheme := "https"
-	if s.config.Core.Dev {
-		scheme = "http"
-	}
-	host := fmt.Sprintf("%s://%s", scheme, f.Knot)
-
-	xrpcc := indigoxrpc.Client{
-		Host: host,
-	}
+	xrpcc := s.knotClient(f.Knot)
 
 	// combine patches of substack
 	subStack := stack.Below(pull)
@@ -347,7 +351,7 @@ func (s *Pulls) mergeCheck(r *http.Request, f *models.Repo, pull *models.Pull, s
 
 	resp, err := tangled.RepoMergeCheck(
 		r.Context(),
-		&xrpcc,
+		xrpcc,
 		&tangled.RepoMergeCheck_Input{
 			Did:    f.Did,
 			Name:   f.Name,
@@ -362,29 +366,25 @@ func (s *Pulls) mergeCheck(r *http.Request, f *models.Repo, pull *models.Pull, s
 		}
 	}
 
-	// convert xrpc response to internal types
+	return mergeCheckResponseFrom(resp)
+}
+
+func mergeCheckResponseFrom(resp *tangled.RepoMergeCheck_Output) types.MergeCheckResponse {
 	conflicts := make([]types.ConflictInfo, len(resp.Conflicts))
-	for i, conflict := range resp.Conflicts {
-		conflicts[i] = types.ConflictInfo{
-			Filename: conflict.Filename,
-			Reason:   conflict.Reason,
-		}
+	for i, c := range resp.Conflicts {
+		conflicts[i] = types.ConflictInfo{Filename: c.Filename, Reason: c.Reason}
 	}
-
-	result := types.MergeCheckResponse{
+	out := types.MergeCheckResponse{
 		IsConflicted: resp.Is_conflicted,
 		Conflicts:    conflicts,
 	}
-
 	if resp.Message != nil {
-		result.Message = *resp.Message
+		out.Message = *resp.Message
 	}
-
 	if resp.Error != nil {
-		result.Error = *resp.Error
+		out.Error = *resp.Error
 	}
-
-	return result
+	return out
 }
 
 func (s *Pulls) branchDeleteStatus(r *http.Request, repo *models.Repo, pull *models.Pull) *models.BranchDeleteStatus {
@@ -930,42 +930,13 @@ func (s *Pulls) NewPull(w http.ResponseWriter, r *http.Request) {
 
 	switch r.Method {
 	case http.MethodGet:
-		xrpcc := &indigoxrpc.Client{Host: s.config.KnotMirror.Url}
-
-		xrpcBytes, err := tangled.GitTempListBranches(r.Context(), xrpcc, "", 0, f.RepoAt().String())
+		params, err := s.wizardParams(r, f)
 		if err != nil {
-			if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {
-				l.Error("failed to call XRPC repo.branches", "xrpcerr", xrpcerr, "err", err)
-				s.pages.Error503(w)
-				return
-			}
-			l.Error("failed to fetch branches", "err", err)
-			return
-		}
-
-		var result types.RepoBranchesResponse
-		if err := json.Unmarshal(xrpcBytes, &result); err != nil {
-			l.Error("failed to decode XRPC response", "err", err)
+			l.Error("failed to build wizard params", "err", err)
 			s.pages.Error503(w)
 			return
 		}
-
-		// can be one of "patch", "branch" or "fork"
-		strategy := r.URL.Query().Get("strategy")
-		// ignored if strategy is "patch"
-		sourceBranch := r.URL.Query().Get("sourceBranch")
-		targetBranch := r.URL.Query().Get("targetBranch")
-
-		s.pages.RepoNewPull(w, pages.RepoNewPullParams{
-			LoggedInUser: user,
-			RepoInfo:     s.repoResolver.GetRepoInfo(r, user),
-			Branches:     result.Branches,
-			Strategy:     strategy,
-			SourceBranch: sourceBranch,
-			TargetBranch: targetBranch,
-			Title:        r.URL.Query().Get("title"),
-			Body:         r.URL.Query().Get("body"),
-		})
+		s.pages.RepoNewPull(w, params)
 
 	case http.MethodPost:
 		title := r.FormValue("title")
@@ -987,7 +958,7 @@ func (s *Pulls) NewPull(w http.ResponseWriter, r *http.Request) {
 		isBranchBased := isPushAllowed && sourceBranch != "" && fromFork == ""
 		isForkBased := fromFork != "" && sourceBranch != ""
 		isPatchBased := patch != "" && !isBranchBased && !isForkBased
-		isStacked := r.FormValue("isStacked") == "on"
+		isStacked := r.FormValue("mode") == "stack" && !isPatchBased
 
 		if isPatchBased && !patchutil.IsFormatPatch(patch) {
 			if title == "" {
@@ -1013,6 +984,11 @@ func (s *Pulls) NewPull(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
+		if isBranchBased && sourceBranch == targetBranch {
+			s.pages.Notice(w, "pull", "Source and target branch must be different.")
+			return
+		}
+
 		// us, err := knotclient.NewUnsignedClient(f.Knot, s.config.Core.Dev)
 		// if err != nil {
 		// 	log.Printf("failed to create unsigned client to %s: %v", f.Knot, err)
@@ -1054,25 +1030,28 @@ func (s *Pulls) NewPull(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
+		stackTitles := parseBracketedForm(r.Form, "stackTitle")
+		stackBodies := parseBracketedForm(r.Form, "stackBody")
+
 		// Handle the PR creation based on the type
 		if isBranchBased {
 			if !caps.PullRequests.BranchSubmissions {
 				s.pages.Notice(w, "pull", "This knot doesn't support branch-based pull requests. Try another way?")
 				return
 			}
-			s.handleBranchBasedPull(w, r, f, userDid, title, body, targetBranch, sourceBranch, isStacked)
+			s.handleBranchBasedPull(w, r, f, userDid, title, body, targetBranch, sourceBranch, isStacked, stackTitles, stackBodies)
 		} else if isForkBased {
 			if !caps.PullRequests.ForkSubmissions {
 				s.pages.Notice(w, "pull", "This knot doesn't support fork-based pull requests. Try another way?")
 				return
 			}
-			s.handleForkBasedPull(w, r, f, userDid, fromFork, title, body, targetBranch, sourceBranch, isStacked)
+			s.handleForkBasedPull(w, r, f, userDid, fromFork, title, body, targetBranch, sourceBranch, isStacked, stackTitles, stackBodies)
 		} else if isPatchBased {
 			if !caps.PullRequests.PatchSubmissions {
 				s.pages.Notice(w, "pull", "This knot doesn't support patch-based pull requests. Send your patch over email.")
 				return
 			}
-			s.handlePatchBasedPull(w, r, f, userDid, title, body, targetBranch, patch, isStacked)
+			s.handlePatchBasedPull(w, r, f, userDid, title, body, targetBranch, patch, isStacked, stackTitles, stackBodies)
 		}
 		return
 	}
@@ -1088,17 +1067,11 @@ func (s *Pulls) handleBranchBasedPull(
 	targetBranch,
 	sourceBranch string,
 	isStacked bool,
+	stackTitles, stackBodies map[string]string,
 ) {
 	l := s.logger.With("handler", "handleBranchBasedPull", "user", userDid, "target_branch", targetBranch, "source_branch", sourceBranch, "is_stacked", isStacked)
 
-	scheme := "http"
-	if !s.config.Core.Dev {
-		scheme = "https"
-	}
-	host := fmt.Sprintf("%s://%s", scheme, repo.Knot)
-	xrpcc := &indigoxrpc.Client{
-		Host: host,
-	}
+	xrpcc := s.knotClient(repo.Knot)
 
 	xrpcBytes, err := tangled.RepoCompare(r.Context(), xrpcc, repo.RepoIdentifier(), targetBranch, sourceBranch)
 	if err != nil {
@@ -1119,6 +1092,11 @@ func (s *Pulls) handleBranchBasedPull(
 		return
 	}
 
+	if len(comparison.FormatPatch) == 0 {
+		s.pages.Notice(w, "pull", "No commits between target and source.")
+		return
+	}
+
 	sourceRev := comparison.Rev2
 	patch := comparison.FormatPatchRaw
 	combined := comparison.CombinedPatchRaw
@@ -1133,20 +1111,20 @@ func (s *Pulls) handleBranchBasedPull(
 		Branch: sourceBranch,
 	}
 
-	s.createPullRequest(w, r, repo, userDid, title, body, targetBranch, patch, combined, sourceRev, pullSource, isStacked)
+	s.createPullRequest(w, r, repo, userDid, title, body, targetBranch, patch, combined, sourceRev, pullSource, isStacked, stackTitles, stackBodies)
 }
 
-func (s *Pulls) handlePatchBasedPull(w http.ResponseWriter, r *http.Request, repo *models.Repo, userDid syntax.DID, title, body, targetBranch, patch string, isStacked bool) {
+func (s *Pulls) handlePatchBasedPull(w http.ResponseWriter, r *http.Request, repo *models.Repo, userDid syntax.DID, title, body, targetBranch, patch string, isStacked bool, stackTitles, stackBodies map[string]string) {
 	if err := s.validator.ValidatePatch(&patch); err != nil {
 		s.logger.Error("patch validation failed", "err", err)
 		s.pages.Notice(w, "pull", "Invalid patch format. Please provide a valid diff.")
 		return
 	}
 
-	s.createPullRequest(w, r, repo, userDid, title, body, targetBranch, patch, "", "", nil, isStacked)
+	s.createPullRequest(w, r, repo, userDid, title, body, targetBranch, patch, "", "", nil, isStacked, stackTitles, stackBodies)
 }
 
-func (s *Pulls) handleForkBasedPull(w http.ResponseWriter, r *http.Request, repo *models.Repo, userDid syntax.DID, forkRepo string, title, body, targetBranch, sourceBranch string, isStacked bool) {
+func (s *Pulls) handleForkBasedPull(w http.ResponseWriter, r *http.Request, repo *models.Repo, userDid syntax.DID, forkRepo string, title, body, targetBranch, sourceBranch string, isStacked bool, stackTitles, stackBodies map[string]string) {
 	l := s.logger.With("handler", "handleForkBasedPull", "user", userDid, "fork_repo", forkRepo, "target_branch", targetBranch, "source_branch", sourceBranch, "is_stacked", isStacked)
 
 	repoString := strings.SplitN(forkRepo, "/", 2)
@@ -1199,14 +1177,7 @@ func (s *Pulls) handleForkBasedPull(w http.ResponseWriter, r *http.Request, repo
 	// hiddenRef: hidden/feature-1/main (on repo-fork)
 	// targetBranch: main (on repo-1)
 	// sourceBranch: feature-1 (on repo-fork)
-	forkScheme := "http"
-	if !s.config.Core.Dev {
-		forkScheme = "https"
-	}
-	forkHost := fmt.Sprintf("%s://%s", forkScheme, fork.Knot)
-	forkXrpcc := &indigoxrpc.Client{
-		Host: forkHost,
-	}
+	forkXrpcc := s.knotClient(fork.Knot)
 
 	forkXrpcBytes, err := tangled.RepoCompare(r.Context(), forkXrpcc, fork.RepoIdentifier(), hiddenRef, sourceBranch)
 	if err != nil {
@@ -1227,6 +1198,11 @@ func (s *Pulls) handleForkBasedPull(w http.ResponseWriter, r *http.Request, repo
 		return
 	}
 
+	if len(comparison.FormatPatch) == 0 {
+		s.pages.Notice(w, "pull", "No commits between target and source.")
+		return
+	}
+
 	sourceRev := comparison.Rev2
 	patch := comparison.FormatPatchRaw
 	combined := comparison.CombinedPatchRaw
@@ -1250,7 +1226,7 @@ func (s *Pulls) handleForkBasedPull(w http.ResponseWriter, r *http.Request, repo
 		RepoDid: forkDid,
 	}
 
-	s.createPullRequest(w, r, repo, userDid, title, body, targetBranch, patch, combined, sourceRev, pullSource, isStacked)
+	s.createPullRequest(w, r, repo, userDid, title, body, targetBranch, patch, combined, sourceRev, pullSource, isStacked, stackTitles, stackBodies)
 }
 
 func (s *Pulls) createPullRequest(
@@ -1264,6 +1240,7 @@ func (s *Pulls) createPullRequest(
 	sourceRev string,
 	pullSource *models.PullSource,
 	isStacked bool,
+	stackTitles, stackBodies map[string]string,
 ) {
 	l := s.logger.With("handler", "createPullRequest", "user", userDid, "target_branch", targetBranch, "is_stacked", isStacked)
 
@@ -1278,6 +1255,8 @@ func (s *Pulls) createPullRequest(
 			patch,
 			sourceRev,
 			pullSource,
+			stackTitles,
+			stackBodies,
 		)
 		return
 	}
@@ -1390,6 +1369,8 @@ func (s *Pulls) createPullRequest(
 
 	s.notifier.NewPull(r.Context(), pull)
 
+	s.applyCreationLabels(r.Context(), client, userDid, []*models.Pull{pull}, r.Form, repo)
+
 	ownerSlashRepo := reporesolver.GetBaseRepoPath(r, repo)
 	s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", ownerSlashRepo, pullId))
 }
@@ -1403,18 +1384,12 @@ func (s *Pulls) createStackedPullRequest(
 	patch string,
 	sourceRev string,
 	pullSource *models.PullSource,
+	stackTitles, stackBodies map[string]string,
 ) {
 	l := s.logger.With("handler", "createStackedPullRequest", "user", userDid, "target_branch", targetBranch, "source_rev", sourceRev)
 
 	// run some necessary checks for stacked-prs first
 
-	//  must be branch or fork based
-	if sourceRev == "" {
-		l.Error("stacked PR from patch-based pull")
-		s.pages.Notice(w, "pull", "Stacking is only supported on branch and fork based pull-requests.")
-		return
-	}
-
 	formatPatches, err := patchutil.ExtractPatches(patch)
 	if err != nil {
 		l.Error("failed to extract patches", "err", err)
@@ -1450,7 +1425,7 @@ func (s *Pulls) createStackedPullRequest(
 	}
 
 	// build a stack out of this patch
-	stack, err := s.newStack(r.Context(), repo, userDid, targetBranch, pullSource, formatPatches, blobs)
+	stack, err := s.newStack(r.Context(), repo, userDid, targetBranch, pullSource, formatPatches, blobs, stackTitles, stackBodies)
 	if err != nil {
 		l.Error("failed to create stack", "err", err)
 		s.pages.Notice(w, "pull", fmt.Sprintf("Failed to create stack: %v", err))
@@ -1513,6 +1488,8 @@ func (s *Pulls) createStackedPullRequest(
 		s.notifier.NewPull(r.Context(), p)
 	}
 
+	s.applyCreationLabels(r.Context(), client, userDid, stack, r.Form, repo)
+
 	ownerSlashRepo := reporesolver.GetBaseRepoPath(r, repo)
 	s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls", ownerSlashRepo))
 }
@@ -1545,158 +1522,682 @@ func (s *Pulls) ValidatePatch(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-func (s *Pulls) PatchUploadFragment(w http.ResponseWriter, r *http.Request) {
-	user := s.oauth.GetMultiAccountUser(r)
-
-	s.pages.PullPatchUploadFragment(w, pages.PullPatchUploadParams{
-		RepoInfo: s.repoResolver.GetRepoInfo(r, user),
-	})
+func (s *Pulls) MarkdownPreview(w http.ResponseWriter, r *http.Request) {
+	body := r.FormValue("body")
+	s.pages.MarkdownPreviewFragment(w, body)
 }
 
-func (s *Pulls) CompareBranchesFragment(w http.ResponseWriter, r *http.Request) {
-	l := s.logger.With("handler", "CompareBranchesFragment")
+func (s *Pulls) RefreshWizard(w http.ResponseWriter, r *http.Request) {
+	l := s.logger.With("handler", "RefreshWizard")
 
-	user := s.oauth.GetMultiAccountUser(r)
 	f, err := s.repoResolver.Resolve(r)
 	if err != nil {
-		l.Error("failed to get repo and knot", "err", err)
+		l.Error("failed to resolve repo", "err", err)
+		s.pages.Error503(w)
 		return
 	}
 
-	xrpcc := &indigoxrpc.Client{Host: s.config.KnotMirror.Url}
-
-	xrpcBytes, err := tangled.GitTempListBranches(r.Context(), xrpcc, "", 0, f.RepoAt().String())
+	params, err := s.wizardParams(r, f)
 	if err != nil {
-		l.Error("failed to fetch branches", "err", err)
+		l.Error("failed to build wizard params", "err", err)
 		s.pages.Error503(w)
 		return
 	}
+	w.Header().Set("HX-Replace-Url", wizardCanonicalURL(params))
+	s.pages.PullWizardHostFragment(w, params)
+}
 
-	var result types.RepoBranchesResponse
-	if err := json.Unmarshal(xrpcBytes, &result); err != nil {
-		l.Error("failed to decode XRPC response", "err", err)
-		s.pages.Error503(w)
-		return
+func wizardCanonicalURL(params pages.RepoNewPullParams) string {
+	base := fmt.Sprintf("/%s/pulls/new", params.RepoInfo.FullName())
+	q := url.Values{}
+	if params.IsStacked {
+		q.Set("mode", "stack")
+	}
+	if params.Source != "" && params.Source != pages.SourceBranch {
+		q.Set("source", string(params.Source))
+	}
+	if params.SourceBranch != "" {
+		q.Set("sourceBranch", params.SourceBranch)
+	}
+	if params.TargetBranch != "" {
+		q.Set("targetBranch", params.TargetBranch)
+	}
+	if params.Source == pages.SourceFork && params.Fork != "" {
+		q.Set("fork", params.Fork)
 	}
+	if len(q) == 0 {
+		return base
+	}
+	return base + "?" + q.Encode()
+}
 
-	branches := result.Branches
-	sort.Slice(branches, func(i int, j int) bool {
-		return branches[i].Commit.Committer.When.After(branches[j].Commit.Committer.When)
-	})
+func (s *Pulls) wizardParams(r *http.Request, repo *models.Repo) (pages.RepoNewPullParams, error) {
+	l := s.logger.With("handler", "wizardParams")
+	user := s.oauth.GetMultiAccountUser(r)
+
+	branches, err := s.listBranches(r.Context(), repo)
+	if err != nil {
+		return pages.RepoNewPullParams{}, err
+	}
+
+	var forks []models.Repo
+	if user != nil {
+		forks, err = db.GetForksByDid(s.db, user.Did)
+		if err != nil {
+			l.Warn("failed to list user forks", "err", err, "user", user.Did)
+		}
+	}
+
+	repoInfo := s.repoResolver.GetRepoInfo(r, user)
+	source, ok := pages.ParseSource(r.FormValue("source"))
+	if !ok {
+		source = pages.SourceBranch
+		if !repoInfo.Roles.IsPushAllowed() {
+			source = pages.SourceFork
+		}
+	}
+
+	sourceBranch := r.FormValue("sourceBranch")
+	targetBranch := r.FormValue("targetBranch")
+	fork := r.FormValue("fork")
+	patch := r.FormValue("patch")
+
+	if source == pages.SourceFork && fork == "" && len(forks) == 1 {
+		fork = fmt.Sprintf("%s/%s", forks[0].Did, forks[0].Name)
+	}
+
+	var forkBranches []types.Branch
+	if source == pages.SourceFork && fork != "" {
+		forkBranches, err = s.listForkBranches(r.Context(), fork)
+		if err != nil {
+			l.Warn("failed to list fork branches", "err", err, "fork", fork)
+		}
+	}
+
+	sourceBranchList := sourceBranchChoices(branches)
+	targetBranch = defaultTargetBranch(branches, targetBranch)
+	sourceBranch = defaultSourceBranch(source, sourceBranch, sourceBranchList, forkBranches)
+
+	comparison, diff, prefetchErr := s.prefetchComparison(r, repo, source, fork, targetBranch, sourceBranch, patch)
+	var prefillErr string
+	if prefetchErr != nil {
+		prefillErr = prefetchErr.Error()
+	}
+
+	emailToDid, err := s.comparisonEmailToDid(comparison)
+	if err != nil {
+		l.Warn("failed to map commit emails to dids", "err", err)
+		emailToDid = make(map[string]string)
+	}
+
+	mergeCheck := s.wizardMergeCheck(r.Context(), repo, targetBranch, comparison)
+
+	refreshUrl := fmt.Sprintf("/%s/pulls/new/refresh", repoInfo.FullName())
+	var diffOpts types.DiffOpts
+	if r.FormValue("diff") == "split" {
+		diffOpts.Split = true
+	}
+	diffOpts.RefreshUrl = refreshUrl
 
-	withoutDefault := []types.Branch{}
-	for _, b := range branches {
-		if b.IsDefault {
+	labelDefs, err := s.pullLabelDefs(repo)
+	if err != nil {
+		l.Warn("failed to load label definitions", "err", err)
+	}
+	labelState := labelStateFromForm(r.Form, labelDefs)
+	perCidLabelForms := parseStackLabelForms(r.Form)
+	stackLabelStates := make(map[string]models.LabelState, len(perCidLabelForms))
+	for cid, perForm := range perCidLabelForms {
+		stackLabelStates[cid] = labelStateFromForm(perForm, labelDefs)
+	}
+
+	stackTitles := parseBracketedForm(r.Form, "stackTitle")
+	stackBodies := parseBracketedForm(r.Form, "stackBody")
+	stackSplits := parseBracketedForm(r.Form, "stackSplit")
+
+	title := r.FormValue("title")
+	body := r.FormValue("body")
+	if comparison != nil && len(comparison.FormatPatch) > 0 {
+		first := comparison.FormatPatch[0]
+		if title == "" && first.PatchHeader != nil {
+			title = first.Title
+		}
+		if body == "" && first.PatchHeader != nil {
+			body = first.Body
+		}
+	}
+
+	isStacked := r.FormValue("mode") == "stack" && source != pages.SourcePatch
+	var perCommitDiffs []*types.NiceDiff
+	var stackDiffOpts []types.DiffOpts
+	if isStacked {
+		perCommitDiffs, stackDiffOpts = stackPerCommitDiffs(comparison, targetBranch, refreshUrl, stackSplits)
+	}
+
+	return pages.RepoNewPullParams{
+		LoggedInUser:     user,
+		RepoInfo:         repoInfo,
+		Branches:         branches,
+		SourceBranches:   sourceBranchList,
+		ForkBranches:     forkBranches,
+		Forks:            forks,
+		Source:           source,
+		SourceBranch:     sourceBranch,
+		TargetBranch:     targetBranch,
+		Fork:             fork,
+		Patch:            patch,
+		Title:            title,
+		Body:             body,
+		IsStacked:        isStacked,
+		Comparison:       comparison,
+		Diff:             diff,
+		PerCommitDiffs:   perCommitDiffs,
+		DiffOpts:         diffOpts,
+		StackDiffOpts:    stackDiffOpts,
+		EmailToDid:       emailToDid,
+		MergeCheck:       mergeCheck,
+		StackTitles:      stackTitles,
+		StackBodies:      stackBodies,
+		PrefillError:     prefillErr,
+		LabelDefs:        labelDefs,
+		LabelState:       labelState,
+		StackLabelStates: stackLabelStates,
+	}, nil
+}
+
+func (s *Pulls) pullLabelDefs(repo *models.Repo) (map[string]*models.LabelDefinition, error) {
+	defs, err := db.GetLabelDefinitions(
+		s.db,
+		orm.FilterIn("at_uri", repo.Labels),
+		orm.FilterContains("scope", tangled.RepoPullNSID),
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	out := make(map[string]*models.LabelDefinition, len(defs))
+	for i := range defs {
+		d := defs[i]
+		if !slices.Contains(d.Scope, tangled.RepoPullNSID) {
 			continue
 		}
-		withoutDefault = append(withoutDefault, b)
+		out[d.AtUri().String()] = &d
 	}
+	return out, nil
+}
 
-	s.pages.PullCompareBranchesFragment(w, pages.PullCompareBranchesParams{
-		RepoInfo: s.repoResolver.GetRepoInfo(r, user),
-		Branches: withoutDefault,
-	})
+func formLabelEntries(form url.Values, defs map[string]*models.LabelDefinition) iter.Seq2[string, string] {
+	return func(yield func(string, string) bool) {
+		for key := range defs {
+			for _, v := range form[key] {
+				if v == "" {
+					continue
+				}
+				if !yield(key, v) {
+					return
+				}
+			}
+		}
+	}
 }
 
-func (s *Pulls) CompareForksFragment(w http.ResponseWriter, r *http.Request) {
-	l := s.logger.With("handler", "CompareForksFragment")
+func labelStateFromForm(form url.Values, defs map[string]*models.LabelDefinition) models.LabelState {
+	state := models.NewLabelState()
+	actx := &models.LabelApplicationCtx{Defs: defs}
+	for key, val := range formLabelEntries(form, defs) {
+		_ = actx.ApplyLabelOp(state, models.LabelOp{
+			Operation:    models.LabelOperationAdd,
+			OperandKey:   key,
+			OperandValue: val,
+		})
+	}
+	return state
+}
 
-	user := s.oauth.GetMultiAccountUser(r)
-	if user != nil {
-		l = l.With("user", user.Did)
+func buildCreationLabelOps(
+	userDid syntax.DID,
+	subject syntax.ATURI,
+	rkey string,
+	form url.Values,
+	defs map[string]*models.LabelDefinition,
+	performedAt time.Time,
+) []models.LabelOp {
+	var ops []models.LabelOp
+	for key, val := range formLabelEntries(form, defs) {
+		ops = append(ops, models.LabelOp{
+			Did:          userDid.String(),
+			Rkey:         rkey,
+			Subject:      subject,
+			Operation:    models.LabelOperationAdd,
+			OperandKey:   key,
+			OperandValue: val,
+			PerformedAt:  performedAt,
+		})
 	}
+	return ops
+}
+
+func (s *Pulls) applyCreationLabels(
+	ctx context.Context,
+	client *atclient.APIClient,
+	userDid syntax.DID,
+	pulls []*models.Pull,
+	form url.Values,
+	repo *models.Repo,
+) {
+	l := s.logger.With("handler", "applyCreationLabels", "user", userDid)
 
-	forks, err := db.GetForksByDid(s.db, user.Did)
+	defs, err := s.pullLabelDefs(repo)
 	if err != nil {
-		l.Error("failed to get forks", "err", err)
+		l.Warn("failed to fetch label defs", "err", err)
+		return
+	}
+	if len(defs) == 0 {
 		return
 	}
 
-	s.pages.PullCompareForkFragment(w, pages.PullCompareForkParams{
-		RepoInfo: s.repoResolver.GetRepoInfo(r, user),
-		Forks:    forks,
-		Selected: r.URL.Query().Get("fork"),
-	})
-}
+	perCidForms := parseStackLabelForms(form)
 
-func (s *Pulls) CompareForksBranchesFragment(w http.ResponseWriter, r *http.Request) {
-	l := s.logger.With("handler", "CompareForksBranchesFragment")
+	performedAt := time.Now()
+	for _, pull := range pulls {
+		labelForm := form
+		if len(perCidForms) > 0 && len(pull.Submissions) > 0 {
+			if cid := pull.Submissions[0].ChangeId(); cid != "" {
+				if perForm, ok := perCidForms[cid]; ok {
+					labelForm = perForm
+				}
+			}
+		}
+		rkey := tid.TID()
+		raw := buildCreationLabelOps(userDid, pull.AtUri(), rkey, labelForm, defs, performedAt)
 
-	user := s.oauth.GetMultiAccountUser(r)
-	if user != nil {
-		l = l.With("user", user.Did)
+		valid := make([]models.LabelOp, 0, len(raw))
+		for _, op := range raw {
+			def := defs[op.OperandKey]
+			if err := s.validator.ValidateLabelOp(def, repo, &op); err != nil {
+				l.Warn("invalid label op", "err", err, "subject", op.Subject, "key", op.OperandKey)
+				continue
+			}
+			valid = append(valid, op)
+		}
+		if len(valid) == 0 {
+			continue
+		}
+
+		record := models.LabelOpsAsRecord(valid)
+		if _, err := comatproto.RepoPutRecord(ctx, client, &comatproto.RepoPutRecord_Input{
+			Collection: tangled.LabelOpNSID,
+			Repo:       userDid.String(),
+			Rkey:       rkey,
+			Record:     &lexutil.LexiconTypeDecoder{Val: &record},
+		}); err != nil {
+			l.Warn("failed to write label ops to PDS", "err", err, "subject", pull.AtUri())
+			continue
+		}
+
+		if err := s.indexLabelOps(ctx, valid); err != nil {
+			l.Warn("failed to index label ops", "err", err, "subject", pull.AtUri())
+			if _, err := comatproto.RepoDeleteRecord(context.Background(), client, &comatproto.RepoDeleteRecord_Input{
+				Collection: tangled.LabelOpNSID,
+				Repo:       userDid.String(),
+				Rkey:       rkey,
+			}); err != nil {
+				l.Warn("failed to rollback label ops record from PDS", "err", err, "subject", pull.AtUri())
+			}
+			continue
+		}
+
+		s.notifier.NewPullLabelOp(ctx, pull)
 	}
+}
 
-	f, err := s.repoResolver.Resolve(r)
+func (s *Pulls) indexLabelOps(ctx context.Context, ops []models.LabelOp) error {
+	tx, err := s.db.BeginTx(ctx, nil)
 	if err != nil {
-		l.Error("failed to get repo and knot", "err", err)
-		return
+		return err
 	}
+	defer tx.Rollback()
+	for _, op := range ops {
+		if _, err := db.AddLabelOp(tx, &op); err != nil {
+			return err
+		}
+	}
+	return tx.Commit()
+}
 
+func (s *Pulls) listBranches(ctx context.Context, repo *models.Repo) ([]types.Branch, error) {
 	xrpcc := &indigoxrpc.Client{Host: s.config.KnotMirror.Url}
+	xrpcBytes, err := tangled.GitTempListBranches(ctx, xrpcc, "", 0, repo.RepoAt().String())
+	if err != nil {
+		return nil, err
+	}
+	var result types.RepoBranchesResponse
+	if err := json.Unmarshal(xrpcBytes, &result); err != nil {
+		return nil, err
+	}
+	return result.Branches, nil
+}
 
-	forkVal := r.URL.Query().Get("fork")
-	repoString := strings.SplitN(forkVal, "/", 2)
-	forkOwnerDid := repoString[0]
-	forkName := repoString[1]
-	// fork repo
-	repo, err := db.GetRepo(
-		s.db,
-		orm.FilterEq("did", forkOwnerDid),
-		orm.FilterEq("name", forkName),
-	)
+func (s *Pulls) listForkBranches(ctx context.Context, forkIdent string) ([]types.Branch, error) {
+	parts := strings.SplitN(forkIdent, "/", 2)
+	if len(parts) != 2 {
+		return nil, fmt.Errorf("invalid fork identifier: %s", forkIdent)
+	}
+	forkRepo, err := db.GetRepo(s.db, orm.FilterEq("did", parts[0]), orm.FilterEq("name", parts[1]))
 	if err != nil {
-		l.Error("failed to get repo", "fork_owner_did", forkOwnerDid, "fork_name", forkName, "err", err)
-		return
+		return nil, err
+	}
+	branches, err := s.listBranches(ctx, forkRepo)
+	if err != nil {
+		return nil, err
 	}
+	return sortBranchesByRecency(branches), nil
+}
+
+func sourceBranchChoices(branches []types.Branch) []types.Branch {
+	withoutDefault := slices.DeleteFunc(slices.Clone(branches), func(b types.Branch) bool {
+		return b.IsDefault
+	})
+	return sortBranchesByRecency(withoutDefault)
+}
+
+func defaultTargetBranch(branches []types.Branch, current string) string {
+	if slices.ContainsFunc(branches, func(b types.Branch) bool { return b.Reference.Name == current }) {
+		return current
+	}
+	if idx := slices.IndexFunc(branches, func(b types.Branch) bool { return b.IsDefault }); idx >= 0 {
+		return branches[idx].Reference.Name
+	}
+	return ""
+}
 
-	sourceXrpcBytes, err := tangled.GitTempListBranches(r.Context(), xrpcc, "", 0, repo.RepoAt().String())
+func defaultSourceBranch(source pages.Source, current string, branchChoices, forkBranches []types.Branch) string {
+	var candidates []types.Branch
+	switch source {
+	case pages.SourceFork:
+		candidates = forkBranches
+	case pages.SourceBranch:
+		candidates = branchChoices
+	default:
+		return current
+	}
+	if slices.ContainsFunc(candidates, func(b types.Branch) bool { return b.Reference.Name == current }) {
+		return current
+	}
+	if len(candidates) == 0 {
+		return ""
+	}
+	return candidates[0].Reference.Name
+}
+
+func sortBranchesByRecency(branches []types.Branch) []types.Branch {
+	out := slices.Clone(branches)
+	sort.SliceStable(out, func(i, j int) bool {
+		if out[i].Commit == nil || out[j].Commit == nil {
+			return out[i].Commit != nil
+		}
+		return out[i].Commit.Committer.When.After(out[j].Commit.Committer.When)
+	})
+	return out
+}
+
+func (s *Pulls) prefetchComparison(r *http.Request, repo *models.Repo, source pages.Source, fork, targetBranch, sourceBranch, patch string) (*types.RepoFormatPatchResponse, *types.NiceDiff, error) {
+	var (
+		comparison *types.RepoFormatPatchResponse
+		err        error
+	)
+	switch source {
+	case pages.SourcePatch:
+		if strings.TrimSpace(patch) == "" {
+			return nil, nil, nil
+		}
+		if verr := s.validator.ValidatePatch(&patch); verr != nil {
+			return nil, nil, fmt.Errorf("invalid patch: paste a valid git diff or format-patch")
+		}
+		comparison = parsePastedPatch(patch)
+	case pages.SourceBranch:
+		if targetBranch == "" || sourceBranch == "" {
+			return nil, nil, nil
+		}
+		comparison, err = s.fetchBranchComparison(r.Context(), repo, targetBranch, sourceBranch)
+	case pages.SourceFork:
+		if fork == "" || targetBranch == "" || sourceBranch == "" {
+			return nil, nil, nil
+		}
+		comparison, err = s.fetchForkComparison(r, fork, targetBranch, sourceBranch)
+	default:
+		return nil, nil, nil
+	}
 	if err != nil {
-		if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {
-			l.Error("failed to call XRPC repo.branches for source", "xrpcerr", xrpcerr, "err", err)
-			s.pages.Error503(w)
-			return
+		s.logger.With("handler", "prefetchComparison").Warn("failed to pre-fetch comparison", "err", err, "source", source)
+		return nil, nil, err
+	}
+
+	return comparison, deriveDiff(comparison, targetBranch), nil
+}
+
+func (s *Pulls) wizardMergeCheck(ctx context.Context, repo *models.Repo, targetBranch string, comparison *types.RepoFormatPatchResponse) *types.MergeCheckResponse {
+	if comparison == nil || targetBranch == "" {
+		return nil
+	}
+	patch := comparison.CombinedPatchRaw
+	if patch == "" {
+		patch = comparison.FormatPatchRaw
+	}
+	if patch == "" {
+		return nil
+	}
+
+	xrpcc := s.knotClient(repo.Knot)
+
+	resp, err := tangled.RepoMergeCheck(ctx, xrpcc, &tangled.RepoMergeCheck_Input{
+		Did:    repo.Did,
+		Name:   repo.Name,
+		Branch: targetBranch,
+		Patch:  patch,
+	})
+	if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {
+		s.logger.With("handler", "wizardMergeCheck").Warn("failed to check mergeability", "xrpcerr", xrpcerr, "err", err, "target_branch", targetBranch)
+		return &types.MergeCheckResponse{Error: xrpcerr.Error()}
+	}
+
+	out := mergeCheckResponseFrom(resp)
+	return &out
+}
+
+func bracketComponents(key, prefix string) ([]string, bool) {
+	if !strings.HasPrefix(key, prefix) {
+		return nil, false
+	}
+	rest := key[len(prefix):]
+	var parts []string
+	for len(rest) > 0 {
+		if !strings.HasPrefix(rest, "[") {
+			return nil, false
 		}
-		l.Error("failed to fetch source branches", "err", err)
-		return
+		end := strings.Index(rest, "]")
+		if end <= 0 {
+			return nil, false
+		}
+		parts = append(parts, rest[1:end])
+		rest = rest[end+1:]
+	}
+	if len(parts) == 0 {
+		return nil, false
 	}
+	return parts, true
+}
 
-	// Decode source branches
-	var sourceBranches types.RepoBranchesResponse
-	if err := json.Unmarshal(sourceXrpcBytes, &sourceBranches); err != nil {
-		l.Error("failed to decode source branches XRPC response", "err", err)
-		s.pages.Error503(w)
-		return
+func parseBracketedForm(form url.Values, prefix string) map[string]string {
+	out := make(map[string]string)
+	for key, vals := range form {
+		parts, ok := bracketComponents(key, prefix)
+		if !ok || len(parts) != 1 || parts[0] == "" || len(vals) == 0 {
+			continue
+		}
+		out[parts[0]] = vals[0]
+	}
+	return out
+}
+
+func parseStackLabelForms(form url.Values) map[string]url.Values {
+	out := make(map[string]url.Values)
+	for key, vals := range form {
+		parts, ok := bracketComponents(key, "stackLabel")
+		if !ok || len(parts) != 2 || parts[0] == "" || parts[1] == "" {
+			continue
+		}
+		cid, atUri := parts[0], parts[1]
+		if _, ok := out[cid]; !ok {
+			out[cid] = make(url.Values)
+		}
+		out[cid][atUri] = append(out[cid][atUri], vals...)
+	}
+	return out
+}
+
+func (s *Pulls) comparisonEmailToDid(comparison *types.RepoFormatPatchResponse) (map[string]string, error) {
+	if comparison == nil {
+		return make(map[string]string), nil
 	}
+	seen := make(map[string]struct{})
+	for _, p := range comparison.FormatPatch {
+		if p.PatchHeader == nil {
+			continue
+		}
+		if p.Author != nil && p.Author.Email != "" {
+			seen[p.Author.Email] = struct{}{}
+		}
+		if p.Committer != nil && p.Committer.Email != "" {
+			seen[p.Committer.Email] = struct{}{}
+		}
+	}
+	if len(seen) == 0 {
+		return make(map[string]string), nil
+	}
+	emails := slices.Collect(maps.Keys(seen))
+	return db.GetEmailToDid(s.db, emails, true)
+}
 
-	targetXrpcBytes, err := tangled.GitTempListBranches(r.Context(), xrpcc, "", 0, f.RepoAt().String())
+func parsePastedPatch(patch string) *types.RepoFormatPatchResponse {
+	if patch == "" {
+		return nil
+	}
+	response := &types.RepoFormatPatchResponse{FormatPatchRaw: patch}
+	if patchutil.IsFormatPatch(patch) {
+		if patches, err := patchutil.ExtractPatches(patch); err == nil {
+			response.FormatPatch = patches
+		}
+	}
+	return response
+}
+
+func (s *Pulls) fetchBranchComparison(ctx context.Context, repo *models.Repo, targetBranch, sourceBranch string) (*types.RepoFormatPatchResponse, error) {
+	xrpcc := s.knotClient(repo.Knot)
+
+	xrpcBytes, err := tangled.RepoCompare(ctx, xrpcc, repo.RepoIdentifier(), targetBranch, sourceBranch)
 	if err != nil {
-		if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {
-			l.Error("failed to call XRPC repo.branches for target", "xrpcerr", xrpcerr, "err", err)
-			s.pages.Error503(w)
-			return
+		return nil, err
+	}
+
+	var comparison types.RepoFormatPatchResponse
+	if err := json.Unmarshal(xrpcBytes, &comparison); err != nil {
+		return nil, err
+	}
+	return &comparison, nil
+}
+
+func (s *Pulls) fetchForkComparison(r *http.Request, forkIdent, targetBranch, sourceBranch string) (*types.RepoFormatPatchResponse, error) {
+	parts := strings.SplitN(forkIdent, "/", 2)
+	if len(parts) != 2 {
+		return nil, fmt.Errorf("invalid fork identifier: %s", forkIdent)
+	}
+	fork, err := db.GetForkByDid(s.db, parts[0], parts[1])
+	if err != nil {
+		return nil, err
+	}
+
+	client, err := s.oauth.ServiceClient(
+		r,
+		oauth.WithService(fork.Knot),
+		oauth.WithLxm(tangled.RepoHiddenRefNSID),
+		oauth.WithDev(s.config.Core.Dev),
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	resp, err := tangled.RepoHiddenRef(
+		r.Context(),
+		client,
+		&tangled.RepoHiddenRef_Input{
+			ForkRef:   sourceBranch,
+			RemoteRef: targetBranch,
+			Repo:      fork.RepoAt().String(),
+		},
+	)
+	if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {
+		return nil, xrpcerr
+	}
+	if !resp.Success {
+		if resp.Error != nil {
+			return nil, fmt.Errorf("hidden ref failed: %s", *resp.Error)
 		}
-		l.Error("failed to fetch target branches", "err", err)
-		return
+		return nil, fmt.Errorf("hidden ref failed")
 	}
 
-	// Decode target branches
-	var targetBranches types.RepoBranchesResponse
-	if err := json.Unmarshal(targetXrpcBytes, &targetBranches); err != nil {
-		l.Error("failed to decode target branches XRPC response", "err", err)
-		s.pages.Error503(w)
-		return
+	hiddenRef := fmt.Sprintf("hidden/%s/%s", sourceBranch, targetBranch)
+	forkXrpcc := s.knotClient(fork.Knot)
+
+	forkXrpcBytes, err := tangled.RepoCompare(r.Context(), forkXrpcc, fork.RepoIdentifier(), hiddenRef, sourceBranch)
+	if err != nil {
+		return nil, err
 	}
 
-	sort.Slice(sourceBranches.Branches, func(i int, j int) bool {
-		return sourceBranches.Branches[i].Commit.Committer.When.After(sourceBranches.Branches[j].Commit.Committer.When)
-	})
+	var comparison types.RepoFormatPatchResponse
+	if err := json.Unmarshal(forkXrpcBytes, &comparison); err != nil {
+		return nil, err
+	}
+	return &comparison, nil
+}
 
-	s.pages.PullCompareForkBranchesFragment(w, pages.PullCompareForkBranchesParams{
-		RepoInfo:       s.repoResolver.GetRepoInfo(r, user),
-		SourceBranches: sourceBranches.Branches,
-		TargetBranches: targetBranches.Branches,
-	})
+func stackPerCommitDiffs(
+	comparison *types.RepoFormatPatchResponse,
+	targetBranch, refreshUrl string,
+	stackSplits map[string]string,
+) ([]*types.NiceDiff, []types.DiffOpts) {
+	if comparison == nil {
+		return nil, nil
+	}
+	n := len(comparison.FormatPatch)
+	diffs := make([]*types.NiceDiff, n)
+	opts := make([]types.DiffOpts, n)
+	for i, p := range comparison.FormatPatch {
+		nd := patchutil.AsNiceDiff(p.Raw, targetBranch)
+		diffs[i] = &nd
+		cid := p.ChangeIdOrEmpty()
+		if cid == "" {
+			continue
+		}
+		opts[i] = types.DiffOpts{
+			Split:      stackSplits[cid] == "split",
+			RefreshUrl: refreshUrl,
+			Target:     fmt.Sprintf("#stack-diff-%s", cid),
+			Field:      fmt.Sprintf("stackSplit[%s]", cid),
+		}
+	}
+	return diffs, opts
+}
+
+func deriveDiff(comparison *types.RepoFormatPatchResponse, targetBranch string) *types.NiceDiff {
+	if comparison == nil {
+		return nil
+	}
+	raw := comparison.CombinedPatchRaw
+	if raw == "" {
+		raw = comparison.FormatPatchRaw
+	}
+	d := patchutil.AsNiceDiff(raw, targetBranch)
+	return &d
 }
 
 func (s *Pulls) ResubmitPull(w http.ResponseWriter, r *http.Request) {
@@ -1804,14 +2305,7 @@ func (s *Pulls) resubmitBranch(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	scheme := "http"
-	if !s.config.Core.Dev {
-		scheme = "https"
-	}
-	host := fmt.Sprintf("%s://%s", scheme, f.Knot)
-	xrpcc := &indigoxrpc.Client{
-		Host: host,
-	}
+	xrpcc := s.knotClient(f.Knot)
 
 	xrpcBytes, err := tangled.RepoCompare(r.Context(), xrpcc, f.RepoIdentifier(), pull.TargetBranch, pull.PullSource.Branch)
 	if err != nil {
@@ -1908,12 +2402,7 @@ func (s *Pulls) resubmitFork(w http.ResponseWriter, r *http.Request) {
 
 	hiddenRef := fmt.Sprintf("hidden/%s/%s", pull.PullSource.Branch, pull.TargetBranch)
 	// extract patch by performing compare
-	forkScheme := "http"
-	if !s.config.Core.Dev {
-		forkScheme = "https"
-	}
-	forkHost := fmt.Sprintf("%s://%s", forkScheme, forkRepo.Knot)
-	forkXrpcBytes, err := tangled.RepoCompare(r.Context(), &indigoxrpc.Client{Host: forkHost}, forkRepo.RepoIdentifier(), hiddenRef, pull.PullSource.Branch)
+	forkXrpcBytes, err := tangled.RepoCompare(r.Context(), s.knotClient(forkRepo.Knot), forkRepo.RepoIdentifier(), hiddenRef, pull.PullSource.Branch)
 	if err != nil {
 		if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {
 			l.Error("failed to call XRPC repo.compare for fork", "xrpcerr", xrpcerr, "err", err, "hidden_ref", hiddenRef, "source_branch", pull.PullSource.Branch)
@@ -2086,7 +2575,7 @@ func (s *Pulls) resubmitStackedPullHelper(
 		blobs[i] = blob.Blob
 	}
 
-	newStack, err := s.newStack(r.Context(), repo, userDid, targetBranch, pull.PullSource, formatPatches, blobs)
+	newStack, err := s.newStack(r.Context(), repo, userDid, targetBranch, pull.PullSource, formatPatches, blobs, nil, nil)
 	if err != nil {
 		l.Error("failed to create resubmitted stack", "err", err)
 		s.pages.Notice(w, "pull-merge-error", "Failed to merge pull request. Try again later.")
@@ -2583,18 +3072,25 @@ func (s *Pulls) newStack(
 	pullSource *models.PullSource,
 	formatPatches []types.FormatPatch,
 	blobs []*lexutil.LexBlob,
+	stackTitles, stackBodies map[string]string,
 ) (models.Stack, error) {
 	var stack models.Stack
 	var parentAtUri *syntax.ATURI
 	for i, fp := range formatPatches {
 		//  all patches must have a jj change-id
-		_, err := fp.ChangeId()
+		cid, err := fp.ChangeId()
 		if err != nil {
 			return nil, fmt.Errorf("Stacking is only supported if all patches contain a change-id commit header.")
 		}
 
 		title := fp.Title
 		body := fp.Body
+		if override, ok := stackTitles[cid]; ok && strings.TrimSpace(override) != "" {
+			title = override
+		}
+		if override, ok := stackBodies[cid]; ok {
+			body = override
+		}
 		rkey := tid.TID()
 
 		mentions, references := s.mentionsResolver.Resolve(ctx, body)
diff --git a/appview/pulls/router.go b/appview/pulls/router.go
index c1a0fce4..cb782cb5 100644
--- a/appview/pulls/router.go
+++ b/appview/pulls/router.go
@@ -12,11 +12,10 @@ func (s *Pulls) Router(mw *middleware.Middleware) http.Handler {
 	r.With(middleware.Paginate).Get("/", s.RepoPulls)
 	r.With(middleware.AuthMiddleware(s.oauth)).Route("/new", func(r chi.Router) {
 		r.Get("/", s.NewPull)
-		r.Get("/patch-upload", s.PatchUploadFragment)
 		r.Post("/validate-patch", s.ValidatePatch)
-		r.Get("/compare-branches", s.CompareBranchesFragment)
-		r.Get("/compare-forks", s.CompareForksFragment)
-		r.Get("/fork-branches", s.CompareForksBranchesFragment)
+		r.Get("/refresh", s.RefreshWizard)
+		r.Post("/refresh", s.RefreshWizard)
+		r.Post("/preview", s.MarkdownPreview)
 		r.Post("/", s.NewPull)
 	})
 
diff --git a/appview/pulls/wizard_helpers_test.go b/appview/pulls/wizard_helpers_test.go
new file mode 100644
index 00000000..dc3c5e99
--- /dev/null
+++ b/appview/pulls/wizard_helpers_test.go
@@ -0,0 +1,269 @@
+package pulls
+
+import (
+	"net/url"
+	"reflect"
+	"testing"
+	"time"
+
+	"github.com/go-git/go-git/v5/plumbing/object"
+	"tangled.org/core/appview/models"
+	"tangled.org/core/appview/pages"
+	"tangled.org/core/appview/pages/repoinfo"
+	"tangled.org/core/types"
+)
+
+func TestBracketComponents(t *testing.T) {
+	cases := []struct {
+		key, prefix string
+		want        []string
+		ok          bool
+	}{
+		{"foo[a]", "foo", []string{"a"}, true},
+		{"foo[a][b]", "foo", []string{"a", "b"}, true},
+		{"foo[a][b][c]", "foo", []string{"a", "b", "c"}, true},
+		{"foo[]", "foo", []string{""}, true},
+		{"foo[a][]", "foo", []string{"a", ""}, true},
+		{"foo", "foo", nil, false},
+		{"bar[a]", "foo", nil, false},
+		{"foo[a", "foo", nil, false},
+		{"fooa]", "foo", nil, false},
+		{"foo[a]extra", "foo", nil, false},
+		{"", "foo", nil, false},
+	}
+	for _, c := range cases {
+		got, ok := bracketComponents(c.key, c.prefix)
+		if ok != c.ok || !reflect.DeepEqual(got, c.want) {
+			t.Errorf("bracketComponents(%q, %q) = %v, %v; want %v, %v", c.key, c.prefix, got, ok, c.want, c.ok)
+		}
+	}
+}
+
+func TestParseBracketedForm(t *testing.T) {
+	form := url.Values{
+		"stackTitle[abc]":   {"hello"},
+		"stackTitle[xyz]":   {"world", "ignored"},
+		"stackTitle[]":      {"empty-id"},
+		"stackTitle[a][b]":  {"too-deep"},
+		"stackTitle":        {"no-bracket"},
+		"unrelated[abc]":    {"skip"},
+		"stackTitle[noval]": {},
+	}
+	got := parseBracketedForm(form, "stackTitle")
+	want := map[string]string{
+		"abc": "hello",
+		"xyz": "world",
+	}
+	if !reflect.DeepEqual(got, want) {
+		t.Errorf("parseBracketedForm = %v; want %v", got, want)
+	}
+}
+
+func TestParseStackLabelForms(t *testing.T) {
+	form := url.Values{
+		"stackLabel[c1][at://uri/a]": {"v1"},
+		"stackLabel[c1][at://uri/b]": {"v2"},
+		"stackLabel[c2][at://uri/a]": {"v3", "v4"},
+		"stackLabel[c1][]":           {"empty-uri"},
+		"stackLabel[][at://uri/a]":   {"empty-cid"},
+		"stackLabel[c1]":             {"missing-second-bracket"},
+		"stackLabel[c1][a][b]":       {"too-deep"},
+		"stackTitle[c1]":             {"wrong-prefix"},
+	}
+	got := parseStackLabelForms(form)
+	want := map[string]url.Values{
+		"c1": {
+			"at://uri/a": {"v1"},
+			"at://uri/b": {"v2"},
+		},
+		"c2": {
+			"at://uri/a": {"v3", "v4"},
+		},
+	}
+	if !reflect.DeepEqual(got, want) {
+		t.Errorf("parseStackLabelForms = %v; want %v", got, want)
+	}
+}
+
+func TestDefaultTargetBranch(t *testing.T) {
+	branches := []types.Branch{
+		{Reference: types.Reference{Name: "feature"}},
+		{Reference: types.Reference{Name: "main"}, IsDefault: true},
+	}
+	cases := []struct {
+		name     string
+		branches []types.Branch
+		current  string
+		want     string
+	}{
+		{"current is valid", branches, "feature", "feature"},
+		{"current is default", branches, "main", "main"},
+		{"current invalid, falls to default", branches, "ghost", "main"},
+		{"current empty, falls to default", branches, "", "main"},
+		{"no default, no match returns empty", []types.Branch{{Reference: types.Reference{Name: "only"}}}, "ghost", ""},
+		{"empty branches returns empty", nil, "anything", ""},
+	}
+	for _, c := range cases {
+		t.Run(c.name, func(t *testing.T) {
+			if got := defaultTargetBranch(c.branches, c.current); got != c.want {
+				t.Errorf("defaultTargetBranch = %q; want %q", got, c.want)
+			}
+		})
+	}
+}
+
+func TestDefaultSourceBranch(t *testing.T) {
+	choices := []types.Branch{
+		{Reference: types.Reference{Name: "feature"}},
+		{Reference: types.Reference{Name: "wip"}},
+	}
+	forks := []types.Branch{
+		{Reference: types.Reference{Name: "fork-feature"}},
+	}
+	cases := []struct {
+		name    string
+		source  pages.Source
+		current string
+		want    string
+	}{
+		{"branch source, valid current", pages.SourceBranch, "feature", "feature"},
+		{"branch source, invalid falls to first", pages.SourceBranch, "ghost", "feature"},
+		{"branch source, empty falls to first", pages.SourceBranch, "", "feature"},
+		{"fork source, valid current", pages.SourceFork, "fork-feature", "fork-feature"},
+		{"fork source, invalid falls to first fork", pages.SourceFork, "ghost", "fork-feature"},
+		{"patch source preserves current", pages.SourcePatch, "anything", "anything"},
+	}
+	for _, c := range cases {
+		t.Run(c.name, func(t *testing.T) {
+			if got := defaultSourceBranch(c.source, c.current, choices, forks); got != c.want {
+				t.Errorf("defaultSourceBranch = %q; want %q", got, c.want)
+			}
+		})
+	}
+	if got := defaultSourceBranch(pages.SourceBranch, "", nil, nil); got != "" {
+		t.Errorf("empty choices should return empty, got %q", got)
+	}
+}
+
+func TestSortBranchesByRecency(t *testing.T) {
+	mk := func(name string, when *time.Time) types.Branch {
+		b := types.Branch{Reference: types.Reference{Name: name}}
+		if when != nil {
+			b.Commit = &object.Commit{Committer: object.Signature{When: *when}}
+		}
+		return b
+	}
+	t1 := time.Date(2026, 1, 1, 0, 0, 0, 0, time.UTC)
+	t2 := time.Date(2026, 2, 1, 0, 0, 0, 0, time.UTC)
+	t3 := time.Date(2026, 3, 1, 0, 0, 0, 0, time.UTC)
+
+	in := []types.Branch{
+		mk("oldest", &t1),
+		mk("newest", &t3),
+		mk("nil-commit", nil),
+		mk("middle", &t2),
+	}
+	got := sortBranchesByRecency(in)
+	wantNames := []string{"newest", "middle", "oldest", "nil-commit"}
+	for i, want := range wantNames {
+		if got[i].Reference.Name != want {
+			t.Errorf("position %d: got %q, want %q", i, got[i].Reference.Name, want)
+		}
+	}
+
+	if &got[0] == &in[0] {
+		t.Error("expected new slice, got aliased input")
+	}
+}
+
+func TestWizardCanonicalURL(t *testing.T) {
+	repo := repoinfo.RepoInfo{OwnerDid: "did:plc:abc", Name: "demo"}
+	cases := []struct {
+		name string
+		p    pages.RepoNewPullParams
+		want string
+	}{
+		{
+			"defaults",
+			pages.RepoNewPullParams{RepoInfo: repo, Source: pages.SourceBranch},
+			"/did:plc:abc/demo/pulls/new",
+		},
+		{
+			"stacked",
+			pages.RepoNewPullParams{RepoInfo: repo, Source: pages.SourceBranch, IsStacked: true},
+			"/did:plc:abc/demo/pulls/new?mode=stack",
+		},
+		{
+			"fork with selection",
+			pages.RepoNewPullParams{
+				RepoInfo:     repo,
+				Source:       pages.SourceFork,
+				Fork:         "did:plc:other/repo",
+				SourceBranch: "feature",
+				TargetBranch: "main",
+			},
+			"/did:plc:abc/demo/pulls/new?fork=did%3Aplc%3Aother%2Frepo&source=fork&sourceBranch=feature&targetBranch=main",
+		},
+		{
+			"branch with selection drops source param",
+			pages.RepoNewPullParams{
+				RepoInfo:     repo,
+				Source:       pages.SourceBranch,
+				SourceBranch: "feature",
+				TargetBranch: "main",
+			},
+			"/did:plc:abc/demo/pulls/new?sourceBranch=feature&targetBranch=main",
+		},
+		{
+			"fork field skipped when source != fork",
+			pages.RepoNewPullParams{
+				RepoInfo: repo,
+				Source:   pages.SourceBranch,
+				Fork:     "stale",
+			},
+			"/did:plc:abc/demo/pulls/new",
+		},
+	}
+	for _, c := range cases {
+		t.Run(c.name, func(t *testing.T) {
+			if got := wizardCanonicalURL(c.p); got != c.want {
+				t.Errorf("wizardCanonicalURL = %q; want %q", got, c.want)
+			}
+		})
+	}
+}
+
+func TestLabelStateFromForm(t *testing.T) {
+	bug := &models.LabelDefinition{
+		Did: "did:plc:test", Rkey: "bug", Name: "bug",
+		ValueType: models.ValueType{Type: models.ConcreteTypeNull},
+		Scope:     []string{"sh.tangled.repo.pull"},
+	}
+	priority := &models.LabelDefinition{
+		Did: "did:plc:test", Rkey: "priority", Name: "priority",
+		ValueType: models.ValueType{Type: models.ConcreteTypeString, Enum: []string{"low", "med", "high"}},
+		Scope:     []string{"sh.tangled.repo.pull"},
+	}
+	defs := map[string]*models.LabelDefinition{
+		bug.AtUri().String():      bug,
+		priority.AtUri().String(): priority,
+	}
+
+	form := url.Values{
+		bug.AtUri().String():      {"null"},
+		priority.AtUri().String(): {"high", ""},
+		"unrelated":               {"ignored"},
+	}
+	state := labelStateFromForm(form, defs)
+	if !state.ContainsLabel(bug.AtUri().String()) {
+		t.Error("expected bug label in state")
+	}
+	if !state.ContainsLabel(priority.AtUri().String()) {
+		t.Error("expected priority label in state")
+	}
+
+	emptyState := labelStateFromForm(url.Values{}, defs)
+	if emptyState.ContainsLabel(bug.AtUri().String()) {
+		t.Error("empty form should produce empty state")
+	}
+}
diff --git a/knotserver/internal.go b/knotserver/internal.go
index 6a1a8170..1a374c4b 100644
--- a/knotserver/internal.go
+++ b/knotserver/internal.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"log/slog"
 	"net/http"
+	"net/url"
 	"os"
 	"path/filepath"
 	"strings"
@@ -257,9 +258,9 @@ func (h *InternalHandle) PostReceiveHook(w http.ResponseWriter, r *http.Request)
 			l.Error("failed to insert op", "err", err, "line", line, "did", gitUserDid, "repo", gitRelativeDir)
 		}
 
-		err = h.emitCompareLink(&resp.Messages, line, ownerDid, repoName, repoDid)
+		err = h.emitPullRequestLink(&resp.Messages, line, ownerDid, repoName, repoDid)
 		if err != nil {
-			l.Error("failed to reply with compare link", "err", err, "line", line, "did", gitUserDid, "repo", gitRelativeDir)
+			l.Error("failed to reply with pull request link", "err", err, "line", line, "did", gitUserDid, "repo", gitRelativeDir)
 		}
 
 		err = h.triggerPipeline(&resp.Messages, line, gitUserDid, ownerDid, repoName, repoDid, pushOptions)
@@ -415,31 +416,31 @@ func (h *InternalHandle) triggerPipeline(
 	return h.db.InsertEvent(event, h.n)
 }
 
-func (h *InternalHandle) emitCompareLink(
+func (h *InternalHandle) emitPullRequestLink(
 	clientMsgs *[]string,
 	line git.PostReceiveLine,
 	ownerDid string,
 	repoName string,
 	repoDid string,
 ) error {
-	// this is a second push to a branch, don't reply with the link again
-	if !line.OldSha.IsZero() {
+	if line.NewSha.IsZero() {
 		return nil
 	}
 
 	// the ref was not updated to a new hash, don't reply with the link
 	//
 	// NOTE: do we need this?
-	if line.NewSha.String() == line.OldSha.String() {
+	if line.NewSha == line.OldSha {
 		return nil
 	}
 
 	pushedRef := plumbing.ReferenceName(line.Ref)
+	if !pushedRef.IsBranch() {
+		return nil
+	}
 
-	userIdent, err := h.res.ResolveIdent(context.Background(), ownerDid)
-	user := ownerDid
-	if err == nil {
-		user = userIdent.Handle.String()
+	if !line.OldSha.IsZero() {
+		return nil
 	}
 
 	repoPath, _, _, resolveErr := h.db.ResolveRepoDIDOnDisk(h.c.Repo.ScanPath, repoDid)
@@ -457,20 +458,34 @@ func (h *InternalHandle) emitCompareLink(
 		return err
 	}
 
+	pushedBranch := pushedRef.Short()
+
 	// pushing to default branch
-	if pushedRef == plumbing.NewBranchReferenceName(defaultBranch) {
+	if pushedBranch == defaultBranch {
 		return nil
 	}
 
-	// pushing a tag, don't prompt the user the open a PR
-	if pushedRef.IsTag() {
-		return nil
+	userIdent, err := h.res.ResolveIdent(context.Background(), ownerDid)
+	user := ownerDid
+	if err == nil {
+		user = userIdent.Handle.String()
+	}
+
+	query := url.Values{}
+	query.Set("source", "branch")
+	query.Set("sourceBranch", pushedBranch)
+	query.Set("targetBranch", defaultBranch)
+
+	basePath, err := url.JoinPath(h.c.AppViewEndpoint, user, repoName, "pulls", "new")
+	if err != nil {
+		return err
 	}
+	pullURL := basePath + "?" + query.Encode()
 
 	ZWS := "\u200B"
 	*clientMsgs = append(*clientMsgs, ZWS)
-	*clientMsgs = append(*clientMsgs, fmt.Sprintf("Create a PR pointing to %s", defaultBranch))
-	*clientMsgs = append(*clientMsgs, fmt.Sprintf("\t%s/%s/%s/compare/%s...%s", h.c.AppViewEndpoint, user, repoName, defaultBranch, strings.TrimPrefix(line.Ref, "refs/heads/")))
+	*clientMsgs = append(*clientMsgs, "→  Open pull request:")
+	*clientMsgs = append(*clientMsgs, "   "+pullURL)
 	*clientMsgs = append(*clientMsgs, ZWS)
 	return nil
 }
diff --git a/types/diff.go b/types/diff.go
index 5204581b..96509ae0 100644
--- a/types/diff.go
+++ b/types/diff.go
@@ -8,7 +8,10 @@ import (
 )
 
 type DiffOpts struct {
-	Split bool `json:"split"`
+	Split      bool   `json:"split"`
+	RefreshUrl string `json:"refresh_url,omitempty"`
+	Target     string `json:"target,omitempty"`
+	Field      string `json:"field,omitempty"`
 }
 
 func (d DiffOpts) Encode() string {
diff --git a/types/patch.go b/types/patch.go
index ce9bfae0..1c725f4b 100644
--- a/types/patch.go
+++ b/types/patch.go
@@ -18,3 +18,11 @@ func (f FormatPatch) ChangeId() (string, error) {
 	}
 	return "", fmt.Errorf("no change-id found")
 }
+
+func (f FormatPatch) ChangeIdOrEmpty() string {
+	id, err := f.ChangeId()
+	if err != nil {
+		return ""
+	}
+	return id
+}