|
5 | 5 | useAcpRuntimesQuery, |
6 | 6 | useAvailableAcpRuntimes, |
7 | 7 | useBackendProvidersQuery, |
| 8 | + useBakedBuildEnvKeysQuery, |
8 | 9 | useCreateManagedAgentMutation, |
9 | 10 | useManagedAgentPrereqsQuery, |
10 | 11 | useRuntimeFileConfigQuery, |
@@ -41,6 +42,7 @@ import { meshPrepareRelayMeshClient } from "@/shared/api/tauriMesh"; |
41 | 42 | import type { MeshServeTarget } from "@/shared/api/tauriMesh"; |
42 | 43 | import { useLastRuntime } from "@/features/agents/lib/useLastRuntime"; |
43 | 44 | import { |
| 45 | + getBakedSatisfiedEnvKeys, |
44 | 46 | requiredCredentialEnvKeys, |
45 | 47 | runtimeSupportsLlmProviderSelection, |
46 | 48 | shouldClearKnownModelForSelectionScope, |
@@ -182,28 +184,45 @@ export function CreateAgentDialog({ |
182 | 184 | selectedRuntimeId, |
183 | 185 | { enabled: open }, |
184 | 186 | ); |
| 187 | + const { data: bakedEnvKeys } = useBakedBuildEnvKeysQuery({ enabled: open }); |
| 188 | + |
| 189 | + // All required keys for the selected runtime + provider. |
| 190 | + const allRequiredEnvKeys = React.useMemo( |
| 191 | + () => |
| 192 | + requiredCredentialEnvKeys( |
| 193 | + selectedRuntimeId, |
| 194 | + runtimeSupportsLlmProviderSelection(selectedRuntimeId) ? provider : "", |
| 195 | + ), |
| 196 | + [selectedRuntimeId, provider], |
| 197 | + ); |
| 198 | + |
| 199 | + // Keys covered by the baked build env (Block-internal builds only) — silenced, |
| 200 | + // produce no amber row or info row. |
| 201 | + const bakedSatisfiedEnvKeys = React.useMemo( |
| 202 | + () => getBakedSatisfiedEnvKeys(allRequiredEnvKeys, envVars, bakedEnvKeys), |
| 203 | + [allRequiredEnvKeys, envVars, bakedEnvKeys], |
| 204 | + ); |
| 205 | + |
185 | 206 | // Credential keys satisfied by the runtime file config (e.g. goose config.yaml). |
186 | 207 | // These are shown as "Set in goose config" rows rather than amber required rows. |
187 | 208 | const fileSatisfiedEnvKeys = React.useMemo(() => { |
188 | 209 | if (!runtimeFileConfig) return [] as string[]; |
189 | | - const allKeys = requiredCredentialEnvKeys( |
190 | | - selectedRuntimeId, |
191 | | - runtimeSupportsLlmProviderSelection(selectedRuntimeId) ? provider : "", |
192 | | - ); |
193 | | - return allKeys.filter( |
| 210 | + return allRequiredEnvKeys.filter( |
194 | 211 | (key) => |
195 | 212 | (envVars[key] ?? "").length === 0 && |
| 213 | + !bakedSatisfiedEnvKeys.includes(key) && |
196 | 214 | runtimeFileConfig.satisfiedEnvKeys.includes(key), |
197 | 215 | ); |
198 | | - }, [runtimeFileConfig, selectedRuntimeId, provider, envVars]); |
| 216 | + }, [runtimeFileConfig, allRequiredEnvKeys, envVars, bakedSatisfiedEnvKeys]); |
199 | 217 |
|
200 | 218 | const requiredEnvKeys = React.useMemo( |
201 | 219 | () => |
202 | | - requiredCredentialEnvKeys( |
203 | | - selectedRuntimeId, |
204 | | - runtimeSupportsLlmProviderSelection(selectedRuntimeId) ? provider : "", |
205 | | - ).filter((key) => !fileSatisfiedEnvKeys.includes(key)), |
206 | | - [selectedRuntimeId, provider, fileSatisfiedEnvKeys], |
| 220 | + allRequiredEnvKeys.filter( |
| 221 | + (key) => |
| 222 | + !bakedSatisfiedEnvKeys.includes(key) && |
| 223 | + !fileSatisfiedEnvKeys.includes(key), |
| 224 | + ), |
| 225 | + [allRequiredEnvKeys, bakedSatisfiedEnvKeys, fileSatisfiedEnvKeys], |
207 | 226 | ); |
208 | 227 |
|
209 | 228 | // Clear model when provider scope changes, mirroring EditAgentDialog. |
|
0 commit comments