Progress

Author: nang-dev

src/core/webview/ClineProvider.ts

@@ -612,7 +612,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 			`style-src ${webview.cspSource} 'unsafe-inline' https://* http://${localServerUrl} http://0.0.0.0:${localPort}`,
 			`img-src ${webview.cspSource} data:`,
 			`script-src 'unsafe-eval' https://* https://*.posthog.com http://${localServerUrl} http://0.0.0.0:${localPort} 'nonce-${nonce}'`,
-			`connect-src https://* https://*.posthog.com ws://${localServerUrl} ws://0.0.0.0:${localPort} http://${localServerUrl} http://0.0.0.0:${localPort}`,
+			`connect-src https://* https://*.posthog.com ws://${localServerUrl} ws://0.0.0.0:${localPort} http://${localServerUrl} http://0.0.0.0:${localPort} http://localhost:8000 http://0.0.0.0:8000 https://stingray-app-gb2an.ondigitalocean.app`,
 		]
 
 		return /*html*/ `
@@ -701,7 +701,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
             <meta charset="utf-8">
             <meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
             <meta name="theme-color" content="#000000">
-            <meta http-equiv="Content-Security-Policy" content="default-src 'none'; font-src ${webview.cspSource}; style-src ${webview.cspSource} 'unsafe-inline'; img-src ${webview.cspSource} data:; script-src 'nonce-${nonce}' https://us-assets.i.posthog.com; connect-src https://openrouter.ai https://us.i.posthog.com https://us-assets.i.posthog.com;">
+            <meta http-equiv="Content-Security-Policy" content="default-src 'none'; font-src ${webview.cspSource}; style-src ${webview.cspSource} 'unsafe-inline'; img-src ${webview.cspSource} data:; script-src 'nonce-${nonce}' https://us-assets.i.posthog.com; connect-src https://openrouter.ai https://us.i.posthog.com https://us-assets.i.posthog.com ${webview.cspSource} https://stingray-app-gb2an.ondigitalocean.app;">
             <link rel="stylesheet" type="text/css" href="${stylesUri}">
 			<link href="${codiconsUri}" rel="stylesheet" />
             <title>Roo Code</title>
@@ -2498,13 +2498,13 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 			version: this.context.extension?.packageJSON?.version ?? "",
 			apiConfiguration,
 			customInstructions,
-			alwaysAllowReadOnly: alwaysAllowReadOnly ?? false,
-			alwaysAllowWrite: alwaysAllowWrite ?? false,
-			alwaysAllowExecute: alwaysAllowExecute ?? false,
-			alwaysAllowBrowser: alwaysAllowBrowser ?? false,
-			alwaysAllowMcp: alwaysAllowMcp ?? false,
-			alwaysAllowModeSwitch: alwaysAllowModeSwitch ?? false,
-			alwaysAllowSubtasks: alwaysAllowSubtasks ?? false,
+			alwaysAllowReadOnly: alwaysAllowReadOnly ?? true,
+			alwaysAllowWrite: alwaysAllowWrite ?? true,
+			alwaysAllowExecute: alwaysAllowExecute ?? true,
+			alwaysAllowBrowser: alwaysAllowBrowser ?? true,
+			alwaysAllowMcp: alwaysAllowMcp ?? true,
+			alwaysAllowModeSwitch: alwaysAllowModeSwitch ?? true,
+			alwaysAllowSubtasks: alwaysAllowSubtasks ?? true,
 			uriScheme: vscode.env.uriScheme,
 			currentTaskItem: this.getCurrentCline()?.taskId
 				? (taskHistory || []).find((item: HistoryItem) => item.id === this.getCurrentCline()?.taskId)
@@ -2542,7 +2542,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 			customModePrompts: customModePrompts ?? {},
 			customSupportPrompts: customSupportPrompts ?? {},
 			enhancementApiConfigId,
-			autoApprovalEnabled: autoApprovalEnabled ?? false,
+			autoApprovalEnabled: autoApprovalEnabled ?? true,
 			customModes: await this.customModesManager.getCustomModes(),
 			experiments: experiments ?? experimentDefault,
 			mcpServers: this.mcpHub?.getAllServers() ?? [],

webview-ui/src/components/settings/ApiOptions.tsx

@@ -127,14 +127,7 @@ const ApiOptions = ({
 	)
 
 	const { selectedProvider, selectedModelId, selectedModelInfo } = useMemo(() => {
-		const result = normalizeApiConfiguration(apiConfiguration, pearAiModels)
-		if (result.selectedProvider === "pearai") {
-			return {
-				...result,
-				selectedModelInfo: pearAiModels[result.selectedModelId] || pearAiModels[pearAiDefaultModelId],
-			}
-		}
-		return result
+		return normalizeApiConfiguration(apiConfiguration, pearAiModels)
 	}, [apiConfiguration, pearAiModels])
 
 	// Debounced refresh model updates, only executed 250ms after the user
@@ -243,16 +236,20 @@ const ApiOptions = ({
 
 	useEvent("message", onMessage)
 
-	const selectedProviderModelOptions = useMemo(
-		() =>
-			MODELS_BY_PROVIDER[selectedProvider]
-				? Object.keys(MODELS_BY_PROVIDER[selectedProvider]).map((modelId) => ({
-						value: modelId,
-						label: modelId,
-					}))
-				: [],
-		[selectedProvider],
-	)
+	const selectedProviderModelOptions = useMemo(() => {
+		if (selectedProvider === "pearai") {
+			return Object.keys(pearAiModels).map((modelId) => ({
+				value: modelId,
+				label: modelId,
+			}))
+		}
+		return MODELS_BY_PROVIDER[selectedProvider]
+			? Object.keys(MODELS_BY_PROVIDER[selectedProvider]).map((modelId) => ({
+					value: modelId,
+					label: modelId,
+				}))
+			: []
+	}, [selectedProvider, pearAiModels])
 
 	return (
 		<div className="flex flex-col gap-3">
@@ -1695,7 +1692,11 @@ export function normalizeApiConfiguration(
 				},
 			}
 		case "pearai": {
-			return getProviderData(pearAiModelsQuery || pearAiModels, pearAiDefaultModelId)
+			// Always use the models from the hook which are fetched when provider is selected
+			return getProviderData(
+				pearAiModelsQuery || { [pearAiDefaultModelId]: pearAiDefaultModelInfo },
+				pearAiDefaultModelId,
+			)
 		}
 		default:
 			return getProviderData(anthropicModels, anthropicDefaultModelId)

webview-ui/src/components/settings/constants.ts

@@ -19,7 +19,6 @@ export const MODELS_BY_PROVIDER: Partial<Record<ApiProvider, Record<string, Mode
 	mistral: mistralModels,
 	"openai-native": openAiNativeModels,
 	vertex: vertexModels,
-	pearai: pearAiModels,
 }
 
 export const PROVIDERS = [

webview-ui/src/hooks/usePearAiModels.ts

@@ -8,22 +8,22 @@ export const usePearAiModels = (apiConfiguration?: ApiConfiguration) => {
 	})
 
 	useEffect(() => {
-		if (apiConfiguration?.apiProvider === "pearai") {
-			const fetchPearAiModels = async () => {
-				try {
-					const res = await fetch(`${PEARAI_URL}/getPearAIAgentModels`)
-					if (!res.ok) throw new Error("Failed to fetch models")
-					const config = await res.json()
+		const fetchPearAiModels = async () => {
+			try {
+				const res = await fetch(`${PEARAI_URL}/getPearAIAgentModels`)
+				if (!res.ok) throw new Error("Failed to fetch models")
+				const config = await res.json()
 
-					if (config.models && Object.keys(config.models).length > 0) {
-						console.log("Models successfully loaded from server")
-						setPearAiModels(config.models)
-					}
-				} catch (error) {
-					console.error("Error fetching PearAI models:", error)
+				if (config.models && Object.keys(config.models).length > 0) {
+					console.log("Models successfully loaded from server")
+					setPearAiModels(config.models)
 				}
+			} catch (error) {
+				console.error("Error fetching PearAI models:", error)
 			}
+		}
 
+		if (apiConfiguration?.apiProvider === "pearai") {
 			fetchPearAiModels()
 		}
 	}, [apiConfiguration?.apiProvider])