Skip to content

Proper proxy support on windows & mac #6840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DOsinga merged 4 commits into from
Feb 5, 2026
+32 −32
Merged

Proper proxy support on windows & mac #6840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
779416e
Proper proxy support on windows & mac
Jan 30, 2026
e88e9f3
Merge remote-tracking branch 'origin/main' into enabled-proxy
Feb 2, 2026
16e7a46
Merge main, resolve conflicts in Cargo.lock and Cargo.toml
Feb 4, 2026
2b8dddb
Merge remote-tracking branch 'origin/main' into enabled-proxyZ
Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/goose-mcp/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ schemars = "1.0"
shellexpand = "3.1.0"
indoc = "2.0.5"
xcap = "=0.4.0"
reqwest = { workspace = true, features = ["json", "rustls-tls-native-roots"], default-features = false }
reqwest = { workspace = true, features = ["json", "rustls-tls-native-roots", "system-proxy"], default-features = false }
Copy link

Copilot AI Feb 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as in goose: adding the "system-proxy" feature alone doesn’t enable proxy usage unless the runtime code opts in when constructing reqwest::Clients, so this change likely doesn’t achieve the PR goal by itself.

Copilot uses AI. Check for mistakes.
chrono = { version = "0.4.38", features = ["serde"] }
etcetera = { workspace = true }
tempfile = "3.8"
Expand Down
2 changes: 1 addition & 1 deletion crates/goose-server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ thiserror = "1.0"
clap = { version = "4.4", features = ["derive"] }
serde_yaml = "0.9.34"
utoipa = { version = "4.1", features = ["axum_extras", "chrono"] }
reqwest = { workspace = true, features = ["json", "rustls-tls", "blocking", "multipart"], default-features = false }
reqwest = { workspace = true, features = ["json", "rustls-tls", "blocking", "multipart", "system-proxy"], default-features = false }
Copy link

Copilot AI Feb 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as in goose: adding the "system-proxy" feature alone doesn’t enable proxy usage unless the runtime code opts in when constructing reqwest::Clients, so this change likely doesn’t achieve the PR goal by itself.

Copilot uses AI. Check for mistakes.
tokio-util = "0.7.15"
serde_path_to_error = "0.1.20"
tokio-tungstenite = { version = "0.28.0", features = ["rustls-tls-native-roots"] }
Expand Down
3 changes: 2 additions & 1 deletion crates/goose/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ tokio = { workspace = true }
reqwest = { workspace = true, features = [
"json",
"rustls-tls-native-roots",
"system-proxy",
Copy link

Copilot AI Feb 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Enabling the system-proxy feature alone doesn't fix the proxy issue. The code must also call .use_system_proxy() on each Client::builder() instance. Based on the issue description, at minimum these files need the actual implementation:

  • crates/goose/src/providers/api_client.rs (lines 211 and 233)
  • crates/goose/src/providers/githubcopilot.rs (line 161)
  • crates/goose/src/providers/gcpvertexai.rs (line 166)
  • crates/goose/src/providers/toolshim.rs (line 73)

Copilot uses AI. Check for mistakes.
], default-features = false }

[dependencies]
Expand All @@ -34,7 +35,7 @@ anyhow = { workspace = true }
thiserror = "1.0"
futures = { workspace = true }
dirs = "5.0"
reqwest = { workspace = true, features = ["rustls-tls-native-roots", "json", "cookies", "gzip", "brotli", "deflate", "zstd", "charset", "http2", "stream", "blocking", "multipart"], default-features = false }
reqwest = { workspace = true, features = ["rustls-tls-native-roots", "json", "cookies", "gzip", "brotli", "deflate", "zstd", "charset", "http2", "stream", "blocking", "multipart", "system-proxy"], default-features = false }
tokio = { workspace = true }
serde = { version = "1.0", features = ["derive"] }
serde_json = { workspace = true }
Expand Down
12 changes: 5 additions & 7 deletions ui/desktop/src/components/ChatInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,9 +276,10 @@ export default function ChatInput({
? filteredText.replace(/\bsubmit[.,!?;'"\s]*$/i, '').trim()
: filteredText;

const newValue = displayValue.trim() && cleanedText
? `${displayValue.trim()} ${cleanedText}`
: displayValue.trim() || cleanedText;
const newValue =
displayValue.trim() && cleanedText
? `${displayValue.trim()} ${cleanedText}`
: displayValue.trim() || cleanedText;

setDisplayValue(newValue);
setValue(newValue);
Expand Down Expand Up @@ -928,7 +929,6 @@ export default function ChatInput({
]
);


const handleKeyDown = (evt: React.KeyboardEvent<HTMLTextAreaElement>) => {
if (mentionPopover.isOpen && mentionPopoverRef.current) {
if (evt.key === 'ArrowDown') {
Expand Down Expand Up @@ -1383,9 +1383,7 @@ export default function ChatInput({
Listening
</span>
)}
{isRecording && isTranscribing && (
<span className="text-textSubtle">•</span>
)}
{isRecording && isTranscribing && <span className="text-textSubtle">•</span>}
{isTranscribing && (
<span className="flex items-center gap-1 text-blue-500">
<span className="inline-block w-2 h-2 bg-blue-500 rounded-full animate-pulse" />
Expand Down
8 changes: 7 additions & 1 deletion ui/desktop/src/components/McpApps/McpAppRenderer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,13 @@ export default function McpAppRenderer({
if (response.data) {
const content = response.data;
const meta = content._meta as
| { ui?: { csp?: CspMetadata; permissions?: PermissionsMetadata; prefersBorder?: boolean } }
| {
ui?: {
csp?: CspMetadata;
permissions?: PermissionsMetadata;
prefersBorder?: boolean;
};
}
| undefined;

if (content.text !== cachedHtml) {
Expand Down
6 changes: 5 additions & 1 deletion ui/desktop/src/components/McpApps/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
export type { CspMetadata, PermissionsMetadata, CallToolResponse as ToolResult } from '../../api/types.gen';
export type {
CspMetadata,
PermissionsMetadata,
CallToolResponse as ToolResult,
} from '../../api/types.gen';

export type ContentBlock =
| { type: 'text'; text: string }
Expand Down
31 changes: 11 additions & 20 deletions ui/desktop/src/components/settings/dictation/LocalModelManager.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ export const LocalModelManager = () => {
};

const selectModel = async (modelId: string) => {
await upsert(LOCAL_WHISPER_MODEL_CONFIG_KEY, modelId, false);
setSelectedModelId(modelId);
await upsert(LOCAL_WHISPER_MODEL_CONFIG_KEY, modelId, false);
setSelectedModelId(modelId);
};

const loadModels = async () => {
Expand Down Expand Up @@ -151,7 +151,10 @@ export const LocalModelManager = () => {
return (
<div className="space-y-3">
<div className="text-xs text-text-muted mb-2">
<p>Supports GPU acceleration (CUDA for NVIDIA, Metal for Apple Silicon). GPU features must be enabled at build time for hardware acceleration.</p>
<p>
Supports GPU acceleration (CUDA for NVIDIA, Metal for Apple Silicon). GPU features must be
enabled at build time for hardware acceleration.
</p>
</div>

<div className="space-y-2">
Expand Down Expand Up @@ -184,9 +187,7 @@ export const LocalModelManager = () => {
<h4 className="text-sm font-medium text-text-default">
{capitalize(model.id)}
</h4>
<span className="text-xs text-text-muted">
{model.size_mb}MB
</span>
<span className="text-xs text-text-muted">{model.size_mb}MB</span>
{model.recommended && (
<span className="text-xs bg-blue-500 text-white px-2 py-0.5 rounded">
Recommended
Expand All @@ -199,9 +200,7 @@ export const LocalModelManager = () => {
)}
</div>

<p className="text-xs text-text-muted mt-1">
{model.description}
</p>
<p className="text-xs text-text-muted mt-1">{model.description}</p>
{model.recommended && (
<p className="text-xs text-blue-600 mt-1 font-medium">
Recommended for your hardware
Expand Down Expand Up @@ -230,11 +229,7 @@ export const LocalModelManager = () => {
<div className="text-xs text-text-muted min-w-[60px]">
{progress.progress_percent.toFixed(0)}%
</div>
<Button
variant="ghost"
size="sm"
onClick={() => cancelDownload(model.id)}
>
<Button variant="ghost" size="sm" onClick={() => cancelDownload(model.id)}>
<X className="w-4 h-4" />
</Button>
</>
Expand All @@ -259,9 +254,7 @@ export const LocalModelManager = () => {
<span>
{formatBytes(progress.bytes_downloaded)} / {formatBytes(progress.total_bytes)}
</span>
{progress.speed_bps && (
<span>{formatBytes(progress.speed_bps)}/s</span>
)}
{progress.speed_bps && <span>{formatBytes(progress.speed_bps)}/s</span>}
</div>
</div>
)}
Expand Down Expand Up @@ -296,9 +289,7 @@ export const LocalModelManager = () => {
)}

{models.length === 0 && (
<div className="text-center py-6 text-text-muted text-sm">
No models available
</div>
<div className="text-center py-6 text-text-muted text-sm">No models available</div>
)}
</div>
);
Expand Down
Loading