Skip to content

🙌 OpenHands: AI-Driven Development

feat(acp): add model dropdown and credential fields to agent settings page (#14733)

simonrosenbergd0230a218efd
diff --git a/frontend/src/api/conversation-service/v1-conversation-service.api.ts b/frontend/src/api/conversation-service/v1-conversation-service.api.ts
index 2d2acdf208..15810d4f8b 100644
--- a/frontend/src/api/conversation-service/v1-conversation-service.api.ts
+++ b/frontend/src/api/conversation-service/v1-conversation-service.api.ts
@@ -250,6 +250,16 @@ class V1ConversationService {
);
}
+ static async switchAcpModel(
+ conversationId: string,
+ model: string,
+ ): Promise<void> {
+ await openHands.post(
+ `/api/v1/app-conversations/${conversationId}/switch_acp_model`,
+ { model },
+ );
+ }
+
/**
* Resume a V1 conversation
* Uses the custom runtime URL from the conversation
diff --git a/frontend/src/api/option-service/option.types.ts b/frontend/src/api/option-service/option.types.ts
index e99556d526..be92dcdee7 100644
--- a/frontend/src/api/option-service/option.types.ts
+++ b/frontend/src/api/option-service/option.types.ts
@@ -36,10 +36,19 @@ export interface WebClientFeatureFlags {
enable_onboarding: boolean;
}
+export interface ACPModelOption {
+ id: string;
+ label: string;
+}
+
export interface ACPProviderConfig {
key: string;
display_name: string;
default_command: string[];
+ default_model?: string | null;
+ available_models?: ACPModelOption[];
+ api_key_env_var?: string | null;
+ base_url_env_var?: string | null;
}
export interface WebClientConfig {
diff --git a/frontend/src/components/features/chat/change-agent-button.tsx b/frontend/src/components/features/chat/change-agent-button.tsx
index 70d63abe04..4cebddd0a8 100644
--- a/frontend/src/components/features/chat/change-agent-button.tsx
+++ b/frontend/src/components/features/chat/change-agent-button.tsx
@@ -129,6 +129,8 @@ export function ChangeAgentButton() {
setConversationMode("code");
};
+ const isAcp = conversation?.agent_kind === "acp";
+
const isExecutionAgent = conversationMode === "code";
const buttonLabel = useMemo(() => {
@@ -145,6 +147,8 @@ export function ChangeAgentButton() {
return <LessonPlanIcon width={18} height={18} color="#ffffff" />;
}, [isExecutionAgent]);
+ if (isAcp) return null;
+
return (
<div className="relative">
<button
diff --git a/frontend/src/components/features/chat/components/chat-input-actions.tsx b/frontend/src/components/features/chat/components/chat-input-actions.tsx
index dd1785ae8f..ab84a8d89e 100644
--- a/frontend/src/components/features/chat/components/chat-input-actions.tsx
+++ b/frontend/src/components/features/chat/components/chat-input-actions.tsx
@@ -5,6 +5,7 @@ import { useConversationId } from "#/hooks/use-conversation-id";
import { useV1PauseConversation } from "#/hooks/mutation/use-v1-pause-conversation";
import { useV1ResumeConversation } from "#/hooks/mutation/use-v1-resume-conversation";
import { ChangeAgentButton } from "../change-agent-button";
+import { SwitchAcpModelButton } from "../switch-acp-model-button";
import { SwitchProfileButton } from "../switch-profile-button";
interface ChatInputActionsProps {
@@ -38,6 +39,7 @@ export function ChatInputActions({ disabled }: ChatInputActionsProps) {
<Tools />
<ChangeAgentButton />
<SwitchProfileButton />
+ <SwitchAcpModelButton />
</div>
</div>
<AgentStatus
diff --git a/frontend/src/components/features/chat/switch-acp-model-button.tsx b/frontend/src/components/features/chat/switch-acp-model-button.tsx
new file mode 100644
index 0000000000..a2031afaff
--- /dev/null
+++ b/frontend/src/components/features/chat/switch-acp-model-button.tsx
@@ -0,0 +1,213 @@
+import React from "react";
+import { useQueryClient } from "@tanstack/react-query";
+import { useTranslation } from "react-i18next";
+import { Link } from "react-router";
+import { useActiveConversation } from "#/hooks/query/use-active-conversation";
+import { useConversationId } from "#/hooks/use-conversation-id";
+import { useConfig } from "#/hooks/query/use-config";
+import { useSwitchAcpModel } from "#/hooks/mutation/use-switch-acp-model";
+import { useSaveSettings } from "#/hooks/mutation/use-save-settings";
+import { ACP_SERVER_TAG } from "#/utils/agent-display-label";
+import { ContextMenu } from "#/ui/context-menu";
+import { ContextMenuListItem } from "../context-menu/context-menu-list-item";
+import { Divider } from "#/ui/divider";
+import { SettingsNavHeader } from "../settings/settings-nav-header";
+import { ToolsContextMenuIconText } from "../controls/tools-context-menu-icon-text";
+import { useClickOutsideElement } from "#/hooks/use-click-outside-element";
+import { displayErrorToast } from "#/utils/custom-toast-handlers";
+import { extractErrorMessage } from "#/utils/extract-error-message";
+import { I18nKey } from "#/i18n/declaration";
+import { CONTEXT_MENU_ICON_TEXT_CLASSNAME } from "#/utils/constants";
+import { cn } from "#/utils/utils";
+import ChevronDownSmallIcon from "#/icons/chevron-down-small.svg?react";
+import CheckIcon from "#/icons/checkmark.svg?react";
+import SettingsIcon from "#/icons/settings.svg?react";
+import type { ACPModelOption } from "#/api/option-service/option.types";
+
+interface AcpModelMenuProps {
+ models: ACPModelOption[];
+ activeModelId: string | null;
+ onSelect: (modelId: string) => void;
+ onClose: () => void;
+}
+
+function AcpModelMenu({
+ models,
+ activeModelId,
+ onSelect,
+ onClose,
+}: AcpModelMenuProps) {
+ const { t } = useTranslation();
+ const ref = useClickOutsideElement<HTMLUListElement>(onClose);
+
+ React.useEffect(() => {
+ const onKey = (e: KeyboardEvent) => e.key === "Escape" && onClose();
+ document.addEventListener("keydown", onKey);
+ return () => document.removeEventListener("keydown", onKey);
+ }, [onClose]);
+
+ const handleSelect = (e: React.MouseEvent<HTMLButtonElement>, id: string) => {
+ e.preventDefault();
+ e.stopPropagation();
+ onSelect(id);
+ onClose();
+ };
+
+ return (
+ <ContextMenu
+ ref={ref}
+ testId="switch-acp-model-context-menu"
+ position="top"
+ alignment="left"
+ className="left-0 mb-2 bottom-full min-w-[260px] max-h-[60vh] overflow-y-auto"
+ >
+ <SettingsNavHeader
+ text={I18nKey.SETTINGS$AVAILABLE_MODELS}
+ className="px-2 pt-1 pb-1"
+ />
+ {models.map((model) => {
+ const isActive = model.id === activeModelId;
+ return (
+ <ContextMenuListItem
+ key={model.id}
+ testId={`switch-acp-model-option-${model.id}`}
+ onClick={(e) => handleSelect(e, model.id)}
+ className="cursor-pointer p-0 h-auto hover:bg-transparent"
+ >
+ <div
+ className={cn(
+ "flex items-center justify-between gap-2 p-2 rounded",
+ isActive ? "bg-[#5C5D62]" : "hover:bg-[#5C5D62]",
+ )}
+ >
+ <span className="truncate text-sm">{model.label}</span>
+ {isActive && (
+ <CheckIcon width={14} height={14} className="shrink-0" />
+ )}
+ </div>
+ </ContextMenuListItem>
+ );
+ })}
+ <Divider />
+ <Link
+ to="/settings/agent"
+ onClick={onClose}
+ data-testid="switch-acp-model-open-settings"
+ className={cn("block", CONTEXT_MENU_ICON_TEXT_CLASSNAME)}
+ >
+ <ToolsContextMenuIconText
+ icon={<SettingsIcon width={16} height={16} />}
+ text={t(I18nKey.MODEL$OPEN_SETTINGS)}
+ className={CONTEXT_MENU_ICON_TEXT_CLASSNAME}
+ />
+ </Link>
+ </ContextMenu>
+ );
+}
+
+export function SwitchAcpModelButton() {
+ const { t } = useTranslation();
+ const [menuOpen, setMenuOpen] = React.useState(false);
+ const queryClient = useQueryClient();
+ const { conversationId } = useConversationId();
+ const { data: conversation } = useActiveConversation();
+ const { data: config } = useConfig();
+ const { mutate, isPending: isSwitchPending } = useSwitchAcpModel();
+ const { mutate: saveSettings, isPending: isSavePending } = useSaveSettings();
+ const isPending = isSwitchPending || isSavePending;
+
+ const isAcp = conversation?.agent_kind === "acp";
+ const acpServerKey = conversation?.tags?.[ACP_SERVER_TAG] ?? null;
+ const provider = config?.acp_providers?.find((p) => p.key === acpServerKey);
+ const availableModels = provider?.available_models ?? [];
+ const currentModelId = conversation?.llm_model ?? null;
+ // Fall back to the provider's default so the button shows a meaningful label
+ // even before the user or conversation has set an explicit model.
+ const effectiveModelId = currentModelId ?? provider?.default_model ?? null;
+
+ if (!isAcp || availableModels.length === 0) return null;
+
+ const currentLabel =
+ availableModels.find((m) => m.id === effectiveModelId)?.label ??
+ effectiveModelId ??
+ t(I18nKey.LLM$SELECT_MODEL_PLACEHOLDER);
+
+ const handleSelect = (modelId: string) => {
+ if (modelId === effectiveModelId) return;
+ mutate(
+ { conversationId, model: modelId },
+ {
+ onError: (err) => {
+ // 409 means the ACP session is not yet initialised (no first run()).
+ // Fall back to a settings update so the model is applied when the
+ // conversation actually starts.
+ const status = (err as { response?: { status?: number } })?.response
+ ?.status;
+ if (status === 409) {
+ saveSettings(
+ { agent_settings_diff: { acp_model: modelId } },
+ {
+ onSuccess: () => {
+ queryClient.invalidateQueries({
+ queryKey: ["user", "conversation", conversationId],
+ });
+ },
+ onError: (saveErr) =>
+ displayErrorToast(
+ extractErrorMessage(
+ saveErr,
+ t(I18nKey.MODEL$SWITCH_FAILED, { name: modelId }),
+ ),
+ ),
+ },
+ );
+ } else {
+ displayErrorToast(
+ extractErrorMessage(
+ err,
+ t(I18nKey.MODEL$SWITCH_FAILED, { name: modelId }),
+ ),
+ );
+ }
+ },
+ },
+ );
+ };
+
+ return (
+ <div className="relative">
+ <button
+ type="button"
+ onClick={(e) => {
+ e.preventDefault();
+ e.stopPropagation();
+ setMenuOpen((o) => !o);
+ }}
+ disabled={isPending}
+ data-testid="switch-acp-model-button"
+ title={currentModelId ?? undefined}
+ aria-haspopup="menu"
+ aria-expanded={menuOpen}
+ className="flex items-center gap-1 border border-[#4B505F] rounded-[100px] transition-opacity cursor-pointer hover:opacity-80 disabled:opacity-50 disabled:cursor-not-allowed pl-2 max-w-[200px]"
+ >
+ <span className="text-white text-2.75 not-italic font-normal leading-5 truncate">
+ {currentLabel}
+ </span>
+ <ChevronDownSmallIcon
+ width={24}
+ height={24}
+ color="#ffffff"
+ className="shrink-0"
+ />
+ </button>
+ {menuOpen && (
+ <AcpModelMenu
+ models={availableModels}
+ activeModelId={effectiveModelId}
+ onSelect={handleSelect}
+ onClose={() => setMenuOpen(false)}
+ />
+ )}
+ </div>
+ );
+}
diff --git a/frontend/src/components/features/settings/acp-credentials-section.tsx b/frontend/src/components/features/settings/acp-credentials-section.tsx
new file mode 100644
index 0000000000..cd2bca45e9
--- /dev/null
+++ b/frontend/src/components/features/settings/acp-credentials-section.tsx
@@ -0,0 +1,46 @@
+import { useTranslation } from "react-i18next";
+import { AcpSecretField } from "#/components/features/settings/acp-secret-field";
+import { Typography } from "#/ui/typography";
+import { I18nKey } from "#/i18n/declaration";
+import type { AcpCredentialForm } from "#/hooks/use-acp-credential-form";
+
+/**
+ * Settings → Agent credentials section: renders API-key and base-URL fields for
+ * built-in ACP providers (Claude Code, Codex). The form state and the save are
+ * owned by the parent (Settings → Agent) so the page has a single Save button
+ * for both agent settings and credentials. Returns null for providers with no
+ * credential fields (Gemini CLI, custom preset).
+ */
+export function AcpCredentialsSection({ form }: { form: AcpCredentialForm }) {
+ const { t } = useTranslation();
+ const { fields, values, setValue, secretExists } = form;
+
+ if (fields.length === 0) return null;
+
+ return (
+ <div className="flex flex-col gap-4">
+ <div className="flex flex-col gap-1">
+ <Typography.Text className="text-sm font-medium text-white">
+ {t(I18nKey.SETTINGS$ACP_CREDENTIALS_TITLE)}
+ </Typography.Text>
+ <Typography.Text className="text-xs text-[#717888]">
+ {t(I18nKey.SETTINGS$ACP_CREDENTIALS_DESCRIPTION)}
+ </Typography.Text>
+ </div>
+
+ <div className="flex flex-col gap-5">
+ {fields.map((field) => (
+ <AcpSecretField
+ key={field.name}
+ field={field}
+ value={values[field.name] ?? ""}
+ onChange={(value) => setValue(field.name, value)}
+ alreadySet={secretExists(field.name)}
+ testId={`settings-acp-secret-${field.name}`}
+ showOptionalTag
+ />
+ ))}
+ </div>
+ </div>
+ );
+}
diff --git a/frontend/src/components/features/settings/acp-secret-field.tsx b/frontend/src/components/features/settings/acp-secret-field.tsx
new file mode 100644
index 0000000000..94824cf462
--- /dev/null
+++ b/frontend/src/components/features/settings/acp-secret-field.tsx
@@ -0,0 +1,74 @@
+import { useTranslation } from "react-i18next";
+import { SettingsInput } from "#/components/features/settings/settings-input";
+import { OptionalTag } from "#/components/features/settings/optional-tag";
+import { I18nKey } from "#/i18n/declaration";
+import type { ACPProviderSecretField } from "#/constants/acp-provider-secrets";
+
+interface AcpSecretFieldProps {
+ field: ACPProviderSecretField;
+ value: string;
+ onChange: (value: string) => void;
+ alreadySet: boolean;
+ testId: string;
+ showOptionalTag?: boolean;
+}
+
+/**
+ * A single ACP credential field — either a multiline textarea for file-content
+ * blobs or a masked/plain SettingsInput for keys and base URLs.
+ */
+export function AcpSecretField({
+ field,
+ value,
+ onChange,
+ alreadySet,
+ testId,
+ showOptionalTag,
+}: AcpSecretFieldProps) {
+ const { t } = useTranslation();
+ const placeholder = alreadySet
+ ? t(I18nKey.SETTINGS$ACP_SECRET_ALREADY_SET)
+ : "";
+
+ return (
+ <div className="flex flex-col gap-1.5">
+ {field.multiline ? (
+ <label className="flex flex-col gap-2.5">
+ <span className="flex items-center gap-2">
+ <span className="text-sm font-mono text-white">{field.name}</span>
+ {showOptionalTag && <OptionalTag />}
+ </span>
+ <textarea
+ data-testid={testId}
+ name={field.name}
+ rows={4}
+ spellCheck={false}
+ autoCapitalize="off"
+ autoComplete="off"
+ autoCorrect="off"
+ value={value}
+ placeholder={placeholder}
+ onChange={(e) => onChange(e.target.value)}
+ className="bg-tertiary border border-[#717888] rounded-sm p-2 text-xs font-mono text-white placeholder:italic placeholder:text-[#717888] min-h-[80px] resize-y focus:outline-none focus:border-white"
+ />
+ </label>
+ ) : (
+ <SettingsInput
+ testId={testId}
+ name={field.name}
+ label={field.name}
+ labelClassName="font-mono"
+ type={field.secret ? "password" : "text"}
+ value={value}
+ onChange={onChange}
+ showOptionalTag={showOptionalTag}
+ placeholder={placeholder}
+ autoComplete={field.secret ? "new-password" : "off"}
+ />
+ )}
+ <span className="text-xs text-[#717888]">
+ {t(field.hint_key, field.hint_values)}
+ </span>
+ </div>
+ );
+}
diff --git a/frontend/src/components/features/settings/settings-input.tsx b/frontend/src/components/features/settings/settings-input.tsx
index af293d0079..366d75ca45 100644
--- a/frontend/src/components/features/settings/settings-input.tsx
+++ b/frontend/src/components/features/settings/settings-input.tsx
@@ -21,6 +21,7 @@ interface SettingsInputProps {
step?: number;
pattern?: string;
labelClassName?: string;
+ autoComplete?: string;
}
export function SettingsInput({
@@ -43,6 +44,7 @@ export function SettingsInput({
step,
pattern,
labelClassName,
+ autoComplete,
}: SettingsInputProps) {
return (
<label className={cn("flex flex-col gap-2.5 w-fit", className)}>
@@ -66,6 +68,7 @@ export function SettingsInput({
step={step}
required={required}
pattern={pattern}
+ autoComplete={autoComplete}
className={cn(
"bg-tertiary border border-[#717888] h-10 w-full max-w-[680px] rounded-sm p-2 placeholder:italic placeholder:text-tertiary-alt",
"disabled:bg-[#2D2F36] disabled:border-[#2D2F36] disabled:cursor-not-allowed",
diff --git a/frontend/src/constants/acp-provider-secrets.ts b/frontend/src/constants/acp-provider-secrets.ts
new file mode 100644
index 0000000000..baa97bdc38
--- /dev/null
+++ b/frontend/src/constants/acp-provider-secrets.ts
@@ -0,0 +1,110 @@
+import { I18nKey } from "#/i18n/declaration";
+import type { ACPProviderConfig } from "#/api/option-service/option.types";
+
+/**
+ * A credential an ACP provider authenticates with. The {@link name} is both
+ * the global-secret name and the env var the agent-server injects into the
+ * ACP subprocess — keeping them identical is what makes a saved secret
+ * actually reach the CLI.
+ */
+export interface ACPProviderSecretField {
+ name: string;
+ secret?: boolean;
+ multiline?: boolean;
+ hint_key: I18nKey;
+ hint_values?: Record<string, string>;
+}
+
+// Provider-specific extras that are NOT in the SDK registry:
+// OAuth/subscription tokens and file-content secrets (auth.json blobs, Vertex SA).
+// The api_key and base_url fields are derived from the SDK-sourced provider config
+// (ACPProviderConfig.api_key_env_var / base_url_env_var) to avoid duplication.
+const ACP_PROVIDER_SECRETS_EXTRA: Record<string, ACPProviderSecretField[]> = {
+ "claude-code": [
+ {
+ name: "CLAUDE_CODE_OAUTH_TOKEN",
+ secret: true,
+ hint_key: I18nKey.SETTINGS$ACP_SECRET_OAUTH_TOKEN_HINT,
+ },
+ ],
+ codex: [
+ {
+ name: "CODEX_AUTH_JSON",
+ secret: true,
+ multiline: true,
+ hint_key: I18nKey.SETTINGS$ACP_SECRET_FILE_BLOB_HINT,
+ hint_values: { file: "~/.codex/auth.json" },
+ },
+ ],
+ "gemini-cli": [
+ {
+ name: "GOOGLE_APPLICATION_CREDENTIALS_JSON",
+ secret: true,
+ multiline: true,
+ hint_key: I18nKey.SETTINGS$ACP_SECRET_FILE_BLOB_HINT,
+ hint_values: {
+ file: "~/.config/gcloud/application_default_credentials.json",
+ },
+ },
+ {
+ name: "GOOGLE_CLOUD_PROJECT",
+ hint_key: I18nKey.SETTINGS$ACP_SECRET_GCP_PROJECT_HINT,
+ },
+ {
+ name: "GOOGLE_CLOUD_LOCATION",
+ hint_key: I18nKey.SETTINGS$ACP_SECRET_GCP_LOCATION_HINT,
+ },
+ {
+ name: "GOOGLE_GENAI_USE_VERTEXAI",
+ hint_key: I18nKey.SETTINGS$ACP_SECRET_VERTEXAI_FLAG_HINT,
+ },
+ ],
+};
+
+/**
+ * Returns credential fields for the given ACP provider key.
+ * ``providerConfig`` is the SDK-sourced config for the provider; when supplied,
+ * api_key and base_url fields are derived from it rather than hardcoded here.
+ * Returns [] for custom presets and unknown keys.
+ */
+export function getAcpProviderSecrets(
+ key: string | null | undefined,
+ providerConfig?: ACPProviderConfig,
+): ACPProviderSecretField[] {
+ if (!key) return [];
+ const extra = ACP_PROVIDER_SECRETS_EXTRA[key] ?? [];
+ const sdkFields: ACPProviderSecretField[] = [];
+ if (providerConfig?.api_key_env_var) {
+ sdkFields.push({
+ name: providerConfig.api_key_env_var,
+ secret: true,
+ hint_key: I18nKey.SETTINGS$ACP_SECRET_API_KEY_HINT,
+ });
+ }
+ if (providerConfig?.base_url_env_var) {
+ sdkFields.push({
+ name: providerConfig.base_url_env_var,
+ hint_key: I18nKey.SETTINGS$ACP_SECRET_BASE_URL_HINT,
+ });
+ }
+ return [...extra, ...sdkFields];
+}
+
+/**
+ * Returns [credential, conflicting] pairs where both are set (typed or saved).
+ * Claude's OAuth token authenticates against Anthropic directly; an
+ * ANTHROPIC_BASE_URL set alongside it silently routes requests elsewhere
+ * and breaks the token's bearer auth.
+ */
+const ACP_CREDENTIAL_CONFLICTS: Record<string, [string, string][]> = {
+ "claude-code": [["CLAUDE_CODE_OAUTH_TOKEN", "ANTHROPIC_BASE_URL"]],
+};
+
+export function getAcpCredentialConflicts(
+ key: string | null | undefined,
+ hasValueFor: (name: string) => boolean,
+): Array<[string, string]> {
+ if (!key) return [];
+ const pairs = ACP_CREDENTIAL_CONFLICTS[key] ?? [];
+ return pairs.filter(([a, b]) => hasValueFor(a) && hasValueFor(b));
+}
diff --git a/frontend/src/hooks/mutation/use-switch-acp-model.ts b/frontend/src/hooks/mutation/use-switch-acp-model.ts
new file mode 100644
index 0000000000..49ccbc1cdc
--- /dev/null
+++ b/frontend/src/hooks/mutation/use-switch-acp-model.ts
@@ -0,0 +1,23 @@
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+
+interface SwitchAcpModelVars {
+ conversationId: string;
+ model: string;
+}
+
+export const useSwitchAcpModel = () => {
+ const queryClient = useQueryClient();
+
+ return useMutation({
+ mutationFn: ({ conversationId, model }: SwitchAcpModelVars) =>
+ V1ConversationService.switchAcpModel(conversationId, model),
+ onSuccess: (_data, { conversationId }) => {
+ // Refetch so the chat header picks up the new model (backend persisted it).
+ queryClient.invalidateQueries({
+ queryKey: ["user", "conversation", conversationId],
+ });
+ },
+ meta: { disableToast: true },
+ });
+};
diff --git a/frontend/src/hooks/use-acp-credential-form.ts b/frontend/src/hooks/use-acp-credential-form.ts
new file mode 100644
index 0000000000..d69f6c214e
--- /dev/null
+++ b/frontend/src/hooks/use-acp-credential-form.ts
@@ -0,0 +1,81 @@
+import React from "react";
+import { useSearchSecrets } from "#/hooks/query/use-get-secrets";
+import { useSaveAcpSecrets } from "#/hooks/use-save-acp-secrets";
+import {
+ getAcpProviderSecrets,
+ getAcpCredentialConflicts,
+ type ACPProviderSecretField,
+} from "#/constants/acp-provider-secrets";
+import type { ACPProviderConfig } from "#/api/option-service/option.types";
+
+export interface AcpCredentialForm {
+ fields: ACPProviderSecretField[];
+ values: Record<string, string>;
+ setValue: (name: string, value: string) => void;
+ secretExists: (name: string) => boolean;
+ hasValueFor: (name: string) => boolean;
+ conflicts: Array<[string, string]>;
+ isDirty: boolean;
+ save: (options?: { silent?: boolean }) => Promise<boolean>;
+ reset: () => void;
+ isSaving: boolean;
+}
+
+/**
+ * Manages credential form state for a built-in ACP provider.
+ * ``providerConfig`` is the SDK-sourced config used to derive api_key and
+ * base_url field names; pass the matching ACPProviderConfig when available.
+ * Resets typed values whenever ``providerKey`` changes.
+ */
+export function useAcpCredentialForm(
+ providerKey: string | null | undefined,
+ providerConfig?: ACPProviderConfig,
+): AcpCredentialForm {
+ const { data: existingSecrets } = useSearchSecrets();
+ const fields = React.useMemo(
+ () => getAcpProviderSecrets(providerKey, providerConfig),
+ [providerKey, providerConfig],
+ );
+ const [values, setValues] = React.useState<Record<string, string>>({});
+ const { saveFilled, isSaving } = useSaveAcpSecrets(fields);
+
+ React.useEffect(() => {
+ setValues({});
+ }, [providerKey]);
+
+ const secretExists = React.useCallback(
+ (name: string) => (existingSecrets ?? []).some((s) => s.name === name),
+ [existingSecrets],
+ );
+
+ const hasValueFor = React.useCallback(
+ (name: string) => Boolean(values[name]?.trim()) || secretExists(name),
+ [values, secretExists],
+ );
+
+ const setValue = React.useCallback(
+ (name: string, value: string) =>
+ setValues((prev) => ({ ...prev, [name]: value })),
+ [],
+ );
+
+ const reset = React.useCallback(() => setValues({}), []);
+
+ const conflicts = React.useMemo(
+ () => getAcpCredentialConflicts(providerKey, hasValueFor),
+ [providerKey, hasValueFor],
+ );
+
+ return {
+ fields,
+ values,
+ setValue,
+ secretExists,
+ hasValueFor,
+ conflicts,
+ isDirty: fields.some((f) => Boolean(values[f.name]?.trim())),
+ save: (options) => saveFilled(values, options),
+ reset,
+ isSaving,
+ };
+}
diff --git a/frontend/src/hooks/use-save-acp-secrets.ts b/frontend/src/hooks/use-save-acp-secrets.ts
new file mode 100644
index 0000000000..047cb5a784
--- /dev/null
+++ b/frontend/src/hooks/use-save-acp-secrets.ts
@@ -0,0 +1,56 @@
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { useQueryClient } from "@tanstack/react-query";
+import { AxiosError } from "axios";
+import { I18nKey } from "#/i18n/declaration";
+import { useCreateSecret } from "#/hooks/mutation/use-create-secret";
+import type { ACPProviderSecretField } from "#/constants/acp-provider-secrets";
+import {
+ displayErrorToast,
+ displaySuccessToast,
+} from "#/utils/custom-toast-handlers";
+import { retrieveAxiosErrorMessage } from "#/utils/retrieve-axios-error-message";
+
+/**
+ * Persists each filled ACP credential field as a global secret and refreshes
+ * the secret query cache. ``saveFilled`` resolves ``true`` on success (or when
+ * nothing needed saving) and ``false`` on error so callers can gate navigation.
+ * ``silent`` suppresses the success toast when the caller emits its own.
+ */
+export function useSaveAcpSecrets(fields: ACPProviderSecretField[]) {
+ const { t } = useTranslation();
+ const queryClient = useQueryClient();
+ const { mutateAsync: createSecret } = useCreateSecret();
+ const [isSaving, setIsSaving] = React.useState(false);
+
+ const saveFilled = async (
+ values: Record<string, string>,
+ { silent = false }: { silent?: boolean } = {},
+ ) => {
+ const toSave = fields
+ .map((field) => ({ name: field.name, value: values[field.name]?.trim() }))
+ .filter((entry): entry is { name: string; value: string } =>
+ Boolean(entry.value),
+ );
+ if (toSave.length === 0) return true;
+
+ setIsSaving(true);
+ try {
+ await Promise.all(
+ toSave.map(({ name, value }) => createSecret({ name, value })),
+ );
+ await queryClient.invalidateQueries({ queryKey: ["secrets-search"] });
+ await queryClient.invalidateQueries({ queryKey: ["secrets"] });
+ if (!silent) displaySuccessToast(t(I18nKey.SETTINGS$SAVED));
+ return true;
+ } catch (error) {
+ const message = retrieveAxiosErrorMessage(error as AxiosError);
+ displayErrorToast(message || t(I18nKey.ERROR$GENERIC));
+ return false;
+ } finally {
+ setIsSaving(false);
+ }
+ };
+
+ return { saveFilled, isSaving };
+}
diff --git a/frontend/src/i18n/declaration.ts b/frontend/src/i18n/declaration.ts
index 074eb9bedc..c338d42c38 100644
--- a/frontend/src/i18n/declaration.ts
+++ b/frontend/src/i18n/declaration.ts
@@ -1500,6 +1500,7 @@ export enum I18nKey {
SETTINGS$PROFILE_RENAMED = "SETTINGS$PROFILE_RENAMED",
SETTINGS$PROFILE_DELETED = "SETTINGS$PROFILE_DELETED",
SETTINGS$PROFILE_ACTIVATED = "SETTINGS$PROFILE_ACTIVATED",
+ SETTINGS$AVAILABLE_MODELS = "SETTINGS$AVAILABLE_MODELS",
SETTINGS$AVAILABLE_PROFILES = "SETTINGS$AVAILABLE_PROFILES",
SETTINGS$BACK_TO_LLM_LIST = "SETTINGS$BACK_TO_LLM_LIST",
SETTINGS$ADD_LLM_PROFILE = "SETTINGS$ADD_LLM_PROFILE",
@@ -1555,4 +1556,16 @@ export enum I18nKey {
PROJECT_MANAGEMENT$JIRA_DC_EDIT_BUTTON_LABEL = "PROJECT_MANAGEMENT$JIRA_DC_EDIT_BUTTON_LABEL",
PROJECT_MANAGEMENT$JIRA_DC_COL_STATUS = "PROJECT_MANAGEMENT$JIRA_DC_COL_STATUS",
PROJECT_MANAGEMENT$JIRA_DC_COL_ACTION = "PROJECT_MANAGEMENT$JIRA_DC_COL_ACTION",
+ SETTINGS$AGENT_MODEL = "SETTINGS$AGENT_MODEL",
+ SETTINGS$AGENT_CUSTOM_MODEL = "SETTINGS$AGENT_CUSTOM_MODEL",
+ SETTINGS$ACP_CREDENTIALS_TITLE = "SETTINGS$ACP_CREDENTIALS_TITLE",
+ SETTINGS$ACP_CREDENTIALS_DESCRIPTION = "SETTINGS$ACP_CREDENTIALS_DESCRIPTION",
+ SETTINGS$ACP_SECRET_ALREADY_SET = "SETTINGS$ACP_SECRET_ALREADY_SET",
+ SETTINGS$ACP_SECRET_API_KEY_HINT = "SETTINGS$ACP_SECRET_API_KEY_HINT",
+ SETTINGS$ACP_SECRET_BASE_URL_HINT = "SETTINGS$ACP_SECRET_BASE_URL_HINT",
+ SETTINGS$ACP_SECRET_OAUTH_TOKEN_HINT = "SETTINGS$ACP_SECRET_OAUTH_TOKEN_HINT",
+ SETTINGS$ACP_SECRET_FILE_BLOB_HINT = "SETTINGS$ACP_SECRET_FILE_BLOB_HINT",
+ SETTINGS$ACP_SECRET_GCP_PROJECT_HINT = "SETTINGS$ACP_SECRET_GCP_PROJECT_HINT",
+ SETTINGS$ACP_SECRET_GCP_LOCATION_HINT = "SETTINGS$ACP_SECRET_GCP_LOCATION_HINT",
+ SETTINGS$ACP_SECRET_VERTEXAI_FLAG_HINT = "SETTINGS$ACP_SECRET_VERTEXAI_FLAG_HINT",
}
diff --git a/frontend/src/i18n/translation.json b/frontend/src/i18n/translation.json
index 112d5b1969..3798c5a0e3 100644
--- a/frontend/src/i18n/translation.json
+++ b/frontend/src/i18n/translation.json
@@ -25499,6 +25499,23 @@
"tr": "\"{{name}}\" profiline geçildi",
"uk": "Перемкнуто на профіль \"{{name}}\""
},
+ "SETTINGS$AVAILABLE_MODELS": {
+ "en": "Available Models",
+ "ja": "利用可能なモデル",
+ "zh-CN": "可用模型",
+ "zh-TW": "可用模型",
+ "ko-KR": "사용 가능한 모델",
+ "no": "Tilgjengelige modeller",
+ "ar": "النماذج المتاحة",
+ "de": "Verfügbare Modelle",
+ "fr": "Modèles disponibles",
+ "it": "Modelli disponibili",
+ "pt": "Modelos disponíveis",
+ "es": "Modelos disponibles",
+ "ca": "Models disponibles",
+ "tr": "Kullanılabilir Modeller",
+ "uk": "Доступні моделі"
+ },
"SETTINGS$AVAILABLE_PROFILES": {
"en": "Available Profiles",
"ja": "利用可能なプロファイル",
@@ -26433,5 +26450,209 @@
"ca": "Acció",
"tr": "Eylem",
"uk": "Дія"
+ },
+ "SETTINGS$AGENT_MODEL": {
+ "en": "Model",
+ "ja": "モデル",
+ "zh-CN": "模型",
+ "zh-TW": "模型",
+ "ko-KR": "모델",
+ "no": "Modell",
+ "ar": "النموذج",
+ "de": "Modell",
+ "fr": "Modèle",
+ "it": "Modello",
+ "pt": "Modelo",
+ "es": "Modelo",
+ "ca": "Model",
+ "tr": "Model",
+ "uk": "Модель"
+ },
+ "SETTINGS$AGENT_CUSTOM_MODEL": {
+ "en": "Custom model",
+ "ja": "カスタムモデル",
+ "zh-CN": "自定义模型",
+ "zh-TW": "自訂模型",
+ "ko-KR": "사용자 정의 모델",
+ "no": "Tilpasset modell",
+ "ar": "نموذج مخصص",
+ "de": "Benutzerdefiniertes Modell",
+ "fr": "Modèle personnalisé",
+ "it": "Modello personalizzato",
+ "pt": "Modelo personalizado",
+ "es": "Modelo personalizado",
+ "ca": "Model personalitzat",
+ "tr": "Özel model",
+ "uk": "Спеціальна модель"
+ },
+ "SETTINGS$ACP_CREDENTIALS_TITLE": {
+ "en": "Credentials",
+ "ja": "認証情報",
+ "zh-CN": "凭据",
+ "zh-TW": "憑證",
+ "ko-KR": "자격 증명",
+ "no": "Legitimasjon",
+ "ar": "بيانات الاعتماد",
+ "de": "Anmeldedaten",
+ "fr": "Identifiants",
+ "it": "Credenziali",
+ "pt": "Credenciais",
+ "es": "Credenciales",
+ "ca": "Credencials",
+ "tr": "Kimlik Bilgileri",
+ "uk": "Облікові дані"
+ },
+ "SETTINGS$ACP_CREDENTIALS_DESCRIPTION": {
+ "en": "API key and optional base URL for this provider. Saved as global secrets and injected into the agent subprocess at runtime.",
+ "ja": "このプロバイダーのAPIキーとオプションのベースURL。グローバルシークレットとして保存され、実行時にエージェントサブプロセスに注入されます。",
+ "zh-CN": "此提供商的API密钥和可选基础URL。保存为全局密钥,并在运行时注入到代理子进程中。",
+ "zh-TW": "此提供者的API金鑰和可選基礎URL。儲存為全域密鑰,並在執行時注入代理子程序中。",
+ "ko-KR": "이 공급자의 API 키와 선택적 기본 URL. 글로벌 시크릿으로 저장되어 런타임에 에이전트 서브프로세스에 주입됩니다.",
+ "no": "API-nøkkel og valgfri basis-URL for denne leverandøren. Lagres som globale hemmeligheter og injiseres i agentunderprosessen ved kjøring.",
+ "ar": "مفتاح API وعنوان URL الأساسي الاختياري لهذا المزود. يُحفظ كأسرار عامة ويُحقن في العملية الفرعية للوكيل أثناء التشغيل.",
+ "de": "API-Schlüssel und optionale Basis-URL für diesen Anbieter. Wird als globale Geheimnisse gespeichert und zur Laufzeit in den Agent-Unterprozess injiziert.",
+ "fr": "Clé API et URL de base optionnelle pour ce fournisseur. Enregistrées comme secrets globaux et injectées dans le sous-processus de l'agent au moment de l'exécution.",
+ "it": "Chiave API e URL base opzionale per questo provider. Salvata come segreti globali e iniettata nel sottoprocesso dell'agente in fase di esecuzione.",
+ "pt": "Chave API e URL base opcional para este provedor. Salva como segredos globais e injetada no subprocesso do agente em tempo de execução.",
+ "es": "Clave API y URL base opcional para este proveedor. Se guarda como secretos globales y se inyecta en el subproceso del agente en tiempo de ejecución.",
+ "ca": "Clau API i URL base opcional per a aquest proveïdor. Es desa com a secrets globals i s'injecta al subprocés de l'agent en temps d'execució.",
+ "tr": "Bu sağlayıcı için API anahtarı ve isteğe bağlı temel URL. Genel sırlar olarak kaydedilir ve çalışma zamanında ajan alt sürecine enjekte edilir.",
+ "uk": "API-ключ і необов'язковий базовий URL для цього провайдера. Зберігається як глобальні секрети та вводиться в підпроцес агента під час виконання."
+ },
+ "SETTINGS$ACP_SECRET_ALREADY_SET": {
+ "en": "already saved — type to replace",
+ "ja": "保存済み — 置き換えるには入力",
+ "zh-CN": "已保存 — 输入以替换",
+ "zh-TW": "已儲存 — 輸入以取代",
+ "ko-KR": "이미 저장됨 — 교체하려면 입력",
+ "no": "allerede lagret — skriv for å erstatte",
+ "ar": "محفوظ بالفعل — اكتب للاستبدال",
+ "de": "bereits gespeichert — zum Ersetzen eingeben",
+ "fr": "déjà enregistré — tapez pour remplacer",
+ "it": "già salvato — digita per sostituire",
+ "pt": "já salvo — digite para substituir",
+ "es": "ya guardado — escribe para reemplazar",
+ "ca": "ja desat — escriu per substituir",
+ "tr": "zaten kaydedildi — değiştirmek için yazın",
+ "uk": "вже збережено — введіть для заміни"
+ },
+ "SETTINGS$ACP_SECRET_API_KEY_HINT": {
+ "en": "API key for this provider. Leave blank to use a subscription login or an env var already set on the backend.",
+ "ja": "このプロバイダーのAPIキー。サブスクリプションログインまたはバックエンドで既に設定されている環境変数を使用するには空白にしてください。",
+ "zh-CN": "此提供商的API密钥。留空可使用订阅登录或后端已设置的环境变量。",
+ "zh-TW": "此提供者的API金鑰。留空可使用訂閱登入或後端已設定的環境變數。",
+ "ko-KR": "이 공급자의 API 키. 구독 로그인 또는 백엔드에 이미 설정된 환경 변수를 사용하려면 비워두세요.",
+ "no": "API-nøkkel for denne leverandøren. La stå tomt for å bruke et abonnementsinnlogging eller en env-variabel som allerede er satt på backend.",
+ "ar": "مفتاح API لهذا المزود. اتركه فارغاً لاستخدام تسجيل دخول الاشتراك أو متغير بيئة مُعيَّن بالفعل في الخلفية.",
+ "de": "API-Schlüssel für diesen Anbieter. Leer lassen, um einen Abonnement-Login oder eine bereits im Backend festgelegte Umgebungsvariable zu verwenden.",
+ "fr": "Clé API pour ce fournisseur. Laisser vide pour utiliser une connexion par abonnement ou une variable d'environnement déjà définie sur le backend.",
+ "it": "Chiave API per questo provider. Lasciare vuoto per utilizzare un accesso tramite abbonamento o una variabile d'ambiente già impostata sul backend.",
+ "pt": "Chave API para este provedor. Deixe em branco para usar um login de assinatura ou uma variável de ambiente já definida no backend.",
+ "es": "Clave API para este proveedor. Dejar en blanco para usar un inicio de sesión de suscripción o una variable de entorno ya configurada en el backend.",
+ "ca": "Clau API per a aquest proveïdor. Deixeu en blanc per utilitzar un inici de sessió de subscripció o una variable d'entorn ja configurada al backend.",
+ "tr": "Bu sağlayıcı için API anahtarı. Abonelik girişi veya arka uçta zaten ayarlanmış bir ortam değişkeni kullanmak için boş bırakın.",
+ "uk": "API-ключ для цього провайдера. Залиште порожнім, щоб використовувати вхід за підпискою або змінну середовища, вже встановлену у бекенді."
+ },
+ "SETTINGS$ACP_SECRET_BASE_URL_HINT": {
+ "en": "Optional base URL override for proxies or alternative API gateways.",
+ "ja": "プロキシや代替APIゲートウェイのためのオプションのベースURLオーバーライド。",
+ "zh-CN": "用于代理或替代API网关的可选基础URL覆盖。",
+ "zh-TW": "用於代理或替代API閘道的可選基礎URL覆寫。",
+ "ko-KR": "프록시 또는 대체 API 게이트웨이를 위한 선택적 기본 URL 재정의.",
+ "no": "Valgfri basis-URL-overstyring for proxyer eller alternative API-gatewayer.",
+ "ar": "تجاوز URL الأساسي الاختياري للبروكسيات أو بوابات API البديلة.",
+ "de": "Optionale Basis-URL-Überschreibung für Proxys oder alternative API-Gateways.",
+ "fr": "Remplacement optionnel de l'URL de base pour les proxys ou les passerelles API alternatives.",
+ "it": "Override opzionale dell'URL base per proxy o gateway API alternativi.",
+ "pt": "Substituição opcional de URL base para proxies ou gateways de API alternativos.",
+ "es": "Sustitución opcional de URL base para proxies o puertas de enlace de API alternativas.",
+ "ca": "Substitució opcional de la URL base per a proxies o passarel·les d'API alternatives.",
+ "tr": "Proxy'ler veya alternatif API ağ geçitleri için isteğe bağlı temel URL geçersiz kılma.",
+ "uk": "Необов'язкове перевизначення базового URL для проксі-серверів або альтернативних шлюзів API."
+ },
+ "SETTINGS$ACP_SECRET_OAUTH_TOKEN_HINT": {
+ "en": "Subscription OAuth token for Claude Pro/Max. Run `claude setup-token` in your terminal to get it.",
+ "ja": "Claude Pro/Max のサブスクリプション OAuth トークン。ターミナルで `claude setup-token` を実行して取得してください。",
+ "zh-CN": "Claude Pro/Max 的订阅 OAuth 令牌。在终端运行 `claude setup-token` 获取。",
+ "zh-TW": "Claude Pro/Max 的訂閱 OAuth 權杖。在終端機執行 `claude setup-token` 取得。",
+ "ko-KR": "Claude Pro/Max 구독 OAuth 토큰입니다. 터미널에서 `claude setup-token`을 실행해 받으세요.",
+ "no": "OAuth-token for Claude Pro/Max-abonnement. Kjør `claude setup-token` i terminalen for å hente det.",
+ "ar": "رمز OAuth لاشتراك Claude Pro/Max. شغّل `claude setup-token` في الطرفية للحصول عليه.",
+ "de": "OAuth-Token des Claude-Pro/Max-Abonnements. Führe `claude setup-token` im Terminal aus, um es zu erhalten.",
+ "fr": "Jeton OAuth d'abonnement Claude Pro/Max. Exécutez `claude setup-token` dans votre terminal pour l'obtenir.",
+ "it": "Token OAuth dell'abbonamento Claude Pro/Max. Esegui `claude setup-token` nel terminale per ottenerlo.",
+ "pt": "Token OAuth da assinatura Claude Pro/Max. Execute `claude setup-token` no terminal para obtê-lo.",
+ "es": "Token OAuth de la suscripción Claude Pro/Max. Ejecuta `claude setup-token` en tu terminal para obtenerlo.",
+ "ca": "Token OAuth de la subscripció Claude Pro/Max. Executa `claude setup-token` al terminal per obtenir-lo.",
+ "tr": "Claude Pro/Max abonelik OAuth belirteci. Almak için terminalde `claude setup-token` çalıştırın.",
+ "uk": "OAuth-токен передплати Claude Pro/Max. Виконайте `claude setup-token` у терміналі, щоб отримати його."
+ },
+ "SETTINGS$ACP_SECRET_FILE_BLOB_HINT": {
+ "en": "Paste the full contents of {{file}}. Run `cat {{file}}` to get it. Saved as a secret and written to disk for the agent at runtime.",
+ "ja": "{{file}} の内容全体を貼り付けてください。`cat {{file}}` を実行して取得できます。シークレットとして保存され、実行時にエージェント用にディスクへ書き出されます。",
+ "zh-CN": "粘贴 {{file}} 的完整内容。运行 `cat {{file}}` 获取。它会作为密钥保存,并在运行时写入磁盘供智能体使用。",
+ "zh-TW": "貼上 {{file}} 的完整內容。執行 `cat {{file}}` 取得。將以密鑰形式儲存,並在執行時寫入磁碟供代理使用。",
+ "ko-KR": "{{file}}의 전체 내용을 붙여넣으세요. `cat {{file}}`을 실행해 가져올 수 있습니다. 비밀로 저장되며 실행 시 에이전트를 위해 디스크에 기록됩니다.",
+ "no": "Lim inn hele innholdet i {{file}}. Kjør `cat {{file}}` for å hente det. Lagres som en hemmelighet og skrives til disk for agenten ved kjøretid.",
+ "ar": "الصق المحتوى الكامل لـ {{file}}. شغّل `cat {{file}}` للحصول عليه. يُحفظ كسرّ ويُكتب على القرص للوكيل عند التشغيل.",
+ "de": "Füge den vollständigen Inhalt von {{file}} ein. Führe `cat {{file}}` aus, um ihn zu erhalten. Wird als Secret gespeichert und zur Laufzeit für den Agenten auf die Festplatte geschrieben.",
+ "fr": "Collez le contenu complet de {{file}}. Exécutez `cat {{file}}` pour l'obtenir. Enregistré comme secret et écrit sur le disque pour l'agent à l'exécution.",
+ "it": "Incolla l'intero contenuto di {{file}}. Esegui `cat {{file}}` per ottenerlo. Salvato come secret e scritto su disco per l'agente in fase di esecuzione.",
+ "pt": "Cole o conteúdo completo de {{file}}. Execute `cat {{file}}` para obtê-lo. Salvo como secret e gravado em disco para o agente em tempo de execução.",
+ "es": "Pega el contenido completo de {{file}}. Ejecuta `cat {{file}}` para obtenerlo. Se guarda como secreto y se escribe en disco para el agente en tiempo de ejecución.",
+ "ca": "Enganxa el contingut complet de {{file}}. Executa `cat {{file}}` per obtenir-lo. Es desa com a secret i s'escriu al disc per a l'agent en temps d'execució.",
+ "tr": "{{file}} dosyasının tüm içeriğini yapıştırın. Almak için `cat {{file}}` çalıştırın. Bir secret olarak kaydedilir ve çalışma zamanında ajan için diske yazılır.",
+ "uk": "Вставте повний вміст {{file}}. Виконайте `cat {{file}}`, щоб отримати його. Зберігається як секрет і записується на диск для агента під час виконання."
+ },
+ "SETTINGS$ACP_SECRET_GCP_PROJECT_HINT": {
+ "en": "Google Cloud project ID for Vertex AI (e.g. the output of `gcloud config get-value project`).",
+ "ja": "Vertex AI 用の Google Cloud プロジェクト ID(例: `gcloud config get-value project` の出力)。",
+ "zh-CN": "用于 Vertex AI 的 Google Cloud 项目 ID(例如 `gcloud config get-value project` 的输出)。",
+ "zh-TW": "用於 Vertex AI 的 Google Cloud 專案 ID(例如 `gcloud config get-value project` 的輸出)。",
+ "ko-KR": "Vertex AI용 Google Cloud 프로젝트 ID(예: `gcloud config get-value project`의 출력).",
+ "no": "Google Cloud-prosjekt-ID for Vertex AI (f.eks. utdata fra `gcloud config get-value project`).",
+ "ar": "معرّف مشروع Google Cloud لـ Vertex AI (مثل ناتج `gcloud config get-value project`).",
+ "de": "Google-Cloud-Projekt-ID für Vertex AI (z. B. die Ausgabe von `gcloud config get-value project`).",
+ "fr": "ID de projet Google Cloud pour Vertex AI (par ex. la sortie de `gcloud config get-value project`).",
+ "it": "ID progetto Google Cloud per Vertex AI (ad es. l'output di `gcloud config get-value project`).",
+ "pt": "ID do projeto Google Cloud para o Vertex AI (por ex. a saída de `gcloud config get-value project`).",
+ "es": "ID de proyecto de Google Cloud para Vertex AI (p. ej. la salida de `gcloud config get-value project`).",
+ "ca": "ID de projecte de Google Cloud per a Vertex AI (p. ex. la sortida de `gcloud config get-value project`).",
+ "tr": "Vertex AI için Google Cloud proje kimliği (örn. `gcloud config get-value project` çıktısı).",
+ "uk": "Ідентифікатор проєкту Google Cloud для Vertex AI (напр. вивід `gcloud config get-value project`)."
+ },
+ "SETTINGS$ACP_SECRET_GCP_LOCATION_HINT": {
+ "en": "Vertex AI region, for example us-central1.",
+ "ja": "Vertex AI のリージョン(例: us-central1)。",
+ "zh-CN": "Vertex AI 区域,例如 us-central1。",
+ "zh-TW": "Vertex AI 區域,例如 us-central1。",
+ "ko-KR": "Vertex AI 리전입니다(예: us-central1).",
+ "no": "Vertex AI-region, for eksempel us-central1.",
+ "ar": "منطقة Vertex AI، على سبيل المثال us-central1.",
+ "de": "Vertex-AI-Region, zum Beispiel us-central1.",
+ "fr": "Région Vertex AI, par exemple us-central1.",
+ "it": "Regione Vertex AI, ad esempio us-central1.",
+ "pt": "Região do Vertex AI, por exemplo us-central1.",
+ "es": "Región de Vertex AI, por ejemplo us-central1.",
+ "ca": "Regió de Vertex AI, per exemple us-central1.",
+ "tr": "Vertex AI bölgesi, örneğin us-central1.",
+ "uk": "Регіон Vertex AI, наприклад us-central1."
+ },
+ "SETTINGS$ACP_SECRET_VERTEXAI_FLAG_HINT": {
+ "en": "Set to true to route Gemini through Vertex AI using the credentials above.",
+ "ja": "上記の認証情報を使って Gemini を Vertex AI 経由で利用する場合は true に設定します。",
+ "zh-CN": "设置为 true 可使用上述凭据通过 Vertex AI 调用 Gemini。",
+ "zh-TW": "設定為 true 可使用上述憑證透過 Vertex AI 呼叫 Gemini。",
+ "ko-KR": "위 자격 증명을 사용해 Gemini를 Vertex AI로 라우팅하려면 true로 설정하세요.",
+ "no": "Sett til true for å rute Gemini gjennom Vertex AI med legitimasjonen ovenfor.",
+ "ar": "اضبطه على true لتوجيه Gemini عبر Vertex AI باستخدام بيانات الاعتماد أعلاه.",
+ "de": "Auf true setzen, um Gemini mit den obigen Anmeldedaten über Vertex AI zu leiten.",
+ "fr": "Définissez sur true pour acheminer Gemini via Vertex AI avec les identifiants ci-dessus.",
+ "it": "Imposta su true per instradare Gemini tramite Vertex AI usando le credenziali sopra.",
+ "pt": "Defina como true para encaminhar o Gemini pelo Vertex AI usando as credenciais acima.",
+ "es": "Ponlo en true para enrutar Gemini a través de Vertex AI con las credenciales anteriores.",
+ "ca": "Posa'l a true per encaminar Gemini a través de Vertex AI amb les credencials anteriors.",
+ "tr": "Yukarıdaki kimlik bilgilerini kullanarak Gemini'yi Vertex AI üzerinden yönlendirmek için true yapın.",
+ "uk": "Встановіть true, щоб спрямовувати Gemini через Vertex AI з наведеними вище обліковими даними."
}
}
diff --git a/frontend/src/routes/agent-settings.tsx b/frontend/src/routes/agent-settings.tsx
index 16494386cb..7f8b06a671 100644
--- a/frontend/src/routes/agent-settings.tsx
+++ b/frontend/src/routes/agent-settings.tsx
@@ -6,6 +6,8 @@ import { LlmSettingsInputsSkeleton } from "#/components/features/settings/llm-se
import { SettingsDropdownInput } from "#/components/features/settings/settings-dropdown-input";
import { SettingsInput } from "#/components/features/settings/settings-input";
import { SettingsSwitch } from "#/components/features/settings/settings-switch";
+import { AcpCredentialsSection } from "#/components/features/settings/acp-credentials-section";
+import { useAcpCredentialForm } from "#/hooks/use-acp-credential-form";
import { useSaveSettings } from "#/hooks/mutation/use-save-settings";
import { useAgentSettingsSchema } from "#/hooks/query/use-agent-settings-schema";
import { useConfig } from "#/hooks/query/use-config";
@@ -28,6 +30,7 @@ import type { ACPProviderConfig } from "#/api/option-service/option.types";
const ENABLE_SUB_AGENTS_FIELD_KEY = "enable_sub_agents";
const CUSTOM_PRESET = "custom";
+const CUSTOM_MODEL_KEY = "__custom__";
const EMPTY_ACP_PROVIDERS: ACPProviderConfig[] = [];
function findEnableSubAgentsField(
@@ -63,6 +66,15 @@ function detectPreset(
return CUSTOM_PRESET;
}
+function isKnownModel(
+ provider: ACPProviderConfig | undefined,
+ model: string,
+): boolean {
+ return (
+ provider?.available_models?.some(({ id }) => id === model.trim()) ?? false
+ );
+}
+
export const clientLoader = createPermissionGuard("view_llm_settings");
export default function AgentSettingsScreen() {
@@ -104,8 +116,6 @@ export default function AgentSettingsScreen() {
const [acpModel, setAcpModel] = useState("");
const [isDirty, setIsDirty] = useState(false);
- // Prevent re-initialising ACP fields on every config refetch; only
- // reinitialise when the server returns a new settings object.
const lastInitializedSettingsRef = useRef<unknown>(null);
useEffect(() => {
@@ -121,23 +131,25 @@ export default function AgentSettingsScreen() {
...toStringArray(settings.agent_settings?.acp_command),
...toStringArray(settings.agent_settings?.acp_args),
];
- const joined = tokens.join(" ");
const rawAcpServer = settings.agent_settings?.acp_server;
const acpServer =
typeof rawAcpServer === "string" ? rawAcpServer : undefined;
const provider = acpProviders.find(({ key }) => key === acpServer);
+ const joined = tokens.join(" ");
setCommandText(joined || formatCommand(provider?.default_command ?? []));
const savedModel = settings.agent_settings?.acp_model;
- setAcpModel(typeof savedModel === "string" ? savedModel : "");
+ const normalizedModel =
+ typeof savedModel === "string" ? savedModel.trim() : "";
+ setAcpModel(normalizedModel || provider?.default_model || "");
} else {
setAgentType("openhands");
setCommandText("");
setAcpModel("");
}
setIsDirty(false);
- }, [settings, acpProviders]);
+ }, [settings, acpProviders, isConfigLoading]);
- // ── Derived state ────────────────────────────────────────────────────────
+ // ── Derived state ─────────────────────────────────────────────────────────
const isAcp = agentType === "acp";
const commandTokens = tokenizeCommand(commandText);
const isAcpInvalid = isAcp && commandTokens.length === 0;
@@ -151,16 +163,44 @@ export default function AgentSettingsScreen() {
const commandPlaceholder =
formatCommand(acpProviders[0]?.default_command ?? []) ||
"npx -y <package-name>";
+
+ const modelSuggestions = selectedProvider?.available_models ?? [];
+ const hasModelSuggestions = modelSuggestions.length > 0;
+ const selectedModelIsSuggestion = isKnownModel(selectedProvider, acpModel);
+ const selectedModelKey = selectedModelIsSuggestion
+ ? acpModel
+ : CUSTOM_MODEL_KEY;
+
+ // ── Credential form ───────────────────────────────────────────────────────
+ // Called unconditionally for hook-order stability; null arg → empty form.
+ const credentialPreset =
+ isAcp && selectedPreset !== CUSTOM_PRESET ? selectedPreset : null;
+ const credentialForm = useAcpCredentialForm(
+ credentialPreset,
+ selectedProvider,
+ );
+
const subAgentsDirty = isSubAgentsEnabled !== initialSubAgentsEnabled;
- const canSave = isAcp ? isDirty && !isAcpInvalid : isDirty || subAgentsDirty;
+ const settingsDirty = isDirty || (!isAcp && subAgentsDirty);
+ const credentialsDirty = isAcp && credentialForm.isDirty;
+ const canSave = settingsDirty || credentialsDirty;
+ const isSavingAny = isPending || credentialForm.isSaving;
+
+ // ── Save ──────────────────────────────────────────────────────────────────
+ const handleSave = async () => {
+ // Persist credentials first so they exist when the agent spec is applied.
+ // silent=true when settings are also changing, so we show one "Saved" toast.
+ if (isAcp && credentialForm.isDirty) {
+ const ok = await credentialForm.save({ silent: settingsDirty });
+ if (!ok) return;
+ credentialForm.reset();
+ }
+
+ if (!settingsDirty) return;
- // ── Save ─────────────────────────────────────────────────────────────────
- const handleSave = () => {
let agentSettingsDiff: Record<string, unknown>;
if (isAcp) {
- // ``acp_args`` intentionally omitted — the textarea owns everything via
- // ``acp_command``; the backend's fresh-base default ``[]`` is correct.
agentSettingsDiff = {
agent_kind: "acp",
acp_server:
@@ -172,12 +212,10 @@ export default function AgentSettingsScreen() {
acp_model: acpModel.trim() || null,
};
} else if (isDirty) {
- // Agent-kind flip: backend resets the new kind to defaults, so send
- // the kind alone (sub-agents toggle resets too — preserved as a
- // deferred follow-up).
+ // Agent-kind flip: backend resets to defaults, send kind alone.
agentSettingsDiff = { agent_kind: "openhands" };
} else {
- // Only sub-agents toggled, no kind change.
+ // Sub-agents toggle only.
agentSettingsDiff = { enable_sub_agents: isSubAgentsEnabled };
}
@@ -196,12 +234,12 @@ export default function AgentSettingsScreen() {
);
};
- // ── Loading ──────────────────────────────────────────────────────────────
+ // ── Loading ───────────────────────────────────────────────────────────────
if (isSettingsLoading || isSchemaLoading || isConfigLoading) {
return <LlmSettingsInputsSkeleton />;
}
- // ── Render ───────────────────────────────────────────────────────────────
+ // ── Render ────────────────────────────────────────────────────────────────
return (
<div data-testid="agent-settings-screen" className="h-full relative">
<div className="flex flex-col gap-8 pb-20">
@@ -228,6 +266,7 @@ export default function AgentSettingsScreen() {
const preferred = acpProviders[0];
if (preferred) {
setCommandText(formatCommand(preferred.default_command));
+ setAcpModel(preferred.default_model || "");
}
}
setIsDirty(true);
@@ -274,7 +313,7 @@ export default function AgentSettingsScreen() {
</section>
)}
- {/* ACP: preset, command, model */}
+ {/* ACP: preset, command, model, credentials */}
{isAcp && (
<>
<SettingsDropdownInput
@@ -300,6 +339,10 @@ export default function AgentSettingsScreen() {
);
if (provider) {
setCommandText(formatCommand(provider.default_command));
+ setAcpModel(provider.default_model || "");
+ } else if (preset === CUSTOM_PRESET) {
+ setCommandText("");
+ setAcpModel("");
}
setIsDirty(true);
}}
@@ -315,7 +358,17 @@ export default function AgentSettingsScreen() {
value={commandText}
placeholder={commandPlaceholder}
onChange={(e) => {
- setCommandText(e.target.value);
+ const next = e.target.value;
+ // Sync model when provider changes via typed command.
+ const prevPreset = detectPreset(commandText, acpProviders);
+ const nextPreset = detectPreset(next, acpProviders);
+ if (nextPreset !== prevPreset) {
+ const nextProvider = acpProviders.find(
+ ({ key }) => key === nextPreset,
+ );
+ setAcpModel(nextProvider?.default_model || "");
+ }
+ setCommandText(next);
setIsDirty(true);
}}
/>
@@ -324,23 +377,66 @@ export default function AgentSettingsScreen() {
</Typography.Text>
</div>
+ {/* Model: dropdown for known models, free text for custom */}
<div className="flex flex-col gap-1.5">
- <SettingsInput
- testId="agent-model-input"
- label={t(I18nKey.SCHEMA$LLM$MODEL$LABEL)}
- type="text"
- className="w-full"
- value={acpModel}
- showOptionalTag
- onChange={(value) => {
- setAcpModel(value);
- setIsDirty(true);
- }}
- />
+ {hasModelSuggestions && (
+ <SettingsDropdownInput
+ testId="agent-model-selector"
+ name="agent-model"
+ label={t(I18nKey.SETTINGS$AGENT_MODEL)}
+ items={[
+ ...modelSuggestions.map((m) => ({
+ key: m.id,
+ label: m.label,
+ })),
+ {
+ key: CUSTOM_MODEL_KEY,
+ label: t(I18nKey.SETTINGS$AGENT_PRESET_CUSTOM),
+ },
+ ]}
+ selectedKey={selectedModelKey}
+ onSelectionChange={(key) => {
+ if (!key) return;
+ const mk = String(key);
+ if (mk === CUSTOM_MODEL_KEY) {
+ setAcpModel("");
+ } else {
+ setAcpModel(mk);
+ }
+ setIsDirty(true);
+ }}
+ />
+ )}
+ {selectedModelKey === CUSTOM_MODEL_KEY && (
+ <SettingsInput
+ testId="agent-model-input"
+ label={
+ hasModelSuggestions
+ ? t(I18nKey.SETTINGS$AGENT_CUSTOM_MODEL)
+ : t(I18nKey.SETTINGS$AGENT_MODEL)
+ }
+ type="text"
+ className="w-full"
+ value={acpModel}
+ showOptionalTag
+ onChange={(value) => {
+ setAcpModel(value);
+ setIsDirty(true);
+ }}
+ />
+ )}
<Typography.Text className="text-xs text-[#717888]">
{t(I18nKey.SETTINGS$AGENT_MODEL_HINT)}
</Typography.Text>
</div>
+
+ {/* Credentials section for built-in providers */}
+ {credentialForm.fields.length > 0 && (
+ <>
+ <hr className="border-[#3D4046]" />
+ <AcpCredentialsSection form={credentialForm} />
+ </>
+ )}
</>
)}
</div>
@@ -350,10 +446,10 @@ export default function AgentSettingsScreen() {
testId="agent-save-button"
type="button"
variant="primary"
- isDisabled={isPending || !canSave}
+ isDisabled={isSavingAny || !canSave || isAcpInvalid}
onClick={handleSave}
>
- {isPending
+ {isSavingAny
? t(I18nKey.SETTINGS$SAVING)
: t(I18nKey.SETTINGS$SAVE_CHANGES)}
</BrandButton>
diff --git a/openhands/app_server/app_conversation/live_status_app_conversation_service.py b/openhands/app_server/app_conversation/live_status_app_conversation_service.py
index 6badb8d3ea..5ff51f2916 100644
--- a/openhands/app_server/app_conversation/live_status_app_conversation_service.py
+++ b/openhands/app_server/app_conversation/live_status_app_conversation_service.py
@@ -1601,11 +1601,15 @@ class LiveStatusAppConversationService(AppConversationServiceBase):
) -> StartConversationRequest:
"""Build a StartConversationRequest for ACP agent conversations.
- Provider creds (``llm.api_key`` / ``base_url``) and user secrets both
- flow through ``AgentContext.secrets``. ``acp_settings.create_agent()``
- folds the provider creds (keyed by env-var name, sdk#3464) into
- ``agent_context.secrets``; the SDK gap-fills them into the subprocess
- env at launch.
+ User secrets (Secrets panel + git provider tokens) flow through
+ ``request.secrets`` — the canonical cipher-protected wire channel.
+ In SaaS mode each secret is a ``LookupSecret`` pointing at
+ ``/api/v1/webhooks/custom-secret`` with a per-secret scoped JWT, so
+ values are never materialised in this process. In OSS mode (no
+ ``web_url``) they remain ``StaticSecret``. Secrets are passed
+ directly as ``secrets=`` to ``create_request()``; no ``AgentContext``
+ relay is needed. This avoids the deprecated ``acp_env`` channel
+ (software-agent-sdk #3464; OpenHands/agent-canvas#1039).
Args:
sandbox: Sandbox information
@@ -1622,7 +1626,29 @@ class LiveStatusAppConversationService(AppConversationServiceBase):
workspace = LocalWorkspace(working_dir=project_dir)
# --- secrets --------------------------------------------------------
- secrets = await self._setup_secrets_for_git_providers(user)
+ # ACP secrets must be StaticSecrets — LookupSecrets with JWT headers
+ # (e.g. X-Access-Token) are redacted by the SDK serializer because
+ # "TOKEN" matches SECRET_KEY_PATTERNS, leaving headers: {} and
+ # causing provider auth to silently fail at subprocess launch.
+ # Use the raw custom secrets directly, then fold in git provider tokens
+ # as StaticSecrets (bypassing the LookupSecret wrapping that
+ # _setup_secrets_for_git_providers does for non-ACP paths).
+ secrets: dict = await self.user_context.get_secrets()
+ provider_tokens = cast(
+ PROVIDER_TOKEN_TYPE | None,
+ await self.user_context.get_provider_tokens(),
+ )
+ if provider_tokens:
+ for provider_type, provider_token in provider_tokens.items():
+ if not provider_token.token:
+ continue
+ secret_name = f'{provider_type.name}_TOKEN'
+ static_token = await self.user_context.get_latest_token(provider_type)
+ if static_token:
+ secrets[secret_name] = StaticSecret(
+ value=SecretStr(static_token),
+ description=f'{provider_type.name} authentication token',
+ )
if api_secrets:
from openhands.app_server.constants import (
@@ -1643,17 +1669,20 @@ class LiveStatusAppConversationService(AppConversationServiceBase):
acp_settings = user.agent_settings # already verified to be ACPAgentSettings
assert isinstance(acp_settings, ACPAgentSettings)
- # acp_settings.create_agent() folds provider creds into agent_context.secrets
- # (sdk#3464). Pass SecretSource objects verbatim — the SDK resolves them
- # at subprocess launch, not here, to avoid eager LookupSecret calls.
- agent_context = AgentContext(secrets=secrets) if secrets else None
# Isolate the CLI data dir onto the durable /workspace tree so the SDK
# self-resumes the provider session (session/load from base_state.json)
# across pause/resume — matching the regular-agent lifecycle (#1274).
- settings_update: dict[str, object] = {'acp_isolate_data_dir': True}
- if agent_context is not None:
- settings_update['agent_context'] = agent_context
- acp_agent = acp_settings.model_copy(update=settings_update).create_agent()
+ # Strip llm.api_key/base_url to prevent proxy settings from leaking
+ # into the subprocess env (ACP CLIs handle their own LLM calls).
+ acp_settings_for_agent = acp_settings.model_copy(
+ update={
+ 'acp_isolate_data_dir': True,
+ 'llm': acp_settings.llm.model_copy(
+ update={'api_key': None, 'base_url': None}
+ ),
+ }
+ )
+ acp_agent = acp_settings_for_agent.create_agent()
sdk_plugins: list[PluginSource] | None = None
if plugins:
@@ -1681,7 +1710,10 @@ class LiveStatusAppConversationService(AppConversationServiceBase):
# attributable, falling back to ``user.id`` when no email is available.
laminar_user_id = await self.user_context.get_user_email() or user.id
return conv_settings.create_request(
- StartConversationRequest, agent=acp_agent, user_id=laminar_user_id
+ StartConversationRequest,
+ agent=acp_agent,
+ user_id=laminar_user_id,
+ secrets=secrets,
)
async def _process_pending_messages(
diff --git a/openhands/app_server/event_callback/webhook_router.py b/openhands/app_server/event_callback/webhook_router.py
index 33fea658db..14ea7913eb 100644
--- a/openhands/app_server/event_callback/webhook_router.py
+++ b/openhands/app_server/event_callback/webhook_router.py
@@ -477,6 +477,12 @@ async def on_event(
return Success()
+async def _resolve_user_context(user_id: str | None) -> AuthUserContext:
+ """Resolve a UserContext from a user_id, falling back to DefaultUserAuth in OSS mode."""
+ user_auth = await get_user_auth_for_user(user_id) if user_id else DefaultUserAuth()
+ return AuthUserContext(user_auth=user_auth)
+
+
@router.get('/secrets')
async def get_secret(
access_token: str = Depends(APIKeyHeader(name='X-Access-Token', auto_error=False)),
@@ -485,20 +491,14 @@ async def get_secret(
"""Given an access token, retrieve a user secret. The access token
is limited by user and provider type, and may include a timeout, limiting
the damage in the event that a token is ever leaked"""
+ if not access_token:
+ raise HTTPException(status.HTTP_401_UNAUTHORIZED)
try:
payload = jwt_service.verify_jws_token(access_token)
user_id = payload['user_id']
provider_type = ProviderType(payload['provider_type'])
- # Get UserAuth for the user_id
- if user_id:
- user_auth = await get_user_auth_for_user(user_id)
- else:
- # OpenHands (OSS mode) - use default user auth
- user_auth = DefaultUserAuth()
-
- # Create UserContext directly
- user_context = AuthUserContext(user_auth=user_auth)
+ user_context = await _resolve_user_context(user_id)
secret = await user_context.get_latest_token(provider_type)
if secret is None:
diff --git a/openhands/app_server/secrets/secrets_router.py b/openhands/app_server/secrets/secrets_router.py
index d3e561b14e..2d087b52d2 100644
--- a/openhands/app_server/secrets/secrets_router.py
+++ b/openhands/app_server/secrets/secrets_router.py
@@ -251,14 +251,13 @@ async def create_custom_secret(
incoming_secret: CustomSecretCreate,
secrets_store: SecretsStore = Depends(get_secrets_store),
) -> EditResponse:
- """Create a custom secret.
+ """Create or update a custom secret.
- Creates a new custom secret for the authenticated user.
+ Creates a new custom secret, or overwrites it if it already exists.
Returns:
- 201: Secret created successfully
- 400: Secret already exists
- 500: Error creating secret
+ 201: Secret saved successfully
+ 500: Error saving secret
"""
existing_secrets = await secrets_store.load()
custom_secrets = dict(existing_secrets.custom_secrets) if existing_secrets else {}
@@ -267,15 +266,14 @@ async def create_custom_secret(
secret_value = incoming_secret.value
secret_description = incoming_secret.description
- if secret_name in custom_secrets:
- raise HTTPException(
- status_code=status.HTTP_400_BAD_REQUEST,
- detail=f'Secret {secret_name} already exists',
- )
-
+ existing_description = (
+ custom_secrets[secret_name].description if secret_name in custom_secrets else ''
+ )
custom_secrets[secret_name] = CustomSecret(
secret=secret_value,
- description=secret_description or '',
+ description=secret_description
+ if secret_description is not None
+ else existing_description,
)
# Create a new Secrets that preserves provider tokens
diff --git a/openhands/app_server/web_client/default_web_client_config_injector.py b/openhands/app_server/web_client/default_web_client_config_injector.py
index 90590c8d2c..ed625cda7b 100644
--- a/openhands/app_server/web_client/default_web_client_config_injector.py
+++ b/openhands/app_server/web_client/default_web_client_config_injector.py
@@ -13,6 +13,7 @@ from openhands.app_server.web_client.web_client_config_injector import (
WebClientConfigInjector,
)
from openhands.app_server.web_client.web_client_models import (
+ ACPModelOption,
ACPProviderConfig,
WebClientConfig,
WebClientFeatureFlags,
@@ -224,10 +225,14 @@ class DefaultWebClientConfigInjector(WebClientConfigInjector):
ACPProviderConfig(
key=provider.key,
display_name=provider.display_name,
- # SDK exposes ``default_command`` as ``tuple[str, ...]`` (frozen
- # registry record); the API contract uses ``list[str]`` for
- # JSON-friendliness.
default_command=list(provider.default_command),
+ default_model=provider.default_model or None,
+ available_models=[
+ ACPModelOption(id=m.id, label=m.label)
+ for m in (provider.available_models or [])
+ ],
+ api_key_env_var=provider.api_key_env_var,
+ base_url_env_var=provider.base_url_env_var,
)
for provider in ACP_PROVIDERS.values()
]
diff --git a/openhands/app_server/web_client/web_client_models.py b/openhands/app_server/web_client/web_client_models.py
index 8f3ba9c8d6..63472f5591 100644
--- a/openhands/app_server/web_client/web_client_models.py
+++ b/openhands/app_server/web_client/web_client_models.py
@@ -38,10 +38,19 @@ class WebClientFeatureFlags(BaseModel):
return self
+class ACPModelOption(BaseModel):
+ id: str
+ label: str
+
+
class ACPProviderConfig(BaseModel):
key: str
display_name: str
default_command: list[str]
+ default_model: str | None = None
+ available_models: list[ACPModelOption] = Field(default_factory=list)
+ api_key_env_var: str | None = None
+ base_url_env_var: str | None = None
class WebClientConfig(DiscriminatedUnionMixin):
diff --git a/tests/unit/app_server/test_live_status_app_conversation_service.py b/tests/unit/app_server/test_live_status_app_conversation_service.py
index 825f891742..e66291a163 100644
--- a/tests/unit/app_server/test_live_status_app_conversation_service.py
+++ b/tests/unit/app_server/test_live_status_app_conversation_service.py
@@ -312,15 +312,21 @@ class TestLiveStatusAppConversationService:
async def test_setup_secrets_for_git_providers_no_provider_tokens(self):
"""Test _setup_secrets_for_git_providers with no provider tokens."""
# Arrange
- base_secrets = {'existing': 'secret'}
+ # get_secrets returns StaticSecret objects (plain strings are not valid)
+ base_secrets = {
+ 'existing': StaticSecret(value=SecretStr('secret'), description='')
+ }
self.mock_user_context.get_secrets.return_value = base_secrets
self.mock_user_context.get_provider_tokens = AsyncMock(return_value=None)
+ self.mock_jwt_service.create_jws_token.return_value = 'test_access_token'
# Act
result = await self.service._setup_secrets_for_git_providers(self.mock_user)
- # Assert
- assert result == base_secrets
+ # Assert — custom secrets are passed through as-is (no LookupSecret wrapping)
+ assert 'existing' in result
+ assert isinstance(result['existing'], StaticSecret)
+ assert result['existing'].description == ''
self.mock_user_context.get_secrets.assert_called_once()
self.mock_user_context.get_provider_tokens.assert_called_once()
@@ -543,23 +549,23 @@ class TestLiveStatusAppConversationService:
# Act
result = await self.service._setup_secrets_for_git_providers(self.mock_user)
- # Assert - verify custom secrets are preserved with their descriptions
+ # Assert — custom secrets are passed through as-is; descriptions preserved.
assert 'CUSTOM_API_KEY' in result
assert isinstance(result['CUSTOM_API_KEY'], StaticSecret)
assert (
- result['CUSTOM_API_KEY'].description
- == 'Custom API key for external service'
+ result['CUSTOM_API_KEY'].value.get_secret_value() == 'custom_secret_value'
)
assert (
- result['CUSTOM_API_KEY'].value.get_secret_value() == 'custom_secret_value'
+ result['CUSTOM_API_KEY'].description
+ == 'Custom API key for external service'
)
assert 'ANOTHER_SECRET' in result
assert isinstance(result['ANOTHER_SECRET'], StaticSecret)
- assert result['ANOTHER_SECRET'].description is None
assert (
result['ANOTHER_SECRET'].value.get_secret_value() == 'another_secret_value'
)
+ assert result['ANOTHER_SECRET'].description is None
# Verify git provider token is also included
assert 'GITHUB_TOKEN' in result
@@ -578,14 +584,14 @@ class TestLiveStatusAppConversationService:
base_secrets = {'MY_SECRET': custom_secret_empty_desc}
self.mock_user_context.get_secrets.return_value = base_secrets
self.mock_user_context.get_provider_tokens = AsyncMock(return_value=None)
+ self.mock_jwt_service.create_jws_token.return_value = 'test_access_token'
# Act
result = await self.service._setup_secrets_for_git_providers(self.mock_user)
- # Assert - empty description should be preserved as-is
+ # Assert — custom secrets are passed through as-is; empty description preserved
assert 'MY_SECRET' in result
assert isinstance(result['MY_SECRET'], StaticSecret)
- # Empty string description is preserved
assert result['MY_SECRET'].description == ''
@pytest.mark.asyncio
@@ -3254,11 +3260,11 @@ class TestAgentKindConversationUrl:
class TestBuildAcpStartConversationRequestSecrets:
- """Tests for user-secret injection in ``_build_acp_start_conversation_request``.
+ """Tests for secret injection in ``_build_acp_start_conversation_request``.
- Covers issue #14167: secrets from the Secrets panel and git provider
- tokens must be available to ACP subprocesses as environment variables,
- mirroring how they flow into the regular OpenHands sandbox.
+ Secrets from the Secrets panel and git provider tokens flow through
+ ``request.secrets`` as the sole canonical channel. ``llm.api_key`` is
+ never read for ACP (the CLI subprocess handles its own LLM calls).
"""
@pytest.fixture
@@ -3315,10 +3321,12 @@ class TestBuildAcpStartConversationRequestSecrets:
)
return user
- def _call_build(self, service, user, tmp_path):
+ def _call_build(self, service, user, tmp_path, *, secrets=None):
"""Wire user_context and call _build_acp_start_conversation_request."""
service.user_context.get_user_info = AsyncMock(return_value=user)
service.user_context.get_user_email = AsyncMock(return_value=None)
+ service.user_context.get_secrets = AsyncMock(return_value=secrets or {})
+ service.user_context.get_provider_tokens = AsyncMock(return_value=None)
sandbox = Mock(spec=SandboxInfo)
return service._build_acp_start_conversation_request(
sandbox=sandbox,
@@ -3329,74 +3337,80 @@ class TestBuildAcpStartConversationRequestSecrets:
)
@pytest.mark.asyncio
- async def test_secrets_passed_via_agent_context(self, service, tmp_path):
- """Secrets are forwarded via agent_context.secrets as SecretSource objects."""
+ async def test_secrets_passed_via_request_secrets(self, service, tmp_path):
+ """Secrets are forwarded via request.secrets as SecretSource objects."""
github_secret = StaticSecret(value=SecretStr('ghp_test123'))
api_secret = StaticSecret(value=SecretStr('secret-value'))
user = self._make_acp_user()
- service._setup_secrets_for_git_providers = AsyncMock(
- return_value={'GITHUB_TOKEN': github_secret, 'MY_API_KEY': api_secret}
- )
- request = await self._call_build(service, user, tmp_path)
+ request = await self._call_build(
+ service,
+ user,
+ tmp_path,
+ secrets={'GITHUB_TOKEN': github_secret, 'MY_API_KEY': api_secret},
+ )
- assert request.agent.agent_context is not None
- ctx = request.agent.agent_context.secrets
- assert ctx.get('GITHUB_TOKEN') is github_secret
- assert ctx.get('MY_API_KEY') is api_secret
+ assert request.secrets.get('GITHUB_TOKEN') is github_secret
+ assert request.secrets.get('MY_API_KEY') is api_secret
# Isolation is enabled regardless of whether secrets are present.
assert request.agent.acp_isolate_data_dir is True
@pytest.mark.asyncio
async def test_lookup_secret_forwarded_as_source(self, service, tmp_path):
- """LookupSecrets are forwarded as-is; the SDK resolves them at start time."""
+ """LookupSecrets from user_context are forwarded as-is."""
lookup = LookupSecret(url='https://example.com/token', headers={})
user = self._make_acp_user()
- service._setup_secrets_for_git_providers = AsyncMock(
- return_value={'GITHUB_TOKEN': lookup}
- )
- request = await self._call_build(service, user, tmp_path)
+ request = await self._call_build(
+ service,
+ user,
+ tmp_path,
+ secrets={'GITHUB_TOKEN': lookup},
+ )
- assert request.agent.agent_context is not None
- assert request.agent.agent_context.secrets.get('GITHUB_TOKEN') is lookup
+ assert request.secrets.get('GITHUB_TOKEN') is lookup
@pytest.mark.asyncio
async def test_explicit_acp_env_preserved(self, service, tmp_path):
"""Explicit acp_env entries survive when secrets also present."""
user = self._make_acp_user(acp_env={'MY_TOKEN': 'explicit-override'})
- service._setup_secrets_for_git_providers = AsyncMock(
- return_value={'OTHER': StaticSecret(value=SecretStr('other-value'))}
- )
+ other_secret = StaticSecret(value=SecretStr('other-value'))
- request = await self._call_build(service, user, tmp_path)
+ request = await self._call_build(
+ service,
+ user,
+ tmp_path,
+ secrets={'OTHER': other_secret},
+ )
assert request.agent.acp_env.get('MY_TOKEN') == 'explicit-override'
+ assert request.secrets.get('OTHER') is other_secret
@pytest.mark.asyncio
- async def test_provider_env_in_agent_context_not_acp_env(self, service, tmp_path):
- """Provider cred lands in agent_context.secrets, not acp_env."""
+ async def test_llm_api_key_not_forwarded_to_request_secrets(
+ self, service, tmp_path
+ ):
+ """llm.api_key must not bleed into request.secrets for ACP.
+
+ ACP does not use the SDK's LLM layer — the CLI subprocess handles its
+ own model calls. Credentials must be supplied via the Secrets panel
+ (request.secrets channel), not via llm.api_key.
+ """
user = self._make_acp_user(acp_server='claude-code', api_key='sk-ui-key')
- service._setup_secrets_for_git_providers = AsyncMock(return_value={})
request = await self._call_build(service, user, tmp_path)
assert request.agent.acp_env.get('ANTHROPIC_API_KEY') is None
- assert request.agent.agent_context is not None
- assert (
- request.agent.agent_context.secrets.get('ANTHROPIC_API_KEY').get_value()
- == 'sk-ui-key'
- )
+ assert 'ANTHROPIC_API_KEY' not in request.secrets
@pytest.mark.asyncio
- async def test_no_secrets_no_agent_context(self, service, tmp_path):
- """When there are no secrets, agent_context is not set."""
+ async def test_no_secrets_request_secrets_empty(self, service, tmp_path):
+ """When there are no panel secrets, request.secrets is empty."""
user = self._make_acp_user()
- service._setup_secrets_for_git_providers = AsyncMock(return_value={})
request = await self._call_build(service, user, tmp_path)
- assert request.agent.agent_context is None
+ assert request.secrets == {}
@pytest.mark.asyncio
async def test_isolate_data_dir_enabled(self, service, tmp_path):
@@ -3404,79 +3418,77 @@ class TestBuildAcpStartConversationRequestSecrets:
so the CLI session subtree lives on /workspace and the SDK self-resumes
across pause/resume (#1274)."""
user = self._make_acp_user()
- service._setup_secrets_for_git_providers = AsyncMock(return_value={})
request = await self._call_build(service, user, tmp_path)
assert request.agent.acp_isolate_data_dir is True
@pytest.mark.asyncio
- async def test_acp_env_overrides_provider_env(self, service, tmp_path):
- """Explicit acp_env entry beats the provider cred (acp_env > agent_context.secrets at launch)."""
+ async def test_acp_env_explicit_override(self, service, tmp_path):
+ """Explicit acp_env is independent of request.secrets — both are preserved."""
user = self._make_acp_user(
acp_server='claude-code',
acp_env={'ANTHROPIC_API_KEY': 'sk-explicit-override'},
- api_key='sk-ui-key',
)
- service._setup_secrets_for_git_providers = AsyncMock(return_value={})
request = await self._call_build(service, user, tmp_path)
assert request.agent.acp_env.get('ANTHROPIC_API_KEY') == 'sk-explicit-override'
- # Provider cred still lands in agent_context.secrets; acp_env wins at launch.
- assert request.agent.agent_context is not None
- assert (
- request.agent.agent_context.secrets.get('ANTHROPIC_API_KEY').get_value()
- == 'sk-ui-key'
- )
+ # No panel secrets → request.secrets is empty (acp_env is a separate channel).
+ assert 'ANTHROPIC_API_KEY' not in request.secrets
@pytest.mark.asyncio
- async def test_secrets_forwarded_via_agent_context(self, service, tmp_path):
- """Panel secrets flow through agent_context.secrets; not pre-resolved into acp_env."""
+ async def test_secrets_forwarded_via_request_secrets(self, service, tmp_path):
+ """Panel secrets flow through request.secrets; not pre-resolved into acp_env."""
gh_secret = StaticSecret(value=SecretStr('ghp_test123'))
user = self._make_acp_user()
- service._setup_secrets_for_git_providers = AsyncMock(
- return_value={'GH_TOKEN': gh_secret}
- )
- request = await self._call_build(service, user, tmp_path)
+ request = await self._call_build(
+ service,
+ user,
+ tmp_path,
+ secrets={'GH_TOKEN': gh_secret},
+ )
assert request.agent.acp_env.get('GH_TOKEN') is None
- assert request.agent.agent_context is not None
- assert request.agent.agent_context.secrets.get('GH_TOKEN') is gh_secret
+ assert request.secrets.get('GH_TOKEN') is gh_secret
@pytest.mark.asyncio
- async def test_panel_secret_overrides_provider_env_when_conflicting(
- self, service, tmp_path
- ):
- """Panel secret beats provider-derived cred when both name the same key.
+ async def test_panel_secret_is_sole_credentials_channel(self, service, tmp_path):
+ """Panel secret is the only credentials channel; llm.api_key is ignored.
- SDK merge order: {**provider_secrets, **existing} → existing (panel) wins.
- Priority is now panel > provider, reversed from the old workaround.
+ When a panel secret and llm.api_key both target the same env var, only
+ the panel secret appears in request.secrets — llm.api_key is not read.
"""
user = self._make_acp_user(acp_server='claude-code', api_key='sk-ui-key')
panel_secret = StaticSecret(value=SecretStr('sk-from-secrets-panel'))
- service._setup_secrets_for_git_providers = AsyncMock(
- return_value={'ANTHROPIC_API_KEY': panel_secret}
- )
- request = await self._call_build(service, user, tmp_path)
+ request = await self._call_build(
+ service,
+ user,
+ tmp_path,
+ secrets={'ANTHROPIC_API_KEY': panel_secret},
+ )
assert request.agent.acp_env.get('ANTHROPIC_API_KEY') is None
- assert request.agent.agent_context is not None
- assert (
- request.agent.agent_context.secrets.get('ANTHROPIC_API_KEY').get_value()
- == 'sk-from-secrets-panel'
- )
+ assert request.secrets.get('ANTHROPIC_API_KEY') is panel_secret
@pytest.mark.asyncio
- async def test_explicit_acp_env_wins_over_panel_secret(self, service, tmp_path):
- """Same-named explicit acp_env overrides a panel secret of the same name."""
+ async def test_explicit_acp_env_and_panel_secret_coexist(self, service, tmp_path):
+ """acp_env and request.secrets are independent channels.
+
+ An explicit acp_env entry takes precedence at subprocess launch, but
+ the panel secret still flows through request.secrets unchanged.
+ """
+ panel_secret = StaticSecret(value=SecretStr('panel-token'))
user = self._make_acp_user(acp_env={'GH_TOKEN': 'explicit-token'})
- service._setup_secrets_for_git_providers = AsyncMock(
- return_value={'GH_TOKEN': StaticSecret(value=SecretStr('panel-token'))}
- )
- request = await self._call_build(service, user, tmp_path)
+ request = await self._call_build(
+ service,
+ user,
+ tmp_path,
+ secrets={'GH_TOKEN': panel_secret},
+ )
assert request.agent.acp_env.get('GH_TOKEN') == 'explicit-token'
+ assert request.secrets.get('GH_TOKEN') is panel_secret