Rename the new Cline API Key secret

cli/src/agent/ClineAgent.ts

@@ -1158,7 +1158,7 @@ export class ClineAgent implements acp.Agent {
 
 		if (currentProvider === "cline") {
 			// For Cline provider, check if we have stored auth data
-			const values = await Promise.all(["clineApiKey", "clineAccountId"].map((key) => secretStorage.get(key)))
+			const values = await Promise.all(["clineApiKeyv2", "cline:clineAccountId"].map((key) => secretStorage.get(key)))
 			return values.some(Boolean)
 		}
 

cli/src/components/ProviderPicker.tsx

@@ -19,7 +19,7 @@ function isProviderConfigured(providerId: string, config: ApiConfiguration): boo
 	switch (providerId) {
 		case "cline":
 			// Check if user has Cline API key or Cline account auth data stored
-			return !!(config.clineApiKey ?? config["cline:clineAccountId"])
+			return !!(config.clineApiKeyv2 ?? config["cline:clineAccountId"])
 		case "anthropic":
 			return !!config.apiKey
 		case "openrouter":

cli/src/index.ts

@@ -683,7 +683,7 @@ async function checkAnyProviderConfigured(): Promise<boolean> {
 	const config = stateManager.getApiConfiguration() as Record<string, unknown>
 
 	// Check Cline account (stored as "cline:clineAccountId" in secrets, loaded into config)
-	if (config["clineApiKey"] || config["cline:clineAccountId"]) return true
+	if (config["clineApiKeyv2"] || config["cline:clineAccountId"]) return true
 
 	// Check OpenAI Codex OAuth (stored in SECRETS_KEYS, loaded into config)
 	if (config["openai-codex-oauth-credentials"]) return true

proto/cline/state.proto

@@ -100,8 +100,8 @@ message Secrets {
   optional string oca_api_key = 41;
   optional string oca_refresh_token = 42;
   optional string mcp_o_auth_secrets = 43;
-  optional string cline_api_key = 44;
-  optional string openai_codex_oauth_credentials = 46;
+  optional string cline_api_keyv2 = 47;
+  optional string openai_codex_oauth_credentials = 48;
 }
 
 // NOTE: Add new fields under API_HANDLER_SETTINGS_FIELDS or USER_SETTINGS_FIELDS

src/core/api/index.ts

@@ -259,7 +259,7 @@ function createHandlerForProvider(
 			return new ClineHandler({
 				onRetryAttempt: options.onRetryAttempt,
 				clineAccountId: options.clineAccountId,
-				clineApiKey: options.clineApiKey,
+				clineApiKey: options.clineApiKeyv2,
 				ulid: options.ulid,
 				reasoningEffort: mode === "plan" ? options.planModeReasoningEffort : options.actModeReasoningEffort,
 				thinkingBudgetTokens:

src/shared/proto-conversions/models/api-configuration-conversion.ts

@@ -501,7 +501,7 @@ export function convertApiConfigurationToProto(config: ApiConfiguration): ProtoA
 		minimaxApiKey: config.minimaxApiKey,
 		minimaxApiLine: config.minimaxApiLine,
 		nousResearchApiKey: config.nousResearchApiKey,
-		clineApiKey: config.clineApiKey,
+		clineApiKey: config.clineApiKeyv2,
 		ocaMode: config.ocaMode,
 		aihubmixApiKey: config.aihubmixApiKey,
 		aihubmixBaseUrl: config.aihubmixBaseUrl,
@@ -682,7 +682,7 @@ export function convertProtoToApiConfiguration(protoConfig: ProtoApiConfiguratio
 		hicapApiKey: protoConfig.hicapApiKey,
 		hicapModelId: protoConfig.hicapModelId,
 		nousResearchApiKey: protoConfig.nousResearchApiKey,
-		clineApiKey: protoConfig.clineApiKey,
+		clineApiKeyv2: protoConfig.clineApiKey,
 
 		// Plan mode configurations
 		planModeApiProvider:

src/shared/storage/provider-keys.ts

@@ -47,7 +47,7 @@ const ProviderKeyMap: Partial<Record<ApiProvider, string>> = {
 } as const
 
 export const ProviderToApiKeyMap: Partial<Record<ApiProvider, string | string[]>> = {
-	cline: ["clineApiKey", "clineAccountId"],
+	cline: ["clineApiKeyv2", "clineAccountId"],
 	anthropic: "apiKey",
 	openrouter: "openRouterApiKey",
 	bedrock: ["awsAccessKey", "awsBedrockApiKey"],

src/shared/storage/state-keys.ts

@@ -300,7 +300,7 @@ const GLOBAL_STATE_AND_SETTINGS_FIELDS = { ...GLOBAL_STATE_FIELDS, ...SETTINGS_F
 // Secret keys used in Api Configuration
 const SECRETS_KEYS = [
 	"apiKey",
-	"clineApiKey",
+	"clineApiKeyv2",
 	"clineAccountId", // Cline Account ID for Firebase
 	"cline:clineAccountId",
 	"openRouterApiKey",