Resolve conflicts with trunk

.github/workflows/bundle-ucm.yaml

@@ -39,6 +39,8 @@ jobs:
 
       - name: install stack
         uses: unisonweb/actions/stack/install@main
+        with:
+          stack-version: 2.15.5
 
       - name: build
         run: |

.github/workflows/ci.yaml

@@ -102,6 +102,8 @@ jobs:
       - name: install stack
         if: steps.cache-ucm-binaries.outputs.cache-hit != 'true'
         uses: unisonweb/actions/stack/install@main
+        with:
+          stack-version: 2.15.5
 
       # Build deps, then build local code. Splitting it into two steps just allows us to see how much time each step
       # takes.

.github/workflows/haddocks.yaml

@@ -27,6 +27,8 @@ jobs:
 
       - name: install stack
         uses: unisonweb/actions/stack/install@main
+        with:
+          stack-version: 2.15.5
 
       - name: build with haddocks
         working-directory: unison

.github/workflows/update-transcripts.yaml

@@ -22,6 +22,8 @@ jobs:
 
       - name: install stack
         uses: unisonweb/actions/stack/install@main
+        with:
+          stack-version: 2.15.5
 
       # One of the transcripts fails if the user's git name hasn't been set.
       - name: set git user info

codebase2/util-serialization/U/Util/Serialization.hs

@@ -8,7 +8,7 @@
 
 module U.Util.Serialization where
 
-import Control.Applicative (Applicative (liftA2), liftA3)
+import Control.Applicative (liftA3)
 import Control.Monad (foldM, replicateM, replicateM_, when)
 import Data.Bits (Bits, clearBit, setBit, shiftL, shiftR, testBit, (.|.))
 import Data.ByteString (ByteString, readFile, writeFile)

contrib/cabal.project

@@ -29,7 +29,9 @@ packages:
   parser-typechecker
   unison-core
   unison-cli
+  unison-cli-main
   unison-hashing-v2
+  unison-merge
   unison-share-api
   unison-share-projects-api
   unison-syntax
@@ -46,10 +48,12 @@ source-repository-package
   tag: 9275eea7982dabbf47be2ba078ced669ae7ef3d5
 
 constraints:
-  fsnotify < 0.4,
-  crypton-x509-store <= 1.6.8,
-  servant <= 0.19.1,
-  optparse-applicative <= 0.17.1.0
+  lsp == 2.3.0.0,
+  fsnotify == 0.4.1.0,
+  crypton-x509-store == 1.6.9,
+  servant == 0.20.1,
+  optparse-applicative == 0.18.1.0,
+  tls == 1.8.0
 
 -- For now there is no way to apply ghc-options for all local packages
 -- See https://cabal.readthedocs.io/en/latest/cabal-project.html#package-configuration-options
@@ -128,6 +132,9 @@ package unison-core
 package unison-hashing-v2
   ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
 
+package unison-merge
+  ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
+
 package unison-share-api
   ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
 

flake.nix

@@ -27,10 +27,10 @@
     ]
     (system: let
       versions = {
-        ghc = "928";
+        ghc = "965";
         ormolu = "0.5.2.0";
-        hls = "2.4.0.0";
-        stack = "2.13.1";
+        hls = "2.9.0.0";
+        stack = "2.15.5";
         hpack = "0.35.2";
       };
       overlays = [

lib/unison-pretty-printer/src/Unison/Util/SyntaxText.hs

@@ -4,7 +4,7 @@ import Unison.HashQualified (HashQualified)
 import Unison.Name (Name)
 import Unison.Pattern (SeqOp)
 import Unison.Prelude
-import Unison.Referent' (Referent')
+import Unison.ReferentPrime (Referent')
 import Unison.Util.AnnotatedText (AnnotatedText (..), annotate, segment)
 
 type SyntaxText' r = AnnotatedText (Element r)

lib/unison-sqlite/src/Unison/Sqlite/Connection.hs

@@ -172,7 +172,7 @@ execute conn@(Connection _ _ conn0) sql@(Sql s params) = do
 --
 -- This function does not support parameters, and is mostly useful for executing DDL and migrations.
 executeStatements :: Connection -> Text -> IO ()
-executeStatements conn@(Connection _ _ (Sqlite.Connection database)) sql = do
+executeStatements conn@(Connection _ _ (Sqlite.Connection database _tempNameCounter)) sql = do
   logQuery (Sql sql []) Nothing
   Direct.Sqlite.exec database sql `catch` \(exception :: Sqlite.SQLError) ->
     throwSqliteQueryException
@@ -184,7 +184,7 @@ executeStatements conn@(Connection _ _ (Sqlite.Connection database)) sql = do
 
 -- With results, without checks
 
-queryStreamRow :: Sqlite.FromRow a => Connection -> Sql -> (IO (Maybe a) -> IO r) -> IO r
+queryStreamRow :: (Sqlite.FromRow a) => Connection -> Sql -> (IO (Maybe a) -> IO r) -> IO r
 queryStreamRow conn@(Connection _ _ conn0) sql@(Sql s params) callback =
   run `catch` \(exception :: Sqlite.SQLError) ->
     throwSqliteQueryException

parser-typechecker/package.yaml

@@ -20,7 +20,6 @@ when:
 
 dependencies:
   - ListLike
-  - NanoID
   - aeson
   - ansi-terminal
   - asn1-encoding
@@ -81,7 +80,7 @@ dependencies:
   - nonempty-containers
   - open-browser
   - openapi3
-  - optparse-applicative >= 0.16.1.0
+  - optparse-applicative
   - pem
   - pretty-simple
   - primitive
@@ -140,9 +139,9 @@ dependencies:
   - warp
   - witch
   - witherable
-  - x509
-  - x509-store
-  - x509-system
+  - crypton-x509
+  - crypton-x509-store
+  - crypton-x509-system
   - yaml
   - zlib
 

parser-typechecker/src/Unison/Codebase/BranchUtil.hs

@@ -25,7 +25,7 @@ import Unison.Codebase.Branch (Branch, Branch0)
 import Unison.Codebase.Branch qualified as Branch
 import Unison.Codebase.Path (Path)
 import Unison.Codebase.Path qualified as Path
-import Unison.HashQualified' (HashQualified (HashQualified, NameOnly))
+import Unison.HashQualifiedPrime (HashQualified (HashQualified, NameOnly))
 import Unison.Names (Names)
 import Unison.Names qualified as Names
 import Unison.Prelude

parser-typechecker/src/Unison/Codebase/Path.hs

@@ -88,7 +88,7 @@ import Data.Sequence (Seq ((:<|), (:|>)))
 import Data.Sequence qualified as Seq
 import Data.Text qualified as Text
 import GHC.Exts qualified as GHC
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Name (Name)
 import Unison.Name qualified as Name
 import Unison.NameSegment (NameSegment)

parser-typechecker/src/Unison/Codebase/Path/Parse.hs

@@ -22,7 +22,7 @@ import Text.Megaparsec qualified as P
 import Text.Megaparsec.Char qualified as P (char)
 import Text.Megaparsec.Internal qualified as P (withParsecT)
 import Unison.Codebase.Path
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Prelude hiding (empty, toList)
 import Unison.ShortHash (ShortHash)
 import Unison.Syntax.Lexer qualified as Lexer

parser-typechecker/src/Unison/Codebase/SqliteCodebase/Migrations/MigrateSchema1To2.hs

@@ -72,7 +72,7 @@ import Unison.Pattern qualified as Pattern
 import Unison.Prelude
 import Unison.Reference qualified as Reference
 import Unison.Referent qualified as Referent
-import Unison.Referent' qualified as Referent'
+import Unison.ReferentPrime qualified as Referent'
 import Unison.Sqlite qualified as Sqlite
 import Unison.Symbol (Symbol)
 import Unison.Term qualified as Term

parser-typechecker/src/Unison/PrettyPrintEnv.hs

@@ -28,7 +28,7 @@ import Unison.ConstructorReference (ConstructorReference)
 import Unison.ConstructorType qualified as CT
 import Unison.HashQualified (HashQualified)
 import Unison.HashQualified qualified as HQ
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.LabeledDependency (LabeledDependency)
 import Unison.LabeledDependency qualified as LD
 import Unison.Name (Name)

parser-typechecker/src/Unison/PrettyPrintEnv/Names.hs

@@ -18,7 +18,7 @@ module Unison.PrettyPrintEnv.Names
 where
 
 import Data.Set qualified as Set
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Name (Name)
 import Unison.Name qualified as Name
 import Unison.Names (Names)

parser-typechecker/src/Unison/PrintError.hs

@@ -33,7 +33,7 @@ import Unison.ABT qualified as ABT
 import Unison.Builtin.Decls (unitRef, pattern TupleType')
 import Unison.ConstructorReference (ConstructorReference, GConstructorReference (..))
 import Unison.HashQualified (HashQualified)
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Kind (Kind)
 import Unison.Kind qualified as Kind
 import Unison.KindInference.Error.Pretty (prettyKindError)

parser-typechecker/src/Unison/Runtime/ANF/Serialize.hs

@@ -20,10 +20,10 @@ import Data.Serialize.Put (runPutLazy)
 import Data.Text (Text)
 import Data.Word (Word16, Word32, Word64)
 import GHC.Stack
+import GHC.IsList qualified (fromList)
 import Unison.ABT.Normalized (Term (..))
 import Unison.Reference (Reference, Reference' (Builtin), pattern Derived)
 import Unison.Runtime.ANF as ANF hiding (Tag)
-import Unison.Runtime.Array qualified as PA
 import Unison.Runtime.Exception
 import Unison.Runtime.Serialize
 import Unison.Util.EnumContainers qualified as EC
@@ -682,7 +682,7 @@ getBLit v =
     NegT -> Neg <$> getPositive
     CharT -> Char <$> getChar
     FloatT -> Float <$> getFloat
-    ArrT -> Arr . PA.fromList <$> getList (getValue v)
+    ArrT -> Arr . GHC.IsList.fromList <$> getList (getValue v)
 
 putRefs :: (MonadPut m) => [Reference] -> m ()
 putRefs rs = putFoldable putReference rs

parser-typechecker/src/Unison/Runtime/Array.hs

@@ -56,7 +56,7 @@ import Data.Primitive.PrimArray as EPA hiding
 import Data.Primitive.PrimArray qualified as PA
 import Data.Primitive.Types
 import Data.Word (Word8)
-import GHC.Exts (toList)
+import GHC.IsList (toList )
 
 #ifdef ARRAY_CHECK
 import GHC.Stack

parser-typechecker/src/Unison/Runtime/MCode.hs

@@ -36,7 +36,6 @@ module Unison.Runtime.MCode
   )
 where
 
-import Control.Applicative (liftA2)
 import Data.Bifunctor (bimap, first)
 import Data.Bits (shiftL, shiftR, (.|.))
 import Data.Coerce

parser-typechecker/src/Unison/Runtime/Serialize.hs

@@ -2,7 +2,6 @@
 
 module Unison.Runtime.Serialize where
 
-import Control.Applicative (liftA2)
 import Control.Monad (replicateM)
 import Data.Bits (Bits)
 import Data.ByteString qualified as B

parser-typechecker/src/Unison/Syntax/NamePrinter.hs

@@ -2,7 +2,7 @@ module Unison.Syntax.NamePrinter where
 
 import Data.Text qualified as Text
 import Unison.HashQualified qualified as HQ
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.LabeledDependency (LabeledDependency)
 import Unison.LabeledDependency qualified as LD
 import Unison.Name (Name)

parser-typechecker/src/Unison/Syntax/TermParser.hs

@@ -31,7 +31,7 @@ import Unison.Builtin.Decls qualified as DD
 import Unison.ConstructorReference (ConstructorReference, GConstructorReference (..))
 import Unison.ConstructorType qualified as CT
 import Unison.HashQualified qualified as HQ
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Name (Name)
 import Unison.Name qualified as Name
 import Unison.NameSegment qualified as NameSegment

parser-typechecker/src/Unison/Syntax/TermPrinter.hs

@@ -35,7 +35,7 @@ import Unison.ConstructorReference (GConstructorReference (..))
 import Unison.ConstructorReference qualified as ConstructorReference
 import Unison.ConstructorType qualified as CT
 import Unison.HashQualified qualified as HQ
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Name (Name)
 import Unison.Name qualified as Name
 import Unison.NameSegment (NameSegment)

parser-typechecker/tests/Unison/Test/Codebase/Path.hs

@@ -6,7 +6,7 @@ import Data.Maybe (fromJust)
 import EasyTest
 import Unison.Codebase.Path (Path (..), Path' (..), Relative (..))
 import Unison.Codebase.Path.Parse (parseHQSplit', parseShortHashOrHQSplit')
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.NameSegment.Internal (NameSegment (NameSegment))
 import Unison.Prelude
 import Unison.ShortHash qualified as SH

parser-typechecker/unison-parser-typechecker.cabal

@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -224,7 +224,6 @@ library
   build-depends:
       IntervalMap
     , ListLike
-    , NanoID
     , aeson
     , ansi-terminal
     , asn1-encoding
@@ -244,6 +243,9 @@ library
     , concurrent-output
     , configurator
     , containers >=0.6.3
+    , crypton-x509
+    , crypton-x509-store
+    , crypton-x509-system
     , cryptonite
     , data-default
     , data-memocombinators
@@ -284,7 +286,7 @@ library
     , nonempty-containers
     , open-browser
     , openapi3
-    , optparse-applicative >=0.16.1.0
+    , optparse-applicative
     , pem
     , pretty-simple
     , primitive
@@ -343,9 +345,6 @@ library
     , warp
     , witch
     , witherable
-    , x509
-    , x509-store
-    , x509-system
     , yaml
     , zlib
   default-language: Haskell2010
@@ -420,7 +419,6 @@ test-suite parser-typechecker-tests
   build-depends:
       IntervalMap
     , ListLike
-    , NanoID
     , aeson
     , ansi-terminal
     , asn1-encoding
@@ -441,6 +439,9 @@ test-suite parser-typechecker-tests
     , concurrent-output
     , configurator
     , containers >=0.6.3
+    , crypton-x509
+    , crypton-x509-store
+    , crypton-x509-system
     , cryptonite
     , data-default
     , data-memocombinators
@@ -484,7 +485,7 @@ test-suite parser-typechecker-tests
     , nonempty-containers
     , open-browser
     , openapi3
-    , optparse-applicative >=0.16.1.0
+    , optparse-applicative
     , pem
     , pretty-simple
     , primitive
@@ -545,9 +546,6 @@ test-suite parser-typechecker-tests
     , warp
     , witch
     , witherable
-    , x509
-    , x509-store
-    , x509-system
     , yaml
     , zlib
   default-language: Haskell2010

stack.yaml

@@ -44,7 +44,7 @@ packages:
   - unison-syntax
   - yaks/easytest
 
-resolver: lts-20.26
+resolver: lts-22.26
 
 extra-deps:
   # broken version in snapshot
@@ -58,15 +58,13 @@ extra-deps:
     commit: 9275eea7982dabbf47be2ba078ced669ae7ef3d5
 
   # not in stackage
-  - fuzzyfind-3.0.1
+  - fuzzyfind-3.0.2@sha256:0fcd64eb1016fe0d0232abc26b2b80b32d676707ff41d155a28df8a9572603d4,1921
   - guid-0.1.0@sha256:a7c975be473f6f142d5cc1b39bc807a99043d20b1bb0873fdfe7a3ce84d2faf1,1078
   - lock-file-0.7.0.0@sha256:3ad84b5e454145e1d928063b56abb96db24a99a21b493989520e58fa0ab37b00,4484
-  - monad-validate-1.2.0.0@sha256:9850f408431098b28806dd464b6825a88a0b56c84f380d7fe0454c1df9d6f881,3505
-  - recover-rtti-0.4.2@sha256:c179a303921126d8d782264e14f386c96e54a270df74be002e4c4ec3c8c7aebd,4529
-  - lsp-2.2.0.0@sha256:82fbf4b69d94d8d22543be71f89986b3e90050032d671fb3de3f8253ea1e5b6f,3550
-  - lsp-types-2.0.2.0@sha256:a9a51c3cea0726d91fe63fa0670935ee720f7b31bc3f3b33b2483fc538152677,29421
+  - monad-validate-1.3.0.0@sha256:eb6ddd5c9cf72ff0563cba604fa00291376e96138fdb4932d00ff3a99d66706e,2605
+  - recover-rtti-0.4.3@sha256:01adcbab70a6542914df28ac120a23a923d8566236f2c0295998e9419f53dd62,4672
   - row-types-1.0.1.2@sha256:4d4c7cb95d06a32b28ba977852d52a26b4c1f695ef083a6fd874ab6d79933b64,3071
-  - network-udp-0.0.0
+  - network-udp-0.0.0@sha256:408d2d4fa1a25e49e95752ee124cca641993404bb133ae10fb81daef22d876ae,1075
 
 ghc-options:
   # All packages

stack.yaml.lock

@@ -27,12 +27,12 @@ packages:
   original:
     url: https://github.com/unisonweb/haskeline/archive/9275eea7982dabbf47be2ba078ced669ae7ef3d5.tar.gz
 - completed:
-    hackage: fuzzyfind-3.0.1@sha256:78f89c1d79adf0a15fa2e57c693d42b4765ccfbbe380d0c9d7da6bff9f124f85,1823
+    hackage: fuzzyfind-3.0.2@sha256:0fcd64eb1016fe0d0232abc26b2b80b32d676707ff41d155a28df8a9572603d4,1921
     pantry-tree:
-      sha256: 46f001ec2725d3172161c993bc8fbcf0514e3ba736f868fe2c2655e1ff49dad1
+      sha256: 5bb9d39dbc4a619cf9b65409dde0d58dd488c7abab030f71ac83ba849595ee05
       size: 542
   original:
-    hackage: fuzzyfind-3.0.1
+    hackage: fuzzyfind-3.0.2@sha256:0fcd64eb1016fe0d0232abc26b2b80b32d676707ff41d155a28df8a9572603d4,1921
 - completed:
     hackage: guid-0.1.0@sha256:a7c975be473f6f142d5cc1b39bc807a99043d20b1bb0873fdfe7a3ce84d2faf1,1078
     pantry-tree:
@@ -48,33 +48,19 @@ packages:
   original:
     hackage: lock-file-0.7.0.0@sha256:3ad84b5e454145e1d928063b56abb96db24a99a21b493989520e58fa0ab37b00,4484
 - completed:
-    hackage: monad-validate-1.2.0.0@sha256:9850f408431098b28806dd464b6825a88a0b56c84f380d7fe0454c1df9d6f881,3505
+    hackage: monad-validate-1.3.0.0@sha256:eb6ddd5c9cf72ff0563cba604fa00291376e96138fdb4932d00ff3a99d66706e,2605
     pantry-tree:
-      sha256: 8e049bd12ce2bd470909578f2ee8eb80b89d5ff88860afa30e29dd4eafecfa3e
-      size: 713
+      sha256: 0b2a3a57be48fcc739708b214fca202f1e95b1cd773dd3bb9589d3007cf8cf5e
+      size: 611
   original:
-    hackage: monad-validate-1.2.0.0@sha256:9850f408431098b28806dd464b6825a88a0b56c84f380d7fe0454c1df9d6f881,3505
+    hackage: monad-validate-1.3.0.0@sha256:eb6ddd5c9cf72ff0563cba604fa00291376e96138fdb4932d00ff3a99d66706e,2605
 - completed:
-    hackage: recover-rtti-0.4.2@sha256:c179a303921126d8d782264e14f386c96e54a270df74be002e4c4ec3c8c7aebd,4529
+    hackage: recover-rtti-0.4.3@sha256:01adcbab70a6542914df28ac120a23a923d8566236f2c0295998e9419f53dd62,4672
     pantry-tree:
-      sha256: ad6f24481ebd25a1456d5dfaf08d48d95394ce83eb82a267e01d87d34f13bb83
-      size: 2488
+      sha256: 59a5df9c88f83816a9826b1e9708153d06d64bd1aed6c1d71ef0a1f6db070599
+      size: 2489
   original:
-    hackage: recover-rtti-0.4.2@sha256:c179a303921126d8d782264e14f386c96e54a270df74be002e4c4ec3c8c7aebd,4529
-- completed:
-    hackage: lsp-2.2.0.0@sha256:82fbf4b69d94d8d22543be71f89986b3e90050032d671fb3de3f8253ea1e5b6f,3550
-    pantry-tree:
-      sha256: 88ea35fb71d377c035770d5f0d6a3aea51919223e3bc1e492deb6f7d9cda3a85
-      size: 1043
-  original:
-    hackage: lsp-2.2.0.0@sha256:82fbf4b69d94d8d22543be71f89986b3e90050032d671fb3de3f8253ea1e5b6f,3550
-- completed:
-    hackage: lsp-types-2.0.2.0@sha256:a9a51c3cea0726d91fe63fa0670935ee720f7b31bc3f3b33b2483fc538152677,29421
-    pantry-tree:
-      sha256: 7a3f0b679066d5e4732dfa358d76e0969589d636f4012c9e87cbe3451aa3ee5e
-      size: 45527
-  original:
-    hackage: lsp-types-2.0.2.0@sha256:a9a51c3cea0726d91fe63fa0670935ee720f7b31bc3f3b33b2483fc538152677,29421
+    hackage: recover-rtti-0.4.3@sha256:01adcbab70a6542914df28ac120a23a923d8566236f2c0295998e9419f53dd62,4672
 - completed:
     hackage: row-types-1.0.1.2@sha256:4d4c7cb95d06a32b28ba977852d52a26b4c1f695ef083a6fd874ab6d79933b64,3071
     pantry-tree:
@@ -88,10 +74,10 @@ packages:
       sha256: ee19a66c9d420861c5cc1dfad3210e2a53cdc6088ff3dd90b44f7961f5caebee
       size: 284
   original:
-    hackage: network-udp-0.0.0
+    hackage: network-udp-0.0.0@sha256:408d2d4fa1a25e49e95752ee124cca641993404bb133ae10fb81daef22d876ae,1075
 snapshots:
 - completed:
-    sha256: 5a59b2a405b3aba3c00188453be172b85893cab8ebc352b1ef58b0eae5d248a2
-    size: 650475
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/26.yaml
-  original: lts-20.26
+    sha256: 8e7996960d864443a66eb4105338bbdd6830377b9f6f99cd5527ef73c10c01e7
+    size: 719128
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/26.yaml
+  original: lts-22.26

unison-cli/src/ArgParse.hs

@@ -220,7 +220,7 @@ transcriptCommand =
     transcriptHelp = "Execute transcript markdown files"
     transcriptFooter =
       Just . fold . List.intersperse P.line $
-        [ "For each <transcript>.md file provided this executes the transcript and creates" <+> bold "<transcript>.output.md" <+> "if successful.",
+        [ "For each <transcript>.md file provided this executes the transcript and creates" <+> P.annotate bold "<transcript>.output.md" <+> "if successful.",
           "Exits after completion, and deletes the temporary directory created, unless --save-codebase is provided",
           "Multiple transcript files may be provided; they are processed in sequence" <+> "starting from the same codebase."
         ]
@@ -232,7 +232,7 @@ transcriptForkCommand =
     transcriptHelp = "Execute transcript markdown files in a sandboxed codebase"
     transcriptFooter =
       Just . fold . List.intersperse P.line $
-        [ "For each <transcript>.md file provided this executes the transcript in a sandbox codebase and creates" <+> bold "<transcript>.output.md" <+> "if successful.",
+        [ "For each <transcript>.md file provided this executes the transcript in a sandbox codebase and creates" <+> P.annotate bold "<transcript>.output.md" <+> "if successful.",
           "Exits after completion, and deletes the temporary directory created, unless --save-codebase is provided",
           "Multiple transcript files may be provided; they are processed in sequence" <+> "starting from the same codebase."
         ]
@@ -505,15 +505,15 @@ transcriptForkParser = do
     )
 
 unisonHelp :: String -> String -> P.Doc
-unisonHelp (P.text -> executable) (P.text -> version) =
+unisonHelp (fromString -> executable) (fromString -> version) =
   fold . List.intersperse P.line $
-    [ P.empty,
+    [ mempty,
       "🌻",
-      P.empty,
-      P.bold "Usage instructions for the Unison Codebase Manager",
+      mempty,
+      P.annotate P.bold "Usage instructions for the Unison Codebase Manager",
       "You are running version:" <+> version,
-      P.empty,
-      "To get started just run" <+> P.bold executable,
-      P.empty,
-      "Use" <+> P.bold (executable <+> "[command] --help") <+> "to show help for a command."
+      mempty,
+      "To get started just run" <+> P.annotate P.bold executable,
+      mempty,
+      "Use" <+> P.annotate P.bold (executable <+> "[command] --help") <+> "to show help for a command."
     ]

unison-cli/src/Unison/Cli/MonadUtils.hs

@@ -106,7 +106,7 @@ import Unison.Codebase.Path qualified as Path
 import Unison.Codebase.ShortCausalHash (ShortCausalHash)
 import Unison.Codebase.ShortCausalHash qualified as SCH
 import Unison.HashQualified qualified as HQ
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Name qualified as Name
 import Unison.NameSegment qualified as NameSegment
 import Unison.Names (Names)

unison-cli/src/Unison/Cli/Pretty.hs

@@ -94,7 +94,7 @@ import Unison.Hash qualified as Hash
 import Unison.Hash32 (Hash32)
 import Unison.Hash32 qualified as Hash32
 import Unison.HashQualified qualified as HQ
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.LabeledDependency as LD
 import Unison.Name (Name)
 import Unison.Name qualified as Name
@@ -111,7 +111,7 @@ import Unison.Reference (Reference, TermReferenceId)
 import Unison.Reference qualified as Reference
 import Unison.Referent (Referent)
 import Unison.Referent qualified as Referent
-import Unison.Server.SearchResult' qualified as SR'
+import Unison.Server.SearchResultPrime qualified as SR'
 import Unison.ShortHash (ShortHash)
 import Unison.Symbol (Symbol)
 import Unison.Sync.Types qualified as Share

unison-cli/src/Unison/Cli/Share/Projects.hs

@@ -258,8 +258,10 @@ servantClientToCli action = do
         (mkClientEnv httpManager hardCodedBaseUrl)
           { Servant.makeClientRequest = \url request ->
               (Servant.defaultMakeClientRequest url request)
-                { Http.Client.responseTimeout = Http.Client.responseTimeoutMicro (60 * 1000 * 1000 {- 60s -})
-                }
+                <&> \req ->
+                  req
+                    { Http.Client.responseTimeout = Http.Client.responseTimeoutMicro (60 * 1000 * 1000 {- 60s -})
+                    }
           }
 
   liftIO (runClientM action clientEnv)

unison-cli/src/Unison/Codebase/Editor/HandleInput.hs

@@ -117,7 +117,7 @@ import Unison.ConstructorReference (GConstructorReference (..))
 import Unison.DataDeclaration qualified as DD
 import Unison.Hash qualified as Hash
 import Unison.HashQualified qualified as HQ
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.LabeledDependency (LabeledDependency)
 import Unison.LabeledDependency qualified as LD
 import Unison.LabeledDependency qualified as LabeledDependency

unison-cli/src/Unison/Codebase/Editor/HandleInput/FindAndReplace.hs

@@ -20,7 +20,7 @@ import Unison.Codebase.Branch.Names qualified as Branch
 import Unison.Codebase.Editor.Output
 import Unison.Codebase.Editor.StructuredArgument qualified as SA
 import Unison.HashQualified qualified as HQ
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Name (Name)
 import Unison.Name qualified as Name
 import Unison.NameSegment qualified as NameSegment

unison-cli/src/Unison/Codebase/Editor/HandleInput/Merge2.hs

@@ -74,7 +74,7 @@ import Unison.Debug qualified as Debug
 import Unison.Hash (Hash)
 import Unison.Hash qualified as Hash
 import Unison.HashQualified qualified as HQ
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Merge.CombineDiffs (CombinedDiffOp (..), combineDiffs)
 import Unison.Merge.Database (MergeDatabase (..), makeMergeDatabase, referent2to1)
 import Unison.Merge.DeclCoherencyCheck (IncoherentDeclReason (..), checkDeclCoherency, lenientCheckDeclCoherency)
@@ -113,7 +113,7 @@ import Unison.Project (ProjectAndBranch (..), ProjectBranchName, ProjectBranchNa
 import Unison.Reference qualified as Reference
 import Unison.Referent (Referent)
 import Unison.Referent qualified as Referent
-import Unison.Referent' qualified as Referent'
+import Unison.ReferentPrime qualified as Referent'
 import Unison.Sqlite (Transaction)
 import Unison.Sqlite qualified as Sqlite
 import Unison.Syntax.DeclPrinter (AccessorName)

unison-cli/src/Unison/Codebase/Editor/HandleInput/MoveAll.hs

@@ -8,7 +8,7 @@ import Unison.Codebase.Editor.HandleInput.MoveTerm (moveTermSteps)
 import Unison.Codebase.Editor.HandleInput.MoveType (moveTypeSteps)
 import Unison.Codebase.Editor.Output qualified as Output
 import Unison.Codebase.Path qualified as Path
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Prelude
 
 handleMoveAll :: Bool -> Path.Path' -> Path.Path' -> Text -> Cli ()

unison-cli/src/Unison/Codebase/Editor/HandleInput/MoveTerm.hs

@@ -11,7 +11,7 @@ import Unison.Codebase.BranchUtil qualified as BranchUtil
 import Unison.Codebase.Editor.Output qualified as Output
 import Unison.Codebase.Path (Path, Path')
 import Unison.Codebase.Path qualified as Path
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.NameSegment (NameSegment)
 import Unison.Prelude
 

unison-cli/src/Unison/Codebase/Editor/HandleInput/MoveType.hs

@@ -11,7 +11,7 @@ import Unison.Codebase.BranchUtil qualified as BranchUtil
 import Unison.Codebase.Editor.Output qualified as Output
 import Unison.Codebase.Path (Path, Path')
 import Unison.Codebase.Path qualified as Path
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.NameSegment (NameSegment)
 import Unison.Prelude
 

unison-cli/src/Unison/Codebase/Editor/HandleInput/Upgrade.hs

@@ -34,7 +34,7 @@ import Unison.Codebase.Editor.HandleInput.Update2
   )
 import Unison.Codebase.Editor.Output qualified as Output
 import Unison.Codebase.Path qualified as Path
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Name (Name)
 import Unison.Name qualified as Name
 import Unison.NameSegment (NameSegment)

unison-cli/src/Unison/Codebase/Editor/Output.hs

@@ -49,7 +49,7 @@ import Unison.CommandLine.InputPattern qualified as Input
 import Unison.DataDeclaration qualified as DD
 import Unison.DataDeclaration.ConstructorId (ConstructorId)
 import Unison.HashQualified qualified as HQ
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.LabeledDependency (LabeledDependency)
 import Unison.Name (Name)
 import Unison.NameSegment (NameSegment)
@@ -66,7 +66,7 @@ import Unison.Reference (Reference, TermReference, TermReferenceId, TypeReferenc
 import Unison.Reference qualified as Reference
 import Unison.Referent (Referent)
 import Unison.Server.Backend (ShallowListEntry (..))
-import Unison.Server.SearchResult' (SearchResult')
+import Unison.Server.SearchResultPrime (SearchResult')
 import Unison.Share.Sync.Types qualified as Sync
 import Unison.ShortHash (ShortHash)
 import Unison.Symbol (Symbol)

unison-cli/src/Unison/Codebase/Editor/Output/BranchDiff.hs

@@ -10,7 +10,7 @@ import Unison.Codebase.BranchDiff (BranchDiff (BranchDiff))
 import Unison.Codebase.BranchDiff qualified as BranchDiff
 import Unison.Codebase.Patch qualified as P
 import Unison.DataDeclaration (DeclOrBuiltin)
-import Unison.HashQualified' (HashQualified)
+import Unison.HashQualifiedPrime (HashQualified)
 import Unison.Name (Name)
 import Unison.Name qualified as Name
 import Unison.Names (Names)

unison-cli/src/Unison/Codebase/Editor/Slurp.hs

@@ -21,7 +21,7 @@ import Unison.Parser.Ann (Ann)
 import Unison.Prelude
 import Unison.Referent (Referent)
 import Unison.Referent qualified as Referent
-import Unison.Referent' qualified as Referent
+import Unison.ReferentPrime qualified as Referent
 import Unison.Symbol (Symbol)
 import Unison.Syntax.Name qualified as Name (toText, unsafeParseVar)
 import Unison.UnisonFile qualified as UF

unison-cli/src/Unison/Codebase/Editor/StructuredArgument.hs

@@ -6,7 +6,7 @@ import Unison.Codebase.Editor.Input
 import Unison.Codebase.Path (Path')
 import Unison.Codebase.Path qualified as Path
 import Unison.HashQualified qualified as HQ
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Name (Name)
 import Unison.Parser.Ann (Ann)
 import Unison.Project (ProjectAndBranch, ProjectBranchName, ProjectName)

unison-cli/src/Unison/Codebase/Watch.hs

@@ -44,8 +44,8 @@ watchDirectory' d = do
   mvar <- newEmptyMVar
   let handler :: Event -> IO ()
       handler e = case e of
-        Added fp t False -> doIt fp t
-        Modified fp t False -> doIt fp t
+        Added fp t FSNotify.IsFile -> doIt fp t
+        Modified fp t FSNotify.IsFile -> doIt fp t
         _ -> pure ()
         where
           doIt fp t = do
@@ -56,7 +56,7 @@ watchDirectory' d = do
   cleanupRef <- newEmptyMVar
   -- we don't like FSNotify's debouncing (it seems to drop later events)
   -- so we will be doing our own instead
-  let config = FSNotify.defaultConfig {FSNotify.confDebounce = FSNotify.NoDebounce}
+  let config = FSNotify.defaultConfig
   cancel <- liftIO $
     forkIO $
       FSNotify.withManagerConf config $ \mgr -> do

unison-cli/src/Unison/CommandLine/Completion.hs

@@ -50,7 +50,7 @@ import Unison.Codebase.Path qualified as Path
 import Unison.Codebase.Path.Parse qualified as Path
 import Unison.Codebase.SqliteCodebase.Conversions qualified as Cv
 import Unison.CommandLine.InputPattern qualified as IP
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Name qualified as Name
 import Unison.NameSegment.Internal (NameSegment (NameSegment))
 import Unison.Prelude

unison-cli/src/Unison/CommandLine/InputPatterns.hs

@@ -197,7 +197,7 @@ import Unison.CommandLine.InputPattern (ArgumentType (..), InputPattern (InputPa
 import Unison.CommandLine.InputPattern qualified as I
 import Unison.Core.Project (ProjectBranchName (..))
 import Unison.HashQualified qualified as HQ
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Name (Name)
 import Unison.Name qualified as Name
 import Unison.NameSegment (NameSegment)

unison-cli/src/Unison/CommandLine/OutputMessages.hs

@@ -84,7 +84,7 @@ import Unison.DataDeclaration qualified as DD
 import Unison.Hash qualified as Hash
 import Unison.Hash32 (Hash32)
 import Unison.HashQualified qualified as HQ
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.LabeledDependency as LD
 import Unison.Name (Name)
 import Unison.Name qualified as Name
@@ -114,11 +114,11 @@ import Unison.Reference (Reference)
 import Unison.Reference qualified as Reference
 import Unison.Referent (Referent)
 import Unison.Referent qualified as Referent
-import Unison.Referent' qualified as Referent
+import Unison.ReferentPrime qualified as Referent
 import Unison.Result qualified as Result
 import Unison.Server.Backend (ShallowListEntry (..), TypeEntry (..))
 import Unison.Server.Backend qualified as Backend
-import Unison.Server.SearchResult' qualified as SR'
+import Unison.Server.SearchResultPrime qualified as SR'
 import Unison.Share.Sync qualified as Share
 import Unison.Share.Sync.Types (CodeserverTransportError (..))
 import Unison.Sync.Types qualified as Share

unison-cli/src/Unison/LSP.hs

@@ -80,8 +80,8 @@ spawnLsp lspFormattingConfig codebase runtime latestRootHash latestPath =
 
           -- currently we have an independent VFS for each LSP client since each client might have
           -- different un-saved state for the same file.
-          initVFS $ \vfs -> do
-            vfsVar <- newMVar vfs
+          do
+            vfsVar <- newMVar emptyVFS
             void $ runServerWith lspServerLogger lspClientLogger clientInput clientOutput (serverDefinition lspFormattingConfig vfsVar codebase runtime scope latestRootHash latestPath)
   where
     handleFailure :: String -> IOException -> IO ()

unison-cli/src/Unison/LSP/Completion.hs

@@ -23,7 +23,7 @@ import Text.Megaparsec qualified as Megaparsec
 import Unison.Codebase.Path (Path)
 import Unison.Codebase.Path qualified as Path
 import Unison.HashQualified qualified as HQ
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.LSP.FileAnalysis
 import Unison.LSP.Queries qualified as LSPQ
 import Unison.LSP.Types
@@ -43,7 +43,7 @@ import Unison.Reference qualified as Reference
 import Unison.Referent qualified as Referent
 import Unison.Runtime.IOSource qualified as IOSource
 import Unison.Syntax.DeclPrinter qualified as DeclPrinter
-import Unison.Syntax.HashQualified' qualified as HQ' (toText)
+import Unison.Syntax.HashQualifiedPrime qualified as HQ' (toText)
 import Unison.Syntax.Name qualified as Name (nameP, parseText, toText)
 import Unison.Syntax.TypePrinter qualified as TypePrinter
 import Unison.Util.Monoid qualified as Monoid

unison-cli/src/Unison/LSP/FileAnalysis.hs

@@ -55,7 +55,7 @@ import Unison.Referent qualified as Referent
 import Unison.Result (Note)
 import Unison.Result qualified as Result
 import Unison.Symbol (Symbol)
-import Unison.Syntax.HashQualified' qualified as HQ' (toText)
+import Unison.Syntax.HashQualifiedPrime qualified as HQ' (toText)
 import Unison.Syntax.Lexer qualified as L
 import Unison.Syntax.Name qualified as Name
 import Unison.Syntax.Parser qualified as Parser

unison-cli/src/Unison/Share/Sync.hs

@@ -1053,8 +1053,10 @@ httpUploadEntities ::
           { Servant.makeClientRequest = \url request ->
               -- Disable client-side timeouts
               (Servant.defaultMakeClientRequest url request)
-                { Http.Client.responseTimeout = Http.Client.responseTimeoutNone
-                }
+                <&> \r ->
+                  r
+                    { Http.Client.responseTimeout = Http.Client.responseTimeoutNone
+                    }
           }
           & runReaderT (f req)
           & runExceptT

unison-core/src/Unison/DataDeclaration.hs

@@ -52,7 +52,7 @@ import Unison.Prelude
 import Unison.Reference (Reference)
 import Unison.Reference qualified as Reference
 import Unison.Referent qualified as Referent
-import Unison.Referent' qualified as Referent'
+import Unison.ReferentPrime qualified as Referent'
 import Unison.Type (Type)
 import Unison.Type qualified as Type
 import Unison.Var (Var)

unison-core/src/Unison/HashQualifiedPrime.hs

@@ -1,4 +1,4 @@
-module Unison.HashQualified' where
+module Unison.HashQualifiedPrime where
 
 import Data.Text qualified as Text
 import Unison.HashQualified qualified as HQ

unison-core/src/Unison/Names.hs

@@ -59,7 +59,7 @@ import Text.FuzzyFind qualified as FZF
 import Unison.ConstructorReference (GConstructorReference (..))
 import Unison.ConstructorType qualified as CT
 import Unison.HashQualified qualified as HQ
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.LabeledDependency (LabeledDependency)
 import Unison.LabeledDependency qualified as LD
 import Unison.Name (Name)

unison-core/src/Unison/NamesWithHistory.hs

@@ -34,7 +34,7 @@ import Unison.ConstructorReference (ConstructorReference)
 import Unison.ConstructorType qualified as CT
 import Unison.HashQualified (HashQualified)
 import Unison.HashQualified qualified as HQ
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Name (Name)
 import Unison.Name qualified as Name
 import Unison.Names (Names (..))

unison-core/src/Unison/Referent.hs

@@ -41,7 +41,7 @@ import Unison.Prelude hiding (fold)
 import Unison.Reference (Reference, TermReference, TermReferenceId)
 import Unison.Reference qualified as R
 import Unison.Reference qualified as Reference
-import Unison.Referent' (Referent' (..), reference_, toReference')
+import Unison.ReferentPrime (Referent' (..), reference_, toReference')
 import Unison.ShortHash (ShortHash)
 import Unison.ShortHash qualified as SH
 

unison-core/src/Unison/ReferentPrime.hs

@@ -1,12 +1,12 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE PatternSynonyms #-}
 
-module Unison.Referent'
+module Unison.ReferentPrime
   ( Referent' (..),
 
     -- * Basic queries
     isConstructor,
-    Unison.Referent'.fold,
+    Unison.ReferentPrime.fold,
 
     -- * Lenses
     reference_,

unison-core/unison-core1.cabal

@@ -34,7 +34,7 @@ library
       Unison.DataDeclaration.Records
       Unison.Hashable
       Unison.HashQualified
-      Unison.HashQualified'
+      Unison.HashQualifiedPrime
       Unison.Kind
       Unison.LabeledDependency
       Unison.Name
@@ -48,7 +48,7 @@ library
       Unison.Project
       Unison.Reference
       Unison.Referent
-      Unison.Referent'
+      Unison.ReferentPrime
       Unison.Settings
       Unison.Symbol
       Unison.Term

unison-merge/src/Unison/Merge/Diff.hs

@@ -13,7 +13,7 @@ import Unison.ConstructorReference (GConstructorReference (..))
 import Unison.DataDeclaration (Decl)
 import Unison.DataDeclaration qualified as DataDeclaration
 import Unison.Hash (Hash (Hash))
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Merge.Database (MergeDatabase (..))
 import Unison.Merge.DeclNameLookup (DeclNameLookup)
 import Unison.Merge.DeclNameLookup qualified as DeclNameLookup

unison-share-api/package.yaml

@@ -9,7 +9,6 @@ library:
       other-modules: Paths_unison_share_api
 
 dependencies:
-  - NanoID
   - aeson >= 2.0.0.0
   - async
   - base
@@ -17,6 +16,7 @@ dependencies:
   - bytes
   - bytestring
   - containers
+  - cryptonite
   - Diff
   - directory
   - errors

unison-share-api/src/Unison/Server/Backend.hs

@@ -130,7 +130,7 @@ import Unison.ConstructorType qualified as CT
 import Unison.DataDeclaration qualified as DD
 import Unison.DataDeclaration.Dependencies qualified as DD
 import Unison.HashQualified qualified as HQ
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Hashing.V2.Convert qualified as Hashing
 import Unison.LabeledDependency qualified as LD
 import Unison.Name (Name)
@@ -161,7 +161,7 @@ import Unison.Server.NameSearch (NameSearch (..), Search (..), applySearch)
 import Unison.Server.NameSearch.Sqlite (termReferentsByShortHash, typeReferencesByShortHash)
 import Unison.Server.QueryResult
 import Unison.Server.SearchResult qualified as SR
-import Unison.Server.SearchResult' qualified as SR'
+import Unison.Server.SearchResultPrime qualified as SR'
 import Unison.Server.Syntax qualified as Syntax
 import Unison.Server.Types
 import Unison.Server.Types qualified as ServerTypes
@@ -170,7 +170,7 @@ import Unison.ShortHash qualified as SH
 import Unison.Sqlite qualified as Sqlite
 import Unison.Symbol (Symbol)
 import Unison.Syntax.DeclPrinter qualified as DeclPrinter
-import Unison.Syntax.HashQualified' qualified as HQ' (toText)
+import Unison.Syntax.HashQualifiedPrime qualified as HQ' (toText)
 import Unison.Syntax.Name as Name (toText, unsafeParseText)
 import Unison.Syntax.NamePrinter qualified as NP
 import Unison.Syntax.NameSegment qualified as NameSegment (toEscapedText)

unison-share-api/src/Unison/Server/CodebaseServer.hs

@@ -10,13 +10,14 @@ import Control.Concurrent.Async (race)
 import Control.Exception (ErrorCall (..), throwIO)
 import Control.Monad.Reader
 import Control.Monad.Trans.Except
+import Crypto.Random qualified as Crypto
 import Data.Aeson ()
+import Data.ByteArray.Encoding qualified as BE
 import Data.ByteString qualified as Strict
 import Data.ByteString.Char8 (unpack)
 import Data.ByteString.Char8 qualified as C8
 import Data.ByteString.Lazy qualified as Lazy
 import Data.ByteString.Lazy.UTF8 qualified as BLU
-import Data.NanoID (customNanoID, defaultAlphabet, unNanoID)
 import Data.OpenApi (Info (..), License (..), OpenApi, URL (..))
 import Data.OpenApi.Lens qualified as OpenApi
 import Data.Proxy (Proxy (..))
@@ -83,7 +84,6 @@ import System.Directory (canonicalizePath, doesFileExist)
 import System.Environment (getExecutablePath)
 import System.FilePath ((</>))
 import System.FilePath qualified as FilePath
-import System.Random.MWC (createSystemRandom)
 import U.Codebase.HashTags (CausalHash)
 import Unison.Codebase (Codebase)
 import Unison.Codebase qualified as Codebase
@@ -407,11 +407,18 @@ app env rt codebase uiPath expectedToken allowCorsHost =
 
 -- | The Token is used to help prevent multiple users on a machine gain access to
 -- each others codebases.
+--
+-- Generate a cryptographically secure random token.
+-- https://neilmadden.blog/2018/08/30/moving-away-from-uuids/
+--
+--  E.g.
+-- >>> genToken
+-- "uxf85C7Y0B6om47"
 genToken :: IO Strict.ByteString
 genToken = do
-  g <- createSystemRandom
-  n <- customNanoID defaultAlphabet 16 g
-  pure $ unNanoID n
+  BE.convertToBase @ByteString BE.Base64URLUnpadded <$> Crypto.getRandomBytes numRandomBytes
+  where
+    numRandomBytes = 10
 
 data Waiter a = Waiter
   { notify :: a -> IO (),

unison-share-api/src/Unison/Server/Local/Definitions.hs

@@ -20,7 +20,7 @@ import Unison.Codebase.Path (Path)
 import Unison.Codebase.Runtime qualified as Rt
 import Unison.DataDeclaration qualified as DD
 import Unison.HashQualified qualified as HQ
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Name (Name)
 import Unison.NamesWithHistory qualified as NS
 import Unison.NamesWithHistory qualified as Names

unison-share-api/src/Unison/Server/NameSearch.hs

@@ -12,7 +12,7 @@ import Control.Lens
 import Data.List qualified as List
 import Data.Set qualified as Set
 import Unison.HashQualified qualified as HQ
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Name (Name)
 import Unison.NamesWithHistory (SearchType (..))
 import Unison.Prelude

unison-share-api/src/Unison/Server/NameSearch/FromNames.hs

@@ -1,6 +1,6 @@
 module Unison.Server.NameSearch.FromNames where
 
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Names (Names)
 import Unison.NamesWithHistory qualified as Names
 import Unison.Reference (Reference)

unison-share-api/src/Unison/Server/NameSearch/Sqlite.hs

@@ -17,7 +17,7 @@ import Unison.Codebase (Codebase)
 import Unison.Codebase qualified as Codebase
 import Unison.Codebase.Path qualified as Path
 import Unison.Codebase.SqliteCodebase.Conversions qualified as Cv
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.LabeledDependency qualified as LD
 import Unison.Name (Name)
 import Unison.Name qualified as Name

unison-share-api/src/Unison/Server/Orphans.hs

@@ -26,7 +26,7 @@ import Unison.Core.Project (ProjectBranchName (..), ProjectName (..))
 import Unison.Hash (Hash (..))
 import Unison.Hash qualified as Hash
 import Unison.HashQualified qualified as HQ
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Name (Name)
 import Unison.Name qualified as Name
 import Unison.NameSegment.Internal (NameSegment (NameSegment))
@@ -37,7 +37,7 @@ import Unison.Referent qualified as Referent
 import Unison.ShortHash (ShortHash)
 import Unison.ShortHash qualified as SH
 import Unison.Syntax.HashQualified qualified as HQ (parseText)
-import Unison.Syntax.HashQualified' qualified as HQ' (parseText)
+import Unison.Syntax.HashQualifiedPrime qualified as HQ' (parseText)
 import Unison.Syntax.Name qualified as Name (parseTextEither, toText)
 import Unison.Syntax.NameSegment qualified as NameSegment
 import Unison.Util.Pretty (Width (..))

unison-share-api/src/Unison/Server/SearchResult.hs

@@ -2,7 +2,7 @@ module Unison.Server.SearchResult where
 
 import Data.Set qualified as Set
 import Unison.HashQualified (HashQualified)
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Name (Name)
 import Unison.Name qualified as Name
 import Unison.Names (Names (..))

unison-share-api/src/Unison/Server/SearchResultPrime.hs

@@ -1,6 +1,6 @@
 {-# LANGUAGE PatternSynonyms #-}
 
-module Unison.Server.SearchResult' where
+module Unison.Server.SearchResultPrime where
 
 import Data.Set qualified as Set
 import Unison.Codebase.Editor.DisplayObject (DisplayObject)
@@ -8,7 +8,7 @@ import Unison.Codebase.Editor.DisplayObject qualified as DT
 import Unison.DataDeclaration (Decl)
 import Unison.DataDeclaration qualified as DD
 import Unison.HashQualified qualified as HQ
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.LabeledDependency (LabeledDependency)
 import Unison.LabeledDependency qualified as LD
 import Unison.Name (Name)

unison-share-api/src/Unison/Server/Types.hs

@@ -41,7 +41,7 @@ import Unison.Codebase.Path qualified as Path
 import Unison.Core.Project (ProjectBranchName)
 import Unison.Hash qualified as Hash
 import Unison.HashQualified qualified as HQ
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Name (Name)
 import Unison.Prelude
 import Unison.Project (ProjectAndBranch, ProjectName)

unison-share-api/src/Unison/Util/Find.hs

@@ -15,7 +15,7 @@ import Data.Text qualified as Text
 -- https://www.stackage.org/haddock/lts-13.9/regex-tdfa-1.2.3.1/Text-Regex-TDFA.html
 import Text.Regex.TDFA qualified as RE
 import Unison.HashQualified qualified as HQ
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Name (Name)
 import Unison.Name qualified as Name
 import Unison.Names (Names)

unison-share-api/unison-share-api.cabal

@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -41,7 +41,7 @@ library
       Unison.Server.Orphans
       Unison.Server.QueryResult
       Unison.Server.SearchResult
-      Unison.Server.SearchResult'
+      Unison.Server.SearchResultPrime
       Unison.Server.Syntax
       Unison.Server.Types
       Unison.Sync.API
@@ -84,7 +84,6 @@ library
   ghc-options: -Wall
   build-depends:
       Diff
-    , NanoID
     , aeson >=2.0.0.0
     , async
     , base
@@ -92,6 +91,7 @@ library
     , bytes
     , bytestring
     , containers
+    , cryptonite
     , directory
     , errors
     , extra

unison-share-projects-api/src/Unison/Share/API/Hash.hs

@@ -1,4 +1,5 @@
 {-# LANGUAGE RecordWildCards #-}
+{-# OPTIONS_GHC -Wno-deprecations #-}
 
 -- | Hash-related types in the Share API.
 module Unison.Share.API.Hash

unison-src/transcripts-using-base/failure-tests.output.md

@@ -50,7 +50,7 @@ scratch/main> io.test test1
   
     Failure
       (typeLink IOFailure)
-      "Cannot decode byte '\\xee': Data.Text.Internal.Encoding.decodeUtf8: Invalid UTF-8 stream"
+      "Cannot decode byte '\\xee': Data.Text.Encoding: Invalid UTF-8 stream"
       (Any ())
   
   Stack trace:

unison-src/transcripts-using-base/utf8.output.md

@@ -138,6 +138,6 @@ greek_bytes = Bytes.fromList [206, 145, 206, 146, 206, 147, 206, 148, 206]
 
     5 | > match fromUtf8.impl (drop 1 greek_bytes) with
           ⧩
-          "Cannot decode byte '\\x91': Data.Text.Internal.Encoding.decodeUtf8: Invalid UTF-8 stream"
+          "Cannot decode byte '\\x91': Data.Text.Encoding: Invalid UTF-8 stream"
 
 ```

unison-src/transcripts/generic-parse-errors.output.md

@@ -66,6 +66,24 @@ x = a.#abc
   
   
   I was surprised to find a '.' here.
+  I was expecting one of these instead:
+  
+  * and
+  * bang
+  * do
+  * false
+  * force
+  * handle
+  * if
+  * infixApp
+  * let
+  * newline or semicolon
+  * or
+  * quote
+  * termLink
+  * true
+  * tuple
+  * typeLink
 
 ```
 ```unison

unison-syntax/src/Unison/Syntax/HashQualified.hs

@@ -21,10 +21,10 @@ import Text.Megaparsec qualified as P
 import Text.Megaparsec.Internal qualified as P (withParsecT)
 import Unison.HashQualified (HashQualified (..))
 import Unison.HashQualified qualified as HashQualified
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Name (Name)
 import Unison.Prelude hiding (fromString)
-import Unison.Syntax.HashQualified' qualified as HQ'
+import Unison.Syntax.HashQualifiedPrime qualified as HQ'
 import Unison.Syntax.Lexer.Token (Token)
 import Unison.Syntax.Name qualified as Name (nameP, toText)
 import Unison.Syntax.NameSegment qualified as NameSegment

unison-syntax/src/Unison/Syntax/HashQualifiedPrime.hs

@@ -1,7 +1,7 @@
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 -- | Syntax-related combinators for HashQualified' (to/from string types).
-module Unison.Syntax.HashQualified'
+module Unison.Syntax.HashQualifiedPrime
   ( -- * String conversions
     parseText,
     unsafeParseText,
@@ -16,7 +16,7 @@ import Data.Text qualified as Text
 import Text.Megaparsec (ParsecT)
 import Text.Megaparsec qualified as P
 import Text.Megaparsec.Internal qualified as P (withParsecT)
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Name (Name)
 import Unison.Prelude hiding (fromString)
 import Unison.Syntax.Lexer.Token (Token)

unison-syntax/src/Unison/Syntax/Lexer.hs

@@ -46,7 +46,7 @@ import Text.Megaparsec.Char qualified as CP
 import Text.Megaparsec.Char.Lexer qualified as LP
 import Text.Megaparsec.Error qualified as EP
 import Text.Megaparsec.Internal qualified as PI
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Lexer.Pos (Column, Line, Pos (Pos), column, line)
 import Unison.Name (Name)
 import Unison.Name qualified as Name
@@ -56,7 +56,7 @@ import Unison.NameSegment.Internal qualified as NameSegment
 import Unison.Prelude
 import Unison.ShortHash (ShortHash)
 import Unison.ShortHash qualified as SH
-import Unison.Syntax.HashQualified' qualified as HQ' (toText)
+import Unison.Syntax.HashQualifiedPrime qualified as HQ' (toText)
 import Unison.Syntax.Lexer.Token (Token (..), posP, tokenP)
 import Unison.Syntax.Name qualified as Name (isSymboly, nameP, toText, unsafeParseText)
 import Unison.Syntax.NameSegment (symbolyIdChar, wordyIdChar, wordyIdStartChar)

unison-syntax/src/Unison/Syntax/Parser.hs

@@ -72,7 +72,7 @@ import Unison.ABT qualified as ABT
 import Unison.ConstructorReference (ConstructorReference)
 import Unison.Hash qualified as Hash
 import Unison.HashQualified qualified as HQ
-import Unison.HashQualified' qualified as HQ'
+import Unison.HashQualifiedPrime qualified as HQ'
 import Unison.Hashable qualified as Hashable
 import Unison.Name as Name
 import Unison.Names (Names)

unison-syntax/test/Main.hs

@@ -9,7 +9,7 @@ import System.IO.CodePage (withCP65001)
 import Unison.Prelude
 import Unison.ShortHash (ShortHash)
 import Unison.ShortHash qualified as ShortHash
-import Unison.Syntax.HashQualified' qualified as HQ' (unsafeParseText)
+import Unison.Syntax.HashQualifiedPrime qualified as HQ' (unsafeParseText)
 import Unison.Syntax.Lexer
 
 main :: IO ()

unison-syntax/unison-syntax.cabal

@@ -20,7 +20,7 @@ library
       Unison.Lexer.Pos
       Unison.Parser.Ann
       Unison.Syntax.HashQualified
-      Unison.Syntax.HashQualified'
+      Unison.Syntax.HashQualifiedPrime
       Unison.Syntax.Lexer
       Unison.Syntax.Lexer.Token
       Unison.Syntax.Name