Merge remote-tracking branch 'private/cloud/integration' into cloud/agents-buildsheet-row

This commit is contained in:
Neil
2026-11-10 08:53:20 -08:00
6 changed files with 106 additions and 44 deletions
@@ -8,16 +8,14 @@ import type {
CloudSecretView,
CloudSecretsErrorCode
} from '../../../../../shared/cloud-secrets/cloud-secrets-wire'
import { Badge } from '../../ui/badge'
import { InlineError } from '../../ui/inline-error'
import { Skeleton } from '../../ui/skeleton'
import { Button } from '../../ui/button'
import { cloudSecretKindLabel, cloudSecretsErrorCopy } from './cloud-secrets-copy'
import { cloudSecretsErrorCopy } from './cloud-secrets-copy'
import { CloudSecretEditor, type CloudSecretEditorTarget } from './CloudSecretEditor'
import { CloudApiEmptyState } from '../cloud-api/cloud-api-parts'
import { CloudSecretsPasteEnv } from './CloudSecretsPasteEnv'
import { cloudSecretStoredOnVm } from '../../../../../shared/cloud-secrets/cloud-secret-rules'
import { CloudSecretVmBadge } from './CloudSecretVmBadge'
import { CloudSecretChips } from './CloudSecretVmBadge'
import type { CloudSecretListModel } from './use-cloud-secrets'
export type CloudSecretPeople = {
@@ -79,17 +77,12 @@ function SecretRow({
}}
>
<div className="flex min-h-7 items-center gap-3">
<span className="flex min-w-0 flex-1 items-center gap-2">
<code title={secret.name} className="min-w-0 truncate font-mono text-xs">
{/* The name never truncates: chips sit on their own line under it. */}
<span className="flex min-w-0 flex-1 flex-col items-start gap-1 py-0.5">
<code title={secret.name} className="min-w-0 font-mono text-xs break-all">
{secret.name}
</code>
{secret.kind === 'agent_key' && !cloudSecretStoredOnVm(secret.name) ? (
<Badge variant="referenceLabel">
<KeyRound />
{cloudSecretKindLabel(secret.name, t)}
</Badge>
) : null}
<CloudSecretVmBadge name={secret.name} />
<CloudSecretChips name={secret.name} kind={secret.kind} />
</span>
<span className="w-[9ch] shrink-0 font-mono text-xs whitespace-nowrap text-muted-foreground">
<span aria-hidden>{maskedHint(secret.hint)}</span>
@@ -1,7 +1,9 @@
import { TriangleAlert } from 'lucide-react'
import { KeyRound, TriangleAlert } from 'lucide-react'
import { useTranslate } from '@/i18n/use-translate'
import { cloudSecretStoredOnVm } from '../../../../../shared/cloud-secrets/cloud-secret-rules'
import type { CloudSecretKind } from '../../../../../shared/cloud-secrets/cloud-secrets-wire'
import { Badge } from '../../ui/badge'
import { cloudSecretKindLabel } from './cloud-secrets-copy'
import { Tooltip, TooltipContent, TooltipTrigger } from '../../ui/tooltip'
/**
@@ -47,3 +49,30 @@ export function cloudSecretVmWarning(t: ReturnType<typeof useTranslate>, name: s
'Orca can’t swap this key at the network edge, so cloud workspaces get the real value. Anything running in the sandbox can read it.'
)
}
/** The chips on a secret's row, on their own line under the name: Agent key, or Real value in sandbox. */
export function CloudSecretChips({
name,
kind
}: {
name: string
kind: CloudSecretKind
}): React.JSX.Element | null {
const t = useTranslate()
const inFull = cloudSecretStoredOnVm(name)
if (kind !== 'agent_key' && !inFull) {
return null
}
return (
<span className="flex flex-wrap items-center gap-1.5">
{inFull ? (
<CloudSecretVmBadge name={name} />
) : (
<Badge variant="referenceLabel">
<KeyRound />
{cloudSecretKindLabel(name, t)}
</Badge>
)}
</span>
)
}
@@ -1,20 +1,15 @@
import { KeyRound, Layers } from 'lucide-react'
import { Layers } from 'lucide-react'
import { useTranslate, type Translate } from '@/i18n/use-translate'
import type {
CloudSecretScope,
CloudSecretsEffective
} from '../../../../../shared/cloud-secrets/cloud-secrets-wire'
import { Badge } from '../../ui/badge'
import { cloudSecretStoredOnVm } from '../../../../../shared/cloud-secrets/cloud-secret-rules'
import { CloudSecretVmBadge } from './CloudSecretVmBadge'
import { CloudSecretChips } from './CloudSecretVmBadge'
import { InlineError } from '../../ui/inline-error'
import { Skeleton } from '../../ui/skeleton'
import { CloudApiEmptyState } from '../cloud-api/cloud-api-parts'
import {
cloudSecretKindLabel,
cloudSecretScopeLabel,
cloudSecretsErrorCopy
} from './cloud-secrets-copy'
import { cloudSecretScopeLabel, cloudSecretsErrorCopy } from './cloud-secrets-copy'
import { maskedHint } from './CloudSecretList'
import type { Loadable } from './use-cloud-secrets'
@@ -126,15 +121,9 @@ export function CloudSecretsEffectiveView({
{secrets.map((secret) => (
<tr key={secret.name} className="align-middle">
<td className="px-3 py-2">
<span className="flex min-w-0 items-center gap-2">
<code className="truncate font-mono">{secret.name}</code>
{secret.kind === 'agent_key' && !cloudSecretStoredOnVm(secret.name) ? (
<Badge variant="referenceLabel">
<KeyRound />
{cloudSecretKindLabel(secret.name, t)}
</Badge>
) : null}
<CloudSecretVmBadge name={secret.name} />
<span className="flex min-w-0 flex-col items-start gap-1">
<code className="font-mono break-all">{secret.name}</code>
<CloudSecretChips name={secret.name} kind={secret.kind} />
</span>
</td>
<td className="px-3 py-2">