@sidecar-ai/cli 0.1.0-alpha.14 → 0.1.0-alpha.16

package/dist/index.js

@@ -532,9 +532,18 @@ function typeToJsonSchemaInner(type) {
   if (type.isUnion()) {
     const parts = type.getUnionTypes().filter((part) => !part.isUndefined());
     if (parts.every(isLiteralType)) {
-      return { enum: parts.map((part) => literalValue(part)) };
+      return { enum: [...new Set(parts.map((part) => literalValue(part)))] };
     }
-    return { anyOf: parts.map((part) => typeToJsonSchema(part)) };
+    const schemas = deduplicateSchemas(
+      parts.map((part) => typeToJsonSchema(part))
+    );
+    if (schemas.length === 1) {
+      return schemas[0];
+    }
+    return {
+      ...schemas.every((schema) => schema.type === "object") ? { type: "object" } : {},
+      anyOf: schemas
+    };
   }
   const properties = type.getProperties();
   const indexType = type.getStringIndexType() ?? type.getNumberIndexType();
@@ -549,6 +558,37 @@ function typeToJsonSchemaInner(type) {
   }
   return {};
 }
+function deduplicateSchemas(schemas) {
+  const seen = /* @__PURE__ */ new Set();
+  return schemas.filter((schema) => {
+    const key = schemaComparisonKey(schema);
+    if (seen.has(key)) {
+      return false;
+    }
+    seen.add(key);
+    return true;
+  });
+}
+function schemaComparisonKey(schema) {
+  return JSON.stringify(canonicalSchemaValue(schema));
+}
+function canonicalSchemaValue(value, keyword) {
+  if (Array.isArray(value)) {
+    const values = value.map((item) => canonicalSchemaValue(item));
+    if (keyword === "allOf" || keyword === "anyOf" || keyword === "enum" || keyword === "oneOf" || keyword === "required" || keyword === "type") {
+      return values.sort(
+        (left, right) => JSON.stringify(left).localeCompare(JSON.stringify(right))
+      );
+    }
+    return values;
+  }
+  if (value && typeof value === "object") {
+    return Object.fromEntries(
+      Object.entries(value).sort(([left], [right]) => left.localeCompare(right)).map(([key, entry]) => [key, canonicalSchemaValue(entry, key)])
+    );
+  }
+  return value;
+}
 function objectTypeToSchema(properties, indexType) {
   const schemaProperties = {};
   const required = [];
@@ -3934,7 +3974,11 @@ import { randomUUID } from "crypto";
 import { JSONRPC_VERSION } from "@modelcontextprotocol/sdk/types.js";
 
 // packages/server/src/index.ts
-import { JSONRPC_VERSION as JSONRPC_VERSION2 } from "@modelcontextprotocol/sdk/types.js";
+import {
+  JSONRPC_VERSION as JSONRPC_VERSION2,
+  LATEST_PROTOCOL_VERSION,
+  SUPPORTED_PROTOCOL_VERSIONS
+} from "@modelcontextprotocol/sdk/types.js";
 var CODE_MODE_CALLBACK_TOKEN_TTL_MS = 5 * 60 * 1e3;
 
 // packages/cli/src/dev-harness.ts
@@ -4561,14 +4605,14 @@ function renderDevHarnessHtml(state, options = {}) {
         border: 1px solid var(--border);
         border-radius: 10px;
         display: block;
-        height: clamp(360px, 58dvh, 720px);
-        min-height: 360px;
+        height: 360px;
+        min-height: 0;
         overflow: auto;
+        transition: height 120ms ease;
         width: 100%;
       }
       :root[data-sidecar-device="mobile"] .tool-body iframe {
-        height: clamp(440px, 70dvh, 680px);
-        min-height: 440px;
+        height: 440px;
       }
       
       .composer {
@@ -5021,6 +5065,7 @@ async function readMcpResource(mcpUrl, uri, authToken) {
   };
 }
 async function callMcp(mcpUrl, method, params, authToken) {
+  const requestId = randomUUID3();
   const response = await fetch(mcpUrl, {
     method: "POST",
     headers: {
@@ -5031,7 +5076,7 @@ async function callMcp(mcpUrl, method, params, authToken) {
     },
     body: JSON.stringify({
       jsonrpc: "2.0",
-      id: randomUUID3(),
+      id: requestId,
       method,
       params
     })
@@ -5040,12 +5085,26 @@ async function callMcp(mcpUrl, method, params, authToken) {
   if (!response.ok) {
     throw new HttpError(response.status, `MCP ${method} failed with HTTP ${response.status}: ${text}`);
   }
-  const json = JSON.parse(text);
+  const json = parseMcpResponse(text, response.headers.get("content-type"), requestId);
   if (json.error) {
     throw new HttpError(502, json.error.message ?? `MCP ${method} returned an error.`);
   }
   return json.result;
 }
+function parseMcpResponse(text, contentType, requestId) {
+  if (!contentType?.toLowerCase().includes("text/event-stream")) {
+    return JSON.parse(text);
+  }
+  for (const event of text.split(/\r?\n\r?\n/)) {
+    const data = event.split(/\r?\n/).filter((line) => line.startsWith("data:")).map((line) => line.slice(5).replace(/^ /, "")).join("\n");
+    if (!data.trim()) continue;
+    const message = JSON.parse(data);
+    if (message && typeof message === "object" && message.id === requestId) {
+      return message;
+    }
+  }
+  throw new Error(`MCP response stream did not contain a result for request "${requestId}".`);
+}
 function toOpenAiMessages(messages) {
   return [
     {
@@ -5443,6 +5502,16 @@ window.addEventListener("message", async (event) => {
       respond(event.source, message.id, { mode: message.params?.mode || "inline" });
       return;
     }
+    if (message.method === "ui/notifications/size-changed") {
+      const requestedHeight = Number(message.params?.height);
+      const iframe = [...document.querySelectorAll(".tool-body iframe")]
+        .find((candidate) => candidate.contentWindow === event.source);
+      if (iframe && Number.isFinite(requestedHeight) && requestedHeight > 0) {
+        iframe.style.height = Math.min(2000, Math.max(120, Math.ceil(requestedHeight))) + "px";
+        iframe.dataset.autoSized = "true";
+      }
+      return;
+    }
     if (message.method === "ui/message" || message.method === "ui/update-model-context") {
       respond(event.source, message.id, { isError: false });
       return;