@openhands/agent-canvas 1.0.0-rc.8 → 1.0.0

package/dist/utils/llm-subscription-schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"llm-subscription-schema.js","names":[],"sources":["../../src/utils/llm-subscription-schema.ts"],"sourcesContent":["import type { SettingsSchema } from \"#/types/settings\";\nimport { LLM_SUBSCRIPTION_SCHEMA_FIELDS } from \"#/constants/llm-subscription\";\n\nconst LLM_SECTION_KEY = \"llm\";\n\nexport function withLlmSubscriptionSchemaFields(\n  schema: SettingsSchema | null | undefined,\n): SettingsSchema | null | undefined {\n  if (!schema?.sections) return schema;\n\n  let changed = false;\n  const sections = schema.sections.map((section) => {\n    if (section.key !== LLM_SECTION_KEY) return section;\n\n    const existingKeys = new Set(section.fields.map((field) => field.key));\n    const missingFields = LLM_SUBSCRIPTION_SCHEMA_FIELDS.filter(\n      (field) => !existingKeys.has(field.key),\n    );\n\n    if (missingFields.length === 0) return section;\n    changed = true;\n    return {\n      ...section,\n      fields: [...section.fields, ...missingFields],\n    };\n  });\n\n  if (!changed) return schema;\n  return { ...schema, sections };\n}\n"],"mappings":";;AAGA,IAAM,IAAkB;AAExB,SAAgB,EACd,GACmC;AACnC,KAAI,CAAC,GAAQ,SAAU,QAAO;CAE9B,IAAI,IAAU,IACR,IAAW,EAAO,SAAS,KAAK,MAAY;AAChD,MAAI,EAAQ,QAAQ,EAAiB,QAAO;EAE5C,IAAM,IAAe,IAAI,IAAI,EAAQ,OAAO,KAAK,MAAU,EAAM,IAAI,CAAC,EAChE,IAAgB,EAA+B,QAClD,MAAU,CAAC,EAAa,IAAI,EAAM,IAAI,CACxC;AAID,SAFI,EAAc,WAAW,IAAU,KACvC,IAAU,IACH;GACL,GAAG;GACH,QAAQ,CAAC,GAAG,EAAQ,QAAQ,GAAG,EAAc;GAC9C;GACD;AAGF,QADK,IACE;EAAE,GAAG;EAAQ;EAAU,GADT"}

package/dist/utils/mcp-config.cjs

@@ -1,2 +1,2 @@
-require(`../_virtual/_rolldown/runtime.cjs`);var e={sse_servers:[],stdio_servers:[],shttp_servers:[]},t=`https://mcp.linear.app/sse`,n=`https://mcp.linear.app/mcp`;function r(e,n){return n===`sse`?e.split(`?`)[0].replace(/\/+$/,``)===t:!1}function i(t){if(!t||typeof t!=`object`)return{...e};let i=t;if(!(`mcpServers`in i)||!i.mcpServers||typeof i.mcpServers!=`object`)return{...e};let a=[],o=[],s=[],c=[],l=i.mcpServers;for(let[e,t]of Object.entries(l)){if(!t||typeof t!=`object`)continue;let i=t.url;if(i){let e=t.transport,o=t.auth,l=typeof o==`string`&&o!==`oauth`?o:void 0;if(r(i,e)){let e={url:n};l&&(e.api_key=l),c.push(e)}else if(e===`sse`){let e={url:i};l&&(e.api_key=l),a.push(e)}else{let e={url:i};l&&(e.api_key=l),t.timeout!=null&&(e.timeout=t.timeout),s.push(e)}}else{let n={name:e,command:t.command};t.args&&(n.args=t.args),t.env&&(n.env=t.env),o.push(n)}}let u=e=>e.replace(/\/+$/,``);for(let e of c)s.some(t=>u(typeof t==`string`?t:t.url)===u(e.url))||s.push(e);return{sse_servers:a,stdio_servers:o,shttp_servers:s}}function a(e){let t={},n=e=>{if(!(e in t))return e;let n=1;for(;`${e}_${n}`in t;)n+=1;return`${e}_${n}`};for(let r of e.sse_servers){let e={};typeof r==`string`?e.url=r:(e.url=r.url,r.api_key&&(e.auth=r.api_key)),e.transport=`sse`,t[n(`sse`)]=e}for(let r of e.shttp_servers){let e={};typeof r==`string`?e.url=r:(e.url=r.url,r.api_key&&(e.auth=r.api_key),r.timeout!=null&&(e.timeout=r.timeout)),t[n(`shttp`)]=e}for(let r of e.stdio_servers){let e={command:r.command};r.args&&(e.args=r.args),r.env&&(e.env=r.env),t[n(r.name||`stdio`)]=e}return Object.keys(t).length>0?{mcpServers:t}:null}exports.parseMcpConfig=i,exports.toSdkMcpConfig=a;
+require(`../_virtual/_rolldown/runtime.cjs`);var e={sse_servers:[],stdio_servers:[],shttp_servers:[]},t=`https://mcp.linear.app/sse`,n=`https://mcp.linear.app/mcp`;function r(e,n){return n===`sse`?e.split(`?`)[0].replace(/\/+$/,``)===t:!1}function i(e){if(Array.isArray(e))return e.map(i).find(e=>e!==void 0);if(typeof e!=`string`||e.length===0)return;let t=e.match(/^Bearer\s+(.+)$/i);return t?t[1]:e}function a(e){let t=e.headers,n=i(t&&typeof t==`object`?t.Authorization??t.authorization:void 0);if(n)return n;let r=e.auth;return typeof r==`string`&&r!==`oauth`?r:void 0}function o(e){return e?{headers:{Authorization:`Bearer ${e}`}}:{}}function s(t){if(!t||typeof t!=`object`)return{...e};let i=t;if(!(`mcpServers`in i)||!i.mcpServers||typeof i.mcpServers!=`object`)return{...e};let o=[],s=[],c=[],l=[],u=i.mcpServers;for(let[e,t]of Object.entries(u)){if(!t||typeof t!=`object`)continue;let i=t.url;if(i){let e=t.transport,s=a(t);if(r(i,e)){let e={url:n};s&&(e.api_key=s),l.push(e)}else if(e===`sse`){let e={url:i};s&&(e.api_key=s),o.push(e)}else{let e={url:i};s&&(e.api_key=s),t.timeout!=null&&(e.timeout=t.timeout),c.push(e)}}else{let n={name:e,command:t.command};t.args&&(n.args=t.args),t.env&&(n.env=t.env),s.push(n)}}let d=e=>e.replace(/\/+$/,``);for(let e of l)c.some(t=>d(typeof t==`string`?t:t.url)===d(e.url))||c.push(e);return{sse_servers:o,stdio_servers:s,shttp_servers:c}}function c(e){let t={},n=e=>{if(!(e in t))return e;let n=1;for(;`${e}_${n}`in t;)n+=1;return`${e}_${n}`};for(let r of e.sse_servers){let e={};typeof r==`string`?e.url=r:(e.url=r.url,Object.assign(e,o(r.api_key))),e.transport=`sse`,t[n(`sse`)]=e}for(let r of e.shttp_servers){let e={};typeof r==`string`?e.url=r:(e.url=r.url,Object.assign(e,o(r.api_key)),r.timeout!=null&&(e.timeout=r.timeout)),t[n(`shttp`)]=e}for(let r of e.stdio_servers){let e={command:r.command};r.args&&(e.args=r.args),r.env&&(e.env=r.env),t[n(r.name||`stdio`)]=e}return Object.keys(t).length>0?{mcpServers:t}:null}exports.parseMcpConfig=s,exports.toSdkMcpConfig=c;
 //# sourceMappingURL=mcp-config.cjs.map

package/dist/utils/mcp-config.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-config.cjs","names":[],"sources":["../../src/utils/mcp-config.ts"],"sourcesContent":["import {\n  MCPConfig,\n  MCPSSEServer,\n  MCPSHTTPServer,\n  MCPStdioServer,\n  SettingsValue,\n} from \"#/types/settings\";\n\nconst EMPTY_MCP_CONFIG: MCPConfig = {\n  sse_servers: [],\n  stdio_servers: [],\n  shttp_servers: [],\n};\n\nconst LINEAR_DEPRECATED_SSE_URL = \"https://mcp.linear.app/sse\";\nconst LINEAR_SHTTP_URL = \"https://mcp.linear.app/mcp\";\n\n/**\n * Linear removed its MCP SSE transport (the /sse endpoint rejects every\n * call since 2026-04-08). Detect persisted configs that still point at\n * the dead endpoint so they can be migrated to streamable HTTP at the\n * /mcp replacement. Matches only the exact deprecated URL (tolerating a\n * trailing slash or query string) — nothing else is rewritten.\n */\nfunction isDeprecatedLinearSse(\n  url: string,\n  transport: string | undefined,\n): boolean {\n  if (transport !== \"sse\") return false;\n  const normalized = url.split(\"?\")[0].replace(/\\/+$/, \"\");\n  return normalized === LINEAR_DEPRECATED_SSE_URL;\n}\n\ntype SdkMcpServerConfig = Record<string, SettingsValue>;\ntype SdkMcpConfig = { mcpServers: Record<string, SdkMcpServerConfig> };\n\n/**\n * Parse an SDK mcp_config value ({ mcpServers: { ... } }) and convert it\n * to the frontend MCPConfig format used by UI components.\n */\nexport function parseMcpConfig(value: unknown): MCPConfig {\n  if (!value || typeof value !== \"object\") {\n    return { ...EMPTY_MCP_CONFIG };\n  }\n\n  const obj = value as Record<string, unknown>;\n\n  if (\n    !(\"mcpServers\" in obj) ||\n    !obj.mcpServers ||\n    typeof obj.mcpServers !== \"object\"\n  ) {\n    return { ...EMPTY_MCP_CONFIG };\n  }\n\n  const sseServers: (string | MCPSSEServer)[] = [];\n  const stdioServers: MCPStdioServer[] = [];\n  const shttpServers: (string | MCPSHTTPServer)[] = [];\n  // Legacy Linear SSE entries rewritten to the /mcp endpoint. Collected\n  // separately and merged after the loop so an existing hand-added /mcp\n  // entry (with its own api_key/timeout) wins over the migrated one.\n  const migratedShttpServers: MCPSHTTPServer[] = [];\n\n  const mcpServers = obj.mcpServers as Record<string, Record<string, unknown>>;\n\n  for (const [serverName, serverConfig] of Object.entries(mcpServers)) {\n    if (!serverConfig || typeof serverConfig !== \"object\") continue;\n\n    const url = serverConfig.url as string | undefined;\n\n    if (url) {\n      const transport = serverConfig.transport as string | undefined;\n      const auth = serverConfig.auth as string | undefined;\n      const apiKey =\n        typeof auth === \"string\" && auth !== \"oauth\" ? auth : undefined;\n\n      if (isDeprecatedLinearSse(url, transport)) {\n        const server: MCPSHTTPServer = { url: LINEAR_SHTTP_URL };\n        if (apiKey) server.api_key = apiKey;\n        migratedShttpServers.push(server);\n      } else if (transport === \"sse\") {\n        const server: MCPSSEServer = { url };\n        if (apiKey) server.api_key = apiKey;\n        sseServers.push(server);\n      } else {\n        const server: MCPSHTTPServer = { url };\n        if (apiKey) server.api_key = apiKey;\n        if (serverConfig.timeout != null) {\n          server.timeout = serverConfig.timeout as number;\n        }\n        shttpServers.push(server);\n      }\n    } else {\n      const stdioServer: MCPStdioServer = {\n        name: serverName,\n        command: serverConfig.command as string,\n      };\n      if (serverConfig.args) {\n        stdioServer.args = serverConfig.args as string[];\n      }\n      if (serverConfig.env) {\n        stdioServer.env = serverConfig.env as Record<string, string>;\n      }\n      stdioServers.push(stdioServer);\n    }\n  }\n\n  const normalizeUrl = (u: string) => u.replace(/\\/+$/, \"\");\n  for (const migrated of migratedShttpServers) {\n    const alreadyPresent = shttpServers.some((entry) => {\n      const entryUrl = typeof entry === \"string\" ? entry : entry.url;\n      return normalizeUrl(entryUrl) === normalizeUrl(migrated.url);\n    });\n    if (!alreadyPresent) shttpServers.push(migrated);\n  }\n\n  return {\n    sse_servers: sseServers,\n    stdio_servers: stdioServers,\n    shttp_servers: shttpServers,\n  };\n}\n\n/**\n * Convert the frontend MCPConfig format back to the SDK { mcpServers: { ... } }\n * shape expected by agent_settings.mcp_config on the backend.\n *\n * Names are only suffixed (``_1``, ``_2``, …) when an earlier entry has\n * already claimed the bare base name. We intentionally do NOT use a single\n * monotonic counter across server types: that would, for example, rename a\n * stdio server \"myname\" to \"myname_1\" the moment any sse/shttp entry is\n * persisted ahead of it, and shift the suffix on every save as the count\n * of other server types changes. With per-base collision suffixing,\n * unrelated entries keep their human-meaningful names stable across edits.\n */\nexport function toSdkMcpConfig(config: MCPConfig): SdkMcpConfig | null {\n  const mcpServers: Record<string, SdkMcpServerConfig> = {};\n\n  const reserve = (base: string): string => {\n    if (!(base in mcpServers)) return base;\n    let i = 1;\n    while (`${base}_${i}` in mcpServers) i += 1;\n    return `${base}_${i}`;\n  };\n\n  for (const entry of config.sse_servers) {\n    const server: SdkMcpServerConfig = {};\n    if (typeof entry === \"string\") {\n      server.url = entry;\n    } else {\n      server.url = entry.url;\n      if (entry.api_key) server.auth = entry.api_key;\n    }\n    server.transport = \"sse\";\n    mcpServers[reserve(\"sse\")] = server;\n  }\n\n  for (const entry of config.shttp_servers) {\n    const server: SdkMcpServerConfig = {};\n    if (typeof entry === \"string\") {\n      server.url = entry;\n    } else {\n      server.url = entry.url;\n      if (entry.api_key) server.auth = entry.api_key;\n      if (entry.timeout != null) server.timeout = entry.timeout;\n    }\n    mcpServers[reserve(\"shttp\")] = server;\n  }\n\n  for (const entry of config.stdio_servers) {\n    const server: SdkMcpServerConfig = {\n      command: entry.command,\n    };\n    if (entry.args) server.args = entry.args;\n    if (entry.env) server.env = entry.env;\n    mcpServers[reserve(entry.name || \"stdio\")] = server;\n  }\n\n  return Object.keys(mcpServers).length > 0 ? { mcpServers } : null;\n}\n"],"mappings":"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"}
+{"version":3,"file":"mcp-config.cjs","names":[],"sources":["../../src/utils/mcp-config.ts"],"sourcesContent":["import {\n  MCPConfig,\n  MCPSSEServer,\n  MCPSHTTPServer,\n  MCPStdioServer,\n  SettingsValue,\n} from \"#/types/settings\";\n\nconst EMPTY_MCP_CONFIG: MCPConfig = {\n  sse_servers: [],\n  stdio_servers: [],\n  shttp_servers: [],\n};\n\nconst LINEAR_DEPRECATED_SSE_URL = \"https://mcp.linear.app/sse\";\nconst LINEAR_SHTTP_URL = \"https://mcp.linear.app/mcp\";\n\n/**\n * Linear removed its MCP SSE transport (the /sse endpoint rejects every\n * call since 2026-04-08). Detect persisted configs that still point at\n * the dead endpoint so they can be migrated to streamable HTTP at the\n * /mcp replacement. Matches only the exact deprecated URL (tolerating a\n * trailing slash or query string) — nothing else is rewritten.\n */\nfunction isDeprecatedLinearSse(\n  url: string,\n  transport: string | undefined,\n): boolean {\n  if (transport !== \"sse\") return false;\n  const normalized = url.split(\"?\")[0].replace(/\\/+$/, \"\");\n  return normalized === LINEAR_DEPRECATED_SSE_URL;\n}\n\ntype SdkMcpServerConfig = Record<string, SettingsValue>;\ntype SdkMcpConfig = { mcpServers: Record<string, SdkMcpServerConfig> };\n\nfunction apiKeyFromAuthorizationHeader(value: unknown): string | undefined {\n  if (Array.isArray(value)) {\n    return value\n      .map(apiKeyFromAuthorizationHeader)\n      .find((apiKey) => apiKey !== undefined);\n  }\n\n  if (typeof value !== \"string\" || value.length === 0) return undefined;\n  const bearer = value.match(/^Bearer\\s+(.+)$/i);\n  return bearer ? bearer[1] : value;\n}\n\nfunction apiKeyFromServerConfig(\n  serverConfig: Record<string, unknown>,\n): string | undefined {\n  const headers = serverConfig.headers;\n  const authorization =\n    headers && typeof headers === \"object\"\n      ? ((headers as Record<string, unknown>).Authorization ??\n        (headers as Record<string, unknown>).authorization)\n      : undefined;\n  const headerApiKey = apiKeyFromAuthorizationHeader(authorization);\n  if (headerApiKey) return headerApiKey;\n\n  const auth = serverConfig.auth;\n  return typeof auth === \"string\" && auth !== \"oauth\" ? auth : undefined;\n}\n\nfunction getAuthorizationHeaders(apiKey: string | undefined) {\n  if (!apiKey) return {};\n  return {\n    headers: {\n      Authorization: `Bearer ${apiKey}`,\n    },\n  };\n}\n\n/**\n * Parse an SDK mcp_config value ({ mcpServers: { ... } }) and convert it\n * to the frontend MCPConfig format used by UI components.\n */\nexport function parseMcpConfig(value: unknown): MCPConfig {\n  if (!value || typeof value !== \"object\") {\n    return { ...EMPTY_MCP_CONFIG };\n  }\n\n  const obj = value as Record<string, unknown>;\n\n  if (\n    !(\"mcpServers\" in obj) ||\n    !obj.mcpServers ||\n    typeof obj.mcpServers !== \"object\"\n  ) {\n    return { ...EMPTY_MCP_CONFIG };\n  }\n\n  const sseServers: (string | MCPSSEServer)[] = [];\n  const stdioServers: MCPStdioServer[] = [];\n  const shttpServers: (string | MCPSHTTPServer)[] = [];\n  // Legacy Linear SSE entries rewritten to the /mcp endpoint. Collected\n  // separately and merged after the loop so an existing hand-added /mcp\n  // entry (with its own api_key/timeout) wins over the migrated one.\n  const migratedShttpServers: MCPSHTTPServer[] = [];\n\n  const mcpServers = obj.mcpServers as Record<string, Record<string, unknown>>;\n\n  for (const [serverName, serverConfig] of Object.entries(mcpServers)) {\n    if (!serverConfig || typeof serverConfig !== \"object\") continue;\n\n    const url = serverConfig.url as string | undefined;\n\n    if (url) {\n      const transport = serverConfig.transport as string | undefined;\n      const apiKey = apiKeyFromServerConfig(serverConfig);\n\n      if (isDeprecatedLinearSse(url, transport)) {\n        const server: MCPSHTTPServer = { url: LINEAR_SHTTP_URL };\n        if (apiKey) server.api_key = apiKey;\n        migratedShttpServers.push(server);\n      } else if (transport === \"sse\") {\n        const server: MCPSSEServer = { url };\n        if (apiKey) server.api_key = apiKey;\n        sseServers.push(server);\n      } else {\n        const server: MCPSHTTPServer = { url };\n        if (apiKey) server.api_key = apiKey;\n        if (serverConfig.timeout != null) {\n          server.timeout = serverConfig.timeout as number;\n        }\n        shttpServers.push(server);\n      }\n    } else {\n      const stdioServer: MCPStdioServer = {\n        name: serverName,\n        command: serverConfig.command as string,\n      };\n      if (serverConfig.args) {\n        stdioServer.args = serverConfig.args as string[];\n      }\n      if (serverConfig.env) {\n        stdioServer.env = serverConfig.env as Record<string, string>;\n      }\n      stdioServers.push(stdioServer);\n    }\n  }\n\n  const normalizeUrl = (u: string) => u.replace(/\\/+$/, \"\");\n  for (const migrated of migratedShttpServers) {\n    const alreadyPresent = shttpServers.some((entry) => {\n      const entryUrl = typeof entry === \"string\" ? entry : entry.url;\n      return normalizeUrl(entryUrl) === normalizeUrl(migrated.url);\n    });\n    if (!alreadyPresent) shttpServers.push(migrated);\n  }\n\n  return {\n    sse_servers: sseServers,\n    stdio_servers: stdioServers,\n    shttp_servers: shttpServers,\n  };\n}\n\n/**\n * Convert the frontend MCPConfig format back to the SDK { mcpServers: { ... } }\n * shape expected by agent_settings.mcp_config on the backend.\n *\n * Names are only suffixed (``_1``, ``_2``, …) when an earlier entry has\n * already claimed the bare base name. We intentionally do NOT use a single\n * monotonic counter across server types: that would, for example, rename a\n * stdio server \"myname\" to \"myname_1\" the moment any sse/shttp entry is\n * persisted ahead of it, and shift the suffix on every save as the count\n * of other server types changes. With per-base collision suffixing,\n * unrelated entries keep their human-meaningful names stable across edits.\n */\nexport function toSdkMcpConfig(config: MCPConfig): SdkMcpConfig | null {\n  const mcpServers: Record<string, SdkMcpServerConfig> = {};\n\n  const reserve = (base: string): string => {\n    if (!(base in mcpServers)) return base;\n    let i = 1;\n    while (`${base}_${i}` in mcpServers) i += 1;\n    return `${base}_${i}`;\n  };\n\n  for (const entry of config.sse_servers) {\n    const server: SdkMcpServerConfig = {};\n    if (typeof entry === \"string\") {\n      server.url = entry;\n    } else {\n      server.url = entry.url;\n      Object.assign(server, getAuthorizationHeaders(entry.api_key));\n    }\n    server.transport = \"sse\";\n    mcpServers[reserve(\"sse\")] = server;\n  }\n\n  for (const entry of config.shttp_servers) {\n    const server: SdkMcpServerConfig = {};\n    if (typeof entry === \"string\") {\n      server.url = entry;\n    } else {\n      server.url = entry.url;\n      Object.assign(server, getAuthorizationHeaders(entry.api_key));\n      if (entry.timeout != null) server.timeout = entry.timeout;\n    }\n    mcpServers[reserve(\"shttp\")] = server;\n  }\n\n  for (const entry of config.stdio_servers) {\n    const server: SdkMcpServerConfig = {\n      command: entry.command,\n    };\n    if (entry.args) server.args = entry.args;\n    if (entry.env) server.env = entry.env;\n    mcpServers[reserve(entry.name || \"stdio\")] = server;\n  }\n\n  return Object.keys(mcpServers).length > 0 ? { mcpServers } : null;\n}\n"],"mappings":"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"}

package/dist/utils/mcp-config.js

@@ -7,43 +7,58 @@ var e = {
 function r(e, n) {
 	return n === "sse" ? e.split("?")[0].replace(/\/+$/, "") === t : !1;
 }
-function i(t) {
+function i(e) {
+	if (Array.isArray(e)) return e.map(i).find((e) => e !== void 0);
+	if (typeof e != "string" || e.length === 0) return;
+	let t = e.match(/^Bearer\s+(.+)$/i);
+	return t ? t[1] : e;
+}
+function a(e) {
+	let t = e.headers, n = i(t && typeof t == "object" ? t.Authorization ?? t.authorization : void 0);
+	if (n) return n;
+	let r = e.auth;
+	return typeof r == "string" && r !== "oauth" ? r : void 0;
+}
+function o(e) {
+	return e ? { headers: { Authorization: `Bearer ${e}` } } : {};
+}
+function s(t) {
 	if (!t || typeof t != "object") return { ...e };
 	let i = t;
 	if (!("mcpServers" in i) || !i.mcpServers || typeof i.mcpServers != "object") return { ...e };
-	let a = [], o = [], s = [], c = [], l = i.mcpServers;
-	for (let [e, t] of Object.entries(l)) {
+	let o = [], s = [], c = [], l = [], u = i.mcpServers;
+	for (let [e, t] of Object.entries(u)) {
 		if (!t || typeof t != "object") continue;
 		let i = t.url;
 		if (i) {
-			let e = t.transport, o = t.auth, l = typeof o == "string" && o !== "oauth" ? o : void 0;
+			let e = t.transport, s = a(t);
 			if (r(i, e)) {
 				let e = { url: n };
-				l && (e.api_key = l), c.push(e);
+				s && (e.api_key = s), l.push(e);
 			} else if (e === "sse") {
 				let e = { url: i };
-				l && (e.api_key = l), a.push(e);
+				s && (e.api_key = s), o.push(e);
 			} else {
 				let e = { url: i };
-				l && (e.api_key = l), t.timeout != null && (e.timeout = t.timeout), s.push(e);
+				s && (e.api_key = s), t.timeout != null && (e.timeout = t.timeout), c.push(e);
 			}
 		} else {
 			let n = {
 				name: e,
 				command: t.command
 			};
-			t.args && (n.args = t.args), t.env && (n.env = t.env), o.push(n);
+			t.args && (n.args = t.args), t.env && (n.env = t.env), s.push(n);
 		}
 	}
-	let u = (e) => e.replace(/\/+$/, "");
-	for (let e of c) s.some((t) => u(typeof t == "string" ? t : t.url) === u(e.url)) || s.push(e);
+	let d = (e) => e.replace(/\/+$/, "");
+	for (let e of l) c.some((t) => d(typeof t == "string" ? t : t.url) === d(e.url)) || c.push(e);
 	return {
-		sse_servers: a,
-		stdio_servers: o,
-		shttp_servers: s
+		sse_servers: o,
+		stdio_servers: s,
+		shttp_servers: c
 	};
 }
-function a(e) {
+function c(e) {
 	let t = {}, n = (e) => {
 		if (!(e in t)) return e;
 		let n = 1;
@@ -52,11 +67,11 @@ function a(e) {
 	};
 	for (let r of e.sse_servers) {
 		let e = {};
-		typeof r == "string" ? e.url = r : (e.url = r.url, r.api_key && (e.auth = r.api_key)), e.transport = "sse", t[n("sse")] = e;
+		typeof r == "string" ? e.url = r : (e.url = r.url, Object.assign(e, o(r.api_key))), e.transport = "sse", t[n("sse")] = e;
 	}
 	for (let r of e.shttp_servers) {
 		let e = {};
-		typeof r == "string" ? e.url = r : (e.url = r.url, r.api_key && (e.auth = r.api_key), r.timeout != null && (e.timeout = r.timeout)), t[n("shttp")] = e;
+		typeof r == "string" ? e.url = r : (e.url = r.url, Object.assign(e, o(r.api_key)), r.timeout != null && (e.timeout = r.timeout)), t[n("shttp")] = e;
 	}
 	for (let r of e.stdio_servers) {
 		let e = { command: r.command };
@@ -65,6 +80,6 @@ function a(e) {
 	return Object.keys(t).length > 0 ? { mcpServers: t } : null;
 }
 //#endregion
-export { i as parseMcpConfig, a as toSdkMcpConfig };
+export { s as parseMcpConfig, c as toSdkMcpConfig };
 
 //# sourceMappingURL=mcp-config.js.map

package/dist/utils/mcp-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-config.js","names":[],"sources":["../../src/utils/mcp-config.ts"],"sourcesContent":["import {\n  MCPConfig,\n  MCPSSEServer,\n  MCPSHTTPServer,\n  MCPStdioServer,\n  SettingsValue,\n} from \"#/types/settings\";\n\nconst EMPTY_MCP_CONFIG: MCPConfig = {\n  sse_servers: [],\n  stdio_servers: [],\n  shttp_servers: [],\n};\n\nconst LINEAR_DEPRECATED_SSE_URL = \"https://mcp.linear.app/sse\";\nconst LINEAR_SHTTP_URL = \"https://mcp.linear.app/mcp\";\n\n/**\n * Linear removed its MCP SSE transport (the /sse endpoint rejects every\n * call since 2026-04-08). Detect persisted configs that still point at\n * the dead endpoint so they can be migrated to streamable HTTP at the\n * /mcp replacement. Matches only the exact deprecated URL (tolerating a\n * trailing slash or query string) — nothing else is rewritten.\n */\nfunction isDeprecatedLinearSse(\n  url: string,\n  transport: string | undefined,\n): boolean {\n  if (transport !== \"sse\") return false;\n  const normalized = url.split(\"?\")[0].replace(/\\/+$/, \"\");\n  return normalized === LINEAR_DEPRECATED_SSE_URL;\n}\n\ntype SdkMcpServerConfig = Record<string, SettingsValue>;\ntype SdkMcpConfig = { mcpServers: Record<string, SdkMcpServerConfig> };\n\n/**\n * Parse an SDK mcp_config value ({ mcpServers: { ... } }) and convert it\n * to the frontend MCPConfig format used by UI components.\n */\nexport function parseMcpConfig(value: unknown): MCPConfig {\n  if (!value || typeof value !== \"object\") {\n    return { ...EMPTY_MCP_CONFIG };\n  }\n\n  const obj = value as Record<string, unknown>;\n\n  if (\n    !(\"mcpServers\" in obj) ||\n    !obj.mcpServers ||\n    typeof obj.mcpServers !== \"object\"\n  ) {\n    return { ...EMPTY_MCP_CONFIG };\n  }\n\n  const sseServers: (string | MCPSSEServer)[] = [];\n  const stdioServers: MCPStdioServer[] = [];\n  const shttpServers: (string | MCPSHTTPServer)[] = [];\n  // Legacy Linear SSE entries rewritten to the /mcp endpoint. Collected\n  // separately and merged after the loop so an existing hand-added /mcp\n  // entry (with its own api_key/timeout) wins over the migrated one.\n  const migratedShttpServers: MCPSHTTPServer[] = [];\n\n  const mcpServers = obj.mcpServers as Record<string, Record<string, unknown>>;\n\n  for (const [serverName, serverConfig] of Object.entries(mcpServers)) {\n    if (!serverConfig || typeof serverConfig !== \"object\") continue;\n\n    const url = serverConfig.url as string | undefined;\n\n    if (url) {\n      const transport = serverConfig.transport as string | undefined;\n      const auth = serverConfig.auth as string | undefined;\n      const apiKey =\n        typeof auth === \"string\" && auth !== \"oauth\" ? auth : undefined;\n\n      if (isDeprecatedLinearSse(url, transport)) {\n        const server: MCPSHTTPServer = { url: LINEAR_SHTTP_URL };\n        if (apiKey) server.api_key = apiKey;\n        migratedShttpServers.push(server);\n      } else if (transport === \"sse\") {\n        const server: MCPSSEServer = { url };\n        if (apiKey) server.api_key = apiKey;\n        sseServers.push(server);\n      } else {\n        const server: MCPSHTTPServer = { url };\n        if (apiKey) server.api_key = apiKey;\n        if (serverConfig.timeout != null) {\n          server.timeout = serverConfig.timeout as number;\n        }\n        shttpServers.push(server);\n      }\n    } else {\n      const stdioServer: MCPStdioServer = {\n        name: serverName,\n        command: serverConfig.command as string,\n      };\n      if (serverConfig.args) {\n        stdioServer.args = serverConfig.args as string[];\n      }\n      if (serverConfig.env) {\n        stdioServer.env = serverConfig.env as Record<string, string>;\n      }\n      stdioServers.push(stdioServer);\n    }\n  }\n\n  const normalizeUrl = (u: string) => u.replace(/\\/+$/, \"\");\n  for (const migrated of migratedShttpServers) {\n    const alreadyPresent = shttpServers.some((entry) => {\n      const entryUrl = typeof entry === \"string\" ? entry : entry.url;\n      return normalizeUrl(entryUrl) === normalizeUrl(migrated.url);\n    });\n    if (!alreadyPresent) shttpServers.push(migrated);\n  }\n\n  return {\n    sse_servers: sseServers,\n    stdio_servers: stdioServers,\n    shttp_servers: shttpServers,\n  };\n}\n\n/**\n * Convert the frontend MCPConfig format back to the SDK { mcpServers: { ... } }\n * shape expected by agent_settings.mcp_config on the backend.\n *\n * Names are only suffixed (``_1``, ``_2``, …) when an earlier entry has\n * already claimed the bare base name. We intentionally do NOT use a single\n * monotonic counter across server types: that would, for example, rename a\n * stdio server \"myname\" to \"myname_1\" the moment any sse/shttp entry is\n * persisted ahead of it, and shift the suffix on every save as the count\n * of other server types changes. With per-base collision suffixing,\n * unrelated entries keep their human-meaningful names stable across edits.\n */\nexport function toSdkMcpConfig(config: MCPConfig): SdkMcpConfig | null {\n  const mcpServers: Record<string, SdkMcpServerConfig> = {};\n\n  const reserve = (base: string): string => {\n    if (!(base in mcpServers)) return base;\n    let i = 1;\n    while (`${base}_${i}` in mcpServers) i += 1;\n    return `${base}_${i}`;\n  };\n\n  for (const entry of config.sse_servers) {\n    const server: SdkMcpServerConfig = {};\n    if (typeof entry === \"string\") {\n      server.url = entry;\n    } else {\n      server.url = entry.url;\n      if (entry.api_key) server.auth = entry.api_key;\n    }\n    server.transport = \"sse\";\n    mcpServers[reserve(\"sse\")] = server;\n  }\n\n  for (const entry of config.shttp_servers) {\n    const server: SdkMcpServerConfig = {};\n    if (typeof entry === \"string\") {\n      server.url = entry;\n    } else {\n      server.url = entry.url;\n      if (entry.api_key) server.auth = entry.api_key;\n      if (entry.timeout != null) server.timeout = entry.timeout;\n    }\n    mcpServers[reserve(\"shttp\")] = server;\n  }\n\n  for (const entry of config.stdio_servers) {\n    const server: SdkMcpServerConfig = {\n      command: entry.command,\n    };\n    if (entry.args) server.args = entry.args;\n    if (entry.env) server.env = entry.env;\n    mcpServers[reserve(entry.name || \"stdio\")] = server;\n  }\n\n  return Object.keys(mcpServers).length > 0 ? { mcpServers } : null;\n}\n"],"mappings":"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"}
+{"version":3,"file":"mcp-config.js","names":[],"sources":["../../src/utils/mcp-config.ts"],"sourcesContent":["import {\n  MCPConfig,\n  MCPSSEServer,\n  MCPSHTTPServer,\n  MCPStdioServer,\n  SettingsValue,\n} from \"#/types/settings\";\n\nconst EMPTY_MCP_CONFIG: MCPConfig = {\n  sse_servers: [],\n  stdio_servers: [],\n  shttp_servers: [],\n};\n\nconst LINEAR_DEPRECATED_SSE_URL = \"https://mcp.linear.app/sse\";\nconst LINEAR_SHTTP_URL = \"https://mcp.linear.app/mcp\";\n\n/**\n * Linear removed its MCP SSE transport (the /sse endpoint rejects every\n * call since 2026-04-08). Detect persisted configs that still point at\n * the dead endpoint so they can be migrated to streamable HTTP at the\n * /mcp replacement. Matches only the exact deprecated URL (tolerating a\n * trailing slash or query string) — nothing else is rewritten.\n */\nfunction isDeprecatedLinearSse(\n  url: string,\n  transport: string | undefined,\n): boolean {\n  if (transport !== \"sse\") return false;\n  const normalized = url.split(\"?\")[0].replace(/\\/+$/, \"\");\n  return normalized === LINEAR_DEPRECATED_SSE_URL;\n}\n\ntype SdkMcpServerConfig = Record<string, SettingsValue>;\ntype SdkMcpConfig = { mcpServers: Record<string, SdkMcpServerConfig> };\n\nfunction apiKeyFromAuthorizationHeader(value: unknown): string | undefined {\n  if (Array.isArray(value)) {\n    return value\n      .map(apiKeyFromAuthorizationHeader)\n      .find((apiKey) => apiKey !== undefined);\n  }\n\n  if (typeof value !== \"string\" || value.length === 0) return undefined;\n  const bearer = value.match(/^Bearer\\s+(.+)$/i);\n  return bearer ? bearer[1] : value;\n}\n\nfunction apiKeyFromServerConfig(\n  serverConfig: Record<string, unknown>,\n): string | undefined {\n  const headers = serverConfig.headers;\n  const authorization =\n    headers && typeof headers === \"object\"\n      ? ((headers as Record<string, unknown>).Authorization ??\n        (headers as Record<string, unknown>).authorization)\n      : undefined;\n  const headerApiKey = apiKeyFromAuthorizationHeader(authorization);\n  if (headerApiKey) return headerApiKey;\n\n  const auth = serverConfig.auth;\n  return typeof auth === \"string\" && auth !== \"oauth\" ? auth : undefined;\n}\n\nfunction getAuthorizationHeaders(apiKey: string | undefined) {\n  if (!apiKey) return {};\n  return {\n    headers: {\n      Authorization: `Bearer ${apiKey}`,\n    },\n  };\n}\n\n/**\n * Parse an SDK mcp_config value ({ mcpServers: { ... } }) and convert it\n * to the frontend MCPConfig format used by UI components.\n */\nexport function parseMcpConfig(value: unknown): MCPConfig {\n  if (!value || typeof value !== \"object\") {\n    return { ...EMPTY_MCP_CONFIG };\n  }\n\n  const obj = value as Record<string, unknown>;\n\n  if (\n    !(\"mcpServers\" in obj) ||\n    !obj.mcpServers ||\n    typeof obj.mcpServers !== \"object\"\n  ) {\n    return { ...EMPTY_MCP_CONFIG };\n  }\n\n  const sseServers: (string | MCPSSEServer)[] = [];\n  const stdioServers: MCPStdioServer[] = [];\n  const shttpServers: (string | MCPSHTTPServer)[] = [];\n  // Legacy Linear SSE entries rewritten to the /mcp endpoint. Collected\n  // separately and merged after the loop so an existing hand-added /mcp\n  // entry (with its own api_key/timeout) wins over the migrated one.\n  const migratedShttpServers: MCPSHTTPServer[] = [];\n\n  const mcpServers = obj.mcpServers as Record<string, Record<string, unknown>>;\n\n  for (const [serverName, serverConfig] of Object.entries(mcpServers)) {\n    if (!serverConfig || typeof serverConfig !== \"object\") continue;\n\n    const url = serverConfig.url as string | undefined;\n\n    if (url) {\n      const transport = serverConfig.transport as string | undefined;\n      const apiKey = apiKeyFromServerConfig(serverConfig);\n\n      if (isDeprecatedLinearSse(url, transport)) {\n        const server: MCPSHTTPServer = { url: LINEAR_SHTTP_URL };\n        if (apiKey) server.api_key = apiKey;\n        migratedShttpServers.push(server);\n      } else if (transport === \"sse\") {\n        const server: MCPSSEServer = { url };\n        if (apiKey) server.api_key = apiKey;\n        sseServers.push(server);\n      } else {\n        const server: MCPSHTTPServer = { url };\n        if (apiKey) server.api_key = apiKey;\n        if (serverConfig.timeout != null) {\n          server.timeout = serverConfig.timeout as number;\n        }\n        shttpServers.push(server);\n      }\n    } else {\n      const stdioServer: MCPStdioServer = {\n        name: serverName,\n        command: serverConfig.command as string,\n      };\n      if (serverConfig.args) {\n        stdioServer.args = serverConfig.args as string[];\n      }\n      if (serverConfig.env) {\n        stdioServer.env = serverConfig.env as Record<string, string>;\n      }\n      stdioServers.push(stdioServer);\n    }\n  }\n\n  const normalizeUrl = (u: string) => u.replace(/\\/+$/, \"\");\n  for (const migrated of migratedShttpServers) {\n    const alreadyPresent = shttpServers.some((entry) => {\n      const entryUrl = typeof entry === \"string\" ? entry : entry.url;\n      return normalizeUrl(entryUrl) === normalizeUrl(migrated.url);\n    });\n    if (!alreadyPresent) shttpServers.push(migrated);\n  }\n\n  return {\n    sse_servers: sseServers,\n    stdio_servers: stdioServers,\n    shttp_servers: shttpServers,\n  };\n}\n\n/**\n * Convert the frontend MCPConfig format back to the SDK { mcpServers: { ... } }\n * shape expected by agent_settings.mcp_config on the backend.\n *\n * Names are only suffixed (``_1``, ``_2``, …) when an earlier entry has\n * already claimed the bare base name. We intentionally do NOT use a single\n * monotonic counter across server types: that would, for example, rename a\n * stdio server \"myname\" to \"myname_1\" the moment any sse/shttp entry is\n * persisted ahead of it, and shift the suffix on every save as the count\n * of other server types changes. With per-base collision suffixing,\n * unrelated entries keep their human-meaningful names stable across edits.\n */\nexport function toSdkMcpConfig(config: MCPConfig): SdkMcpConfig | null {\n  const mcpServers: Record<string, SdkMcpServerConfig> = {};\n\n  const reserve = (base: string): string => {\n    if (!(base in mcpServers)) return base;\n    let i = 1;\n    while (`${base}_${i}` in mcpServers) i += 1;\n    return `${base}_${i}`;\n  };\n\n  for (const entry of config.sse_servers) {\n    const server: SdkMcpServerConfig = {};\n    if (typeof entry === \"string\") {\n      server.url = entry;\n    } else {\n      server.url = entry.url;\n      Object.assign(server, getAuthorizationHeaders(entry.api_key));\n    }\n    server.transport = \"sse\";\n    mcpServers[reserve(\"sse\")] = server;\n  }\n\n  for (const entry of config.shttp_servers) {\n    const server: SdkMcpServerConfig = {};\n    if (typeof entry === \"string\") {\n      server.url = entry;\n    } else {\n      server.url = entry.url;\n      Object.assign(server, getAuthorizationHeaders(entry.api_key));\n      if (entry.timeout != null) server.timeout = entry.timeout;\n    }\n    mcpServers[reserve(\"shttp\")] = server;\n  }\n\n  for (const entry of config.stdio_servers) {\n    const server: SdkMcpServerConfig = {\n      command: entry.command,\n    };\n    if (entry.args) server.args = entry.args;\n    if (entry.env) server.env = entry.env;\n    mcpServers[reserve(entry.name || \"stdio\")] = server;\n  }\n\n  return Object.keys(mcpServers).length > 0 ? { mcpServers } : null;\n}\n"],"mappings":"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"}

package/dist/utils/mcp-credential-validation.cjs

@@ -0,0 +1,2 @@
+require(`../_virtual/_rolldown/runtime.cjs`);const e=require(`./mcp-marketplace-utils.cjs`),t=require(`../node_modules/@openhands/extensions/integrations/index.cjs`);var n=new Set([`invalid_auth`,`not_authed`,`account_inactive`,`token_revoked`,`token_expired`]),r={slack:{toolCall:{name:`slack_list_channels`,arguments:{limit:1}},interpret:e=>{if(e.is_error)return e.text||`tool call failed`;try{let t=JSON.parse(e.text);if(t?.ok===!1&&n.has(t.error))return String(t.error)}catch{}return null}}};function i(n){let i=e.findCatalogEntryForServer(n,e.getMcpMarketplaceCatalog(t.default));return i?r[i.id]:void 0}exports.getCredentialValidationForServer=i;
+//# sourceMappingURL=mcp-credential-validation.cjs.map

package/dist/utils/mcp-credential-validation.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-credential-validation.cjs","names":[],"sources":["../../src/utils/mcp-credential-validation.ts"],"sourcesContent":["import { INTEGRATION_CATALOG as MCP_MARKETPLACE } from \"@openhands/extensions/integrations\";\nimport {\n  findCatalogEntryForServer,\n  getMcpMarketplaceCatalog,\n} from \"#/utils/mcp-marketplace-utils\";\nimport type {\n  MCPServerConfig,\n  MCPTestToolCall,\n  MCPTestToolResult,\n} from \"#/types/mcp-server\";\n\n/**\n * Credential validation specs for marketplace MCP servers whose credentials\n * are only exercised on tool invocation (listing tools succeeds with any\n * credentials). The test endpoint runs `toolCall` after listing and reports\n * the outcome verbatim; `interpret` decides whether that outcome proves the\n * credentials are invalid.\n *\n * `toolCall` MUST be read-only — it runs on every \"Test connection\" /\n * pre-save validation.\n */\nexport interface CredentialValidation {\n  toolCall: MCPTestToolCall;\n  /** Returns the provider's error code/message, or null when creds pass. */\n  interpret: (toolResult: MCPTestToolResult) => string | null;\n}\n\n/**\n * Slack error codes that mean the credentials themselves are bad. Anything\n * else (e.g. `missing_scope`) proves the token *authenticated* — a valid\n * token lacking a scope must not be reported as invalid credentials.\n */\nconst SLACK_AUTH_FAILURES = new Set([\n  \"invalid_auth\",\n  \"not_authed\",\n  \"account_inactive\",\n  \"token_revoked\",\n  \"token_expired\",\n]);\n\nconst VALIDATION_BY_ENTRY_ID: Record<string, CredentialValidation> = {\n  slack: {\n    // Read-only: lists at most one channel. The Slack MCP server returns\n    // the raw Slack API JSON ({ok: boolean, error?: string}) as text.\n    toolCall: { name: \"slack_list_channels\", arguments: { limit: 1 } },\n    interpret: (toolResult) => {\n      if (toolResult.is_error) {\n        return toolResult.text || \"tool call failed\";\n      }\n      try {\n        const parsed = JSON.parse(toolResult.text);\n        if (parsed?.ok === false && SLACK_AUTH_FAILURES.has(parsed.error)) {\n          return String(parsed.error);\n        }\n      } catch {\n        // Non-JSON payload — make no claim about the credentials.\n      }\n      return null;\n    },\n  },\n};\n\n/**\n * Look up the credential validation for a server by matching it to its\n * marketplace catalog entry (same matching the MCP page uses for icons).\n * Returns undefined for custom servers — their test behaves as before.\n */\nexport function getCredentialValidationForServer(\n  server: MCPServerConfig,\n): CredentialValidation | undefined {\n  const entry = findCatalogEntryForServer(\n    server,\n    getMcpMarketplaceCatalog(MCP_MARKETPLACE),\n  );\n  return entry ? VALIDATION_BY_ENTRY_ID[entry.id] : undefined;\n}\n"],"mappings":"sKAgCA,IAAM,EAAsB,IAAI,IAAI,CAClC,eACA,aACA,mBACA,gBACA,gBACD,CAAC,CAEI,EAA+D,CACnE,MAAO,CAGL,SAAU,CAAE,KAAM,sBAAuB,UAAW,CAAE,MAAO,EAAG,CAAE,CAClE,UAAY,GAAe,CACzB,GAAI,EAAW,SACb,OAAO,EAAW,MAAQ,mBAE5B,GAAI,CACF,IAAM,EAAS,KAAK,MAAM,EAAW,KAAK,CAC1C,GAAI,GAAQ,KAAO,IAAS,EAAoB,IAAI,EAAO,MAAM,CAC/D,OAAO,OAAO,EAAO,MAAM,MAEvB,EAGR,OAAO,MAEV,CACF,CAOD,SAAgB,EACd,EACkC,CAClC,IAAM,EAAQ,EAAA,0BACZ,EACA,EAAA,yBAAyB,EAAA,QAAgB,CAC1C,CACD,OAAO,EAAQ,EAAuB,EAAM,IAAM,IAAA"}

package/dist/utils/mcp-credential-validation.d.ts

@@ -0,0 +1,22 @@
+import type { MCPServerConfig, MCPTestToolCall, MCPTestToolResult } from "#/types/mcp-server";
+/**
+ * Credential validation specs for marketplace MCP servers whose credentials
+ * are only exercised on tool invocation (listing tools succeeds with any
+ * credentials). The test endpoint runs `toolCall` after listing and reports
+ * the outcome verbatim; `interpret` decides whether that outcome proves the
+ * credentials are invalid.
+ *
+ * `toolCall` MUST be read-only — it runs on every "Test connection" /
+ * pre-save validation.
+ */
+export interface CredentialValidation {
+    toolCall: MCPTestToolCall;
+    /** Returns the provider's error code/message, or null when creds pass. */
+    interpret: (toolResult: MCPTestToolResult) => string | null;
+}
+/**
+ * Look up the credential validation for a server by matching it to its
+ * marketplace catalog entry (same matching the MCP page uses for icons).
+ * Returns undefined for custom servers — their test behaves as before.
+ */
+export declare function getCredentialValidationForServer(server: MCPServerConfig): CredentialValidation | undefined;

package/dist/utils/mcp-credential-validation.js

@@ -0,0 +1,31 @@
+import { findCatalogEntryForServer as e, getMcpMarketplaceCatalog as t } from "./mcp-marketplace-utils.js";
+import n from "../node_modules/@openhands/extensions/integrations/index.js";
+//#region src/utils/mcp-credential-validation.ts
+var r = new Set([
+	"invalid_auth",
+	"not_authed",
+	"account_inactive",
+	"token_revoked",
+	"token_expired"
+]), i = { slack: {
+	toolCall: {
+		name: "slack_list_channels",
+		arguments: { limit: 1 }
+	},
+	interpret: (e) => {
+		if (e.is_error) return e.text || "tool call failed";
+		try {
+			let t = JSON.parse(e.text);
+			if (t?.ok === !1 && r.has(t.error)) return String(t.error);
+		} catch {}
+		return null;
+	}
+} };
+function a(r) {
+	let a = e(r, t(n));
+	return a ? i[a.id] : void 0;
+}
+//#endregion
+export { a as getCredentialValidationForServer };
+
+//# sourceMappingURL=mcp-credential-validation.js.map

package/dist/utils/mcp-credential-validation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-credential-validation.js","names":[],"sources":["../../src/utils/mcp-credential-validation.ts"],"sourcesContent":["import { INTEGRATION_CATALOG as MCP_MARKETPLACE } from \"@openhands/extensions/integrations\";\nimport {\n  findCatalogEntryForServer,\n  getMcpMarketplaceCatalog,\n} from \"#/utils/mcp-marketplace-utils\";\nimport type {\n  MCPServerConfig,\n  MCPTestToolCall,\n  MCPTestToolResult,\n} from \"#/types/mcp-server\";\n\n/**\n * Credential validation specs for marketplace MCP servers whose credentials\n * are only exercised on tool invocation (listing tools succeeds with any\n * credentials). The test endpoint runs `toolCall` after listing and reports\n * the outcome verbatim; `interpret` decides whether that outcome proves the\n * credentials are invalid.\n *\n * `toolCall` MUST be read-only — it runs on every \"Test connection\" /\n * pre-save validation.\n */\nexport interface CredentialValidation {\n  toolCall: MCPTestToolCall;\n  /** Returns the provider's error code/message, or null when creds pass. */\n  interpret: (toolResult: MCPTestToolResult) => string | null;\n}\n\n/**\n * Slack error codes that mean the credentials themselves are bad. Anything\n * else (e.g. `missing_scope`) proves the token *authenticated* — a valid\n * token lacking a scope must not be reported as invalid credentials.\n */\nconst SLACK_AUTH_FAILURES = new Set([\n  \"invalid_auth\",\n  \"not_authed\",\n  \"account_inactive\",\n  \"token_revoked\",\n  \"token_expired\",\n]);\n\nconst VALIDATION_BY_ENTRY_ID: Record<string, CredentialValidation> = {\n  slack: {\n    // Read-only: lists at most one channel. The Slack MCP server returns\n    // the raw Slack API JSON ({ok: boolean, error?: string}) as text.\n    toolCall: { name: \"slack_list_channels\", arguments: { limit: 1 } },\n    interpret: (toolResult) => {\n      if (toolResult.is_error) {\n        return toolResult.text || \"tool call failed\";\n      }\n      try {\n        const parsed = JSON.parse(toolResult.text);\n        if (parsed?.ok === false && SLACK_AUTH_FAILURES.has(parsed.error)) {\n          return String(parsed.error);\n        }\n      } catch {\n        // Non-JSON payload — make no claim about the credentials.\n      }\n      return null;\n    },\n  },\n};\n\n/**\n * Look up the credential validation for a server by matching it to its\n * marketplace catalog entry (same matching the MCP page uses for icons).\n * Returns undefined for custom servers — their test behaves as before.\n */\nexport function getCredentialValidationForServer(\n  server: MCPServerConfig,\n): CredentialValidation | undefined {\n  const entry = findCatalogEntryForServer(\n    server,\n    getMcpMarketplaceCatalog(MCP_MARKETPLACE),\n  );\n  return entry ? VALIDATION_BY_ENTRY_ID[entry.id] : undefined;\n}\n"],"mappings":";;;AAgCA,IAAM,IAAsB,IAAI,IAAI;CAClC;CACA;CACA;CACA;CACA;CACD,CAAC,EAEI,IAA+D,EACnE,OAAO;CAGL,UAAU;EAAE,MAAM;EAAuB,WAAW,EAAE,OAAO,GAAG;EAAE;CAClE,YAAY,MAAe;AACzB,MAAI,EAAW,SACb,QAAO,EAAW,QAAQ;AAE5B,MAAI;GACF,IAAM,IAAS,KAAK,MAAM,EAAW,KAAK;AAC1C,OAAI,GAAQ,OAAO,MAAS,EAAoB,IAAI,EAAO,MAAM,CAC/D,QAAO,OAAO,EAAO,MAAM;UAEvB;AAGR,SAAO;;CAEV,EACF;AAOD,SAAgB,EACd,GACkC;CAClC,IAAM,IAAQ,EACZ,GACA,EAAyB,EAAgB,CAC1C;AACD,QAAO,IAAQ,EAAuB,EAAM,MAAM,KAAA"}

package/dist/utils/mcp-marketplace-utils.cjs

@@ -1,2 +1,2 @@
-require(`../_virtual/_rolldown/runtime.cjs`);const e=require(`../api/agent-server-adapter.cjs`);function t(e){return e.connectionOptions.filter(e=>e.provider===`mcp`&&!!e.transport)}function n(e){let n=t(e);return n.find(t=>t.id===e.defaultConnectionOptionId)??n[0]}function r(e){return e.auth.strategy!==`oauth2`}function i(e){let n=t(e),i=n.find(t=>t.id===e.defaultConnectionOptionId);return i&&r(i)?i:n.find(r)}function a(e){return n(e)?.transport}var o=`https://mcp.linear.app/sse`,s=`https://mcp.linear.app/mcp`,c=`https://linear.app/docs/mcp`;function l(e){return e.id===`linear`?{...e,docsUrl:c,installHint:`Authenticate with a Linear API key (Linear → Settings → Security & access) — sent as a Bearer token. Optional when the endpoint accepts your OAuth session.`,connectionOptions:e.connectionOptions.map(e=>e.transport?.kind===`sse`&&p(e.transport.url,o)?{...e,auth:{...e.auth,strategy:`bearer`},transport:{kind:`shttp`,url:s,apiKeyOptional:e.transport.apiKeyOptional}}:e)}:e}function u(t){return t.id!==`github`||e.getDeploymentMode()!==`docker`?t:{...t,installHint:`Requires a GitHub Personal Access Token (classic or fine-grained).`,connectionOptions:t.connectionOptions.map(e=>e.transport?.kind===`stdio`&&e.transport.command===`docker`?{...e,transport:{...e.transport,command:`github-mcp-server`,args:[`stdio`]}}:e)}}function d(e){return e.map(l).map(u).filter(e=>!!n(e))}var f=e=>{try{return new URL(e)}catch{return null}};function p(e,t){let n=typeof e==`string`?e:``,r=typeof t==`string`?t:``;if(!n||!r)return!1;let i=f(n),a=f(r);return!i||!a?n.replace(/\/+$/,``)===r.replace(/\/+$/,``):i.protocol===a.protocol&&i.host===a.host&&i.pathname.replace(/\/+$/,``)===a.pathname.replace(/\/+$/,``)}function m(e,t){if(e.kind===`shttp`){let n=e.url;return t.type===`shttp`&&!!t.url&&p(t.url,n)}if(e.kind===`sse`){let n=e.url;return t.type===`sse`&&!!t.url&&p(t.url,n)}return t.type===`stdio`&&t.name===e.serverName}function h(e,t){return!e.runtimeAvailability||e.runtimeAvailability===`all`?!0:e.runtimeAvailability===t}function g(e){return e.trim().toLowerCase()}function _(e){return e.map((e,t)=>({entry:e,index:t})).sort((e,t)=>(t.entry.popularityRank??0)-(e.entry.popularityRank??0)||e.index-t.index).map(({entry:e})=>e)}function v(e,t){let n=g(t);return n?[e.name,e.description,e.id,...e.keywords??[]].join(` `).toLowerCase().includes(n):!0}function y(e,t,n){let r=g(n);return r?[e.type,`name`in e?e.name:void 0,`command`in e?e.command:void 0,`args`in e?e.args?.join(` `):void 0,`url`in e?e.url:void 0,t?.name,t?.description,t?.id,...t?.keywords??[]].filter(Boolean).join(` `).toLowerCase().includes(r):!0}function b(e,n){return n.find(n=>t(n).some(t=>m(t.transport,e)))}exports.findCatalogEntryForServer=b,exports.getDefaultMcpTransport=a,exports.getInstallableMcpConnectionOption=i,exports.getMarketplaceEntriesByPopularity=_,exports.getMcpMarketplaceCatalog=d,exports.installedServerMatchesQuery=y,exports.isMarketplaceEntryAvailable=h,exports.marketplaceEntryMatchesQuery=v;
+require(`../_virtual/_rolldown/runtime.cjs`);function e(e){return e.connectionOptions.filter(e=>e.provider===`mcp`&&!!e.transport)}function t(t){let n=e(t);return n.find(e=>e.id===t.defaultConnectionOptionId)??n[0]}function n(e){return e.auth.strategy!==`oauth2`}function r(t){let r=e(t),i=r.find(e=>e.id===t.defaultConnectionOptionId);return i&&n(i)?i:r.find(n)}function i(e){return t(e)?.transport}var a=`https://mcp.linear.app/sse`,o=`https://mcp.linear.app/mcp`,s=`https://linear.app/docs/mcp`;function c(e){return e.id===`linear`?{...e,docsUrl:s,installHint:`Authenticate with a Linear API key (Linear → Settings → Security & access) — sent as a Bearer token. Optional when the endpoint accepts your OAuth session.`,connectionOptions:e.connectionOptions.map(e=>e.transport?.kind===`sse`&&d(e.transport.url,a)?{...e,auth:{...e.auth,strategy:`bearer`},transport:{kind:`shttp`,url:o,apiKeyOptional:e.transport.apiKeyOptional}}:e)}:e}function l(e){return e.map(c).filter(e=>!!t(e))}var u=e=>{try{return new URL(e)}catch{return null}};function d(e,t){let n=typeof e==`string`?e:``,r=typeof t==`string`?t:``;if(!n||!r)return!1;let i=u(n),a=u(r);return!i||!a?n.replace(/\/+$/,``)===r.replace(/\/+$/,``):i.protocol===a.protocol&&i.host===a.host&&i.pathname.replace(/\/+$/,``)===a.pathname.replace(/\/+$/,``)}function f(e,t){if(e.kind===`shttp`){let n=e.url;return t.type===`shttp`&&!!t.url&&d(t.url,n)}if(e.kind===`sse`){let n=e.url;return t.type===`sse`&&!!t.url&&d(t.url,n)}return t.type===`stdio`&&t.name===e.serverName}function p(e,t){return!e.runtimeAvailability||e.runtimeAvailability===`all`?!0:e.runtimeAvailability===t}function m(e){return e.trim().toLowerCase()}function h(e){return e.map((e,t)=>({entry:e,index:t})).sort((e,t)=>(t.entry.popularityRank??0)-(e.entry.popularityRank??0)||e.index-t.index).map(({entry:e})=>e)}function g(e,t){let n=m(t);return n?[e.name,e.description,e.id,...e.keywords??[]].join(` `).toLowerCase().includes(n):!0}function _(e,t,n){let r=m(n);return r?[e.type,`name`in e?e.name:void 0,`command`in e?e.command:void 0,`args`in e?e.args?.join(` `):void 0,`url`in e?e.url:void 0,t?.name,t?.description,t?.id,...t?.keywords??[]].filter(Boolean).join(` `).toLowerCase().includes(r):!0}function v(t,n){return n.find(n=>e(n).some(e=>f(e.transport,t)))}exports.findCatalogEntryForServer=v,exports.getDefaultMcpTransport=i,exports.getInstallableMcpConnectionOption=r,exports.getMarketplaceEntriesByPopularity=h,exports.getMcpMarketplaceCatalog=l,exports.installedServerMatchesQuery=_,exports.isMarketplaceEntryAvailable=p,exports.marketplaceEntryMatchesQuery=g;
 //# sourceMappingURL=mcp-marketplace-utils.cjs.map

package/dist/utils/mcp-marketplace-utils.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-marketplace-utils.cjs","names":[],"sources":["../../src/utils/mcp-marketplace-utils.ts"],"sourcesContent":["import { MCPServerConfig } from \"#/types/mcp-server\";\nimport type {\n  IntegrationCatalogEntry as MarketplaceEntry,\n  IntegrationConnectionOption,\n  IntegrationTransport,\n} from \"@openhands/extensions/integrations\";\nimport { getDeploymentMode } from \"#/api/agent-server-adapter\";\n\nexport type { MarketplaceEntry };\n\nexport type McpMarketplaceConnectionOption = IntegrationConnectionOption & {\n  provider: \"mcp\";\n  transport: IntegrationTransport;\n};\n\nexport function getMcpConnectionOptions(\n  entry: MarketplaceEntry,\n): McpMarketplaceConnectionOption[] {\n  return entry.connectionOptions.filter(\n    (option): option is McpMarketplaceConnectionOption =>\n      option.provider === \"mcp\" && !!option.transport,\n  );\n}\n\nexport function getDefaultMcpConnectionOption(\n  entry: MarketplaceEntry,\n): McpMarketplaceConnectionOption | undefined {\n  const options = getMcpConnectionOptions(entry);\n  return (\n    options.find((option) => option.id === entry.defaultConnectionOptionId) ??\n    options[0]\n  );\n}\n\nfunction isLocallyInstallableMcpOption(\n  option: McpMarketplaceConnectionOption,\n): boolean {\n  // The local install modal writes static MCP server config. OAuth options\n  // describe hosted redirect flows, so prefer an API/stdio fallback when one\n  // exists and leave OAuth as the default connection for hosted integrations.\n  return option.auth.strategy !== \"oauth2\";\n}\n\nexport function getInstallableMcpConnectionOption(\n  entry: MarketplaceEntry,\n): McpMarketplaceConnectionOption | undefined {\n  const options = getMcpConnectionOptions(entry);\n  const defaultOption = options.find(\n    (option) => option.id === entry.defaultConnectionOptionId,\n  );\n  if (defaultOption && isLocallyInstallableMcpOption(defaultOption)) {\n    return defaultOption;\n  }\n  return options.find(isLocallyInstallableMcpOption);\n}\n\nexport function getDefaultMcpTransport(\n  entry: MarketplaceEntry,\n): IntegrationTransport | undefined {\n  return getDefaultMcpConnectionOption(entry)?.transport;\n}\n\nconst LINEAR_DEPRECATED_SSE_URL = \"https://mcp.linear.app/sse\";\nconst LINEAR_SHTTP_URL = \"https://mcp.linear.app/mcp\";\nconst LINEAR_DOCS_URL = \"https://linear.app/docs/mcp\";\n\n/**\n * Upstream @openhands/extensions still ships Linear's deprecated SSE\n * transport (removed upstream on 2026-04-08; the /sse endpoint now\n * rejects every call). Rewrite the entry to streamable HTTP at the\n * /mcp replacement endpoint until the pinned dependency catches up.\n *\n * The /mcp endpoint authenticates via OAuth 2.1 or a Linear API key\n * sent as \"Authorization: Bearer <token>\". This client has no\n * interactive OAuth flow for MCP installs, so switch the auth\n * strategy from \"none\" to \"bearer\" — the install modal then offers\n * an (optional) API key field and the agent server forwards it as a\n * Bearer header.\n *\n * Patches immutably — the imported catalog JSON is shared module\n * state and must not be mutated.\n */\nfunction patchLinearEntry(entry: MarketplaceEntry): MarketplaceEntry {\n  if (entry.id !== \"linear\") return entry;\n  return {\n    ...entry,\n    docsUrl: LINEAR_DOCS_URL,\n    installHint:\n      \"Authenticate with a Linear API key (Linear → Settings → Security & access) — sent as a Bearer token. Optional when the endpoint accepts your OAuth session.\",\n    connectionOptions: entry.connectionOptions.map((option) =>\n      option.transport?.kind === \"sse\" &&\n      urlsMatch(option.transport.url, LINEAR_DEPRECATED_SSE_URL)\n        ? {\n            ...option,\n            auth: { ...option.auth, strategy: \"bearer\" as const },\n            transport: {\n              kind: \"shttp\" as const,\n              url: LINEAR_SHTTP_URL,\n              apiKeyOptional: option.transport.apiKeyOptional,\n            },\n          }\n        : option,\n    ),\n  };\n}\n\n/**\n * The upstream catalog ships the GitHub MCP server with `command: \"docker\"`\n * (`docker run … ghcr.io/github/github-mcp-server`). This requires Docker-\n * in-Docker when agent-canvas itself runs inside the Docker image, which\n * isn't available. The Docker image pre-installs the native Go binary at\n * `/usr/local/bin/github-mcp-server`, so we rewrite the transport to use\n * it directly.\n *\n * Only applied when `getDeploymentMode()` returns `\"docker\"`.\n */\nfunction patchGitHubEntry(entry: MarketplaceEntry): MarketplaceEntry {\n  if (entry.id !== \"github\") return entry;\n  if (getDeploymentMode() !== \"docker\") return entry;\n  return {\n    ...entry,\n    installHint:\n      \"Requires a GitHub Personal Access Token (classic or fine-grained).\",\n    // The upstream @openhands/extensions catalog defines the GitHub entry\n    // with `command: \"docker\"` (i.e. `docker run …`). We match on that\n    // exact value to replace it with the pre-installed native binary.\n    // If the upstream ever changes the command string, this patch becomes\n    // a no-op and the original transport is preserved — the worst case is\n    // the user falls back to the Docker-based transport (which still works\n    // outside the Docker image).\n    connectionOptions: entry.connectionOptions.map((option) =>\n      option.transport?.kind === \"stdio\" &&\n      option.transport.command === \"docker\"\n        ? {\n            ...option,\n            transport: {\n              ...option.transport,\n              command: \"github-mcp-server\",\n              args: [\"stdio\"],\n            },\n          }\n        : option,\n    ),\n  };\n}\n\nexport function getMcpMarketplaceCatalog(\n  catalog: MarketplaceEntry[],\n): MarketplaceEntry[] {\n  return catalog\n    .map(patchLinearEntry)\n    .map(patchGitHubEntry)\n    .filter((entry) => !!getDefaultMcpConnectionOption(entry));\n}\n\nconst tryUrl = (raw: string): URL | null => {\n  try {\n    return new URL(raw);\n  } catch {\n    return null;\n  }\n};\n\n/**\n * Loose URL match that ignores query strings, trailing slashes, and\n * default ports. We want clicking \"Linear\" to flag the entry as\n * installed even if the user pasted the URL with extra trailing slash\n * or a different port-equivalent variant.\n *\n * Defensive against runtime data that doesn't match the static type:\n * if either input is not a string (e.g. parsed from an older settings\n * blob), we fall through the URL parsing path and the safe trim\n * fallback below, never calling `.replace` on undefined.\n */\nexport function urlsMatch(a: unknown, b: unknown): boolean {\n  const aStr = typeof a === \"string\" ? a : \"\";\n  const bStr = typeof b === \"string\" ? b : \"\";\n  if (!aStr || !bStr) return false;\n  const left = tryUrl(aStr);\n  const right = tryUrl(bStr);\n  if (!left || !right) {\n    return aStr.replace(/\\/+$/, \"\") === bStr.replace(/\\/+$/, \"\");\n  }\n  return (\n    left.protocol === right.protocol &&\n    left.host === right.host &&\n    left.pathname.replace(/\\/+$/, \"\") === right.pathname.replace(/\\/+$/, \"\")\n  );\n}\n\n/**\n * Decide whether a marketplace template is already represented by one\n * of the installed MCP servers. Used to render an \"Installed\" badge on\n * the marketplace tile. Returns the first matching server, or null.\n */\nexport function findInstalledMatch(\n  transport: IntegrationTransport,\n  servers: MCPServerConfig[],\n): MCPServerConfig | null {\n  return (\n    servers.find((server) => transportMatchesServer(transport, server)) ?? null\n  );\n}\n\nexport function findInstalledEntryMatch(\n  entry: MarketplaceEntry,\n  servers: MCPServerConfig[],\n): MCPServerConfig | null {\n  for (const option of getMcpConnectionOptions(entry)) {\n    const match = findInstalledMatch(option.transport, servers);\n    if (match) return match;\n  }\n  return null;\n}\n\nfunction transportMatchesServer(\n  transport: IntegrationTransport,\n  server: MCPServerConfig,\n): boolean {\n  if (transport.kind === \"shttp\") {\n    const tplUrl = transport.url;\n    return (\n      server.type === \"shttp\" && !!server.url && urlsMatch(server.url, tplUrl)\n    );\n  }\n\n  if (transport.kind === \"sse\") {\n    const tplUrl = transport.url;\n    return (\n      server.type === \"sse\" && !!server.url && urlsMatch(server.url, tplUrl)\n    );\n  }\n\n  // stdio: match on the registered server name.\n  return server.type === \"stdio\" && server.name === transport.serverName;\n}\n\nexport function isMarketplaceEntryAvailable(\n  entry: MarketplaceEntry,\n  backendKind: \"local\" | \"cloud\",\n): boolean {\n  if (!entry.runtimeAvailability || entry.runtimeAvailability === \"all\")\n    return true;\n  return entry.runtimeAvailability === backendKind;\n}\n\nfunction normalize(query: string): string {\n  return query.trim().toLowerCase();\n}\n\n/**\n * Case-insensitive substring match against the catalog entry's\n * user-visible identity (name, description, id, keywords). Empty\n * queries always match.\n */\nexport function getMarketplaceEntriesByPopularity(\n  catalog: MarketplaceEntry[],\n): MarketplaceEntry[] {\n  return catalog\n    .map((entry, index) => ({ entry, index }))\n    .sort((a, b) => {\n      const byPopularity =\n        (b.entry.popularityRank ?? 0) - (a.entry.popularityRank ?? 0);\n      return byPopularity || a.index - b.index;\n    })\n    .map(({ entry }) => entry);\n}\n\nexport function getMarketplaceEntryById(\n  id: string,\n  catalog: MarketplaceEntry[],\n): MarketplaceEntry | undefined {\n  return catalog.find((entry) => entry.id === id);\n}\n\nexport function marketplaceEntryMatchesQuery(\n  entry: MarketplaceEntry,\n  rawQuery: string,\n): boolean {\n  const q = normalize(rawQuery);\n  if (!q) return true;\n  const haystack = [\n    entry.name,\n    entry.description,\n    entry.id,\n    ...(entry.keywords ?? []),\n  ]\n    .join(\" \")\n    .toLowerCase();\n  return haystack.includes(q);\n}\n\n/**\n * Search match for an installed (already-configured) server. We\n * search the server's own identifying fields and — if it's a catalog\n * entry — its catalog name/keywords too, so typing \"Slack\" matches\n * the installed Slack tile even though the persisted server is just\n * `{ type: \"stdio\", name: \"slack\", ... }`.\n */\nexport function installedServerMatchesQuery(\n  server: MCPServerConfig,\n  catalogEntry: MarketplaceEntry | undefined,\n  rawQuery: string,\n): boolean {\n  const q = normalize(rawQuery);\n  if (!q) return true;\n  const haystack = [\n    server.type,\n    \"name\" in server ? server.name : undefined,\n    \"command\" in server ? server.command : undefined,\n    \"args\" in server ? server.args?.join(\" \") : undefined,\n    \"url\" in server ? server.url : undefined,\n    catalogEntry?.name,\n    catalogEntry?.description,\n    catalogEntry?.id,\n    ...(catalogEntry?.keywords ?? []),\n  ]\n    .filter(Boolean)\n    .join(\" \")\n    .toLowerCase();\n  return haystack.includes(q);\n}\n\n/**\n * Look up the catalog entry that best matches an installed server.\n * Mirrors the lookup used in `installed-server-card.tsx` for\n * rendering the friendly icon.\n */\nexport function findCatalogEntryForServer(\n  server: MCPServerConfig,\n  catalog: MarketplaceEntry[],\n): MarketplaceEntry | undefined {\n  return catalog.find((entry) => {\n    // Check every MCP option rather than only the default. Some unified\n    // integration entries default to OAuth-hosted MCP while still exposing\n    // an API/stdio option; existing installed servers should match either.\n    return getMcpConnectionOptions(entry).some((option) =>\n      transportMatchesServer(option.transport, server),\n    );\n  });\n}\n"],"mappings":"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"}
+{"version":3,"file":"mcp-marketplace-utils.cjs","names":[],"sources":["../../src/utils/mcp-marketplace-utils.ts"],"sourcesContent":["import { MCPServerConfig } from \"#/types/mcp-server\";\nimport type {\n  IntegrationAuthConfig,\n  IntegrationCatalogEntry as MarketplaceEntry,\n  IntegrationConnectionOption,\n  IntegrationTransport,\n} from \"@openhands/extensions/integrations\";\n\nexport type { MarketplaceEntry };\n\ntype McpIntegrationAuthConfig = IntegrationAuthConfig & {\n  credentialSecretName?: string;\n  saveCredentialAsSecretByDefault?: boolean;\n};\n\nexport type McpMarketplaceConnectionOption = Omit<\n  IntegrationConnectionOption,\n  \"auth\" | \"provider\" | \"transport\"\n> & {\n  provider: \"mcp\";\n  transport: IntegrationTransport;\n  auth: McpIntegrationAuthConfig;\n};\n\nexport function getMcpConnectionOptions(\n  entry: MarketplaceEntry,\n): McpMarketplaceConnectionOption[] {\n  return entry.connectionOptions.filter(\n    (option): option is McpMarketplaceConnectionOption =>\n      option.provider === \"mcp\" && !!option.transport,\n  );\n}\n\nexport function getDefaultMcpConnectionOption(\n  entry: MarketplaceEntry,\n): McpMarketplaceConnectionOption | undefined {\n  const options = getMcpConnectionOptions(entry);\n  return (\n    options.find((option) => option.id === entry.defaultConnectionOptionId) ??\n    options[0]\n  );\n}\n\nfunction isLocallyInstallableMcpOption(\n  option: McpMarketplaceConnectionOption,\n): boolean {\n  // The local install modal writes static MCP server config. OAuth options\n  // describe hosted redirect flows, so prefer an API/stdio fallback when one\n  // exists and leave OAuth as the default connection for hosted integrations.\n  return option.auth.strategy !== \"oauth2\";\n}\n\nexport function getInstallableMcpConnectionOption(\n  entry: MarketplaceEntry,\n): McpMarketplaceConnectionOption | undefined {\n  const options = getMcpConnectionOptions(entry);\n  const defaultOption = options.find(\n    (option) => option.id === entry.defaultConnectionOptionId,\n  );\n  if (defaultOption && isLocallyInstallableMcpOption(defaultOption)) {\n    return defaultOption;\n  }\n  return options.find(isLocallyInstallableMcpOption);\n}\n\nexport function getDefaultMcpTransport(\n  entry: MarketplaceEntry,\n): IntegrationTransport | undefined {\n  return getDefaultMcpConnectionOption(entry)?.transport;\n}\n\nconst LINEAR_DEPRECATED_SSE_URL = \"https://mcp.linear.app/sse\";\nconst LINEAR_SHTTP_URL = \"https://mcp.linear.app/mcp\";\nconst LINEAR_DOCS_URL = \"https://linear.app/docs/mcp\";\n\n/**\n * Upstream @openhands/extensions still ships Linear's deprecated SSE\n * transport (removed upstream on 2026-04-08; the /sse endpoint now\n * rejects every call). Rewrite the entry to streamable HTTP at the\n * /mcp replacement endpoint until the pinned dependency catches up.\n *\n * The /mcp endpoint authenticates via OAuth 2.1 or a Linear API key\n * sent as \"Authorization: Bearer <token>\". This client has no\n * interactive OAuth flow for MCP installs, so switch the auth\n * strategy from \"none\" to \"bearer\" — the install modal then offers\n * an (optional) API key field and the agent server forwards it as a\n * Bearer header.\n *\n * Patches immutably — the imported catalog JSON is shared module\n * state and must not be mutated.\n */\nfunction patchLinearEntry(entry: MarketplaceEntry): MarketplaceEntry {\n  if (entry.id !== \"linear\") return entry;\n  return {\n    ...entry,\n    docsUrl: LINEAR_DOCS_URL,\n    installHint:\n      \"Authenticate with a Linear API key (Linear → Settings → Security & access) — sent as a Bearer token. Optional when the endpoint accepts your OAuth session.\",\n    connectionOptions: entry.connectionOptions.map((option) =>\n      option.transport?.kind === \"sse\" &&\n      urlsMatch(option.transport.url, LINEAR_DEPRECATED_SSE_URL)\n        ? {\n            ...option,\n            auth: { ...option.auth, strategy: \"bearer\" as const },\n            transport: {\n              kind: \"shttp\" as const,\n              url: LINEAR_SHTTP_URL,\n              apiKeyOptional: option.transport.apiKeyOptional,\n            },\n          }\n        : option,\n    ),\n  };\n}\n\nexport function getMcpMarketplaceCatalog(\n  catalog: MarketplaceEntry[],\n): MarketplaceEntry[] {\n  return catalog\n    .map(patchLinearEntry)\n    .filter((entry) => !!getDefaultMcpConnectionOption(entry));\n}\n\nconst tryUrl = (raw: string): URL | null => {\n  try {\n    return new URL(raw);\n  } catch {\n    return null;\n  }\n};\n\n/**\n * Loose URL match that ignores query strings, trailing slashes, and\n * default ports. We want clicking \"Linear\" to flag the entry as\n * installed even if the user pasted the URL with extra trailing slash\n * or a different port-equivalent variant.\n *\n * Defensive against runtime data that doesn't match the static type:\n * if either input is not a string (e.g. parsed from an older settings\n * blob), we fall through the URL parsing path and the safe trim\n * fallback below, never calling `.replace` on undefined.\n */\nexport function urlsMatch(a: unknown, b: unknown): boolean {\n  const aStr = typeof a === \"string\" ? a : \"\";\n  const bStr = typeof b === \"string\" ? b : \"\";\n  if (!aStr || !bStr) return false;\n  const left = tryUrl(aStr);\n  const right = tryUrl(bStr);\n  if (!left || !right) {\n    return aStr.replace(/\\/+$/, \"\") === bStr.replace(/\\/+$/, \"\");\n  }\n  return (\n    left.protocol === right.protocol &&\n    left.host === right.host &&\n    left.pathname.replace(/\\/+$/, \"\") === right.pathname.replace(/\\/+$/, \"\")\n  );\n}\n\n/**\n * Decide whether a marketplace template is already represented by one\n * of the installed MCP servers. Used to render an \"Installed\" badge on\n * the marketplace tile. Returns the first matching server, or null.\n */\nexport function findInstalledMatch(\n  transport: IntegrationTransport,\n  servers: MCPServerConfig[],\n): MCPServerConfig | null {\n  return (\n    servers.find((server) => transportMatchesServer(transport, server)) ?? null\n  );\n}\n\nexport function findInstalledEntryMatch(\n  entry: MarketplaceEntry,\n  servers: MCPServerConfig[],\n): MCPServerConfig | null {\n  for (const option of getMcpConnectionOptions(entry)) {\n    const match = findInstalledMatch(option.transport, servers);\n    if (match) return match;\n  }\n  return null;\n}\n\nfunction transportMatchesServer(\n  transport: IntegrationTransport,\n  server: MCPServerConfig,\n): boolean {\n  if (transport.kind === \"shttp\") {\n    const tplUrl = transport.url;\n    return (\n      server.type === \"shttp\" && !!server.url && urlsMatch(server.url, tplUrl)\n    );\n  }\n\n  if (transport.kind === \"sse\") {\n    const tplUrl = transport.url;\n    return (\n      server.type === \"sse\" && !!server.url && urlsMatch(server.url, tplUrl)\n    );\n  }\n\n  // stdio: match on the registered server name.\n  return server.type === \"stdio\" && server.name === transport.serverName;\n}\n\nexport function isMarketplaceEntryAvailable(\n  entry: MarketplaceEntry,\n  backendKind: \"local\" | \"cloud\",\n): boolean {\n  if (!entry.runtimeAvailability || entry.runtimeAvailability === \"all\")\n    return true;\n  return entry.runtimeAvailability === backendKind;\n}\n\nfunction normalize(query: string): string {\n  return query.trim().toLowerCase();\n}\n\n/**\n * Case-insensitive substring match against the catalog entry's\n * user-visible identity (name, description, id, keywords). Empty\n * queries always match.\n */\nexport function getMarketplaceEntriesByPopularity(\n  catalog: MarketplaceEntry[],\n): MarketplaceEntry[] {\n  return catalog\n    .map((entry, index) => ({ entry, index }))\n    .sort((a, b) => {\n      const byPopularity =\n        (b.entry.popularityRank ?? 0) - (a.entry.popularityRank ?? 0);\n      return byPopularity || a.index - b.index;\n    })\n    .map(({ entry }) => entry);\n}\n\nexport function getMarketplaceEntryById(\n  id: string,\n  catalog: MarketplaceEntry[],\n): MarketplaceEntry | undefined {\n  return catalog.find((entry) => entry.id === id);\n}\n\nexport function marketplaceEntryMatchesQuery(\n  entry: MarketplaceEntry,\n  rawQuery: string,\n): boolean {\n  const q = normalize(rawQuery);\n  if (!q) return true;\n  const haystack = [\n    entry.name,\n    entry.description,\n    entry.id,\n    ...(entry.keywords ?? []),\n  ]\n    .join(\" \")\n    .toLowerCase();\n  return haystack.includes(q);\n}\n\n/**\n * Search match for an installed (already-configured) server. We\n * search the server's own identifying fields and — if it's a catalog\n * entry — its catalog name/keywords too, so typing \"Slack\" matches\n * the installed Slack tile even though the persisted server is just\n * `{ type: \"stdio\", name: \"slack\", ... }`.\n */\nexport function installedServerMatchesQuery(\n  server: MCPServerConfig,\n  catalogEntry: MarketplaceEntry | undefined,\n  rawQuery: string,\n): boolean {\n  const q = normalize(rawQuery);\n  if (!q) return true;\n  const haystack = [\n    server.type,\n    \"name\" in server ? server.name : undefined,\n    \"command\" in server ? server.command : undefined,\n    \"args\" in server ? server.args?.join(\" \") : undefined,\n    \"url\" in server ? server.url : undefined,\n    catalogEntry?.name,\n    catalogEntry?.description,\n    catalogEntry?.id,\n    ...(catalogEntry?.keywords ?? []),\n  ]\n    .filter(Boolean)\n    .join(\" \")\n    .toLowerCase();\n  return haystack.includes(q);\n}\n\n/**\n * Look up the catalog entry that best matches an installed server.\n * Mirrors the lookup used in `installed-server-card.tsx` for\n * rendering the friendly icon.\n */\nexport function findCatalogEntryForServer(\n  server: MCPServerConfig,\n  catalog: MarketplaceEntry[],\n): MarketplaceEntry | undefined {\n  return catalog.find((entry) => {\n    // Check every MCP option rather than only the default. Some unified\n    // integration entries default to OAuth-hosted MCP while still exposing\n    // an API/stdio option; existing installed servers should match either.\n    return getMcpConnectionOptions(entry).some((option) =>\n      transportMatchesServer(option.transport, server),\n    );\n  });\n}\n"],"mappings":"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"}

package/dist/utils/mcp-marketplace-utils.d.ts

@@ -1,9 +1,14 @@
 import { MCPServerConfig } from "#/types/mcp-server";
-import type { IntegrationCatalogEntry as MarketplaceEntry, IntegrationConnectionOption, IntegrationTransport } from "@openhands/extensions/integrations";
+import type { IntegrationAuthConfig, IntegrationCatalogEntry as MarketplaceEntry, IntegrationConnectionOption, IntegrationTransport } from "@openhands/extensions/integrations";
 export type { MarketplaceEntry };
-export type McpMarketplaceConnectionOption = IntegrationConnectionOption & {
+type McpIntegrationAuthConfig = IntegrationAuthConfig & {
+    credentialSecretName?: string;
+    saveCredentialAsSecretByDefault?: boolean;
+};
+export type McpMarketplaceConnectionOption = Omit<IntegrationConnectionOption, "auth" | "provider" | "transport"> & {
     provider: "mcp";
     transport: IntegrationTransport;
+    auth: McpIntegrationAuthConfig;
 };
 export declare function getMcpConnectionOptions(entry: MarketplaceEntry): McpMarketplaceConnectionOption[];
 export declare function getDefaultMcpConnectionOption(entry: MarketplaceEntry): McpMarketplaceConnectionOption | undefined;

package/dist/utils/mcp-marketplace-utils.js

@@ -1,29 +1,28 @@
-import { getDeploymentMode as e } from "../api/agent-server-adapter.js";
 //#region src/utils/mcp-marketplace-utils.ts
-function t(e) {
+function e(e) {
 	return e.connectionOptions.filter((e) => e.provider === "mcp" && !!e.transport);
 }
-function n(e) {
-	let n = t(e);
-	return n.find((t) => t.id === e.defaultConnectionOptionId) ?? n[0];
+function t(t) {
+	let n = e(t);
+	return n.find((e) => e.id === t.defaultConnectionOptionId) ?? n[0];
 }
-function r(e) {
+function n(e) {
 	return e.auth.strategy !== "oauth2";
 }
-function i(e) {
-	let n = t(e), i = n.find((t) => t.id === e.defaultConnectionOptionId);
-	return i && r(i) ? i : n.find(r);
+function r(t) {
+	let r = e(t), i = r.find((e) => e.id === t.defaultConnectionOptionId);
+	return i && n(i) ? i : r.find(n);
 }
-function a(e) {
-	return n(e)?.transport;
+function i(e) {
+	return t(e)?.transport;
 }
-var o = "https://mcp.linear.app/sse", s = "https://mcp.linear.app/mcp", c = "https://linear.app/docs/mcp";
-function l(e) {
+var a = "https://mcp.linear.app/sse", o = "https://mcp.linear.app/mcp", s = "https://linear.app/docs/mcp";
+function c(e) {
 	return e.id === "linear" ? {
 		...e,
-		docsUrl: c,
+		docsUrl: s,
 		installHint: "Authenticate with a Linear API key (Linear → Settings → Security & access) — sent as a Bearer token. Optional when the endpoint accepts your OAuth session.",
-		connectionOptions: e.connectionOptions.map((e) => e.transport?.kind === "sse" && p(e.transport.url, o) ? {
+		connectionOptions: e.connectionOptions.map((e) => e.transport?.kind === "sse" && d(e.transport.url, a) ? {
 			...e,
 			auth: {
 				...e.auth,
@@ -31,67 +30,53 @@ function l(e) {
 			},
 			transport: {
 				kind: "shttp",
-				url: s,
+				url: o,
 				apiKeyOptional: e.transport.apiKeyOptional
 			}
 		} : e)
 	} : e;
 }
-function u(t) {
-	return t.id !== "github" || e() !== "docker" ? t : {
-		...t,
-		installHint: "Requires a GitHub Personal Access Token (classic or fine-grained).",
-		connectionOptions: t.connectionOptions.map((e) => e.transport?.kind === "stdio" && e.transport.command === "docker" ? {
-			...e,
-			transport: {
-				...e.transport,
-				command: "github-mcp-server",
-				args: ["stdio"]
-			}
-		} : e)
-	};
-}
-function d(e) {
-	return e.map(l).map(u).filter((e) => !!n(e));
+function l(e) {
+	return e.map(c).filter((e) => !!t(e));
 }
-var f = (e) => {
+var u = (e) => {
 	try {
 		return new URL(e);
 	} catch {
 		return null;
 	}
 };
-function p(e, t) {
+function d(e, t) {
 	let n = typeof e == "string" ? e : "", r = typeof t == "string" ? t : "";
 	if (!n || !r) return !1;
-	let i = f(n), a = f(r);
+	let i = u(n), a = u(r);
 	return !i || !a ? n.replace(/\/+$/, "") === r.replace(/\/+$/, "") : i.protocol === a.protocol && i.host === a.host && i.pathname.replace(/\/+$/, "") === a.pathname.replace(/\/+$/, "");
 }
-function m(e, t) {
+function f(e, t) {
 	if (e.kind === "shttp") {
 		let n = e.url;
-		return t.type === "shttp" && !!t.url && p(t.url, n);
+		return t.type === "shttp" && !!t.url && d(t.url, n);
 	}
 	if (e.kind === "sse") {
 		let n = e.url;
-		return t.type === "sse" && !!t.url && p(t.url, n);
+		return t.type === "sse" && !!t.url && d(t.url, n);
 	}
 	return t.type === "stdio" && t.name === e.serverName;
 }
-function h(e, t) {
+function p(e, t) {
 	return !e.runtimeAvailability || e.runtimeAvailability === "all" ? !0 : e.runtimeAvailability === t;
 }
-function g(e) {
+function m(e) {
 	return e.trim().toLowerCase();
 }
-function _(e) {
+function h(e) {
 	return e.map((e, t) => ({
 		entry: e,
 		index: t
 	})).sort((e, t) => (t.entry.popularityRank ?? 0) - (e.entry.popularityRank ?? 0) || e.index - t.index).map(({ entry: e }) => e);
 }
-function v(e, t) {
-	let n = g(t);
+function g(e, t) {
+	let n = m(t);
 	return n ? [
 		e.name,
 		e.description,
@@ -99,8 +84,8 @@ function v(e, t) {
 		...e.keywords ?? []
 	].join(" ").toLowerCase().includes(n) : !0;
 }
-function y(e, t, n) {
-	let r = g(n);
+function _(e, t, n) {
+	let r = m(n);
 	return r ? [
 		e.type,
 		"name" in e ? e.name : void 0,
@@ -113,10 +98,10 @@ function y(e, t, n) {
 		...t?.keywords ?? []
 	].filter(Boolean).join(" ").toLowerCase().includes(r) : !0;
 }
-function b(e, n) {
-	return n.find((n) => t(n).some((t) => m(t.transport, e)));
+function v(t, n) {
+	return n.find((n) => e(n).some((e) => f(e.transport, t)));
 }
 //#endregion
-export { b as findCatalogEntryForServer, a as getDefaultMcpTransport, i as getInstallableMcpConnectionOption, _ as getMarketplaceEntriesByPopularity, d as getMcpMarketplaceCatalog, y as installedServerMatchesQuery, h as isMarketplaceEntryAvailable, v as marketplaceEntryMatchesQuery };
+export { v as findCatalogEntryForServer, i as getDefaultMcpTransport, r as getInstallableMcpConnectionOption, h as getMarketplaceEntriesByPopularity, l as getMcpMarketplaceCatalog, _ as installedServerMatchesQuery, p as isMarketplaceEntryAvailable, g as marketplaceEntryMatchesQuery };
 
 //# sourceMappingURL=mcp-marketplace-utils.js.map