@openhands/agent-canvas 1.0.0-rc.1 → 1.0.0-rc.3

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

@@ -16,47 +16,67 @@ function r(t) {
 function i(e) {
 	return t(e)?.transport;
 }
-function a(e) {
-	return e.filter((e) => !!t(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: 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;
 }
-var o = (e) => {
+function l(e) {
+	return e.map(c).filter((e) => !!t(e));
+}
+var u = (e) => {
 	try {
 		return new URL(e);
 	} catch {
 		return null;
 	}
 };
-function s(e, t) {
+function d(e, t) {
 	let n = typeof e == "string" ? e : "", r = typeof t == "string" ? t : "";
 	if (!n || !r) return !1;
-	let i = o(n), a = o(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 c(e, t) {
+function f(e, t) {
 	if (e.kind === "shttp") {
 		let n = e.url;
-		return t.type === "shttp" && !!t.url && s(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 && s(t.url, n);
+		return t.type === "sse" && !!t.url && d(t.url, n);
 	}
 	return t.type === "stdio" && t.name === e.serverName;
 }
-function l(e, t) {
+function p(e, t) {
 	return !e.runtimeAvailability || e.runtimeAvailability === "all" ? !0 : e.runtimeAvailability === t;
 }
-function u(e) {
+function m(e) {
 	return e.trim().toLowerCase();
 }
-function d(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 f(e, t) {
-	let n = u(t);
+function g(e, t) {
+	let n = m(t);
 	return n ? [
 		e.name,
 		e.description,
@@ -64,8 +84,8 @@ function f(e, t) {
 		...e.keywords ?? []
 	].join(" ").toLowerCase().includes(n) : !0;
 }
-function p(e, t, n) {
-	let r = u(n);
+function _(e, t, n) {
+	let r = m(n);
 	return r ? [
 		e.type,
 		"name" in e ? e.name : void 0,
@@ -78,10 +98,10 @@ function p(e, t, n) {
 		...t?.keywords ?? []
 	].filter(Boolean).join(" ").toLowerCase().includes(r) : !0;
 }
-function m(t, n) {
-	return n.find((n) => e(n).some((e) => c(e.transport, t)));
+function v(t, n) {
+	return n.find((n) => e(n).some((e) => f(e.transport, t)));
 }
 //#endregion
-export { m as findCatalogEntryForServer, i as getDefaultMcpTransport, r as getInstallableMcpConnectionOption, d as getMarketplaceEntriesByPopularity, a as getMcpMarketplaceCatalog, p as installedServerMatchesQuery, l as isMarketplaceEntryAvailable, f 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

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

@@ -1 +1 @@
-{"version":3,"file":"mcp-marketplace-utils.js","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\";\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\nexport function getMcpMarketplaceCatalog(\n  catalog: MarketplaceEntry[],\n): MarketplaceEntry[] {\n  return catalog.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":";AAcA,SAAgB,EACd,GACkC;AAClC,QAAO,EAAM,kBAAkB,QAC5B,MACC,EAAO,aAAa,SAAS,CAAC,CAAC,EAAO,UACzC;;AAGH,SAAgB,EACd,GAC4C;CAC5C,IAAM,IAAU,EAAwB,EAAM;AAC9C,QACE,EAAQ,MAAM,MAAW,EAAO,OAAO,EAAM,0BAA0B,IACvE,EAAQ;;AAIZ,SAAS,EACP,GACS;AAIT,QAAO,EAAO,KAAK,aAAa;;AAGlC,SAAgB,EACd,GAC4C;CAC5C,IAAM,IAAU,EAAwB,EAAM,EACxC,IAAgB,EAAQ,MAC3B,MAAW,EAAO,OAAO,EAAM,0BACjC;AAID,QAHI,KAAiB,EAA8B,EAAc,GACxD,IAEF,EAAQ,KAAK,EAA8B;;AAGpD,SAAgB,EACd,GACkC;AAClC,QAAO,EAA8B,EAAM,EAAE;;AAG/C,SAAgB,EACd,GACoB;AACpB,QAAO,EAAQ,QAAQ,MAAU,CAAC,CAAC,EAA8B,EAAM,CAAC;;AAG1E,IAAM,KAAU,MAA4B;AAC1C,KAAI;AACF,SAAO,IAAI,IAAI,EAAI;SACb;AACN,SAAO;;;AAeX,SAAgB,EAAU,GAAY,GAAqB;CACzD,IAAM,IAAO,OAAO,KAAM,WAAW,IAAI,IACnC,IAAO,OAAO,KAAM,WAAW,IAAI;AACzC,KAAI,CAAC,KAAQ,CAAC,EAAM,QAAO;CAC3B,IAAM,IAAO,EAAO,EAAK,EACnB,IAAQ,EAAO,EAAK;AAI1B,QAHI,CAAC,KAAQ,CAAC,IACL,EAAK,QAAQ,QAAQ,GAAG,KAAK,EAAK,QAAQ,QAAQ,GAAG,GAG5D,EAAK,aAAa,EAAM,YACxB,EAAK,SAAS,EAAM,QACpB,EAAK,SAAS,QAAQ,QAAQ,GAAG,KAAK,EAAM,SAAS,QAAQ,QAAQ,GAAG;;AA6B5E,SAAS,EACP,GACA,GACS;AACT,KAAI,EAAU,SAAS,SAAS;EAC9B,IAAM,IAAS,EAAU;AACzB,SACE,EAAO,SAAS,WAAW,CAAC,CAAC,EAAO,OAAO,EAAU,EAAO,KAAK,EAAO;;AAI5E,KAAI,EAAU,SAAS,OAAO;EAC5B,IAAM,IAAS,EAAU;AACzB,SACE,EAAO,SAAS,SAAS,CAAC,CAAC,EAAO,OAAO,EAAU,EAAO,KAAK,EAAO;;AAK1E,QAAO,EAAO,SAAS,WAAW,EAAO,SAAS,EAAU;;AAG9D,SAAgB,EACd,GACA,GACS;AAGT,QAFI,CAAC,EAAM,uBAAuB,EAAM,wBAAwB,QACvD,KACF,EAAM,wBAAwB;;AAGvC,SAAS,EAAU,GAAuB;AACxC,QAAO,EAAM,MAAM,CAAC,aAAa;;AAQnC,SAAgB,EACd,GACoB;AACpB,QAAO,EACJ,KAAK,GAAO,OAAW;EAAE;EAAO;EAAO,EAAE,CACzC,MAAM,GAAG,OAEL,EAAE,MAAM,kBAAkB,MAAM,EAAE,MAAM,kBAAkB,MACtC,EAAE,QAAQ,EAAE,MACnC,CACD,KAAK,EAAE,eAAY,EAAM;;AAU9B,SAAgB,EACd,GACA,GACS;CACT,IAAM,IAAI,EAAU,EAAS;AAU7B,QATK,IACY;EACf,EAAM;EACN,EAAM;EACN,EAAM;EACN,GAAI,EAAM,YAAY,EAAE;EACzB,CACE,KAAK,IAAI,CACT,aACI,CAAS,SAAS,EAAE,GATZ;;AAmBjB,SAAgB,EACd,GACA,GACA,GACS;CACT,IAAM,IAAI,EAAU,EAAS;AAgB7B,QAfK,IACY;EACf,EAAO;EACP,UAAU,IAAS,EAAO,OAAO,KAAA;EACjC,aAAa,IAAS,EAAO,UAAU,KAAA;EACvC,UAAU,IAAS,EAAO,MAAM,KAAK,IAAI,GAAG,KAAA;EAC5C,SAAS,IAAS,EAAO,MAAM,KAAA;EAC/B,GAAc;EACd,GAAc;EACd,GAAc;EACd,GAAI,GAAc,YAAY,EAAE;EACjC,CACE,OAAO,QAAQ,CACf,KAAK,IAAI,CACT,aACI,CAAS,SAAS,EAAE,GAfZ;;AAuBjB,SAAgB,EACd,GACA,GAC8B;AAC9B,QAAO,EAAQ,MAAM,MAIZ,EAAwB,EAAM,CAAC,MAAM,MAC1C,EAAuB,EAAO,WAAW,EAAO,CACjD,CACD"}
+{"version":3,"file":"mcp-marketplace-utils.js","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\";\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\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/normalize-display-model.cjs

@@ -1,2 +1,2 @@
-require(`../_virtual/_rolldown/runtime.cjs`);var e=new Set([`https://llm-proxy.app.all-hands.dev`,`https://llm-proxy.app.all-hands.dev/v1`]),t=`litellm_proxy/`,n=e=>e.trim().replace(/\/+$/,``);function r(r,i,a){if(!r)return``;if(!r.startsWith(t)||!i||!e.has(n(i)))return r;let o=r.slice(14);return a.includes(o)?`openhands/${o}`:r}exports.normalizeDisplayModel=r;
+require(`../_virtual/_rolldown/runtime.cjs`);const e=require(`./openhands-llm.cjs`);var t=`litellm_proxy/`;function n(n,r,i){if(!n)return``;if(!n.startsWith(t)||!e.isOpenHandsProxyBaseUrl(r))return n;let a=n.slice(14);return i.includes(a)?`openhands/${a}`:n}exports.normalizeDisplayModel=n;
 //# sourceMappingURL=normalize-display-model.cjs.map

package/dist/utils/normalize-display-model.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-display-model.cjs","names":[],"sources":["../../src/utils/normalize-display-model.ts"],"sourcesContent":["const OPENHANDS_PROXY_BASE_URLS = new Set([\n  \"https://llm-proxy.app.all-hands.dev\",\n  \"https://llm-proxy.app.all-hands.dev/v1\",\n]);\n\nconst LITELLM_PROXY_PREFIX = \"litellm_proxy/\";\n\nconst stripTrailingSlashes = (value: string) =>\n  value.trim().replace(/\\/+$/, \"\");\n\n/**\n * Reverse the SDK's `openhands/* -> litellm_proxy/*` rewrite for display.\n *\n * The agent-server's LLM validator stores curated OpenHands models as\n * `litellm_proxy/<m>` against the All-Hands proxy base URL. Without\n * normalization the GUI re-loads such settings as `litellm_proxy`, so the\n * provider dropdown silently switches off \"OpenHands\" after every save.\n */\nexport function normalizeDisplayModel(\n  rawModel: string | null | undefined,\n  baseUrl: string | null | undefined,\n  openhandsVerifiedModels: readonly string[],\n): string {\n  if (!rawModel) return \"\";\n  if (!rawModel.startsWith(LITELLM_PROXY_PREFIX)) return rawModel;\n  if (!baseUrl) return rawModel;\n  if (!OPENHANDS_PROXY_BASE_URLS.has(stripTrailingSlashes(baseUrl))) {\n    return rawModel;\n  }\n  const modelName = rawModel.slice(LITELLM_PROXY_PREFIX.length);\n  if (!openhandsVerifiedModels.includes(modelName)) return rawModel;\n  return `openhands/${modelName}`;\n}\n"],"mappings":"6CAAA,IAAM,EAA4B,IAAI,IAAI,CACxC,sCACA,yCACD,CAAC,CAEI,EAAuB,iBAEvB,EAAwB,GAC5B,EAAM,MAAM,CAAC,QAAQ,OAAQ,GAAG,CAUlC,SAAgB,EACd,EACA,EACA,EACQ,CACR,GAAI,CAAC,EAAU,MAAO,GAGtB,GAFI,CAAC,EAAS,WAAW,EAAqB,EAC1C,CAAC,GACD,CAAC,EAA0B,IAAI,EAAqB,EAAQ,CAAC,CAC/D,OAAO,EAET,IAAM,EAAY,EAAS,MAAM,GAA4B,CAE7D,OADK,EAAwB,SAAS,EAAU,CACzC,aAAa,IADqC"}
+{"version":3,"file":"normalize-display-model.cjs","names":[],"sources":["../../src/utils/normalize-display-model.ts"],"sourcesContent":["import { isOpenHandsProxyBaseUrl } from \"#/utils/openhands-llm\";\n\nconst LITELLM_PROXY_PREFIX = \"litellm_proxy/\";\n\n/**\n * Reverse the SDK's `openhands/* -> litellm_proxy/*` rewrite for display.\n *\n * The agent-server's LLM validator stores curated OpenHands models as\n * `litellm_proxy/<m>` against the All-Hands proxy base URL. Without\n * normalization the GUI re-loads such settings as `litellm_proxy`, so the\n * provider dropdown silently switches off \"OpenHands\" after every save.\n */\nexport function normalizeDisplayModel(\n  rawModel: string | null | undefined,\n  baseUrl: string | null | undefined,\n  openhandsVerifiedModels: readonly string[],\n): string {\n  if (!rawModel) return \"\";\n  if (!rawModel.startsWith(LITELLM_PROXY_PREFIX)) return rawModel;\n  if (!isOpenHandsProxyBaseUrl(baseUrl)) return rawModel;\n  const modelName = rawModel.slice(LITELLM_PROXY_PREFIX.length);\n  if (!openhandsVerifiedModels.includes(modelName)) return rawModel;\n  return `openhands/${modelName}`;\n}\n"],"mappings":"oFAEA,IAAM,EAAuB,iBAU7B,SAAgB,EACd,EACA,EACA,EACQ,CACR,GAAI,CAAC,EAAU,MAAO,GAEtB,GADI,CAAC,EAAS,WAAW,EAAqB,EAC1C,CAAC,EAAA,wBAAwB,EAAQ,CAAE,OAAO,EAC9C,IAAM,EAAY,EAAS,MAAM,GAA4B,CAE7D,OADK,EAAwB,SAAS,EAAU,CACzC,aAAa,IADqC"}

package/dist/utils/normalize-display-model.js

@@ -1,12 +1,13 @@
+import { isOpenHandsProxyBaseUrl as e } from "./openhands-llm.js";
 //#region src/utils/normalize-display-model.ts
-var e = new Set(["https://llm-proxy.app.all-hands.dev", "https://llm-proxy.app.all-hands.dev/v1"]), t = "litellm_proxy/", n = (e) => e.trim().replace(/\/+$/, "");
-function r(r, i, a) {
-	if (!r) return "";
-	if (!r.startsWith(t) || !i || !e.has(n(i))) return r;
-	let o = r.slice(14);
-	return a.includes(o) ? `openhands/${o}` : r;
+var t = "litellm_proxy/";
+function n(n, r, i) {
+	if (!n) return "";
+	if (!n.startsWith(t) || !e(r)) return n;
+	let a = n.slice(14);
+	return i.includes(a) ? `openhands/${a}` : n;
 }
 //#endregion
-export { r as normalizeDisplayModel };
+export { n as normalizeDisplayModel };
 
 //# sourceMappingURL=normalize-display-model.js.map

package/dist/utils/normalize-display-model.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-display-model.js","names":[],"sources":["../../src/utils/normalize-display-model.ts"],"sourcesContent":["const OPENHANDS_PROXY_BASE_URLS = new Set([\n  \"https://llm-proxy.app.all-hands.dev\",\n  \"https://llm-proxy.app.all-hands.dev/v1\",\n]);\n\nconst LITELLM_PROXY_PREFIX = \"litellm_proxy/\";\n\nconst stripTrailingSlashes = (value: string) =>\n  value.trim().replace(/\\/+$/, \"\");\n\n/**\n * Reverse the SDK's `openhands/* -> litellm_proxy/*` rewrite for display.\n *\n * The agent-server's LLM validator stores curated OpenHands models as\n * `litellm_proxy/<m>` against the All-Hands proxy base URL. Without\n * normalization the GUI re-loads such settings as `litellm_proxy`, so the\n * provider dropdown silently switches off \"OpenHands\" after every save.\n */\nexport function normalizeDisplayModel(\n  rawModel: string | null | undefined,\n  baseUrl: string | null | undefined,\n  openhandsVerifiedModels: readonly string[],\n): string {\n  if (!rawModel) return \"\";\n  if (!rawModel.startsWith(LITELLM_PROXY_PREFIX)) return rawModel;\n  if (!baseUrl) return rawModel;\n  if (!OPENHANDS_PROXY_BASE_URLS.has(stripTrailingSlashes(baseUrl))) {\n    return rawModel;\n  }\n  const modelName = rawModel.slice(LITELLM_PROXY_PREFIX.length);\n  if (!openhandsVerifiedModels.includes(modelName)) return rawModel;\n  return `openhands/${modelName}`;\n}\n"],"mappings":";AAAA,IAAM,IAA4B,IAAI,IAAI,CACxC,uCACA,yCACD,CAAC,EAEI,IAAuB,kBAEvB,KAAwB,MAC5B,EAAM,MAAM,CAAC,QAAQ,QAAQ,GAAG;AAUlC,SAAgB,EACd,GACA,GACA,GACQ;AACR,KAAI,CAAC,EAAU,QAAO;AAGtB,KAFI,CAAC,EAAS,WAAW,EAAqB,IAC1C,CAAC,KACD,CAAC,EAA0B,IAAI,EAAqB,EAAQ,CAAC,CAC/D,QAAO;CAET,IAAM,IAAY,EAAS,MAAM,GAA4B;AAE7D,QADK,EAAwB,SAAS,EAAU,GACzC,aAAa,MADqC"}
+{"version":3,"file":"normalize-display-model.js","names":[],"sources":["../../src/utils/normalize-display-model.ts"],"sourcesContent":["import { isOpenHandsProxyBaseUrl } from \"#/utils/openhands-llm\";\n\nconst LITELLM_PROXY_PREFIX = \"litellm_proxy/\";\n\n/**\n * Reverse the SDK's `openhands/* -> litellm_proxy/*` rewrite for display.\n *\n * The agent-server's LLM validator stores curated OpenHands models as\n * `litellm_proxy/<m>` against the All-Hands proxy base URL. Without\n * normalization the GUI re-loads such settings as `litellm_proxy`, so the\n * provider dropdown silently switches off \"OpenHands\" after every save.\n */\nexport function normalizeDisplayModel(\n  rawModel: string | null | undefined,\n  baseUrl: string | null | undefined,\n  openhandsVerifiedModels: readonly string[],\n): string {\n  if (!rawModel) return \"\";\n  if (!rawModel.startsWith(LITELLM_PROXY_PREFIX)) return rawModel;\n  if (!isOpenHandsProxyBaseUrl(baseUrl)) return rawModel;\n  const modelName = rawModel.slice(LITELLM_PROXY_PREFIX.length);\n  if (!openhandsVerifiedModels.includes(modelName)) return rawModel;\n  return `openhands/${modelName}`;\n}\n"],"mappings":";;AAEA,IAAM,IAAuB;AAU7B,SAAgB,EACd,GACA,GACA,GACQ;AACR,KAAI,CAAC,EAAU,QAAO;AAEtB,KADI,CAAC,EAAS,WAAW,EAAqB,IAC1C,CAAC,EAAwB,EAAQ,CAAE,QAAO;CAC9C,IAAM,IAAY,EAAS,MAAM,GAA4B;AAE7D,QADK,EAAwB,SAAS,EAAU,GACzC,aAAa,MADqC"}

package/dist/utils/openhands-llm.cjs

@@ -1,2 +1,2 @@
-require(`../_virtual/_rolldown/runtime.cjs`);var e=`https://llm-proxy.app.all-hands.dev/`;function t(e){return typeof e==`string`&&e.startsWith(`openhands/`)}exports.OPENHANDS_LLM_PROXY_BASE_URL=e,exports.isOpenHandsProviderModel=t;
+require(`../_virtual/_rolldown/runtime.cjs`);var e=`https://llm-proxy.app.all-hands.dev/`,t=new Set([`https://llm-proxy.app.all-hands.dev`,`https://llm-proxy.app.all-hands.dev/v1`]),n=`litellm_proxy/`;function r(e){return typeof e==`string`&&e.startsWith(`openhands/`)}function i(e){return typeof e==`string`&&t.has(e.trim().replace(/\/+$/,``))}function a(e,t){return r(e)?!0:typeof e==`string`&&e.startsWith(n)&&i(t)}exports.OPENHANDS_LLM_PROXY_BASE_URL=e,exports.isOpenHandsProxyBaseUrl=i,exports.isOpenHandsProxyModel=a;
 //# sourceMappingURL=openhands-llm.cjs.map

package/dist/utils/openhands-llm.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"openhands-llm.cjs","names":[],"sources":["../../src/utils/openhands-llm.ts"],"sourcesContent":["export const OPENHANDS_LLM_PROXY_BASE_URL =\n  \"https://llm-proxy.app.all-hands.dev/\";\n\nexport function isOpenHandsProviderModel(model: unknown): model is string {\n  return typeof model === \"string\" && model.startsWith(\"openhands/\");\n}\n"],"mappings":"6CAAA,IAAa,EACX,uCAEF,SAAgB,EAAyB,EAAiC,CACxE,OAAO,OAAO,GAAU,UAAY,EAAM,WAAW,aAAa"}
+{"version":3,"file":"openhands-llm.cjs","names":[],"sources":["../../src/utils/openhands-llm.ts"],"sourcesContent":["export const OPENHANDS_LLM_PROXY_BASE_URL =\n  \"https://llm-proxy.app.all-hands.dev/\";\n\n// Accepted spellings of the All-Hands LiteLLM proxy base URL, normalized\n// without a trailing slash. The agent-server stores curated OpenHands models\n// against one of these once its validator rewrites `openhands/*` to\n// `litellm_proxy/*`.\nconst OPENHANDS_LLM_PROXY_BASE_URLS = new Set([\n  \"https://llm-proxy.app.all-hands.dev\",\n  \"https://llm-proxy.app.all-hands.dev/v1\",\n]);\n\nconst LITELLM_PROXY_PREFIX = \"litellm_proxy/\";\n\nexport function isOpenHandsProviderModel(model: unknown): model is string {\n  return typeof model === \"string\" && model.startsWith(\"openhands/\");\n}\n\n/**\n * True when `baseUrl` points at the All-Hands LiteLLM proxy, ignoring any\n * trailing slash.\n */\nexport function isOpenHandsProxyBaseUrl(baseUrl: unknown): baseUrl is string {\n  return (\n    typeof baseUrl === \"string\" &&\n    OPENHANDS_LLM_PROXY_BASE_URLS.has(baseUrl.trim().replace(/\\/+$/, \"\"))\n  );\n}\n\n/**\n * True for any OpenHands-backed model: the `openhands/*` id the GUI submits, or\n * the `litellm_proxy/*` id the SDK rewrites it to once it is paired with the\n * OpenHands proxy base URL. Both forms must keep the proxy `base_url` on save —\n * dropping it strips the api_base and silently reroutes the request to the\n * default OpenAI endpoint, leaving an unusable profile (issue #1146).\n */\nexport function isOpenHandsProxyModel(\n  model: unknown,\n  baseUrl: unknown,\n): model is string {\n  if (isOpenHandsProviderModel(model)) return true;\n  return (\n    typeof model === \"string\" &&\n    model.startsWith(LITELLM_PROXY_PREFIX) &&\n    isOpenHandsProxyBaseUrl(baseUrl)\n  );\n}\n"],"mappings":"6CAAA,IAAa,EACX,uCAMI,EAAgC,IAAI,IAAI,CAC5C,sCACA,yCACD,CAAC,CAEI,EAAuB,iBAE7B,SAAgB,EAAyB,EAAiC,CACxE,OAAO,OAAO,GAAU,UAAY,EAAM,WAAW,aAAa,CAOpE,SAAgB,EAAwB,EAAqC,CAC3E,OACE,OAAO,GAAY,UACnB,EAA8B,IAAI,EAAQ,MAAM,CAAC,QAAQ,OAAQ,GAAG,CAAC,CAWzE,SAAgB,EACd,EACA,EACiB,CAEjB,OADI,EAAyB,EAAM,CAAS,GAE1C,OAAO,GAAU,UACjB,EAAM,WAAW,EAAqB,EACtC,EAAwB,EAAQ"}

package/dist/utils/openhands-llm.d.ts

@@ -1,2 +1,15 @@
 export declare const OPENHANDS_LLM_PROXY_BASE_URL = "https://llm-proxy.app.all-hands.dev/";
 export declare function isOpenHandsProviderModel(model: unknown): model is string;
+/**
+ * True when `baseUrl` points at the All-Hands LiteLLM proxy, ignoring any
+ * trailing slash.
+ */
+export declare function isOpenHandsProxyBaseUrl(baseUrl: unknown): baseUrl is string;
+/**
+ * True for any OpenHands-backed model: the `openhands/*` id the GUI submits, or
+ * the `litellm_proxy/*` id the SDK rewrites it to once it is paired with the
+ * OpenHands proxy base URL. Both forms must keep the proxy `base_url` on save —
+ * dropping it strips the api_base and silently reroutes the request to the
+ * default OpenAI endpoint, leaving an unusable profile (issue #1146).
+ */
+export declare function isOpenHandsProxyModel(model: unknown, baseUrl: unknown): model is string;

package/dist/utils/openhands-llm.js

@@ -1,9 +1,15 @@
 //#region src/utils/openhands-llm.ts
-var e = "https://llm-proxy.app.all-hands.dev/";
-function t(e) {
+var e = "https://llm-proxy.app.all-hands.dev/", t = new Set(["https://llm-proxy.app.all-hands.dev", "https://llm-proxy.app.all-hands.dev/v1"]), n = "litellm_proxy/";
+function r(e) {
 	return typeof e == "string" && e.startsWith("openhands/");
 }
+function i(e) {
+	return typeof e == "string" && t.has(e.trim().replace(/\/+$/, ""));
+}
+function a(e, t) {
+	return r(e) ? !0 : typeof e == "string" && e.startsWith(n) && i(t);
+}
 //#endregion
-export { e as OPENHANDS_LLM_PROXY_BASE_URL, t as isOpenHandsProviderModel };
+export { e as OPENHANDS_LLM_PROXY_BASE_URL, i as isOpenHandsProxyBaseUrl, a as isOpenHandsProxyModel };
 
 //# sourceMappingURL=openhands-llm.js.map

package/dist/utils/openhands-llm.js.map

@@ -1 +1 @@
-{"version":3,"file":"openhands-llm.js","names":[],"sources":["../../src/utils/openhands-llm.ts"],"sourcesContent":["export const OPENHANDS_LLM_PROXY_BASE_URL =\n  \"https://llm-proxy.app.all-hands.dev/\";\n\nexport function isOpenHandsProviderModel(model: unknown): model is string {\n  return typeof model === \"string\" && model.startsWith(\"openhands/\");\n}\n"],"mappings":";AAAA,IAAa,IACX;AAEF,SAAgB,EAAyB,GAAiC;AACxE,QAAO,OAAO,KAAU,YAAY,EAAM,WAAW,aAAa"}
+{"version":3,"file":"openhands-llm.js","names":[],"sources":["../../src/utils/openhands-llm.ts"],"sourcesContent":["export const OPENHANDS_LLM_PROXY_BASE_URL =\n  \"https://llm-proxy.app.all-hands.dev/\";\n\n// Accepted spellings of the All-Hands LiteLLM proxy base URL, normalized\n// without a trailing slash. The agent-server stores curated OpenHands models\n// against one of these once its validator rewrites `openhands/*` to\n// `litellm_proxy/*`.\nconst OPENHANDS_LLM_PROXY_BASE_URLS = new Set([\n  \"https://llm-proxy.app.all-hands.dev\",\n  \"https://llm-proxy.app.all-hands.dev/v1\",\n]);\n\nconst LITELLM_PROXY_PREFIX = \"litellm_proxy/\";\n\nexport function isOpenHandsProviderModel(model: unknown): model is string {\n  return typeof model === \"string\" && model.startsWith(\"openhands/\");\n}\n\n/**\n * True when `baseUrl` points at the All-Hands LiteLLM proxy, ignoring any\n * trailing slash.\n */\nexport function isOpenHandsProxyBaseUrl(baseUrl: unknown): baseUrl is string {\n  return (\n    typeof baseUrl === \"string\" &&\n    OPENHANDS_LLM_PROXY_BASE_URLS.has(baseUrl.trim().replace(/\\/+$/, \"\"))\n  );\n}\n\n/**\n * True for any OpenHands-backed model: the `openhands/*` id the GUI submits, or\n * the `litellm_proxy/*` id the SDK rewrites it to once it is paired with the\n * OpenHands proxy base URL. Both forms must keep the proxy `base_url` on save —\n * dropping it strips the api_base and silently reroutes the request to the\n * default OpenAI endpoint, leaving an unusable profile (issue #1146).\n */\nexport function isOpenHandsProxyModel(\n  model: unknown,\n  baseUrl: unknown,\n): model is string {\n  if (isOpenHandsProviderModel(model)) return true;\n  return (\n    typeof model === \"string\" &&\n    model.startsWith(LITELLM_PROXY_PREFIX) &&\n    isOpenHandsProxyBaseUrl(baseUrl)\n  );\n}\n"],"mappings":";AAAA,IAAa,IACX,wCAMI,IAAgC,IAAI,IAAI,CAC5C,uCACA,yCACD,CAAC,EAEI,IAAuB;AAE7B,SAAgB,EAAyB,GAAiC;AACxE,QAAO,OAAO,KAAU,YAAY,EAAM,WAAW,aAAa;;AAOpE,SAAgB,EAAwB,GAAqC;AAC3E,QACE,OAAO,KAAY,YACnB,EAA8B,IAAI,EAAQ,MAAM,CAAC,QAAQ,QAAQ,GAAG,CAAC;;AAWzE,SAAgB,EACd,GACA,GACiB;AAEjB,QADI,EAAyB,EAAM,GAAS,KAE1C,OAAO,KAAU,YACjB,EAAM,WAAW,EAAqB,IACtC,EAAwB,EAAQ"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openhands/agent-canvas",
-  "version": "1.0.0-rc.1",
+  "version": "1.0.0-rc.3",
   "description": "Agent Canvas UI for OpenHands - run AI coding agents with a visual interface",
   "license": "MIT",
   "private": false,
@@ -23,7 +23,7 @@
     "@heroui/react": "2.8.10",
     "@microlink/react-json-view": "1.31.20",
     "@monaco-editor/react": "4.7.0",
-    "@openhands/extensions": "git+https://github.com/OpenHands/extensions.git#62594156a187722344736bc2ff5edfb12c0cc75c",
+    "@openhands/extensions": "github:OpenHands/extensions#8a6690071e0e9229ae70b30ff0352aff9e6fca21",
     "@openhands/typescript-client": "1.24.3",
     "@react-router/node": "7.14.2",
     "@react-router/serve": "7.14.2",

package/scripts/check-sdk-version-sync.mjs

@@ -19,7 +19,7 @@
  *
  * Usage:
  *   node scripts/check-sdk-version-sync.mjs
- *   EXPECTED_SDK_VERSION=1.24.0 node scripts/check-sdk-version-sync.mjs
+ *   EXPECTED_SDK_VERSION=1.25.0 node scripts/check-sdk-version-sync.mjs
  *   node scripts/check-sdk-version-sync.mjs --check-pypi
  *
  * Environment variables:
@@ -79,7 +79,7 @@ Triggering from other repos:
     -H "Authorization: token \$GITHUB_TOKEN" \\
     -H "Accept: application/vnd.github.v3+json" \\
     https://api.github.com/repos/OpenHands/agent-canvas/dispatches \\
-    -d '{"event_type": "sdk-version-check", "client_payload": {"version": "1.24.0"}}'
+    -d '{"event_type": "sdk-version-check", "client_payload": {"version": "1.25.0"}}'
 `);
   process.exit(0);
 }
@@ -268,9 +268,9 @@ async function fetchPyPIDependencies(packageName, version) {
  * Parse PyPI requires_dist array and extract SDK package versions
  *
  * PyPI returns dependencies in PEP 508 format like:
- *   "openhands-sdk>=1.24.0,<2.0.0"
- *   "openhands-tools==1.24.0"
- *   "openhands-workspace (>=1.24.0)"
+ *   "openhands-sdk>=1.25.0,<2.0.0"
+ *   "openhands-tools==1.25.0"
+ *   "openhands-workspace (>=1.25.0)"
  */
 function parseSdkVersionsFromRequiresDist(requiresDist) {
   const versions = {};
@@ -284,7 +284,7 @@ function parseSdkVersionsFromRequiresDist(requiresDist) {
       }
 
       // Extract the version number - look for patterns like:
-      // ">=1.24.0", "==1.24.0", "(>=1.24.0)", "~=1.24.0"
+      // ">=1.25.0", "==1.25.0", "(>=1.25.0)", "~=1.25.0"
       // After the package name and before any comma or closing paren
       const versionPattern = /[><=~!]+\s*([0-9]+(?:\.[0-9]+)*)/;
       const match = dep.match(versionPattern);

package/scripts/dev-safe.mjs

@@ -10,7 +10,7 @@ import {
   writeFileSync,
 } from "node:fs";
 import net from "node:net";
-import { homedir, tmpdir } from "node:os";
+import { homedir } from "node:os";
 import path from "node:path";
 import process from "node:process";
 import { setTimeout as delay } from "node:timers/promises";
@@ -21,6 +21,10 @@ import {
   isProcessRunning,
   signalProcessTree,
 } from "./dev-process-utils.mjs";
+// buildRuntimeServicesInfo moved to its own dependency-free module so the
+// Docker entrypoint can run it as a CLI. Re-exported below for back-compat
+// (dev-with-automation.mjs and tests still import it from here).
+import { buildRuntimeServicesInfo } from "./runtime-services-info.mjs";
 
 // ── Centralized config (single source of truth for versions, ports, etc.) ───
 const __dev_safe_dirname = path.dirname(fileURLToPath(import.meta.url));
@@ -31,6 +35,32 @@ const SHARED_DEFAULTS = JSON.parse(
   ),
 );
 
+/**
+ * Extract the pinned commit SHA for @openhands/extensions from package.json.
+ * Returns the 40-char hex SHA when the dependency is a git+https URL with a
+ * commit hash fragment (e.g. "git+https://…#62594156…"), null otherwise.
+ * @returns {string | null}
+ */
+function getExtensionsRef() {
+  try {
+    const pkg = JSON.parse(
+      readFileSync(
+        path.join(__dev_safe_dirname, "..", "package.json"),
+        "utf-8",
+      ),
+    );
+    const url =
+      (pkg.dependencies ?? pkg.devDependencies ?? {})["@openhands/extensions"] ??
+      "";
+    return url.match(/#([0-9a-f]{40})$/i)?.[1] ?? null;
+  } catch {
+    return null;
+  }
+}
+
+/** Pinned extensions commit SHA derived from package.json, or null if not pinned. */
+export const DEFAULT_EXTENSIONS_REF = getExtensionsRef();
+
 const DEFAULT_BACKEND_PORT = SHARED_DEFAULTS.ports.agentServer;
 const DEFAULT_VITE_PORT = 3001;
 const DEFAULT_WAIT_TIMEOUT_MS = 30_000;
@@ -389,7 +419,7 @@ export function validateFrontendDependencies(
  *   edits are picked up without a manual reinstall. The agent-server itself
  *   is rebuilt from local source on each invocation (--reinstall).
  * - OH_AGENT_SERVER_GIT_REF: Git commit SHA or branch name
- * - OH_AGENT_SERVER_VERSION: Specific PyPI version (e.g., "1.24.0")
+ * - OH_AGENT_SERVER_VERSION: Specific PyPI version (e.g., "1.25.0")
  *
  * If none are set, defaults to the released version specified by
  * DEFAULT_AGENT_SERVER_VERSION. Set OH_AGENT_SERVER_GIT_REF to use a
@@ -426,14 +456,23 @@ export function buildAgentServerCommand(env = process.env) {
     );
     source = `local (${localPath})`;
   } else if (gitRef) {
-    // Use git ref with subdirectory syntax for uv workspace monorepo
+    // Use git ref with subdirectory syntax for uv workspace monorepo.
     // The software-agent-sdk repo has packages in subdirectories:
-    // openhands-agent-server/, openhands-tools/, openhands-workspace/
+    // openhands-agent-server/, openhands-sdk/, openhands-tools/, openhands-workspace/
+    // All four must come from the same ref so inter-package APIs stay in sync.
+    //
+    // --reinstall is required because the git branch may carry the same version
+    // string as the current PyPI release (e.g. both "1.25.0"). Without it, uv
+    // silently reuses the cached PyPI wheels and the git ref is never actually
+    // used, even though it was explicitly requested.
     const baseGitUrl = `git+${AGENT_SERVER_GIT_REPO}@${gitRef}`;
     uvxArgs.push(
+      "--reinstall",
       "--from",
       `${baseGitUrl}#subdirectory=openhands-agent-server`,
       "--with",
+      `${baseGitUrl}#subdirectory=openhands-sdk`,
+      "--with",
       `${baseGitUrl}#subdirectory=openhands-tools`,
       "--with",
       `${baseGitUrl}#subdirectory=openhands-workspace`,
@@ -622,7 +661,23 @@ function buildConfigFromPorts(ports, cwd, env) {
     backendPort,
     vscodePort,
     stateDir,
-    tmuxTmpDir: path.join(tmpdir(), "openhands-agent-canvas-tmux"),
+    // tmux socket directory. Defaults to <stateDir>/tmux (under
+    // ~/.openhands/agent-canvas), matching where the rest of dev state lives
+    // and persisting across restarts.
+    //
+    // Do NOT use os.tmpdir() here: on macOS it resolves to the per-user
+    // $TMPDIR (/var/folders/.../T), which the OS periodically reaps
+    // (com.apple.bsd.dirhelper deletes entries untouched for a few days).
+    // Reaping deletes the live tmux socket while the server process keeps
+    // running, orphaning it — every later new-window then fails with
+    // "error connecting to .../openhands (No such file or directory)".
+    //
+    // The only hosts where <stateDir>/tmux can't hold the socket are those
+    // whose $HOME is a network/overlay mount without Unix-domain-socket
+    // support (some devcontainers, NFS/CIFS homes). Those rare cases can point
+    // tmux at a local, socket-capable path with the standard TMUX_TMPDIR env
+    // var (e.g. TMUX_TMPDIR=/tmp), which we honor and pass through below.
+    tmuxTmpDir: env.TMUX_TMPDIR || path.join(stateDir, "tmux"),
     conversationsPath,
     workspacesPath,
     bashEventsDir: path.join(stateDir, "bash_events"),
@@ -681,124 +736,20 @@ export function buildAgentServerEnv(config) {
     // Make the host tools/ directory importable so the agent-server can
     // resolve modules listed in tool_module_qualnames (e.g. canvas_ui_tool).
     OH_EXTRA_PYTHON_PATH: config.canvasToolsDir,
+    // Tell the agent-server which extensions commit to use for the public
+    // skills catalog. Derived from the @openhands/extensions pin in
+    // package.json; the SDK skips network polling when it already has this
+    // SHA cached. Only injected when the caller has not already set it.
+    ...(DEFAULT_EXTENSIONS_REF && !process.env.EXTENSIONS_REF
+      ? { EXTENSIONS_REF: DEFAULT_EXTENSIONS_REF }
+      : {}),
   };
 }
 
-/**
- * Build a structured description of the dev-stack services that are
- * reachable from inside the agent's sandbox. The frontend forwards this
- * (verbatim, as a JSON string in `VITE_RUNTIME_SERVICES_INFO`) and renders
- * it into the system prompt via `AgentContext.system_message_suffix`, so
- * the agent sees a `<RUNTIME_SERVICES>` block listing what's available
- * without having to probe.
- *
- * URLs are written from the *agent's* point of view. The agent-server
- * runs on the host, so the host alias is "localhost".
- *
- * @param {object} options
- * @param {string} [options.mode] - Human-readable dev mode label (e.g. "dev:safe").
- * @param {string} [options.agentHostAlias="localhost"] - Hostname the agent
- *   uses to reach services running on the host machine.
- * @param {number} [options.agentServerPort] - Port the agent-server listens on.
- *   Required at runtime; the function throws if missing because the resulting
- *   URL would otherwise bake `undefined` into the agent's system prompt.
- *   Typed as optional only so TypeScript callers can negative-test the guard.
- * @param {number} [options.ingressPort] - Ingress port (omit if no ingress).
- * @param {number} [options.frontendPort] - Frontend port (Vite dev server
- *   or static-file server). Omit if no frontend is exposed.
- * @param {number} [options.vitePort] - Deprecated alias for `frontendPort`,
- *   accepted for backward compat with older launchers. Remove after one release.
- * @param {"vite"|"static"} [options.frontendKind="vite"] - Whether the
- *   frontend port hosts Vite or a static build. Only affects the
- *   description shown to the agent.
- * @param {object} [options.automation] - Automation backend info. Skipped
- *   entirely if `.port` is missing, so passing `{}` is safe.
- * @param {number} [options.automation.port] - Automation backend port.
- * @param {string} [options.automation.apiPrefix="/api/automation"] - Path
- *   prefix all automation routes are mounted under.
- * @param {string} [options.automation.authEnvVar="OPENHANDS_AUTOMATION_API_KEY"]
- *   - Env var holding the API key.
- * @returns {object} A JSON-serializable runtime services info object.
- */
-export function buildRuntimeServicesInfo(options) {
-  const {
-    mode,
-    agentHostAlias = "localhost",
-    agentServerPort,
-    ingressPort,
-    // Accept legacy `vitePort` for one release so external callers keep working.
-    vitePort,
-    frontendPort = vitePort,
-    frontendKind = "vite",
-    automation,
-  } = options;
-
-  if (agentServerPort === undefined || agentServerPort === null) {
-    // Without this the URL becomes `http://localhost:undefined` and ends up
-    // verbatim in the agent's system prompt, which is worse than failing fast.
-    throw new Error(
-      "buildRuntimeServicesInfo: agentServerPort is required " +
-        "(otherwise the agent_server URL would be `http://localhost:undefined`).",
-    );
-  }
-
-  const services = {
-    agent_server: {
-      description:
-        "The OpenHands Agent Server this agent is running inside. " +
-        "Tool calls (terminal, file_editor, browser, etc.) execute here.",
-      // From the agent's POV, the agent-server it's *inside* is on
-      // localhost, regardless of where the host is.
-      url_from_agent: `http://localhost:${agentServerPort}`,
-    },
-  };
-
-  if (ingressPort !== undefined) {
-    services.ingress = {
-      description:
-        "Unified entry point. Routes /api/automation/* to the automation " +
-        "backend, /api/* and /sockets to the agent-server, and /* to the " +
-        "frontend.",
-      url_from_agent: `http://${agentHostAlias}:${ingressPort}`,
-    };
-  }
-
-  if (frontendPort !== undefined) {
-    services.frontend = {
-      kind: frontendKind,
-      description:
-        frontendKind === "static"
-          ? "Static-file server hosting the agent-canvas production build."
-          : "Vite dev server hosting the agent-canvas frontend.",
-      url_from_agent: `http://${agentHostAlias}:${frontendPort}`,
-    };
-  }
-
-  // Require an explicit port so we don't bake `:undefined` into the
-  // automation URL when the caller passes `automation: {}`.
-  if (automation?.port !== undefined && automation.port !== null) {
-    const apiPrefix = automation.apiPrefix ?? "/api/automation";
-    const authEnvVar = automation.authEnvVar ?? "OPENHANDS_AUTOMATION_API_KEY";
-    const baseUrl = `http://${agentHostAlias}:${automation.port}`;
-    services.automation = {
-      description:
-        "OpenHands Automations service. All routes are mounted under " +
-        `'${apiPrefix}'. Authenticate with header ` +
-        `'X-Session-API-Key: $${authEnvVar}'.`,
-      url_from_agent: baseUrl,
-      api_prefix: apiPrefix,
-      docs_url: `${baseUrl}${apiPrefix}/docs`,
-      openapi_url: `${baseUrl}${apiPrefix}/openapi.json`,
-      auth_env_var: authEnvVar,
-    };
-  }
-
-  return {
-    mode,
-    agent_host_alias: agentHostAlias,
-    services,
-  };
-}
+// Re-export so existing importers (dev-with-automation.mjs, tests) keep
+// resolving `buildRuntimeServicesInfo` from this module. The implementation
+// now lives in ./runtime-services-info.mjs (imported at the top of this file).
+export { buildRuntimeServicesInfo };
 
 export function buildNpmScriptCommand(
   scriptName,