npm - @openhands/agent-canvas - Versions diffs - 1.9.0 → 1.11.0 - Mend

@openhands/agent-canvas 1.9.0 → 1.11.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (1386) hide show

package/dist/api/open-hands.types.d.ts CHANGED Viewed

@@ -48,7 +48,7 @@ export interface RepositorySelection {
     selected_branch: string | null;
     git_provider: Provider | null;
 }
-export type ConversationTrigger = "resolver" | "gui" | "suggested_task" | "microagent_management";
+export type ConversationTrigger = "resolver" | "gui" | "suggested_task" | "microagent_management" | "automation";
 export interface Conversation {
     conversation_id: string;
     title: string;

package/dist/api/settings-service/settings-service.api.cjs CHANGED Viewed

@@ -1,2 +1,2 @@
-require("../../_virtual/_rolldown/runtime.cjs");const e=require("../../node_modules/@openhands/typescript-client/dist/client/settings-client.cjs");require("../../node_modules/@openhands/typescript-client/dist/clients.cjs");const t=require("../backend-registry/active-store.cjs"),n=require("../agent-server-client-options.cjs"),r=require("../../services/settings.cjs"),i=require("../../utils/mcp-config.cjs"),a=require("../cloud/settings-service.api.cjs");var o=[`language`,`user_consents_to_analytics`,`enable_sound_notifications`,`git_user_name`,`git_user_email`,`title_llm_profile`,`disabled_skills`],s=new Set(o),c=e=>s.has(e),l=e=>{let t={},n={};for(let[r,i]of Object.entries(e))c(r)?t[r]=i:n[r]=i;return{extracted:t,rest:n}},u=e=>JSON.parse(JSON.stringify(e)),d=(e,t)=>({...e??{},...t??{}});async function f(e,t=3,n=500){for(let r=0;r<t;r+=1)try{return await e()}catch(e){if(r>=t-1)throw e;let i=n*2**r;await new Promise(e=>{setTimeout(e,i)})}throw Error(`Retry attempts exhausted`)}var p={redacted:null,encrypted:null,timestamp:0},m=300*1e3,h=()=>Date.now()-p.timestamp<m,g=()=>{p={redacted:null,encrypted:null,timestamp:0}},_=e=>!!e&&typeof e==`object`&&!Array.isArray(e),v=(e,t)=>`Basic ${btoa(`${e}:${t}`)}`,y=e=>{switch(e.strategy){case`none`:return{};case`api_key`:{if(typeof e.value!=`string`||!e.value)return null;let t=typeof e.header_name==`string`&&e.header_name?e.header_name:`Authorization`,n=t===`Authorization`?`Bearer ${e.value}`:e.value;return{[t]:n}}case`bearer`:return typeof e.value!=`string`||!e.value?null:{Authorization:`Bearer ${e.value}`};case`basic`:return typeof e.username!=`string`||typeof e.password!=`string`?null:{Authorization:v(e.username,e.password)};case`header`:return i.stringRecord(e.headers)??{};case`oauth2`:{let t=_(e.state)?e.state.tokens:void 0;return!_(t)||typeof t.access_token!=`string`?null:{Authorization:`Bearer ${t.access_token}`}}default:return null}},b=e=>{if(!_(e))return e;let t=_(e.mcpServers),n=t?e.mcpServers:e,r=Object.fromEntries(Object.entries(n).map(([e,t])=>{if(!_(t)||!_(t.auth))return[e,t];let n=y(t.auth);if(n===null)return[e,t];let r={...t},a={...i.stringRecord(t.headers)??{},...n};return delete r.auth,Object.keys(a).length>0?r.headers=a:delete r.headers,[e,r]}));return t?{...e,mcpServers:r}:r},x=e=>{if(!_(e))return e;let t=_(e.mcpServers),n=t?e.mcpServers:e,r=Object.fromEntries(Object.entries(n).map(([e,t])=>_(t)?[e,{...t,enabled:t.enabled!==!1}]:[e,t]));return t?{...e,mcpServers:r}:r},S=e=>{let t=i.getSdkMcpServerMap(e);return t?Object.values(t).some(e=>i.hasRedactedMcpSecretLeaf(_(e)?e.auth:void 0)||i.hasRedactedMcpSecretLeaf(_(e)?e.headers:void 0)||i.hasRedactedMcpSecretLeaf(_(e)?e.env:void 0)):!1},C=(e,t)=>{let n=i.getSdkMcpServerMap(e),r=i.getSdkMcpServerMap(t);return!n||!r?!1:Object.keys(n).some(e=>!(e in r))},w=e=>{let t={agent_settings:e.agent_settings??{},conversation_settings:e.conversation_settings??{},llm_api_key_set:e.llm_api_key_is_set},n=e.misc_settings?.app_preferences;if(n)for(let e of o){let r=n[e];r!==void 0&&(t[e]=r)}return t},T=e=>{let t=d(r.DEFAULT_SETTINGS.agent_settings??{},e.agent_settings??{}),n=d(r.DEFAULT_SETTINGS.conversation_settings??{},e.conversation_settings??{}),i={...u(r.DEFAULT_SETTINGS),...e,provider_tokens_set:{...r.DEFAULT_SETTINGS.provider_tokens_set??{},...e.provider_tokens_set??{}},agent_settings:t,conversation_settings:n},a=t.llm,o=t.condenser;return typeof t.agent==`string`&&(i.agent=t.agent),typeof a?.model==`string`&&a.model.length>0&&(i.llm_model=a.model),typeof a?.base_url==`string`&&(i.llm_base_url=a.base_url),typeof o?.enabled==`boolean`&&(i.enable_default_condenser=o.enabled),typeof o?.max_size==`number`&&(i.condenser_max_size=o.max_size),typeof n.confirmation_mode==`boolean`&&(i.confirmation_mode=n.confirmation_mode),(typeof n.security_analyzer==`string`||n.security_analyzer===null)&&(i.security_analyzer=n.security_analyzer),typeof n.max_iterations==`number`&&(i.max_iterations=n.max_iterations),i.search_api_key_set=!!i.search_api_key,i},E=class r{static async fetchSettingsFromApi(t){return f(()=>new e.SettingsClient(n.getAgentServerClientOptions()).getSettings({exposeSecrets:t}))}static async getSettings(){if(t.getActiveBackend().backend.kind===`cloud`)try{return T(await f(()=>a.fetchCloudSettings()))}catch(e){return console.warn(`Failed to fetch cloud settings, using defaults:`,e),T({})}if(h()&&p.redacted)return T(w(p.redacted));try{let e=await this.fetchSettingsFromApi();return p.redacted=e,p.timestamp=Date.now(),T(w(e))}catch(e){return console.warn(`Failed to fetch settings from API, using defaults:`,e),T({})}}static async getSettingsForConversation(){if(h()&&p.encrypted)return{agentSettings:p.encrypted.agent_settings,conversationSettings:p.encrypted.conversation_settings,secretsEncrypted:!0};let e=await this.fetchSettingsFromApi(`encrypted`);return p.encrypted=e,p.timestamp||=Date.now(),{agentSettings:e.agent_settings,conversationSettings:e.conversation_settings,secretsEncrypted:!0}}static async getSettingsSchema(){return t.getActiveBackend().backend.kind===`cloud`?await a.fetchCloudSettingsSchema():await new e.SettingsClient(n.getAgentServerClientOptions()).getAgentSchema()}static async getConversationSettingsSchema(){return t.getActiveBackend().backend.kind===`cloud`?await a.fetchCloudConversationSettingsSchema():await new e.SettingsClient(n.getAgentServerClientOptions()).getConversationSchema()}static async saveSettings(i){let{extracted:o,rest:s}=l(i),c=Object.keys(o).length>0,u={},d=s.agent_settings_diff;d&&Object.keys(d).length>0&&(u.agent_settings_diff=d);let p=s.conversation_settings_diff;p&&Object.keys(p).length>0&&(u.conversation_settings_diff=p),c&&(u.misc_settings_diff={app_preferences:o});let m=t.getActiveBackend().backend.kind===`cloud`,h=u.agent_settings_diff,_=!!h&&`mcp_config`in h&&h.mcp_config!==null,v;if(_)try{v=m?(await a.fetchCloudSettings())?.agent_settings?.mcp_config:(await r.fetchSettingsFromApi())?.agent_settings?.mcp_config}catch{}let y=m&&_&&S(v)&&!C(v,h?.mcp_config),w=_&&!y;if(m){if(!(u.agent_settings_diff||u.conversation_settings_diff||c))return!0;w&&await f(()=>a.saveCloudSettings({agent_settings_diff:{mcp_config:null}}));let e={};if(u.agent_settings_diff&&(e.agent_settings_diff={...u.agent_settings_diff},`mcp_config`in e.agent_settings_diff)){let t=b(e.agent_settings_diff.mcp_config);e.agent_settings_diff.mcp_config=y?x(t):t}u.conversation_settings_diff&&(e.conversation_settings_diff=u.conversation_settings_diff),c&&(e.app_preferences=o);try{await f(()=>a.saveCloudSettings(e))}catch(e){if(w&&v)try{await a.saveCloudSettings({agent_settings_diff:{mcp_config:v}})}catch{}throw e}}else{if(!(u.agent_settings_diff||u.conversation_settings_diff||u.misc_settings_diff))return!0;w&&await f(()=>new e.SettingsClient(n.getAgentServerClientOptions()).updateSettings({agent_settings_diff:{mcp_config:null}}));try{await f(()=>new e.SettingsClient(n.getAgentServerClientOptions()).updateSettings(u))}catch(t){if(w&&v)try{await new e.SettingsClient(n.getAgentServerClientOptions()).updateSettings({agent_settings_diff:{mcp_config:v}})}catch{}throw t}}return g(),!0}static invalidateCache(){g()}};exports.default=E;
+require("../../_virtual/_rolldown/runtime.cjs");const e=require("../../node_modules/@openhands/typescript-client/dist/client/settings-client.cjs");require("../../node_modules/@openhands/typescript-client/dist/clients.cjs");const t=require("../backend-registry/active-store.cjs"),n=require("../agent-server-client-options.cjs"),r=require("../../services/settings.cjs"),i=require("../../utils/mcp-config.cjs"),a=require("../cloud/settings-service.api.cjs");var o=[`language`,`user_consents_to_analytics`,`enable_sound_notifications`,`git_user_name`,`git_user_email`,`title_llm_profile`,`disabled_skills`],s=new Set(o),c=e=>s.has(e),l=e=>{let t={},n={};for(let[r,i]of Object.entries(e))c(r)?t[r]=i:n[r]=i;return{extracted:t,rest:n}},u=e=>JSON.parse(JSON.stringify(e)),d=(e,t)=>({...e??{},...t??{}});async function f(e,t=3,n=500){for(let r=0;r<t;r+=1)try{return await e()}catch(e){if(r>=t-1)throw e;let i=n*2**r;await new Promise(e=>{setTimeout(e,i)})}throw Error(`Retry attempts exhausted`)}var p={redacted:null,encrypted:null,timestamp:0},m=300*1e3,h=()=>Date.now()-p.timestamp<m,g=()=>{p={redacted:null,encrypted:null,timestamp:0}},_=e=>!!e&&typeof e==`object`&&!Array.isArray(e),v=(e,t)=>`Basic ${btoa(`${e}:${t}`)}`,y=e=>{switch(e.strategy){case`none`:return{};case`api_key`:{if(typeof e.value!=`string`||!e.value)return null;let t=typeof e.header_name==`string`&&e.header_name?e.header_name:`Authorization`,n=t===`Authorization`?`Bearer ${e.value}`:e.value;return{[t]:n}}case`bearer`:return typeof e.value!=`string`||!e.value?null:{Authorization:`Bearer ${e.value}`};case`basic`:return typeof e.username!=`string`||typeof e.password!=`string`?null:{Authorization:v(e.username,e.password)};case`header`:return i.stringRecord(e.headers)??{};case`oauth2`:{let t=_(e.state)?e.state.tokens:void 0;return!_(t)||typeof t.access_token!=`string`?null:{Authorization:`Bearer ${t.access_token}`}}default:return null}},b=async e=>{if(!_(e))return e;let n=_(e.mcpServers),r=n?e.mcpServers:e,o=Object.values(r).some(e=>_(e)&&_(e.auth)&&e.auth!==null)&&t.getActiveBackend().backend.kind===`cloud`,s=new Map;if(o)try{let e=await a.fetchCloudSettings(),t=_(e.mcp_config)?e.mcp_config:{};for(let[e,n]of Object.entries(t))if(_(n)){let t=i.stringRecord(n.headers);t&&s.set(e,t)}}catch{}let c=Object.fromEntries(Object.entries(r).map(([e,t])=>{if(!_(t))return[e,t];if(t.auth===null){let n={...t,headers:null};return delete n.auth,[e,n]}if(!_(t.auth))return[e,t];let n=y(t.auth);if(n===null)return[e,t];let r={...t},a={...i.stringRecord(t.headers)??{},...n},o=s.get(e);if(o)for(let e of Object.keys(o))e in a||(a[e]=null);return delete r.auth,Object.keys(a).length>0?r.headers=a:delete r.headers,[e,r]}));return n?{...e,mcpServers:c}:c},x=e=>{let t={agent_settings:e.agent_settings??{},conversation_settings:e.conversation_settings??{},llm_api_key_set:e.llm_api_key_is_set},n=e.misc_settings?.app_preferences;if(n)for(let e of o){let r=n[e];r!==void 0&&(t[e]=r)}return t},S=e=>{let t=d(r.DEFAULT_SETTINGS.agent_settings??{},e.agent_settings??{}),n=d(r.DEFAULT_SETTINGS.conversation_settings??{},e.conversation_settings??{}),i={...u(r.DEFAULT_SETTINGS),...e,provider_tokens_set:{...r.DEFAULT_SETTINGS.provider_tokens_set??{},...e.provider_tokens_set??{}},agent_settings:t,conversation_settings:n},a=t.llm,o=t.condenser;return typeof t.agent==`string`&&(i.agent=t.agent),typeof a?.model==`string`&&a.model.length>0&&(i.llm_model=a.model),typeof a?.base_url==`string`&&(i.llm_base_url=a.base_url),typeof o?.enabled==`boolean`&&(i.enable_default_condenser=o.enabled),typeof o?.max_size==`number`&&(i.condenser_max_size=o.max_size),typeof n.confirmation_mode==`boolean`&&(i.confirmation_mode=n.confirmation_mode),(typeof n.security_analyzer==`string`||n.security_analyzer===null)&&(i.security_analyzer=n.security_analyzer),typeof n.max_iterations==`number`&&(i.max_iterations=n.max_iterations),i.search_api_key_set=!!i.search_api_key,i},C=class r{static async fetchSettingsFromApi(t){return f(()=>new e.SettingsClient(n.getAgentServerClientOptions()).getSettings({exposeSecrets:t}))}static async getSettings(){if(t.getActiveBackend().backend.kind===`cloud`)try{return S(await f(()=>a.fetchCloudSettings()))}catch(e){return console.warn(`Failed to fetch cloud settings, using defaults:`,e),S({})}if(h()&&p.redacted)return S(x(p.redacted));try{let e=await this.fetchSettingsFromApi();return p.redacted=e,p.timestamp=Date.now(),S(x(e))}catch(e){return console.warn(`Failed to fetch settings from API, using defaults:`,e),S({})}}static async getSettingsForConversation(){if(h()&&p.encrypted)return{agentSettings:p.encrypted.agent_settings,conversationSettings:p.encrypted.conversation_settings,secretsEncrypted:!0};let e=await this.fetchSettingsFromApi(`encrypted`);return p.encrypted=e,p.timestamp||=Date.now(),{agentSettings:e.agent_settings,conversationSettings:e.conversation_settings,secretsEncrypted:!0}}static async getSettingsSchema(){return t.getActiveBackend().backend.kind===`cloud`?await a.fetchCloudSettingsSchema():await new e.SettingsClient(n.getAgentServerClientOptions()).getAgentSchema()}static async getConversationSettingsSchema(){return t.getActiveBackend().backend.kind===`cloud`?await a.fetchCloudConversationSettingsSchema():await new e.SettingsClient(n.getAgentServerClientOptions()).getConversationSchema()}static async patchMcpConfig(r){if(t.getActiveBackend().backend.kind===`cloud`){let e=await b(r);await f(()=>a.saveCloudSettings({agent_settings_diff:{mcp_config:e}}))}else await f(()=>new e.SettingsClient(n.getAgentServerClientOptions()).updateSettings({agent_settings_diff:{mcp_config:r}}));return g(),!0}static async patchMcpServer(i,a){return t.getActiveBackend().backend.kind===`cloud`?r.patchMcpConfig({[i]:a}):(await f(()=>new e.SettingsClient(n.getAgentServerClientOptions()).patchMcpServer(i,a)),g(),!0)}static async createMcpServer(i,a){return t.getActiveBackend().backend.kind===`cloud`?r.patchMcpConfig({[i]:a}):(await f(()=>new e.SettingsClient(n.getAgentServerClientOptions()).createMcpServer(i,a)),g(),!0)}static async deleteMcpServer(i){return t.getActiveBackend().backend.kind===`cloud`?r.patchMcpConfig({[i]:null}):(await f(()=>new e.SettingsClient(n.getAgentServerClientOptions()).deleteMcpServer(i)),g(),!0)}static async saveSettings(r){let{extracted:i,rest:o}=l(r),s=Object.keys(i).length>0,c={},u=o.agent_settings_diff;u&&Object.keys(u).length>0&&(c.agent_settings_diff=u);let d=o.conversation_settings_diff;if(d&&Object.keys(d).length>0&&(c.conversation_settings_diff=d),s&&(c.misc_settings_diff={app_preferences:i}),t.getActiveBackend().backend.kind===`cloud`){if(!(c.agent_settings_diff||c.conversation_settings_diff||s))return!0;let e={};c.agent_settings_diff&&(e.agent_settings_diff={...c.agent_settings_diff},`mcp_config`in e.agent_settings_diff&&(e.agent_settings_diff.mcp_config=await b(e.agent_settings_diff.mcp_config))),c.conversation_settings_diff&&(e.conversation_settings_diff=c.conversation_settings_diff),s&&(e.app_preferences=i),await f(()=>a.saveCloudSettings(e))}else{if(!(c.agent_settings_diff||c.conversation_settings_diff||c.misc_settings_diff))return!0;await f(()=>new e.SettingsClient(n.getAgentServerClientOptions()).updateSettings(c))}return g(),!0}static invalidateCache(){g()}};exports.default=C;
 //# sourceMappingURL=settings-service.api.cjs.map

package/dist/api/settings-service/settings-service.api.cjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"settings-service.api.cjs","names":[],"sources":["../../../src/api/settings-service/settings-service.api.ts"],"sourcesContent":["import { SettingsClient } from \"@openhands/typescript-client/clients\";\nimport { DEFAULT_SETTINGS } from \"#/services/settings\";\nimport { Settings, SettingsSchema, SettingsValue } from \"#/types/settings\";\nimport {\n getSdkMcpServerMap,\n hasRedactedMcpSecretLeaf,\n stringRecord,\n} from \"#/utils/mcp-config\";\nimport { getActiveBackend } from \"../backend-registry/active-store\";\nimport {\n fetchCloudConversationSettingsSchema,\n fetchCloudSettings,\n fetchCloudSettingsSchema,\n saveCloudSettings,\n} from \"../cloud/settings-service.api\";\nimport { getAgentServerClientOptions } from \"../agent-server-client-options\";\n\n/*\n Fields the agent-server stores under `misc_settings.app_preferences` (see\n * SDK `openhands.sdk.settings.AppPreferences`). Mirrored here as a flat\n * partial of Settings so the rest of the frontend can keep treating them as\n * top-level keys (`settings.language`, `settings.disabled_skills`, …).\n /\nexport const APP_PREFERENCE_FIELDS = [\n \"language\",\n \"user_consents_to_analytics\",\n \"enable_sound_notifications\",\n \"git_user_name\",\n \"git_user_email\",\n \"title_llm_profile\",\n \"disabled_skills\",\n] as const;\n\nexport type AppPreferenceField = (typeof APP_PREFERENCE_FIELDS)[number];\n\nexport type AppPreferences = Partial<Pick<Settings, AppPreferenceField>>;\n\n/\n Container for frontend-owned settings the agent doesn't interpret.\n * Mirrors the SDK `MiscSettings` model introduced in agent-server 1.27.\n \n Single nested category today (`app_preferences`). Adding a future\n * category (e.g. `ui_preferences`) is a non-breaking change for the wire\n * shape — it just adds another optional sibling here.\n /\nexport interface MiscSettings {\n app_preferences?: AppPreferences;\n}\n\n/\n Response from GET /api/settings\n * Mirrors the SettingsResponse model in the agent server.\n /\nexport interface SettingsApiResponse {\n agent_settings: Record<string, SettingsValue>;\n conversation_settings: Record<string, SettingsValue>;\n llm_api_key_is_set: boolean;\n /\n Frontend-owned settings the agent does not interpret (currently just\n * `app_preferences`). Added in agent-server 1.27; earlier servers omit\n * the field entirely, in which case the frontend falls back to defaults.\n /\n misc_settings?: MiscSettings;\n}\n\n/\n Request payload for PATCH /api/settings.\n \n `misc_settings_diff` is deep-merged into the persisted `misc_settings`\n * block, matching the semantics of `agent_settings_diff` /\n * `conversation_settings_diff`. A partial diff like\n * `{ app_preferences: { language: \"fr\" } }` updates only `language` and\n * leaves every other `app_preferences` field alone. Lists\n * (`disabled_skills`) are replaced wholesale rather than merged.\n /\nexport interface SettingsUpdateRequest {\n agent_settings_diff?: Record<string, SettingsValue>;\n conversation_settings_diff?: Record<string, SettingsValue>;\n misc_settings_diff?: MiscSettings;\n // Permit additional keys so this stays assignable to the underlying\n // typescript-client SDK type, which uses `[key: string]: unknown` for\n // forward compatibility.\n [key: string]: unknown;\n}\n\nconst APP_PREFERENCE_FIELD_SET: ReadonlySet<string> = new Set(\n APP_PREFERENCE_FIELDS,\n);\n\nconst isAppPreferenceField = (key: string): key is AppPreferenceField =>\n APP_PREFERENCE_FIELD_SET.has(key);\n\n/\n Split known app-preference keys out of a save payload so callers can\n * route them through `misc_settings_diff.app_preferences` (local) or as\n * flat top-level keys (cloud), while the remaining fields flow into the\n * `agent_settings_diff` / `conversation_settings_diff` branches.\n /\nconst extractAppPreferences = (\n input: Record<string, unknown>,\n): { extracted: AppPreferences; rest: Record<string, unknown> } => {\n const extracted: AppPreferences = {};\n const rest: Record<string, unknown> = {};\n for (const [key, value] of Object.entries(input)) {\n if (isAppPreferenceField(key)) {\n (extracted as Record<string, unknown>)[key] = value;\n } else {\n rest[key] = value;\n }\n }\n return { extracted, rest };\n};\n\n/\n Secret exposure mode for X-Expose-Secrets header.\n \n - undefined: Returns redacted secrets (\"*********\")\n - \"encrypted\": Returns cipher-encrypted values (safe for frontend to round-trip)\n * - \"plaintext\": Returns raw secret values (backend use only!)\n /\nexport type ExposeSecretsMode = \"encrypted\" \| \"plaintext\" \| undefined;\n\nconst deepClone = <T>(value: T): T => JSON.parse(JSON.stringify(value)) as T;\n\nconst mergeRecords = (\n base: Record<string, SettingsValue> \| null \| undefined,\n next: Record<string, SettingsValue> \| null \| undefined,\n) => ({ ...(base ?? {}), ...(next ?? {}) });\n\n/\n Retry helper for API calls with exponential backoff.\n /\nasync function withRetry<T>(\n fn: () => Promise<T>,\n maxRetries: number = 3,\n baseDelayMs: number = 500,\n): Promise<T> {\n for (let attempt = 0; attempt < maxRetries; attempt += 1) {\n try {\n return await fn();\n } catch (error) {\n if (attempt >= maxRetries - 1) {\n throw error;\n }\n\n const delay = baseDelayMs 2 attempt;\n\n await new Promise<void>((resolve) => {\n setTimeout(resolve, delay);\n });\n }\n }\n\n throw new Error(\"Retry attempts exhausted\");\n}\n\n/\n * In-memory cache for settings to avoid repeated network calls.\n * The cache is invalidated on save operations.\n /\nlet settingsCache: {\n /* Settings with redacted secrets for display /\n redacted: SettingsApiResponse \| null;\n /* Settings with encrypted secrets for conversation start /\n encrypted: SettingsApiResponse \| null;\n /* Timestamp when the cache was last populated /\n timestamp: number;\n} = {\n redacted: null,\n encrypted: null,\n timestamp: 0,\n};\n\nconst CACHE_TTL_MS = 5 60 * 1000; // 5 minutes\n\nconst isCacheValid = () => Date.now() - settingsCache.timestamp < CACHE_TTL_MS;\n\nconst clearCache = () => {\n settingsCache = { redacted: null, encrypted: null, timestamp: 0 };\n};\n\nconst isRecord = (value: unknown): value is Record<string, unknown> =>\n !!value && typeof value === \"object\" && !Array.isArray(value);\n\nconst basicAuthHeader = (username: string, password: string): string => {\n const token = btoa(`${username}:${password}`);\n return `Basic ${token}`;\n};\n\nconst headersFromMcpAuth = (\n auth: Record<string, unknown>,\n): Record<string, string> \| null => {\n switch (auth.strategy) {\n case \"none\":\n return {};\n case \"api_key\": {\n if (typeof auth.value !== \"string\" \|\| !auth.value) return null;\n const header =\n typeof auth.header_name === \"string\" && auth.header_name\n ? auth.header_name\n : \"Authorization\";\n const value =\n header === \"Authorization\" ? `Bearer ${auth.value}` : auth.value;\n return { [header]: value };\n }\n case \"bearer\":\n if (typeof auth.value !== \"string\" \|\| !auth.value) return null;\n return { Authorization: `Bearer ${auth.value}` };\n case \"basic\":\n if (\n typeof auth.username !== \"string\" \|\|\n typeof auth.password !== \"string\"\n ) {\n return null;\n }\n return { Authorization: basicAuthHeader(auth.username, auth.password) };\n case \"header\":\n return stringRecord(auth.headers) ?? {};\n case \"oauth2\": {\n const tokens = isRecord(auth.state) ? auth.state.tokens : undefined;\n if (!isRecord(tokens) \|\| typeof tokens.access_token !== \"string\") {\n return null;\n }\n return { Authorization: `Bearer ${tokens.access_token}` };\n }\n default:\n return null;\n }\n};\n\nconst cloudCompatibleMcpConfig = (value: unknown): unknown => {\n if (!isRecord(value)) return value;\n\n const hasWrapper = isRecord(value.mcpServers);\n const serverMap: Record<string, unknown> = hasWrapper\n ? (value.mcpServers as Record<string, unknown>)\n : value;\n\n const converted = Object.fromEntries(\n Object.entries(serverMap).map(([name, server]) => {\n if (!isRecord(server) \|\| !isRecord(server.auth)) return [name, server];\n\n const authHeaders = headersFromMcpAuth(server.auth);\n if (authHeaders === null) return [name, server];\n\n const nextServer = { ...server };\n const existingHeaders = stringRecord(server.headers) ?? {};\n const mergedHeaders = { ...existingHeaders, ...authHeaders };\n delete nextServer.auth;\n if (Object.keys(mergedHeaders).length > 0) {\n nextServer.headers = mergedHeaders;\n } else {\n delete nextServer.headers;\n }\n return [name, nextServer];\n }),\n );\n\n return hasWrapper ? { ...value, mcpServers: converted } : converted;\n};\n\n/*\n Spell out every server's `enabled` flag.\n \n `toSdkMcpConfig` omits the flag while a server is enabled and relies on the\n * pre-clear below to drop a previously persisted `enabled: false`. The one\n * write that skips the pre-clear — a cloud update carrying redacted secrets —\n * lands as an RFC 7386 merge instead, and a merge cannot clear a key by\n * omitting it. Without this, re-enabling a server on cloud would silently do\n * nothing.\n /\nconst withExplicitMcpEnabled = (value: unknown): unknown => {\n if (!isRecord(value)) return value;\n\n const hasWrapper = isRecord(value.mcpServers);\n const serverMap: Record<string, unknown> = hasWrapper\n ? (value.mcpServers as Record<string, unknown>)\n : value;\n\n const converted = Object.fromEntries(\n Object.entries(serverMap).map(([name, server]) =>\n isRecord(server)\n ? [name, { ...server, enabled: server.enabled !== false }]\n : [name, server],\n ),\n );\n\n return hasWrapper ? { ...value, mcpServers: converted } : converted;\n};\n\nconst hasRedactedMcpSecrets = (mcpConfig: unknown): boolean => {\n const servers = getSdkMcpServerMap(mcpConfig);\n if (!servers) return false;\n return Object.values(servers).some(\n (server) =>\n hasRedactedMcpSecretLeaf(isRecord(server) ? server.auth : undefined) \|\|\n hasRedactedMcpSecretLeaf(isRecord(server) ? server.headers : undefined) \|\|\n hasRedactedMcpSecretLeaf(isRecord(server) ? server.env : undefined),\n );\n};\n\nconst removesMcpServer = (previous: unknown, next: unknown): boolean => {\n const previousServers = getSdkMcpServerMap(previous);\n const nextServers = getSdkMcpServerMap(next);\n if (!previousServers \|\| !nextServers) return false;\n return Object.keys(previousServers).some((name) => !(name in nextServers));\n};\n\n/\n Transform API response into Settings object with derived fields.\n /\nconst transformApiResponse = (\n response: SettingsApiResponse,\n): Partial<Settings> => {\n const agentSettings = response.agent_settings ?? {};\n const conversationSettings = response.conversation_settings ?? {};\n\n const partial: Partial<Settings> = {\n agent_settings: agentSettings,\n conversation_settings: conversationSettings,\n llm_api_key_set: response.llm_api_key_is_set,\n };\n\n // App-level user preferences come back nested under\n // `misc_settings.app_preferences` from the local agent-server (added in\n // 1.27, restructured into the `misc_settings` container in the follow-up\n // refactor). Hoist them onto the flat Settings shape the rest of the\n // frontend already speaks. Older servers omit the `misc_settings` field\n // entirely; the migration helper invoked from `getSettings` promotes any\n // leftover localStorage values to the server on first run, so the omitted\n // case just falls back to defaults.\n const prefs = response.misc_settings?.app_preferences;\n if (prefs) {\n for (const key of APP_PREFERENCE_FIELDS) {\n const value = prefs[key];\n if (value !== undefined) {\n (partial as Record<string, unknown>)[key] = value;\n }\n }\n }\n\n return partial;\n};\n\n/\n Sync derived settings fields from agent_settings and conversation_settings.\n * This ensures backward compatibility with code that reads top-level fields.\n /\nconst syncDerivedSettings = (settings: Partial<Settings>): Settings => {\n const agentSettings = mergeRecords(\n DEFAULT_SETTINGS.agent_settings ?? {},\n settings.agent_settings ?? {},\n );\n const conversationSettings = mergeRecords(\n DEFAULT_SETTINGS.conversation_settings ?? {},\n settings.conversation_settings ?? {},\n );\n\n const merged = {\n ...deepClone(DEFAULT_SETTINGS),\n ...settings,\n provider_tokens_set: {\n ...(DEFAULT_SETTINGS.provider_tokens_set ?? {}),\n ...(settings.provider_tokens_set ?? {}),\n },\n agent_settings: agentSettings,\n conversation_settings: conversationSettings,\n } as Settings;\n\n const llm = agentSettings.llm as Record<string, SettingsValue> \| undefined;\n const condenser = agentSettings.condenser as\n \| Record<string, SettingsValue>\n \| undefined;\n\n if (typeof agentSettings.agent === \"string\") {\n merged.agent = agentSettings.agent;\n }\n if (typeof llm?.model === \"string\" && llm.model.length > 0) {\n merged.llm_model = llm.model;\n }\n if (typeof llm?.base_url === \"string\") {\n merged.llm_base_url = llm.base_url;\n }\n // Note: api_key may be redacted (\"*******\") when fetched without expose header\n // We don't sync it to top-level llm_api_key to avoid overwriting with redacted value\n if (typeof condenser?.enabled === \"boolean\") {\n merged.enable_default_condenser = condenser.enabled;\n }\n if (typeof condenser?.max_size === \"number\") {\n merged.condenser_max_size = condenser.max_size;\n }\n if (typeof conversationSettings.confirmation_mode === \"boolean\") {\n merged.confirmation_mode = conversationSettings.confirmation_mode;\n }\n if (\n typeof conversationSettings.security_analyzer === \"string\" \|\|\n conversationSettings.security_analyzer === null\n ) {\n merged.security_analyzer = conversationSettings.security_analyzer as\n \| string\n \| null;\n }\n if (typeof conversationSettings.max_iterations === \"number\") {\n merged.max_iterations = conversationSettings.max_iterations;\n }\n\n merged.search_api_key_set = !!merged.search_api_key;\n\n return merged;\n};\n\nclass SettingsService {\n /\n * Fetch settings from the agent server API with retry logic.\n \n @param exposeSecrets - Controls how secrets are returned:\n * - undefined: Secrets are redacted (\"*********\") - safe for display\n - \"encrypted\": Secrets are cipher-encrypted - safe for round-trip to start conversation\n * - \"plaintext\": Raw secrets - DO NOT USE from frontend\n /\n static async fetchSettingsFromApi(\n exposeSecrets?: ExposeSecretsMode,\n ): Promise<SettingsApiResponse> {\n return withRetry(() =>\n new SettingsClient(getAgentServerClientOptions()).getSettings({\n exposeSecrets,\n }),\n ) as Promise<SettingsApiResponse>;\n }\n\n /\n Get settings for display (secrets are redacted).\n * Uses in-memory cache for performance.\n /\n static async getSettings(): Promise<Settings> {\n // Cloud uses a different settings shape (flat top-level fields\n // including provider_tokens_set, llm_model, etc.). Branch out before\n // touching the local-only cache: cloud responses bypass the local\n // SettingsApiResponse shape and feed straight into syncDerivedSettings\n // so cloud-native fields like provider_tokens_set reach the GUI's\n // useUserProviders → useAppInstallations → useGitRepositories chain.\n if (getActiveBackend().backend.kind === \"cloud\") {\n try {\n const cloud = await withRetry(() => fetchCloudSettings());\n return syncDerivedSettings(cloud);\n } catch (error) {\n console.warn(\"Failed to fetch cloud settings, using defaults:\", error);\n return syncDerivedSettings({});\n }\n }\n\n // Check cache first\n if (isCacheValid() && settingsCache.redacted) {\n return syncDerivedSettings(transformApiResponse(settingsCache.redacted));\n }\n\n try {\n const response = await this.fetchSettingsFromApi();\n settingsCache.redacted = response;\n settingsCache.timestamp = Date.now();\n return syncDerivedSettings(transformApiResponse(response));\n } catch (error) {\n // If API fails, return defaults\n console.warn(\"Failed to fetch settings from API, using defaults:\", error);\n return syncDerivedSettings({});\n }\n }\n\n /\n Get settings with encrypted secrets for starting conversations.\n * The encrypted secrets can be passed to the start conversation API\n * with secrets_encrypted=true for server-side decryption.\n \n @throws Error if encrypted settings cannot be fetched - conversations\n * should not start with broken/redacted credentials.\n /\n static async getSettingsForConversation(): Promise<{\n agentSettings: Record<string, SettingsValue>;\n conversationSettings: Record<string, SettingsValue>;\n secretsEncrypted: boolean;\n }> {\n // Check cache first\n if (isCacheValid() && settingsCache.encrypted) {\n return {\n agentSettings: settingsCache.encrypted.agent_settings,\n conversationSettings: settingsCache.encrypted.conversation_settings,\n secretsEncrypted: true,\n };\n }\n\n // Fetch encrypted settings - this MUST succeed for conversations to work.\n // Do not fall back to redacted settings as that would cause auth failures.\n const response = await this.fetchSettingsFromApi(\"encrypted\");\n settingsCache.encrypted = response;\n if (!settingsCache.timestamp) {\n settingsCache.timestamp = Date.now();\n }\n return {\n agentSettings: response.agent_settings,\n conversationSettings: response.conversation_settings,\n secretsEncrypted: true,\n };\n }\n\n static async getSettingsSchema(): Promise<SettingsSchema> {\n if (getActiveBackend().backend.kind === \"cloud\") {\n return (await fetchCloudSettingsSchema()) as SettingsSchema;\n }\n return (await new SettingsClient(\n getAgentServerClientOptions(),\n ).getAgentSchema()) as SettingsSchema;\n }\n\n static async getConversationSettingsSchema(): Promise<SettingsSchema> {\n if (getActiveBackend().backend.kind === \"cloud\") {\n return (await fetchCloudConversationSettingsSchema()) as SettingsSchema;\n }\n return (await new SettingsClient(\n getAgentServerClientOptions(),\n ).getConversationSchema()) as SettingsSchema;\n }\n\n /\n Save settings to the agent server API.\n * Uses PATCH for incremental updates.\n /\n static async saveSettings(\n settings: Partial<Settings> & Record<string, unknown>,\n ): Promise<boolean> {\n // Split app-level user-preference fields (language, git identity, sound\n // notifications, analytics consent, disabled_skills) off and route them\n // through `misc_settings_diff.app_preferences` (local) or as flat\n // top-level keys (cloud). The local agent-server stores them under\n // `PersistedSettings.misc_settings.app_preferences`; the cloud accepts\n // them as flat keys on `POST /api/v1/settings`.\n const { extracted: appPreferences, rest } = extractAppPreferences(\n settings as Record<string, unknown>,\n );\n const hasAppPreferences = Object.keys(appPreferences).length > 0;\n\n const payload: SettingsUpdateRequest = {};\n\n // Extract agent_settings_diff\n const agentSettingsDiff = rest.agent_settings_diff as\n \| Record<string, SettingsValue>\n \| undefined;\n if (agentSettingsDiff && Object.keys(agentSettingsDiff).length > 0) {\n payload.agent_settings_diff = agentSettingsDiff;\n }\n\n // Extract conversation_settings_diff\n const conversationSettingsDiff = rest.conversation_settings_diff as\n \| Record<string, SettingsValue>\n \| undefined;\n if (\n conversationSettingsDiff &&\n Object.keys(conversationSettingsDiff).length > 0\n ) {\n payload.conversation_settings_diff = conversationSettingsDiff;\n }\n\n if (hasAppPreferences) {\n payload.misc_settings_diff = { app_preferences: appPreferences };\n }\n\n const isCloud = getActiveBackend().backend.kind === \"cloud\";\n\n // The backend applies ``agent_settings_diff`` by deep-merging it into the\n // existing ``agent_settings`` dict (see SDK\n // ``openhands.agent_server.persistence.models._deep_merge``). That works\n // for scalar fields but is wrong for ``mcp_config``, which is\n // a name-keyed map: a diff that omits a server cannot remove it (stale\n // key stays), and a diff whose key indices shift (e.g. after deleting\n // index 0, the second server is renumbered) leaves the original keys\n // behind as duplicates pointing to the wrong server config.\n //\n // The only way to make ``mcp_config`` behave like a replace through this\n // API is to first null it out — ``null`` is not a dict, so deep-merge\n // takes the else branch and sets the field to ``None`` outright — and\n // then send the new value in a follow-up call. We do this for every\n // ``mcp_config`` write, including adds (the wasted round-trip is\n // negligible for this user action and avoids divergent code paths).\n const agentDiff = payload.agent_settings_diff;\n // Send a pre-clear PATCH when the diff sets ``mcp_config`` to a non-null\n // value. A second PATCH below then writes the new value. Skipping the\n // pre-clear when the caller is already clearing (``mcp_config: null``)\n // avoids a pointless duplicate request.\n const needsMcpPreClear =\n !!agentDiff && \"mcp_config\" in agentDiff && agentDiff.mcp_config !== null;\n\n // The pre-clear is destructive: if the follow-up write fails after the\n // clear succeeds, the user's MCP config is left empty. Snapshot the\n // previous value (in raw SDK-native shape, NOT the GUI's parsed MCPConfig)\n // before pre-clearing so we can attempt a best-effort rollback. The\n // original write error is always re-thrown to the caller regardless\n // of rollback success — the GUI's react-query mutations surface that\n // as an error toast so the user knows to retry.\n //\n // Snapshot must be the SDK-native server map because that is what the\n // backend expects on the rollback PATCH.\n // ``SettingsService.getSettings`` returns a GUI Settings object whose\n // ``mcp_config`` is typed as the parsed frontend MCPConfig and\n // defaults to empty arrays when nothing is installed, so it is not\n // suitable for round-tripping back to the backend.\n let mcpConfigSnapshot: unknown = undefined;\n if (needsMcpPreClear) {\n try {\n if (isCloud) {\n const raw = (await fetchCloudSettings()) as {\n agent_settings?: { mcp_config?: unknown };\n };\n mcpConfigSnapshot = raw?.agent_settings?.mcp_config;\n } else {\n const raw = (await SettingsService.fetchSettingsFromApi()) as {\n agent_settings?: { mcp_config?: unknown };\n };\n mcpConfigSnapshot = raw?.agent_settings?.mcp_config;\n }\n } catch {\n // Snapshot failed (network blip, etc.). Continue without rollback\n // ability — the original write error will still surface.\n }\n }\n\n // Cloud settings may redact MCP env/header/auth secrets without an\n // encrypted exposure mode. A pre-clear before a non-delete update can\n // permanently erase unchanged secrets; for updates that keep all existing\n // server keys, rely on the backend deep-merge to preserve redacted leaves\n // while applying edited fields and newly typed credentials.\n const shouldUseCloudMergePatchForRedactedMcpSecrets =\n isCloud &&\n needsMcpPreClear &&\n hasRedactedMcpSecrets(mcpConfigSnapshot) &&\n !removesMcpServer(mcpConfigSnapshot, agentDiff?.mcp_config);\n const shouldPreClearMcpConfig =\n needsMcpPreClear && !shouldUseCloudMergePatchForRedactedMcpSecrets;\n\n if (isCloud) {\n const hasCloudWork =\n !!payload.agent_settings_diff \|\|\n !!payload.conversation_settings_diff \|\|\n hasAppPreferences;\n if (!hasCloudWork) {\n return true;\n }\n if (shouldPreClearMcpConfig) {\n await withRetry(() =>\n saveCloudSettings({\n agent_settings_diff: { mcp_config: null },\n }),\n );\n }\n // Build the cloud payload from the same diffs, but as a separate\n // object so undefined keys don't appear in the call (saveCloudSettings\n // is called from tests with an exact-shape assertion).\n const cloudPayload: Parameters<typeof saveCloudSettings>[0] = {};\n if (payload.agent_settings_diff) {\n cloudPayload.agent_settings_diff = { ...payload.agent_settings_diff };\n if (\"mcp_config\" in cloudPayload.agent_settings_diff) {\n const mcpConfig = cloudCompatibleMcpConfig(\n cloudPayload.agent_settings_diff.mcp_config,\n );\n cloudPayload.agent_settings_diff.mcp_config = (\n shouldUseCloudMergePatchForRedactedMcpSecrets\n ? withExplicitMcpEnabled(mcpConfig)\n : mcpConfig\n ) as SettingsValue;\n }\n }\n if (payload.conversation_settings_diff) {\n cloudPayload.conversation_settings_diff =\n payload.conversation_settings_diff;\n }\n if (hasAppPreferences) {\n // The cloud `POST /api/v1/settings` takes app-preference fields as\n // flat top-level keys (not under `app_preferences_diff`).\n // `saveCloudSettings` re-flattens them onto the request body.\n cloudPayload.app_preferences = appPreferences;\n }\n try {\n await withRetry(() => saveCloudSettings(cloudPayload));\n } catch (err) {\n if (shouldPreClearMcpConfig && mcpConfigSnapshot) {\n // Best-effort rollback. We deliberately do not wrap in withRetry:\n // the user's session is already in a degraded state and we want\n // to surface the original error promptly. Swallowing the restore\n // error preserves the original failure context for the caller.\n try {\n await saveCloudSettings({\n agent_settings_diff: {\n mcp_config: mcpConfigSnapshot as SettingsValue,\n },\n });\n } catch {\n // Rollback failed; the original error takes precedence.\n }\n }\n throw err;\n }\n } else {\n // The local agent-server PATCH /api/settings requires at least one of\n // the three diff fields. Skip the request entirely if nothing changed.\n const hasLocalDiffs =\n !!payload.agent_settings_diff \|\|\n !!payload.conversation_settings_diff \|\|\n !!payload.misc_settings_diff;\n if (!hasLocalDiffs) {\n return true;\n }\n if (shouldPreClearMcpConfig) {\n await withRetry(() =>\n new SettingsClient(getAgentServerClientOptions()).updateSettings({\n agent_settings_diff: { mcp_config: null },\n }),\n );\n }\n try {\n await withRetry(() =>\n new SettingsClient(getAgentServerClientOptions()).updateSettings(\n payload,\n ),\n );\n } catch (err) {\n if (shouldPreClearMcpConfig && mcpConfigSnapshot) {\n // See cloud branch above for rationale.\n try {\n await new SettingsClient(\n getAgentServerClientOptions(),\n ).updateSettings({\n agent_settings_diff: {\n mcp_config: mcpConfigSnapshot as SettingsValue,\n },\n });\n } catch {\n // Rollback failed; the original error takes precedence.\n }\n }\n throw err;\n }\n }\n\n // Invalidate cache after successful save\n clearCache();\n\n return true;\n }\n\n /\n Invalidate the settings cache.\n * Call this when settings may have changed externally.\n */\n static invalidateCache(): void {\n clearCache();\n }\n}\n\nexport default SettingsService;\n"],"mappings":"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"}
1	+ {"version":3,"file":"settings-service.api.cjs","names":[],"sources":["../../../src/api/settings-service/settings-service.api.ts"],"sourcesContent":["import { SettingsClient } from \"@openhands/typescript-client/clients\";\nimport type {\n MCPConfigPatch,\n MCPServer,\n MCPServerPatch,\n} from \"@openhands/typescript-client\";\nimport { DEFAULT_SETTINGS } from \"#/services/settings\";\nimport { Settings, SettingsSchema, SettingsValue } from \"#/types/settings\";\nimport { stringRecord } from \"#/utils/mcp-config\";\nimport { getActiveBackend } from \"../backend-registry/active-store\";\nimport {\n fetchCloudConversationSettingsSchema,\n fetchCloudSettings,\n fetchCloudSettingsSchema,\n saveCloudSettings,\n} from \"../cloud/settings-service.api\";\nimport { getAgentServerClientOptions } from \"../agent-server-client-options\";\n\n/*\n Fields the agent-server stores under `misc_settings.app_preferences` (see\n * SDK `openhands.sdk.settings.AppPreferences`). Mirrored here as a flat\n * partial of Settings so the rest of the frontend can keep treating them as\n * top-level keys (`settings.language`, `settings.disabled_skills`, …).\n /\nexport const APP_PREFERENCE_FIELDS = [\n \"language\",\n \"user_consents_to_analytics\",\n \"enable_sound_notifications\",\n \"git_user_name\",\n \"git_user_email\",\n \"title_llm_profile\",\n \"disabled_skills\",\n] as const;\n\nexport type AppPreferenceField = (typeof APP_PREFERENCE_FIELDS)[number];\n\nexport type AppPreferences = Partial<Pick<Settings, AppPreferenceField>>;\n\n/\n Container for frontend-owned settings the agent doesn't interpret.\n * Mirrors the SDK `MiscSettings` model introduced in agent-server 1.27.\n \n Single nested category today (`app_preferences`). Adding a future\n * category (e.g. `ui_preferences`) is a non-breaking change for the wire\n * shape — it just adds another optional sibling here.\n /\nexport interface MiscSettings {\n app_preferences?: AppPreferences;\n}\n\n/\n Response from GET /api/settings\n * Mirrors the SettingsResponse model in the agent server.\n /\nexport interface SettingsApiResponse {\n agent_settings: Record<string, SettingsValue>;\n conversation_settings: Record<string, SettingsValue>;\n llm_api_key_is_set: boolean;\n /\n Frontend-owned settings the agent does not interpret (currently just\n * `app_preferences`). Added in agent-server 1.27; earlier servers omit\n * the field entirely, in which case the frontend falls back to defaults.\n /\n misc_settings?: MiscSettings;\n}\n\n/\n Request payload for PATCH /api/settings.\n \n `misc_settings_diff` is deep-merged into the persisted `misc_settings`\n * block, matching the semantics of `agent_settings_diff` /\n * `conversation_settings_diff`. A partial diff like\n * `{ app_preferences: { language: \"fr\" } }` updates only `language` and\n * leaves every other `app_preferences` field alone. Lists\n * (`disabled_skills`) are replaced wholesale rather than merged.\n /\nexport interface SettingsUpdateRequest {\n agent_settings_diff?: Record<string, SettingsValue>;\n conversation_settings_diff?: Record<string, SettingsValue>;\n misc_settings_diff?: MiscSettings;\n // Permit additional keys so this stays assignable to the underlying\n // typescript-client SDK type, which uses `[key: string]: unknown` for\n // forward compatibility.\n [key: string]: unknown;\n}\n\nconst APP_PREFERENCE_FIELD_SET: ReadonlySet<string> = new Set(\n APP_PREFERENCE_FIELDS,\n);\n\nconst isAppPreferenceField = (key: string): key is AppPreferenceField =>\n APP_PREFERENCE_FIELD_SET.has(key);\n\n/\n Split known app-preference keys out of a save payload so callers can\n * route them through `misc_settings_diff.app_preferences` (local) or as\n * flat top-level keys (cloud), while the remaining fields flow into the\n * `agent_settings_diff` / `conversation_settings_diff` branches.\n /\nconst extractAppPreferences = (\n input: Record<string, unknown>,\n): { extracted: AppPreferences; rest: Record<string, unknown> } => {\n const extracted: AppPreferences = {};\n const rest: Record<string, unknown> = {};\n for (const [key, value] of Object.entries(input)) {\n if (isAppPreferenceField(key)) {\n (extracted as Record<string, unknown>)[key] = value;\n } else {\n rest[key] = value;\n }\n }\n return { extracted, rest };\n};\n\n/\n Secret exposure mode for X-Expose-Secrets header.\n \n - undefined: Returns redacted secrets (\"*********\")\n - \"encrypted\": Returns cipher-encrypted values (safe for frontend to round-trip)\n * - \"plaintext\": Returns raw secret values (backend use only!)\n /\nexport type ExposeSecretsMode = \"encrypted\" \| \"plaintext\" \| undefined;\n\nconst deepClone = <T>(value: T): T => JSON.parse(JSON.stringify(value)) as T;\n\nconst mergeRecords = (\n base: Record<string, SettingsValue> \| null \| undefined,\n next: Record<string, SettingsValue> \| null \| undefined,\n) => ({ ...(base ?? {}), ...(next ?? {}) });\n\n/\n Retry helper for API calls with exponential backoff.\n /\nasync function withRetry<T>(\n fn: () => Promise<T>,\n maxRetries: number = 3,\n baseDelayMs: number = 500,\n): Promise<T> {\n for (let attempt = 0; attempt < maxRetries; attempt += 1) {\n try {\n return await fn();\n } catch (error) {\n if (attempt >= maxRetries - 1) {\n throw error;\n }\n\n const delay = baseDelayMs 2 attempt;\n\n await new Promise<void>((resolve) => {\n setTimeout(resolve, delay);\n });\n }\n }\n\n throw new Error(\"Retry attempts exhausted\");\n}\n\n/\n * In-memory cache for settings to avoid repeated network calls.\n * The cache is invalidated on save operations.\n /\nlet settingsCache: {\n /* Settings with redacted secrets for display /\n redacted: SettingsApiResponse \| null;\n /* Settings with encrypted secrets for conversation start /\n encrypted: SettingsApiResponse \| null;\n /* Timestamp when the cache was last populated /\n timestamp: number;\n} = {\n redacted: null,\n encrypted: null,\n timestamp: 0,\n};\n\nconst CACHE_TTL_MS = 5 60 * 1000; // 5 minutes\n\nconst isCacheValid = () => Date.now() - settingsCache.timestamp < CACHE_TTL_MS;\n\nconst clearCache = () => {\n settingsCache = { redacted: null, encrypted: null, timestamp: 0 };\n};\n\nconst isRecord = (value: unknown): value is Record<string, unknown> =>\n !!value && typeof value === \"object\" && !Array.isArray(value);\n\nconst basicAuthHeader = (username: string, password: string): string => {\n const token = btoa(`${username}:${password}`);\n return `Basic ${token}`;\n};\n\nconst headersFromMcpAuth = (\n auth: Record<string, unknown>,\n): Record<string, string> \| null => {\n switch (auth.strategy) {\n case \"none\":\n return {};\n case \"api_key\": {\n if (typeof auth.value !== \"string\" \|\| !auth.value) return null;\n const header =\n typeof auth.header_name === \"string\" && auth.header_name\n ? auth.header_name\n : \"Authorization\";\n const value =\n header === \"Authorization\" ? `Bearer ${auth.value}` : auth.value;\n return { [header]: value };\n }\n case \"bearer\":\n if (typeof auth.value !== \"string\" \|\| !auth.value) return null;\n return { Authorization: `Bearer ${auth.value}` };\n case \"basic\":\n if (\n typeof auth.username !== \"string\" \|\|\n typeof auth.password !== \"string\"\n ) {\n return null;\n }\n return { Authorization: basicAuthHeader(auth.username, auth.password) };\n case \"header\":\n return stringRecord(auth.headers) ?? {};\n case \"oauth2\": {\n const tokens = isRecord(auth.state) ? auth.state.tokens : undefined;\n if (!isRecord(tokens) \|\| typeof tokens.access_token !== \"string\") {\n return null;\n }\n return { Authorization: `Bearer ${tokens.access_token}` };\n }\n default:\n return null;\n }\n};\n\n/*\n Convert SDK `auth` credentials to the cloud's header-only storage shape.\n \n The cloud settings endpoint applies `mcp_config` as a merge patch, so a\n * credential change must also tombstone the headers the previous credential\n * produced — otherwise stale secrets survive a strategy switch (e.g. an\n * api_key's custom header after moving to bearer). Stored headers that the\n * new credential still produces (via the patch's carried `headers` or the\n * converted auth) are left untouched; any other stored header is cleared.\n /\nconst cloudCompatibleMcpConfig = async (value: unknown): Promise<unknown> => {\n if (!isRecord(value)) return value;\n\n const hasWrapper = isRecord(value.mcpServers);\n const serverMap: Record<string, unknown> = hasWrapper\n ? (value.mcpServers as Record<string, unknown>)\n : value;\n\n const needsStoredCredential =\n Object.values(serverMap).some(\n (server) =>\n isRecord(server) && isRecord(server.auth) && server.auth !== null,\n ) && getActiveBackend().backend.kind === \"cloud\";\n\n const storedHeadersByServer = new Map<string, Record<string, string>>();\n if (needsStoredCredential) {\n try {\n const stored = await fetchCloudSettings();\n const storedMcp = isRecord(stored.mcp_config) ? stored.mcp_config : {};\n for (const [name, server] of Object.entries(storedMcp)) {\n if (isRecord(server)) {\n const headers = stringRecord(\n (server as Record<string, unknown>).headers,\n );\n if (headers) storedHeadersByServer.set(name, headers);\n }\n }\n } catch {\n // Fall back to the patch-only conversion; a transient fetch failure\n // must not block saving the user's explicit edits.\n }\n }\n\n const converted = Object.fromEntries(\n Object.entries(serverMap).map(([name, server]) => {\n if (!isRecord(server)) return [name, server];\n if (server.auth === null) {\n const nextServer: Record<string, unknown> = {\n ...server,\n headers: null,\n };\n delete nextServer.auth;\n return [name, nextServer];\n }\n if (!isRecord(server.auth)) return [name, server];\n\n const authHeaders = headersFromMcpAuth(server.auth);\n if (authHeaders === null) return [name, server];\n\n const nextServer = { ...server };\n const existingHeaders = stringRecord(server.headers) ?? {};\n const mergedHeaders: Record<string, string \| null> = {\n ...existingHeaders,\n ...authHeaders,\n };\n\n const storedHeaders = storedHeadersByServer.get(name);\n if (storedHeaders) {\n for (const key of Object.keys(storedHeaders)) {\n if (!(key in mergedHeaders)) mergedHeaders[key] = null;\n }\n }\n\n delete nextServer.auth;\n if (Object.keys(mergedHeaders).length > 0) {\n nextServer.headers = mergedHeaders;\n } else {\n delete nextServer.headers;\n }\n return [name, nextServer];\n }),\n );\n\n return hasWrapper ? { ...value, mcpServers: converted } : converted;\n};\n\n/\n Transform API response into Settings object with derived fields.\n /\nconst transformApiResponse = (\n response: SettingsApiResponse,\n): Partial<Settings> => {\n const agentSettings = response.agent_settings ?? {};\n const conversationSettings = response.conversation_settings ?? {};\n\n const partial: Partial<Settings> = {\n agent_settings: agentSettings,\n conversation_settings: conversationSettings,\n llm_api_key_set: response.llm_api_key_is_set,\n };\n\n // App-level user preferences come back nested under\n // `misc_settings.app_preferences` from the local agent-server (added in\n // 1.27, restructured into the `misc_settings` container in the follow-up\n // refactor). Hoist them onto the flat Settings shape the rest of the\n // frontend already speaks. Older servers omit the `misc_settings` field\n // entirely; the migration helper invoked from `getSettings` promotes any\n // leftover localStorage values to the server on first run, so the omitted\n // case just falls back to defaults.\n const prefs = response.misc_settings?.app_preferences;\n if (prefs) {\n for (const key of APP_PREFERENCE_FIELDS) {\n const value = prefs[key];\n if (value !== undefined) {\n (partial as Record<string, unknown>)[key] = value;\n }\n }\n }\n\n return partial;\n};\n\n/\n Sync derived settings fields from agent_settings and conversation_settings.\n * This ensures backward compatibility with code that reads top-level fields.\n /\nconst syncDerivedSettings = (settings: Partial<Settings>): Settings => {\n const agentSettings = mergeRecords(\n DEFAULT_SETTINGS.agent_settings ?? {},\n settings.agent_settings ?? {},\n );\n const conversationSettings = mergeRecords(\n DEFAULT_SETTINGS.conversation_settings ?? {},\n settings.conversation_settings ?? {},\n );\n\n const merged = {\n ...deepClone(DEFAULT_SETTINGS),\n ...settings,\n provider_tokens_set: {\n ...(DEFAULT_SETTINGS.provider_tokens_set ?? {}),\n ...(settings.provider_tokens_set ?? {}),\n },\n agent_settings: agentSettings,\n conversation_settings: conversationSettings,\n } as Settings;\n\n const llm = agentSettings.llm as Record<string, SettingsValue> \| undefined;\n const condenser = agentSettings.condenser as\n \| Record<string, SettingsValue>\n \| undefined;\n\n if (typeof agentSettings.agent === \"string\") {\n merged.agent = agentSettings.agent;\n }\n if (typeof llm?.model === \"string\" && llm.model.length > 0) {\n merged.llm_model = llm.model;\n }\n if (typeof llm?.base_url === \"string\") {\n merged.llm_base_url = llm.base_url;\n }\n // Note: api_key may be redacted (\"*******\") when fetched without expose header\n // We don't sync it to top-level llm_api_key to avoid overwriting with redacted value\n if (typeof condenser?.enabled === \"boolean\") {\n merged.enable_default_condenser = condenser.enabled;\n }\n if (typeof condenser?.max_size === \"number\") {\n merged.condenser_max_size = condenser.max_size;\n }\n if (typeof conversationSettings.confirmation_mode === \"boolean\") {\n merged.confirmation_mode = conversationSettings.confirmation_mode;\n }\n if (\n typeof conversationSettings.security_analyzer === \"string\" \|\|\n conversationSettings.security_analyzer === null\n ) {\n merged.security_analyzer = conversationSettings.security_analyzer as\n \| string\n \| null;\n }\n if (typeof conversationSettings.max_iterations === \"number\") {\n merged.max_iterations = conversationSettings.max_iterations;\n }\n\n merged.search_api_key_set = !!merged.search_api_key;\n\n return merged;\n};\n\nclass SettingsService {\n /\n * Fetch settings from the agent server API with retry logic.\n \n @param exposeSecrets - Controls how secrets are returned:\n * - undefined: Secrets are redacted (\"*********\") - safe for display\n - \"encrypted\": Secrets are cipher-encrypted - safe for round-trip to start conversation\n * - \"plaintext\": Raw secrets - DO NOT USE from frontend\n /\n static async fetchSettingsFromApi(\n exposeSecrets?: ExposeSecretsMode,\n ): Promise<SettingsApiResponse> {\n return withRetry(() =>\n new SettingsClient(getAgentServerClientOptions()).getSettings({\n exposeSecrets,\n }),\n ) as Promise<SettingsApiResponse>;\n }\n\n /\n Get settings for display (secrets are redacted).\n * Uses in-memory cache for performance.\n /\n static async getSettings(): Promise<Settings> {\n // Cloud uses a different settings shape (flat top-level fields\n // including provider_tokens_set, llm_model, etc.). Branch out before\n // touching the local-only cache: cloud responses bypass the local\n // SettingsApiResponse shape and feed straight into syncDerivedSettings\n // so cloud-native fields like provider_tokens_set reach the GUI's\n // useUserProviders → useAppInstallations → useGitRepositories chain.\n if (getActiveBackend().backend.kind === \"cloud\") {\n try {\n const cloud = await withRetry(() => fetchCloudSettings());\n return syncDerivedSettings(cloud);\n } catch (error) {\n console.warn(\"Failed to fetch cloud settings, using defaults:\", error);\n return syncDerivedSettings({});\n }\n }\n\n // Check cache first\n if (isCacheValid() && settingsCache.redacted) {\n return syncDerivedSettings(transformApiResponse(settingsCache.redacted));\n }\n\n try {\n const response = await this.fetchSettingsFromApi();\n settingsCache.redacted = response;\n settingsCache.timestamp = Date.now();\n return syncDerivedSettings(transformApiResponse(response));\n } catch (error) {\n // If API fails, return defaults\n console.warn(\"Failed to fetch settings from API, using defaults:\", error);\n return syncDerivedSettings({});\n }\n }\n\n /\n Get settings with encrypted secrets for starting conversations.\n * The encrypted secrets can be passed to the start conversation API\n * with secrets_encrypted=true for server-side decryption.\n \n @throws Error if encrypted settings cannot be fetched - conversations\n * should not start with broken/redacted credentials.\n /\n static async getSettingsForConversation(): Promise<{\n agentSettings: Record<string, SettingsValue>;\n conversationSettings: Record<string, SettingsValue>;\n secretsEncrypted: boolean;\n }> {\n // Check cache first\n if (isCacheValid() && settingsCache.encrypted) {\n return {\n agentSettings: settingsCache.encrypted.agent_settings,\n conversationSettings: settingsCache.encrypted.conversation_settings,\n secretsEncrypted: true,\n };\n }\n\n // Fetch encrypted settings - this MUST succeed for conversations to work.\n // Do not fall back to redacted settings as that would cause auth failures.\n const response = await this.fetchSettingsFromApi(\"encrypted\");\n settingsCache.encrypted = response;\n if (!settingsCache.timestamp) {\n settingsCache.timestamp = Date.now();\n }\n return {\n agentSettings: response.agent_settings,\n conversationSettings: response.conversation_settings,\n secretsEncrypted: true,\n };\n }\n\n static async getSettingsSchema(): Promise<SettingsSchema> {\n if (getActiveBackend().backend.kind === \"cloud\") {\n return (await fetchCloudSettingsSchema()) as SettingsSchema;\n }\n return (await new SettingsClient(\n getAgentServerClientOptions(),\n ).getAgentSchema()) as SettingsSchema;\n }\n\n static async getConversationSettingsSchema(): Promise<SettingsSchema> {\n if (getActiveBackend().backend.kind === \"cloud\") {\n return (await fetchCloudConversationSettingsSchema()) as SettingsSchema;\n }\n return (await new SettingsClient(\n getAgentServerClientOptions(),\n ).getConversationSchema()) as SettingsSchema;\n }\n\n /\n Apply one name-keyed MCP merge patch in exactly one request. The server\n * owns the stored catalog and secret preservation; Canvas never rebuilds\n * the catalog from redacted display settings.\n /\n static async patchMcpConfig(patch: MCPConfigPatch): Promise<boolean> {\n if (getActiveBackend().backend.kind === \"cloud\") {\n const mcpConfig = await cloudCompatibleMcpConfig(patch);\n await withRetry(() =>\n saveCloudSettings({\n agent_settings_diff: { mcp_config: mcpConfig as SettingsValue },\n }),\n );\n } else {\n await withRetry(() =>\n new SettingsClient(getAgentServerClientOptions()).updateSettings({\n agent_settings_diff: { mcp_config: patch },\n }),\n );\n }\n clearCache();\n return true;\n }\n\n static async patchMcpServer(\n settingsKey: string,\n patch: MCPServerPatch,\n ): Promise<boolean> {\n if (getActiveBackend().backend.kind === \"cloud\") {\n return SettingsService.patchMcpConfig({ [settingsKey]: patch });\n }\n await withRetry(() =>\n new SettingsClient(getAgentServerClientOptions()).patchMcpServer(\n settingsKey,\n patch,\n ),\n );\n clearCache();\n return true;\n }\n\n static async createMcpServer(\n settingsKey: string,\n server: MCPServer,\n ): Promise<boolean> {\n if (getActiveBackend().backend.kind === \"cloud\") {\n return SettingsService.patchMcpConfig({ [settingsKey]: server });\n }\n await withRetry(() =>\n new SettingsClient(getAgentServerClientOptions()).createMcpServer(\n settingsKey,\n server,\n ),\n );\n clearCache();\n return true;\n }\n\n static async deleteMcpServer(settingsKey: string): Promise<boolean> {\n if (getActiveBackend().backend.kind === \"cloud\") {\n return SettingsService.patchMcpConfig({ [settingsKey]: null });\n }\n await withRetry(() =>\n new SettingsClient(getAgentServerClientOptions()).deleteMcpServer(\n settingsKey,\n ),\n );\n clearCache();\n return true;\n }\n\n /\n Save settings to the agent server API.\n * Uses PATCH for incremental updates.\n /\n static async saveSettings(\n settings: Partial<Settings> & Record<string, unknown>,\n ): Promise<boolean> {\n // Split app-level user-preference fields (language, git identity, sound\n // notifications, analytics consent, disabled_skills) off and route them\n // through `misc_settings_diff.app_preferences` (local) or as flat\n // top-level keys (cloud). The local agent-server stores them under\n // `PersistedSettings.misc_settings.app_preferences`; the cloud accepts\n // them as flat keys on `POST /api/v1/settings`.\n const { extracted: appPreferences, rest } = extractAppPreferences(\n settings as Record<string, unknown>,\n );\n const hasAppPreferences = Object.keys(appPreferences).length > 0;\n\n const payload: SettingsUpdateRequest = {};\n\n // Extract agent_settings_diff\n const agentSettingsDiff = rest.agent_settings_diff as\n \| Record<string, SettingsValue>\n \| undefined;\n if (agentSettingsDiff && Object.keys(agentSettingsDiff).length > 0) {\n payload.agent_settings_diff = agentSettingsDiff;\n }\n\n // Extract conversation_settings_diff\n const conversationSettingsDiff = rest.conversation_settings_diff as\n \| Record<string, SettingsValue>\n \| undefined;\n if (\n conversationSettingsDiff &&\n Object.keys(conversationSettingsDiff).length > 0\n ) {\n payload.conversation_settings_diff = conversationSettingsDiff;\n }\n\n if (hasAppPreferences) {\n payload.misc_settings_diff = { app_preferences: appPreferences };\n }\n\n const isCloud = getActiveBackend().backend.kind === \"cloud\";\n if (isCloud) {\n const hasCloudWork =\n !!payload.agent_settings_diff \|\|\n !!payload.conversation_settings_diff \|\|\n hasAppPreferences;\n if (!hasCloudWork) {\n return true;\n }\n // Build the cloud payload from the same diffs, but as a separate\n // object so undefined keys don't appear in the call (saveCloudSettings\n // is called from tests with an exact-shape assertion).\n const cloudPayload: Parameters<typeof saveCloudSettings>[0] = {};\n if (payload.agent_settings_diff) {\n cloudPayload.agent_settings_diff = { ...payload.agent_settings_diff };\n if (\"mcp_config\" in cloudPayload.agent_settings_diff) {\n cloudPayload.agent_settings_diff.mcp_config =\n (await cloudCompatibleMcpConfig(\n cloudPayload.agent_settings_diff.mcp_config,\n )) as SettingsValue;\n }\n }\n if (payload.conversation_settings_diff) {\n cloudPayload.conversation_settings_diff =\n payload.conversation_settings_diff;\n }\n if (hasAppPreferences) {\n // The cloud `POST /api/v1/settings` takes app-preference fields as\n // flat top-level keys (not under `app_preferences_diff`).\n // `saveCloudSettings` re-flattens them onto the request body.\n cloudPayload.app_preferences = appPreferences;\n }\n await withRetry(() => saveCloudSettings(cloudPayload));\n } else {\n // The local agent-server PATCH /api/settings requires at least one of\n // the three diff fields. Skip the request entirely if nothing changed.\n const hasLocalDiffs =\n !!payload.agent_settings_diff \|\|\n !!payload.conversation_settings_diff \|\|\n !!payload.misc_settings_diff;\n if (!hasLocalDiffs) {\n return true;\n }\n await withRetry(() =>\n new SettingsClient(getAgentServerClientOptions()).updateSettings(\n payload,\n ),\n );\n }\n\n // Invalidate cache after successful save\n clearCache();\n\n return true;\n }\n\n /\n Invalidate the settings cache.\n * Call this when settings may have changed externally.\n */\n static invalidateCache(): void {\n clearCache();\n }\n}\n\nexport default SettingsService;\n"],"mappings":"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"}

package/dist/api/settings-service/settings-service.api.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+import type { MCPConfigPatch, MCPServer, MCPServerPatch } from "@openhands/typescript-client";
 import { Settings, SettingsSchema, SettingsValue } from "#/types/settings";
 /**
  * Fields the agent-server stores under `misc_settings.app_preferences` (see
@@ -88,6 +89,15 @@ declare class SettingsService {
     }>;
     static getSettingsSchema(): Promise<SettingsSchema>;
     static getConversationSettingsSchema(): Promise<SettingsSchema>;
+    /**
+     * Apply one name-keyed MCP merge patch in exactly one request. The server
+     * owns the stored catalog and secret preservation; Canvas never rebuilds
+     * the catalog from redacted display settings.
+     */
+    static patchMcpConfig(patch: MCPConfigPatch): Promise<boolean>;
+    static patchMcpServer(settingsKey: string, patch: MCPServerPatch): Promise<boolean>;
+    static createMcpServer(settingsKey: string, server: MCPServer): Promise<boolean>;
+    static deleteMcpServer(settingsKey: string): Promise<boolean>;
     /**
      * Save settings to the agent server API.
      * Uses PATCH for incremental updates.

package/dist/api/settings-service/settings-service.api.js CHANGED Viewed

@@ -3,10 +3,10 @@ import "../../node_modules/@openhands/typescript-client/dist/clients.js";
 import { getActiveBackend as t } from "../backend-registry/active-store.js";
 import { getAgentServerClientOptions as n } from "../agent-server-client-options.js";
 import { DEFAULT_SETTINGS as r } from "../../services/settings.js";
-import { getSdkMcpServerMap as i, hasRedactedMcpSecretLeaf as a, stringRecord as o } from "../../utils/mcp-config.js";
-import { fetchCloudConversationSettingsSchema as s, fetchCloudSettings as c, fetchCloudSettingsSchema as l, saveCloudSettings as u } from "../cloud/settings-service.api.js";
+import { stringRecord as i } from "../../utils/mcp-config.js";
+import { fetchCloudConversationSettingsSchema as a, fetchCloudSettings as o, fetchCloudSettingsSchema as s, saveCloudSettings as c } from "../cloud/settings-service.api.js";
 //#region src/api/settings-service/settings-service.api.ts
-var d = [
+var l = [
 	"language",
 	"user_consents_to_analytics",
 	"enable_sound_notifications",
@@ -14,18 +14,18 @@ var d = [
 	"git_user_email",
 	"title_llm_profile",
 	"disabled_skills"
-], f = new Set(d), p = (e) => f.has(e), m = (e) => {
+], u = new Set(l), d = (e) => u.has(e), f = (e) => {
 	let t = {}, n = {};
-	for (let [r, i] of Object.entries(e)) p(r) ? t[r] = i : n[r] = i;
+	for (let [r, i] of Object.entries(e)) d(r) ? t[r] = i : n[r] = i;
 	return {
 		extracted: t,
 		rest: n
 	};
-}, h = (e) => JSON.parse(JSON.stringify(e)), g = (e, t) => ({
+}, p = (e) => JSON.parse(JSON.stringify(e)), m = (e, t) => ({
 	...e ?? {},
 	...t ?? {}
 });
-async function _(e, t = 3, n = 500) {
+async function h(e, t = 3, n = 500) {
 	for (let r = 0; r < t; r += 1) try {
 		return await e();
 	} catch (e) {
@@ -37,17 +37,17 @@ async function _(e, t = 3, n = 500) {
 	}
 	throw Error("Retry attempts exhausted");
 }
-var v = {
+var g = {
 	redacted: null,
 	encrypted: null,
 	timestamp: 0
-}, y = 300 * 1e3, b = () => Date.now() - v.timestamp < y, x = () => {
-	v = {
+}, _ = 300 * 1e3, v = () => Date.now() - g.timestamp < _, y = () => {
+	g = {
 		redacted: null,
 		encrypted: null,
 		timestamp: 0
 	};
-}, S = (e) => !!e && typeof e == "object" && !Array.isArray(e), C = (e, t) => `Basic ${btoa(`${e}:${t}`)}`, w = (e) => {
+}, b = (e) => !!e && typeof e == "object" && !Array.isArray(e), x = (e, t) => `Basic ${btoa(`${e}:${t}`)}`, S = (e) => {
 	switch (e.strategy) {
 		case "none": return {};
 		case "api_key": {
@@ -56,60 +56,61 @@ var v = {
 			return { [t]: n };
 		}
 		case "bearer": return typeof e.value != "string" || !e.value ? null : { Authorization: `Bearer ${e.value}` };
-		case "basic": return typeof e.username != "string" || typeof e.password != "string" ? null : { Authorization: C(e.username, e.password) };
-		case "header": return o(e.headers) ?? {};
+		case "basic": return typeof e.username != "string" || typeof e.password != "string" ? null : { Authorization: x(e.username, e.password) };
+		case "header": return i(e.headers) ?? {};
 		case "oauth2": {
-			let t = S(e.state) ? e.state.tokens : void 0;
-			return !S(t) || typeof t.access_token != "string" ? null : { Authorization: `Bearer ${t.access_token}` };
+			let t = b(e.state) ? e.state.tokens : void 0;
+			return !b(t) || typeof t.access_token != "string" ? null : { Authorization: `Bearer ${t.access_token}` };
 		}
 		default: return null;
 	}
-}, T = (e) => {
-	if (!S(e)) return e;
-	let t = S(e.mcpServers), n = t ? e.mcpServers : e, r = Object.fromEntries(Object.entries(n).map(([e, t]) => {
-		if (!S(t) || !S(t.auth)) return [e, t];
-		let n = w(t.auth);
+}, C = async (e) => {
+	if (!b(e)) return e;
+	let n = b(e.mcpServers), r = n ? e.mcpServers : e, a = Object.values(r).some((e) => b(e) && b(e.auth) && e.auth !== null) && t().backend.kind === "cloud", s = /* @__PURE__ */ new Map();
+	if (a) try {
+		let e = await o(), t = b(e.mcp_config) ? e.mcp_config : {};
+		for (let [e, n] of Object.entries(t)) if (b(n)) {
+			let t = i(n.headers);
+			t && s.set(e, t);
+		}
+	} catch {}
+	let c = Object.fromEntries(Object.entries(r).map(([e, t]) => {
+		if (!b(t)) return [e, t];
+		if (t.auth === null) {
+			let n = {
+				...t,
+				headers: null
+			};
+			return delete n.auth, [e, n];
+		}
+		if (!b(t.auth)) return [e, t];
+		let n = S(t.auth);
 		if (n === null) return [e, t];
-		let r = { ...t }, i = {
-			...o(t.headers) ?? {},
+		let r = { ...t }, a = {
+			...i(t.headers) ?? {},
 			...n
-		};
-		return delete r.auth, Object.keys(i).length > 0 ? r.headers = i : delete r.headers, [e, r];
+		}, o = s.get(e);
+		if (o) for (let e of Object.keys(o)) e in a || (a[e] = null);
+		return delete r.auth, Object.keys(a).length > 0 ? r.headers = a : delete r.headers, [e, r];
 	}));
-	return t ? {
-		...e,
-		mcpServers: r
-	} : r;
-}, E = (e) => {
-	if (!S(e)) return e;
-	let t = S(e.mcpServers), n = t ? e.mcpServers : e, r = Object.fromEntries(Object.entries(n).map(([e, t]) => S(t) ? [e, {
-		...t,
-		enabled: t.enabled !== !1
-	}] : [e, t]));
-	return t ? {
+	return n ? {
 		...e,
-		mcpServers: r
-	} : r;
-}, D = (e) => {
-	let t = i(e);
-	return t ? Object.values(t).some((e) => a(S(e) ? e.auth : void 0) || a(S(e) ? e.headers : void 0) || a(S(e) ? e.env : void 0)) : !1;
-}, O = (e, t) => {
-	let n = i(e), r = i(t);
-	return !n || !r ? !1 : Object.keys(n).some((e) => !(e in r));
-}, k = (e) => {
+		mcpServers: c
+	} : c;
+}, w = (e) => {
 	let t = {
 		agent_settings: e.agent_settings ?? {},
 		conversation_settings: e.conversation_settings ?? {},
 		llm_api_key_set: e.llm_api_key_is_set
 	}, n = e.misc_settings?.app_preferences;
-	if (n) for (let e of d) {
+	if (n) for (let e of l) {
 		let r = n[e];
 		r !== void 0 && (t[e] = r);
 	}
 	return t;
-}, A = (e) => {
-	let t = g(r.agent_settings ?? {}, e.agent_settings ?? {}), n = g(r.conversation_settings ?? {}, e.conversation_settings ?? {}), i = {
-		...h(r),
+}, T = (e) => {
+	let t = m(r.agent_settings ?? {}, e.agent_settings ?? {}), n = m(r.conversation_settings ?? {}, e.conversation_settings ?? {}), i = {
+		...p(r),
 		...e,
 		provider_tokens_set: {
 			...r.provider_tokens_set ?? {},
@@ -119,89 +120,78 @@ var v = {
 		conversation_settings: n
 	}, a = t.llm, o = t.condenser;
 	return typeof t.agent == "string" && (i.agent = t.agent), typeof a?.model == "string" && a.model.length > 0 && (i.llm_model = a.model), typeof a?.base_url == "string" && (i.llm_base_url = a.base_url), typeof o?.enabled == "boolean" && (i.enable_default_condenser = o.enabled), typeof o?.max_size == "number" && (i.condenser_max_size = o.max_size), typeof n.confirmation_mode == "boolean" && (i.confirmation_mode = n.confirmation_mode), (typeof n.security_analyzer == "string" || n.security_analyzer === null) && (i.security_analyzer = n.security_analyzer), typeof n.max_iterations == "number" && (i.max_iterations = n.max_iterations), i.search_api_key_set = !!i.search_api_key, i;
-}, j = class r {
+}, E = class r {
 	static async fetchSettingsFromApi(t) {
-		return _(() => new e(n()).getSettings({ exposeSecrets: t }));
+		return h(() => new e(n()).getSettings({ exposeSecrets: t }));
 	}
 	static async getSettings() {
 		if (t().backend.kind === "cloud") try {
-			return A(await _(() => c()));
+			return T(await h(() => o()));
 		} catch (e) {
-			return console.warn("Failed to fetch cloud settings, using defaults:", e), A({});
+			return console.warn("Failed to fetch cloud settings, using defaults:", e), T({});
 		}
-		if (b() && v.redacted) return A(k(v.redacted));
+		if (v() && g.redacted) return T(w(g.redacted));
 		try {
 			let e = await this.fetchSettingsFromApi();
-			return v.redacted = e, v.timestamp = Date.now(), A(k(e));
+			return g.redacted = e, g.timestamp = Date.now(), T(w(e));
 		} catch (e) {
-			return console.warn("Failed to fetch settings from API, using defaults:", e), A({});
+			return console.warn("Failed to fetch settings from API, using defaults:", e), T({});
 		}
 	}
 	static async getSettingsForConversation() {
-		if (b() && v.encrypted) return {
-			agentSettings: v.encrypted.agent_settings,
-			conversationSettings: v.encrypted.conversation_settings,
+		if (v() && g.encrypted) return {
+			agentSettings: g.encrypted.agent_settings,
+			conversationSettings: g.encrypted.conversation_settings,
 			secretsEncrypted: !0
 		};
 		let e = await this.fetchSettingsFromApi("encrypted");
-		return v.encrypted = e, v.timestamp ||= Date.now(), {
+		return g.encrypted = e, g.timestamp ||= Date.now(), {
 			agentSettings: e.agent_settings,
 			conversationSettings: e.conversation_settings,
 			secretsEncrypted: !0
 		};
 	}
 	static async getSettingsSchema() {
-		return t().backend.kind === "cloud" ? await l() : await new e(n()).getAgentSchema();
+		return t().backend.kind === "cloud" ? await s() : await new e(n()).getAgentSchema();
 	}
 	static async getConversationSettingsSchema() {
-		return t().backend.kind === "cloud" ? await s() : await new e(n()).getConversationSchema();
+		return t().backend.kind === "cloud" ? await a() : await new e(n()).getConversationSchema();
+	}
+	static async patchMcpConfig(r) {
+		if (t().backend.kind === "cloud") {
+			let e = await C(r);
+			await h(() => c({ agent_settings_diff: { mcp_config: e } }));
+		} else await h(() => new e(n()).updateSettings({ agent_settings_diff: { mcp_config: r } }));
+		return y(), !0;
+	}
+	static async patchMcpServer(i, a) {
+		return t().backend.kind === "cloud" ? r.patchMcpConfig({ [i]: a }) : (await h(() => new e(n()).patchMcpServer(i, a)), y(), !0);
+	}
+	static async createMcpServer(i, a) {
+		return t().backend.kind === "cloud" ? r.patchMcpConfig({ [i]: a }) : (await h(() => new e(n()).createMcpServer(i, a)), y(), !0);
+	}
+	static async deleteMcpServer(i) {
+		return t().backend.kind === "cloud" ? r.patchMcpConfig({ [i]: null }) : (await h(() => new e(n()).deleteMcpServer(i)), y(), !0);
 	}
-	static async saveSettings(i) {
-		let { extracted: a, rest: o } = m(i), s = Object.keys(a).length > 0, l = {}, d = o.agent_settings_diff;
-		d && Object.keys(d).length > 0 && (l.agent_settings_diff = d);
-		let f = o.conversation_settings_diff;
-		f && Object.keys(f).length > 0 && (l.conversation_settings_diff = f), s && (l.misc_settings_diff = { app_preferences: a });
-		let p = t().backend.kind === "cloud", h = l.agent_settings_diff, g = !!h && "mcp_config" in h && h.mcp_config !== null, v;
-		if (g) try {
-			v = p ? (await c())?.agent_settings?.mcp_config : (await r.fetchSettingsFromApi())?.agent_settings?.mcp_config;
-		} catch {}
-		let y = p && g && D(v) && !O(v, h?.mcp_config), b = g && !y;
-		if (p) {
-			if (!(l.agent_settings_diff || l.conversation_settings_diff || s)) return !0;
-			b && await _(() => u({ agent_settings_diff: { mcp_config: null } }));
+	static async saveSettings(r) {
+		let { extracted: i, rest: a } = f(r), o = Object.keys(i).length > 0, s = {}, l = a.agent_settings_diff;
+		l && Object.keys(l).length > 0 && (s.agent_settings_diff = l);
+		let u = a.conversation_settings_diff;
+		if (u && Object.keys(u).length > 0 && (s.conversation_settings_diff = u), o && (s.misc_settings_diff = { app_preferences: i }), t().backend.kind === "cloud") {
+			if (!(s.agent_settings_diff || s.conversation_settings_diff || o)) return !0;
 			let e = {};
-			if (l.agent_settings_diff && (e.agent_settings_diff = { ...l.agent_settings_diff }, "mcp_config" in e.agent_settings_diff)) {
-				let t = T(e.agent_settings_diff.mcp_config);
-				e.agent_settings_diff.mcp_config = y ? E(t) : t;
-			}
-			l.conversation_settings_diff && (e.conversation_settings_diff = l.conversation_settings_diff), s && (e.app_preferences = a);
-			try {
-				await _(() => u(e));
-			} catch (e) {
-				if (b && v) try {
-					await u({ agent_settings_diff: { mcp_config: v } });
-				} catch {}
-				throw e;
-			}
+			s.agent_settings_diff && (e.agent_settings_diff = { ...s.agent_settings_diff }, "mcp_config" in e.agent_settings_diff && (e.agent_settings_diff.mcp_config = await C(e.agent_settings_diff.mcp_config))), s.conversation_settings_diff && (e.conversation_settings_diff = s.conversation_settings_diff), o && (e.app_preferences = i), await h(() => c(e));
 		} else {
-			if (!(l.agent_settings_diff || l.conversation_settings_diff || l.misc_settings_diff)) return !0;
-			b && await _(() => new e(n()).updateSettings({ agent_settings_diff: { mcp_config: null } }));
-			try {
-				await _(() => new e(n()).updateSettings(l));
-			} catch (t) {
-				if (b && v) try {
-					await new e(n()).updateSettings({ agent_settings_diff: { mcp_config: v } });
-				} catch {}
-				throw t;
-			}
+			if (!(s.agent_settings_diff || s.conversation_settings_diff || s.misc_settings_diff)) return !0;
+			await h(() => new e(n()).updateSettings(s));
 		}
-		return x(), !0;
+		return y(), !0;
 	}
 	static invalidateCache() {
-		x();
+		y();
 	}
 };
 //#endregion
-export { j as default };
+export { E as default };
 //# sourceMappingURL=settings-service.api.js.map