diff --git a/types/chat1/api.go b/types/chat1/api.go
index b6e5b41..4c328a9 100644
--- a/types/chat1/api.go
+++ b/types/chat1/api.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/chat1/api.avdl
+//   Input file: ../../../../../../client/protocol/avdl/chat1/api.avdl
 
 package chat1
 
@@ -942,6 +942,7 @@ type AdvertiseCommandAPIParam struct {
 	Typ      string                `codec:"typ" json:"type"`
 	Commands []UserBotCommandInput `codec:"commands" json:"commands"`
 	TeamName string                `codec:"teamName,omitempty" json:"team_name,omitempty"`
+	ConvID   ConvIDStr             `codec:"convID,omitempty" json:"conv_id,omitempty"`
 }
 
 func (o AdvertiseCommandAPIParam) DeepCopy() AdvertiseCommandAPIParam {
@@ -959,6 +960,7 @@ func (o AdvertiseCommandAPIParam) DeepCopy() AdvertiseCommandAPIParam {
 			return ret
 		})(o.Commands),
 		TeamName: o.TeamName,
+		ConvID:   o.ConvID.DeepCopy(),
 	}
 }
 
diff --git a/types/chat1/blocking.go b/types/chat1/blocking.go
index 37c5c78..a401b83 100644
--- a/types/chat1/blocking.go
+++ b/types/chat1/blocking.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/chat1/blocking.avdl
+//   Input file: ../../../../../../client/protocol/avdl/chat1/blocking.avdl
 
 package chat1
diff --git a/types/chat1/chat_ui.go b/types/chat1/chat_ui.go
index 86c2418..c81f882 100644
--- a/types/chat1/chat_ui.go
+++ b/types/chat1/chat_ui.go
@@ -1,14 +1,15 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/chat1/chat_ui.avdl
+//   Input file: ../../../../../../client/protocol/avdl/chat1/chat_ui.avdl
 
 package chat1
 
 import (
+	"errors"
+	"fmt"
+
 	gregor1 "samhofi.us/x/keybase/v2/types/gregor1"
 	keybase1 "samhofi.us/x/keybase/v2/types/keybase1"
 	stellar1 "samhofi.us/x/keybase/v2/types/stellar1"
-	"errors"
-	"fmt"
 )
 
 type UIPagination struct {
diff --git a/types/chat1/commands.go b/types/chat1/commands.go
index f6d4d55..6ea28eb 100644
--- a/types/chat1/commands.go
+++ b/types/chat1/commands.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/chat1/commands.avdl
+//   Input file: ../../../../../../client/protocol/avdl/chat1/commands.avdl
 
 package chat1
 
diff --git a/types/chat1/common.go b/types/chat1/common.go
index 040e5e1..c2487f2 100644
--- a/types/chat1/common.go
+++ b/types/chat1/common.go
@@ -1,13 +1,15 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/chat1/common.avdl
+//   Input file: ../../../../../../client/protocol/avdl/chat1/common.avdl
 
 package chat1
 
 import (
-	gregor1 "samhofi.us/x/keybase/v2/types/gregor1"
-	keybase1 "samhofi.us/x/keybase/v2/types/keybase1"
 	"errors"
 	"fmt"
+
+	gregor1 "samhofi.us/x/keybase/v2/types/gregor1"
+	keybase1 "samhofi.us/x/keybase/v2/types/keybase1"
+	stellar1 "samhofi.us/x/keybase/v2/types/stellar1"
 )
 
 type ThreadID []byte
@@ -1368,6 +1370,7 @@ type MessageClientHeader struct {
 	EphemeralMetadata *MsgEphemeralMetadata    `codec:"em,omitempty" json:"em,omitempty"`
 	PairwiseMacs      map[keybase1.KID][]byte  `codec:"pm" json:"pm"`
 	BotUID            *gregor1.UID             `codec:"b,omitempty" json:"b,omitempty"`
+	TxID              *stellar1.TransactionID  `codec:"t,omitempty" json:"t,omitempty"`
 }
 
 func (o MessageClientHeader) DeepCopy() MessageClientHeader {
@@ -1467,6 +1470,13 @@ func (o MessageClientHeader) DeepCopy() MessageClientHeader {
 			tmp := (*x).DeepCopy()
 			return &tmp
 		})(o.BotUID),
+		TxID: (func(x *stellar1.TransactionID) *stellar1.TransactionID {
+			if x == nil {
+				return nil
+			}
+			tmp := (*x).DeepCopy()
+			return &tmp
+		})(o.TxID),
 	}
 }
 
@@ -2481,6 +2491,7 @@ const (
 	BotCommandsAdvertisementTyp_PUBLIC        BotCommandsAdvertisementTyp = 0
 	BotCommandsAdvertisementTyp_TLFID_MEMBERS BotCommandsAdvertisementTyp = 1
 	BotCommandsAdvertisementTyp_TLFID_CONVS   BotCommandsAdvertisementTyp = 2
+	BotCommandsAdvertisementTyp_CONV          BotCommandsAdvertisementTyp = 3
 )
 
 func (o BotCommandsAdvertisementTyp) DeepCopy() BotCommandsAdvertisementTyp { return o }
@@ -2489,12 +2500,14 @@ var BotCommandsAdvertisementTypMap = map[string]BotCommandsAdvertisementTyp{
 	"PUBLIC":        0,
 	"TLFID_MEMBERS": 1,
 	"TLFID_CONVS":   2,
+	"CONV":          3,
 }
 
 var BotCommandsAdvertisementTypRevMap = map[BotCommandsAdvertisementTyp]string{
 	0: "PUBLIC",
 	1: "TLFID_MEMBERS",
 	2: "TLFID_CONVS",
+	3: "CONV",
 }
 
 func (e BotCommandsAdvertisementTyp) String() string {
@@ -2546,3 +2559,97 @@ func (e LastActiveStatus) String() string {
 	}
 	return fmt.Sprintf("%v", int(e))
 }
+
+type ChatMemberDetails struct {
+	Uid      keybase1.UID      `codec:"uid" json:"uid"`
+	Username string            `codec:"username" json:"username"`
+	FullName keybase1.FullName `codec:"fullName" json:"fullName"`
+}
+
+func (o ChatMemberDetails) DeepCopy() ChatMemberDetails {
+	return ChatMemberDetails{
+		Uid:      o.Uid.DeepCopy(),
+		Username: o.Username,
+		FullName: o.FullName.DeepCopy(),
+	}
+}
+
+type ChatMembersDetails struct {
+	Owners         []ChatMemberDetails `codec:"owners" json:"owners"`
+	Admins         []ChatMemberDetails `codec:"admins" json:"admins"`
+	Writers        []ChatMemberDetails `codec:"writers" json:"writers"`
+	Readers        []ChatMemberDetails `codec:"readers" json:"readers"`
+	Bots           []ChatMemberDetails `codec:"bots" json:"bots"`
+	RestrictedBots []ChatMemberDetails `codec:"restrictedBots" json:"restrictedBots"`
+}
+
+func (o ChatMembersDetails) DeepCopy() ChatMembersDetails {
+	return ChatMembersDetails{
+		Owners: (func(x []ChatMemberDetails) []ChatMemberDetails {
+			if x == nil {
+				return nil
+			}
+			ret := make([]ChatMemberDetails, len(x))
+			for i, v := range x {
+				vCopy := v.DeepCopy()
+				ret[i] = vCopy
+			}
+			return ret
+		})(o.Owners),
+		Admins: (func(x []ChatMemberDetails) []ChatMemberDetails {
+			if x == nil {
+				return nil
+			}
+			ret := make([]ChatMemberDetails, len(x))
+			for i, v := range x {
+				vCopy := v.DeepCopy()
+				ret[i] = vCopy
+			}
+			return ret
+		})(o.Admins),
+		Writers: (func(x []ChatMemberDetails) []ChatMemberDetails {
+			if x == nil {
+				return nil
+			}
+			ret := make([]ChatMemberDetails, len(x))
+			for i, v := range x {
+				vCopy := v.DeepCopy()
+				ret[i] = vCopy
+			}
+			return ret
+		})(o.Writers),
+		Readers: (func(x []ChatMemberDetails) []ChatMemberDetails {
+			if x == nil {
+				return nil
+			}
+			ret := make([]ChatMemberDetails, len(x))
+			for i, v := range x {
+				vCopy := v.DeepCopy()
+				ret[i] = vCopy
+			}
+			return ret
+		})(o.Readers),
+		Bots: (func(x []ChatMemberDetails) []ChatMemberDetails {
+			if x == nil {
+				return nil
+			}
+			ret := make([]ChatMemberDetails, len(x))
+			for i, v := range x {
+				vCopy := v.DeepCopy()
+				ret[i] = vCopy
+			}
+			return ret
+		})(o.Bots),
+		RestrictedBots: (func(x []ChatMemberDetails) []ChatMemberDetails {
+			if x == nil {
+				return nil
+			}
+			ret := make([]ChatMemberDetails, len(x))
+			for i, v := range x {
+				vCopy := v.DeepCopy()
+				ret[i] = vCopy
+			}
+			return ret
+		})(o.RestrictedBots),
+	}
+}
diff --git a/types/chat1/emoji.go b/types/chat1/emoji.go
index 735e144..19989e3 100644
--- a/types/chat1/emoji.go
+++ b/types/chat1/emoji.go
@@ -1,12 +1,13 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/chat1/emoji.avdl
+//   Input file: ../../../../../../client/protocol/avdl/chat1/emoji.avdl
 
 package chat1
 
 import (
-	gregor1 "samhofi.us/x/keybase/v2/types/gregor1"
 	"errors"
 	"fmt"
+
+	gregor1 "samhofi.us/x/keybase/v2/types/gregor1"
 )
 
 type EmojiLoadSourceTyp int
@@ -274,9 +275,12 @@ type Emoji struct {
 	IsBig        bool               `codec:"isBig" json:"isBig"`
 	IsReacji     bool               `codec:"isReacji" json:"isReacji"`
 	IsCrossTeam  bool               `codec:"isCrossTeam" json:"isCrossTeam"`
+	IsAlias      bool               `codec:"isAlias" json:"isAlias"`
 	Source       EmojiLoadSource    `codec:"source" json:"source"`
+	NoAnimSource EmojiLoadSource    `codec:"noAnimSource" json:"noAnimSource"`
 	RemoteSource EmojiRemoteSource  `codec:"remoteSource" json:"remoteSource"`
 	CreationInfo *EmojiCreationInfo `codec:"creationInfo,omitempty" json:"creationInfo,omitempty"`
+	Teamname     *string            `codec:"teamname,omitempty" json:"teamname,omitempty"`
 }
 
 func (o Emoji) DeepCopy() Emoji {
@@ -285,7 +289,9 @@ func (o Emoji) DeepCopy() Emoji {
 		IsBig:        o.IsBig,
 		IsReacji:     o.IsReacji,
 		IsCrossTeam:  o.IsCrossTeam,
+		IsAlias:      o.IsAlias,
 		Source:       o.Source.DeepCopy(),
+		NoAnimSource: o.NoAnimSource.DeepCopy(),
 		RemoteSource: o.RemoteSource.DeepCopy(),
 		CreationInfo: (func(x *EmojiCreationInfo) *EmojiCreationInfo {
 			if x == nil {
@@ -294,6 +300,13 @@ func (o Emoji) DeepCopy() Emoji {
 			tmp := (*x).DeepCopy()
 			return &tmp
 		})(o.CreationInfo),
+		Teamname: (func(x *string) *string {
+			if x == nil {
+				return nil
+			}
+			tmp := (*x)
+			return &tmp
+		})(o.Teamname),
 	}
 }
 
diff --git a/types/chat1/gregor.go b/types/chat1/gregor.go
index 80084fa..c59d7f8 100644
--- a/types/chat1/gregor.go
+++ b/types/chat1/gregor.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/chat1/gregor.avdl
+//   Input file: ../../../../../../client/protocol/avdl/chat1/gregor.avdl
 
 package chat1
 
diff --git a/types/chat1/local.go b/types/chat1/local.go
index 51697ee..5e9409a 100644
--- a/types/chat1/local.go
+++ b/types/chat1/local.go
@@ -1,14 +1,15 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/chat1/local.avdl
+//   Input file: ../../../../../../client/protocol/avdl/chat1/local.avdl
 
 package chat1
 
 import (
+	"errors"
+	"fmt"
+
 	gregor1 "samhofi.us/x/keybase/v2/types/gregor1"
 	keybase1 "samhofi.us/x/keybase/v2/types/keybase1"
 	stellar1 "samhofi.us/x/keybase/v2/types/stellar1"
-	"errors"
-	"fmt"
 )
 
 type VersionKind string
@@ -356,12 +357,25 @@ func (o MessageDelete) DeepCopy() MessageDelete {
 }
 
 type MessageHeadline struct {
-	Headline string `codec:"headline" json:"headline"`
+	Headline string                    `codec:"headline" json:"headline"`
+	Emojis   map[string]HarvestedEmoji `codec:"emojis" json:"emojis"`
 }
 
 func (o MessageHeadline) DeepCopy() MessageHeadline {
 	return MessageHeadline{
 		Headline: o.Headline,
+		Emojis: (func(x map[string]HarvestedEmoji) map[string]HarvestedEmoji {
+			if x == nil {
+				return nil
+			}
+			ret := make(map[string]HarvestedEmoji, len(x))
+			for k, v := range x {
+				kCopy := k
+				vCopy := v.DeepCopy()
+				ret[kCopy] = vCopy
+			}
+			return ret
+		})(o.Emojis),
 	}
 }
 
@@ -970,13 +984,14 @@ func (o MessageDeleteHistory) DeepCopy() MessageDeleteHistory {
 }
 
 type MessageAttachment struct {
-	Object       Asset              `codec:"object" json:"object"`
-	Preview      *Asset             `codec:"preview,omitempty" json:"preview,omitempty"`
-	Previews     []Asset            `codec:"previews" json:"previews"`
-	Metadata     []byte             `codec:"metadata" json:"metadata"`
-	Uploaded     bool               `codec:"uploaded" json:"uploaded"`
-	UserMentions []KnownUserMention `codec:"userMentions" json:"userMentions"`
-	TeamMentions []KnownTeamMention `codec:"teamMentions" json:"teamMentions"`
+	Object       Asset                     `codec:"object" json:"object"`
+	Preview      *Asset                    `codec:"preview,omitempty" json:"preview,omitempty"`
+	Previews     []Asset                   `codec:"previews" json:"previews"`
+	Metadata     []byte                    `codec:"metadata" json:"metadata"`
+	Uploaded     bool                      `codec:"uploaded" json:"uploaded"`
+	UserMentions []KnownUserMention        `codec:"userMentions" json:"userMentions"`
+	TeamMentions []KnownTeamMention        `codec:"teamMentions" json:"teamMentions"`
+	Emojis       map[string]HarvestedEmoji `codec:"emojis" json:"emojis"`
 }
 
 func (o MessageAttachment) DeepCopy() MessageAttachment {
@@ -1029,6 +1044,18 @@ func (o MessageAttachment) DeepCopy() MessageAttachment {
 			}
 			return ret
 		})(o.TeamMentions),
+		Emojis: (func(x map[string]HarvestedEmoji) map[string]HarvestedEmoji {
+			if x == nil {
+				return nil
+			}
+			ret := make(map[string]HarvestedEmoji, len(x))
+			for k, v := range x {
+				kCopy := k
+				vCopy := v.DeepCopy()
+				ret[kCopy] = vCopy
+			}
+			return ret
+		})(o.Emojis),
 	}
 }
 
@@ -3385,26 +3412,27 @@ func (o ConversationPinnedMessage) DeepCopy() ConversationPinnedMessage {
 }
 
 type ConversationInfoLocal struct {
-	Id            ConversationID                 `codec:"id" json:"id"`
-	Triple        ConversationIDTriple           `codec:"triple" json:"triple"`
-	TlfName       string                         `codec:"tlfName" json:"tlfName"`
-	TopicName     string                         `codec:"topicName" json:"topicName"`
-	Headline      string                         `codec:"headline" json:"headline"`
-	SnippetMsg    *MessageUnboxed                `codec:"snippetMsg,omitempty" json:"snippetMsg,omitempty"`
-	PinnedMsg     *ConversationPinnedMessage     `codec:"pinnedMsg,omitempty" json:"pinnedMsg,omitempty"`
-	Draft         *string                        `codec:"draft,omitempty" json:"draft,omitempty"`
-	Visibility    keybase1.TLFVisibility         `codec:"visibility" json:"visibility"`
-	IsDefaultConv bool                           `codec:"isDefaultConv" json:"isDefaultConv"`
-	Status        ConversationStatus             `codec:"status" json:"status"`
-	MembersType   ConversationMembersType        `codec:"membersType" json:"membersType"`
-	MemberStatus  ConversationMemberStatus       `codec:"memberStatus" json:"memberStatus"`
-	TeamType      TeamType                       `codec:"teamType" json:"teamType"`
-	Existence     ConversationExistence          `codec:"existence" json:"existence"`
-	Version       ConversationVers               `codec:"version" json:"version"`
-	LocalVersion  LocalConversationVers          `codec:"localVersion" json:"localVersion"`
-	Participants  []ConversationLocalParticipant `codec:"participants" json:"participants"`
-	FinalizeInfo  *ConversationFinalizeInfo      `codec:"finalizeInfo,omitempty" json:"finalizeInfo,omitempty"`
-	ResetNames    []string                       `codec:"resetNames" json:"resetNames"`
+	Id             ConversationID                 `codec:"id" json:"id"`
+	Triple         ConversationIDTriple           `codec:"triple" json:"triple"`
+	TlfName        string                         `codec:"tlfName" json:"tlfName"`
+	TopicName      string                         `codec:"topicName" json:"topicName"`
+	Headline       string                         `codec:"headline" json:"headline"`
+	HeadlineEmojis []HarvestedEmoji               `codec:"headlineEmojis" json:"headlineEmojis"`
+	SnippetMsg     *MessageUnboxed                `codec:"snippetMsg,omitempty" json:"snippetMsg,omitempty"`
+	PinnedMsg      *ConversationPinnedMessage     `codec:"pinnedMsg,omitempty" json:"pinnedMsg,omitempty"`
+	Draft          *string                        `codec:"draft,omitempty" json:"draft,omitempty"`
+	Visibility     keybase1.TLFVisibility         `codec:"visibility" json:"visibility"`
+	IsDefaultConv  bool                           `codec:"isDefaultConv" json:"isDefaultConv"`
+	Status         ConversationStatus             `codec:"status" json:"status"`
+	MembersType    ConversationMembersType        `codec:"membersType" json:"membersType"`
+	MemberStatus   ConversationMemberStatus       `codec:"memberStatus" json:"memberStatus"`
+	TeamType       TeamType                       `codec:"teamType" json:"teamType"`
+	Existence      ConversationExistence          `codec:"existence" json:"existence"`
+	Version        ConversationVers               `codec:"version" json:"version"`
+	LocalVersion   LocalConversationVers          `codec:"localVersion" json:"localVersion"`
+	Participants   []ConversationLocalParticipant `codec:"participants" json:"participants"`
+	FinalizeInfo   *ConversationFinalizeInfo      `codec:"finalizeInfo,omitempty" json:"finalizeInfo,omitempty"`
+	ResetNames     []string                       `codec:"resetNames" json:"resetNames"`
 }
 
 func (o ConversationInfoLocal) DeepCopy() ConversationInfoLocal {
@@ -3414,6 +3442,17 @@ func (o ConversationInfoLocal) DeepCopy() ConversationInfoLocal {
 		TlfName:   o.TlfName,
 		TopicName: o.TopicName,
 		Headline:  o.Headline,
+		HeadlineEmojis: (func(x []HarvestedEmoji) []HarvestedEmoji {
+			if x == nil {
+				return nil
+			}
+			ret := make([]HarvestedEmoji, len(x))
+			for i, v := range x {
+				vCopy := v.DeepCopy()
+				ret[i] = vCopy
+			}
+			return ret
+		})(o.HeadlineEmojis),
 		SnippetMsg: (func(x *MessageUnboxed) *MessageUnboxed {
 			if x == nil {
 				return nil
@@ -5909,6 +5948,7 @@ type AdvertiseCommandsParam struct {
 	Typ      BotCommandsAdvertisementTyp `codec:"typ" json:"typ"`
 	Commands []UserBotCommandInput       `codec:"commands" json:"commands"`
 	TeamName *string                     `codec:"teamName,omitempty" json:"teamName,omitempty"`
+	ConvID   *ConversationID             `codec:"convID,omitempty" json:"convID,omitempty"`
 }
 
 func (o AdvertiseCommandsParam) DeepCopy() AdvertiseCommandsParam {
@@ -5932,6 +5972,13 @@ func (o AdvertiseCommandsParam) DeepCopy() AdvertiseCommandsParam {
 			tmp := (*x)
 			return &tmp
 		})(o.TeamName),
+		ConvID: (func(x *ConversationID) *ConversationID {
+			if x == nil {
+				return nil
+			}
+			tmp := (*x).DeepCopy()
+			return &tmp
+		})(o.ConvID),
 	}
 }
 
@@ -6259,8 +6306,21 @@ func (o LastActiveStatusAll) DeepCopy() LastActiveStatusAll {
 	}
 }
 
+type EmojiError struct {
+	Clidisplay string `codec:"clidisplay" json:"clidisplay"`
+	Uidisplay  string `codec:"uidisplay" json:"uidisplay"`
+}
+
+func (o EmojiError) DeepCopy() EmojiError {
+	return EmojiError{
+		Clidisplay: o.Clidisplay,
+		Uidisplay:  o.Uidisplay,
+	}
+}
+
 type AddEmojiRes struct {
-	RateLimit *RateLimit `codec:"rateLimit,omitempty" json:"rateLimit,omitempty"`
+	RateLimit *RateLimit  `codec:"rateLimit,omitempty" json:"rateLimit,omitempty"`
+	Error     *EmojiError `codec:"error,omitempty" json:"error,omitempty"`
 }
 
 func (o AddEmojiRes) DeepCopy() AddEmojiRes {
@@ -6272,13 +6332,20 @@ func (o AddEmojiRes) DeepCopy() AddEmojiRes {
 			tmp := (*x).DeepCopy()
 			return &tmp
 		})(o.RateLimit),
+		Error: (func(x *EmojiError) *EmojiError {
+			if x == nil {
+				return nil
+			}
+			tmp := (*x).DeepCopy()
+			return &tmp
+		})(o.Error),
 	}
 }
 
 type AddEmojisRes struct {
-	RateLimit        *RateLimit        `codec:"rateLimit,omitempty" json:"rateLimit,omitempty"`
-	SuccessFilenames []string          `codec:"successFilenames" json:"successFilenames"`
-	FailedFilenames  map[string]string `codec:"failedFilenames" json:"failedFilenames"`
+	RateLimit        *RateLimit            `codec:"rateLimit,omitempty" json:"rateLimit,omitempty"`
+	SuccessFilenames []string              `codec:"successFilenames" json:"successFilenames"`
+	FailedFilenames  map[string]EmojiError `codec:"failedFilenames" json:"failedFilenames"`
 }
 
 func (o AddEmojisRes) DeepCopy() AddEmojisRes {
@@ -6301,14 +6368,14 @@ func (o AddEmojisRes) DeepCopy() AddEmojisRes {
 			}
 			return ret
 		})(o.SuccessFilenames),
-		FailedFilenames: (func(x map[string]string) map[string]string {
+		FailedFilenames: (func(x map[string]EmojiError) map[string]EmojiError {
 			if x == nil {
 				return nil
 			}
-			ret := make(map[string]string, len(x))
+			ret := make(map[string]EmojiError, len(x))
 			for k, v := range x {
 				kCopy := k
-				vCopy := v
+				vCopy := v.DeepCopy()
 				ret[kCopy] = vCopy
 			}
 			return ret
@@ -6317,8 +6384,8 @@ func (o AddEmojisRes) DeepCopy() AddEmojisRes {
 }
 
 type AddEmojiAliasRes struct {
-	RateLimit   *RateLimit `codec:"rateLimit,omitempty" json:"rateLimit,omitempty"`
-	ErrorString *string    `codec:"errorString,omitempty" json:"errorString,omitempty"`
+	RateLimit *RateLimit  `codec:"rateLimit,omitempty" json:"rateLimit,omitempty"`
+	Error     *EmojiError `codec:"error,omitempty" json:"error,omitempty"`
 }
 
 func (o AddEmojiAliasRes) DeepCopy() AddEmojiAliasRes {
@@ -6330,13 +6397,13 @@ func (o AddEmojiAliasRes) DeepCopy() AddEmojiAliasRes {
 			tmp := (*x).DeepCopy()
 			return &tmp
 		})(o.RateLimit),
-		ErrorString: (func(x *string) *string {
+		Error: (func(x *EmojiError) *EmojiError {
 			if x == nil {
 				return nil
 			}
-			tmp := (*x)
+			tmp := (*x).DeepCopy()
 			return &tmp
-		})(o.ErrorString),
+		})(o.Error),
 	}
 }
 
diff --git a/types/chat1/notify.go b/types/chat1/notify.go
index cc6bbec..3c96d4b 100644
--- a/types/chat1/notify.go
+++ b/types/chat1/notify.go
@@ -1,12 +1,13 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/chat1/notify.avdl
+//   Input file: ../../../../../../client/protocol/avdl/chat1/notify.avdl
 
 package chat1
 
 import (
-	keybase1 "samhofi.us/x/keybase/v2/types/keybase1"
 	"errors"
 	"fmt"
+
+	keybase1 "samhofi.us/x/keybase/v2/types/keybase1"
 )
 
 type ChatActivitySource int
diff --git a/types/chat1/remote.go b/types/chat1/remote.go
index 70547f7..32df51f 100644
--- a/types/chat1/remote.go
+++ b/types/chat1/remote.go
@@ -1,13 +1,14 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/chat1/remote.avdl
+//   Input file: ../../../../../../client/protocol/avdl/chat1/remote.avdl
 
 package chat1
 
 import (
-	gregor1 "samhofi.us/x/keybase/v2/types/gregor1"
-	keybase1 "samhofi.us/x/keybase/v2/types/keybase1"
 	"errors"
 	"fmt"
+
+	gregor1 "samhofi.us/x/keybase/v2/types/gregor1"
+	keybase1 "samhofi.us/x/keybase/v2/types/keybase1"
 )
 
 type MessageBoxed struct {
@@ -965,11 +966,24 @@ func (o RemoteBotCommandsAdvertisementTLFID) DeepCopy() RemoteBotCommandsAdverti
 	}
 }
 
+type RemoteBotCommandsAdvertisementConv struct {
+	ConvID          ConversationID `codec:"convID" json:"convID"`
+	AdvertiseConvID ConversationID `codec:"advertiseConvID" json:"advertiseConvID"`
+}
+
+func (o RemoteBotCommandsAdvertisementConv) DeepCopy() RemoteBotCommandsAdvertisementConv {
+	return RemoteBotCommandsAdvertisementConv{
+		ConvID:          o.ConvID.DeepCopy(),
+		AdvertiseConvID: o.AdvertiseConvID.DeepCopy(),
+	}
+}
+
 type RemoteBotCommandsAdvertisement struct {
 	Typ__          BotCommandsAdvertisementTyp           `codec:"typ" json:"typ"`
 	Public__       *RemoteBotCommandsAdvertisementPublic `codec:"public,omitempty" json:"public,omitempty"`
 	TlfidMembers__ *RemoteBotCommandsAdvertisementTLFID  `codec:"tlfidMembers,omitempty" json:"tlfidMembers,omitempty"`
 	TlfidConvs__   *RemoteBotCommandsAdvertisementTLFID  `codec:"tlfidConvs,omitempty" json:"tlfidConvs,omitempty"`
+	Conv__         *RemoteBotCommandsAdvertisementConv   `codec:"conv,omitempty" json:"conv,omitempty"`
 }
 
 func (o *RemoteBotCommandsAdvertisement) Typ() (ret BotCommandsAdvertisementTyp, err error) {
@@ -989,6 +1003,11 @@ func (o *RemoteBotCommandsAdvertisement) Typ() (ret BotCommandsAdvertisementTyp,
 			err = errors.New("unexpected nil value for TlfidConvs__")
 			return ret, err
 		}
+	case BotCommandsAdvertisementTyp_CONV:
+		if o.Conv__ == nil {
+			err = errors.New("unexpected nil value for Conv__")
+			return ret, err
+		}
 	}
 	return o.Typ__, nil
 }
@@ -1023,6 +1042,16 @@ func (o RemoteBotCommandsAdvertisement) TlfidConvs() (res RemoteBotCommandsAdver
 	return *o.TlfidConvs__
 }
 
+func (o RemoteBotCommandsAdvertisement) Conv() (res RemoteBotCommandsAdvertisementConv) {
+	if o.Typ__ != BotCommandsAdvertisementTyp_CONV {
+		panic("wrong case accessed")
+	}
+	if o.Conv__ == nil {
+		return
+	}
+	return *o.Conv__
+}
+
 func NewRemoteBotCommandsAdvertisementWithPublic(v RemoteBotCommandsAdvertisementPublic) RemoteBotCommandsAdvertisement {
 	return RemoteBotCommandsAdvertisement{
 		Typ__:    BotCommandsAdvertisementTyp_PUBLIC,
@@ -1044,6 +1073,13 @@ func NewRemoteBotCommandsAdvertisementWithTlfidConvs(v RemoteBotCommandsAdvertis
 	}
 }
 
+func NewRemoteBotCommandsAdvertisementWithConv(v RemoteBotCommandsAdvertisementConv) RemoteBotCommandsAdvertisement {
+	return RemoteBotCommandsAdvertisement{
+		Typ__:  BotCommandsAdvertisementTyp_CONV,
+		Conv__: &v,
+	}
+}
+
 func (o RemoteBotCommandsAdvertisement) DeepCopy() RemoteBotCommandsAdvertisement {
 	return RemoteBotCommandsAdvertisement{
 		Typ__: o.Typ__.DeepCopy(),
@@ -1068,6 +1104,13 @@ func (o RemoteBotCommandsAdvertisement) DeepCopy() RemoteBotCommandsAdvertisemen
 			tmp := (*x).DeepCopy()
 			return &tmp
 		})(o.TlfidConvs__),
+		Conv__: (func(x *RemoteBotCommandsAdvertisementConv) *RemoteBotCommandsAdvertisementConv {
+			if x == nil {
+				return nil
+			}
+			tmp := (*x).DeepCopy()
+			return &tmp
+		})(o.Conv__),
 	}
 }
 
diff --git a/types/chat1/unfurl.go b/types/chat1/unfurl.go
index b51bd76..eeae860 100644
--- a/types/chat1/unfurl.go
+++ b/types/chat1/unfurl.go
@@ -1,12 +1,13 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/chat1/unfurl.avdl
+//   Input file: ../../../../../../client/protocol/avdl/chat1/unfurl.avdl
 
 package chat1
 
 import (
-	gregor1 "samhofi.us/x/keybase/v2/types/gregor1"
 	"errors"
 	"fmt"
+
+	gregor1 "samhofi.us/x/keybase/v2/types/gregor1"
 )
 
 type UnfurlType int
diff --git a/types/gregor1/auth.go b/types/gregor1/auth.go
index 3da2500..a7e3787 100644
--- a/types/gregor1/auth.go
+++ b/types/gregor1/auth.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/gregor1/auth.avdl
+//   Input file: ../../../../../../client/protocol/avdl/gregor1/auth.avdl
 
 package gregor1
 
diff --git a/types/gregor1/auth_internal.go b/types/gregor1/auth_internal.go
index 3a0376c..becea67 100644
--- a/types/gregor1/auth_internal.go
+++ b/types/gregor1/auth_internal.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/gregor1/auth_internal.avdl
+//   Input file: ../../../../../../client/protocol/avdl/gregor1/auth_internal.avdl
 
 package gregor1
diff --git a/types/gregor1/auth_update.go b/types/gregor1/auth_update.go
index 74fce37..cfd4826 100644
--- a/types/gregor1/auth_update.go
+++ b/types/gregor1/auth_update.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/gregor1/auth_update.avdl
+//   Input file: ../../../../../../client/protocol/avdl/gregor1/auth_update.avdl
 
 package gregor1
diff --git a/types/gregor1/common.go b/types/gregor1/common.go
index 27ba51d..ab3bf5e 100644
--- a/types/gregor1/common.go
+++ b/types/gregor1/common.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/gregor1/common.avdl
+//   Input file: ../../../../../../client/protocol/avdl/gregor1/common.avdl
 
 package gregor1
 
diff --git a/types/gregor1/incoming.go b/types/gregor1/incoming.go
index 153cc16..67361a1 100644
--- a/types/gregor1/incoming.go
+++ b/types/gregor1/incoming.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/gregor1/incoming.avdl
+//   Input file: ../../../../../../client/protocol/avdl/gregor1/incoming.avdl
 
 package gregor1
 
diff --git a/types/gregor1/outgoing.go b/types/gregor1/outgoing.go
index 685ece4..1de20f0 100644
--- a/types/gregor1/outgoing.go
+++ b/types/gregor1/outgoing.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/gregor1/outgoing.avdl
+//   Input file: ../../../../../../client/protocol/avdl/gregor1/outgoing.avdl
 
 package gregor1
diff --git a/types/gregor1/remind.go b/types/gregor1/remind.go
index b949c54..75573ed 100644
--- a/types/gregor1/remind.go
+++ b/types/gregor1/remind.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/gregor1/remind.avdl
+//   Input file: ../../../../../../client/protocol/avdl/gregor1/remind.avdl
 
 package gregor1
diff --git a/types/keybase1/account.go b/types/keybase1/account.go
index f26f967..233b037 100644
--- a/types/keybase1/account.go
+++ b/types/keybase1/account.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/account.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/account.avdl
 
 package keybase1
 
diff --git a/types/keybase1/airdrop.go b/types/keybase1/airdrop.go
index ec00de3..7d639a3 100644
--- a/types/keybase1/airdrop.go
+++ b/types/keybase1/airdrop.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/airdrop.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/airdrop.avdl
 
 package keybase1
 
diff --git a/types/keybase1/apiserver.go b/types/keybase1/apiserver.go
index 8e77353..1cf18f9 100644
--- a/types/keybase1/apiserver.go
+++ b/types/keybase1/apiserver.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/apiserver.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/apiserver.avdl
 
 package keybase1
 
diff --git a/types/keybase1/appstate.go b/types/keybase1/appstate.go
index 52478e3..ded73e5 100644
--- a/types/keybase1/appstate.go
+++ b/types/keybase1/appstate.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/appstate.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/appstate.avdl
 
 package keybase1
 
diff --git a/types/keybase1/audit.go b/types/keybase1/audit.go
index 1a4c722..5362e7a 100644
--- a/types/keybase1/audit.go
+++ b/types/keybase1/audit.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/audit.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/audit.avdl
 
 package keybase1
 
diff --git a/types/keybase1/avatars.go b/types/keybase1/avatars.go
index 9e78e2f..44cf663 100644
--- a/types/keybase1/avatars.go
+++ b/types/keybase1/avatars.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/avatars.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/avatars.avdl
 
 package keybase1
 
diff --git a/types/keybase1/backend_common.go b/types/keybase1/backend_common.go
index ed83acf..d5f00c6 100644
--- a/types/keybase1/backend_common.go
+++ b/types/keybase1/backend_common.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/backend_common.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/backend_common.avdl
 
 package keybase1
 
diff --git a/types/keybase1/badger.go b/types/keybase1/badger.go
index b260435..fc01501 100644
--- a/types/keybase1/badger.go
+++ b/types/keybase1/badger.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/badger.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/badger.avdl
 
 package keybase1
diff --git a/types/keybase1/block.go b/types/keybase1/block.go
index 0478f3b..015748c 100644
--- a/types/keybase1/block.go
+++ b/types/keybase1/block.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/block.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/block.avdl
 
 package keybase1
 
diff --git a/types/keybase1/bot.go b/types/keybase1/bot.go
index 8b9306f..5475ae4 100644
--- a/types/keybase1/bot.go
+++ b/types/keybase1/bot.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/bot.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/bot.avdl
 
 package keybase1
 
diff --git a/types/keybase1/btc.go b/types/keybase1/btc.go
index f54533b..5de066e 100644
--- a/types/keybase1/btc.go
+++ b/types/keybase1/btc.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/btc.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/btc.avdl
 
 package keybase1
diff --git a/types/keybase1/common.go b/types/keybase1/common.go
index 4a26a95..42092ab 100644
--- a/types/keybase1/common.go
+++ b/types/keybase1/common.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/common.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/common.avdl
 
 package keybase1
 
@@ -1074,8 +1074,9 @@ func (e OfflineAvailability) String() string {
 }
 
 type UserReacji struct {
-	Name       string  `codec:"name" json:"name"`
-	CustomAddr *string `codec:"customAddr,omitempty" json:"customAddr,omitempty"`
+	Name             string  `codec:"name" json:"name"`
+	CustomAddr       *string `codec:"customAddr,omitempty" json:"customAddr,omitempty"`
+	CustomAddrNoAnim *string `codec:"customAddrNoAnim,omitempty" json:"customAddrNoAnim,omitempty"`
 }
 
 func (o UserReacji) DeepCopy() UserReacji {
@@ -1088,13 +1089,52 @@ func (o UserReacji) DeepCopy() UserReacji {
 			tmp := (*x)
 			return &tmp
 		})(o.CustomAddr),
+		CustomAddrNoAnim: (func(x *string) *string {
+			if x == nil {
+				return nil
+			}
+			tmp := (*x)
+			return &tmp
+		})(o.CustomAddrNoAnim),
 	}
 }
 
 type ReacjiSkinTone int
 
-func (o ReacjiSkinTone) DeepCopy() ReacjiSkinTone {
-	return o
+const (
+	ReacjiSkinTone_NONE      ReacjiSkinTone = 0
+	ReacjiSkinTone_SKINTONE1 ReacjiSkinTone = 1
+	ReacjiSkinTone_SKINTONE2 ReacjiSkinTone = 2
+	ReacjiSkinTone_SKINTONE3 ReacjiSkinTone = 3
+	ReacjiSkinTone_SKINTONE4 ReacjiSkinTone = 4
+	ReacjiSkinTone_SKINTONE5 ReacjiSkinTone = 5
+)
+
+func (o ReacjiSkinTone) DeepCopy() ReacjiSkinTone { return o }
+
+var ReacjiSkinToneMap = map[string]ReacjiSkinTone{
+	"NONE":      0,
+	"SKINTONE1": 1,
+	"SKINTONE2": 2,
+	"SKINTONE3": 3,
+	"SKINTONE4": 4,
+	"SKINTONE5": 5,
+}
+
+var ReacjiSkinToneRevMap = map[ReacjiSkinTone]string{
+	0: "NONE",
+	1: "SKINTONE1",
+	2: "SKINTONE2",
+	3: "SKINTONE3",
+	4: "SKINTONE4",
+	5: "SKINTONE5",
+}
+
+func (e ReacjiSkinTone) String() string {
+	if v, ok := ReacjiSkinToneRevMap[e]; ok {
+		return v
+	}
+	return fmt.Sprintf("%v", int(e))
 }
 
 type UserReacjis struct {
@@ -1153,13 +1193,3 @@ func (e WotStatusType) String() string {
 	}
 	return fmt.Sprintf("%v", int(e))
 }
-
-type GenericError struct {
-	Message string `codec:"message" json:"message"`
-}
-
-func (o GenericError) DeepCopy() GenericError {
-	return GenericError{
-		Message: o.Message,
-	}
-}
diff --git a/types/keybase1/config.go b/types/keybase1/config.go
index a94aff5..a6d0fc7 100644
--- a/types/keybase1/config.go
+++ b/types/keybase1/config.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/config.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/config.avdl
 
 package keybase1
 
diff --git a/types/keybase1/constants.go b/types/keybase1/constants.go
index 8f34d2e..0f3fe7f 100644
--- a/types/keybase1/constants.go
+++ b/types/keybase1/constants.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/constants.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/constants.avdl
 
 package keybase1
 
diff --git a/types/keybase1/contacts.go b/types/keybase1/contacts.go
index 6853945..9c6f1e3 100644
--- a/types/keybase1/contacts.go
+++ b/types/keybase1/contacts.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/contacts.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/contacts.avdl
 
 package keybase1
 
diff --git a/types/keybase1/crypto.go b/types/keybase1/crypto.go
index 3a492fa..4766885 100644
--- a/types/keybase1/crypto.go
+++ b/types/keybase1/crypto.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/crypto.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/crypto.avdl
 
 package keybase1
 
diff --git a/types/keybase1/cryptocurrency.go b/types/keybase1/cryptocurrency.go
index 477357e..d3578ff 100644
--- a/types/keybase1/cryptocurrency.go
+++ b/types/keybase1/cryptocurrency.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/cryptocurrency.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/cryptocurrency.avdl
 
 package keybase1
 
diff --git a/types/keybase1/ctl.go b/types/keybase1/ctl.go
index 1621930..8470d39 100644
--- a/types/keybase1/ctl.go
+++ b/types/keybase1/ctl.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/ctl.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/ctl.avdl
 
 package keybase1
 
diff --git a/types/keybase1/debugging.go b/types/keybase1/debugging.go
index 220cd12..a01ae3a 100644
--- a/types/keybase1/debugging.go
+++ b/types/keybase1/debugging.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/debugging.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/debugging.avdl
 
 package keybase1
 
diff --git a/types/keybase1/delegate_ui_ctl.go b/types/keybase1/delegate_ui_ctl.go
index 527d6fb..2476865 100644
--- a/types/keybase1/delegate_ui_ctl.go
+++ b/types/keybase1/delegate_ui_ctl.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/delegate_ui_ctl.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/delegate_ui_ctl.avdl
 
 package keybase1
diff --git a/types/keybase1/device.go b/types/keybase1/device.go
index ada7469..1e0e6ba 100644
--- a/types/keybase1/device.go
+++ b/types/keybase1/device.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/device.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/device.avdl
 
 package keybase1
 
diff --git a/types/keybase1/emails.go b/types/keybase1/emails.go
index 4fddd5d..1abd3bc 100644
--- a/types/keybase1/emails.go
+++ b/types/keybase1/emails.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/emails.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/emails.avdl
 
 package keybase1
 
diff --git a/types/keybase1/ephemeral.go b/types/keybase1/ephemeral.go
index def4172..9582a8d 100644
--- a/types/keybase1/ephemeral.go
+++ b/types/keybase1/ephemeral.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/ephemeral.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/ephemeral.avdl
 
 package keybase1
 
diff --git a/types/keybase1/favorite.go b/types/keybase1/favorite.go
index 6f74e8d..863957d 100644
--- a/types/keybase1/favorite.go
+++ b/types/keybase1/favorite.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/favorite.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/favorite.avdl
 
 package keybase1
 
diff --git a/types/keybase1/featured_bot.go b/types/keybase1/featured_bot.go
index 25a396e..86708c0 100644
--- a/types/keybase1/featured_bot.go
+++ b/types/keybase1/featured_bot.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/featured_bot.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/featured_bot.avdl
 
 package keybase1
 
diff --git a/types/keybase1/fs.go b/types/keybase1/fs.go
index ee2bdc1..44a859d 100644
--- a/types/keybase1/fs.go
+++ b/types/keybase1/fs.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/fs.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/fs.avdl
 
 package keybase1
 
diff --git a/types/keybase1/git.go b/types/keybase1/git.go
index f228355..5cea47e 100644
--- a/types/keybase1/git.go
+++ b/types/keybase1/git.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/git.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/git.avdl
 
 package keybase1
 
diff --git a/types/keybase1/gpg_common.go b/types/keybase1/gpg_common.go
index d351b2b..c320e78 100644
--- a/types/keybase1/gpg_common.go
+++ b/types/keybase1/gpg_common.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/gpg_common.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/gpg_common.avdl
 
 package keybase1
 
diff --git a/types/keybase1/gpg_ui.go b/types/keybase1/gpg_ui.go
index ca7b6b5..2a3e5bf 100644
--- a/types/keybase1/gpg_ui.go
+++ b/types/keybase1/gpg_ui.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/gpg_ui.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/gpg_ui.avdl
 
 package keybase1
 
diff --git a/types/keybase1/gregor.go b/types/keybase1/gregor.go
index c1a1527..7916c65 100644
--- a/types/keybase1/gregor.go
+++ b/types/keybase1/gregor.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/gregor.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/gregor.avdl
 
 package keybase1
diff --git a/types/keybase1/gregor_ui.go b/types/keybase1/gregor_ui.go
index 5d9ce81..938f73e 100644
--- a/types/keybase1/gregor_ui.go
+++ b/types/keybase1/gregor_ui.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/gregor_ui.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/gregor_ui.avdl
 
 package keybase1
 
diff --git a/types/keybase1/home.go b/types/keybase1/home.go
index ad9ddf8..dbb4f47 100644
--- a/types/keybase1/home.go
+++ b/types/keybase1/home.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/home.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/home.avdl
 
 package keybase1
 
@@ -298,19 +298,19 @@ const (
 	HomeScreenTodoType_PROOF                   HomeScreenTodoType = 2
 	HomeScreenTodoType_DEVICE                  HomeScreenTodoType = 3
 	HomeScreenTodoType_FOLLOW                  HomeScreenTodoType = 4
-	HomeScreenTodoType_CHAT                    HomeScreenTodoType = 5
 	HomeScreenTodoType_PAPERKEY                HomeScreenTodoType = 6
 	HomeScreenTodoType_TEAM                    HomeScreenTodoType = 7
 	HomeScreenTodoType_FOLDER                  HomeScreenTodoType = 8
 	HomeScreenTodoType_GIT_REPO                HomeScreenTodoType = 9
 	HomeScreenTodoType_TEAM_SHOWCASE           HomeScreenTodoType = 10
-	HomeScreenTodoType_AVATAR_USER             HomeScreenTodoType = 11
 	HomeScreenTodoType_AVATAR_TEAM             HomeScreenTodoType = 12
 	HomeScreenTodoType_ADD_PHONE_NUMBER        HomeScreenTodoType = 18
 	HomeScreenTodoType_VERIFY_ALL_PHONE_NUMBER HomeScreenTodoType = 19
 	HomeScreenTodoType_VERIFY_ALL_EMAIL        HomeScreenTodoType = 20
 	HomeScreenTodoType_LEGACY_EMAIL_VISIBILITY HomeScreenTodoType = 21
 	HomeScreenTodoType_ADD_EMAIL               HomeScreenTodoType = 22
+	HomeScreenTodoType_AVATAR_USER             HomeScreenTodoType = 23
+	HomeScreenTodoType_CHAT                    HomeScreenTodoType = 24
 	HomeScreenTodoType_ANNONCEMENT_PLACEHOLDER HomeScreenTodoType = 10000
 )
 
@@ -322,19 +322,19 @@ var HomeScreenTodoTypeMap = map[string]HomeScreenTodoType{
 	"PROOF":                   2,
 	"DEVICE":                  3,
 	"FOLLOW":                  4,
-	"CHAT":                    5,
 	"PAPERKEY":                6,
 	"TEAM":                    7,
 	"FOLDER":                  8,
 	"GIT_REPO":                9,
 	"TEAM_SHOWCASE":           10,
-	"AVATAR_USER":             11,
 	"AVATAR_TEAM":             12,
 	"ADD_PHONE_NUMBER":        18,
 	"VERIFY_ALL_PHONE_NUMBER": 19,
 	"VERIFY_ALL_EMAIL":        20,
 	"LEGACY_EMAIL_VISIBILITY": 21,
 	"ADD_EMAIL":               22,
+	"AVATAR_USER":             23,
+	"CHAT":                    24,
 	"ANNONCEMENT_PLACEHOLDER": 10000,
 }
 
@@ -344,19 +344,19 @@ var HomeScreenTodoTypeRevMap = map[HomeScreenTodoType]string{
 	2:     "PROOF",
 	3:     "DEVICE",
 	4:     "FOLLOW",
-	5:     "CHAT",
 	6:     "PAPERKEY",
 	7:     "TEAM",
 	8:     "FOLDER",
 	9:     "GIT_REPO",
 	10:    "TEAM_SHOWCASE",
-	11:    "AVATAR_USER",
 	12:    "AVATAR_TEAM",
 	18:    "ADD_PHONE_NUMBER",
 	19:    "VERIFY_ALL_PHONE_NUMBER",
 	20:    "VERIFY_ALL_EMAIL",
 	21:    "LEGACY_EMAIL_VISIBILITY",
 	22:    "ADD_EMAIL",
+	23:    "AVATAR_USER",
+	24:    "CHAT",
 	10000: "ANNONCEMENT_PLACEHOLDER",
 }
 
diff --git a/types/keybase1/home_ui.go b/types/keybase1/home_ui.go
index a7671a4..0342db1 100644
--- a/types/keybase1/home_ui.go
+++ b/types/keybase1/home_ui.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/home_ui.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/home_ui.avdl
 
 package keybase1
diff --git a/types/keybase1/identify.go b/types/keybase1/identify.go
index 3a81019..aa8b30b 100644
--- a/types/keybase1/identify.go
+++ b/types/keybase1/identify.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/identify.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/identify.avdl
 
 package keybase1
 
diff --git a/types/keybase1/identify3.go b/types/keybase1/identify3.go
index af462f3..74c7963 100644
--- a/types/keybase1/identify3.go
+++ b/types/keybase1/identify3.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/identify3.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/identify3.avdl
 
 package keybase1
diff --git a/types/keybase1/identify3_common.go b/types/keybase1/identify3_common.go
index 78b5377..1c094e4 100644
--- a/types/keybase1/identify3_common.go
+++ b/types/keybase1/identify3_common.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/identify3_common.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/identify3_common.avdl
 
 package keybase1
 
diff --git a/types/keybase1/identify3_ui.go b/types/keybase1/identify3_ui.go
index f12d5ca..dd8414a 100644
--- a/types/keybase1/identify3_ui.go
+++ b/types/keybase1/identify3_ui.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/identify3_ui.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/identify3_ui.avdl
 
 package keybase1
 
diff --git a/types/keybase1/identify_common.go b/types/keybase1/identify_common.go
index bd1ff20..b0c7002 100644
--- a/types/keybase1/identify_common.go
+++ b/types/keybase1/identify_common.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/identify_common.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/identify_common.avdl
 
 package keybase1
 
diff --git a/types/keybase1/identify_ui.go b/types/keybase1/identify_ui.go
index 2cfd290..a0d5a93 100644
--- a/types/keybase1/identify_ui.go
+++ b/types/keybase1/identify_ui.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/identify_ui.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/identify_ui.avdl
 
 package keybase1
 
diff --git a/types/keybase1/implicit_team_migration.go b/types/keybase1/implicit_team_migration.go
index 703ac01..eadac57 100644
--- a/types/keybase1/implicit_team_migration.go
+++ b/types/keybase1/implicit_team_migration.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/implicit_team_migration.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/implicit_team_migration.avdl
 
 package keybase1
diff --git a/types/keybase1/incoming-share.go b/types/keybase1/incoming-share.go
index a4c1760..543327e 100644
--- a/types/keybase1/incoming-share.go
+++ b/types/keybase1/incoming-share.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/incoming-share.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/incoming-share.avdl
 
 package keybase1
 
@@ -41,8 +41,8 @@ func (e IncomingShareType) String() string {
 
 type IncomingShareItem struct {
 	Type          IncomingShareType `codec:"type" json:"type"`
-	OriginalPath  string            `codec:"originalPath" json:"originalPath"`
-	OriginalSize  int               `codec:"originalSize" json:"originalSize"`
+	OriginalPath  *string           `codec:"originalPath,omitempty" json:"originalPath,omitempty"`
+	OriginalSize  *int              `codec:"originalSize,omitempty" json:"originalSize,omitempty"`
 	ScaledPath    *string           `codec:"scaledPath,omitempty" json:"scaledPath,omitempty"`
 	ScaledSize    *int              `codec:"scaledSize,omitempty" json:"scaledSize,omitempty"`
 	ThumbnailPath *string           `codec:"thumbnailPath,omitempty" json:"thumbnailPath,omitempty"`
@@ -51,9 +51,21 @@ type IncomingShareItem struct {
 
 func (o IncomingShareItem) DeepCopy() IncomingShareItem {
 	return IncomingShareItem{
-		Type:         o.Type.DeepCopy(),
-		OriginalPath: o.OriginalPath,
-		OriginalSize: o.OriginalSize,
+		Type: o.Type.DeepCopy(),
+		OriginalPath: (func(x *string) *string {
+			if x == nil {
+				return nil
+			}
+			tmp := (*x)
+			return &tmp
+		})(o.OriginalPath),
+		OriginalSize: (func(x *int) *int {
+			if x == nil {
+				return nil
+			}
+			tmp := (*x)
+			return &tmp
+		})(o.OriginalSize),
 		ScaledPath: (func(x *string) *string {
 			if x == nil {
 				return nil
diff --git a/types/keybase1/install.go b/types/keybase1/install.go
index 2b31fd3..e3374d6 100644
--- a/types/keybase1/install.go
+++ b/types/keybase1/install.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/install.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/install.avdl
 
 package keybase1
 
diff --git a/types/keybase1/invite_friends.go b/types/keybase1/invite_friends.go
index 0470a74..f314349 100644
--- a/types/keybase1/invite_friends.go
+++ b/types/keybase1/invite_friends.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/invite_friends.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/invite_friends.avdl
 
 package keybase1
 
@@ -8,6 +8,7 @@ type InviteCounts struct {
 	PercentageChange float64 `codec:"percentageChange" json:"percentageChange"`
 	ShowNumInvites   bool    `codec:"showNumInvites" json:"showNumInvites"`
 	ShowFire         bool    `codec:"showFire" json:"showFire"`
+	TooltipMarkdown  string  `codec:"tooltipMarkdown" json:"tooltipMarkdown"`
 }
 
 func (o InviteCounts) DeepCopy() InviteCounts {
@@ -16,6 +17,7 @@ func (o InviteCounts) DeepCopy() InviteCounts {
 		PercentageChange: o.PercentageChange,
 		ShowNumInvites:   o.ShowNumInvites,
 		ShowFire:         o.ShowFire,
+		TooltipMarkdown:  o.TooltipMarkdown,
 	}
 }
 
diff --git a/types/keybase1/kbfs.go b/types/keybase1/kbfs.go
index b32228a..8dd1538 100644
--- a/types/keybase1/kbfs.go
+++ b/types/keybase1/kbfs.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/kbfs.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/kbfs.avdl
 
 package keybase1
 
diff --git a/types/keybase1/kbfs_common.go b/types/keybase1/kbfs_common.go
index 682044f..77582e2 100644
--- a/types/keybase1/kbfs_common.go
+++ b/types/keybase1/kbfs_common.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/kbfs_common.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/kbfs_common.avdl
 
 package keybase1
 
diff --git a/types/keybase1/kbfs_git.go b/types/keybase1/kbfs_git.go
index a9e81d8..96c1bc2 100644
--- a/types/keybase1/kbfs_git.go
+++ b/types/keybase1/kbfs_git.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/kbfs_git.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/kbfs_git.avdl
 
 package keybase1
 
diff --git a/types/keybase1/kbfsmount.go b/types/keybase1/kbfsmount.go
index d9d727f..4b4db5f 100644
--- a/types/keybase1/kbfsmount.go
+++ b/types/keybase1/kbfsmount.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/kbfsmount.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/kbfsmount.avdl
 
 package keybase1
diff --git a/types/keybase1/kex2provisionee.go b/types/keybase1/kex2provisionee.go
index 1dc8010..9f771d5 100644
--- a/types/keybase1/kex2provisionee.go
+++ b/types/keybase1/kex2provisionee.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/kex2provisionee.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/kex2provisionee.avdl
 
 package keybase1
 
diff --git a/types/keybase1/kex2provisionee2.go b/types/keybase1/kex2provisionee2.go
index 148c8fa..444afe6 100644
--- a/types/keybase1/kex2provisionee2.go
+++ b/types/keybase1/kex2provisionee2.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/kex2provisionee2.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/kex2provisionee2.avdl
 
 package keybase1
 
diff --git a/types/keybase1/kex2provisioner.go b/types/keybase1/kex2provisioner.go
index e24d4e8..f430212 100644
--- a/types/keybase1/kex2provisioner.go
+++ b/types/keybase1/kex2provisioner.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/kex2provisioner.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/kex2provisioner.avdl
 
 package keybase1
diff --git a/types/keybase1/kvstore.go b/types/keybase1/kvstore.go
index cbb8d94..1dde1f4 100644
--- a/types/keybase1/kvstore.go
+++ b/types/keybase1/kvstore.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/kvstore.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/kvstore.avdl
 
 package keybase1
 
diff --git a/types/keybase1/log.go b/types/keybase1/log.go
index 2874c1e..b71feaa 100644
--- a/types/keybase1/log.go
+++ b/types/keybase1/log.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/log.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/log.avdl
 
 package keybase1
diff --git a/types/keybase1/log_ui.go b/types/keybase1/log_ui.go
index 39bd218..51a245b 100644
--- a/types/keybase1/log_ui.go
+++ b/types/keybase1/log_ui.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/log_ui.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/log_ui.avdl
 
 package keybase1
diff --git a/types/keybase1/login.go b/types/keybase1/login.go
index 86e383e..93547d5 100644
--- a/types/keybase1/login.go
+++ b/types/keybase1/login.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/login.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/login.avdl
 
 package keybase1
 
diff --git a/types/keybase1/login_ui.go b/types/keybase1/login_ui.go
index 124ff2b..25539e6 100644
--- a/types/keybase1/login_ui.go
+++ b/types/keybase1/login_ui.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/login_ui.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/login_ui.avdl
 
 package keybase1
 
diff --git a/types/keybase1/logsend.go b/types/keybase1/logsend.go
index 55df5fb..c63fa99 100644
--- a/types/keybase1/logsend.go
+++ b/types/keybase1/logsend.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/logsend.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/logsend.avdl
 
 package keybase1
diff --git a/types/keybase1/merkle.go b/types/keybase1/merkle.go
index f8c4320..9b5b625 100644
--- a/types/keybase1/merkle.go
+++ b/types/keybase1/merkle.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/merkle.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/merkle.avdl
 
 package keybase1
 
diff --git a/types/keybase1/merkle_store.go b/types/keybase1/merkle_store.go
index a8ea009..86c9728 100644
--- a/types/keybase1/merkle_store.go
+++ b/types/keybase1/merkle_store.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/merkle_store.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/merkle_store.avdl
 
 package keybase1
 
diff --git a/types/keybase1/metadata.go b/types/keybase1/metadata.go
index 1dc761f..6784d17 100644
--- a/types/keybase1/metadata.go
+++ b/types/keybase1/metadata.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/metadata.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/metadata.avdl
 
 package keybase1
 
diff --git a/types/keybase1/metadata_update.go b/types/keybase1/metadata_update.go
index 85d49c8..efdbd94 100644
--- a/types/keybase1/metadata_update.go
+++ b/types/keybase1/metadata_update.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/metadata_update.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/metadata_update.avdl
 
 package keybase1
 
diff --git a/types/keybase1/network_stats.go b/types/keybase1/network_stats.go
index 466158a..41f00e1 100644
--- a/types/keybase1/network_stats.go
+++ b/types/keybase1/network_stats.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/network_stats.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/network_stats.avdl
 
 package keybase1
 
diff --git a/types/keybase1/notify_app.go b/types/keybase1/notify_app.go
index 64f76c7..00cf0cc 100644
--- a/types/keybase1/notify_app.go
+++ b/types/keybase1/notify_app.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_app.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_app.avdl
 
 package keybase1
diff --git a/types/keybase1/notify_audit.go b/types/keybase1/notify_audit.go
index 8a39a98..8b41e44 100644
--- a/types/keybase1/notify_audit.go
+++ b/types/keybase1/notify_audit.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_audit.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_audit.avdl
 
 package keybase1
diff --git a/types/keybase1/notify_badges.go b/types/keybase1/notify_badges.go
index cca9a7b..9330177 100644
--- a/types/keybase1/notify_badges.go
+++ b/types/keybase1/notify_badges.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_badges.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_badges.avdl
 
 package keybase1
 
diff --git a/types/keybase1/notify_can_user_perform.go b/types/keybase1/notify_can_user_perform.go
index 92be0aa..6d709ea 100644
--- a/types/keybase1/notify_can_user_perform.go
+++ b/types/keybase1/notify_can_user_perform.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_can_user_perform.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_can_user_perform.avdl
 
 package keybase1
diff --git a/types/keybase1/notify_ctl.go b/types/keybase1/notify_ctl.go
index 3078f98..a4f4872 100644
--- a/types/keybase1/notify_ctl.go
+++ b/types/keybase1/notify_ctl.go
@@ -1,74 +1,76 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_ctl.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_ctl.avdl
 
 package keybase1
 
 type NotificationChannels struct {
-	Session          bool `codec:"session" json:"session"`
-	Users            bool `codec:"users" json:"users"`
-	Kbfs             bool `codec:"kbfs" json:"kbfs"`
-	Kbfsdesktop      bool `codec:"kbfsdesktop" json:"kbfsdesktop"`
-	Kbfslegacy       bool `codec:"kbfslegacy" json:"kbfslegacy"`
-	Kbfssubscription bool `codec:"kbfssubscription" json:"kbfssubscription"`
-	Tracking         bool `codec:"tracking" json:"tracking"`
-	Favorites        bool `codec:"favorites" json:"favorites"`
-	Paperkeys        bool `codec:"paperkeys" json:"paperkeys"`
-	Keyfamily        bool `codec:"keyfamily" json:"keyfamily"`
-	Service          bool `codec:"service" json:"service"`
-	App              bool `codec:"app" json:"app"`
-	Chat             bool `codec:"chat" json:"chat"`
-	PGP              bool `codec:"pgp" json:"pgp"`
-	Kbfsrequest      bool `codec:"kbfsrequest" json:"kbfsrequest"`
-	Badges           bool `codec:"badges" json:"badges"`
-	Reachability     bool `codec:"reachability" json:"reachability"`
-	Team             bool `codec:"team" json:"team"`
-	Ephemeral        bool `codec:"ephemeral" json:"ephemeral"`
-	Teambot          bool `codec:"teambot" json:"teambot"`
-	Chatkbfsedits    bool `codec:"chatkbfsedits" json:"chatkbfsedits"`
-	Chatdev          bool `codec:"chatdev" json:"chatdev"`
-	Chatemoji        bool `codec:"chatemoji" json:"chatemoji"`
-	Chatemojicross   bool `codec:"chatemojicross" json:"chatemojicross"`
-	Deviceclone      bool `codec:"deviceclone" json:"deviceclone"`
-	Chatattachments  bool `codec:"chatattachments" json:"chatattachments"`
-	Wallet           bool `codec:"wallet" json:"wallet"`
-	Audit            bool `codec:"audit" json:"audit"`
-	Runtimestats     bool `codec:"runtimestats" json:"runtimestats"`
-	FeaturedBots     bool `codec:"featuredBots" json:"featuredBots"`
-	Saltpack         bool `codec:"saltpack" json:"saltpack"`
+	Session              bool `codec:"session" json:"session"`
+	Users                bool `codec:"users" json:"users"`
+	Kbfs                 bool `codec:"kbfs" json:"kbfs"`
+	Kbfsdesktop          bool `codec:"kbfsdesktop" json:"kbfsdesktop"`
+	Kbfslegacy           bool `codec:"kbfslegacy" json:"kbfslegacy"`
+	Kbfssubscription     bool `codec:"kbfssubscription" json:"kbfssubscription"`
+	Tracking             bool `codec:"tracking" json:"tracking"`
+	Favorites            bool `codec:"favorites" json:"favorites"`
+	Paperkeys            bool `codec:"paperkeys" json:"paperkeys"`
+	Keyfamily            bool `codec:"keyfamily" json:"keyfamily"`
+	Service              bool `codec:"service" json:"service"`
+	App                  bool `codec:"app" json:"app"`
+	Chat                 bool `codec:"chat" json:"chat"`
+	PGP                  bool `codec:"pgp" json:"pgp"`
+	Kbfsrequest          bool `codec:"kbfsrequest" json:"kbfsrequest"`
+	Badges               bool `codec:"badges" json:"badges"`
+	Reachability         bool `codec:"reachability" json:"reachability"`
+	Team                 bool `codec:"team" json:"team"`
+	Ephemeral            bool `codec:"ephemeral" json:"ephemeral"`
+	Teambot              bool `codec:"teambot" json:"teambot"`
+	Chatkbfsedits        bool `codec:"chatkbfsedits" json:"chatkbfsedits"`
+	Chatdev              bool `codec:"chatdev" json:"chatdev"`
+	Chatemoji            bool `codec:"chatemoji" json:"chatemoji"`
+	Chatemojicross       bool `codec:"chatemojicross" json:"chatemojicross"`
+	Deviceclone          bool `codec:"deviceclone" json:"deviceclone"`
+	Chatattachments      bool `codec:"chatattachments" json:"chatattachments"`
+	Wallet               bool `codec:"wallet" json:"wallet"`
+	Audit                bool `codec:"audit" json:"audit"`
+	Runtimestats         bool `codec:"runtimestats" json:"runtimestats"`
+	FeaturedBots         bool `codec:"featuredBots" json:"featuredBots"`
+	Saltpack             bool `codec:"saltpack" json:"saltpack"`
+	AllowChatNotifySkips bool `codec:"allowChatNotifySkips" json:"allowChatNotifySkips"`
 }
 
 func (o NotificationChannels) DeepCopy() NotificationChannels {
 	return NotificationChannels{
-		Session:          o.Session,
-		Users:            o.Users,
-		Kbfs:             o.Kbfs,
-		Kbfsdesktop:      o.Kbfsdesktop,
-		Kbfslegacy:       o.Kbfslegacy,
-		Kbfssubscription: o.Kbfssubscription,
-		Tracking:         o.Tracking,
-		Favorites:        o.Favorites,
-		Paperkeys:        o.Paperkeys,
-		Keyfamily:        o.Keyfamily,
-		Service:          o.Service,
-		App:              o.App,
-		Chat:             o.Chat,
-		PGP:              o.PGP,
-		Kbfsrequest:      o.Kbfsrequest,
-		Badges:           o.Badges,
-		Reachability:     o.Reachability,
-		Team:             o.Team,
-		Ephemeral:        o.Ephemeral,
-		Teambot:          o.Teambot,
-		Chatkbfsedits:    o.Chatkbfsedits,
-		Chatdev:          o.Chatdev,
-		Chatemoji:        o.Chatemoji,
-		Chatemojicross:   o.Chatemojicross,
-		Deviceclone:      o.Deviceclone,
-		Chatattachments:  o.Chatattachments,
-		Wallet:           o.Wallet,
-		Audit:            o.Audit,
-		Runtimestats:     o.Runtimestats,
-		FeaturedBots:     o.FeaturedBots,
-		Saltpack:         o.Saltpack,
+		Session:              o.Session,
+		Users:                o.Users,
+		Kbfs:                 o.Kbfs,
+		Kbfsdesktop:          o.Kbfsdesktop,
+		Kbfslegacy:           o.Kbfslegacy,
+		Kbfssubscription:     o.Kbfssubscription,
+		Tracking:             o.Tracking,
+		Favorites:            o.Favorites,
+		Paperkeys:            o.Paperkeys,
+		Keyfamily:            o.Keyfamily,
+		Service:              o.Service,
+		App:                  o.App,
+		Chat:                 o.Chat,
+		PGP:                  o.PGP,
+		Kbfsrequest:          o.Kbfsrequest,
+		Badges:               o.Badges,
+		Reachability:         o.Reachability,
+		Team:                 o.Team,
+		Ephemeral:            o.Ephemeral,
+		Teambot:              o.Teambot,
+		Chatkbfsedits:        o.Chatkbfsedits,
+		Chatdev:              o.Chatdev,
+		Chatemoji:            o.Chatemoji,
+		Chatemojicross:       o.Chatemojicross,
+		Deviceclone:          o.Deviceclone,
+		Chatattachments:      o.Chatattachments,
+		Wallet:               o.Wallet,
+		Audit:                o.Audit,
+		Runtimestats:         o.Runtimestats,
+		FeaturedBots:         o.FeaturedBots,
+		Saltpack:             o.Saltpack,
+		AllowChatNotifySkips: o.AllowChatNotifySkips,
 	}
 }
diff --git a/types/keybase1/notify_device_clone.go b/types/keybase1/notify_device_clone.go
index 61bfa51..7883bd8 100644
--- a/types/keybase1/notify_device_clone.go
+++ b/types/keybase1/notify_device_clone.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_device_clone.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_device_clone.avdl
 
 package keybase1
diff --git a/types/keybase1/notify_email.go b/types/keybase1/notify_email.go
index 297afae..11f5a96 100644
--- a/types/keybase1/notify_email.go
+++ b/types/keybase1/notify_email.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_email.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_email.avdl
 
 package keybase1
diff --git a/types/keybase1/notify_ephemeral.go b/types/keybase1/notify_ephemeral.go
index f23a9fa..9b4e16c 100644
--- a/types/keybase1/notify_ephemeral.go
+++ b/types/keybase1/notify_ephemeral.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_ephemeral.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_ephemeral.avdl
 
 package keybase1
diff --git a/types/keybase1/notify_favorites.go b/types/keybase1/notify_favorites.go
index 5a30b97..dc1f629 100644
--- a/types/keybase1/notify_favorites.go
+++ b/types/keybase1/notify_favorites.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_favorites.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_favorites.avdl
 
 package keybase1
diff --git a/types/keybase1/notify_featuredbots.go b/types/keybase1/notify_featuredbots.go
index ac43c6b..d56069d 100644
--- a/types/keybase1/notify_featuredbots.go
+++ b/types/keybase1/notify_featuredbots.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_featuredbots.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_featuredbots.avdl
 
 package keybase1
diff --git a/types/keybase1/notify_fs.go b/types/keybase1/notify_fs.go
index aadffd8..4a89d16 100644
--- a/types/keybase1/notify_fs.go
+++ b/types/keybase1/notify_fs.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_fs.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_fs.avdl
 
 package keybase1
diff --git a/types/keybase1/notify_fs_request.go b/types/keybase1/notify_fs_request.go
index a5d9259..7f2d78a 100644
--- a/types/keybase1/notify_fs_request.go
+++ b/types/keybase1/notify_fs_request.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_fs_request.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_fs_request.avdl
 
 package keybase1
diff --git a/types/keybase1/notify_invite_friends.go b/types/keybase1/notify_invite_friends.go
index ff01baa..c9d04c8 100644
--- a/types/keybase1/notify_invite_friends.go
+++ b/types/keybase1/notify_invite_friends.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_invite_friends.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_invite_friends.avdl
 
 package keybase1
diff --git a/types/keybase1/notify_keyfamily.go b/types/keybase1/notify_keyfamily.go
index 36fa67b..b31b945 100644
--- a/types/keybase1/notify_keyfamily.go
+++ b/types/keybase1/notify_keyfamily.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_keyfamily.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_keyfamily.avdl
 
 package keybase1
diff --git a/types/keybase1/notify_paperkey.go b/types/keybase1/notify_paperkey.go
index 4ea5435..0093d76 100644
--- a/types/keybase1/notify_paperkey.go
+++ b/types/keybase1/notify_paperkey.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_paperkey.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_paperkey.avdl
 
 package keybase1
diff --git a/types/keybase1/notify_pgp.go b/types/keybase1/notify_pgp.go
index 7f8a607..a77b26d 100644
--- a/types/keybase1/notify_pgp.go
+++ b/types/keybase1/notify_pgp.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_pgp.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_pgp.avdl
 
 package keybase1
diff --git a/types/keybase1/notify_phone.go b/types/keybase1/notify_phone.go
index 42c5e0f..7e91e08 100644
--- a/types/keybase1/notify_phone.go
+++ b/types/keybase1/notify_phone.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_phone.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_phone.avdl
 
 package keybase1
diff --git a/types/keybase1/notify_runtimestats.go b/types/keybase1/notify_runtimestats.go
index a877ce4..b90dcaf 100644
--- a/types/keybase1/notify_runtimestats.go
+++ b/types/keybase1/notify_runtimestats.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_runtimestats.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_runtimestats.avdl
 
 package keybase1
 
diff --git a/types/keybase1/notify_saltpack.go b/types/keybase1/notify_saltpack.go
index 8df8a8d..124cbe1 100644
--- a/types/keybase1/notify_saltpack.go
+++ b/types/keybase1/notify_saltpack.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_saltpack.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_saltpack.avdl
 
 package keybase1
 
diff --git a/types/keybase1/notify_service.go b/types/keybase1/notify_service.go
index e96d4dd..73d3b16 100644
--- a/types/keybase1/notify_service.go
+++ b/types/keybase1/notify_service.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_service.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_service.avdl
 
 package keybase1
 
diff --git a/types/keybase1/notify_session.go b/types/keybase1/notify_session.go
index 3f89041..c79d1fd 100644
--- a/types/keybase1/notify_session.go
+++ b/types/keybase1/notify_session.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_session.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_session.avdl
 
 package keybase1
diff --git a/types/keybase1/notify_team.go b/types/keybase1/notify_team.go
index b90f13e..abc7304 100644
--- a/types/keybase1/notify_team.go
+++ b/types/keybase1/notify_team.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_team.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_team.avdl
 
 package keybase1
 
diff --git a/types/keybase1/notify_teambot.go b/types/keybase1/notify_teambot.go
index 64d8242..e11e5e3 100644
--- a/types/keybase1/notify_teambot.go
+++ b/types/keybase1/notify_teambot.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_teambot.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_teambot.avdl
 
 package keybase1
diff --git a/types/keybase1/notify_tracking.go b/types/keybase1/notify_tracking.go
index ecb4a58..04c2755 100644
--- a/types/keybase1/notify_tracking.go
+++ b/types/keybase1/notify_tracking.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_tracking.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_tracking.avdl
 
 package keybase1
diff --git a/types/keybase1/notify_users.go b/types/keybase1/notify_users.go
index 10aa26b..e535052 100644
--- a/types/keybase1/notify_users.go
+++ b/types/keybase1/notify_users.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/notify_users.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/notify_users.avdl
 
 package keybase1
diff --git a/types/keybase1/os.go b/types/keybase1/os.go
index 1efd93e..66e51ba 100644
--- a/types/keybase1/os.go
+++ b/types/keybase1/os.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/os.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/os.avdl
 
 package keybase1
 
diff --git a/types/keybase1/paperprovision.go b/types/keybase1/paperprovision.go
index eafff4e..40cc755 100644
--- a/types/keybase1/paperprovision.go
+++ b/types/keybase1/paperprovision.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/paperprovision.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/paperprovision.avdl
 
 package keybase1
diff --git a/types/keybase1/passphrase_common.go b/types/keybase1/passphrase_common.go
index 1d31f46..9f2c19d 100644
--- a/types/keybase1/passphrase_common.go
+++ b/types/keybase1/passphrase_common.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/passphrase_common.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/passphrase_common.avdl
 
 package keybase1
 
diff --git a/types/keybase1/pgp.go b/types/keybase1/pgp.go
index c7025ec..adb7280 100644
--- a/types/keybase1/pgp.go
+++ b/types/keybase1/pgp.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/pgp.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/pgp.avdl
 
 package keybase1
 
diff --git a/types/keybase1/pgp_ui.go b/types/keybase1/pgp_ui.go
index 1dd3ae7..b362f6b 100644
--- a/types/keybase1/pgp_ui.go
+++ b/types/keybase1/pgp_ui.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/pgp_ui.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/pgp_ui.avdl
 
 package keybase1
diff --git a/types/keybase1/phone_numbers.go b/types/keybase1/phone_numbers.go
index 0ac2fe4..3a2b790 100644
--- a/types/keybase1/phone_numbers.go
+++ b/types/keybase1/phone_numbers.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/phone_numbers.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/phone_numbers.avdl
 
 package keybase1
 
diff --git a/types/keybase1/pprof.go b/types/keybase1/pprof.go
index 3670f9a..2879e9d 100644
--- a/types/keybase1/pprof.go
+++ b/types/keybase1/pprof.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/pprof.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/pprof.avdl
 
 package keybase1
diff --git a/types/keybase1/process.go b/types/keybase1/process.go
index 276acd6..ca8dda7 100644
--- a/types/keybase1/process.go
+++ b/types/keybase1/process.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/process.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/process.avdl
 
 package keybase1
 
diff --git a/types/keybase1/prove.go b/types/keybase1/prove.go
index 4d5d8f5..c3b09d9 100644
--- a/types/keybase1/prove.go
+++ b/types/keybase1/prove.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/prove.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/prove.avdl
 
 package keybase1
 
diff --git a/types/keybase1/prove_common.go b/types/keybase1/prove_common.go
index b53886e..7a750aa 100644
--- a/types/keybase1/prove_common.go
+++ b/types/keybase1/prove_common.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/prove_common.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/prove_common.avdl
 
 package keybase1
 
diff --git a/types/keybase1/prove_ui.go b/types/keybase1/prove_ui.go
index a9dc6a3..1bf9f2d 100644
--- a/types/keybase1/prove_ui.go
+++ b/types/keybase1/prove_ui.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/prove_ui.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/prove_ui.avdl
 
 package keybase1
 
diff --git a/types/keybase1/provision_ui.go b/types/keybase1/provision_ui.go
index af88e60..ce64227 100644
--- a/types/keybase1/provision_ui.go
+++ b/types/keybase1/provision_ui.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/provision_ui.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/provision_ui.avdl
 
 package keybase1
 
diff --git a/types/keybase1/quota.go b/types/keybase1/quota.go
index 4656fae..44cb018 100644
--- a/types/keybase1/quota.go
+++ b/types/keybase1/quota.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/quota.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/quota.avdl
 
 package keybase1
 
diff --git a/types/keybase1/reachability.go b/types/keybase1/reachability.go
index 20a8d4f..ff00657 100644
--- a/types/keybase1/reachability.go
+++ b/types/keybase1/reachability.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/reachability.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/reachability.avdl
 
 package keybase1
 
diff --git a/types/keybase1/rekey.go b/types/keybase1/rekey.go
index d5e60c4..0769d3f 100644
--- a/types/keybase1/rekey.go
+++ b/types/keybase1/rekey.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/rekey.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/rekey.avdl
 
 package keybase1
 
diff --git a/types/keybase1/rekey_ui.go b/types/keybase1/rekey_ui.go
index 8379842..5bcd318 100644
--- a/types/keybase1/rekey_ui.go
+++ b/types/keybase1/rekey_ui.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/rekey_ui.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/rekey_ui.avdl
 
 package keybase1
 
diff --git a/types/keybase1/reset.go b/types/keybase1/reset.go
index c7d28b8..003351b 100644
--- a/types/keybase1/reset.go
+++ b/types/keybase1/reset.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/reset.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/reset.avdl
 
 package keybase1
 
diff --git a/types/keybase1/revoke.go b/types/keybase1/revoke.go
index 0f7faab..85dc385 100644
--- a/types/keybase1/revoke.go
+++ b/types/keybase1/revoke.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/revoke.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/revoke.avdl
 
 package keybase1
diff --git a/types/keybase1/saltpack.go b/types/keybase1/saltpack.go
index 1a659c3..f2f1409 100644
--- a/types/keybase1/saltpack.go
+++ b/types/keybase1/saltpack.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/saltpack.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/saltpack.avdl
 
 package keybase1
 
diff --git a/types/keybase1/saltpack_ui.go b/types/keybase1/saltpack_ui.go
index 60685ec..7257228 100644
--- a/types/keybase1/saltpack_ui.go
+++ b/types/keybase1/saltpack_ui.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/saltpack_ui.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/saltpack_ui.avdl
 
 package keybase1
 
diff --git a/types/keybase1/scanproofs.go b/types/keybase1/scanproofs.go
index 61e1140..d896e63 100644
--- a/types/keybase1/scanproofs.go
+++ b/types/keybase1/scanproofs.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/scanproofs.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/scanproofs.avdl
 
 package keybase1
diff --git a/types/keybase1/secret_ui.go b/types/keybase1/secret_ui.go
index d48e8b4..fc7644c 100644
--- a/types/keybase1/secret_ui.go
+++ b/types/keybase1/secret_ui.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/secret_ui.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/secret_ui.avdl
 
 package keybase1
 
diff --git a/types/keybase1/secretkeys.go b/types/keybase1/secretkeys.go
index e7aeb75..0faf2fc 100644
--- a/types/keybase1/secretkeys.go
+++ b/types/keybase1/secretkeys.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/secretkeys.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/secretkeys.avdl
 
 package keybase1
 
diff --git a/types/keybase1/selfprovision.go b/types/keybase1/selfprovision.go
index 3a89450..95e45cb 100644
--- a/types/keybase1/selfprovision.go
+++ b/types/keybase1/selfprovision.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/selfprovision.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/selfprovision.avdl
 
 package keybase1
diff --git a/types/keybase1/session.go b/types/keybase1/session.go
index 0c13b9e..c608062 100644
--- a/types/keybase1/session.go
+++ b/types/keybase1/session.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/session.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/session.avdl
 
 package keybase1
 
diff --git a/types/keybase1/signup.go b/types/keybase1/signup.go
index fb8fa57..41e5959 100644
--- a/types/keybase1/signup.go
+++ b/types/keybase1/signup.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/signup.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/signup.avdl
 
 package keybase1
 
diff --git a/types/keybase1/sigs.go b/types/keybase1/sigs.go
index 09abc8c..b5e19af 100644
--- a/types/keybase1/sigs.go
+++ b/types/keybase1/sigs.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/sigs.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/sigs.avdl
 
 package keybase1
 
diff --git a/types/keybase1/simple_fs.go b/types/keybase1/simple_fs.go
index 88d1ac8..b00484f 100644
--- a/types/keybase1/simple_fs.go
+++ b/types/keybase1/simple_fs.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/simple_fs.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/simple_fs.avdl
 
 package keybase1
 
diff --git a/types/keybase1/stream_ui.go b/types/keybase1/stream_ui.go
index ac4f43c..d3619a1 100644
--- a/types/keybase1/stream_ui.go
+++ b/types/keybase1/stream_ui.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/stream_ui.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/stream_ui.avdl
 
 package keybase1
diff --git a/types/keybase1/teambot.go b/types/keybase1/teambot.go
index e9be663..0d55027 100644
--- a/types/keybase1/teambot.go
+++ b/types/keybase1/teambot.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/teambot.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/teambot.avdl
 
 package keybase1
 
diff --git a/types/keybase1/teams.go b/types/keybase1/teams.go
index 4275ae6..f9df025 100644
--- a/types/keybase1/teams.go
+++ b/types/keybase1/teams.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/teams.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/teams.avdl
 
 package keybase1
 
@@ -1764,18 +1764,18 @@ func (o TeamInvite) DeepCopy() TeamInvite {
 }
 
 type AnnotatedTeamInvite struct {
-	Invite          TeamInvite                        `codec:"invite" json:"invite"`
-	DisplayName     TeamInviteDisplayName             `codec:"displayName" json:"displayName"`
-	InviterUsername string                            `codec:"inviterUsername" json:"inviterUsername"`
-	InviteeUv       UserVersion                       `codec:"inviteeUv" json:"inviteeUv"`
-	TeamName        string                            `codec:"teamName" json:"teamName"`
-	Status          *TeamMemberStatus                 `codec:"status,omitempty" json:"status,omitempty"`
-	UsedInvites     []AnnotatedTeamUsedInviteLogPoint `codec:"usedInvites" json:"usedInvites"`
+	InviteMetadata       TeamInviteMetadata                `codec:"inviteMetadata" json:"inviteMetadata"`
+	DisplayName          TeamInviteDisplayName             `codec:"displayName" json:"displayName"`
+	InviterUsername      string                            `codec:"inviterUsername" json:"inviterUsername"`
+	InviteeUv            UserVersion                       `codec:"inviteeUv" json:"inviteeUv"`
+	TeamName             string                            `codec:"teamName" json:"teamName"`
+	Status               *TeamMemberStatus                 `codec:"status,omitempty" json:"status,omitempty"`
+	AnnotatedUsedInvites []AnnotatedTeamUsedInviteLogPoint `codec:"annotatedUsedInvites" json:"annotatedUsedInvites"`
 }
 
 func (o AnnotatedTeamInvite) DeepCopy() AnnotatedTeamInvite {
 	return AnnotatedTeamInvite{
-		Invite:          o.Invite.DeepCopy(),
+		InviteMetadata:  o.InviteMetadata.DeepCopy(),
 		DisplayName:     o.DisplayName.DeepCopy(),
 		InviterUsername: o.InviterUsername,
 		InviteeUv:       o.InviteeUv.DeepCopy(),
@@ -1787,7 +1787,7 @@ func (o AnnotatedTeamInvite) DeepCopy() AnnotatedTeamInvite {
 			tmp := (*x).DeepCopy()
 			return &tmp
 		})(o.Status),
-		UsedInvites: (func(x []AnnotatedTeamUsedInviteLogPoint) []AnnotatedTeamUsedInviteLogPoint {
+		AnnotatedUsedInvites: (func(x []AnnotatedTeamUsedInviteLogPoint) []AnnotatedTeamUsedInviteLogPoint {
 			if x == nil {
 				return nil
 			}
@@ -1797,7 +1797,7 @@ func (o AnnotatedTeamInvite) DeepCopy() AnnotatedTeamInvite {
 				ret[i] = vCopy
 			}
 			return ret
-		})(o.UsedInvites),
+		})(o.AnnotatedUsedInvites),
 	}
 }
 
@@ -1863,6 +1863,184 @@ func (o TeamLegacyTLFUpgradeChainInfo) DeepCopy() TeamLegacyTLFUpgradeChainInfo
 	}
 }
 
+type TeamSignatureMetadata struct {
+	SigMeta SignatureMetadata `codec:"sigMeta" json:"sigMeta"`
+	Uv      UserVersion       `codec:"uv" json:"uv"`
+}
+
+func (o TeamSignatureMetadata) DeepCopy() TeamSignatureMetadata {
+	return TeamSignatureMetadata{
+		SigMeta: o.SigMeta.DeepCopy(),
+		Uv:      o.Uv.DeepCopy(),
+	}
+}
+
+type TeamInviteMetadataCancel struct {
+	TeamSigMeta TeamSignatureMetadata `codec:"teamSigMeta" json:"teamSigMeta"`
+}
+
+func (o TeamInviteMetadataCancel) DeepCopy() TeamInviteMetadataCancel {
+	return TeamInviteMetadataCancel{
+		TeamSigMeta: o.TeamSigMeta.DeepCopy(),
+	}
+}
+
+type TeamInviteMetadataCompleted struct {
+	TeamSigMeta TeamSignatureMetadata `codec:"teamSigMeta" json:"teamSigMeta"`
+}
+
+func (o TeamInviteMetadataCompleted) DeepCopy() TeamInviteMetadataCompleted {
+	return TeamInviteMetadataCompleted{
+		TeamSigMeta: o.TeamSigMeta.DeepCopy(),
+	}
+}
+
+type TeamInviteMetadataStatusCode int
+
+const (
+	TeamInviteMetadataStatusCode_ACTIVE    TeamInviteMetadataStatusCode = 0
+	TeamInviteMetadataStatusCode_OBSOLETE  TeamInviteMetadataStatusCode = 1
+	TeamInviteMetadataStatusCode_CANCELLED TeamInviteMetadataStatusCode = 2
+	TeamInviteMetadataStatusCode_COMPLETED TeamInviteMetadataStatusCode = 3
+)
+
+func (o TeamInviteMetadataStatusCode) DeepCopy() TeamInviteMetadataStatusCode { return o }
+
+var TeamInviteMetadataStatusCodeMap = map[string]TeamInviteMetadataStatusCode{
+	"ACTIVE":    0,
+	"OBSOLETE":  1,
+	"CANCELLED": 2,
+	"COMPLETED": 3,
+}
+
+var TeamInviteMetadataStatusCodeRevMap = map[TeamInviteMetadataStatusCode]string{
+	0: "ACTIVE",
+	1: "OBSOLETE",
+	2: "CANCELLED",
+	3: "COMPLETED",
+}
+
+func (e TeamInviteMetadataStatusCode) String() string {
+	if v, ok := TeamInviteMetadataStatusCodeRevMap[e]; ok {
+		return v
+	}
+	return fmt.Sprintf("%v", int(e))
+}
+
+type TeamInviteMetadataStatus struct {
+	Code__      TeamInviteMetadataStatusCode `codec:"code" json:"code"`
+	Cancelled__ *TeamInviteMetadataCancel    `codec:"cancelled,omitempty" json:"cancelled,omitempty"`
+	Completed__ *TeamInviteMetadataCompleted `codec:"completed,omitempty" json:"completed,omitempty"`
+}
+
+func (o *TeamInviteMetadataStatus) Code() (ret TeamInviteMetadataStatusCode, err error) {
+	switch o.Code__ {
+	case TeamInviteMetadataStatusCode_CANCELLED:
+		if o.Cancelled__ == nil {
+			err = errors.New("unexpected nil value for Cancelled__")
+			return ret, err
+		}
+	case TeamInviteMetadataStatusCode_COMPLETED:
+		if o.Completed__ == nil {
+			err = errors.New("unexpected nil value for Completed__")
+			return ret, err
+		}
+	}
+	return o.Code__, nil
+}
+
+func (o TeamInviteMetadataStatus) Cancelled() (res TeamInviteMetadataCancel) {
+	if o.Code__ != TeamInviteMetadataStatusCode_CANCELLED {
+		panic("wrong case accessed")
+	}
+	if o.Cancelled__ == nil {
+		return
+	}
+	return *o.Cancelled__
+}
+
+func (o TeamInviteMetadataStatus) Completed() (res TeamInviteMetadataCompleted) {
+	if o.Code__ != TeamInviteMetadataStatusCode_COMPLETED {
+		panic("wrong case accessed")
+	}
+	if o.Completed__ == nil {
+		return
+	}
+	return *o.Completed__
+}
+
+func NewTeamInviteMetadataStatusWithActive() TeamInviteMetadataStatus {
+	return TeamInviteMetadataStatus{
+		Code__: TeamInviteMetadataStatusCode_ACTIVE,
+	}
+}
+
+func NewTeamInviteMetadataStatusWithObsolete() TeamInviteMetadataStatus {
+	return TeamInviteMetadataStatus{
+		Code__: TeamInviteMetadataStatusCode_OBSOLETE,
+	}
+}
+
+func NewTeamInviteMetadataStatusWithCancelled(v TeamInviteMetadataCancel) TeamInviteMetadataStatus {
+	return TeamInviteMetadataStatus{
+		Code__:      TeamInviteMetadataStatusCode_CANCELLED,
+		Cancelled__: &v,
+	}
+}
+
+func NewTeamInviteMetadataStatusWithCompleted(v TeamInviteMetadataCompleted) TeamInviteMetadataStatus {
+	return TeamInviteMetadataStatus{
+		Code__:      TeamInviteMetadataStatusCode_COMPLETED,
+		Completed__: &v,
+	}
+}
+
+func (o TeamInviteMetadataStatus) DeepCopy() TeamInviteMetadataStatus {
+	return TeamInviteMetadataStatus{
+		Code__: o.Code__.DeepCopy(),
+		Cancelled__: (func(x *TeamInviteMetadataCancel) *TeamInviteMetadataCancel {
+			if x == nil {
+				return nil
+			}
+			tmp := (*x).DeepCopy()
+			return &tmp
+		})(o.Cancelled__),
+		Completed__: (func(x *TeamInviteMetadataCompleted) *TeamInviteMetadataCompleted {
+			if x == nil {
+				return nil
+			}
+			tmp := (*x).DeepCopy()
+			return &tmp
+		})(o.Completed__),
+	}
+}
+
+type TeamInviteMetadata struct {
+	Invite      TeamInvite               `codec:"invite" json:"invite"`
+	TeamSigMeta TeamSignatureMetadata    `codec:"teamSigMeta" json:"teamSigMeta"`
+	Status      TeamInviteMetadataStatus `codec:"status" json:"status"`
+	UsedInvites []TeamUsedInviteLogPoint `codec:"usedInvites" json:"usedInvites"`
+}
+
+func (o TeamInviteMetadata) DeepCopy() TeamInviteMetadata {
+	return TeamInviteMetadata{
+		Invite:      o.Invite.DeepCopy(),
+		TeamSigMeta: o.TeamSigMeta.DeepCopy(),
+		Status:      o.Status.DeepCopy(),
+		UsedInvites: (func(x []TeamUsedInviteLogPoint) []TeamUsedInviteLogPoint {
+			if x == nil {
+				return nil
+			}
+			ret := make([]TeamUsedInviteLogPoint, len(x))
+			for i, v := range x {
+				vCopy := v.DeepCopy()
+				ret[i] = vCopy
+			}
+			return ret
+		})(o.UsedInvites),
+	}
+}
+
 type TeamSigChainState struct {
 	Reader                  UserVersion                                       `codec:"reader" json:"reader"`
 	Id                      TeamID                                            `codec:"id" json:"id"`
@@ -1883,9 +2061,7 @@ type TeamSigChainState struct {
 	PerTeamKeyCTime         UnixTime                                          `codec:"perTeamKeyCTime" json:"perTeamKeyCTime"`
 	LinkIDs                 map[Seqno]LinkID                                  `codec:"linkIDs" json:"linkIDs"`
 	StubbedLinks            map[Seqno]bool                                    `codec:"stubbedLinks" json:"stubbedLinks"`
-	ActiveInvites           map[TeamInviteID]TeamInvite                       `codec:"activeInvites" json:"activeInvites"`
-	ObsoleteInvites         map[TeamInviteID]TeamInvite                       `codec:"obsoleteInvites" json:"obsoleteInvites"`
-	UsedInvites             map[TeamInviteID][]TeamUsedInviteLogPoint         `codec:"usedInvites" json:"usedInvites"`
+	InviteMetadatas         map[TeamInviteID]TeamInviteMetadata               `codec:"inviteMetadatas" json:"inviteMetadatas"`
 	Open                    bool                                              `codec:"open" json:"open"`
 	OpenTeamJoinAs          TeamRole                                          `codec:"openTeamJoinAs" json:"openTeamJoinAs"`
 	Bots                    map[UserVersion]TeamBotSettings                   `codec:"bots" json:"bots"`
@@ -2007,52 +2183,18 @@ func (o TeamSigChainState) DeepCopy() TeamSigChainState {
 			}
 			return ret
 		})(o.StubbedLinks),
-		ActiveInvites: (func(x map[TeamInviteID]TeamInvite) map[TeamInviteID]TeamInvite {
+		InviteMetadatas: (func(x map[TeamInviteID]TeamInviteMetadata) map[TeamInviteID]TeamInviteMetadata {
 			if x == nil {
 				return nil
 			}
-			ret := make(map[TeamInviteID]TeamInvite, len(x))
+			ret := make(map[TeamInviteID]TeamInviteMetadata, len(x))
 			for k, v := range x {
 				kCopy := k.DeepCopy()
 				vCopy := v.DeepCopy()
 				ret[kCopy] = vCopy
 			}
 			return ret
-		})(o.ActiveInvites),
-		ObsoleteInvites: (func(x map[TeamInviteID]TeamInvite) map[TeamInviteID]TeamInvite {
-			if x == nil {
-				return nil
-			}
-			ret := make(map[TeamInviteID]TeamInvite, len(x))
-			for k, v := range x {
-				kCopy := k.DeepCopy()
-				vCopy := v.DeepCopy()
-				ret[kCopy] = vCopy
-			}
-			return ret
-		})(o.ObsoleteInvites),
-		UsedInvites: (func(x map[TeamInviteID][]TeamUsedInviteLogPoint) map[TeamInviteID][]TeamUsedInviteLogPoint {
-			if x == nil {
-				return nil
-			}
-			ret := make(map[TeamInviteID][]TeamUsedInviteLogPoint, len(x))
-			for k, v := range x {
-				kCopy := k.DeepCopy()
-				vCopy := (func(x []TeamUsedInviteLogPoint) []TeamUsedInviteLogPoint {
-					if x == nil {
-						return nil
-					}
-					ret := make([]TeamUsedInviteLogPoint, len(x))
-					for i, v := range x {
-						vCopy := v.DeepCopy()
-						ret[i] = vCopy
-					}
-					return ret
-				})(v)
-				ret[kCopy] = vCopy
-			}
-			return ret
-		})(o.UsedInvites),
+		})(o.InviteMetadatas),
 		Open:           o.Open,
 		OpenTeamJoinAs: o.OpenTeamJoinAs.DeepCopy(),
 		Bots: (func(x map[UserVersion]TeamBotSettings) map[UserVersion]TeamBotSettings {
@@ -3384,6 +3526,94 @@ func (o TeamAndMemberShowcase) DeepCopy() TeamAndMemberShowcase {
 	}
 }
 
+type TeamAvatar struct {
+	AvatarFilename string         `codec:"avatarFilename" json:"avatarFilename"`
+	Crop           *ImageCropRect `codec:"crop,omitempty" json:"crop,omitempty"`
+}
+
+func (o TeamAvatar) DeepCopy() TeamAvatar {
+	return TeamAvatar{
+		AvatarFilename: o.AvatarFilename,
+		Crop: (func(x *ImageCropRect) *ImageCropRect {
+			if x == nil {
+				return nil
+			}
+			tmp := (*x).DeepCopy()
+			return &tmp
+		})(o.Crop),
+	}
+}
+
+type TeamCreateFancyInfo struct {
+	Name               string         `codec:"name" json:"name"`
+	Description        string         `codec:"description" json:"description"`
+	JoinSubteam        bool           `codec:"joinSubteam" json:"joinSubteam"`
+	OpenSettings       TeamSettings   `codec:"openSettings" json:"openSettings"`
+	Showcase           bool           `codec:"showcase" json:"showcase"`
+	Avatar             *TeamAvatar    `codec:"avatar,omitempty" json:"avatar,omitempty"`
+	ChatChannels       []string       `codec:"chatChannels" json:"chatChannels"`
+	Subteams           []string       `codec:"subteams" json:"subteams"`
+	Users              []UserRolePair `codec:"users" json:"users"`
+	EmailInviteMessage *string        `codec:"emailInviteMessage,omitempty" json:"emailInviteMessage,omitempty"`
+}
+
+func (o TeamCreateFancyInfo) DeepCopy() TeamCreateFancyInfo {
+	return TeamCreateFancyInfo{
+		Name:         o.Name,
+		Description:  o.Description,
+		JoinSubteam:  o.JoinSubteam,
+		OpenSettings: o.OpenSettings.DeepCopy(),
+		Showcase:     o.Showcase,
+		Avatar: (func(x *TeamAvatar) *TeamAvatar {
+			if x == nil {
+				return nil
+			}
+			tmp := (*x).DeepCopy()
+			return &tmp
+		})(o.Avatar),
+		ChatChannels: (func(x []string) []string {
+			if x == nil {
+				return nil
+			}
+			ret := make([]string, len(x))
+			for i, v := range x {
+				vCopy := v
+				ret[i] = vCopy
+			}
+			return ret
+		})(o.ChatChannels),
+		Subteams: (func(x []string) []string {
+			if x == nil {
+				return nil
+			}
+			ret := make([]string, len(x))
+			for i, v := range x {
+				vCopy := v
+				ret[i] = vCopy
+			}
+			return ret
+		})(o.Subteams),
+		Users: (func(x []UserRolePair) []UserRolePair {
+			if x == nil {
+				return nil
+			}
+			ret := make([]UserRolePair, len(x))
+			for i, v := range x {
+				vCopy := v.DeepCopy()
+				ret[i] = vCopy
+			}
+			return ret
+		})(o.Users),
+		EmailInviteMessage: (func(x *string) *string {
+			if x == nil {
+				return nil
+			}
+			tmp := (*x)
+			return &tmp
+		})(o.EmailInviteMessage),
+	}
+}
+
 type UserRolePair struct {
 	Assertion   string           `codec:"assertion" json:"assertion"`
 	Role        TeamRole         `codec:"role" json:"role"`
@@ -3506,26 +3736,25 @@ func (o BulkRes) DeepCopy() BulkRes {
 
 type InviteLinkDetails struct {
 	InviteID          TeamInviteID               `codec:"inviteID" json:"inviteID"`
+	InviterResetOrDel bool                       `codec:"inviterResetOrDel" json:"inviterResetOrDel"`
 	InviterUID        UID                        `codec:"inviterUID" json:"inviterUID"`
 	InviterUsername   string                     `codec:"inviterUsername" json:"inviterUsername"`
-	InviterResetOrDel bool                       `codec:"inviterResetOrDel" json:"inviterResetOrDel"`
-	TeamID            TeamID                     `codec:"teamID" json:"teamID"`
+	IsMember          bool                       `codec:"isMember" json:"isMember"`
+	TeamAvatars       map[AvatarFormat]AvatarUrl `codec:"teamAvatars" json:"teamAvatars"`
 	TeamDesc          string                     `codec:"teamDesc" json:"teamDesc"`
+	TeamID            TeamID                     `codec:"teamID" json:"teamID"`
+	TeamIsOpen        bool                       `codec:"teamIsOpen" json:"teamIsOpen"`
 	TeamName          TeamName                   `codec:"teamName" json:"teamName"`
 	TeamNumMembers    int                        `codec:"teamNumMembers" json:"teamNumMembers"`
-	TeamAvatars       map[AvatarFormat]AvatarUrl `codec:"teamAvatars" json:"teamAvatars"`
 }
 
 func (o InviteLinkDetails) DeepCopy() InviteLinkDetails {
 	return InviteLinkDetails{
 		InviteID:          o.InviteID.DeepCopy(),
+		InviterResetOrDel: o.InviterResetOrDel,
 		InviterUID:        o.InviterUID.DeepCopy(),
 		InviterUsername:   o.InviterUsername,
-		InviterResetOrDel: o.InviterResetOrDel,
-		TeamID:            o.TeamID.DeepCopy(),
-		TeamDesc:          o.TeamDesc,
-		TeamName:          o.TeamName.DeepCopy(),
-		TeamNumMembers:    o.TeamNumMembers,
+		IsMember:          o.IsMember,
 		TeamAvatars: (func(x map[AvatarFormat]AvatarUrl) map[AvatarFormat]AvatarUrl {
 			if x == nil {
 				return nil
@@ -3538,6 +3767,11 @@ func (o InviteLinkDetails) DeepCopy() InviteLinkDetails {
 			}
 			return ret
 		})(o.TeamAvatars),
+		TeamDesc:       o.TeamDesc,
+		TeamID:         o.TeamID.DeepCopy(),
+		TeamIsOpen:     o.TeamIsOpen,
+		TeamName:       o.TeamName.DeepCopy(),
+		TeamNumMembers: o.TeamNumMembers,
 	}
 }
 
@@ -3651,10 +3885,12 @@ type TeamOperation struct {
 	ListFirst              bool `codec:"listFirst" json:"listFirst"`
 	ChangeTarsDisabled     bool `codec:"changeTarsDisabled" json:"changeTarsDisabled"`
 	DeleteChatHistory      bool `codec:"deleteChatHistory" json:"deleteChatHistory"`
+	DeleteOtherEmojis      bool `codec:"deleteOtherEmojis" json:"deleteOtherEmojis"`
 	DeleteOtherMessages    bool `codec:"deleteOtherMessages" json:"deleteOtherMessages"`
 	DeleteTeam             bool `codec:"deleteTeam" json:"deleteTeam"`
 	PinMessage             bool `codec:"pinMessage" json:"pinMessage"`
 	ManageBots             bool `codec:"manageBots" json:"manageBots"`
+	ManageEmojis           bool `codec:"manageEmojis" json:"manageEmojis"`
 }
 
 func (o TeamOperation) DeepCopy() TeamOperation {
@@ -3679,10 +3915,12 @@ func (o TeamOperation) DeepCopy() TeamOperation {
 		ListFirst:              o.ListFirst,
 		ChangeTarsDisabled:     o.ChangeTarsDisabled,
 		DeleteChatHistory:      o.DeleteChatHistory,
+		DeleteOtherEmojis:      o.DeleteOtherEmojis,
 		DeleteOtherMessages:    o.DeleteOtherMessages,
 		DeleteTeam:             o.DeleteTeam,
 		PinMessage:             o.PinMessage,
 		ManageBots:             o.ManageBots,
+		ManageEmojis:           o.ManageEmojis,
 	}
 }
 
@@ -3906,25 +4144,10 @@ func (o AnnotatedTeam) DeepCopy() AnnotatedTeam {
 	}
 }
 
-type AnnotatedSubteamMemberDetails struct {
-	TeamName TeamName          `codec:"teamName" json:"teamName"`
-	TeamID   TeamID            `codec:"teamID" json:"teamID"`
-	Details  TeamMemberDetails `codec:"details" json:"details"`
-	Role     TeamRole          `codec:"role" json:"role"`
-}
-
-func (o AnnotatedSubteamMemberDetails) DeepCopy() AnnotatedSubteamMemberDetails {
-	return AnnotatedSubteamMemberDetails{
-		TeamName: o.TeamName.DeepCopy(),
-		TeamID:   o.TeamID.DeepCopy(),
-		Details:  o.Details.DeepCopy(),
-		Role:     o.Role.DeepCopy(),
-	}
-}
-
 type TeamTreeMembershipValue struct {
 	Role     TeamRole `codec:"role" json:"role"`
 	JoinTime *Time    `codec:"joinTime,omitempty" json:"joinTime,omitempty"`
+	TeamID   TeamID   `codec:"teamID" json:"teamID"`
 }
 
 func (o TeamTreeMembershipValue) DeepCopy() TeamTreeMembershipValue {
@@ -3937,26 +4160,30 @@ func (o TeamTreeMembershipValue) DeepCopy() TeamTreeMembershipValue {
 			tmp := (*x).DeepCopy()
 			return &tmp
 		})(o.JoinTime),
+		TeamID: o.TeamID.DeepCopy(),
 	}
 }
 
 type TeamTreeMembershipStatus int
 
 const (
-	TeamTreeMembershipStatus_OK    TeamTreeMembershipStatus = 0
-	TeamTreeMembershipStatus_ERROR TeamTreeMembershipStatus = 1
+	TeamTreeMembershipStatus_OK     TeamTreeMembershipStatus = 0
+	TeamTreeMembershipStatus_ERROR  TeamTreeMembershipStatus = 1
+	TeamTreeMembershipStatus_HIDDEN TeamTreeMembershipStatus = 2
 )
 
 func (o TeamTreeMembershipStatus) DeepCopy() TeamTreeMembershipStatus { return o }
 
 var TeamTreeMembershipStatusMap = map[string]TeamTreeMembershipStatus{
-	"OK":    0,
-	"ERROR": 1,
+	"OK":     0,
+	"ERROR":  1,
+	"HIDDEN": 2,
 }
 
 var TeamTreeMembershipStatusRevMap = map[TeamTreeMembershipStatus]string{
 	0: "OK",
 	1: "ERROR",
+	2: "HIDDEN",
 }
 
 func (e TeamTreeMembershipStatus) String() string {
@@ -3966,10 +4193,24 @@ func (e TeamTreeMembershipStatus) String() string {
 	return fmt.Sprintf("%v", int(e))
 }
 
+type TeamTreeError struct {
+	Message           string `codec:"message" json:"message"`
+	WillSkipSubtree   bool   `codec:"willSkipSubtree" json:"willSkipSubtree"`
+	WillSkipAncestors bool   `codec:"willSkipAncestors" json:"willSkipAncestors"`
+}
+
+func (o TeamTreeError) DeepCopy() TeamTreeError {
+	return TeamTreeError{
+		Message:           o.Message,
+		WillSkipSubtree:   o.WillSkipSubtree,
+		WillSkipAncestors: o.WillSkipAncestors,
+	}
+}
+
 type TeamTreeMembershipResult struct {
 	S__     TeamTreeMembershipStatus `codec:"s" json:"s"`
 	Ok__    *TeamTreeMembershipValue `codec:"ok,omitempty" json:"ok,omitempty"`
-	Error__ *GenericError            `codec:"error,omitempty" json:"error,omitempty"`
+	Error__ *TeamTreeError           `codec:"error,omitempty" json:"error,omitempty"`
 }
 
 func (o *TeamTreeMembershipResult) S() (ret TeamTreeMembershipStatus, err error) {
@@ -3998,7 +4239,7 @@ func (o TeamTreeMembershipResult) Ok() (res TeamTreeMembershipValue) {
 	return *o.Ok__
 }
 
-func (o TeamTreeMembershipResult) Error() (res GenericError) {
+func (o TeamTreeMembershipResult) Error() (res TeamTreeError) {
 	if o.S__ != TeamTreeMembershipStatus_ERROR {
 		panic("wrong case accessed")
 	}
@@ -4015,13 +4256,19 @@ func NewTeamTreeMembershipResultWithOk(v TeamTreeMembershipValue) TeamTreeMember
 	}
 }
 
-func NewTeamTreeMembershipResultWithError(v GenericError) TeamTreeMembershipResult {
+func NewTeamTreeMembershipResultWithError(v TeamTreeError) TeamTreeMembershipResult {
 	return TeamTreeMembershipResult{
 		S__:     TeamTreeMembershipStatus_ERROR,
 		Error__: &v,
 	}
 }
 
+func NewTeamTreeMembershipResultWithHidden() TeamTreeMembershipResult {
+	return TeamTreeMembershipResult{
+		S__: TeamTreeMembershipStatus_HIDDEN,
+	}
+}
+
 func (o TeamTreeMembershipResult) DeepCopy() TeamTreeMembershipResult {
 	return TeamTreeMembershipResult{
 		S__: o.S__.DeepCopy(),
@@ -4032,7 +4279,7 @@ func (o TeamTreeMembershipResult) DeepCopy() TeamTreeMembershipResult {
 			tmp := (*x).DeepCopy()
 			return &tmp
 		})(o.Ok__),
-		Error__: (func(x *GenericError) *GenericError {
+		Error__: (func(x *TeamTreeError) *TeamTreeError {
 			if x == nil {
 				return nil
 			}
@@ -4043,13 +4290,45 @@ func (o TeamTreeMembershipResult) DeepCopy() TeamTreeMembershipResult {
 }
 
 type TeamTreeMembership struct {
-	TeamName TeamName                 `codec:"teamName" json:"teamName"`
-	Result   TeamTreeMembershipResult `codec:"result" json:"result"`
+	TeamName       string                   `codec:"teamName" json:"teamName"`
+	Result         TeamTreeMembershipResult `codec:"result" json:"result"`
+	TargetTeamID   TeamID                   `codec:"targetTeamID" json:"targetTeamID"`
+	TargetUsername string                   `codec:"targetUsername" json:"targetUsername"`
+	Guid           int                      `codec:"guid" json:"guid"`
 }
 
 func (o TeamTreeMembership) DeepCopy() TeamTreeMembership {
 	return TeamTreeMembership{
-		TeamName: o.TeamName.DeepCopy(),
-		Result:   o.Result.DeepCopy(),
+		TeamName:       o.TeamName,
+		Result:         o.Result.DeepCopy(),
+		TargetTeamID:   o.TargetTeamID.DeepCopy(),
+		TargetUsername: o.TargetUsername,
+		Guid:           o.Guid,
+	}
+}
+
+type TeamTreeMembershipsDoneResult struct {
+	ExpectedCount  int    `codec:"expectedCount" json:"expectedCount"`
+	TargetTeamID   TeamID `codec:"targetTeamID" json:"targetTeamID"`
+	TargetUsername string `codec:"targetUsername" json:"targetUsername"`
+	Guid           int    `codec:"guid" json:"guid"`
+}
+
+func (o TeamTreeMembershipsDoneResult) DeepCopy() TeamTreeMembershipsDoneResult {
+	return TeamTreeMembershipsDoneResult{
+		ExpectedCount:  o.ExpectedCount,
+		TargetTeamID:   o.TargetTeamID.DeepCopy(),
+		TargetUsername: o.TargetUsername,
+		Guid:           o.Guid,
+	}
+}
+
+type TeamTreeInitial struct {
+	Guid int `codec:"guid" json:"guid"`
+}
+
+func (o TeamTreeInitial) DeepCopy() TeamTreeInitial {
+	return TeamTreeInitial{
+		Guid: o.Guid,
 	}
 }
diff --git a/types/keybase1/teams_ui.go b/types/keybase1/teams_ui.go
index 2c713aa..4d7f0e1 100644
--- a/types/keybase1/teams_ui.go
+++ b/types/keybase1/teams_ui.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/teams_ui.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/teams_ui.avdl
 
 package keybase1
diff --git a/types/keybase1/teamsearch.go b/types/keybase1/teamsearch.go
index 4c49829..9b4293c 100644
--- a/types/keybase1/teamsearch.go
+++ b/types/keybase1/teamsearch.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/teamsearch.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/teamsearch.avdl
 
 package keybase1
 
diff --git a/types/keybase1/test.go b/types/keybase1/test.go
index d8d6dd8..4ef4e5d 100644
--- a/types/keybase1/test.go
+++ b/types/keybase1/test.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/test.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/test.avdl
 
 package keybase1
 
diff --git a/types/keybase1/tlf.go b/types/keybase1/tlf.go
index ec80324..6f4f91b 100644
--- a/types/keybase1/tlf.go
+++ b/types/keybase1/tlf.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/tlf.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/tlf.avdl
 
 package keybase1
diff --git a/types/keybase1/tlf_keys.go b/types/keybase1/tlf_keys.go
index 2aa0ee5..a3dd727 100644
--- a/types/keybase1/tlf_keys.go
+++ b/types/keybase1/tlf_keys.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/tlf_keys.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/tlf_keys.avdl
 
 package keybase1
 
diff --git a/types/keybase1/track.go b/types/keybase1/track.go
index 23ce167..463a7c1 100644
--- a/types/keybase1/track.go
+++ b/types/keybase1/track.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/track.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/track.avdl
 
 package keybase1
diff --git a/types/keybase1/ui.go b/types/keybase1/ui.go
index 7eb6201..7872b43 100644
--- a/types/keybase1/ui.go
+++ b/types/keybase1/ui.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/ui.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/ui.avdl
 
 package keybase1
 
diff --git a/types/keybase1/upk.go b/types/keybase1/upk.go
index 2d773e9..61fd2fe 100644
--- a/types/keybase1/upk.go
+++ b/types/keybase1/upk.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/upk.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/upk.avdl
 
 package keybase1
 
diff --git a/types/keybase1/user.go b/types/keybase1/user.go
index 04fb95e..6e530b7 100644
--- a/types/keybase1/user.go
+++ b/types/keybase1/user.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/user.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/user.avdl
 
 package keybase1
 
diff --git a/types/keybase1/usersearch.go b/types/keybase1/usersearch.go
index 9341314..95a4b07 100644
--- a/types/keybase1/usersearch.go
+++ b/types/keybase1/usersearch.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/keybase1/usersearch.avdl
+//   Input file: ../../../../../../client/protocol/avdl/keybase1/usersearch.avdl
 
 package keybase1
 
diff --git a/types/stellar1/bundle.go b/types/stellar1/bundle.go
index 2eccae2..c020401 100644
--- a/types/stellar1/bundle.go
+++ b/types/stellar1/bundle.go
@@ -1,12 +1,13 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/stellar1/bundle.avdl
+//   Input file: ../../../../../../client/protocol/avdl/stellar1/bundle.avdl
 
 package stellar1
 
 import (
-	keybase1 "samhofi.us/x/keybase/v2/types/keybase1"
 	"errors"
 	"fmt"
+
+	keybase1 "samhofi.us/x/keybase/v2/types/keybase1"
 )
 
 type BundleRevision uint64
diff --git a/types/stellar1/common.go b/types/stellar1/common.go
index 2b0ba75..7a669ac 100644
--- a/types/stellar1/common.go
+++ b/types/stellar1/common.go
@@ -1,11 +1,12 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/stellar1/common.avdl
+//   Input file: ../../../../../../client/protocol/avdl/stellar1/common.avdl
 
 package stellar1
 
 import (
-	keybase1 "samhofi.us/x/keybase/v2/types/keybase1"
 	"fmt"
+
+	keybase1 "samhofi.us/x/keybase/v2/types/keybase1"
 )
 
 type AccountID string
diff --git a/types/stellar1/gregor.go b/types/stellar1/gregor.go
index bcdf859..e69c7d1 100644
--- a/types/stellar1/gregor.go
+++ b/types/stellar1/gregor.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/stellar1/gregor.avdl
+//   Input file: ../../../../../../client/protocol/avdl/stellar1/gregor.avdl
 
 package stellar1
 
diff --git a/types/stellar1/local.go b/types/stellar1/local.go
index ec474d2..337bf87 100644
--- a/types/stellar1/local.go
+++ b/types/stellar1/local.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/stellar1/local.avdl
+//   Input file: ../../../../../../client/protocol/avdl/stellar1/local.avdl
 
 package stellar1
 
diff --git a/types/stellar1/notify.go b/types/stellar1/notify.go
index f095bf0..6a9972b 100644
--- a/types/stellar1/notify.go
+++ b/types/stellar1/notify.go
@@ -1,4 +1,4 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/stellar1/notify.avdl
+//   Input file: ../../../../../../client/protocol/avdl/stellar1/notify.avdl
 
 package stellar1
diff --git a/types/stellar1/remote.go b/types/stellar1/remote.go
index 949441b..313fe87 100644
--- a/types/stellar1/remote.go
+++ b/types/stellar1/remote.go
@@ -1,12 +1,13 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/stellar1/remote.avdl
+//   Input file: ../../../../../../client/protocol/avdl/stellar1/remote.avdl
 
 package stellar1
 
 import (
-	keybase1 "samhofi.us/x/keybase/v2/types/keybase1"
 	"errors"
 	"fmt"
+
+	keybase1 "samhofi.us/x/keybase/v2/types/keybase1"
 )
 
 type ChatConversationID string
diff --git a/types/stellar1/ui.go b/types/stellar1/ui.go
index 8decce7..102e2a0 100644
--- a/types/stellar1/ui.go
+++ b/types/stellar1/ui.go
@@ -1,5 +1,5 @@
 // Auto-generated to Go types using avdl-compiler v1.4.6 (https://github.com/keybase/node-avdl-compiler)
-//   Input file: ../client/protocol/avdl/stellar1/ui.avdl
+//   Input file: ../../../../../../client/protocol/avdl/stellar1/ui.avdl
 
 package stellar1