@@ -26,6 +26,7 @@ import {
2626 type EnvironmentId ,
2727 type ProjectId ,
2828 type ProviderDriverKind ,
29+ type SecretReference ,
2930 type ServerProvider ,
3031 type ServerProviderModel ,
3132} from "@t3tools/contracts" ;
@@ -43,7 +44,7 @@ import { Badge } from "../ui/badge";
4344import { Button } from "../ui/button" ;
4445import { MorphIcon } from "~/components/MorphIcon" ;
4546import { DraftInput } from "../ui/draft-input" ;
46- import { SecretInput } from "./SecretInput " ;
47+ import { SecretSourceInput , type SecretSource } from "./SecretSourceInput " ;
4748import { Popover , PopoverPopup , PopoverTrigger } from "../ui/popover" ;
4849import { Switch } from "../ui/switch" ;
4950import { stackedThreadToast , toastManager } from "../ui/toast" ;
@@ -101,6 +102,7 @@ type EnvironmentDraftRow = {
101102 readonly value : string ;
102103 readonly sensitive : boolean ;
103104 readonly valueRedacted ?: boolean ;
105+ readonly secret ?: SecretReference ;
104106} ;
105107
106108function makeEnvironmentDraftRow (
@@ -113,6 +115,7 @@ function makeEnvironmentDraftRow(
113115 value : variable . value ,
114116 sensitive : variable . sensitive ,
115117 ...( variable . valueRedacted !== undefined ? { valueRedacted : variable . valueRedacted } : { } ) ,
118+ ...( variable . secret !== undefined ? { secret : variable . secret } : { } ) ,
116119 } ;
117120}
118121
@@ -132,7 +135,9 @@ function providerEnvironmentsEqual(
132135 variable . name === other . name &&
133136 variable . value === other . value &&
134137 variable . sensitive === other . sensitive &&
135- variable . valueRedacted === other . valueRedacted
138+ variable . valueRedacted === other . valueRedacted &&
139+ variable . secret ?. provider === other . secret ?. provider &&
140+ variable . secret ?. reference === other . secret ?. reference
136141 ) ;
137142 } )
138143 ) ;
@@ -247,12 +252,28 @@ export function nextProviderEnvironmentWithFieldValue(
247252 return next ;
248253}
249254
255+ export function nextProviderEnvironmentWithFieldSecret (
256+ environment : ReadonlyArray < ProviderInstanceEnvironmentVariable > | undefined ,
257+ field : ProviderEnvironmentField ,
258+ secret : SecretReference | undefined ,
259+ ) : ReadonlyArray < ProviderInstanceEnvironmentVariable > {
260+ const others = providerEnvironmentWithoutNames ( environment , new Set ( [ field . name ] ) ) ;
261+ return secret === undefined
262+ ? others
263+ : [ ...others , { name : field . name , value : "" , sensitive : true , secret } ] ;
264+ }
265+
250266function ProviderEnvironmentFieldRow ( props : {
251267 readonly field : ProviderEnvironmentField ;
252268 readonly variable : ProviderInstanceEnvironmentVariable | undefined ;
253269 readonly idPrefix : string ;
254270 readonly onCommit : ( field : ProviderEnvironmentField , value : string ) => void ;
271+ readonly onSecretChange : (
272+ field : ProviderEnvironmentField ,
273+ secret : SecretReference | undefined ,
274+ ) => void ;
255275 readonly onRemove : ( field : ProviderEnvironmentField ) => void ;
276+ readonly secretSources : ReadonlyArray < SecretSource > ;
256277} ) {
257278 const inputId = `${ props . idPrefix } -environment-${ props . field . name } ` ;
258279 const value = props . variable ?. valueRedacted ? "" : ( props . variable ?. value ?? "" ) ;
@@ -275,7 +296,7 @@ function ProviderEnvironmentFieldRow(props: {
275296 spellCheck = { false }
276297 />
277298 ) : (
278- < SecretInput
299+ < SecretSourceInput
279300 id = { inputId }
280301 size = "sm"
281302 className = "min-w-0 flex-1"
@@ -284,6 +305,10 @@ function ProviderEnvironmentFieldRow(props: {
284305 placeholder = { props . field . placeholder }
285306 configured = { props . variable ?. valueRedacted === true }
286307 spellCheck = { false }
308+ aria-label = { props . field . label }
309+ sources = { props . secretSources }
310+ secret = { props . variable ?. secret }
311+ onSecretChange = { ( secret ) => props . onSecretChange ( props . field , secret ) }
287312 />
288313 ) }
289314 { props . variable ? (
@@ -306,6 +331,7 @@ function ProviderEnvironmentFieldRow(props: {
306331export function ProviderEnvironmentSection ( props : {
307332 readonly environment : ReadonlyArray < ProviderInstanceEnvironmentVariable > ;
308333 readonly onChange : ( environment : ReadonlyArray < ProviderInstanceEnvironmentVariable > ) => void ;
334+ readonly secretSources ?: ReadonlyArray < SecretSource > ;
309335} ) {
310336 const [ storedDraft , setDraft ] = useState ( ( ) =>
311337 seedRowsDraft ( props . environment , toEnvironmentDraftRows ) ,
@@ -330,7 +356,8 @@ export function ProviderEnvironmentSection(props: {
330356 name . length > 0 ||
331357 row . value . length > 0 ||
332358 row . sensitive !== true ||
333- row . valueRedacted !== undefined
359+ row . valueRedacted !== undefined ||
360+ row . secret !== undefined
334361 ) {
335362 return ;
336363 }
@@ -357,6 +384,16 @@ export function ProviderEnvironmentSection(props: {
357384 publishRows ( nextRows ) ;
358385 } ;
359386
387+ const setVariableSecret = ( id : string , secret : SecretReference | undefined ) => {
388+ const nextRows = rows . map ( ( row ) => {
389+ if ( row . id !== id ) return row ;
390+ const { secret : _secret , valueRedacted : _valueRedacted , ...rest } = row ;
391+ return { ...rest , value : "" , ...( secret !== undefined ? { secret } : { } ) } ;
392+ } ) ;
393+ setRows ( nextRows ) ;
394+ publishRows ( nextRows ) ;
395+ } ;
396+
360397 const removeVariable = ( id : string ) => {
361398 const nextRows = rows . filter ( ( row ) => row . id !== id ) ;
362399 setRows ( nextRows ) ;
@@ -403,7 +440,7 @@ export function ProviderEnvironmentSection(props: {
403440 =
404441 </ span >
405442 { variable . sensitive ? (
406- < SecretInput
443+ < SecretSourceInput
407444 size = "sm"
408445 font = "mono"
409446 className = "min-w-0 flex-1"
@@ -413,6 +450,9 @@ export function ProviderEnvironmentSection(props: {
413450 configured = { variable . valueRedacted === true }
414451 spellCheck = { false }
415452 aria-label = { `Environment variable value ${ index + 1 } ` }
453+ sources = { props . secretSources ?? [ ] }
454+ secret = { variable . secret }
455+ onSecretChange = { ( secret ) => setVariableSecret ( variable . id , secret ) }
416456 />
417457 ) : (
418458 < DraftInput
@@ -444,6 +484,7 @@ export function ProviderEnvironmentSection(props: {
444484 } ) ;
445485 } }
446486 aria-pressed = { variable . sensitive }
487+ disabled = { variable . secret !== undefined }
447488 aria-label = { `Mark environment variable ${ variable . name || index + 1 } as sensitive` }
448489 >
449490 < MorphIcon
@@ -584,6 +625,7 @@ interface ProviderInstanceCardProps {
584625 readonly isUpdating ?: boolean | undefined ;
585626 readonly onAcceptUrlAuth ?: ( ( action : AcpRegistryUrlAuthAction ) => void ) | undefined ;
586627 readonly environmentId ?: EnvironmentId | undefined ;
628+ readonly secretSources ?: ReadonlyArray < SecretSource > ;
587629 readonly projectOverride ?: ProjectOverrideControl | undefined ;
588630 readonly acpProjects ?:
589631 | ReadonlyArray < {
@@ -595,6 +637,7 @@ interface ProviderInstanceCardProps {
595637}
596638
597639const EMPTY_ACP_PROJECTS : NonNullable < ProviderInstanceCardProps [ "acpProjects" ] > = [ ] ;
640+ const NO_SECRET_SOURCES : ReadonlyArray < SecretSource > = [ ] ;
598641const NO_CUSTOM_MODELS : ReadonlyArray < CustomModelDefinition > = [ ] ;
599642
600643/** Unknown drivers stay read-only to preserve fork config. projectOverride switches affect only the
@@ -627,6 +670,7 @@ export function ProviderInstanceCard({
627670 onAcceptUrlAuth,
628671 environmentId,
629672 acpProjects = EMPTY_ACP_PROJECTS ,
673+ secretSources = NO_SECRET_SOURCES ,
630674 projectOverride,
631675} : ProviderInstanceCardProps ) {
632676 const enabled = projectOverride ?. effectiveEnabled ?? resolveProviderInstanceEnabled ( instance ) ;
@@ -781,6 +825,12 @@ export function ProviderInstanceCard({
781825 const updateEnvironmentField = ( field : ProviderEnvironmentField , value : string ) => {
782826 updateEnvironment ( nextProviderEnvironmentWithFieldValue ( instance . environment , field , value ) ) ;
783827 } ;
828+ const updateEnvironmentFieldSecret = (
829+ field : ProviderEnvironmentField ,
830+ secret : SecretReference | undefined ,
831+ ) => {
832+ updateEnvironment ( nextProviderEnvironmentWithFieldSecret ( instance . environment , field , secret ) ) ;
833+ } ;
784834 const removeEnvironmentField = ( field : ProviderEnvironmentField ) => {
785835 updateEnvironment ( providerEnvironmentWithoutNames ( instance . environment , new Set ( [ field . name ] ) ) ) ;
786836 } ;
@@ -1182,7 +1232,9 @@ export function ProviderInstanceCard({
11821232 variable = { readProviderEnvironmentVariable ( instance . environment , field . name ) }
11831233 idPrefix = { `provider-instance-${ instanceId } ` }
11841234 onCommit = { updateEnvironmentField }
1235+ onSecretChange = { updateEnvironmentFieldSecret }
11851236 onRemove = { removeEnvironmentField }
1237+ secretSources = { secretSources }
11861238 />
11871239 ) ) }
11881240 </ div >
@@ -1225,6 +1277,7 @@ export function ProviderInstanceCard({
12251277 < ProviderEnvironmentSection
12261278 environment = { genericEnvironment }
12271279 onChange = { updateGenericEnvironment }
1280+ secretSources = { secretSources }
12281281 />
12291282 </ SettingsSection >
12301283 { environmentId !== undefined && liveProvider ?. driver === "acpRegistry" ? (
0 commit comments