From 1637d30c881ea92d19e48bc0210c4bf12f17d9e9 Mon Sep 17 00:00:00 2001
From: Chris Penner <christopher.penner@gmail.com>
Date: Wed, 30 Apr 2025 11:40:20 -0700
Subject: [PATCH 1/3] Bump unison back to trunk

---
 unison | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unison b/unison
index d67de6f7..1e733a47 160000
--- a/unison
+++ b/unison
@@ -1 +1 @@
-Subproject commit d67de6f71353df51510a232f55390445d944c3c4
+Subproject commit 1e733a47e1220423a710d8d63bae5f232e0b83c4

From e4e36d4d49bc658402ab31830c321d69b9da23d3 Mon Sep 17 00:00:00 2001
From: Chris Penner <christopher.penner@gmail.com>
Date: Wed, 30 Apr 2025 11:51:12 -0700
Subject: [PATCH 2/3] Get building on latest trunk

---
 src/Share/Backend.hs                         | 2 +-
 transcripts/share-apis/user-creation/run.zsh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Share/Backend.hs b/src/Share/Backend.hs
index 86d9712d..47809965 100644
--- a/src/Share/Backend.hs
+++ b/src/Share/Backend.hs
@@ -314,7 +314,7 @@ typeDeclHeader ppe r = case Reference.toId r of
       Just decl ->
         DisplayObject.UserObject $
           Syntax.convertElement
-            <$> Pretty.render defaultWidth (DeclPrinter.prettyDeclHeader name decl)
+            <$> Pretty.render defaultWidth (DeclPrinter.prettyDeclHeader DeclPrinter.RenderUniqueTypeGuids'No name decl)
   Nothing ->
     pure (DisplayObject.BuiltinObject (Backend.formatTypeName ppe r))
   where
diff --git a/transcripts/share-apis/user-creation/run.zsh b/transcripts/share-apis/user-creation/run.zsh
index 895a4afd..71433fc4 100755
--- a/transcripts/share-apis/user-creation/run.zsh
+++ b/transcripts/share-apis/user-creation/run.zsh
@@ -10,7 +10,7 @@ new_user_cookie_jar=$(cookie_jar_for_user_id "new_user")
 # Should be able to create a new user via the login flow by following redirects.
 # Note that the end of the redirect chain ends up on the Share UI (localhost:1234) which may or may not be running, so
 # we just ignore bad status codes from that server.
-curl -v -L -I -o /dev/null -w '{"result_url": "%{url_effective}"}' --request "GET" --cookie "$new_user_cookie_jar" --cookie-jar "$new_user_cookie_jar" "http://localhost:5424/login" || true
+curl -s -L -I -o /dev/null -w '{"result_url": "%{url_effective}"}' --request "GET" --cookie "$new_user_cookie_jar" --cookie-jar "$new_user_cookie_jar" "http://localhost:5424/login" || true
 
 # user should now be logged in as the local github user.
 fetch "new_user" GET new-user-profile /account

From e211308178a56135e2fd0b3bb38f7a924c39de9a Mon Sep 17 00:00:00 2001
From: ChrisPenner <ChrisPenner@users.noreply.github.com>
Date: Wed, 30 Apr 2025 18:53:54 +0000
Subject: [PATCH 3/3] automatically run ormolu

---
 src/Share/Backend.hs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Share/Backend.hs b/src/Share/Backend.hs
index 47809965..826aae1c 100644
--- a/src/Share/Backend.hs
+++ b/src/Share/Backend.hs
@@ -192,11 +192,11 @@ getTermTag r termType = do
     V2Referent.Con ref _ -> Just <$> Codebase.expectDeclKind ref
   pure $
     if
-      | isDoc -> Doc
-      | isTest -> Test
-      | Just CT.Effect <- constructorType -> Constructor Ability
-      | Just CT.Data <- constructorType -> Constructor Data
-      | otherwise -> Plain
+        | isDoc -> Doc
+        | isTest -> Test
+        | Just CT.Effect <- constructorType -> Constructor Ability
+        | Just CT.Data <- constructorType -> Constructor Data
+        | otherwise -> Plain
 
 getTypeTag ::
   (PG.QueryM m) =>