fix: more commands cleanup

7 files changed, 279 insertions, 245 deletions

diff --git a/packages/sdk/go/.stats.yml b/packages/sdk/go/.stats.yml
index 9f1e13803..e3713a1ca 100644
--- a/packages/sdk/go/.stats.yml
+++ b/packages/sdk/go/.stats.yml
@@ -1,4 +1,4 @@
 configured_endpoints: 36
-openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/opencode%2Fopencode-a881262c7de4ab59bdfbfc6e30a23c47dee465d7270ffb867b760b0103aff8ed.yml
-openapi_spec_hash: 7dbb6f96f5c26a25c849e50298f58586
+openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/opencode%2Fopencode-d0eaf92deaa53a25bbbc3181540ad73ed5a4aec6381ac08d8122e24318e5e455.yml
+openapi_spec_hash: 22196d859c0711e564b9538d988abda6
 config_hash: 8d85a768523cff92b85ef06c443d49fa
diff --git a/packages/sdk/go/config.go b/packages/sdk/go/config.go
index 47d2fa580..ee2cf7194 100644
--- a/packages/sdk/go/config.go
+++ b/packages/sdk/go/config.go
@@ -1655,19 +1655,25 @@ func (r ConfigShare) IsKnown() bool {
 }
 
 type KeybindsConfig struct {
+	// Next agent
+	AgentCycle string `json:"agent_cycle,required"`
+	// Previous agent
+	AgentCycleReverse string `json:"agent_cycle_reverse,required"`
+	// List agents
+	AgentList string `json:"agent_list,required"`
 	// Exit the application
 	AppExit string `json:"app_exit,required"`
 	// Show help dialog
 	AppHelp string `json:"app_help,required"`
 	// Open external editor
 	EditorOpen string `json:"editor_open,required"`
-	// Close file
+	// @deprecated Close file
 	FileClose string `json:"file_close,required"`
-	// Split/unified diff
+	// @deprecated Split/unified diff
 	FileDiffToggle string `json:"file_diff_toggle,required"`
-	// List files
+	// @deprecated Currently not available. List files
 	FileList string `json:"file_list,required"`
-	// Search file
+	// @deprecated Search file
 	FileSearch string `json:"file_search,required"`
 	// Clear input field
 	InputClear string `json:"input_clear,required"`
@@ -1689,15 +1695,15 @@ type KeybindsConfig struct {
 	MessagesHalfPageUp string `json:"messages_half_page_up,required"`
 	// Navigate to last message
 	MessagesLast string `json:"messages_last,required"`
-	// Toggle layout
+	// @deprecated Toggle layout
 	MessagesLayoutToggle string `json:"messages_layout_toggle,required"`
-	// Navigate to next message
+	// @deprecated Navigate to next message
 	MessagesNext string `json:"messages_next,required"`
 	// Scroll messages down by one page
 	MessagesPageDown string `json:"messages_page_down,required"`
 	// Scroll messages up by one page
 	MessagesPageUp string `json:"messages_page_up,required"`
-	// Navigate to previous message
+	// @deprecated Navigate to previous message
 	MessagesPrevious string `json:"messages_previous,required"`
 	// Redo message
 	MessagesRedo string `json:"messages_redo,required"`
@@ -1705,6 +1711,10 @@ type KeybindsConfig struct {
 	MessagesRevert string `json:"messages_revert,required"`
 	// Undo message
 	MessagesUndo string `json:"messages_undo,required"`
+	// Next recent model
+	ModelCycleRecent string `json:"model_cycle_recent,required"`
+	// Previous recent model
+	ModelCycleRecentReverse string `json:"model_cycle_recent_reverse,required"`
 	// List available models
 	ModelList string `json:"model_list,required"`
 	// Create/update AGENTS.md
@@ -1723,13 +1733,13 @@ type KeybindsConfig struct {
 	SessionShare string `json:"session_share,required"`
 	// Unshare current session
 	SessionUnshare string `json:"session_unshare,required"`
-	// Next agent
+	// @deprecated use agent_cycle. Next agent
 	SwitchAgent string `json:"switch_agent,required"`
-	// Previous agent
+	// @deprecated use agent_cycle_reverse. Previous agent
 	SwitchAgentReverse string `json:"switch_agent_reverse,required"`
-	// @deprecated use switch_agent. Next mode
+	// @deprecated use agent_cycle. Next mode
 	SwitchMode string `json:"switch_mode,required"`
-	// @deprecated use switch_agent_reverse. Previous mode
+	// @deprecated use agent_cycle_reverse. Previous mode
 	SwitchModeReverse string `json:"switch_mode_reverse,required"`
 	// List available themes
 	ThemeList string `json:"theme_list,required"`
@@ -1742,49 +1752,54 @@ type KeybindsConfig struct {
 
 // keybindsConfigJSON contains the JSON metadata for the struct [KeybindsConfig]
 type keybindsConfigJSON struct {
-	AppExit              apijson.Field
-	AppHelp              apijson.Field
-	EditorOpen           apijson.Field
-	FileClose            apijson.Field
-	FileDiffToggle       apijson.Field
-	FileList             apijson.Field
-	FileSearch           apijson.Field
-	InputClear           apijson.Field
-	InputNewline         apijson.Field
-	InputPaste           apijson.Field
-	InputSubmit          apijson.Field
-	Leader               apijson.Field
-	MessagesCopy         apijson.Field
-	MessagesFirst        apijson.Field
-	MessagesHalfPageDown apijson.Field
-	MessagesHalfPageUp   apijson.Field
-	MessagesLast         apijson.Field
-	MessagesLayoutToggle apijson.Field
-	MessagesNext         apijson.Field
-	MessagesPageDown     apijson.Field
-	MessagesPageUp       apijson.Field
-	MessagesPrevious     apijson.Field
-	MessagesRedo         apijson.Field
-	MessagesRevert       apijson.Field
-	MessagesUndo         apijson.Field
-	ModelList            apijson.Field
-	ProjectInit          apijson.Field
-	SessionCompact       apijson.Field
-	SessionExport        apijson.Field
-	SessionInterrupt     apijson.Field
-	SessionList          apijson.Field
-	SessionNew           apijson.Field
-	SessionShare         apijson.Field
-	SessionUnshare       apijson.Field
-	SwitchAgent          apijson.Field
-	SwitchAgentReverse   apijson.Field
-	SwitchMode           apijson.Field
-	SwitchModeReverse    apijson.Field
-	ThemeList            apijson.Field
-	ThinkingBlocks       apijson.Field
-	ToolDetails          apijson.Field
-	raw                  string
-	ExtraFields          map[string]apijson.Field
+	AgentCycle              apijson.Field
+	AgentCycleReverse       apijson.Field
+	AgentList               apijson.Field
+	AppExit                 apijson.Field
+	AppHelp                 apijson.Field
+	EditorOpen              apijson.Field
+	FileClose               apijson.Field
+	FileDiffToggle          apijson.Field
+	FileList                apijson.Field
+	FileSearch              apijson.Field
+	InputClear              apijson.Field
+	InputNewline            apijson.Field
+	InputPaste              apijson.Field
+	InputSubmit             apijson.Field
+	Leader                  apijson.Field
+	MessagesCopy            apijson.Field
+	MessagesFirst           apijson.Field
+	MessagesHalfPageDown    apijson.Field
+	MessagesHalfPageUp      apijson.Field
+	MessagesLast            apijson.Field
+	MessagesLayoutToggle    apijson.Field
+	MessagesNext            apijson.Field
+	MessagesPageDown        apijson.Field
+	MessagesPageUp          apijson.Field
+	MessagesPrevious        apijson.Field
+	MessagesRedo            apijson.Field
+	MessagesRevert          apijson.Field
+	MessagesUndo            apijson.Field
+	ModelCycleRecent        apijson.Field
+	ModelCycleRecentReverse apijson.Field
+	ModelList               apijson.Field
+	ProjectInit             apijson.Field
+	SessionCompact          apijson.Field
+	SessionExport           apijson.Field
+	SessionInterrupt        apijson.Field
+	SessionList             apijson.Field
+	SessionNew              apijson.Field
+	SessionShare            apijson.Field
+	SessionUnshare          apijson.Field
+	SwitchAgent             apijson.Field
+	SwitchAgentReverse      apijson.Field
+	SwitchMode              apijson.Field
+	SwitchModeReverse       apijson.Field
+	ThemeList               apijson.Field
+	ThinkingBlocks          apijson.Field
+	ToolDetails             apijson.Field
+	raw                     string
+	ExtraFields             map[string]apijson.Field
 }
 
 func (r *KeybindsConfig) UnmarshalJSON(data []byte) (err error) {
diff --git a/packages/sdk/go/event.go b/packages/sdk/go/event.go
index 9823cdc58..f16270806 100644
--- a/packages/sdk/go/event.go
+++ b/packages/sdk/go/event.go
@@ -54,13 +54,13 @@ type EventListResponse struct {
 	// [EventListResponseEventMessageRemovedProperties],
 	// [EventListResponseEventMessagePartUpdatedProperties],
 	// [EventListResponseEventMessagePartRemovedProperties],
-	// [EventListResponseEventStorageWriteProperties],
-	// [EventListResponseEventFileEditedProperties], [interface{}], [Permission],
+	// [EventListResponseEventStorageWriteProperties], [Permission],
 	// [EventListResponseEventPermissionRepliedProperties],
+	// [EventListResponseEventFileEditedProperties],
 	// [EventListResponseEventSessionUpdatedProperties],
 	// [EventListResponseEventSessionDeletedProperties],
 	// [EventListResponseEventSessionIdleProperties],
-	// [EventListResponseEventSessionErrorProperties],
+	// [EventListResponseEventSessionErrorProperties], [interface{}],
 	// [EventListResponseEventFileWatcherUpdatedProperties],
 	// [EventListResponseEventIdeInstalledProperties].
 	Properties interface{}           `json:"properties,required"`
@@ -100,12 +100,11 @@ func (r *EventListResponse) UnmarshalJSON(data []byte) (err error) {
 // [EventListResponseEventMessageUpdated], [EventListResponseEventMessageRemoved],
 // [EventListResponseEventMessagePartUpdated],
 // [EventListResponseEventMessagePartRemoved],
-// [EventListResponseEventStorageWrite], [EventListResponseEventFileEdited],
-// [EventListResponseEventServerConnected],
-// [EventListResponseEventPermissionUpdated],
-// [EventListResponseEventPermissionReplied],
+// [EventListResponseEventStorageWrite], [EventListResponseEventPermissionUpdated],
+// [EventListResponseEventPermissionReplied], [EventListResponseEventFileEdited],
 // [EventListResponseEventSessionUpdated], [EventListResponseEventSessionDeleted],
 // [EventListResponseEventSessionIdle], [EventListResponseEventSessionError],
+// [EventListResponseEventServerConnected],
 // [EventListResponseEventFileWatcherUpdated],
 // [EventListResponseEventIdeInstalled].
 func (r EventListResponse) AsUnion() EventListResponseUnion {
@@ -117,12 +116,11 @@ func (r EventListResponse) AsUnion() EventListResponseUnion {
 // [EventListResponseEventMessageUpdated], [EventListResponseEventMessageRemoved],
 // [EventListResponseEventMessagePartUpdated],
 // [EventListResponseEventMessagePartRemoved],
-// [EventListResponseEventStorageWrite], [EventListResponseEventFileEdited],
-// [EventListResponseEventServerConnected],
-// [EventListResponseEventPermissionUpdated],
-// [EventListResponseEventPermissionReplied],
+// [EventListResponseEventStorageWrite], [EventListResponseEventPermissionUpdated],
+// [EventListResponseEventPermissionReplied], [EventListResponseEventFileEdited],
 // [EventListResponseEventSessionUpdated], [EventListResponseEventSessionDeleted],
 // [EventListResponseEventSessionIdle], [EventListResponseEventSessionError],
+// [EventListResponseEventServerConnected],
 // [EventListResponseEventFileWatcherUpdated] or
 // [EventListResponseEventIdeInstalled].
 type EventListResponseUnion interface {
@@ -170,16 +168,6 @@ func init() {
 		},
 		apijson.UnionVariant{
 			TypeFilter:         gjson.JSON,
-			Type:               reflect.TypeOf(EventListResponseEventFileEdited{}),
-			DiscriminatorValue: "file.edited",
-		},
-		apijson.UnionVariant{
-			TypeFilter:         gjson.JSON,
-			Type:               reflect.TypeOf(EventListResponseEventServerConnected{}),
-			DiscriminatorValue: "server.connected",
-		},
-		apijson.UnionVariant{
-			TypeFilter:         gjson.JSON,
 			Type:               reflect.TypeOf(EventListResponseEventPermissionUpdated{}),
 			DiscriminatorValue: "permission.updated",
 		},
@@ -190,6 +178,11 @@ func init() {
 		},
 		apijson.UnionVariant{
 			TypeFilter:         gjson.JSON,
+			Type:               reflect.TypeOf(EventListResponseEventFileEdited{}),
+			DiscriminatorValue: "file.edited",
+		},
+		apijson.UnionVariant{
+			TypeFilter:         gjson.JSON,
 			Type:               reflect.TypeOf(EventListResponseEventSessionUpdated{}),
 			DiscriminatorValue: "session.updated",
 		},
@@ -210,6 +203,11 @@ func init() {
 		},
 		apijson.UnionVariant{
 			TypeFilter:         gjson.JSON,
+			Type:               reflect.TypeOf(EventListResponseEventServerConnected{}),
+			DiscriminatorValue: "server.connected",
+		},
+		apijson.UnionVariant{
+			TypeFilter:         gjson.JSON,
 			Type:               reflect.TypeOf(EventListResponseEventFileWatcherUpdated{}),
 			DiscriminatorValue: "file.watcher.updated",
 		},
@@ -651,105 +649,6 @@ func (r EventListResponseEventStorageWriteType) IsKnown() bool {
 	return false
 }
 
-type EventListResponseEventFileEdited struct {
-	Properties EventListResponseEventFileEditedProperties `json:"properties,required"`
-	Type       EventListResponseEventFileEditedType       `json:"type,required"`
-	JSON       eventListResponseEventFileEditedJSON       `json:"-"`
-}
-
-// eventListResponseEventFileEditedJSON contains the JSON metadata for the struct
-// [EventListResponseEventFileEdited]
-type eventListResponseEventFileEditedJSON struct {
-	Properties  apijson.Field
-	Type        apijson.Field
-	raw         string
-	ExtraFields map[string]apijson.Field
-}
-
-func (r *EventListResponseEventFileEdited) UnmarshalJSON(data []byte) (err error) {
-	return apijson.UnmarshalRoot(data, r)
-}
-
-func (r eventListResponseEventFileEditedJSON) RawJSON() string {
-	return r.raw
-}
-
-func (r EventListResponseEventFileEdited) implementsEventListResponse() {}
-
-type EventListResponseEventFileEditedProperties struct {
-	File string                                         `json:"file,required"`
-	JSON eventListResponseEventFileEditedPropertiesJSON `json:"-"`
-}
-
-// eventListResponseEventFileEditedPropertiesJSON contains the JSON metadata for
-// the struct [EventListResponseEventFileEditedProperties]
-type eventListResponseEventFileEditedPropertiesJSON struct {
-	File        apijson.Field
-	raw         string
-	ExtraFields map[string]apijson.Field
-}
-
-func (r *EventListResponseEventFileEditedProperties) UnmarshalJSON(data []byte) (err error) {
-	return apijson.UnmarshalRoot(data, r)
-}
-
-func (r eventListResponseEventFileEditedPropertiesJSON) RawJSON() string {
-	return r.raw
-}
-
-type EventListResponseEventFileEditedType string
-
-const (
-	EventListResponseEventFileEditedTypeFileEdited EventListResponseEventFileEditedType = "file.edited"
-)
-
-func (r EventListResponseEventFileEditedType) IsKnown() bool {
-	switch r {
-	case EventListResponseEventFileEditedTypeFileEdited:
-		return true
-	}
-	return false
-}
-
-type EventListResponseEventServerConnected struct {
-	Properties interface{}                               `json:"properties,required"`
-	Type       EventListResponseEventServerConnectedType `json:"type,required"`
-	JSON       eventListResponseEventServerConnectedJSON `json:"-"`
-}
-
-// eventListResponseEventServerConnectedJSON contains the JSON metadata for the
-// struct [EventListResponseEventServerConnected]
-type eventListResponseEventServerConnectedJSON struct {
-	Properties  apijson.Field
-	Type        apijson.Field
-	raw         string
-	ExtraFields map[string]apijson.Field
-}
-
-func (r *EventListResponseEventServerConnected) UnmarshalJSON(data []byte) (err error) {
-	return apijson.UnmarshalRoot(data, r)
-}
-
-func (r eventListResponseEventServerConnectedJSON) RawJSON() string {
-	return r.raw
-}
-
-func (r EventListResponseEventServerConnected) implementsEventListResponse() {}
-
-type EventListResponseEventServerConnectedType string
-
-const (
-	EventListResponseEventServerConnectedTypeServerConnected EventListResponseEventServerConnectedType = "server.connected"
-)
-
-func (r EventListResponseEventServerConnectedType) IsKnown() bool {
-	switch r {
-	case EventListResponseEventServerConnectedTypeServerConnected:
-		return true
-	}
-	return false
-}
-
 type EventListResponseEventPermissionUpdated struct {
 	Properties Permission                                  `json:"properties,required"`
 	Type       EventListResponseEventPermissionUpdatedType `json:"type,required"`
@@ -853,6 +752,66 @@ func (r EventListResponseEventPermissionRepliedType) IsKnown() bool {
 	return false
 }
 
+type EventListResponseEventFileEdited struct {
+	Properties EventListResponseEventFileEditedProperties `json:"properties,required"`
+	Type       EventListResponseEventFileEditedType       `json:"type,required"`
+	JSON       eventListResponseEventFileEditedJSON       `json:"-"`
+}
+
+// eventListResponseEventFileEditedJSON contains the JSON metadata for the struct
+// [EventListResponseEventFileEdited]
+type eventListResponseEventFileEditedJSON struct {
+	Properties  apijson.Field
+	Type        apijson.Field
+	raw         string
+	ExtraFields map[string]apijson.Field
+}
+
+func (r *EventListResponseEventFileEdited) UnmarshalJSON(data []byte) (err error) {
+	return apijson.UnmarshalRoot(data, r)
+}
+
+func (r eventListResponseEventFileEditedJSON) RawJSON() string {
+	return r.raw
+}
+
+func (r EventListResponseEventFileEdited) implementsEventListResponse() {}
+
+type EventListResponseEventFileEditedProperties struct {
+	File string                                         `json:"file,required"`
+	JSON eventListResponseEventFileEditedPropertiesJSON `json:"-"`
+}
+
+// eventListResponseEventFileEditedPropertiesJSON contains the JSON metadata for
+// the struct [EventListResponseEventFileEditedProperties]
+type eventListResponseEventFileEditedPropertiesJSON struct {
+	File        apijson.Field
+	raw         string
+	ExtraFields map[string]apijson.Field
+}
+
+func (r *EventListResponseEventFileEditedProperties) UnmarshalJSON(data []byte) (err error) {
+	return apijson.UnmarshalRoot(data, r)
+}
+
+func (r eventListResponseEventFileEditedPropertiesJSON) RawJSON() string {
+	return r.raw
+}
+
+type EventListResponseEventFileEditedType string
+
+const (
+	EventListResponseEventFileEditedTypeFileEdited EventListResponseEventFileEditedType = "file.edited"
+)
+
+func (r EventListResponseEventFileEditedType) IsKnown() bool {
+	switch r {
+	case EventListResponseEventFileEditedTypeFileEdited:
+		return true
+	}
+	return false
+}
+
 type EventListResponseEventSessionUpdated struct {
 	Properties EventListResponseEventSessionUpdatedProperties `json:"properties,required"`
 	Type       EventListResponseEventSessionUpdatedType       `json:"type,required"`
@@ -1229,6 +1188,45 @@ func (r EventListResponseEventSessionErrorType) IsKnown() bool {
 	return false
 }
 
+type EventListResponseEventServerConnected struct {
+	Properties interface{}                               `json:"properties,required"`
+	Type       EventListResponseEventServerConnectedType `json:"type,required"`
+	JSON       eventListResponseEventServerConnectedJSON `json:"-"`
+}
+
+// eventListResponseEventServerConnectedJSON contains the JSON metadata for the
+// struct [EventListResponseEventServerConnected]
+type eventListResponseEventServerConnectedJSON struct {
+	Properties  apijson.Field
+	Type        apijson.Field
+	raw         string
+	ExtraFields map[string]apijson.Field
+}
+
+func (r *EventListResponseEventServerConnected) UnmarshalJSON(data []byte) (err error) {
+	return apijson.UnmarshalRoot(data, r)
+}
+
+func (r eventListResponseEventServerConnectedJSON) RawJSON() string {
+	return r.raw
+}
+
+func (r EventListResponseEventServerConnected) implementsEventListResponse() {}
+
+type EventListResponseEventServerConnectedType string
+
+const (
+	EventListResponseEventServerConnectedTypeServerConnected EventListResponseEventServerConnectedType = "server.connected"
+)
+
+func (r EventListResponseEventServerConnectedType) IsKnown() bool {
+	switch r {
+	case EventListResponseEventServerConnectedTypeServerConnected:
+		return true
+	}
+	return false
+}
+
 type EventListResponseEventFileWatcherUpdated struct {
 	Properties EventListResponseEventFileWatcherUpdatedProperties `json:"properties,required"`
 	Type       EventListResponseEventFileWatcherUpdatedType       `json:"type,required"`
@@ -1376,21 +1374,21 @@ const (
 	EventListResponseTypeMessagePartUpdated   EventListResponseType = "message.part.updated"
 	EventListResponseTypeMessagePartRemoved   EventListResponseType = "message.part.removed"
 	EventListResponseTypeStorageWrite         EventListResponseType = "storage.write"
-	EventListResponseTypeFileEdited           EventListResponseType = "file.edited"
-	EventListResponseTypeServerConnected      EventListResponseType = "server.connected"
 	EventListResponseTypePermissionUpdated    EventListResponseType = "permission.updated"
 	EventListResponseTypePermissionReplied    EventListResponseType = "permission.replied"
+	EventListResponseTypeFileEdited           EventListResponseType = "file.edited"
 	EventListResponseTypeSessionUpdated       EventListResponseType = "session.updated"
 	EventListResponseTypeSessionDeleted       EventListResponseType = "session.deleted"
 	EventListResponseTypeSessionIdle          EventListResponseType = "session.idle"
 	EventListResponseTypeSessionError         EventListResponseType = "session.error"
+	EventListResponseTypeServerConnected      EventListResponseType = "server.connected"
 	EventListResponseTypeFileWatcherUpdated   EventListResponseType = "file.watcher.updated"
 	EventListResponseTypeIdeInstalled         EventListResponseType = "ide.installed"
 )
 
 func (r EventListResponseType) IsKnown() bool {
 	switch r {
-	case EventListResponseTypeInstallationUpdated, EventListResponseTypeLspClientDiagnostics, EventListResponseTypeMessageUpdated, EventListResponseTypeMessageRemoved, EventListResponseTypeMessagePartUpdated, EventListResponseTypeMessagePartRemoved, EventListResponseTypeStorageWrite, EventListResponseTypeFileEdited, EventListResponseTypeServerConnected, EventListResponseTypePermissionUpdated, EventListResponseTypePermissionReplied, EventListResponseTypeSessionUpdated, EventListResponseTypeSessionDeleted, EventListResponseTypeSessionIdle, EventListResponseTypeSessionError, EventListResponseTypeFileWatcherUpdated, EventListResponseTypeIdeInstalled:
+	case EventListResponseTypeInstallationUpdated, EventListResponseTypeLspClientDiagnostics, EventListResponseTypeMessageUpdated, EventListResponseTypeMessageRemoved, EventListResponseTypeMessagePartUpdated, EventListResponseTypeMessagePartRemoved, EventListResponseTypeStorageWrite, EventListResponseTypePermissionUpdated, EventListResponseTypePermissionReplied, EventListResponseTypeFileEdited, EventListResponseTypeSessionUpdated, EventListResponseTypeSessionDeleted, EventListResponseTypeSessionIdle, EventListResponseTypeSessionError, EventListResponseTypeServerConnected, EventListResponseTypeFileWatcherUpdated, EventListResponseTypeIdeInstalled:
 		return true
 	}
 	return false
diff --git a/packages/sdk/go/session.go b/packages/sdk/go/session.go
index c6f197a71..29cc92a21 100644
--- a/packages/sdk/go/session.go
+++ b/packages/sdk/go/session.go
@@ -2025,9 +2025,9 @@ func (r toolStateCompletedTimeJSON) RawJSON() string {
 type ToolStateError struct {
 	Error    string                 `json:"error,required"`
 	Input    map[string]interface{} `json:"input,required"`
-	Metadata map[string]interface{} `json:"metadata"`
 	Status   ToolStateErrorStatus   `json:"status,required"`
 	Time     ToolStateErrorTime     `json:"time,required"`
+	Metadata map[string]interface{} `json:"metadata"`
 	JSON     toolStateErrorJSON     `json:"-"`
 }
 
@@ -2035,9 +2035,9 @@ type ToolStateError struct {
 type toolStateErrorJSON struct {
 	Error       apijson.Field
 	Input       apijson.Field
-	Metadata    apijson.Field
 	Status      apijson.Field
 	Time        apijson.Field
+	Metadata    apijson.Field
 	raw         string
 	ExtraFields map[string]apijson.Field
 }
diff --git a/packages/sdk/go/tui.go b/packages/sdk/go/tui.go
index 986b73aa5..6f36ce543 100644
--- a/packages/sdk/go/tui.go
+++ b/packages/sdk/go/tui.go
@@ -47,7 +47,7 @@ func (r *TuiService) ClearPrompt(ctx context.Context, opts ...option.RequestOpti
 	return
 }
 
-// Execute a TUI command (e.g. switch_agent)
+// Execute a TUI command (e.g. agent_cycle)
 func (r *TuiService) ExecuteCommand(ctx context.Context, body TuiExecuteCommandParams, opts ...option.RequestOption) (res *bool, err error) {
 	opts = append(r.Options[:], opts...)
 	path := "tui/execute-command"
diff --git a/packages/sdk/js/src/gen/sdk.gen.ts b/packages/sdk/js/src/gen/sdk.gen.ts
index 5dd8552d5..d29862387 100644
--- a/packages/sdk/js/src/gen/sdk.gen.ts
+++ b/packages/sdk/js/src/gen/sdk.gen.ts
@@ -506,7 +506,7 @@ class Tui extends _HeyApiClient {
   }
 
   /**
-   * Execute a TUI command (e.g. switch_agent)
+   * Execute a TUI command (e.g. agent_cycle)
    */
   public executeCommand<ThrowOnError extends boolean = false>(options?: Options<TuiExecuteCommandData, ThrowOnError>) {
     return (options?.client ?? this._client).post<TuiExecuteCommandResponses, unknown, ThrowOnError>({
diff --git a/packages/sdk/js/src/gen/types.gen.ts b/packages/sdk/js/src/gen/types.gen.ts
index dbd69bcb6..54087908c 100644
--- a/packages/sdk/js/src/gen/types.gen.ts
+++ b/packages/sdk/js/src/gen/types.gen.ts
@@ -347,10 +347,10 @@ export type ToolStateError = {
   input: {
     [key: string]: unknown
   }
-  metadata: {
+  error: string
+  metadata?: {
     [key: string]: unknown
   }
-  error: string
   time: {
     start: number
     end: number
@@ -750,25 +750,29 @@ export type KeybindsConfig = {
    */
   app_help: string
   /**
-   * @deprecated use switch_agent. Next mode
+   * Exit the application
    */
-  switch_mode: string
+  app_exit: string
   /**
-   * @deprecated use switch_agent_reverse. Previous mode
+   * Open external editor
    */
-  switch_mode_reverse: string
+  editor_open: string
   /**
-   * Next agent
+   * List available themes
    */
-  switch_agent: string
+  theme_list: string
   /**
-   * Previous agent
+   * Create/update AGENTS.md
    */
-  switch_agent_reverse: string
+  project_init: string
   /**
-   * Open external editor
+   * Toggle tool details
    */
-  editor_open: string
+  tool_details: string
+  /**
+   * Toggle thinking blocks
+   */
+  thinking_blocks: string
   /**
    * Export session to editor
    */
@@ -798,41 +802,65 @@ export type KeybindsConfig = {
    */
   session_compact: string
   /**
-   * Toggle tool details
+   * Scroll messages up by one page
    */
-  tool_details: string
+  messages_page_up: string
   /**
-   * Toggle thinking blocks
+   * Scroll messages down by one page
    */
-  thinking_blocks: string
+  messages_page_down: string
   /**
-   * List available models
+   * Scroll messages up by half page
    */
-  model_list: string
+  messages_half_page_up: string
   /**
-   * List available themes
+   * Scroll messages down by half page
    */
-  theme_list: string
+  messages_half_page_down: string
   /**
-   * List files
+   * Navigate to first message
    */
-  file_list: string
+  messages_first: string
   /**
-   * Close file
+   * Navigate to last message
    */
-  file_close: string
+  messages_last: string
   /**
-   * Search file
+   * Copy message
    */
-  file_search: string
+  messages_copy: string
   /**
-   * Split/unified diff
+   * Undo message
    */
-  file_diff_toggle: string
+  messages_undo: string
   /**
-   * Create/update AGENTS.md
+   * Redo message
    */
-  project_init: string
+  messages_redo: string
+  /**
+   * List available models
+   */
+  model_list: string
+  /**
+   * Next recent model
+   */
+  model_cycle_recent: string
+  /**
+   * Previous recent model
+   */
+  model_cycle_recent_reverse: string
+  /**
+   * List agents
+   */
+  agent_list: string
+  /**
+   * Next agent
+   */
+  agent_cycle: string
+  /**
+   * Previous agent
+   */
+  agent_cycle_reverse: string
   /**
    * Clear input field
    */
@@ -850,61 +878,53 @@ export type KeybindsConfig = {
    */
   input_newline: string
   /**
-   * Scroll messages up by one page
-   */
-  messages_page_up: string
-  /**
-   * Scroll messages down by one page
-   */
-  messages_page_down: string
-  /**
-   * Scroll messages up by half page
+   * @deprecated use agent_cycle. Next mode
    */
-  messages_half_page_up: string
+  switch_mode: string
   /**
-   * Scroll messages down by half page
+   * @deprecated use agent_cycle_reverse. Previous mode
    */
-  messages_half_page_down: string
+  switch_mode_reverse: string
   /**
-   * Navigate to previous message
+   * @deprecated use agent_cycle. Next agent
    */
-  messages_previous: string
+  switch_agent: string
   /**
-   * Navigate to next message
+   * @deprecated use agent_cycle_reverse. Previous agent
    */
-  messages_next: string
+  switch_agent_reverse: string
   /**
-   * Navigate to first message
+   * @deprecated Currently not available. List files
    */
-  messages_first: string
+  file_list: string
   /**
-   * Navigate to last message
+   * @deprecated Close file
    */
-  messages_last: string
+  file_close: string
   /**
-   * Toggle layout
+   * @deprecated Search file
    */
-  messages_layout_toggle: string
+  file_search: string
   /**
-   * Copy message
+   * @deprecated Split/unified diff
    */
-  messages_copy: string
+  file_diff_toggle: string
   /**
-   * @deprecated use messages_undo. Revert message
+   * @deprecated Navigate to previous message
    */
-  messages_revert: string
+  messages_previous: string
   /**
-   * Undo message
+   * @deprecated Navigate to next message
    */
-  messages_undo: string
+  messages_next: string
   /**
-   * Redo message
+   * @deprecated Toggle layout
    */
-  messages_redo: string
+  messages_layout_toggle: string
   /**
-   * Exit the application
+   * @deprecated use messages_undo. Revert message
    */
-  app_exit: string
+  messages_revert: string
 }
 
 export type AgentConfig = {
@@ -1086,6 +1106,7 @@ export type Agent = {
   name: string
   description?: string
   mode: "subagent" | "primary" | "all"
+  builtIn: boolean
   topP?: number
   temperature?: number
   permission: {