merge: resolve conflicts after upstream merge

src/shared/ExtensionMessage.ts

@@ -1,6 +1,6 @@
 // type that represents json data that is sent from extension to webview, called ExtensionMessage and has 'type' enum which can be 'plusButtonClicked' or 'settingsButtonClicked' or 'hello'
 
-import { ApiConfiguration, ModelInfo } from "./api"
+import { ApiConfiguration, ApiProvider, ModelInfo } from "./api"
 import { HistoryItem } from "./HistoryItem"
 import { McpServer } from "./mcp"
 import { GitCommit } from "../utils/git"
@@ -9,25 +9,25 @@ import { GitCommit } from "../utils/git"
 export interface ExtensionMessage {
 
 	type:
-	| "action"
-	| "state"
-	| "selectedImages"
-	| "ollamaModels"
-	| "lmStudioModels"
-	| "vsCodeLmModels"
-	| "vsCodeLmApiAvailable"
-	| "requestVsCodeLmModels"
-	| "theme"
-	| "workspaceUpdated"
-	| "invoke"
-	| "partialMessage"
-	| "glamaModels"
-	| "openRouterModels"
-	| "openAiModels"
-	| "mcpServers"
-	| "enhancedPrompt"
-	| "commitSearchResults"
-
+		| "action"
+		| "state"
+		| "selectedImages"
+		| "ollamaModels"
+		| "lmStudioModels"
+		| "theme"
+		| "workspaceUpdated"
+		| "invoke"
+		| "partialMessage"
+		| "glamaModels"
+		| "openRouterModels"
+		| "openAiModels"
+		| "mcpServers"
+		| "enhancedPrompt"
+		| "commitSearchResults"
+		| "listApiConfig"
+		| "vsCodeLmModels"
+	    | "vsCodeLmApiAvailable"
+	    | "requestVsCodeLmModels"
 	text?: string
 	action?:
 	| "chatButtonClicked"
@@ -48,6 +48,12 @@ export interface ExtensionMessage {
 	openAiModels?: string[]
 	mcpServers?: McpServer[]
 	commits?: GitCommit[]
+	listApiConfig?: ApiConfigMeta[]
+}
+
+export interface ApiConfigMeta {
+	name: string
+	apiProvider?: ApiProvider
 }
 
 export interface ExtensionState {
@@ -56,12 +62,16 @@ export interface ExtensionState {
 	taskHistory: HistoryItem[]
 	shouldShowAnnouncement: boolean
 	apiConfiguration?: ApiConfiguration
+	currentApiConfigName?: string
+	listApiConfigMeta?: ApiConfigMeta[]
 	customInstructions?: string
 	alwaysAllowReadOnly?: boolean
 	alwaysAllowWrite?: boolean
 	alwaysAllowExecute?: boolean
 	alwaysAllowBrowser?: boolean
 	alwaysAllowMcp?: boolean
+	alwaysApproveResubmit?: boolean
+	requestDelaySeconds: number
 	uriScheme?: string
 	allowedCommands?: string[]
 	soundEnabled?: boolean
@@ -109,6 +119,7 @@ export type ClineSay =
 	| "user_feedback"
 	| "user_feedback_diff"
 	| "api_req_retried"
+	| "api_req_retry_delayed"
 	| "command_output"
 	| "tool"
 	| "shell_integration_warning"