feat: use on prem proxy in CLI #7466
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| apiKeyLocation: (selectedModel as any).apiKeyLocation, | ||
| orgScopeId: organizationId, | ||
| proxyUrl: undefined, | ||
| proxyUrl: (selectedModel as any).onPremProxyUrl ?? undefined, |
Contributor
There was a problem hiding this comment.
Ignores the useOnPremProxy flag; should only set proxyUrl when on-prem proxy usage is enabled.
(Based on your team's feedback about correctly honoring on-prem proxy settings in the CLI.)
Prompt for AI agents
Address the following comment on extensions/cli/src/services/ModelService.ts at line 105:
<comment>Ignores the useOnPremProxy flag; should only set proxyUrl when on-prem proxy usage is enabled.
(Based on your team's feedback about correctly honoring on-prem proxy settings in the CLI.)</comment>
<file context>
@@ -102,7 +102,7 @@ export class ModelService
apiKeyLocation: (selectedModel as any).apiKeyLocation,
orgScopeId: organizationId,
- proxyUrl: undefined,
+ proxyUrl: (selectedModel as any).onPremProxyUrl ?? undefined,
},
}
</file context>
| apiKeyLocation: (selectedModel as any).apiKeyLocation, | ||
| orgScopeId: organizationId, | ||
| proxyUrl: undefined, | ||
| proxyUrl: (selectedModel as any).onPremProxyUrl ?? undefined, |
Contributor
There was a problem hiding this comment.
Empty string onPremProxyUrl will be treated as a base URL and can crash URL construction; coalesce falsy to undefined to avoid invalid base URLs.
(Based on your team's feedback about correctly using on-prem proxy settings in the CLI without introducing runtime errors.)
Prompt for AI agents
Address the following comment on extensions/cli/src/services/ModelService.ts at line 105:
<comment>Empty string onPremProxyUrl will be treated as a base URL and can crash URL construction; coalesce falsy to undefined to avoid invalid base URLs.
(Based on your team's feedback about correctly using on-prem proxy settings in the CLI without introducing runtime errors.)</comment>
<file context>
@@ -102,7 +102,7 @@ export class ModelService
apiKeyLocation: (selectedModel as any).apiKeyLocation,
orgScopeId: organizationId,
- proxyUrl: undefined,
+ proxyUrl: (selectedModel as any).onPremProxyUrl ?? undefined,
},
}
</file context>
Suggested change
| proxyUrl: (selectedModel as any).onPremProxyUrl ?? undefined, | |
| proxyUrl: (selectedModel as any).onPremProxyUrl || undefined, |
|
|
||
| // Unroll locally if not logged in | ||
| if (!(apiClient as any).configuration.apiKey) { | ||
| if (!(apiClient as any).configuration.accessToken) { |
Contributor
There was a problem hiding this comment.
Directly accessing configuration.accessToken can throw if configuration is undefined (e.g., with a mock client). Use optional chaining to avoid a runtime crash.
Prompt for AI agents
Address the following comment on extensions/cli/src/configLoader.ts at line 356:
<comment>Directly accessing configuration.accessToken can throw if configuration is undefined (e.g., with a mock client). Use optional chaining to avoid a runtime crash.</comment>
<file context>
@@ -353,7 +353,7 @@ async function loadAssistantSlug(
// Unroll locally if not logged in
- if (!(apiClient as any).configuration.apiKey) {
+ if (!(apiClient as any).configuration.accessToken) {
return await unrollAssistantWithConfig(
{
</file context>
Suggested change
| if (!(apiClient as any).configuration.accessToken) { | |
| if (!((apiClient as any).configuration?.accessToken)) { |
tingwai
approved these changes
Aug 28, 2025
Contributor
Author
|
🎉 This PR is included in version 1.12.0 🎉 The release is available on: Your semantic-release bot 📦🚀 |
Contributor
Author
|
🎉 This PR is included in version 1.12.0 🎉 The release is available on: Your semantic-release bot 📦🚀 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Correctly use on prem proxy settings in CLI
Summary by cubic
Routes CLI model requests through the configured on‑prem proxy. Also fixes login detection and trims noisy terminal output in tool results.