@webmcp-auto-ui/sdk 2.5.31 → 2.5.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webmcp-auto-ui/sdk",
-  "version": "2.5.31",
+  "version": "2.5.33",
   "description": "Skills CRUD, HyperSkill format, Svelte 5 stores",
   "license": "AGPL-3.0-or-later",
   "type": "module",

package/src/index.ts

@@ -96,3 +96,6 @@ export type { ParsedSegment, RunResult, RunLog, RunTab, RecipeData } from './rec
 
 // Short URL — domain-dependent compact token
 export { buildShortUrl, getShortToken } from './short-url.js';
+
+// Widget sample-data extractor — parses the `## Example` block of a recipe
+export { extractSampleData } from './widget-sample-data.js';

package/src/stores/canvas.svelte.ts

@@ -80,7 +80,6 @@ function createCanvas() {
     // Setters (kept for backward compat)
     setMode(m: Mode) { canvasVanilla.setMode(m); },
     setLlm(l: LLMId) { canvasVanilla.setLlm(l); },
-    setMcpUrl(u: string) { canvasVanilla.setMcpUrl(u); },
     setGenerating(g: boolean) { canvasVanilla.setGenerating(g); },
 
     // Widget actions (primary name)
@@ -101,11 +100,6 @@ function createCanvas() {
     updateMsg: canvasVanilla.updateMsg.bind(canvasVanilla),
     clearMessages: canvasVanilla.clearMessages.bind(canvasVanilla),
 
-    // MCP
-    setMcpConnecting: canvasVanilla.setMcpConnecting.bind(canvasVanilla),
-    setMcpConnected: canvasVanilla.setMcpConnected.bind(canvasVanilla),
-    setMcpError: canvasVanilla.setMcpError.bind(canvasVanilla),
-
     // Theme
     get themeOverrides() { return themeOverrides; },
     setThemeOverrides: canvasVanilla.setThemeOverrides.bind(canvasVanilla),
@@ -118,6 +112,7 @@ function createCanvas() {
     get dataServers() { return dataServers; },
     set dataServers(v: DataServer[]) { canvasVanilla.dataServers = v; },
     addDataServer: canvasVanilla.addDataServer.bind(canvasVanilla),
+    addMcpServer: canvasVanilla.addMcpServer.bind(canvasVanilla),
     removeDataServer: canvasVanilla.removeDataServer.bind(canvasVanilla),
     getDataServer: canvasVanilla.getDataServer.bind(canvasVanilla),
     setDataServerMeta: canvasVanilla.setDataServerMeta.bind(canvasVanilla),

package/src/stores/canvas.ts

@@ -10,17 +10,15 @@
  *
  * Historically this store had TWO parallel surfaces for MCP servers:
  *   - `mcpUrl` / `mcpName` / `mcpConnected` / `mcpConnecting` / `mcpTools`
- *     (flat, single-server or comma-joined multi)
+ *     (flat, single-server or comma-joined multi) driven by legacy
+ *     `setMcpConnected`/`setMcpConnecting`/`setMcpError` setters.
  *   - `dataServers: DataServer[]` (list, managed by MultiMcpBridge)
  *
- * They were actually the same concept. This file now stores a single list
- * (`_servers`) and derives the flat `mcp*` fields from it. All writes (via
- * `setMcpConnected`, `addDataServer`, etc.) mutate the same underlying list,
- * so tools populated by the agent-MCP path are visible to the notebook / data
- * server consumers and vice-versa.
- *
- * The public API shape is preserved (both `mcp*` and `dataServers` / `addDataServer`)
- * so existing apps keep working without modification.
+ * They were the same concept. The legacy setters and the `primary` flag have
+ * been removed; writes go through `addDataServer` / `setDataServerMeta` /
+ * `setDataServerEnabled` / `addMcpServer` (url shorthand) exclusively. Flat
+ * getters (`mcpConnected`, `mcpName`, `mcpUrl`, `mcpConnecting`, `mcpTools`)
+ * remain as read-only derivations over the server list for UI back-compat.
  */
 
 import { encode, decode } from '../hyperskills.js';
@@ -62,9 +60,8 @@ export interface McpToolInfo {
 
 /**
  * Single MCP server entry — the one true shape.
- * `primary: true` marks the "agent MCP" (used by the chat/tool-call path) —
- * at most one server may be primary. Additional servers (data-only) are
- * non-primary but otherwise identical.
+ * All servers are equal; there is no "primary" concept. The MultiMcpBridge
+ * singleton reconciles connection state across all entries.
  */
 export interface DataServer {
   name: string;         // user-chosen label
@@ -73,10 +70,12 @@ export interface DataServer {
   enabled: boolean;     // user intent
   connected: boolean;   // handshake completed
   connecting?: boolean;
-  primary?: boolean;    // agent MCP when true
   tools?: McpToolInfo[];
   recipes?: { name: string; description?: string; body?: string }[];
   error?: string;
+  /** Real server name from MCP handshake (initResult.serverInfo.name, aliased).
+   * Canvas `.name` is URL-host; `.serverName` is what to display. */
+  serverName?: string;
 }
 
 export interface CanvasSnapshot {
@@ -124,9 +123,6 @@ function createCanvasVanilla() {
   let _servers: DataServer[] = [];
 
   // ── Helpers over _servers ──────────────────────────────────────────────
-  function primaryServer(): DataServer | undefined {
-    return _servers.find((s) => s.primary);
-  }
   function connectedServers(): DataServer[] {
     return _servers.filter((s) => s.connected);
   }
@@ -162,33 +158,35 @@ function createCanvasVanilla() {
   }
 
   // ── Server list actions (public, stable) ───────────────────────────────
-  function addDataServer(desc: { name: string; url: string; primary?: boolean }): DataServer {
+  function addDataServer(desc: { name: string; url: string }): DataServer {
     const existing = _servers.find((s) => s.name === desc.name);
-    if (existing) {
-      if (desc.primary && !existing.primary) {
-        // Promote: there's only one primary. Demote others.
-        _servers = _servers.map((s) => ({ ...s, primary: s.name === desc.name }));
-        notify();
-      }
-      return existing;
-    }
+    if (existing) return existing;
     const srv: DataServer = {
       name: desc.name,
       url: desc.url,
       kind: 'data',
       enabled: true,
       connected: false,
-      primary: !!desc.primary,
     };
-    if (srv.primary) {
-      // Demote any existing primary before inserting.
-      _servers = _servers.map((s) => ({ ...s, primary: false }));
-    }
     _servers = [..._servers, srv];
     notify();
     return srv;
   }
 
+  /**
+   * Add a server by URL alone (derives name from the URL host). Returns the
+   * canvas name so callers can reference it later.
+   */
+  function addMcpServer(url: string): string {
+    if (!url) return '';
+    let name: string;
+    try { name = new URL(url, 'http://local').host || url; }
+    catch { name = url; }
+    addDataServer({ name, url });
+    setDataServerEnabled(name, true);
+    return name;
+  }
+
   function removeDataServer(name: string): boolean {
     const before = _servers.length;
     _servers = _servers.filter((s) => s.name !== name);
@@ -222,68 +220,6 @@ function createCanvasVanilla() {
     return setDataServerEnabled(name, !s.enabled);
   }
 
-  // ── Agent-MCP compatibility layer ──────────────────────────────────────
-  // All these mutate the SAME _servers list; `mcpUrl` targets the primary
-  // entry, creating one if none exists. Apps can equivalently call
-  // addDataServer({primary: true}) + setDataServerMeta(name, ...) directly.
-  function ensurePrimary(url?: string): DataServer {
-    let p = primaryServer();
-    if (p) {
-      if (url && p.url !== url) {
-        _servers = _servers.map((s) => s.name === p!.name ? { ...s, url } : s);
-      }
-      return _servers.find((s) => s.primary)!;
-    }
-    // Create a placeholder primary with a stable name derived from the URL.
-    const nm = url ? new URL(url, 'http://local').host || url : 'primary';
-    _servers = [..._servers, {
-      name: nm, url: url ?? '', kind: 'data', enabled: true, connected: false, primary: true,
-    }];
-    return _servers[_servers.length - 1]!;
-  }
-
-  function setMcpUrl(u: string): void {
-    // Update the primary server's URL (create one if none).
-    ensurePrimary(u);
-    notify();
-  }
-
-  function setMcpConnecting(connecting: boolean): void {
-    const p = ensurePrimary();
-    _servers = _servers.map((s) => s.name === p.name ? { ...s, connecting } : s);
-    notify();
-  }
-
-  function setMcpConnected(connected: boolean, name?: string, tools?: McpToolInfo[]): void {
-    if (!connected) {
-      // Disconnect all — agent-level disconnect affects the primary and
-      // traditionally cleared the flat tools. Mirror that by disconnecting
-      // all primary-flagged servers.
-      const p = primaryServer();
-      if (p) {
-        _servers = _servers.map((s) => s.primary
-          ? { ...s, connected: false, connecting: false, tools: [], error: undefined }
-          : s);
-      }
-      notify();
-      return;
-    }
-    const p = ensurePrimary();
-    const newName = name && name.length > 0 ? name : p.name;
-    _servers = _servers.map((s) => s.name === p.name
-      ? { ...s, name: newName, connected: true, connecting: false, tools: tools ?? s.tools ?? [], error: undefined }
-      : s);
-    notify();
-  }
-
-  function setMcpError(err: string): void {
-    const p = ensurePrimary();
-    _servers = _servers.map((s) => s.name === p.name
-      ? { ...s, connected: false, connecting: false, error: err }
-      : s);
-    notify();
-  }
-
   // ── Widget actions ─────────────────────────────────────────────────────
   function addWidget(type: WidgetType, data: Record<string, unknown> = {}): Widget {
     const widget: Widget = { id: uuid(), type, data };
@@ -340,12 +276,12 @@ function createCanvasVanilla() {
 
   // ── HyperSkill ─────────────────────────────────────────────────────────
   function buildSkillJSON() {
-    const p = primaryServer();
+    const first = connectedServers()[0] ?? _servers[0];
     const skill: Record<string, unknown> = {
       version: '1.0',
       name: 'skill-' + Date.now(),
       created: new Date().toISOString(),
-      mcp: p?.url ?? '',
+      mcp: first?.url ?? '',
       llm: _llm,
       blocks: _blocks.map((b) => ({ type: b.type, data: JSON.parse(JSON.stringify(b.data)) })),
     };
@@ -368,7 +304,7 @@ function createCanvasVanilla() {
       servers?: string[];
       blocks?: { type: WidgetType; data: Record<string, unknown> }[];
     }) {
-      if (skill.mcp) ensurePrimary(skill.mcp);
+      if (skill.mcp) addMcpServer(skill.mcp);
       if (skill.llm) _llm = skill.llm;
       if (skill.theme) _themeOverrides = skill.theme;
       if (skill.servers) _enabledServerIds = skill.servers;
@@ -401,7 +337,7 @@ function createCanvasVanilla() {
         content?: { blocks?: { type: WidgetType; data: Record<string, unknown> }[] };
         servers?: string[];
       };
-      if (decoded.meta?.mcp) ensurePrimary(decoded.meta.mcp as string);
+      if (decoded.meta?.mcp) addMcpServer(decoded.meta.mcp as string);
       if (decoded.meta?.llm) _llm = decoded.meta.llm as LLMId;
       if (decoded.meta?.theme) _themeOverrides = decoded.meta.theme as Record<string, string>;
       const servers = (decoded.servers ?? (decoded.meta?.servers as string[] | undefined));
@@ -416,15 +352,15 @@ function createCanvasVanilla() {
 
   // ── Snapshot (fields kept for API stability) ───────────────────────────
   function getSnapshot(): CanvasSnapshot {
-    const p = primaryServer();
+    const first = connectedServers()[0] ?? _servers[0];
     return {
       blocks: _blocks,
       mode: _mode,
       llm: _llm,
-      mcpUrl: p?.url ?? '',
-      mcpConnected: p?.connected ?? false,
+      mcpUrl: first?.url ?? '',
+      mcpConnected: _servers.some((s) => s.connected),
       mcpConnecting: anyConnecting(),
-      mcpName: displayName(),
+      mcpName: first && first.connected ? aliasName(first.serverName ?? first.name) : '',
       mcpTools: unionTools(),
       messages: _messages,
       generating: _generating,
@@ -450,11 +386,14 @@ function createCanvasVanilla() {
     set mode(v: Mode) { _mode = v; notify(); },
     get llm() { return _llm; },
     set llm(v: LLMId) { _llm = v; notify(); },
-    get mcpUrl() { return primaryServer()?.url ?? ''; },
-    set mcpUrl(v: string) { setMcpUrl(v); },
-    get mcpConnected() { return primaryServer()?.connected ?? false; },
+    get mcpUrl() { return (connectedServers()[0] ?? _servers[0])?.url ?? ''; },
+    set mcpUrl(v: string) { addMcpServer(v); },
+    get mcpConnected() { return _servers.some((s) => s.connected); },
     get mcpConnecting() { return anyConnecting(); },
-    get mcpName() { return displayName(); },
+    get mcpName() {
+      const s = connectedServers()[0];
+      return s ? aliasName(s.serverName ?? s.name) : '';
+    },
     get mcpTools() { return unionTools(); },
     get messages() { return _messages; },
     get generating() { return _generating; },
@@ -466,15 +405,12 @@ function createCanvasVanilla() {
 
     setMode(m: Mode) { _mode = m; notify(); },
     setLlm(l: LLMId) { _llm = l; notify(); },
-    setMcpUrl,
     setGenerating(g: boolean) { _generating = g; notify(); },
 
     addWidget, addBlock,
     removeBlock, updateBlock, moveBlock, clearBlocks, setBlocks,
     addMsg, updateMsg, clearMessages,
 
-    setMcpConnecting, setMcpConnected, setMcpError,
-
     get themeOverrides() { return _themeOverrides; },
     setThemeOverrides,
 
@@ -486,6 +422,7 @@ function createCanvasVanilla() {
     get dataServers() { return _servers; },
     set dataServers(v: DataServer[]) { _servers = Array.isArray(v) ? v : []; notify(); },
     addDataServer,
+    addMcpServer,
     removeDataServer,
     getDataServer,
     setDataServerMeta,

package/src/widget-sample-data.ts

@@ -0,0 +1,47 @@
+/**
+ * Extract sample `params` data from a widget recipe's `## Example` block.
+ *
+ * Recipes have shape:
+ *   ## Example
+ *   ```
+ *   <server>_webmcp_widget_display({name: "<widget>", params: { ... }})
+ *   ```
+ *
+ * Recipes are bundled at build time from our own source — `new Function`
+ * eval is acceptable here (not user input).
+ */
+
+function findBalancedBraces(text: string, fromIndex: number): string | null {
+  let depth = 0;
+  let start = -1;
+  for (let i = fromIndex; i < text.length; i++) {
+    const ch = text[i];
+    if (ch === '{') {
+      if (start === -1) start = i;
+      depth++;
+    } else if (ch === '}') {
+      depth--;
+      if (depth === 0 && start !== -1) return text.slice(start, i + 1);
+    }
+  }
+  return null;
+}
+
+export function extractSampleData(recipe: string | undefined | null): Record<string, unknown> | null {
+  if (!recipe) return null;
+  const exampleHeader = recipe.search(/^##\s*Example/m);
+  if (exampleHeader === -1) return null;
+  const after = recipe.slice(exampleHeader);
+  const paramsIdx = after.search(/params\s*:/);
+  if (paramsIdx === -1) return null;
+  const objStart = after.indexOf('{', paramsIdx);
+  if (objStart === -1) return null;
+  const objLiteral = findBalancedBraces(after, objStart);
+  if (!objLiteral) return null;
+  try {
+    const fn = new Function(`return (${objLiteral});`);
+    const value = fn();
+    if (value && typeof value === 'object') return value as Record<string, unknown>;
+  } catch { /* parse error — fall through */ }
+  return null;
+}

package/tsconfig.json

@@ -16,7 +16,6 @@
     "declaration": true
   },
   "include": [
-    "src/**/*.ts",
-    "src/**/*.svelte"
+    "src/**/*.ts"
   ]
 }

package/src/Index.svelte

@@ -1,5 +0,0 @@
-<!-- @webmcp-auto-ui/sdk — browser components stub -->
-<script lang="ts">
-  // This file exists to satisfy svelte-check tooling.
-  // Import canvas store via: import { canvas } from '@webmcp-auto-ui/sdk/canvas'
-</script>