| {t('cloudSecrets.effective.name', 'Name')} |
@@ -140,7 +145,7 @@ export function CloudSecretsEffectiveView({
) : null}
-
+ |
{cloudSecretScopeLabel(secret.scope, t)}
@@ -148,7 +153,7 @@ export function CloudSecretsEffectiveView({
|
-
+ |
{secret.shadowed.length > 0
? t('cloudSecrets.effective.overrides', 'Overrides {{scopes}}', {
scopes: secret.shadowed
diff --git a/src/renderer/src/components/settings/cloud-secrets/CloudSecretsPane.fixture.tsx b/src/renderer/src/components/settings/cloud-secrets/CloudSecretsPane.fixture.tsx
index 275118a593c..3273e27c4d1 100644
--- a/src/renderer/src/components/settings/cloud-secrets/CloudSecretsPane.fixture.tsx
+++ b/src/renderer/src/components/settings/cloud-secrets/CloudSecretsPane.fixture.tsx
@@ -181,6 +181,7 @@ function list(
emptyDetail="Add one or paste a .env file."
initialMode={mode}
initialSaved={options.saved}
+ onSetUpAgent={noop}
/>
)
diff --git a/src/renderer/src/components/settings/cloud-secrets/CloudSecretsPasteEnv.tsx b/src/renderer/src/components/settings/cloud-secrets/CloudSecretsPasteEnv.tsx
index 272436b0254..9df619e7545 100644
--- a/src/renderer/src/components/settings/cloud-secrets/CloudSecretsPasteEnv.tsx
+++ b/src/renderer/src/components/settings/cloud-secrets/CloudSecretsPasteEnv.tsx
@@ -129,6 +129,10 @@ export function CloudSecretsPasteEnv({
{
+ // Escape from a portaled Select or menu bubbles here too; let it close only that.
+ if (!event.currentTarget.contains(event.target as Node)) {
+ return
+ }
// A big paste is not thrown away by a stray Escape; Cancel still discards it.
if (event.key === 'Escape' && !saving && text.trim() === '') {
event.stopPropagation()
@@ -186,14 +190,21 @@ export function CloudSecretsPasteEnv({
aria-label={t('cloudSecrets.paste.preview', 'Preview')}
className="max-h-64 divide-y divide-border/60 overflow-y-auto rounded-md border border-border/60 scrollbar-sleek"
>
- {entries.map((entry) => (
-
- ))}
+ {/* Lines that need a fix first, so they can be checked without scrolling. */}
+ {[...entries]
+ .sort(
+ (a, b) =>
+ Number(a.issue === null || a.issue === 'overridden') -
+ Number(b.issue === null || b.issue === 'overridden')
+ )
+ .map((entry) => (
+
+ ))}
) : null}
diff --git a/src/renderer/src/components/settings/cloud-secrets/cloud-secrets-copy.ts b/src/renderer/src/components/settings/cloud-secrets/cloud-secrets-copy.ts
index 42c01643528..a17e3db399d 100644
--- a/src/renderer/src/components/settings/cloud-secrets/cloud-secrets-copy.ts
+++ b/src/renderer/src/components/settings/cloud-secrets/cloud-secrets-copy.ts
@@ -44,7 +44,7 @@ export function cloudSecretsErrorCopy(
case 'subscription_token_refused':
return t(
'cloudSecrets.error.subscriptionToken',
- 'This is a Claude or ChatGPT subscription token, which can’t be stored. Sign the agent in instead.'
+ 'This is a Claude or ChatGPT subscription token, which can’t be stored.'
)
case 'value_too_large':
return t('cloudSecrets.error.valueTooLarge', 'Values can be up to 8 KB.')
diff --git a/src/shared/cloud-secrets/cloud-secret-rules.ts b/src/shared/cloud-secrets/cloud-secret-rules.ts
index 8605b92ada3..d0595f63135 100644
--- a/src/shared/cloud-secrets/cloud-secret-rules.ts
+++ b/src/shared/cloud-secrets/cloud-secret-rules.ts
@@ -77,6 +77,11 @@ const RESERVED_NAMES: ReadonlySet = new Set([
'GITHUB_TOKEN'
])
const RESERVED_PREFIXES = ['LD_', 'DYLD_', 'ORCA_', 'VERCEL_', 'BASH_FUNC_', 'GIT_CONFIG']
+const MODEL_NAMES: ReadonlySet = new Set([
+ 'ANTHROPIC_MODEL',
+ 'ANTHROPIC_SMALL_FAST_MODEL',
+ 'OPENAI_MODEL'
+])
const BASE_URL_NAMES: ReadonlySet = new Set(['ANTHROPIC_BASE_URL', 'OPENAI_BASE_URL'])
const JWT_SHAPE = /^[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]{10,}$/
@@ -116,7 +121,7 @@ export function cloudSecretValueError(name: string, value: string): CloudSecrets
if (BASE_URL_NAMES.has(name) && (!bare || !isPublicHttpsUrl(value))) {
return 'invalid_base_url'
}
- if (name.endsWith('_MODEL') && !bare) {
+ if (MODEL_NAMES.has(name) && !bare) {
return 'invalid_value'
}
return null
|