@openhands/agent-canvas 1.9.0 → 1.10.0

package/dist/api/mcp-service/mcp-service.api.js

@@ -2,19 +2,19 @@ import { MCPClient as e } from "../../node_modules/@openhands/typescript-client/
 import "../../node_modules/@openhands/typescript-client/dist/clients.js";
 import { getActiveBackend as t, getRegisteredBackends as n } from "../backend-registry/active-store.js";
 import { getAgentServerClientOptions as r } from "../agent-server-client-options.js";
-import { substituteRedactedMcpCredentials as i } from "./mcp-redacted-credentials.js";
-import { getCredentialValidationForServer as a } from "../../utils/mcp-credential-validation.js";
-import { redactMcpSecrets as o } from "../../utils/redact-mcp-secrets.js";
+import { getCredentialValidationForServer as i } from "../../utils/mcp-credential-validation.js";
+import { redactMcpSecrets as a } from "../../utils/redact-mcp-secrets.js";
+import { substituteRedactedMcpCredentials as o } from "./mcp-redacted-credentials.js";
 //#region src/api/mcp-service/mcp-service.api.ts
 var s = 120;
 function c(e) {
 	return e.type === "stdio" ? {
-		transport: "stdio",
+		type: "stdio",
 		command: e.command,
 		...e.args?.length && { args: e.args },
 		...e.env && Object.keys(e.env).length > 0 && { env: e.env }
 	} : {
-		transport: e.type === "sse" ? "sse" : "http",
+		type: e.type === "sse" ? "sse" : "http",
 		url: e.url,
 		...e.headers && Object.keys(e.headers).length > 0 && { headers: e.headers },
 		...e.auth ? { auth: e.auth } : {}
@@ -24,12 +24,12 @@ function l(e) {
 	return e.auth?.strategy === "oauth2" ? s : e.timeout;
 }
 async function u(e) {
-	let t = a(e), n = await i(e), r = c(n), o = l(e);
+	let t = i(e), n = await o(e), r = c(n), a = l(e);
 	return {
 		request: {
 			server: r,
 			...e.name ? { name: e.name } : {},
-			...o === void 0 ? {} : { timeout: o },
+			...a === void 0 ? {} : { timeout: a },
 			...t ? { tool_call: t.toolCall } : {}
 		},
 		substituted: n
@@ -40,11 +40,11 @@ function d(e, t) {
 		...e,
 		tool_result: {
 			...e.tool_result,
-			text: o(e.tool_result.text, ...t)
+			text: a(e.tool_result.text, ...t)
 		}
 	} : e : {
 		...e,
-		error: o(e.error, ...t)
+		error: a(e.error, ...t)
 	};
 }
 function f(e, t, n) {
@@ -102,13 +102,13 @@ var g = (e) => new Promise((t) => {
 			ok: !0,
 			tools: []
 		};
-		let i = a(n), { host: o, apiKey: s } = r(), c = new e({
+		let a = i(n), { host: o, apiKey: s } = r(), c = new e({
 			host: o,
 			...s ? { apiKey: s } : {}
 		});
 		try {
 			let { request: e, substituted: t } = await u(n);
-			return f(await c.testServer(e), i, [t, n]);
+			return f(await c.testServer(e), a, [t, n]);
 		} finally {
 			c.close();
 		}
@@ -138,22 +138,22 @@ var g = (e) => new Promise((t) => {
 		}
 	}
 	static async authorizeOAuth(e) {
-		let t = a(e), r = (n) => f(n, t, [e]), i = window.open("about:blank", "_blank"), o = m();
+		let t = i(e), r = (n) => f(n, t, [e]), a = window.open("about:blank", "_blank"), o = m();
 		try {
 			let t = await n.startOAuthWithClient(o, e);
-			if (!t.ok || !t.job_id || !t.authorization_url) return i?.close(), r({
+			if (!t.ok || !t.job_id || !t.authorization_url) return a?.close(), r({
 				ok: !1,
 				error: t.error || "Could not start OAuth authorization",
 				error_kind: t.error_kind || "unknown"
 			});
-			let a = await n.getOAuthStatusWithClient(o, t.job_id);
+			let i = await n.getOAuthStatusWithClient(o, t.job_id);
 			for (let e = 0; e < 20; e += 1) {
-				if (a.status === "succeeded" || a.status === "failed") return i?.close(), r(h(a));
-				if (a.callback_ready) break;
-				await g(250), a = await n.getOAuthStatusWithClient(o, t.job_id);
+				if (i.status === "succeeded" || i.status === "failed") return a?.close(), r(h(i));
+				if (i.callback_ready) break;
+				await g(250), i = await n.getOAuthStatusWithClient(o, t.job_id);
 			}
-			i && (i.location.href = t.authorization_url);
-			for (let e = 0; e < s; e += 1) if (await g(1e3), a = await n.getOAuthStatusWithClient(o, t.job_id), a.status === "succeeded" || a.status === "failed") return i?.close(), r(h(a));
+			a && (a.location.href = t.authorization_url);
+			for (let e = 0; e < s; e += 1) if (await g(1e3), i = await n.getOAuthStatusWithClient(o, t.job_id), i.status === "succeeded" || i.status === "failed") return a?.close(), r(h(i));
 			return {
 				ok: !1,
 				error: "OAuth authorization timed out",

package/dist/api/mcp-service/mcp-service.api.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-service.api.js","names":[],"sources":["../../../src/api/mcp-service/mcp-service.api.ts"],"sourcesContent":["import { MCPClient } from \"@openhands/typescript-client/clients\";\nimport type { MCPTestRequest } from \"@openhands/typescript-client\";\nimport { getAgentServerClientOptions } from \"../agent-server-client-options\";\nimport {\n  getActiveBackend,\n  getRegisteredBackends,\n} from \"../backend-registry/active-store\";\nimport {\n  getCredentialValidationForServer,\n  type CredentialValidation,\n} from \"#/utils/mcp-credential-validation\";\nimport type { MCPAuthCredential } from \"#/types/mcp-auth\";\nimport type {\n  ExtendedMCPTestResponse,\n  MCPOAuthStartResponse,\n  MCPOAuthStatusResponse,\n  MCPServerConfig,\n} from \"#/types/mcp-server\";\nimport { redactMcpSecrets } from \"#/utils/redact-mcp-secrets\";\nimport { substituteRedactedMcpCredentials } from \"./mcp-redacted-credentials\";\n\nconst OAUTH_MCP_TEST_TIMEOUT_SECONDS = 120;\n\ntype MCPTestServer = {\n  transport?: \"stdio\" | \"http\" | \"sse\";\n  command?: string;\n  args?: string[];\n  env?: Record<string, string>;\n  url?: string;\n  headers?: Record<string, string>;\n  auth?: MCPAuthCredential;\n};\n\ninterface ExtendedMCPTestRequest {\n  server: MCPTestServer;\n  name?: string;\n  timeout?: number;\n  tool_call?: {\n    name: string;\n    arguments: Record<string, unknown>;\n  };\n}\n\nfunction toMcpServer(server: MCPServerConfig): MCPTestServer {\n  if (server.type === \"stdio\") {\n    return {\n      transport: \"stdio\",\n      command: server.command!,\n      ...(server.args?.length && { args: server.args }),\n      ...(server.env &&\n        Object.keys(server.env).length > 0 && { env: server.env }),\n    };\n  }\n  return {\n    transport: server.type === \"sse\" ? \"sse\" : \"http\",\n    url: server.url!,\n    ...(server.headers &&\n      Object.keys(server.headers).length > 0 && { headers: server.headers }),\n    ...(server.auth ? { auth: server.auth } : {}),\n  };\n}\n\nfunction getMcpTestTimeout(server: MCPServerConfig): number | undefined {\n  if (server.auth?.strategy !== \"oauth2\") return server.timeout;\n  return OAUTH_MCP_TEST_TIMEOUT_SECONDS;\n}\n\nasync function buildMcpTestRequest(server: MCPServerConfig): Promise<{\n  request: ExtendedMCPTestRequest;\n  substituted: MCPServerConfig;\n}> {\n  const validation = getCredentialValidationForServer(server);\n  const substituted = await substituteRedactedMcpCredentials(server);\n  const serverSpec = toMcpServer(substituted);\n  const timeout = getMcpTestTimeout(server);\n  return {\n    request: {\n      server: serverSpec,\n      ...(server.name ? { name: server.name } : {}),\n      ...(timeout !== undefined ? { timeout } : {}),\n      ...(validation ? { tool_call: validation.toolCall } : {}),\n    },\n    substituted,\n  };\n}\n\nfunction redactMcpTestResponse(\n  result: ExtendedMCPTestResponse,\n  redactionSources: (MCPServerConfig | undefined)[],\n): ExtendedMCPTestResponse {\n  if (!result.ok) {\n    return {\n      ...result,\n      error: redactMcpSecrets(result.error, ...redactionSources),\n    };\n  }\n  if (result.tool_result) {\n    return {\n      ...result,\n      tool_result: {\n        ...result.tool_result,\n        text: redactMcpSecrets(result.tool_result.text, ...redactionSources),\n      },\n    };\n  }\n  return result;\n}\n\n/**\n * Display-boundary post-processing shared by the test and OAuth probes:\n * scrub secrets from error/tool-result text, then let the catalog entry's\n * credential validation turn a failed read-only tool call into a\n * `credentials` failure. The interpretation only runs when the probe tool\n * is actually advertised in `tools` — a server variant that doesn't expose\n * the tool (e.g. a hosted alternative to the stdio server the spec was\n * written for) must degrade to a connectivity-only success, not be\n * misreported as bad credentials.\n */\nfunction finalizeMcpTestResponse(\n  result: ExtendedMCPTestResponse,\n  validation: CredentialValidation | undefined,\n  redactionSources: (MCPServerConfig | undefined)[],\n): ExtendedMCPTestResponse {\n  const redacted = redactMcpTestResponse(result, redactionSources);\n  if (\n    redacted.ok &&\n    validation &&\n    redacted.tool_result &&\n    redacted.tools.includes(validation.toolCall.name)\n  ) {\n    const credentialError = validation.interpret(redacted.tool_result);\n    if (credentialError) {\n      return {\n        ok: false,\n        error: credentialError,\n        error_kind: \"credentials\",\n      };\n    }\n  }\n  return redacted;\n}\n\nfunction getMcpProbeOptions(): { host: string; apiKey?: string } {\n  const active = getActiveBackend().backend;\n  if (active.kind === \"local\") {\n    const { host, apiKey } = getAgentServerClientOptions();\n    return { host, ...(apiKey ? { apiKey } : {}) };\n  }\n\n  const localBackend = getRegisteredBackends().find(\n    (backend) => backend.kind === \"local\" && backend.host,\n  );\n  if (localBackend) {\n    return {\n      host: localBackend.host.replace(/\\/+$/, \"\"),\n      ...(localBackend.apiKey ? { apiKey: localBackend.apiKey } : {}),\n    };\n  }\n  throw new Error(\"OAuth authorization requires a reachable local backend.\");\n}\n\nfunction createMcpProbeClient(): MCPClient {\n  const { host, apiKey } = getMcpProbeOptions();\n  return new MCPClient({\n    host,\n    ...(apiKey ? { apiKey } : {}),\n    timeout: OAUTH_MCP_TEST_TIMEOUT_SECONDS * 1000 + 5000,\n  });\n}\n\nfunction oauthStatusToTestResponse(\n  status: MCPOAuthStatusResponse,\n): ExtendedMCPTestResponse {\n  if (status.status === \"succeeded\") {\n    return {\n      ok: true,\n      tools: status.tools ?? [],\n      ...(status.tool_result !== undefined && {\n        tool_result: status.tool_result,\n      }),\n      ...(status.oauth_state !== undefined && {\n        oauth_state: status.oauth_state,\n      }),\n    };\n  }\n  return {\n    ok: false,\n    error: status.error || \"OAuth authorization did not complete\",\n    error_kind: status.error_kind || \"unknown\",\n  };\n}\n\nconst sleep = (ms: number) =>\n  new Promise<void>((resolve) => {\n    window.setTimeout(resolve, ms);\n  });\n\nclass McpService {\n  static async testServer(\n    server: MCPServerConfig,\n  ): Promise<ExtendedMCPTestResponse> {\n    // The MCP connectivity-test endpoint lives on the local agent-server. It\n    // spawns the configured stdio command / opens an SSE-or-SHTTP connection\n    // from that process's environment. Cloud backends don't expose this\n    // endpoint to the frontend — the MCP server would actually run inside the\n    // cloud sandbox, which isn't reachable from the browser before the user\n    // starts a conversation. Calling `getAgentServerClientOptions()` here for\n    // a cloud-active session would throw `NoBackendAvailableError(\"No backend\n    // is configured.\")` and block the install flow entirely. Short-circuit\n    // with a synthetic success so saving proceeds; any real connection\n    // failure surfaces inside the conversation runtime instead.\n    if (getActiveBackend().backend.kind === \"cloud\") {\n      return { ok: true, tools: [] };\n    }\n    const validation = getCredentialValidationForServer(server);\n    const { host, apiKey } = getAgentServerClientOptions();\n    const client = new MCPClient({ host, ...(apiKey ? { apiKey } : {}) });\n    try {\n      const { request, substituted } = await buildMcpTestRequest(server);\n      const result = (await client.testServer(\n        request as MCPTestRequest,\n      )) as ExtendedMCPTestResponse;\n      // Redact against both config forms: `server` may hold fresh plaintext\n      // input, `substituted` the stored (encrypted) round-trip values.\n      return finalizeMcpTestResponse(result, validation, [substituted, server]);\n    } finally {\n      client.close();\n    }\n  }\n\n  static async startOAuth(\n    server: MCPServerConfig,\n  ): Promise<MCPOAuthStartResponse> {\n    const client = createMcpProbeClient();\n    try {\n      return await McpService.startOAuthWithClient(client, server);\n    } finally {\n      client.close();\n    }\n  }\n\n  static async getOAuthStatus(jobId: string): Promise<MCPOAuthStatusResponse> {\n    const client = createMcpProbeClient();\n    try {\n      return await McpService.getOAuthStatusWithClient(client, jobId);\n    } finally {\n      client.close();\n    }\n  }\n\n  static async submitOAuthCallback(\n    jobId: string,\n    callbackUrl: string,\n  ): Promise<MCPOAuthStatusResponse> {\n    const client = createMcpProbeClient();\n    try {\n      return await McpService.submitOAuthCallbackWithClient(\n        client,\n        jobId,\n        callbackUrl,\n      );\n    } finally {\n      client.close();\n    }\n  }\n\n  static async authorizeOAuth(\n    server: MCPServerConfig,\n  ): Promise<ExtendedMCPTestResponse> {\n    const validation = getCredentialValidationForServer(server);\n    const finalize = (result: ExtendedMCPTestResponse) =>\n      finalizeMcpTestResponse(result, validation, [server]);\n    const popup = window.open(\"about:blank\", \"_blank\");\n    const client = createMcpProbeClient();\n    try {\n      const start = await McpService.startOAuthWithClient(client, server);\n      if (!start.ok || !start.job_id || !start.authorization_url) {\n        popup?.close();\n        return finalize({\n          ok: false,\n          error: start.error || \"Could not start OAuth authorization\",\n          error_kind: start.error_kind || \"unknown\",\n        });\n      }\n\n      let status = await McpService.getOAuthStatusWithClient(\n        client,\n        start.job_id,\n      );\n      for (let attempt = 0; attempt < 20; attempt += 1) {\n        if (status.status === \"succeeded\" || status.status === \"failed\") {\n          popup?.close();\n          return finalize(oauthStatusToTestResponse(status));\n        }\n        if (status.callback_ready) break;\n        await sleep(250);\n        status = await McpService.getOAuthStatusWithClient(\n          client,\n          start.job_id,\n        );\n      }\n\n      if (popup) {\n        popup.location.href = start.authorization_url;\n      }\n\n      for (\n        let attempt = 0;\n        attempt < OAUTH_MCP_TEST_TIMEOUT_SECONDS;\n        attempt += 1\n      ) {\n        await sleep(1000);\n        status = await McpService.getOAuthStatusWithClient(\n          client,\n          start.job_id,\n        );\n        if (status.status === \"succeeded\" || status.status === \"failed\") {\n          popup?.close();\n          return finalize(oauthStatusToTestResponse(status));\n        }\n      }\n\n      return {\n        ok: false,\n        error: \"OAuth authorization timed out\",\n        error_kind: \"timeout\",\n      };\n    } finally {\n      client.close();\n    }\n  }\n\n  private static async startOAuthWithClient(\n    client: MCPClient,\n    server: MCPServerConfig,\n  ): Promise<MCPOAuthStartResponse> {\n    const { request } = await buildMcpTestRequest(server);\n    return client.startOAuth(request as MCPTestRequest);\n  }\n\n  // typescript-client 1.36 types the OAuth probes with the generated\n  // agent-server models, which describe the opaque `oauth_state` JSON blobs as\n  // `unknown` rather than the recursive `MCPJsonValue` the local types use. The\n  // wire shape is unchanged, so narrow back to the app's boundary type.\n  private static async getOAuthStatusWithClient(\n    client: MCPClient,\n    jobId: string,\n  ): Promise<MCPOAuthStatusResponse> {\n    return (await client.getOAuthStatus(jobId)) as MCPOAuthStatusResponse;\n  }\n\n  private static async submitOAuthCallbackWithClient(\n    client: MCPClient,\n    jobId: string,\n    callbackUrl: string,\n  ): Promise<MCPOAuthStatusResponse> {\n    return (await client.submitOAuthCallback(jobId, {\n      callback_url: callbackUrl,\n    })) as MCPOAuthStatusResponse;\n  }\n}\n\nexport default McpService;\n"],"mappings":"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"}
+{"version":3,"file":"mcp-service.api.js","names":[],"sources":["../../../src/api/mcp-service/mcp-service.api.ts"],"sourcesContent":["import { MCPClient } from \"@openhands/typescript-client/clients\";\nimport type { AgentServerMCPTestRequest } from \"@openhands/typescript-client\";\nimport { getAgentServerClientOptions } from \"../agent-server-client-options\";\nimport {\n  getActiveBackend,\n  getRegisteredBackends,\n} from \"../backend-registry/active-store\";\nimport {\n  getCredentialValidationForServer,\n  type CredentialValidation,\n} from \"#/utils/mcp-credential-validation\";\nimport type {\n  ExtendedMCPTestResponse,\n  MCPOAuthStartResponse,\n  MCPOAuthStatusResponse,\n  MCPServerConfig,\n} from \"#/types/mcp-server\";\nimport { redactMcpSecrets } from \"#/utils/redact-mcp-secrets\";\nimport { substituteRedactedMcpCredentials } from \"./mcp-redacted-credentials\";\n\nconst OAUTH_MCP_TEST_TIMEOUT_SECONDS = 120;\n\nfunction toMcpServer(\n  server: MCPServerConfig,\n): AgentServerMCPTestRequest[\"server\"] {\n  if (server.type === \"stdio\") {\n    return {\n      type: \"stdio\",\n      command: server.command!,\n      ...(server.args?.length && { args: server.args }),\n      ...(server.env &&\n        Object.keys(server.env).length > 0 && { env: server.env }),\n    };\n  }\n  return {\n    type: server.type === \"sse\" ? \"sse\" : \"http\",\n    url: server.url!,\n    ...(server.headers &&\n      Object.keys(server.headers).length > 0 && { headers: server.headers }),\n    ...(server.auth ? { auth: server.auth } : {}),\n  };\n}\n\nfunction getMcpTestTimeout(server: MCPServerConfig): number | undefined {\n  if (server.auth?.strategy !== \"oauth2\") return server.timeout;\n  return OAUTH_MCP_TEST_TIMEOUT_SECONDS;\n}\n\nasync function buildMcpTestRequest(server: MCPServerConfig): Promise<{\n  request: AgentServerMCPTestRequest;\n  substituted: MCPServerConfig;\n}> {\n  const validation = getCredentialValidationForServer(server);\n  const substituted = await substituteRedactedMcpCredentials(server);\n  const serverSpec = toMcpServer(substituted);\n  const timeout = getMcpTestTimeout(server);\n  return {\n    request: {\n      server: serverSpec,\n      ...(server.name ? { name: server.name } : {}),\n      ...(timeout !== undefined ? { timeout } : {}),\n      ...(validation ? { tool_call: validation.toolCall } : {}),\n    },\n    substituted,\n  };\n}\n\nfunction redactMcpTestResponse(\n  result: ExtendedMCPTestResponse,\n  redactionSources: (MCPServerConfig | undefined)[],\n): ExtendedMCPTestResponse {\n  if (!result.ok) {\n    return {\n      ...result,\n      error: redactMcpSecrets(result.error, ...redactionSources),\n    };\n  }\n  if (result.tool_result) {\n    return {\n      ...result,\n      tool_result: {\n        ...result.tool_result,\n        text: redactMcpSecrets(result.tool_result.text, ...redactionSources),\n      },\n    };\n  }\n  return result;\n}\n\n/**\n * Display-boundary post-processing shared by the test and OAuth probes:\n * scrub secrets from error/tool-result text, then let the catalog entry's\n * credential validation turn a failed read-only tool call into a\n * `credentials` failure. The interpretation only runs when the probe tool\n * is actually advertised in `tools` — a server variant that doesn't expose\n * the tool (e.g. a hosted alternative to the stdio server the spec was\n * written for) must degrade to a connectivity-only success, not be\n * misreported as bad credentials.\n */\nfunction finalizeMcpTestResponse(\n  result: ExtendedMCPTestResponse,\n  validation: CredentialValidation | undefined,\n  redactionSources: (MCPServerConfig | undefined)[],\n): ExtendedMCPTestResponse {\n  const redacted = redactMcpTestResponse(result, redactionSources);\n  if (\n    redacted.ok &&\n    validation &&\n    redacted.tool_result &&\n    redacted.tools.includes(validation.toolCall.name)\n  ) {\n    const credentialError = validation.interpret(redacted.tool_result);\n    if (credentialError) {\n      return {\n        ok: false,\n        error: credentialError,\n        error_kind: \"credentials\",\n      };\n    }\n  }\n  return redacted;\n}\n\nfunction getMcpProbeOptions(): { host: string; apiKey?: string } {\n  const active = getActiveBackend().backend;\n  if (active.kind === \"local\") {\n    const { host, apiKey } = getAgentServerClientOptions();\n    return { host, ...(apiKey ? { apiKey } : {}) };\n  }\n\n  const localBackend = getRegisteredBackends().find(\n    (backend) => backend.kind === \"local\" && backend.host,\n  );\n  if (localBackend) {\n    return {\n      host: localBackend.host.replace(/\\/+$/, \"\"),\n      ...(localBackend.apiKey ? { apiKey: localBackend.apiKey } : {}),\n    };\n  }\n  throw new Error(\"OAuth authorization requires a reachable local backend.\");\n}\n\nfunction createMcpProbeClient(): MCPClient {\n  const { host, apiKey } = getMcpProbeOptions();\n  return new MCPClient({\n    host,\n    ...(apiKey ? { apiKey } : {}),\n    timeout: OAUTH_MCP_TEST_TIMEOUT_SECONDS * 1000 + 5000,\n  });\n}\n\nfunction oauthStatusToTestResponse(\n  status: MCPOAuthStatusResponse,\n): ExtendedMCPTestResponse {\n  if (status.status === \"succeeded\") {\n    return {\n      ok: true,\n      tools: status.tools ?? [],\n      ...(status.tool_result !== undefined && {\n        tool_result: status.tool_result,\n      }),\n      ...(status.oauth_state !== undefined && {\n        oauth_state: status.oauth_state,\n      }),\n    };\n  }\n  return {\n    ok: false,\n    error: status.error || \"OAuth authorization did not complete\",\n    error_kind: status.error_kind || \"unknown\",\n  };\n}\n\nconst sleep = (ms: number) =>\n  new Promise<void>((resolve) => {\n    window.setTimeout(resolve, ms);\n  });\n\nclass McpService {\n  static async testServer(\n    server: MCPServerConfig,\n  ): Promise<ExtendedMCPTestResponse> {\n    // The MCP connectivity-test endpoint lives on the local agent-server. It\n    // spawns the configured stdio command / opens an SSE-or-SHTTP connection\n    // from that process's environment. Cloud backends don't expose this\n    // endpoint to the frontend — the MCP server would actually run inside the\n    // cloud sandbox, which isn't reachable from the browser before the user\n    // starts a conversation. Calling `getAgentServerClientOptions()` here for\n    // a cloud-active session would throw `NoBackendAvailableError(\"No backend\n    // is configured.\")` and block the install flow entirely. Short-circuit\n    // with a synthetic success so saving proceeds; any real connection\n    // failure surfaces inside the conversation runtime instead.\n    if (getActiveBackend().backend.kind === \"cloud\") {\n      return { ok: true, tools: [] };\n    }\n    const validation = getCredentialValidationForServer(server);\n    const { host, apiKey } = getAgentServerClientOptions();\n    const client = new MCPClient({ host, ...(apiKey ? { apiKey } : {}) });\n    try {\n      const { request, substituted } = await buildMcpTestRequest(server);\n      const result = (await client.testServer(\n        request,\n      )) as ExtendedMCPTestResponse;\n      // Redact against both config forms: `server` may hold fresh plaintext\n      // input, `substituted` the stored (encrypted) round-trip values.\n      return finalizeMcpTestResponse(result, validation, [substituted, server]);\n    } finally {\n      client.close();\n    }\n  }\n\n  static async startOAuth(\n    server: MCPServerConfig,\n  ): Promise<MCPOAuthStartResponse> {\n    const client = createMcpProbeClient();\n    try {\n      return await McpService.startOAuthWithClient(client, server);\n    } finally {\n      client.close();\n    }\n  }\n\n  static async getOAuthStatus(jobId: string): Promise<MCPOAuthStatusResponse> {\n    const client = createMcpProbeClient();\n    try {\n      return await McpService.getOAuthStatusWithClient(client, jobId);\n    } finally {\n      client.close();\n    }\n  }\n\n  static async submitOAuthCallback(\n    jobId: string,\n    callbackUrl: string,\n  ): Promise<MCPOAuthStatusResponse> {\n    const client = createMcpProbeClient();\n    try {\n      return await McpService.submitOAuthCallbackWithClient(\n        client,\n        jobId,\n        callbackUrl,\n      );\n    } finally {\n      client.close();\n    }\n  }\n\n  static async authorizeOAuth(\n    server: MCPServerConfig,\n  ): Promise<ExtendedMCPTestResponse> {\n    const validation = getCredentialValidationForServer(server);\n    const finalize = (result: ExtendedMCPTestResponse) =>\n      finalizeMcpTestResponse(result, validation, [server]);\n    const popup = window.open(\"about:blank\", \"_blank\");\n    const client = createMcpProbeClient();\n    try {\n      const start = await McpService.startOAuthWithClient(client, server);\n      if (!start.ok || !start.job_id || !start.authorization_url) {\n        popup?.close();\n        return finalize({\n          ok: false,\n          error: start.error || \"Could not start OAuth authorization\",\n          error_kind: start.error_kind || \"unknown\",\n        });\n      }\n\n      let status = await McpService.getOAuthStatusWithClient(\n        client,\n        start.job_id,\n      );\n      for (let attempt = 0; attempt < 20; attempt += 1) {\n        if (status.status === \"succeeded\" || status.status === \"failed\") {\n          popup?.close();\n          return finalize(oauthStatusToTestResponse(status));\n        }\n        if (status.callback_ready) break;\n        await sleep(250);\n        status = await McpService.getOAuthStatusWithClient(\n          client,\n          start.job_id,\n        );\n      }\n\n      if (popup) {\n        popup.location.href = start.authorization_url;\n      }\n\n      for (\n        let attempt = 0;\n        attempt < OAUTH_MCP_TEST_TIMEOUT_SECONDS;\n        attempt += 1\n      ) {\n        await sleep(1000);\n        status = await McpService.getOAuthStatusWithClient(\n          client,\n          start.job_id,\n        );\n        if (status.status === \"succeeded\" || status.status === \"failed\") {\n          popup?.close();\n          return finalize(oauthStatusToTestResponse(status));\n        }\n      }\n\n      return {\n        ok: false,\n        error: \"OAuth authorization timed out\",\n        error_kind: \"timeout\",\n      };\n    } finally {\n      client.close();\n    }\n  }\n\n  private static async startOAuthWithClient(\n    client: MCPClient,\n    server: MCPServerConfig,\n  ): Promise<MCPOAuthStartResponse> {\n    const { request } = await buildMcpTestRequest(server);\n    return client.startOAuth(request);\n  }\n\n  // typescript-client 1.36 types the OAuth probes with the generated\n  // agent-server models, which describe the opaque `oauth_state` JSON blobs as\n  // `unknown` rather than the recursive `MCPJsonValue` the local types use. The\n  // wire shape is unchanged, so narrow back to the app's boundary type.\n  private static async getOAuthStatusWithClient(\n    client: MCPClient,\n    jobId: string,\n  ): Promise<MCPOAuthStatusResponse> {\n    return (await client.getOAuthStatus(jobId)) as MCPOAuthStatusResponse;\n  }\n\n  private static async submitOAuthCallbackWithClient(\n    client: MCPClient,\n    jobId: string,\n    callbackUrl: string,\n  ): Promise<MCPOAuthStatusResponse> {\n    return (await client.submitOAuthCallback(jobId, {\n      callback_url: callbackUrl,\n    })) as MCPOAuthStatusResponse;\n  }\n}\n\nexport default McpService;\n"],"mappings":"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"}

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

@@ -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

@@ -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":"ucAuBA,IAAa,EAAwB,CACnC,WACA,6BACA,6BACA,gBACA,iBACA,oBACA,iBACF,EAsDM,EAAgD,IAAI,IACxD,CACF,EAEM,EAAwB,GAC5B,EAAyB,IAAI,CAAG,EAQ5B,EACJ,GACiE,CACjE,IAAM,EAA4B,CAAC,EAC7B,EAAgC,CAAC,EACvC,IAAK,GAAM,CAAC,EAAK,KAAU,OAAO,QAAQ,CAAK,EACzC,EAAqB,CAAG,EAC1B,EAAuC,GAAO,EAE9C,EAAK,GAAO,EAGhB,MAAO,CAAE,YAAW,MAAK,CAC3B,EAWM,EAAgB,GAAgB,KAAK,MAAM,KAAK,UAAU,CAAK,CAAC,EAEhE,GACJ,EACA,KACI,CAAE,GAAI,GAAQ,CAAC,EAAI,GAAI,GAAQ,CAAC,CAAG,GAKzC,eAAe,EACb,EACA,EAAqB,EACrB,EAAsB,IACV,CACZ,IAAK,IAAI,EAAU,EAAG,EAAU,EAAY,GAAW,EACrD,GAAI,CACF,OAAO,MAAM,EAAG,CAClB,OAAS,EAAO,CACd,GAAI,GAAW,EAAa,EAC1B,MAAM,EAGR,IAAM,EAAQ,EAAc,GAAK,EAEjC,MAAM,IAAI,QAAe,GAAY,CACnC,WAAW,EAAS,CAAK,CAC3B,CAAC,CACH,CAGF,MAAU,MAAM,0BAA0B,CAC5C,CAMA,IAAI,EAOA,CACF,SAAU,KACV,UAAW,KACX,UAAW,CACb,EAEM,EAAe,IAAS,IAExB,MAAqB,KAAK,IAAI,EAAI,EAAc,UAAY,EAE5D,MAAmB,CACvB,EAAgB,CAAE,SAAU,KAAM,UAAW,KAAM,UAAW,CAAE,CAClE,EAEM,EAAY,GAChB,CAAC,CAAC,GAAS,OAAO,GAAU,UAAY,CAAC,MAAM,QAAQ,CAAK,EAExD,GAAmB,EAAkB,IAElC,SADO,KAAK,GAAG,EAAS,GAAG,GAClB,IAGZ,EACJ,GACkC,CAClC,OAAQ,EAAK,SAAb,CACE,IAAK,OACH,MAAO,CAAC,EACV,IAAK,UAAW,CACd,GAAI,OAAO,EAAK,OAAU,UAAY,CAAC,EAAK,MAAO,OAAO,KAC1D,IAAM,EACJ,OAAO,EAAK,aAAgB,UAAY,EAAK,YACzC,EAAK,YACL,gBACA,EACJ,IAAW,gBAAkB,UAAU,EAAK,QAAU,EAAK,MAC7D,MAAO,EAAG,GAAS,CAAM,CAC3B,CACA,IAAK,SAEH,OADI,OAAO,EAAK,OAAU,UAAY,CAAC,EAAK,MAAc,KACnD,CAAE,cAAe,UAAU,EAAK,OAAQ,EACjD,IAAK,QAOH,OALE,OAAO,EAAK,UAAa,UACzB,OAAO,EAAK,UAAa,SAElB,KAEF,CAAE,cAAe,EAAgB,EAAK,SAAU,EAAK,QAAQ,CAAE,EACxE,IAAK,SACH,OAAO,EAAA,aAAa,EAAK,OAAO,GAAK,CAAC,EACxC,IAAK,SAAU,CACb,IAAM,EAAS,EAAS,EAAK,KAAK,EAAI,EAAK,MAAM,OAAS,IAAA,GAI1D,MAHI,CAAC,EAAS,CAAM,GAAK,OAAO,EAAO,cAAiB,SAC/C,KAEF,CAAE,cAAe,UAAU,EAAO,cAAe,CAC1D,CACA,QACE,OAAO,IACX,CACF,EAEM,EAA4B,GAA4B,CAC5D,GAAI,CAAC,EAAS,CAAK,EAAG,OAAO,EAE7B,IAAM,EAAa,EAAS,EAAM,UAAU,EACtC,EAAqC,EACtC,EAAM,WACP,EAEE,EAAY,OAAO,YACvB,OAAO,QAAQ,CAAS,EAAE,KAAK,CAAC,EAAM,KAAY,CAChD,GAAI,CAAC,EAAS,CAAM,GAAK,CAAC,EAAS,EAAO,IAAI,EAAG,MAAO,CAAC,EAAM,CAAM,EAErE,IAAM,EAAc,EAAmB,EAAO,IAAI,EAClD,GAAI,IAAgB,KAAM,MAAO,CAAC,EAAM,CAAM,EAE9C,IAAM,EAAa,CAAE,GAAG,CAAO,EAEzB,EAAgB,CAAE,GADA,EAAA,aAAa,EAAO,OAAO,GAAK,CAAC,EACb,GAAG,CAAY,EAO3D,OANA,OAAO,EAAW,KACd,OAAO,KAAK,CAAa,EAAE,OAAS,EACtC,EAAW,QAAU,EAErB,OAAO,EAAW,QAEb,CAAC,EAAM,CAAU,CAC1B,CAAC,CACH,EAEA,OAAO,EAAa,CAAE,GAAG,EAAO,WAAY,CAAU,EAAI,CAC5D,EAYM,EAA0B,GAA4B,CAC1D,GAAI,CAAC,EAAS,CAAK,EAAG,OAAO,EAE7B,IAAM,EAAa,EAAS,EAAM,UAAU,EACtC,EAAqC,EACtC,EAAM,WACP,EAEE,EAAY,OAAO,YACvB,OAAO,QAAQ,CAAS,EAAE,KAAK,CAAC,EAAM,KACpC,EAAS,CAAM,EACX,CAAC,EAAM,CAAE,GAAG,EAAQ,QAAS,EAAO,UAAY,EAAM,CAAC,EACvD,CAAC,EAAM,CAAM,CACnB,CACF,EAEA,OAAO,EAAa,CAAE,GAAG,EAAO,WAAY,CAAU,EAAI,CAC5D,EAEM,EAAyB,GAAgC,CAC7D,IAAM,EAAU,EAAA,mBAAmB,CAAS,EAE5C,OADK,EACE,OAAO,OAAO,CAAO,EAAE,KAC3B,GACC,EAAA,yBAAyB,EAAS,CAAM,EAAI,EAAO,KAAO,IAAA,EAAS,GACnE,EAAA,yBAAyB,EAAS,CAAM,EAAI,EAAO,QAAU,IAAA,EAAS,GACtE,EAAA,yBAAyB,EAAS,CAAM,EAAI,EAAO,IAAM,IAAA,EAAS,CACtE,EANqB,EAOvB,EAEM,GAAoB,EAAmB,IAA2B,CACtE,IAAM,EAAkB,EAAA,mBAAmB,CAAQ,EAC7C,EAAc,EAAA,mBAAmB,CAAI,EAE3C,MADI,CAAC,GAAmB,CAAC,EAAoB,GACtC,OAAO,KAAK,CAAe,EAAE,KAAM,GAAS,EAAE,KAAQ,EAAY,CAC3E,EAKM,EACJ,GACsB,CAItB,IAAM,EAA6B,CACjC,eAJoB,EAAS,gBAAkB,CAAC,EAKhD,sBAJ2B,EAAS,uBAAyB,CAAC,EAK9D,gBAAiB,EAAS,kBAC5B,EAUM,EAAQ,EAAS,eAAe,gBACtC,GAAI,EACF,IAAK,IAAM,KAAO,EAAuB,CACvC,IAAM,EAAQ,EAAM,GAChB,IAAU,IAAA,KACZ,EAAqC,GAAO,EAEhD,CAGF,OAAO,CACT,EAMM,EAAuB,GAA0C,CACrE,IAAM,EAAgB,EACpB,EAAA,iBAAiB,gBAAkB,CAAC,EACpC,EAAS,gBAAkB,CAAC,CAC9B,EACM,EAAuB,EAC3B,EAAA,iBAAiB,uBAAyB,CAAC,EAC3C,EAAS,uBAAyB,CAAC,CACrC,EAEM,EAAS,CACb,GAAG,EAAU,EAAA,gBAAgB,EAC7B,GAAG,EACH,oBAAqB,CACnB,GAAI,EAAA,iBAAiB,qBAAuB,CAAC,EAC7C,GAAI,EAAS,qBAAuB,CAAC,CACvC,EACA,eAAgB,EAChB,sBAAuB,CACzB,EAEM,EAAM,EAAc,IACpB,EAAY,EAAc,UAsChC,OAlCI,OAAO,EAAc,OAAU,WACjC,EAAO,MAAQ,EAAc,OAE3B,OAAO,GAAK,OAAU,UAAY,EAAI,MAAM,OAAS,IACvD,EAAO,UAAY,EAAI,OAErB,OAAO,GAAK,UAAa,WAC3B,EAAO,aAAe,EAAI,UAIxB,OAAO,GAAW,SAAY,YAChC,EAAO,yBAA2B,EAAU,SAE1C,OAAO,GAAW,UAAa,WACjC,EAAO,mBAAqB,EAAU,UAEpC,OAAO,EAAqB,mBAAsB,YACpD,EAAO,kBAAoB,EAAqB,oBAGhD,OAAO,EAAqB,mBAAsB,UAClD,EAAqB,oBAAsB,QAE3C,EAAO,kBAAoB,EAAqB,mBAI9C,OAAO,EAAqB,gBAAmB,WACjD,EAAO,eAAiB,EAAqB,gBAG/C,EAAO,mBAAqB,CAAC,CAAC,EAAO,eAE9B,CACT,EAEM,EAAN,MAAM,CAAgB,CASpB,aAAa,qBACX,EAC8B,CAC9B,OAAO,MACL,IAAI,EAAA,eAAe,EAAA,4BAA4B,CAAC,EAAE,YAAY,CAC5D,eACF,CAAC,CACH,CACF,CAMA,aAAa,aAAiC,CAO5C,GAAI,EAAA,iBAAiB,EAAE,QAAQ,OAAS,QACtC,GAAI,CAEF,OAAO,EAAoB,MADP,MAAgB,EAAA,mBAAmB,CAAC,CACxB,CAClC,OAAS,EAAO,CAEd,OADA,QAAQ,KAAK,kDAAmD,CAAK,EAC9D,EAAoB,CAAC,CAAC,CAC/B,CAIF,GAAI,EAAa,GAAK,EAAc,SAClC,OAAO,EAAoB,EAAqB,EAAc,QAAQ,CAAC,EAGzE,GAAI,CACF,IAAM,EAAW,MAAM,KAAK,qBAAqB,EAGjD,MAFA,GAAc,SAAW,EACzB,EAAc,UAAY,KAAK,IAAI,EAC5B,EAAoB,EAAqB,CAAQ,CAAC,CAC3D,OAAS,EAAO,CAGd,OADA,QAAQ,KAAK,qDAAsD,CAAK,EACjE,EAAoB,CAAC,CAAC,CAC/B,CACF,CAUA,aAAa,4BAIV,CAED,GAAI,EAAa,GAAK,EAAc,UAClC,MAAO,CACL,cAAe,EAAc,UAAU,eACvC,qBAAsB,EAAc,UAAU,sBAC9C,iBAAkB,EACpB,EAKF,IAAM,EAAW,MAAM,KAAK,qBAAqB,WAAW,EAK5D,MAJA,GAAc,UAAY,EAC1B,AACE,EAAc,YAAY,KAAK,IAAI,EAE9B,CACL,cAAe,EAAS,eACxB,qBAAsB,EAAS,sBAC/B,iBAAkB,EACpB,CACF,CAEA,aAAa,mBAA6C,CAIxD,OAHI,EAAA,iBAAiB,EAAE,QAAQ,OAAS,QAC9B,MAAM,EAAA,yBAAyB,EAEjC,MAAM,IAAI,EAAA,eAChB,EAAA,4BAA4B,CAC9B,EAAE,eAAe,CACnB,CAEA,aAAa,+BAAyD,CAIpE,OAHI,EAAA,iBAAiB,EAAE,QAAQ,OAAS,QAC9B,MAAM,EAAA,qCAAqC,EAE7C,MAAM,IAAI,EAAA,eAChB,EAAA,4BAA4B,CAC9B,EAAE,sBAAsB,CAC1B,CAMA,aAAa,aACX,EACkB,CAOlB,GAAM,CAAE,UAAW,EAAgB,QAAS,EAC1C,CACF,EACM,EAAoB,OAAO,KAAK,CAAc,EAAE,OAAS,EAEzD,EAAiC,CAAC,EAGlC,EAAoB,EAAK,oBAG3B,GAAqB,OAAO,KAAK,CAAiB,EAAE,OAAS,IAC/D,EAAQ,oBAAsB,GAIhC,IAAM,EAA2B,EAAK,2BAIpC,GACA,OAAO,KAAK,CAAwB,EAAE,OAAS,IAE/C,EAAQ,2BAA6B,GAGnC,IACF,EAAQ,mBAAqB,CAAE,gBAAiB,CAAe,GAGjE,IAAM,EAAU,EAAA,iBAAiB,EAAE,QAAQ,OAAS,QAiB9C,EAAY,EAAQ,oBAKpB,EACJ,CAAC,CAAC,GAAa,eAAgB,GAAa,EAAU,aAAe,KAgBnE,EACJ,GAAI,EACF,GAAI,CACF,AASE,EATE,GAIkB,MAHD,EAAA,mBAAmB,IAGb,gBAAgB,YAKrB,MAHD,EAAgB,qBAAqB,IAG/B,gBAAgB,UAE7C,MAAQ,CAGR,CAQF,IAAM,EACJ,GACA,GACA,EAAsB,CAAiB,GACvC,CAAC,EAAiB,EAAmB,GAAW,UAAU,EACtD,EACJ,GAAoB,CAAC,EAEvB,GAAI,EAAS,CAKX,GAAI,EAHA,EAAQ,qBACR,EAAQ,4BACV,GAEA,MAAO,GAEL,GACF,MAAM,MACJ,EAAA,kBAAkB,CAChB,oBAAqB,CAAE,WAAY,IAAK,CAC1C,CAAC,CACH,EAKF,IAAM,EAAwD,CAAC,EAC/D,GAAI,EAAQ,sBACV,EAAa,oBAAsB,CAAE,GAAG,EAAQ,mBAAoB,EAChE,eAAgB,EAAa,qBAAqB,CACpD,IAAM,EAAY,EAChB,EAAa,oBAAoB,UACnC,EACA,EAAa,oBAAoB,WAC/B,EACI,EAAuB,CAAS,EAChC,CAER,CAEE,EAAQ,6BACV,EAAa,2BACX,EAAQ,4BAER,IAIF,EAAa,gBAAkB,GAEjC,GAAI,CACF,MAAM,MAAgB,EAAA,kBAAkB,CAAY,CAAC,CACvD,OAAS,EAAK,CACZ,GAAI,GAA2B,EAK7B,GAAI,CACF,MAAM,EAAA,kBAAkB,CACtB,oBAAqB,CACnB,WAAY,CACd,CACF,CAAC,CACH,MAAQ,CAER,CAEF,MAAM,CACR,CACF,KAAO,CAOL,GAAI,EAHA,EAAQ,qBACR,EAAQ,4BACR,EAAQ,oBAEV,MAAO,GAEL,GACF,MAAM,MACJ,IAAI,EAAA,eAAe,EAAA,4BAA4B,CAAC,EAAE,eAAe,CAC/D,oBAAqB,CAAE,WAAY,IAAK,CAC1C,CAAC,CACH,EAEF,GAAI,CACF,MAAM,MACJ,IAAI,EAAA,eAAe,EAAA,4BAA4B,CAAC,EAAE,eAChD,CACF,CACF,CACF,OAAS,EAAK,CACZ,GAAI,GAA2B,EAE7B,GAAI,CACF,MAAM,IAAI,EAAA,eACR,EAAA,4BAA4B,CAC9B,EAAE,eAAe,CACf,oBAAqB,CACnB,WAAY,CACd,CACF,CAAC,CACH,MAAQ,CAER,CAEF,MAAM,CACR,CACF,CAKA,OAFA,EAAW,EAEJ,EACT,CAMA,OAAO,iBAAwB,CAC7B,EAAW,CACb,CACF"}
+{"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

@@ -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.