npm - @openhands/agent-canvas - Versions diffs - 1.0.0-alpha.7 → 1.0.0-alpha.9 - Mend

@openhands/agent-canvas 1.0.0-alpha.7 → 1.0.0-alpha.9

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

Files changed (745) hide show

package/dist/stores/use-event-store.d.ts CHANGED Viewed

@@ -6,6 +6,14 @@ export interface EventState {
     events: OHEvent[];
     eventIds: Set<string | number>;
     uiEvents: OHEvent[];
+    /**
+     * The conversation whose events currently populate the store. The store is
+     * global (not keyed by conversation), so the conversation route uses this to
+     * tell a genuine conversation switch apart from a remount of the *same*
+     * conversation (e.g. navigating to Settings and back) — only the former
+     * should clear the accumulated events.
+     */
+    loadedConversationId: string | null;
     addEvent: (event: OHEvent) => void;
     /**
      * Bulk-insert events. Used for the initial REST history load and for
@@ -14,6 +22,20 @@ export interface EventState {
      * timestamp so older pages drop into the correct position.
      */
     addEvents: (events: OHEvent[]) => void;
+    /**
+     * Clear all events. Also resets `loadedConversationId` to `null` so the
+     * store never claims to hold a conversation whose events have been wiped —
+     * the invariant (`loadedConversationId` reflects the conversation whose
+     * events are in the arrays) holds even for a standalone clear.
+     */
     clearEvents: () => void;
+    /**
+     * Atomically clear all events and record which conversation is now loaded.
+     * Collapsing the reset and the bookkeeping into a single `set` keeps the
+     * store invariant enforced at the boundary, rather than relying on every
+     * call-site to invoke a clear and a `loadedConversationId` setter in the
+     * right order.
+     */
+    clearEventsForConversation: (conversationId: string | null) => void;
 }
 export declare const useEventStore: import("zustand").UseBoundStore<import("zustand").StoreApi<EventState>>;

package/dist/stores/use-event-store.js CHANGED Viewed

@@ -29,6 +29,7 @@ var n = (e) => "id" in e ? e.id : void 0, r = (e) => "timestamp" in e ? e.timest
 	events: [],
 	eventIds: /* @__PURE__ */ new Set(),
 	uiEvents: [],
+	loadedConversationId: null,
 	addEvent: (t) => e((e) => c(e, t)),
 	addEvents: (r) => e((e) => {
 		if (r.length === 0) return e;
@@ -47,7 +48,14 @@ var n = (e) => "id" in e ? e.id : void 0, r = (e) => "timestamp" in e ? e.timest
 	clearEvents: () => e(() => ({
 		events: [],
 		eventIds: /* @__PURE__ */ new Set(),
-		uiEvents: []
+		uiEvents: [],
+		loadedConversationId: null
+	})),
+	clearEventsForConversation: (t) => e(() => ({
+		events: [],
+		eventIds: /* @__PURE__ */ new Set(),
+		uiEvents: [],
+		loadedConversationId: t
 	}))
 }));
 //#endregion

package/dist/stores/use-event-store.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"use-event-store.js","names":[],"sources":["../../src/stores/use-event-store.ts"],"sourcesContent":["import { create } from \"zustand\";\nimport { OpenHandsEvent } from \"#/types/agent-server/core\";\nimport { handleEventForUI } from \"#/utils/handle-event-for-ui\";\n\nexport type OHEvent = OpenHandsEvent & {\n isFromPlanningAgent?: boolean;\n};\n\nconst getEventId = (event: OHEvent): string \| number \| undefined =>\n \"id\" in event ? event.id : undefined;\n\nconst getEventTimestamp = (event: OHEvent): string \| undefined =>\n \"timestamp\" in event ? event.timestamp : undefined;\n\n/*\n Compare two events by timestamp for sorting.\n * Events without timestamps are placed at the end.\n /\nconst compareEventsByTimestamp = (a: OHEvent, b: OHEvent): number => {\n const timestampA = getEventTimestamp(a);\n const timestampB = getEventTimestamp(b);\n\n // Events without timestamps go to the end\n if (!timestampA && !timestampB) return 0;\n if (!timestampA) return 1;\n if (!timestampB) return -1;\n\n // Compare ISO timestamp strings (lexicographic comparison works for ISO format)\n return timestampA.localeCompare(timestampB);\n};\n\n/\n Check if the new event needs sorting (i.e., it's out of order).\n * Returns true if the new event's timestamp is earlier than the last event's timestamp.\n /\nconst needsSorting = (events: OHEvent[], newEvent: OHEvent): boolean => {\n if (events.length === 0) return false;\n\n const lastEvent = events[events.length - 1];\n const lastTimestamp = getEventTimestamp(lastEvent);\n const newTimestamp = getEventTimestamp(newEvent);\n\n // If either event doesn't have a timestamp, don't sort\n if (!lastTimestamp \|\| !newTimestamp) return false;\n\n // Sort needed if new event's timestamp is earlier than last event's timestamp\n return newTimestamp < lastTimestamp;\n};\n\nexport interface EventState {\n events: OHEvent[];\n eventIds: Set<string \| number>;\n uiEvents: OHEvent[];\n addEvent: (event: OHEvent) => void;\n /\n Bulk-insert events. Used for the initial REST history load and for\n * \"scroll up to load older\" pagination. Newly-added events are de-duped\n * against the existing store and the combined list is re-sorted by\n * timestamp so older pages drop into the correct position.\n */\n addEvents: (events: OHEvent[]) => void;\n clearEvents: () => void;\n}\n\nconst appendEvent = (state: EventState, event: OHEvent): EventState => {\n // Deduplicate: skip if event with same id already exists (O(1) lookup)\n const eventId = getEventId(event);\n if (eventId !== undefined && state.eventIds.has(eventId)) {\n return state;\n }\n\n const newEventIds =\n eventId !== undefined\n ? new Set(state.eventIds).add(eventId)\n : state.eventIds;\n\n return {\n ...state,\n events: [...state.events, event],\n eventIds: newEventIds,\n uiEvents: handleEventForUI(event, state.uiEvents),\n };\n};\n\nconst sortEventState = (state: EventState): EventState => ({\n ...state,\n events: [...state.events].sort(compareEventsByTimestamp),\n uiEvents: [...state.uiEvents].sort(compareEventsByTimestamp),\n});\n\nconst applyAddEvent = (state: EventState, event: OHEvent): EventState => {\n const next = appendEvent(state, event);\n if (next === state) {\n return state;\n }\n\n if (\n !needsSorting(state.events, event) &&\n !needsSorting(state.uiEvents, event)\n ) {\n return next;\n }\n\n return sortEventState(next);\n};\n\nexport const useEventStore = create<EventState>()((set) => ({\n events: [],\n eventIds: new Set(),\n uiEvents: [],\n addEvent: (event: OHEvent) => set((state) => applyAddEvent(state, event)),\n addEvents: (incoming: OHEvent[]) =>\n set((state) => {\n if (incoming.length === 0) return state;\n\n const eventIds = new Set(state.eventIds);\n const events = [...state.events];\n let uiEvents = [...state.uiEvents];\n let added = false;\n\n for (const event of incoming) {\n const eventId = getEventId(event);\n const isDuplicate = eventId !== undefined && eventIds.has(eventId);\n\n if (!isDuplicate) {\n added = true;\n if (eventId !== undefined) {\n eventIds.add(eventId);\n }\n events.push(event);\n uiEvents = handleEventForUI(event, uiEvents);\n }\n }\n\n if (!added) {\n return state;\n }\n\n return sortEventState({\n ...state,\n events,\n eventIds,\n uiEvents,\n });\n }),\n clearEvents: () =>\n set(() => ({\n events: [],\n eventIds: new Set(),\n uiEvents: [],\n })),\n}));\n\n// In dev builds, expose the store on `window` so that fixture/preview\n// scripts (e.g. .pr/issue-132 demo capture) can inject synthetic events\n// without round-tripping through the agent-server. Tree-shaken in\n// production builds via `import.meta.env.DEV`.\nif (\n typeof window !== \"undefined\" &&\n typeof import.meta !== \"undefined\" &&\n (import.meta as { env?: { DEV?: boolean } }).env?.DEV\n) {\n (\n window as unknown as { __OH_EVENT_STORE__?: typeof useEventStore }\n ).__OH_EVENT_STORE__ = useEventStore;\n}\n"],"mappings":";;;AAQA,IAAM,KAAc,MAClB,QAAQ,IAAQ,EAAM,KAAK,KAAA,GAEvB,KAAqB,MACzB,eAAe,IAAQ,EAAM,YAAY,KAAA,GAMrC,KAA4B,GAAY,MAAuB;CACnE,IAAM,IAAa,EAAkB,EAAE,EACjC,IAAa,EAAkB,EAAE;AAQvC,QALI,CAAC,KAAc,CAAC,IAAmB,IAClC,IACA,IAGE,EAAW,cAAc,EAAW,GAHnB,KADA;GAWpB,KAAgB,GAAmB,MAA+B;AACtE,KAAI,EAAO,WAAW,EAAG,QAAO;CAEhC,IAAM,IAAY,EAAO,EAAO,SAAS,IACnC,IAAgB,EAAkB,EAAU,EAC5C,IAAe,EAAkB,EAAS;AAMhD,QAHI,CAAC,KAAiB,CAAC,IAAqB,KAGrC,IAAe;~~GAkBlB~~,KAAe,GAAmB,MAA+B;CAErE,IAAM,IAAU,EAAW,EAAM;AACjC,KAAI,MAAY,KAAA,KAAa,EAAM,SAAS,IAAI,EAAQ,CACtD,QAAO;CAGT,IAAM,IACJ,MAAY,KAAA,IAER,EAAM,WADN,IAAI,IAAI,EAAM,SAAS,CAAC,IAAI,EAAQ;AAG1C,QAAO;EACL,GAAG;EACH,QAAQ,CAAC,GAAG,EAAM,QAAQ,EAAM;EAChC,UAAU;EACV,UAAU,EAAiB,GAAO,EAAM,SAAS;EAClD;GAGG,KAAkB,OAAmC;CACzD,GAAG;CACH,QAAQ,CAAC,GAAG,EAAM,OAAO,CAAC,KAAK,EAAyB;CACxD,UAAU,CAAC,GAAG,EAAM,SAAS,CAAC,KAAK,EAAyB;CAC7D,GAEK,KAAiB,GAAmB,MAA+B;CACvE,IAAM,IAAO,EAAY,GAAO,EAAM;AAYtC,QAXI,MAAS,IACJ,IAIP,CAAC,EAAa,EAAM,QAAQ,EAAM,IAClC,CAAC,EAAa,EAAM,UAAU,EAAM,GAE7B,IAGF,EAAe,EAAK;GAGhB,IAAgB,GAAoB,EAAE,OAAS;CAC1D,QAAQ,EAAE;CACV,0BAAU,IAAI,KAAK;CACnB,UAAU,EAAE;CACZ,WAAW,MAAmB,GAAK,MAAU,EAAc,GAAO,EAAM,CAAC;CACzE,YAAY,MACV,GAAK,MAAU;AACb,MAAI,EAAS,WAAW,EAAG,QAAO;EAElC,IAAM,IAAW,IAAI,IAAI,EAAM,SAAS,EAClC,IAAS,CAAC,GAAG,EAAM,OAAO,EAC5B,IAAW,CAAC,GAAG,EAAM,SAAS,EAC9B,IAAQ;AAEZ,OAAK,IAAM,KAAS,GAAU;GAC5B,IAAM,IAAU,EAAW,EAAM;AAGjC,GAFoB,MAAY,KAAA,KAAa,EAAS,IAAI,EAAQ,KAGhE,IAAQ,IACJ,MAAY,KAAA,KACd,EAAS,IAAI,EAAQ,EAEvB,EAAO,KAAK,EAAM,EAClB,IAAW,EAAiB,GAAO,EAAS;;AAQhD,SAJK,IAIE,EAAe;GACpB,GAAG;GACH;GACA;GACA;GACD,CAAC,GARO;GAST;CACJ,mBACE,SAAW;EACT,QAAQ,EAAE;EACV,0BAAU,IAAI,KAAK;EACnB,UAAU,EAAE;~~EACb~~,EAAE;CACN,EAAE"}
1	+ {"version":3,"file":"use-event-store.js","names":[],"sources":["../../src/stores/use-event-store.ts"],"sourcesContent":["import { create } from \"zustand\";\nimport { OpenHandsEvent } from \"#/types/agent-server/core\";\nimport { handleEventForUI } from \"#/utils/handle-event-for-ui\";\n\nexport type OHEvent = OpenHandsEvent & {\n isFromPlanningAgent?: boolean;\n};\n\nconst getEventId = (event: OHEvent): string \| number \| undefined =>\n \"id\" in event ? event.id : undefined;\n\nconst getEventTimestamp = (event: OHEvent): string \| undefined =>\n \"timestamp\" in event ? event.timestamp : undefined;\n\n/*\n Compare two events by timestamp for sorting.\n * Events without timestamps are placed at the end.\n /\nconst compareEventsByTimestamp = (a: OHEvent, b: OHEvent): number => {\n const timestampA = getEventTimestamp(a);\n const timestampB = getEventTimestamp(b);\n\n // Events without timestamps go to the end\n if (!timestampA && !timestampB) return 0;\n if (!timestampA) return 1;\n if (!timestampB) return -1;\n\n // Compare ISO timestamp strings (lexicographic comparison works for ISO format)\n return timestampA.localeCompare(timestampB);\n};\n\n/\n Check if the new event needs sorting (i.e., it's out of order).\n * Returns true if the new event's timestamp is earlier than the last event's timestamp.\n /\nconst needsSorting = (events: OHEvent[], newEvent: OHEvent): boolean => {\n if (events.length === 0) return false;\n\n const lastEvent = events[events.length - 1];\n const lastTimestamp = getEventTimestamp(lastEvent);\n const newTimestamp = getEventTimestamp(newEvent);\n\n // If either event doesn't have a timestamp, don't sort\n if (!lastTimestamp \|\| !newTimestamp) return false;\n\n // Sort needed if new event's timestamp is earlier than last event's timestamp\n return newTimestamp < lastTimestamp;\n};\n\nexport interface EventState {\n events: OHEvent[];\n eventIds: Set<string \| number>;\n uiEvents: OHEvent[];\n /\n The conversation whose events currently populate the store. The store is\n * global (not keyed by conversation), so the conversation route uses this to\n * tell a genuine conversation switch apart from a remount of the same\n * conversation (e.g. navigating to Settings and back) — only the former\n * should clear the accumulated events.\n /\n loadedConversationId: string \| null;\n addEvent: (event: OHEvent) => void;\n /\n Bulk-insert events. Used for the initial REST history load and for\n * \"scroll up to load older\" pagination. Newly-added events are de-duped\n * against the existing store and the combined list is re-sorted by\n * timestamp so older pages drop into the correct position.\n /\n addEvents: (events: OHEvent[]) => void;\n /\n Clear all events. Also resets `loadedConversationId` to `null` so the\n * store never claims to hold a conversation whose events have been wiped —\n * the invariant (`loadedConversationId` reflects the conversation whose\n * events are in the arrays) holds even for a standalone clear.\n /\n clearEvents: () => void;\n /\n Atomically clear all events and record which conversation is now loaded.\n * Collapsing the reset and the bookkeeping into a single `set` keeps the\n * store invariant enforced at the boundary, rather than relying on every\n * call-site to invoke a clear and a `loadedConversationId` setter in the\n * right order.\n */\n clearEventsForConversation: (conversationId: string \| null) => void;\n}\n\nconst appendEvent = (state: EventState, event: OHEvent): EventState => {\n // Deduplicate: skip if event with same id already exists (O(1) lookup)\n const eventId = getEventId(event);\n if (eventId !== undefined && state.eventIds.has(eventId)) {\n return state;\n }\n\n const newEventIds =\n eventId !== undefined\n ? new Set(state.eventIds).add(eventId)\n : state.eventIds;\n\n return {\n ...state,\n events: [...state.events, event],\n eventIds: newEventIds,\n uiEvents: handleEventForUI(event, state.uiEvents),\n };\n};\n\nconst sortEventState = (state: EventState): EventState => ({\n ...state,\n events: [...state.events].sort(compareEventsByTimestamp),\n uiEvents: [...state.uiEvents].sort(compareEventsByTimestamp),\n});\n\nconst applyAddEvent = (state: EventState, event: OHEvent): EventState => {\n const next = appendEvent(state, event);\n if (next === state) {\n return state;\n }\n\n if (\n !needsSorting(state.events, event) &&\n !needsSorting(state.uiEvents, event)\n ) {\n return next;\n }\n\n return sortEventState(next);\n};\n\nexport const useEventStore = create<EventState>()((set) => ({\n events: [],\n eventIds: new Set(),\n uiEvents: [],\n loadedConversationId: null,\n addEvent: (event: OHEvent) => set((state) => applyAddEvent(state, event)),\n addEvents: (incoming: OHEvent[]) =>\n set((state) => {\n if (incoming.length === 0) return state;\n\n const eventIds = new Set(state.eventIds);\n const events = [...state.events];\n let uiEvents = [...state.uiEvents];\n let added = false;\n\n for (const event of incoming) {\n const eventId = getEventId(event);\n const isDuplicate = eventId !== undefined && eventIds.has(eventId);\n\n if (!isDuplicate) {\n added = true;\n if (eventId !== undefined) {\n eventIds.add(eventId);\n }\n events.push(event);\n uiEvents = handleEventForUI(event, uiEvents);\n }\n }\n\n if (!added) {\n return state;\n }\n\n return sortEventState({\n ...state,\n events,\n eventIds,\n uiEvents,\n });\n }),\n clearEvents: () =>\n set(() => ({\n events: [],\n eventIds: new Set(),\n uiEvents: [],\n loadedConversationId: null,\n })),\n clearEventsForConversation: (conversationId: string \| null) =>\n set(() => ({\n events: [],\n eventIds: new Set(),\n uiEvents: [],\n loadedConversationId: conversationId,\n })),\n}));\n\n// In dev builds, expose the store on `window` so that fixture/preview\n// scripts (e.g. .pr/issue-132 demo capture) can inject synthetic events\n// without round-tripping through the agent-server. Tree-shaken in\n// production builds via `import.meta.env.DEV`.\nif (\n typeof window !== \"undefined\" &&\n typeof import.meta !== \"undefined\" &&\n (import.meta as { env?: { DEV?: boolean } }).env?.DEV\n) {\n (\n window as unknown as { __OH_EVENT_STORE__?: typeof useEventStore }\n ).__OH_EVENT_STORE__ = useEventStore;\n}\n"],"mappings":";;;AAQA,IAAM,KAAc,MAClB,QAAQ,IAAQ,EAAM,KAAK,KAAA,GAEvB,KAAqB,MACzB,eAAe,IAAQ,EAAM,YAAY,KAAA,GAMrC,KAA4B,GAAY,MAAuB;CACnE,IAAM,IAAa,EAAkB,EAAE,EACjC,IAAa,EAAkB,EAAE;AAQvC,QALI,CAAC,KAAc,CAAC,IAAmB,IAClC,IACA,IAGE,EAAW,cAAc,EAAW,GAHnB,KADA;GAWpB,KAAgB,GAAmB,MAA+B;AACtE,KAAI,EAAO,WAAW,EAAG,QAAO;CAEhC,IAAM,IAAY,EAAO,EAAO,SAAS,IACnC,IAAgB,EAAkB,EAAU,EAC5C,IAAe,EAAkB,EAAS;AAMhD,QAHI,CAAC,KAAiB,CAAC,IAAqB,KAGrC,IAAe;GAwClB,KAAe,GAAmB,MAA+B;CAErE,IAAM,IAAU,EAAW,EAAM;AACjC,KAAI,MAAY,KAAA,KAAa,EAAM,SAAS,IAAI,EAAQ,CACtD,QAAO;CAGT,IAAM,IACJ,MAAY,KAAA,IAER,EAAM,WADN,IAAI,IAAI,EAAM,SAAS,CAAC,IAAI,EAAQ;AAG1C,QAAO;EACL,GAAG;EACH,QAAQ,CAAC,GAAG,EAAM,QAAQ,EAAM;EAChC,UAAU;EACV,UAAU,EAAiB,GAAO,EAAM,SAAS;EAClD;GAGG,KAAkB,OAAmC;CACzD,GAAG;CACH,QAAQ,CAAC,GAAG,EAAM,OAAO,CAAC,KAAK,EAAyB;CACxD,UAAU,CAAC,GAAG,EAAM,SAAS,CAAC,KAAK,EAAyB;CAC7D,GAEK,KAAiB,GAAmB,MAA+B;CACvE,IAAM,IAAO,EAAY,GAAO,EAAM;AAYtC,QAXI,MAAS,IACJ,IAIP,CAAC,EAAa,EAAM,QAAQ,EAAM,IAClC,CAAC,EAAa,EAAM,UAAU,EAAM,GAE7B,IAGF,EAAe,EAAK;GAGhB,IAAgB,GAAoB,EAAE,OAAS;CAC1D,QAAQ,EAAE;CACV,0BAAU,IAAI,KAAK;CACnB,UAAU,EAAE;CACZ,sBAAsB;CACtB,WAAW,MAAmB,GAAK,MAAU,EAAc,GAAO,EAAM,CAAC;CACzE,YAAY,MACV,GAAK,MAAU;AACb,MAAI,EAAS,WAAW,EAAG,QAAO;EAElC,IAAM,IAAW,IAAI,IAAI,EAAM,SAAS,EAClC,IAAS,CAAC,GAAG,EAAM,OAAO,EAC5B,IAAW,CAAC,GAAG,EAAM,SAAS,EAC9B,IAAQ;AAEZ,OAAK,IAAM,KAAS,GAAU;GAC5B,IAAM,IAAU,EAAW,EAAM;AAGjC,GAFoB,MAAY,KAAA,KAAa,EAAS,IAAI,EAAQ,KAGhE,IAAQ,IACJ,MAAY,KAAA,KACd,EAAS,IAAI,EAAQ,EAEvB,EAAO,KAAK,EAAM,EAClB,IAAW,EAAiB,GAAO,EAAS;;AAQhD,SAJK,IAIE,EAAe;GACpB,GAAG;GACH;GACA;GACA;GACD,CAAC,GARO;GAST;CACJ,mBACE,SAAW;EACT,QAAQ,EAAE;EACV,0BAAU,IAAI,KAAK;EACnB,UAAU,EAAE;EACZ,sBAAsB;EACvB,EAAE;CACL,6BAA6B,MAC3B,SAAW;EACT,QAAQ,EAAE;EACV,0BAAU,IAAI,KAAK;EACnB,UAAU,EAAE;EACZ,sBAAsB;EACvB,EAAE;CACN,EAAE"}

package/dist/ui/context-menu.d.ts CHANGED Viewed

@@ -5,7 +5,7 @@ declare const contextMenuVariants: (props?: ({
     size?: "default" | "compact" | null | undefined;
     layout?: "vertical" | null | undefined;
     position?: "none" | "top" | "bottom" | null | undefined;
-    spacing?: "none" | "default" | null | undefined;
+    spacing?: "default" | "none" | null | undefined;
     alignment?: "none" | "left" | "right" | null | undefined;
 } & import("class-variance-authority/types").ClassProp) | undefined) => string;
 interface ContextMenuProps {

package/dist/ui/help-link.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { type VariantProps } from "class-variance-authority";
 declare const helpLinkVariants: (props?: ({
-    size?: "settings" | "default" | null | undefined;
+    size?: "default" | "settings" | null | undefined;
     linkColor?: "default" | "white" | null | undefined;
 } & import("class-variance-authority/types").ClassProp) | undefined) => string;
 interface HelpLinkProps extends VariantProps<typeof helpLinkVariants> {

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

@@ -1,2 +1,2 @@
-require(`../_virtual/_rolldown/runtime.cjs`);var e=e=>{try{return new URL(e)}catch{return null}};function t(t,n){let r=typeof t==`string`?t:``,i=typeof n==`string`?n:``;if(!r||!i)return!1;let a=e(r),o=e(i);return!a||!o?r.replace(/\/+$/,``)===i.replace(/\/+$/,``):a.protocol===o.protocol&&a.host===o.host&&a.pathname.replace(/\/+$/,``)===o.pathname.replace(/\/+$/,``)}function n(e,t){return!e.availability||e.availability===`all`?!0:e.availability===t}function r(e){return e.trim().toLowerCase()}function i(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 a(e,t){let n=r(t);return n?[e.name,e.description,e.id,...e.keywords??[]].join(` `).toLowerCase().includes(n):!0}function o(e,t,n){let i=r(n);return i?[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(i):!0}function s(e,n){return n.find(n=>{let r=n.template;return r.kind===`stdio`?e.type===`stdio`&&e.name===r.serverName:r.kind===`shttp`?e.type===`shttp`&&t(e.url,r.url):r.kind===`sse`?e.type===`sse`&&t(e.url,r.url):!1})}exports.findCatalogEntryForServer=s,exports.getMarketplaceEntriesByPopularity=i,exports.installedServerMatchesQuery=o,exports.isMarketplaceEntryAvailable=n,exports.marketplaceEntryMatchesQuery=a;
+require(`../_virtual/_rolldown/runtime.cjs`);var e=e=>{try{return new URL(e)}catch{return null}};function t(t,n){let r=typeof t==`string`?t:``,i=typeof n==`string`?n:``;if(!r||!i)return!1;let a=e(r),o=e(i);return!a||!o?r.replace(/\/+$/,``)===i.replace(/\/+$/,``):a.protocol===o.protocol&&a.host===o.host&&a.pathname.replace(/\/+$/,``)===o.pathname.replace(/\/+$/,``)}function n(e){return(e.connectionOptions.find(t=>t.id===e.defaultConnectionOptionId)??e.connectionOptions[0])?.transport}function r(e){let t=e.connectionOptions.find(e=>e.transport?.kind===`stdio`);return t?.transport?t.transport:n(e)}function i(e,t){return!e.runtimeAvailability||e.runtimeAvailability===`all`?!0:e.runtimeAvailability===t}function a(e){return e.trim().toLowerCase()}function o(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 s(e,t){let n=a(t);return n?[e.name,e.description,e.id,...e.keywords??[]].join(` `).toLowerCase().includes(n):!0}function c(e,t,n){let r=a(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 l(e,n){return n.find(n=>{for(let r of n.connectionOptions){let n=r.transport;if(n&&(n.kind===`stdio`&&e.type===`stdio`&&e.name===n.serverName||n.kind===`shttp`&&e.type===`shttp`&&t(e.url,n.url)||n.kind===`sse`&&e.type===`sse`&&t(e.url,n.url)))return!0}return!1})}exports.findCatalogEntryForServer=l,exports.getDefaultTemplate=n,exports.getInstallableTemplate=r,exports.getMarketplaceEntriesByPopularity=o,exports.installedServerMatchesQuery=c,exports.isMarketplaceEntryAvailable=i,exports.marketplaceEntryMatchesQuery=s;
 //# sourceMappingURL=mcp-marketplace-utils.cjs.map

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

	@@ -1 +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 ~~McpCatalogEntry~~ as MarketplaceEntry,\n MarketplaceTemplate,\n} from \"@openhands/extensions/~~mcps~~\";\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 template: MarketplaceTemplate,\n servers: MCPServerConfig[],\n): MCPServerConfig \| null {\n if (template.kind === \"shttp\") {\n const tplUrl = template.url;\n if (!tplUrl) return null;\n return (\n servers.find(\n (s) => s.type === \"shttp\" && !!s.url && urlsMatch(s.url, tplUrl),\n ) ?? null\n );\n }\n\n if (template.kind === \"sse\") {\n const tplUrl = template.url;\n if (!tplUrl) return null;\n return (\n servers.find(\n (s) => s.type === \"sse\" && !!s.url && urlsMatch(s.url, tplUrl),\n ) ?? null\n );\n }\n\n // stdio: match on the registered server name.\n return (\n servers.find((s) => s.type === \"stdio\" && s.name === template.serverName) ??\n null\n );\n}\n\nexport function isMarketplaceEntryAvailable(\n entry: MarketplaceEntry,\n backendKind: \"local\" \| \"cloud\",\n): boolean {\n if (!entry.~~availability~~ \|\| entry.~~availability~~ === \"all\") return true;\n return entry.~~availability~~ === 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 const tpl = ~~entry~~.~~template~~;\n if (tpl.kind === \"stdio\")\n ~~return~~ server.type === \"stdio\" && server.name === tpl.serverName;\n // Reuse the same loose URL match as `findInstalledMatch` so a\n // server whose URL was normalized by the backend (trailing slash\n // stripped, query string dropped, etc.) still gets paired with\n // its catalog tile — otherwise the installed-servers list would\n // render the generic icon while the marketplace shows the\n // entry as installed, which is confusing.\n if (tpl.kind === \"shttp\")\n ~~return~~ server.type === \"shttp\" && urlsMatch(server.url, tpl.url);\n if (tpl.kind === \"sse\")\n ~~return~~ server.type === \"sse\" && urlsMatch(server.url, tpl.url);\n return false;\n });\n}\n"],"mappings":"6CAMA,IAAM,EAAU,GAA4B,CAC1C,GAAI,CACF,OAAO,IAAI,IAAI,EAAI,MACb,CACN,OAAO,OAeX,SAAgB,EAAU,EAAY,EAAqB,CACzD,IAAM,EAAO,OAAO,GAAM,SAAW,EAAI,GACnC,EAAO,OAAO,GAAM,SAAW,EAAI,GACzC,GAAI,CAAC,GAAQ,CAAC,EAAM,MAAO,GAC3B,IAAM,EAAO,EAAO,EAAK,CACnB,EAAQ,EAAO,EAAK,CAI1B,MAHI,CAAC,GAAQ,CAAC,EACL,EAAK,QAAQ,OAAQ,GAAG,GAAK,EAAK,QAAQ,OAAQ,GAAG,CAG5D,EAAK,WAAa,EAAM,UACxB,EAAK,OAAS,EAAM,MACpB,EAAK,SAAS,QAAQ,OAAQ,GAAG,GAAK,EAAM,SAAS,QAAQ,OAAQ,GAAG,~~CAwC5E~~,SAAgB,EACd,EACA,EACS,~~CAET~~,~~MADI~~,CAAC,EAAM,~~cAAgB~~,EAAM,~~eAAiB~~,~~MAAc~~,~~GACzD~~,EAAM,~~eAAiB~~,~~EAGhC~~,SAAS,EAAU,EAAuB,CACxC,OAAO,EAAM,MAAM,CAAC,aAAa,CAQnC,SAAgB,EACd,EACoB,CACpB,OAAO,EACJ,KAAK,EAAO,KAAW,CAAE,QAAO,QAAO,EAAE,CACzC,MAAM,EAAG,KAEL,EAAE,MAAM,gBAAkB,IAAM,EAAE,MAAM,gBAAkB,IACtC,EAAE,MAAQ,EAAE,MACnC,CACD,KAAK,CAAE,WAAY,EAAM,CAU9B,SAAgB,EACd,EACA,EACS,CACT,IAAM,EAAI,EAAU,EAAS,CAU7B,OATK,EACY,CACf,EAAM,KACN,EAAM,YACN,EAAM,GACN,GAAI,EAAM,UAAY,EAAE,CACzB,CACE,KAAK,IAAI,CACT,aACI,CAAS,SAAS,EAAE,CATZ,GAmBjB,SAAgB,EACd,EACA,EACA,EACS,CACT,IAAM,EAAI,EAAU,EAAS,CAgB7B,OAfK,EACY,CACf,EAAO,KACP,SAAU,EAAS,EAAO,KAAO,IAAA,GACjC,YAAa,EAAS,EAAO,QAAU,IAAA,GACvC,SAAU,EAAS,EAAO,MAAM,KAAK,IAAI,CAAG,IAAA,GAC5C,QAAS,EAAS,EAAO,IAAM,IAAA,GAC/B,GAAc,KACd,GAAc,YACd,GAAc,GACd,GAAI,GAAc,UAAY,EAAE,CACjC,CACE,OAAO,QAAQ,CACf,KAAK,IAAI,CACT,aACI,CAAS,SAAS,EAAE,CAfZ,~~GAuBjB~~,SAAgB,EACd,EACA,EAC8B,CAC9B,OAAO,EAAQ,KAAM,GAAU,~~CAC7B~~,IAAM,EAAM,EAAM,~~SAalB~~,~~OAZI~~,EAAI,OAAS,~~QACR~~,EAAO,OAAS,SAAW,EAAO,OAAS,EAAI,~~WAOpD~~,EAAI,OAAS,~~QACR~~,EAAO,OAAS,SAAW,EAAU,EAAO,IAAK,EAAI,IAAI,~~CAC9D~~,EAAI,OAAS,~~MACR~~,EAAO,OAAS,OAAS,EAAU,EAAO,IAAK,EAAI,IAAI,~~CACzD~~,IACP"}
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 IntegrationTransport as MarketplaceTemplate,\n} from \"@openhands/extensions/integrations\";\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 Get the default transport template from an integration catalog entry.\n * Integrations may have multiple connection options; we use the default\n * one (or the first if no default is specified). Only MCP-backed options\n * have a `transport` field.\n /\nexport function getDefaultTemplate(\n entry: MarketplaceEntry,\n): MarketplaceTemplate \| undefined {\n const option =\n entry.connectionOptions.find(\n (o) => o.id === entry.defaultConnectionOptionId,\n ) ?? entry.connectionOptions[0];\n return option?.transport;\n}\n\n/\n Get the stdio (API key-based) transport template from an integration entry.\n * Many integrations have multiple connection options (e.g., OAuth + stdio).\n * Since OAuth isn't implemented in the UI yet, the install modal should use\n * this function to get the stdio-based option that can be configured with\n * API keys/tokens.\n \n Falls back to getDefaultTemplate if no stdio option exists.\n /\nexport function getInstallableTemplate(\n entry: MarketplaceEntry,\n): MarketplaceTemplate \| undefined {\n // First, try to find a stdio option (API key-based, what we can actually install)\n const stdioOption = entry.connectionOptions.find(\n (o) => o.transport?.kind === \"stdio\",\n );\n if (stdioOption?.transport) return stdioOption.transport;\n\n // Fall back to the default template (could be shttp/sse with api_key)\n return getDefaultTemplate(entry);\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 template: MarketplaceTemplate,\n servers: MCPServerConfig[],\n): MCPServerConfig \| null {\n if (template.kind === \"shttp\") {\n const tplUrl = template.url;\n if (!tplUrl) return null;\n return (\n servers.find(\n (s) => s.type === \"shttp\" && !!s.url && urlsMatch(s.url, tplUrl),\n ) ?? null\n );\n }\n\n if (template.kind === \"sse\") {\n const tplUrl = template.url;\n if (!tplUrl) return null;\n return (\n servers.find(\n (s) => s.type === \"sse\" && !!s.url && urlsMatch(s.url, tplUrl),\n ) ?? null\n );\n }\n\n // stdio: match on the registered server name.\n return (\n servers.find((s) => s.type === \"stdio\" && s.name === template.serverName) ??\n null\n );\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 \n Since an entry may have multiple connection options (e.g., OAuth + stdio),\n * we check ALL templates in the entry's connectionOptions, not just the default.\n */\nexport function findCatalogEntryForServer(\n server: MCPServerConfig,\n catalog: MarketplaceEntry[],\n): MarketplaceEntry \| undefined {\n return catalog.find((entry) => {\n // Check all connection options, not just the default\n for (const option of entry.connectionOptions) {\n const tpl = option.transport;\n if (!tpl) continue;\n if (tpl.kind === \"stdio\") {\n if (server.type === \"stdio\" && server.name === tpl.serverName)\n return true;\n }\n // Reuse the same loose URL match as `findInstalledMatch` so a\n // server whose URL was normalized by the backend (trailing slash\n // stripped, query string dropped, etc.) still gets paired with\n // its catalog tile — otherwise the installed-servers list would\n // render the generic icon while the marketplace shows the\n // entry as installed, which is confusing.\n if (tpl.kind === \"shttp\") {\n if (server.type === \"shttp\" && urlsMatch(server.url, tpl.url))\n return true;\n }\n if (tpl.kind === \"sse\") {\n if (server.type === \"sse\" && urlsMatch(server.url, tpl.url))\n return true;\n }\n }\n return false;\n });\n}\n"],"mappings":"6CAMA,IAAM,EAAU,GAA4B,CAC1C,GAAI,CACF,OAAO,IAAI,IAAI,EAAI,MACb,CACN,OAAO,OAeX,SAAgB,EAAU,EAAY,EAAqB,CACzD,IAAM,EAAO,OAAO,GAAM,SAAW,EAAI,GACnC,EAAO,OAAO,GAAM,SAAW,EAAI,GACzC,GAAI,CAAC,GAAQ,CAAC,EAAM,MAAO,GAC3B,IAAM,EAAO,EAAO,EAAK,CACnB,EAAQ,EAAO,EAAK,CAI1B,MAHI,CAAC,GAAQ,CAAC,EACL,EAAK,QAAQ,OAAQ,GAAG,GAAK,EAAK,QAAQ,OAAQ,GAAG,CAG5D,EAAK,WAAa,EAAM,UACxB,EAAK,OAAS,EAAM,MACpB,EAAK,SAAS,QAAQ,OAAQ,GAAG,GAAK,EAAM,SAAS,QAAQ,OAAQ,GAAG,CAU5E,SAAgB,EACd,EACiC,CAKjC,OAHE,EAAM,kBAAkB,KACrB,GAAM,EAAE,KAAO,EAAM,0BACvB,EAAI,EAAM,kBAAkB,KAChB,UAYjB,SAAgB,EACd,EACiC,CAEjC,IAAM,EAAc,EAAM,kBAAkB,KACzC,GAAM,EAAE,WAAW,OAAS,QAC9B,CAID,OAHI,GAAa,UAAkB,EAAY,UAGxC,EAAmB,EAAM,CAuClC,SAAgB,EACd,EACA,EACS,CAGT,MAFI,CAAC,EAAM,qBAAuB,EAAM,sBAAwB,MACvD,GACF,EAAM,sBAAwB,EAGvC,SAAS,EAAU,EAAuB,CACxC,OAAO,EAAM,MAAM,CAAC,aAAa,CAQnC,SAAgB,EACd,EACoB,CACpB,OAAO,EACJ,KAAK,EAAO,KAAW,CAAE,QAAO,QAAO,EAAE,CACzC,MAAM,EAAG,KAEL,EAAE,MAAM,gBAAkB,IAAM,EAAE,MAAM,gBAAkB,IACtC,EAAE,MAAQ,EAAE,MACnC,CACD,KAAK,CAAE,WAAY,EAAM,CAU9B,SAAgB,EACd,EACA,EACS,CACT,IAAM,EAAI,EAAU,EAAS,CAU7B,OATK,EACY,CACf,EAAM,KACN,EAAM,YACN,EAAM,GACN,GAAI,EAAM,UAAY,EAAE,CACzB,CACE,KAAK,IAAI,CACT,aACI,CAAS,SAAS,EAAE,CATZ,GAmBjB,SAAgB,EACd,EACA,EACA,EACS,CACT,IAAM,EAAI,EAAU,EAAS,CAgB7B,OAfK,EACY,CACf,EAAO,KACP,SAAU,EAAS,EAAO,KAAO,IAAA,GACjC,YAAa,EAAS,EAAO,QAAU,IAAA,GACvC,SAAU,EAAS,EAAO,MAAM,KAAK,IAAI,CAAG,IAAA,GAC5C,QAAS,EAAS,EAAO,IAAM,IAAA,GAC/B,GAAc,KACd,GAAc,YACd,GAAc,GACd,GAAI,GAAc,UAAY,EAAE,CACjC,CACE,OAAO,QAAQ,CACf,KAAK,IAAI,CACT,aACI,CAAS,SAAS,EAAE,CAfZ,GA0BjB,SAAgB,EACd,EACA,EAC8B,CAC9B,OAAO,EAAQ,KAAM,GAAU,CAE7B,IAAK,IAAM,KAAU,EAAM,kBAAmB,CAC5C,IAAM,EAAM,EAAO,UACd,OACD,EAAI,OAAS,SACX,EAAO,OAAS,SAAW,EAAO,OAAS,EAAI,YASjD,EAAI,OAAS,SACX,EAAO,OAAS,SAAW,EAAU,EAAO,IAAK,EAAI,IAAI,EAG3D,EAAI,OAAS,OACX,EAAO,OAAS,OAAS,EAAU,EAAO,IAAK,EAAI,IAAI,EACzD,MAAO,GAGb,MAAO,IACP"}

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

@@ -1,5 +1,5 @@
 import { MCPServerConfig } from "#/types/mcp-server";
-import type { McpCatalogEntry as MarketplaceEntry, MarketplaceTemplate } from "@openhands/extensions/mcps";
+import type { IntegrationCatalogEntry as MarketplaceEntry, IntegrationTransport as MarketplaceTemplate } from "@openhands/extensions/integrations";
 /**
  * Loose URL match that ignores query strings, trailing slashes, and
  * default ports. We want clicking "Linear" to flag the entry as
@@ -12,6 +12,23 @@ import type { McpCatalogEntry as MarketplaceEntry, MarketplaceTemplate } from "@
  * fallback below, never calling `.replace` on undefined.
  */
 export declare function urlsMatch(a: unknown, b: unknown): boolean;
+/**
+ * Get the default transport template from an integration catalog entry.
+ * Integrations may have multiple connection options; we use the default
+ * one (or the first if no default is specified). Only MCP-backed options
+ * have a `transport` field.
+ */
+export declare function getDefaultTemplate(entry: MarketplaceEntry): MarketplaceTemplate | undefined;
+/**
+ * Get the stdio (API key-based) transport template from an integration entry.
+ * Many integrations have multiple connection options (e.g., OAuth + stdio).
+ * Since OAuth isn't implemented in the UI yet, the install modal should use
+ * this function to get the stdio-based option that can be configured with
+ * API keys/tokens.
+ *
+ * Falls back to getDefaultTemplate if no stdio option exists.
+ */
+export declare function getInstallableTemplate(entry: MarketplaceEntry): MarketplaceTemplate | undefined;
 /**
  * Decide whether a marketplace template is already represented by one
  * of the installed MCP servers. Used to render an "Installed" badge on
@@ -39,5 +56,8 @@ export declare function installedServerMatchesQuery(server: MCPServerConfig, cat
  * Look up the catalog entry that best matches an installed server.
  * Mirrors the lookup used in `installed-server-card.tsx` for
  * rendering the friendly icon.
+ *
+ * Since an entry may have multiple connection options (e.g., OAuth + stdio),
+ * we check ALL templates in the entry's connectionOptions, not just the default.
  */
 export declare function findCatalogEntryForServer(server: MCPServerConfig, catalog: MarketplaceEntry[]): MarketplaceEntry | undefined;

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

@@ -12,20 +12,27 @@ function t(t, n) {
 	let a = e(r), o = e(i);
 	return !a || !o ? r.replace(/\/+$/, "") === i.replace(/\/+$/, "") : a.protocol === o.protocol && a.host === o.host && a.pathname.replace(/\/+$/, "") === o.pathname.replace(/\/+$/, "");
 }
-function n(e, t) {
-	return !e.availability || e.availability === "all" ? !0 : e.availability === t;
+function n(e) {
+	return (e.connectionOptions.find((t) => t.id === e.defaultConnectionOptionId) ?? e.connectionOptions[0])?.transport;
 }
 function r(e) {
+	let t = e.connectionOptions.find((e) => e.transport?.kind === "stdio");
+	return t?.transport ? t.transport : n(e);
+}
+function i(e, t) {
+	return !e.runtimeAvailability || e.runtimeAvailability === "all" ? !0 : e.runtimeAvailability === t;
+}
+function a(e) {
 	return e.trim().toLowerCase();
 }
-function i(e) {
+function o(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 a(e, t) {
-	let n = r(t);
+function s(e, t) {
+	let n = a(t);
 	return n ? [
 		e.name,
 		e.description,
@@ -33,9 +40,9 @@ function a(e, t) {
 		...e.keywords ?? []
 	].join(" ").toLowerCase().includes(n) : !0;
 }
-function o(e, t, n) {
-	let i = r(n);
-	return i ? [
+function c(e, t, n) {
+	let r = a(n);
+	return r ? [
 		e.type,
 		"name" in e ? e.name : void 0,
 		"command" in e ? e.command : void 0,
@@ -45,15 +52,18 @@ function o(e, t, n) {
 		t?.description,
 		t?.id,
 		...t?.keywords ?? []
-	].filter(Boolean).join(" ").toLowerCase().includes(i) : !0;
+	].filter(Boolean).join(" ").toLowerCase().includes(r) : !0;
 }
-function s(e, n) {
+function l(e, n) {
 	return n.find((n) => {
-		let r = n.template;
-		return r.kind === "stdio" ? e.type === "stdio" && e.name === r.serverName : r.kind === "shttp" ? e.type === "shttp" && t(e.url, r.url) : r.kind === "sse" ? e.type === "sse" && t(e.url, r.url) : !1;
+		for (let r of n.connectionOptions) {
+			let n = r.transport;
+			if (n && (n.kind === "stdio" && e.type === "stdio" && e.name === n.serverName || n.kind === "shttp" && e.type === "shttp" && t(e.url, n.url) || n.kind === "sse" && e.type === "sse" && t(e.url, n.url))) return !0;
+		}
+		return !1;
 	});
 }
 //#endregion
-export { s as findCatalogEntryForServer, i as getMarketplaceEntriesByPopularity, o as installedServerMatchesQuery, n as isMarketplaceEntryAvailable, a as marketplaceEntryMatchesQuery };
+export { l as findCatalogEntryForServer, n as getDefaultTemplate, r as getInstallableTemplate, o as getMarketplaceEntriesByPopularity, c as installedServerMatchesQuery, i as isMarketplaceEntryAvailable, s as marketplaceEntryMatchesQuery };
 //# sourceMappingURL=mcp-marketplace-utils.js.map

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

	@@ -1 +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 ~~McpCatalogEntry~~ as MarketplaceEntry,\n MarketplaceTemplate,\n} from \"@openhands/extensions/~~mcps~~\";\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 template: MarketplaceTemplate,\n servers: MCPServerConfig[],\n): MCPServerConfig \| null {\n if (template.kind === \"shttp\") {\n const tplUrl = template.url;\n if (!tplUrl) return null;\n return (\n servers.find(\n (s) => s.type === \"shttp\" && !!s.url && urlsMatch(s.url, tplUrl),\n ) ?? null\n );\n }\n\n if (template.kind === \"sse\") {\n const tplUrl = template.url;\n if (!tplUrl) return null;\n return (\n servers.find(\n (s) => s.type === \"sse\" && !!s.url && urlsMatch(s.url, tplUrl),\n ) ?? null\n );\n }\n\n // stdio: match on the registered server name.\n return (\n servers.find((s) => s.type === \"stdio\" && s.name === template.serverName) ??\n null\n );\n}\n\nexport function isMarketplaceEntryAvailable(\n entry: MarketplaceEntry,\n backendKind: \"local\" \| \"cloud\",\n): boolean {\n if (!entry.~~availability~~ \|\| entry.~~availability~~ === \"all\") return true;\n return entry.~~availability~~ === 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 const tpl = ~~entry~~.~~template~~;\n if (tpl.kind === \"stdio\")\n ~~return~~ server.type === \"stdio\" && server.name === tpl.serverName;\n // Reuse the same loose URL match as `findInstalledMatch` so a\n // server whose URL was normalized by the backend (trailing slash\n // stripped, query string dropped, etc.) still gets paired with\n // its catalog tile — otherwise the installed-servers list would\n // render the generic icon while the marketplace shows the\n // entry as installed, which is confusing.\n if (tpl.kind === \"shttp\")\n ~~return~~ server.type === \"shttp\" && urlsMatch(server.url, tpl.url);\n if (tpl.kind === \"sse\")\n ~~return~~ server.type === \"sse\" && urlsMatch(server.url, tpl.url);\n return false;\n });\n}\n"],"mappings":";AAMA,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;;~~AAwC5E~~,SAAgB,EACd,GACA,GACS;~~AAET~~,~~QADI~~,CAAC,EAAM,~~gBAAgB~~,EAAM,~~iBAAiB~~,~~QAAc~~,~~KACzD~~,EAAM,~~iBAAiB~~;;~~AAGhC~~,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,MAAU;~~EAC7B~~,~~IAAM~~,IAAM,EAAM;~~AAalB~~,~~SAZI~~,EAAI,SAAS,~~UACR~~,EAAO,SAAS,WAAW,EAAO,SAAS,EAAI,~~aAOpD~~,EAAI,SAAS,~~UACR~~,EAAO,SAAS,WAAW,EAAU,EAAO,KAAK,EAAI,IAAI,~~GAC9D~~,EAAI,SAAS,~~QACR~~,EAAO,SAAS,SAAS,EAAU,EAAO,KAAK,EAAI,IAAI,~~GACzD~~;GACP"}
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 IntegrationTransport as MarketplaceTemplate,\n} from \"@openhands/extensions/integrations\";\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 Get the default transport template from an integration catalog entry.\n * Integrations may have multiple connection options; we use the default\n * one (or the first if no default is specified). Only MCP-backed options\n * have a `transport` field.\n /\nexport function getDefaultTemplate(\n entry: MarketplaceEntry,\n): MarketplaceTemplate \| undefined {\n const option =\n entry.connectionOptions.find(\n (o) => o.id === entry.defaultConnectionOptionId,\n ) ?? entry.connectionOptions[0];\n return option?.transport;\n}\n\n/\n Get the stdio (API key-based) transport template from an integration entry.\n * Many integrations have multiple connection options (e.g., OAuth + stdio).\n * Since OAuth isn't implemented in the UI yet, the install modal should use\n * this function to get the stdio-based option that can be configured with\n * API keys/tokens.\n \n Falls back to getDefaultTemplate if no stdio option exists.\n /\nexport function getInstallableTemplate(\n entry: MarketplaceEntry,\n): MarketplaceTemplate \| undefined {\n // First, try to find a stdio option (API key-based, what we can actually install)\n const stdioOption = entry.connectionOptions.find(\n (o) => o.transport?.kind === \"stdio\",\n );\n if (stdioOption?.transport) return stdioOption.transport;\n\n // Fall back to the default template (could be shttp/sse with api_key)\n return getDefaultTemplate(entry);\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 template: MarketplaceTemplate,\n servers: MCPServerConfig[],\n): MCPServerConfig \| null {\n if (template.kind === \"shttp\") {\n const tplUrl = template.url;\n if (!tplUrl) return null;\n return (\n servers.find(\n (s) => s.type === \"shttp\" && !!s.url && urlsMatch(s.url, tplUrl),\n ) ?? null\n );\n }\n\n if (template.kind === \"sse\") {\n const tplUrl = template.url;\n if (!tplUrl) return null;\n return (\n servers.find(\n (s) => s.type === \"sse\" && !!s.url && urlsMatch(s.url, tplUrl),\n ) ?? null\n );\n }\n\n // stdio: match on the registered server name.\n return (\n servers.find((s) => s.type === \"stdio\" && s.name === template.serverName) ??\n null\n );\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 \n Since an entry may have multiple connection options (e.g., OAuth + stdio),\n * we check ALL templates in the entry's connectionOptions, not just the default.\n */\nexport function findCatalogEntryForServer(\n server: MCPServerConfig,\n catalog: MarketplaceEntry[],\n): MarketplaceEntry \| undefined {\n return catalog.find((entry) => {\n // Check all connection options, not just the default\n for (const option of entry.connectionOptions) {\n const tpl = option.transport;\n if (!tpl) continue;\n if (tpl.kind === \"stdio\") {\n if (server.type === \"stdio\" && server.name === tpl.serverName)\n return true;\n }\n // Reuse the same loose URL match as `findInstalledMatch` so a\n // server whose URL was normalized by the backend (trailing slash\n // stripped, query string dropped, etc.) still gets paired with\n // its catalog tile — otherwise the installed-servers list would\n // render the generic icon while the marketplace shows the\n // entry as installed, which is confusing.\n if (tpl.kind === \"shttp\") {\n if (server.type === \"shttp\" && urlsMatch(server.url, tpl.url))\n return true;\n }\n if (tpl.kind === \"sse\") {\n if (server.type === \"sse\" && urlsMatch(server.url, tpl.url))\n return true;\n }\n }\n return false;\n });\n}\n"],"mappings":";AAMA,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;;AAU5E,SAAgB,EACd,GACiC;AAKjC,SAHE,EAAM,kBAAkB,MACrB,MAAM,EAAE,OAAO,EAAM,0BACvB,IAAI,EAAM,kBAAkB,KAChB;;AAYjB,SAAgB,EACd,GACiC;CAEjC,IAAM,IAAc,EAAM,kBAAkB,MACzC,MAAM,EAAE,WAAW,SAAS,QAC9B;AAID,QAHI,GAAa,YAAkB,EAAY,YAGxC,EAAmB,EAAM;;AAuClC,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;;AA0BjB,SAAgB,EACd,GACA,GAC8B;AAC9B,QAAO,EAAQ,MAAM,MAAU;AAE7B,OAAK,IAAM,KAAU,EAAM,mBAAmB;GAC5C,IAAM,IAAM,EAAO;AACd,aACD,EAAI,SAAS,WACX,EAAO,SAAS,WAAW,EAAO,SAAS,EAAI,cASjD,EAAI,SAAS,WACX,EAAO,SAAS,WAAW,EAAU,EAAO,KAAK,EAAI,IAAI,IAG3D,EAAI,SAAS,SACX,EAAO,SAAS,SAAS,EAAU,EAAO,KAAK,EAAI,IAAI,EACzD,QAAO;;AAGb,SAAO;GACP"}

package/dist/utils/settings-utils.cjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"settings-utils.cjs","names":[],"sources":["../../src/utils/settings-utils.ts"],"sourcesContent":["import { WebClientFeatureFlags } from \"#/api/option-service/option.types\";\nimport { Settings, SettingsValue } from \"#/types/settings\";\nimport { getProviderId } from \"#/utils/map-provider\";\n\nconst extractBasicFormData = (formData: FormData) => {\n const providerDisplay = formData.get(\"llm-provider-input\")?.toString();\n const provider = providerDisplay ? getProviderId(providerDisplay) : undefined;\n const model = formData.get(\"llm-model-input\")?.toString();\n\n return {\n llmModel: provider && model ? `${provider}/${model}` : undefined,\n llmApiKey: formData.get(\"llm-api-key-input\")?.toString(),\n agent: formData.get(\"agent\")?.toString(),\n language: formData.get(\"language\")?.toString(),\n };\n};\n\nexport const parseMaxBudgetPerTask = (value: string): number \| null => {\n if (!value) {\n return null;\n }\n\n const parsedValue = parseFloat(value);\n return parsedValue && parsedValue >= 1 && Number.isFinite(parsedValue)\n ? parsedValue\n : null;\n};\n\nexport const extractSettings = (\n formData: FormData,\n): Partial<Settings> & Record<string, unknown> => {\n const { llmModel, llmApiKey, agent, language } =\n extractBasicFormData(formData);\n\n const llm: Record<string, unknown> = {};\n if (llmModel) llm.model = llmModel;\n if (llmApiKey !== undefined) llm.api_key = llmApiKey;\n\n const agentSettings: Record<string, SettingsValue> = {};\n if (Object.keys(llm).length > 0)\n agentSettings.llm = llm as Record<string, SettingsValue>;\n if (agent) agentSettings.agent = agent;\n\n return {\n ...(Object.keys(agentSettings).length > 0\n ? { agent_settings_diff: agentSettings }\n : {}),\n ...(language ? { language } : {}),\n };\n};\n\nexport function isSettingsPageHidden(\n path: string,\n featureFlags: WebClientFeatureFlags \| undefined,\n): boolean {\n if (featureFlags?.hide_llm_settings && path === \"/settings/llm\") return true;\n return false;\n}\n\nexport function getFirstAvailablePath(\n featureFlags: WebClientFeatureFlags \| undefined,\n): string \| null {\n // ``/settings/agent`` ~~precedes~~ ~~``/settings``~~ ~~because~~ it is the ~~ACP~~\n // ~~landing~~ ~~page~~ ~~and~~ is ~~always~~ ~~available~~ ~~(no~~ ~~feature~~ ~~flag~~ ~~hides~~ ~~it).\~~n // ~~When~~ ~~``hide_llm_settings``~~ is ~~on,~~ ~~the~~ ~~user~~ is ~~steered~~ ~~there rather~~\n // ~~than~~ to ~~``/settings/app``~~ ~~(an~~ ~~unrelated~~ ~~section~~ ~~that~~ ~~used~~ to ~~win~~ ~~the~~\n // ~~fallback).~~ ~~For~~ ~~OpenHands-agent~~ ~~users~~ ~~this~~ is ~~also~~ a ~~sensible landing~~\n // — ~~the~~ ~~Agent~~ ~~page~~ is the ~~single~~ ~~place to switch kinds~~.\n const fallbackOrder = [\n { path: \"/settings/~~llm~~\", hidden: ~~!!featureFlags?.hide_llm_settings~~ },\n { path: \"/settings/~~agent~~\", hidden: ~~false~~ },\n { path: \"/settings\", hidden: !!featureFlags?.hide_llm_settings },\n { path: \"/settings/app\", hidden: false },\n { path: \"/settings/secrets\", hidden: false },\n ];\n\n const firstAvailable = fallbackOrder.find((item) => !item.hidden);\n return firstAvailable?.path ?? null;\n}\n"],"mappings":"mFAIA,IAAM,EAAwB,GAAuB,CACnD,IAAM,EAAkB,EAAS,IAAI,qBAAqB,EAAE,UAAU,CAChE,EAAW,EAAkB,EAAA,cAAc,EAAgB,CAAG,IAAA,GAC9D,EAAQ,EAAS,IAAI,kBAAkB,EAAE,UAAU,CAEzD,MAAO,CACL,SAAU,GAAY,EAAQ,GAAG,EAAS,GAAG,IAAU,IAAA,GACvD,UAAW,EAAS,IAAI,oBAAoB,EAAE,UAAU,CACxD,MAAO,EAAS,IAAI,QAAQ,EAAE,UAAU,CACxC,SAAU,EAAS,IAAI,WAAW,EAAE,UAAU,CAC/C,EAcU,EACX,GACgD,CAChD,GAAM,CAAE,WAAU,YAAW,QAAO,YAClC,EAAqB,EAAS,CAE1B,EAA+B,EAAE,CACnC,IAAU,EAAI,MAAQ,GACtB,IAAc,IAAA,KAAW,EAAI,QAAU,GAE3C,IAAM,EAA+C,EAAE,CAKvD,OAJI,OAAO,KAAK,EAAI,CAAC,OAAS,IAC5B,EAAc,IAAM,GAClB,IAAO,EAAc,MAAQ,GAE1B,CACL,GAAI,OAAO,KAAK,EAAc,CAAC,OAAS,EACpC,CAAE,oBAAqB,EAAe,CACtC,EAAE,CACN,GAAI,EAAW,CAAE,WAAU,CAAG,EAAE,CACjC"}
1	+ {"version":3,"file":"settings-utils.cjs","names":[],"sources":["../../src/utils/settings-utils.ts"],"sourcesContent":["import { WebClientFeatureFlags } from \"#/api/option-service/option.types\";\nimport { Settings, SettingsValue } from \"#/types/settings\";\nimport { getProviderId } from \"#/utils/map-provider\";\n\nconst extractBasicFormData = (formData: FormData) => {\n const providerDisplay = formData.get(\"llm-provider-input\")?.toString();\n const provider = providerDisplay ? getProviderId(providerDisplay) : undefined;\n const model = formData.get(\"llm-model-input\")?.toString();\n\n return {\n llmModel: provider && model ? `${provider}/${model}` : undefined,\n llmApiKey: formData.get(\"llm-api-key-input\")?.toString(),\n agent: formData.get(\"agent\")?.toString(),\n language: formData.get(\"language\")?.toString(),\n };\n};\n\nexport const parseMaxBudgetPerTask = (value: string): number \| null => {\n if (!value) {\n return null;\n }\n\n const parsedValue = parseFloat(value);\n return parsedValue && parsedValue >= 1 && Number.isFinite(parsedValue)\n ? parsedValue\n : null;\n};\n\nexport const extractSettings = (\n formData: FormData,\n): Partial<Settings> & Record<string, unknown> => {\n const { llmModel, llmApiKey, agent, language } =\n extractBasicFormData(formData);\n\n const llm: Record<string, unknown> = {};\n if (llmModel) llm.model = llmModel;\n if (llmApiKey !== undefined) llm.api_key = llmApiKey;\n\n const agentSettings: Record<string, SettingsValue> = {};\n if (Object.keys(llm).length > 0)\n agentSettings.llm = llm as Record<string, SettingsValue>;\n if (agent) agentSettings.agent = agent;\n\n return {\n ...(Object.keys(agentSettings).length > 0\n ? { agent_settings_diff: agentSettings }\n : {}),\n ...(language ? { language } : {}),\n };\n};\n\nexport function isSettingsPageHidden(\n path: string,\n featureFlags: WebClientFeatureFlags \| undefined,\n): boolean {\n if (featureFlags?.hide_llm_settings && path === \"/settings/llm\") return true;\n return false;\n}\n\nexport function getFirstAvailablePath(\n featureFlags: WebClientFeatureFlags \| undefined,\n): string \| null {\n // ``/settings/agent`` always wins: it is the single place to switch\n // agent kinds (OpenHands / ACP) and the only sub-page that is always\n // available regardless of feature flags. Landing here keeps the\n // routing simple — ACP users no longer have to bounce through\n // ``/settings/llm`` (which is disabled for them), and OpenHands users\n // are one nav-click away from the LLM page.\n const fallbackOrder = [\n { path: \"/settings/agent\", hidden: false },\n { path: \"/settings/llm\", hidden: !!featureFlags?.hide_llm_settings },\n { path: \"/settings\", hidden: !!featureFlags?.hide_llm_settings },\n { path: \"/settings/app\", hidden: false },\n { path: \"/settings/secrets\", hidden: false },\n ];\n\n const firstAvailable = fallbackOrder.find((item) => !item.hidden);\n return firstAvailable?.path ?? null;\n}\n"],"mappings":"mFAIA,IAAM,EAAwB,GAAuB,CACnD,IAAM,EAAkB,EAAS,IAAI,qBAAqB,EAAE,UAAU,CAChE,EAAW,EAAkB,EAAA,cAAc,EAAgB,CAAG,IAAA,GAC9D,EAAQ,EAAS,IAAI,kBAAkB,EAAE,UAAU,CAEzD,MAAO,CACL,SAAU,GAAY,EAAQ,GAAG,EAAS,GAAG,IAAU,IAAA,GACvD,UAAW,EAAS,IAAI,oBAAoB,EAAE,UAAU,CACxD,MAAO,EAAS,IAAI,QAAQ,EAAE,UAAU,CACxC,SAAU,EAAS,IAAI,WAAW,EAAE,UAAU,CAC/C,EAcU,EACX,GACgD,CAChD,GAAM,CAAE,WAAU,YAAW,QAAO,YAClC,EAAqB,EAAS,CAE1B,EAA+B,EAAE,CACnC,IAAU,EAAI,MAAQ,GACtB,IAAc,IAAA,KAAW,EAAI,QAAU,GAE3C,IAAM,EAA+C,EAAE,CAKvD,OAJI,OAAO,KAAK,EAAI,CAAC,OAAS,IAC5B,EAAc,IAAM,GAClB,IAAO,EAAc,MAAQ,GAE1B,CACL,GAAI,OAAO,KAAK,EAAc,CAAC,OAAS,EACpC,CAAE,oBAAqB,EAAe,CACtC,EAAE,CACN,GAAI,EAAW,CAAE,WAAU,CAAG,EAAE,CACjC"}

package/dist/utils/settings-utils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"settings-utils.js","names":[],"sources":["../../src/utils/settings-utils.ts"],"sourcesContent":["import { WebClientFeatureFlags } from \"#/api/option-service/option.types\";\nimport { Settings, SettingsValue } from \"#/types/settings\";\nimport { getProviderId } from \"#/utils/map-provider\";\n\nconst extractBasicFormData = (formData: FormData) => {\n const providerDisplay = formData.get(\"llm-provider-input\")?.toString();\n const provider = providerDisplay ? getProviderId(providerDisplay) : undefined;\n const model = formData.get(\"llm-model-input\")?.toString();\n\n return {\n llmModel: provider && model ? `${provider}/${model}` : undefined,\n llmApiKey: formData.get(\"llm-api-key-input\")?.toString(),\n agent: formData.get(\"agent\")?.toString(),\n language: formData.get(\"language\")?.toString(),\n };\n};\n\nexport const parseMaxBudgetPerTask = (value: string): number \| null => {\n if (!value) {\n return null;\n }\n\n const parsedValue = parseFloat(value);\n return parsedValue && parsedValue >= 1 && Number.isFinite(parsedValue)\n ? parsedValue\n : null;\n};\n\nexport const extractSettings = (\n formData: FormData,\n): Partial<Settings> & Record<string, unknown> => {\n const { llmModel, llmApiKey, agent, language } =\n extractBasicFormData(formData);\n\n const llm: Record<string, unknown> = {};\n if (llmModel) llm.model = llmModel;\n if (llmApiKey !== undefined) llm.api_key = llmApiKey;\n\n const agentSettings: Record<string, SettingsValue> = {};\n if (Object.keys(llm).length > 0)\n agentSettings.llm = llm as Record<string, SettingsValue>;\n if (agent) agentSettings.agent = agent;\n\n return {\n ...(Object.keys(agentSettings).length > 0\n ? { agent_settings_diff: agentSettings }\n : {}),\n ...(language ? { language } : {}),\n };\n};\n\nexport function isSettingsPageHidden(\n path: string,\n featureFlags: WebClientFeatureFlags \| undefined,\n): boolean {\n if (featureFlags?.hide_llm_settings && path === \"/settings/llm\") return true;\n return false;\n}\n\nexport function getFirstAvailablePath(\n featureFlags: WebClientFeatureFlags \| undefined,\n): string \| null {\n // ``/settings/agent`` ~~precedes~~ ~~``/settings``~~ ~~because~~ it is the ~~ACP~~\n // ~~landing~~ ~~page~~ ~~and~~ is ~~always~~ ~~available~~ ~~(no~~ ~~feature~~ ~~flag~~ ~~hides~~ ~~it).\~~n // ~~When~~ ~~``hide_llm_settings``~~ is ~~on,~~ ~~the~~ ~~user~~ is ~~steered~~ ~~there rather~~\n // ~~than~~ to ~~``/settings/app``~~ ~~(an~~ ~~unrelated~~ ~~section~~ ~~that~~ ~~used~~ to ~~win~~ ~~the~~\n // ~~fallback).~~ ~~For~~ ~~OpenHands-agent~~ ~~users~~ ~~this~~ is ~~also~~ a ~~sensible landing~~\n // — ~~the~~ ~~Agent~~ ~~page~~ is the ~~single~~ ~~place to switch kinds~~.\n const fallbackOrder = [\n { path: \"/settings/~~llm~~\", hidden: ~~!!featureFlags?.hide_llm_settings~~ },\n { path: \"/settings/~~agent~~\", hidden: ~~false~~ },\n { path: \"/settings\", hidden: !!featureFlags?.hide_llm_settings },\n { path: \"/settings/app\", hidden: false },\n { path: \"/settings/secrets\", hidden: false },\n ];\n\n const firstAvailable = fallbackOrder.find((item) => !item.hidden);\n return firstAvailable?.path ?? null;\n}\n"],"mappings":";;AAIA,IAAM,KAAwB,MAAuB;CACnD,IAAM,IAAkB,EAAS,IAAI,qBAAqB,EAAE,UAAU,EAChE,IAAW,IAAkB,EAAc,EAAgB,GAAG,KAAA,GAC9D,IAAQ,EAAS,IAAI,kBAAkB,EAAE,UAAU;AAEzD,QAAO;EACL,UAAU,KAAY,IAAQ,GAAG,EAAS,GAAG,MAAU,KAAA;EACvD,WAAW,EAAS,IAAI,oBAAoB,EAAE,UAAU;EACxD,OAAO,EAAS,IAAI,QAAQ,EAAE,UAAU;EACxC,UAAU,EAAS,IAAI,WAAW,EAAE,UAAU;EAC/C;GAcU,KACX,MACgD;CAChD,IAAM,EAAE,aAAU,cAAW,UAAO,gBAClC,EAAqB,EAAS,EAE1B,IAA+B,EAAE;AAEvC,CADI,MAAU,EAAI,QAAQ,IACtB,MAAc,KAAA,MAAW,EAAI,UAAU;CAE3C,IAAM,IAA+C,EAAE;AAKvD,QAJI,OAAO,KAAK,EAAI,CAAC,SAAS,MAC5B,EAAc,MAAM,IAClB,MAAO,EAAc,QAAQ,IAE1B;EACL,GAAI,OAAO,KAAK,EAAc,CAAC,SAAS,IACpC,EAAE,qBAAqB,GAAe,GACtC,EAAE;EACN,GAAI,IAAW,EAAE,aAAU,GAAG,EAAE;EACjC"}
1	+ {"version":3,"file":"settings-utils.js","names":[],"sources":["../../src/utils/settings-utils.ts"],"sourcesContent":["import { WebClientFeatureFlags } from \"#/api/option-service/option.types\";\nimport { Settings, SettingsValue } from \"#/types/settings\";\nimport { getProviderId } from \"#/utils/map-provider\";\n\nconst extractBasicFormData = (formData: FormData) => {\n const providerDisplay = formData.get(\"llm-provider-input\")?.toString();\n const provider = providerDisplay ? getProviderId(providerDisplay) : undefined;\n const model = formData.get(\"llm-model-input\")?.toString();\n\n return {\n llmModel: provider && model ? `${provider}/${model}` : undefined,\n llmApiKey: formData.get(\"llm-api-key-input\")?.toString(),\n agent: formData.get(\"agent\")?.toString(),\n language: formData.get(\"language\")?.toString(),\n };\n};\n\nexport const parseMaxBudgetPerTask = (value: string): number \| null => {\n if (!value) {\n return null;\n }\n\n const parsedValue = parseFloat(value);\n return parsedValue && parsedValue >= 1 && Number.isFinite(parsedValue)\n ? parsedValue\n : null;\n};\n\nexport const extractSettings = (\n formData: FormData,\n): Partial<Settings> & Record<string, unknown> => {\n const { llmModel, llmApiKey, agent, language } =\n extractBasicFormData(formData);\n\n const llm: Record<string, unknown> = {};\n if (llmModel) llm.model = llmModel;\n if (llmApiKey !== undefined) llm.api_key = llmApiKey;\n\n const agentSettings: Record<string, SettingsValue> = {};\n if (Object.keys(llm).length > 0)\n agentSettings.llm = llm as Record<string, SettingsValue>;\n if (agent) agentSettings.agent = agent;\n\n return {\n ...(Object.keys(agentSettings).length > 0\n ? { agent_settings_diff: agentSettings }\n : {}),\n ...(language ? { language } : {}),\n };\n};\n\nexport function isSettingsPageHidden(\n path: string,\n featureFlags: WebClientFeatureFlags \| undefined,\n): boolean {\n if (featureFlags?.hide_llm_settings && path === \"/settings/llm\") return true;\n return false;\n}\n\nexport function getFirstAvailablePath(\n featureFlags: WebClientFeatureFlags \| undefined,\n): string \| null {\n // ``/settings/agent`` always wins: it is the single place to switch\n // agent kinds (OpenHands / ACP) and the only sub-page that is always\n // available regardless of feature flags. Landing here keeps the\n // routing simple — ACP users no longer have to bounce through\n // ``/settings/llm`` (which is disabled for them), and OpenHands users\n // are one nav-click away from the LLM page.\n const fallbackOrder = [\n { path: \"/settings/agent\", hidden: false },\n { path: \"/settings/llm\", hidden: !!featureFlags?.hide_llm_settings },\n { path: \"/settings\", hidden: !!featureFlags?.hide_llm_settings },\n { path: \"/settings/app\", hidden: false },\n { path: \"/settings/secrets\", hidden: false },\n ];\n\n const firstAvailable = fallbackOrder.find((item) => !item.hidden);\n return firstAvailable?.path ?? null;\n}\n"],"mappings":";;AAIA,IAAM,KAAwB,MAAuB;CACnD,IAAM,IAAkB,EAAS,IAAI,qBAAqB,EAAE,UAAU,EAChE,IAAW,IAAkB,EAAc,EAAgB,GAAG,KAAA,GAC9D,IAAQ,EAAS,IAAI,kBAAkB,EAAE,UAAU;AAEzD,QAAO;EACL,UAAU,KAAY,IAAQ,GAAG,EAAS,GAAG,MAAU,KAAA;EACvD,WAAW,EAAS,IAAI,oBAAoB,EAAE,UAAU;EACxD,OAAO,EAAS,IAAI,QAAQ,EAAE,UAAU;EACxC,UAAU,EAAS,IAAI,WAAW,EAAE,UAAU;EAC/C;GAcU,KACX,MACgD;CAChD,IAAM,EAAE,aAAU,cAAW,UAAO,gBAClC,EAAqB,EAAS,EAE1B,IAA+B,EAAE;AAEvC,CADI,MAAU,EAAI,QAAQ,IACtB,MAAc,KAAA,MAAW,EAAI,UAAU;CAE3C,IAAM,IAA+C,EAAE;AAKvD,QAJI,OAAO,KAAK,EAAI,CAAC,SAAS,MAC5B,EAAc,MAAM,IAClB,MAAO,EAAc,QAAQ,IAE1B;EACL,GAAI,OAAO,KAAK,EAAc,CAAC,SAAS,IACpC,EAAE,qBAAqB,GAAe,GACtC,EAAE;EACN,GAAI,IAAW,EAAE,aAAU,GAAG,EAAE;EACjC"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@openhands/agent-canvas",
-  "version": "1.0.0-alpha.7",
+  "version": "1.0.0-alpha.9",
   "description": "Agent Canvas UI for OpenHands - run AI coding agents with a visual interface",
   "license": "MIT",
   "private": false,
@@ -23,8 +23,8 @@
     "@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#b8c1869ec9dea4467bb27d5754dc695d14e27889",
-    "@openhands/typescript-client": "1.23.3",
+    "@openhands/extensions": "git+https://github.com/OpenHands/extensions.git#e14f740c59b4bfd7369d4bb6aea5eeb33dd05909",
+    "@openhands/typescript-client": "1.24.3",
     "@react-router/node": "7.14.2",
     "@react-router/serve": "7.14.2",
     "@tailwindcss/vite": "4.2.4",
@@ -80,6 +80,7 @@
     "test": "npm run make-i18n && vitest run",
     "test:e2e": "playwright test --pass-with-no-tests",
     "test:e2e:live": "node --env-file-if-exists=.env tests/e2e/live/scripts/run-live-e2e.mjs",
+    "test:e2e:mock-llm": "playwright test --config=playwright.mock-llm.config.ts",
     "test:e2e:snapshots": "playwright test tests/e2e/snapshots --project=chromium --retries=0",
     "test:e2e:snapshots:update": "playwright test tests/e2e/snapshots --project=chromium --update-snapshots",
     "test:coverage": "npm run make-i18n && vitest run --coverage",
@@ -173,7 +174,8 @@
     "bin",
     "build",
     "config",
-    "scripts"
+    "scripts",
+    "tools"
   ],
   "exports": {
     ".": {

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

@@ -19,7 +19,7 @@
  *
  * Usage:
  *   node scripts/check-sdk-version-sync.mjs
- *   EXPECTED_SDK_VERSION=1.23.1 node scripts/check-sdk-version-sync.mjs
+ *   EXPECTED_SDK_VERSION=1.24.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.23.1"}}'
+    -d '{"event_type": "sdk-version-check", "client_payload": {"version": "1.24.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.23.1,<2.0.0"
- *   "openhands-tools==1.23.1"
- *   "openhands-workspace (>=1.23.1)"
+ *   "openhands-sdk>=1.24.0,<2.0.0"
+ *   "openhands-tools==1.24.0"
+ *   "openhands-workspace (>=1.24.0)"
  */
 function parseSdkVersionsFromRequiresDist(requiresDist) {
   const versions = {};
@@ -284,7 +284,7 @@ function parseSdkVersionsFromRequiresDist(requiresDist) {
       }
       // Extract the version number - look for patterns like:
-      // ">=1.23.1", "==1.23.1", "(>=1.23.1)", "~=1.23.1"
+      // ">=1.24.0", "==1.24.0", "(>=1.24.0)", "~=1.24.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 CHANGED Viewed

@@ -210,6 +210,36 @@ function tryPort(port, host = "127.0.0.1") {
   });
 }
+/**
+ * Assert that all listed ports are available, throwing a descriptive error if
+ * any are already in use.
+ *
+ * Intended as a pre-flight check before spawning services so that a concurrent
+ * agent-canvas instance is detected immediately rather than silently starting
+ * on a different port.
+ *
+ * @param {Array<{name: string, port: number}>} portConfigs - Named port list
+ * @param {string} [host]
+ */
+export async function assertPortsFree(portConfigs, host = "127.0.0.1") {
+  const results = await Promise.all(
+    portConfigs.map(async ({ name, port }) => ({
+      name,
+      port,
+      free: await tryPort(port, host),
+    })),
+  );
+  const busy = results.filter(({ free }) => !free);
+  if (busy.length === 0) return;
+  const lines = busy.map(({ name, port }) => `   • ${name}: port ${port}`).join("\n");
+  throw new Error(
+    `Cannot start: the following ports are already in use:\n\n${lines}\n\n` +
+      `Another agent-canvas instance may already be running.\n` +
+      `Stop it first, or override the port via environment variables (e.g. PORT=<other>).`,
+  );
+}
 /**
  * Find multiple free ports at once, each preferring its specified default.
  *
@@ -337,7 +367,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.23.1")
+ * - OH_AGENT_SERVER_VERSION: Specific PyPI version (e.g., "1.24.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
@@ -491,26 +521,14 @@ export async function buildSafeDevConfigAsync(
     preferredBackendPort + 1,
   );
-  // Find available ports, preferring the defaults
-  const ports = await findFreePorts([
-    { name: "backend", preferred: preferredBackendPort },
-    { name: "vscode", preferred: preferredVscodePort },
+  // Fail fast if any required port is already in use.
+  await assertPortsFree([
+    { name: "agent-server", port: preferredBackendPort },
+    { name: "vscode", port: preferredVscodePort },
   ]);
-  // Log if we're using non-default ports
-  if (ports.backend !== preferredBackendPort) {
-    console.log(
-      `  ℹ Port ${preferredBackendPort} busy, using ${ports.backend} for agent-server`,
-    );
-  }
-  if (ports.vscode !== preferredVscodePort) {
-    console.log(
-      `  ℹ Port ${preferredVscodePort} busy, using ${ports.vscode} for vscode`,
-    );
-  }
   return buildConfigFromPorts(
-    { backendPort: ports.backend, vscodePort: ports.vscode },
+    { backendPort: preferredBackendPort, vscodePort: preferredVscodePort },
     cwd,
     env,
   );
@@ -606,6 +624,17 @@ function buildConfigFromPorts(ports, cwd, env) {
  */
 export function buildAgentServerEnv(config) {
   return {
+    // Force Python to use UTF-8 for all file I/O and streams.
+    //
+    // On Windows, Python defaults to the system ANSI codepage (e.g. cp1252).
+    // The agent-server writes conversation metadata JSON that can contain
+    // emoji (e.g. ✅ U+2705) which cp1252 cannot encode, producing:
+    //   UnicodeEncodeError: 'charmap' codec can't encode character '\u2705'
+    // Setting PYTHONUTF8=1 enables Python's UTF-8 mode (PEP 540) for the
+    // entire agent-server process, matching the behaviour on Linux/macOS
+    // where the locale is already UTF-8.
+    // This is a no-op on Linux/macOS where the locale is already UTF-8.
+    PYTHONUTF8: "1",
     TMUX_TMPDIR: config.tmuxTmpDir,
     OH_CONVERSATIONS_PATH: config.conversationsPath,
     OH_BASH_EVENTS_DIR: config.bashEventsDir,
@@ -753,17 +782,24 @@ export function buildNpmScriptCommand(
   env = process.env,
   nodeExecPath = process.execPath,
 ) {
-  if (env.npm_execpath) {
+  // On Windows, always use cmd.exe regardless of whether npm_execpath is set.
+  // npm_execpath points to a path like
+  // "C:\Program Files\nodejs\node_modules\npm\bin\npm-cli.js" which contains
+  // spaces. When that path is passed as an argument with shell:true in
+  // spawnService, cmd.exe splits on the space and tries to run "C:\Program"
+  // as a command, producing "not recognized as an internal or external command".
+  // Using "npm" via cmd.exe avoids the problem entirely.
+  if (platform === "win32") {
     return {
-      command: env.npm_node_execpath || nodeExecPath,
-      args: [env.npm_execpath, "run", scriptName],
+      command: env.ComSpec || "cmd.exe",
+      args: ["/d", "/s", "/c", "npm", "run", scriptName],
     };
   }
-  if (platform === "win32") {
+  if (env.npm_execpath) {
     return {
-      command: env.ComSpec || "cmd.exe",
-      args: ["/d", "/s", "/c", "npm", "run", scriptName],
+      command: env.npm_node_execpath || nodeExecPath,
+      args: [env.npm_execpath, "run", scriptName],
     };
   }