@sidecar-ai/cli 0.1.0-alpha.0 → 0.1.0-alpha.10

package/dist/index.js

@@ -1,20 +1,20 @@
 #!/usr/bin/env node
 
 // packages/cli/src/index.ts
-import { existsSync as existsSync5, realpathSync } from "fs";
-import { mkdir as mkdir9, readFile as readFile8, writeFile as writeFile9 } from "fs/promises";
+import { existsSync as existsSync7, realpathSync } from "fs";
+import { mkdir as mkdir10, readFile as readFile8, writeFile as writeFile10 } from "fs/promises";
 import { createServer as createServer2 } from "http";
-import path18 from "path";
+import path20 from "path";
 import { createInterface as createInterface2 } from "readline/promises";
-import { fileURLToPath, pathToFileURL } from "url";
+import { fileURLToPath, pathToFileURL as pathToFileURL3 } from "url";
 import { cwd, exit, stdin as stdin2, stdout as stdout2 } from "process";
-import { tsImport } from "tsx/esm/api";
+import { tsImport as tsImport2 } from "tsx/esm/api";
 
 // packages/auth/src/core.ts
 var authBrand = /* @__PURE__ */ Symbol.for("sidecar.auth");
 function isSidecarAuth(value) {
   return Boolean(
-    value && typeof value === "object" && value[authBrand]
+    value && typeof value === "object" && (value[authBrand] || value.kind === "sidecar.auth")
   );
 }
 
@@ -26,13 +26,19 @@ var resourceBrand = /* @__PURE__ */ Symbol.for("sidecar.resource");
 var resourceResultBrand = /* @__PURE__ */ Symbol.for("sidecar.resourceResult");
 var promptBrand = /* @__PURE__ */ Symbol.for("sidecar.prompt");
 function isSidecarTool(value) {
-  return Boolean(value && typeof value === "object" && value[toolBrand]);
+  return Boolean(
+    value && typeof value === "object" && (value[toolBrand] || value.kind === "sidecar.tool")
+  );
 }
 function isSidecarResource(value) {
-  return Boolean(value && typeof value === "object" && value[resourceBrand]);
+  return Boolean(
+    value && typeof value === "object" && (value[resourceBrand] || value.kind === "sidecar.resource")
+  );
 }
 function isSidecarPrompt(value) {
-  return Boolean(value && typeof value === "object" && value[promptBrand]);
+  return Boolean(
+    value && typeof value === "object" && (value[promptBrand] || value.kind === "sidecar.prompt")
+  );
 }
 var toolResult = Object.assign(
   createToolResult,
@@ -60,9 +66,9 @@ var resourceResult = Object.assign(
 );
 function createToolResult(input) {
   const resultEnvelope = stripUndefined({
-    structuredContent: input.structuredContent,
+    structuredContent: stripJsonUndefined(input.structuredContent),
     content: normalizeRequiredContent(input.content),
-    _meta: input.meta,
+    _meta: stripJsonUndefined(input.meta),
     isError: input.isError
   });
   Object.defineProperty(resultEnvelope, toolResultBrand, {
@@ -106,9 +112,9 @@ function normalizeToolResult(value) {
     );
   }
   return stripUndefined({
-    structuredContent: value.structuredContent,
+    structuredContent: stripJsonUndefined(value.structuredContent),
     content: value.content ?? [],
-    _meta: value._meta,
+    _meta: stripJsonUndefined(value._meta),
     isError: value.isError
   });
 }
@@ -447,10 +453,24 @@ function normalizePromptResult(value, defaultDescription) {
 function stripUndefined(value) {
   return Object.fromEntries(Object.entries(value).filter(([, entry]) => entry !== void 0));
 }
+function stripJsonUndefined(value) {
+  if (value === void 0) {
+    return void 0;
+  }
+  if (Array.isArray(value)) {
+    return value.map((entry) => stripJsonUndefined(entry)).filter((entry) => entry !== void 0);
+  }
+  if (!value || typeof value !== "object") {
+    return value;
+  }
+  return Object.fromEntries(
+    Object.entries(value).map(([key, entry]) => [key, stripJsonUndefined(entry)]).filter(([, entry]) => entry !== void 0)
+  );
+}
 
 // packages/compiler/src/analyze.ts
 import { readdir } from "fs/promises";
-import path4 from "path";
+import path5 from "path";
 import {
   Node as Node4,
   SyntaxKind as SyntaxKind2
@@ -617,14 +637,7 @@ function devSidecarTypePaths() {
 import {
   Node as Node2
 } from "ts-morph";
-function getParamsSchema(definition, execute) {
-  const explicitParams = definition.getProperty("params");
-  if (explicitParams && Node2.isPropertyAssignment(explicitParams)) {
-    const inferred = getSchemaFromZodProperty(explicitParams);
-    if (inferred) {
-      return inferred;
-    }
-  }
+function getParamsSchema(_definition, execute) {
   const [params] = execute.getParameters();
   if (!params) {
     return emptyObjectSchema();
@@ -645,74 +658,6 @@ function getOutputSchema(definition, execute) {
   }
   return typeToJsonSchema(returnType);
 }
-function getSchemaFromZodProperty(property) {
-  const initializer = property.getInitializer();
-  if (!initializer) {
-    return void 0;
-  }
-  if (Node2.isCallExpression(initializer) && initializer.getExpression().getText().endsWith(".object")) {
-    const [shape] = initializer.getArguments();
-    if (shape && Node2.isObjectLiteralExpression(shape)) {
-      return zodObjectLiteralToSchema(shape);
-    }
-  }
-  return void 0;
-}
-function zodObjectLiteralToSchema(shape) {
-  const properties = {};
-  const required = [];
-  for (const property of shape.getProperties()) {
-    if (!Node2.isPropertyAssignment(property)) {
-      continue;
-    }
-    const name = property.getName().replace(/^["']|["']$/g, "");
-    const initializer = property.getInitializer();
-    if (!initializer) {
-      continue;
-    }
-    const propertySchema = zodExpressionToSchema(initializer);
-    properties[name] = propertySchema.schema;
-    if (!propertySchema.optional) {
-      required.push(name);
-    }
-  }
-  return {
-    type: "object",
-    properties,
-    required,
-    additionalProperties: false
-  };
-}
-function zodExpressionToSchema(expression) {
-  const text = expression.getText();
-  const optional = /\.optional\(\)/.test(text) || /\.default\(/.test(text);
-  const schema = {};
-  if (/z\.string\(\)/.test(text)) {
-    schema.type = "string";
-  } else if (/z\.number\(\)/.test(text)) {
-    schema.type = "number";
-  } else if (/z\.boolean\(\)/.test(text)) {
-    schema.type = "boolean";
-  } else if (/z\.array\(/.test(text)) {
-    schema.type = "array";
-    schema.items = {};
-  } else {
-    schema.type = "object";
-  }
-  const min = text.match(/\.min\((\d+)/);
-  const max = text.match(/\.max\((\d+)/);
-  if (schema.type === "string") {
-    if (min) schema.minLength = Number(min[1]);
-    if (max) schema.maxLength = Number(max[1]);
-  } else {
-    if (min) schema.minimum = Number(min[1]);
-    if (max) schema.maximum = Number(max[1]);
-  }
-  if (/\.int\(\)/.test(text)) {
-    schema.type = "integer";
-  }
-  return { schema, optional };
-}
 function typeToJsonSchema(type, description) {
   const withoutUndefined = removeUndefined(type);
   const schema = typeToJsonSchemaInner(withoutUndefined);
@@ -755,12 +700,19 @@ function typeToJsonSchemaInner(type) {
     return { anyOf: parts.map((part) => typeToJsonSchema(part)) };
   }
   const properties = type.getProperties();
+  const indexType = type.getStringIndexType() ?? type.getNumberIndexType();
   if (properties.length > 0) {
-    return objectTypeToSchema(properties);
+    return objectTypeToSchema(properties, indexType);
+  }
+  if (indexType) {
+    return {
+      type: "object",
+      additionalProperties: indexTypeToAdditionalProperties(indexType)
+    };
   }
   return {};
 }
-function objectTypeToSchema(properties) {
+function objectTypeToSchema(properties, indexType) {
   const schemaProperties = {};
   const required = [];
   for (const property of properties) {
@@ -784,9 +736,16 @@ function objectTypeToSchema(properties) {
     type: "object",
     properties: schemaProperties,
     required,
-    additionalProperties: false
+    additionalProperties: indexType ? indexTypeToAdditionalProperties(indexType) : false
   };
 }
+function indexTypeToAdditionalProperties(type) {
+  if (type.isAny() || type.isUnknown()) {
+    return true;
+  }
+  const schema = typeToJsonSchema(type);
+  return Object.keys(schema).length ? schema : true;
+}
 function literalOrPrimitive(type, primitive) {
   if (isLiteralType(type)) {
     return { const: literalValue(type) };
@@ -844,39 +803,134 @@ function schemaDescription(symbol) {
   }).find((comment) => comment.trim().length > 0);
 }
 
+// packages/compiler/src/runtime-schema.ts
+import { existsSync as existsSync2 } from "fs";
+import path3 from "path";
+import { pathToFileURL } from "url";
+import { tsImport } from "tsx/esm/api";
+async function readRuntimeToolInputSchema(rootDir, sourcePath) {
+  let sidecarTool;
+  try {
+    sidecarTool = await importRuntimeTool(rootDir, sourcePath);
+  } catch (error) {
+    warnRuntimeSchemaFallback(sourcePath, error);
+    return void 0;
+  }
+  if (!sidecarTool.params) {
+    return void 0;
+  }
+  try {
+    return await paramsToJsonSchema(sidecarTool.params);
+  } catch (error) {
+    warnRuntimeSchemaFallback(sourcePath, error);
+    return void 0;
+  }
+}
+async function importRuntimeTool(rootDir, sourcePath) {
+  const module = await tsImport(pathToFileURL(sourcePath).href, {
+    parentURL: runtimeParentUrl(rootDir),
+    tsconfig: runtimeTsconfig(rootDir)
+  });
+  const defaultExport = unwrapRuntimeDefault(module.default);
+  if (!isSidecarTool(defaultExport)) {
+    throw new Error(`${path3.relative(rootDir, sourcePath)} must default-export tool({ ... }).`);
+  }
+  return defaultExport;
+}
+async function paramsToJsonSchema(params) {
+  const instanceConverter = readInstanceConverter(params);
+  if (instanceConverter) {
+    return ensureJsonSchema(instanceConverter({ io: "input" }));
+  }
+  if (isZodMiniSchema(params)) {
+    const zod = await import("zod/v4-mini");
+    if (typeof zod.toJSONSchema === "function") {
+      return ensureJsonSchema(zod.toJSONSchema(params, { io: "input" }));
+    }
+  }
+  return void 0;
+}
+function readInstanceConverter(params) {
+  if (!params || typeof params !== "object") {
+    return void 0;
+  }
+  const record = params;
+  const converter = record.toJSONSchema ?? record.toJsonSchema;
+  return typeof converter === "function" ? converter.bind(params) : void 0;
+}
+function isZodMiniSchema(params) {
+  return Boolean(params && typeof params === "object" && "_zod" in params);
+}
+function ensureJsonSchema(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return void 0;
+  }
+  return value;
+}
+function runtimeParentUrl(rootDir) {
+  const configPath = path3.join(rootDir, "sidecar.config.ts");
+  return pathToFileURL(existsSync2(configPath) ? configPath : rootDir).href;
+}
+function runtimeTsconfig(rootDir) {
+  const projectTsconfig = path3.join(rootDir, "tsconfig.json");
+  if (existsSync2(projectTsconfig)) {
+    return projectTsconfig;
+  }
+  const repoTsconfig = path3.join(process.cwd(), "tsconfig.json");
+  const repoCore = path3.join(process.cwd(), "packages", "core", "src", "index.ts");
+  return existsSyncSafe(repoTsconfig) && existsSyncSafe(repoCore) ? repoTsconfig : false;
+}
+function unwrapRuntimeDefault(value) {
+  if (value && typeof value === "object" && "default" in value && Object.keys(value).every((key) => key === "default" || key === "__esModule")) {
+    return unwrapRuntimeDefault(value.default);
+  }
+  return value;
+}
+function warnRuntimeSchemaFallback(sourcePath, error) {
+  const message = error instanceof Error ? error.message : String(error);
+  console.warn(
+    `[sidecar] Could not convert runtime params schema for ${sourcePath}; falling back to TypeScript parameter inference. ${message}`
+  );
+}
+
 // packages/compiler/src/widgets.ts
 import { createHash } from "crypto";
-import { existsSync as existsSync2 } from "fs";
+import { existsSync as existsSync3 } from "fs";
 import { mkdir, readFile, writeFile } from "fs/promises";
-import path3 from "path";
+import { createRequire } from "module";
+import path4 from "path";
+import { pathToFileURL as pathToFileURL2 } from "url";
 import { build as esbuild } from "esbuild";
 import postcss from "postcss";
 import {
   Node as Node3,
   SyntaxKind
 } from "ts-morph";
-async function buildWidgets(rootDir, outDir, tools) {
+var CLAUDE_FONT_RESOURCE_DOMAIN = "https://assets.claude.ai";
+var requireFromCompiler = createRequire(import.meta.url);
+async function buildWidgets(rootDir, outDir, tools, config = void 0) {
   const widgets = tools.filter(
     (entry) => Boolean(entry.widget)
   );
   if (!widgets.length) {
     return;
   }
-  const cacheDir = path3.join(rootDir, ".sidecar", "cache", "widgets");
+  const cacheDir = path4.join(rootDir, ".sidecar", "cache", "widgets");
   await mkdir(cacheDir, { recursive: true });
   const appStyle = await prepareAppStyle(rootDir, cacheDir);
+  const configure = await loadWidgetBundlerHook(rootDir, cacheDir, config?.configure);
   for (const entry of widgets) {
-    const sourceFile = path3.join(rootDir, entry.widget.sourceFile);
+    const sourceFile = path4.join(rootDir, entry.widget.sourceFile);
     const safeId = safePathSegment(entry.id);
-    const entryFile = path3.join(cacheDir, `${safeId}.entry.tsx`);
-    const importPath = toImportSpecifier(path3.dirname(entryFile), sourceFile);
+    const entryFile = path4.join(cacheDir, `${safeId}.entry.tsx`);
+    const importPath = toImportSpecifier(path4.dirname(entryFile), sourceFile);
     await writeFile(
       entryFile,
       `import React from "react";
 import { createRoot } from "react-dom/client";
 import { SidecarWidgetRoot } from "@sidecar-ai/react";
 import "@sidecar-ai/native/styles.css";
-${appStyle ? `import ${JSON.stringify(toImportSpecifier(path3.dirname(entryFile), appStyle))};` : ""}
+${appStyle ? `import ${JSON.stringify(toImportSpecifier(path4.dirname(entryFile), appStyle))};` : ""}
 import Component from ${JSON.stringify(importPath)};
 
 createRoot(document.getElementById("root")!).render(
@@ -884,64 +938,219 @@ createRoot(document.getElementById("root")!).render(
 );
 `
     );
-    const bundled = await esbuild({
+    const baseOptions = enforceWidgetBuildInvariants({
       absWorkingDir: rootDir,
-      alias: devSidecarBundleAliases(rootDir),
+      alias: sidecarWidgetAliases(rootDir),
       bundle: true,
+      define: {
+        "process.env.NODE_ENV": JSON.stringify("production")
+      },
       entryPoints: [entryFile],
       format: "iife",
       jsx: "automatic",
-      minify: false,
+      minify: true,
       nodePaths: [
-        path3.join(rootDir, "node_modules"),
-        path3.join(process.cwd(), "node_modules")
+        path4.join(rootDir, "node_modules"),
+        path4.join(process.cwd(), "node_modules")
       ],
       outfile: "widget.js",
       platform: "browser",
       sourcemap: false,
       write: false
     });
-    const javascript = bundled.outputFiles.find((file) => file.path.endsWith(".js"))?.text ?? "";
-    const css = bundled.outputFiles.filter((file) => file.path.endsWith(".css")).map((file) => file.text).join("\n");
+    const staticOptions = widgetBuildOptionsFromConfig(rootDir, config);
+    const configuredOptions = configure ? await configureWidgetBuild(configure, {
+      rootDir,
+      outDir,
+      entryFile,
+      widget: {
+        toolId: entry.id,
+        toolName: entry.name,
+        target: entry.target,
+        sourceFile: entry.widget.sourceFile
+      },
+      esbuildOptions: mergeWidgetBuildOptions(baseOptions, staticOptions)
+    }) : void 0;
+    const bundled = await esbuild(enforceWidgetBuildInvariants(
+      mergeWidgetBuildOptions(baseOptions, staticOptions, configuredOptions),
+      { rootDir, entryFile }
+    ));
+    const outputFiles = bundled.outputFiles ?? [];
+    const javascript = outputFiles.find((file) => file.path.endsWith(".js"))?.text ?? "";
+    const css = outputFiles.filter((file) => file.path.endsWith(".css")).map((file) => file.text).join("\n");
     const html = renderWidgetHtml(entry.name, javascript, css);
     const hash = createHash("sha256").update(html).digest("hex").slice(0, 12);
-    const outputDir = path3.join(outDir, "public", "widgets", safeId);
-    const outputFile = path3.join(outputDir, `widget.${hash}.html`);
+    const outputDir = path4.join(outDir, "public", "widgets", safeId);
+    const outputFile = path4.join(outputDir, `widget.${hash}.html`);
     const resourceUri = `ui://${safeId}/widget.${hash}.html`;
     await mkdir(outputDir, { recursive: true });
     await writeFile(outputFile, html);
     entry.widget.resourceUri = resourceUri;
     entry.widget.resourceMeta = widgetResourceMeta(entry.widget.options, entry.target);
-    entry.widget.outputFile = path3.relative(outDir, outputFile);
+    entry.widget.outputFile = path4.relative(outDir, outputFile);
     entry.descriptor._meta = mergeWidgetMeta(entry.descriptor._meta, widgetMeta(resourceUri, entry.widget.options, entry.target));
   }
 }
+function widgetBuildOptionsFromConfig(rootDir, config) {
+  const esbuildConfig = config?.esbuild;
+  if (!esbuildConfig) {
+    return void 0;
+  }
+  return {
+    alias: normalizeAliases(rootDir, esbuildConfig.alias),
+    conditions: esbuildConfig.conditions,
+    define: esbuildConfig.define,
+    external: esbuildConfig.external,
+    jsx: esbuildConfig.jsx,
+    jsxImportSource: esbuildConfig.jsxImportSource,
+    loader: esbuildConfig.loader,
+    mainFields: esbuildConfig.mainFields
+  };
+}
+async function loadWidgetBundlerHook(rootDir, cacheDir, hookPath) {
+  if (!hookPath) {
+    return void 0;
+  }
+  const sourcePath = path4.resolve(rootDir, hookPath);
+  const relative = path4.relative(rootDir, sourcePath);
+  if (relative.startsWith("..") || path4.isAbsolute(relative)) {
+    throw new Error(`Widget bundler hook must stay inside the project root: ${hookPath}`);
+  }
+  if (!existsSync3(sourcePath)) {
+    throw new Error(`Widget bundler hook not found: ${hookPath}`);
+  }
+  const outputFile = path4.join(cacheDir, `widget-bundler.${contentHash(hookPath)}.mjs`);
+  await esbuild({
+    absWorkingDir: rootDir,
+    alias: devSidecarBundleAliases(rootDir),
+    bundle: true,
+    entryPoints: [sourcePath],
+    format: "esm",
+    nodePaths: [
+      path4.join(rootDir, "node_modules"),
+      path4.join(process.cwd(), "node_modules")
+    ],
+    outfile: outputFile,
+    packages: "external",
+    platform: "node",
+    target: "node20"
+  });
+  const module = await import(`${pathToFileURL2(outputFile).href}?t=${Date.now()}`);
+  if (typeof module.default !== "function") {
+    throw new Error(`Widget bundler hook must default-export a function: ${hookPath}`);
+  }
+  return module.default;
+}
+async function configureWidgetBuild(hook, input) {
+  const result = await hook(input);
+  if (!result) {
+    return void 0;
+  }
+  if (typeof result === "object" && "esbuildOptions" in result) {
+    return result.esbuildOptions;
+  }
+  return result;
+}
+function mergeWidgetBuildOptions(...options) {
+  const merged = {};
+  for (const option of options) {
+    if (!option) {
+      continue;
+    }
+    const previousAlias = merged.alias;
+    const previousDefine = merged.define;
+    const previousLoader = merged.loader;
+    const previousExternal = merged.external;
+    const previousNodePaths = merged.nodePaths;
+    const previousPlugins = merged.plugins;
+    Object.assign(merged, option);
+    merged.alias = { ...previousAlias ?? {}, ...option.alias ?? {} };
+    merged.define = { ...previousDefine ?? {}, ...option.define ?? {} };
+    merged.loader = { ...previousLoader ?? {}, ...option.loader ?? {} };
+    merged.external = uniqueStrings([...previousExternal ?? [], ...option.external ?? []]);
+    merged.nodePaths = uniqueStrings([...previousNodePaths ?? [], ...option.nodePaths ?? []]);
+    merged.plugins = [...previousPlugins ?? [], ...option.plugins ?? []];
+  }
+  return merged;
+}
+function enforceWidgetBuildInvariants(options, required) {
+  const aliases = required ? { ...options.alias ?? {}, ...reactSingletonAliases(required.rootDir) } : options.alias;
+  return {
+    ...options,
+    absWorkingDir: required?.rootDir ?? options.absWorkingDir,
+    alias: aliases,
+    bundle: true,
+    entryPoints: required ? [required.entryFile] : options.entryPoints,
+    format: "iife",
+    outfile: "widget.js",
+    platform: "browser",
+    write: false
+  };
+}
+function sidecarWidgetAliases(rootDir) {
+  return {
+    ...devSidecarBundleAliases(rootDir) ?? {},
+    ...reactSingletonAliases(rootDir)
+  };
+}
+function reactSingletonAliases(rootDir) {
+  return {
+    react: resolveProjectModule(rootDir, "react"),
+    "react/jsx-runtime": resolveProjectModule(rootDir, "react/jsx-runtime"),
+    "react/jsx-dev-runtime": resolveProjectModule(rootDir, "react/jsx-dev-runtime"),
+    "react-dom": resolveProjectModule(rootDir, "react-dom"),
+    "react-dom/client": resolveProjectModule(rootDir, "react-dom/client"),
+    "react-dom/server": resolveProjectModule(rootDir, "react-dom/server")
+  };
+}
+function resolveProjectModule(rootDir, specifier) {
+  return requireFromCompiler.resolve(specifier, {
+    paths: [rootDir, process.cwd()]
+  });
+}
+function normalizeAliases(rootDir, aliases) {
+  if (!aliases) {
+    return void 0;
+  }
+  return Object.fromEntries(
+    Object.entries(aliases).map(([key, value]) => [
+      key,
+      value.startsWith(".") ? path4.resolve(rootDir, value) : value
+    ])
+  );
+}
+function uniqueStrings(values) {
+  return [...new Set(values)];
+}
+function contentHash(value) {
+  return createHash("sha256").update(value).digest("hex").slice(0, 12);
+}
 function devSidecarBundleAliases(rootDir) {
   const repoRoot = findSidecarRepoRoot(rootDir) ?? findSidecarRepoRoot(process.cwd());
   if (!repoRoot) {
     return void 0;
   }
-  const reactEntry = path3.join(repoRoot, "packages", "react", "src", "index.ts");
-  if (!existsSync2(reactEntry)) {
+  const reactEntry = path4.join(repoRoot, "packages", "react", "src", "index.ts");
+  if (!existsSync3(reactEntry)) {
     return void 0;
   }
   return {
-    "sidecar-ai": path3.join(repoRoot, "packages", "sidecar-ai", "src", "index.ts"),
-    "@sidecar-ai/client": path3.join(repoRoot, "packages", "client", "src", "index.ts"),
-    "@sidecar-ai/core": path3.join(repoRoot, "packages", "core", "src", "index.ts"),
+    "sidecar-ai": path4.join(repoRoot, "packages", "sidecar-ai", "src", "index.ts"),
+    "@sidecar-ai/client": path4.join(repoRoot, "packages", "client", "src", "index.ts"),
+    "@sidecar-ai/core": path4.join(repoRoot, "packages", "core", "src", "index.ts"),
     "@sidecar-ai/react": reactEntry,
-    "@sidecar-ai/native": path3.join(repoRoot, "packages", "native", "src", "index.ts"),
-    "@sidecar-ai/native/components": path3.join(repoRoot, "packages", "native", "src", "components", "index.tsx"),
-    "@sidecar-ai/native/styles.css": path3.join(repoRoot, "packages", "native", "src", "styles.css")
+    "@sidecar-ai/native": path4.join(repoRoot, "packages", "native", "src", "index.ts"),
+    "@sidecar-ai/native/components": path4.join(repoRoot, "packages", "native", "src", "components", "index.tsx"),
+    "@sidecar-ai/native/styles.css": path4.join(repoRoot, "packages", "native", "src", "styles.css")
   };
 }
 function findSidecarRepoRoot(startDir) {
-  let current = path3.resolve(startDir);
+  let current = path4.resolve(startDir);
   while (true) {
-    if (existsSync2(path3.join(current, "packages", "core", "src", "index.ts"))) {
+    if (existsSync3(path4.join(current, "packages", "core", "src", "index.ts"))) {
       return current;
     }
-    const parent = path3.dirname(current);
+    const parent = path4.dirname(current);
     if (parent === current) {
       return void 0;
     }
@@ -949,13 +1158,13 @@ function findSidecarRepoRoot(startDir) {
   }
 }
 async function prepareAppStyle(rootDir, cacheDir) {
-  const sourceFile = path3.join(rootDir, "style.css");
-  if (!existsSync2(sourceFile)) {
+  const sourceFile = path4.join(rootDir, "style.css");
+  if (!existsSync3(sourceFile)) {
     return void 0;
   }
   const source = await readFile(sourceFile, "utf8");
   const css = await processAppStyle(source, sourceFile);
-  const outputFile = path3.join(cacheDir, "style.css");
+  const outputFile = path4.join(cacheDir, "style.css");
   await writeFile(outputFile, css);
   return outputFile;
 }
@@ -967,7 +1176,7 @@ async function processAppStyle(source, from) {
   const plugins = [];
   if (cssSource.includes("@tailwind")) {
     const tailwind = await import("@tailwindcss/postcss");
-    plugins.push(tailwind.default({ base: path3.dirname(from) }));
+    plugins.push(tailwind.default({ base: path4.dirname(from) }));
   }
   const autoprefixer = await import("autoprefixer");
   plugins.push(autoprefixer.default());
@@ -981,13 +1190,13 @@ function needsPostcss(source) {
   return /@import\s+["']tailwindcss["']|@tailwind|@source|@theme|@plugin/.test(source);
 }
 function findWidget(rootDir, toolFile, id, target = "mcp", toolVariant = "shared") {
-  const selected = selectWidgetFile(path3.dirname(toolFile), target, toolVariant);
+  const selected = selectWidgetFile(path4.dirname(toolFile), target, toolVariant);
   if (!selected) {
     return void 0;
   }
   const safeId = safePathSegment(id);
   return {
-    sourceFile: path3.relative(rootDir, selected.filePath),
+    sourceFile: path4.relative(rootDir, selected.filePath),
     variant: selected.variant,
     resourceUri: `ui://${safeId}/widget.html`
   };
@@ -1022,7 +1231,8 @@ function widgetMeta(resourceUri, options = {}, target = "mcp") {
   const standard = {
     ui: {
       resourceUri
-    }
+    },
+    "ui/resourceUri": resourceUri
   };
   if (target !== "chatgpt") {
     return standard;
@@ -1038,7 +1248,7 @@ function widgetMeta(resourceUri, options = {}, target = "mcp") {
 function widgetResourceMeta(options = {}, target = "mcp") {
   const csp = stripUndefined3({
     connectDomains: options.csp?.connectDomains ? [...options.csp.connectDomains] : [],
-    resourceDomains: options.csp?.resourceDomains ? [...options.csp.resourceDomains] : [],
+    resourceDomains: widgetResourceDomains(options, target),
     frameDomains: options.csp?.frameDomains ? [...options.csp.frameDomains] : void 0,
     baseUriDomains: options.csp?.baseUriDomains ? [...options.csp.baseUriDomains] : void 0
   });
@@ -1051,6 +1261,13 @@ function widgetResourceMeta(options = {}, target = "mcp") {
   });
   return Object.keys(ui).length ? { ui } : void 0;
 }
+function widgetResourceDomains(options, target) {
+  const domains = [...options.csp?.resourceDomains ?? []];
+  if (target === "claude" && !domains.includes(CLAUDE_FONT_RESOURCE_DOMAIN)) {
+    domains.push(CLAUDE_FONT_RESOURCE_DOMAIN);
+  }
+  return domains;
+}
 function findWidgetDefinition(sourceFile) {
   const call = resolveDefaultExportCall(sourceFile, "widget");
   if (!call) {
@@ -1162,17 +1379,17 @@ function readStringArrayProperty(definition, propertyName) {
 }
 function selectWidgetFile(directory, target, toolVariant) {
   if (toolVariant === "openai") {
-    const filePath = path3.join(directory, "widget.openai.tsx");
-    return existsSync2(filePath) ? { filePath, variant: "openai" } : void 0;
+    const filePath = path4.join(directory, "widget.openai.tsx");
+    return existsSync3(filePath) ? { filePath, variant: "openai" } : void 0;
   }
   if (toolVariant === "anthropic") {
-    const filePath = path3.join(directory, "widget.anthropic.tsx");
-    return existsSync2(filePath) ? { filePath, variant: "anthropic" } : void 0;
+    const filePath = path4.join(directory, "widget.anthropic.tsx");
+    return existsSync3(filePath) ? { filePath, variant: "anthropic" } : void 0;
   }
   const candidates = target === "chatgpt" || target === "claude" || target === "mcp" ? [{ name: "widget.tsx", variant: "shared" }] : [];
   for (const candidate of candidates) {
-    const filePath = path3.join(directory, candidate.name);
-    if (existsSync2(filePath)) {
+    const filePath = path4.join(directory, candidate.name);
+    if (existsSync3(filePath)) {
       return { filePath, variant: candidate.variant };
     }
   }
@@ -1223,17 +1440,23 @@ function stripUndefined3(value) {
 // packages/compiler/src/analyze.ts
 async function analyzeProjectTools(rootDir, options = {}) {
   const target = options.target ?? "mcp";
-  const toolFiles = await findToolFiles(path4.join(rootDir, "server"), target);
+  const toolFiles = await findToolFiles(path5.join(rootDir, "server"), target);
   if (toolFiles.length === 0) {
     return [];
   }
   const project = createProject(rootDir);
   const authScopes = readAuthScopeCatalog(project, rootDir);
-  return toolFiles.map(
-    (candidate) => analyzeToolFile(project.addSourceFileAtPath(candidate.filePath), rootDir, {
+  const sources = toolFiles.map((candidate) => ({
+    candidate,
+    sourceFile: project.addSourceFileAtPath(candidate.filePath)
+  }));
+  const runtimeInputSchemas = await readRuntimeInputSchemas(rootDir, sources);
+  return sources.map(
+    ({ candidate, sourceFile }) => analyzeToolFile(sourceFile, rootDir, {
       target,
       variant: candidate.variant,
-      authScopes
+      authScopes,
+      inputSchema: runtimeInputSchemas.get(candidate.filePath)
     })
   );
 }
@@ -1242,7 +1465,7 @@ function analyzeToolFile(sourceFile, rootDir, options = {}) {
   const variant = options.variant ?? "shared";
   const definition = findToolDefinition(sourceFile);
   const absoluteFile = sourceFile.getFilePath();
-  const directory = path4.basename(path4.dirname(absoluteFile));
+  const directory = path5.basename(path5.dirname(absoluteFile));
   const name = getRequiredStringProperty(definition, "name", sourceFile);
   const id = getOptionalStringProperty(definition, "id") ?? toMachineName(directory);
   const description = getRequiredStringProperty(
@@ -1255,7 +1478,7 @@ function analyzeToolFile(sourceFile, rootDir, options = {}) {
   const hosts = readHosts(definition);
   const auth = readAuthPolicy(definition, options.authScopes ?? {});
   const execute = getExecuteFunction(definition, sourceFile);
-  const inputSchema = getParamsSchema(definition, execute);
+  const inputSchema = options.inputSchema ?? getParamsSchema(definition, execute);
   const outputSchema = getOutputSchema(definition, execute);
   const descriptor = createToolDescriptor({
     name,
@@ -1273,7 +1496,7 @@ function analyzeToolFile(sourceFile, rootDir, options = {}) {
   validateWidgetHierarchy(sourceFile, absoluteFile, target, variant);
   const widget = findWidget(rootDir, absoluteFile, id, target, variant);
   if (widget) {
-    const widgetFile = path4.join(rootDir, widget.sourceFile);
+    const widgetFile = path5.join(rootDir, widget.sourceFile);
     const project = sourceFile.getProject();
     const widgetSourceFile = project.getSourceFile(widgetFile) ?? project.addSourceFileAtPath(widgetFile);
     widget.options = {
@@ -1284,7 +1507,7 @@ function analyzeToolFile(sourceFile, rootDir, options = {}) {
     descriptor._meta = mergeWidgetMeta(descriptor._meta, widgetMeta(widget.resourceUri, widget.options, target));
   }
   return {
-    sourceFile: path4.relative(rootDir, absoluteFile),
+    sourceFile: path5.relative(rootDir, absoluteFile),
     variant,
     target,
     directory,
@@ -1299,6 +1522,26 @@ function analyzeToolFile(sourceFile, rootDir, options = {}) {
     descriptor
   };
 }
+async function readRuntimeInputSchemas(rootDir, sources) {
+  const schemas = /* @__PURE__ */ new Map();
+  await Promise.all(sources.map(async ({ candidate, sourceFile }) => {
+    const definition = findToolDefinition(sourceFile);
+    if (!definitionHasRuntimeParams(definition)) {
+      return;
+    }
+    const schema = await readRuntimeToolInputSchema(rootDir, candidate.filePath);
+    if (schema) {
+      schemas.set(candidate.filePath, schema);
+    }
+  }));
+  return schemas;
+}
+function definitionHasRuntimeParams(definition) {
+  if (definition.getProperty("params")) {
+    return true;
+  }
+  return Boolean(getWithParamsCall(definition));
+}
 function readAuthPolicy(definition, authScopes) {
   const initializer = readObjectProperty2(definition, "auth");
   if (!initializer) {
@@ -1315,7 +1558,7 @@ function readAuthPolicy(definition, authScopes) {
   return { authenticated: true };
 }
 function readAuthScopeCatalog(project, rootDir) {
-  const authPath = path4.join(rootDir, "auth.ts");
+  const authPath = path5.join(rootDir, "auth.ts");
   if (!existsSyncSafe(authPath)) {
     return {};
   }
@@ -1397,12 +1640,12 @@ function isNamedCall(call, name) {
   return callee === name || callee.endsWith(`.${name}`);
 }
 function validateWidgetHierarchy(sourceFile, toolFile, target, variant) {
-  const directory = path4.dirname(toolFile);
+  const directory = path5.dirname(toolFile);
   const platformWidget = target === "chatgpt" ? "widget.openai.tsx" : target === "claude" ? "widget.anthropic.tsx" : void 0;
   if (!platformWidget || variant !== "shared") {
     return;
   }
-  if (existsSyncSafe(path4.join(directory, platformWidget))) {
+  if (existsSyncSafe(path5.join(directory, platformWidget))) {
     const expectedTool = target === "chatgpt" ? "tool.openai.ts" : "tool.anthropic.ts";
     throw new CompilerError(
       sourceFile,
@@ -1417,7 +1660,7 @@ async function findToolFiles(serverDir, target) {
   const entries = await readdir(serverDir, { withFileTypes: true });
   const files = [];
   for (const entry of entries) {
-    const entryPath = path4.join(serverDir, entry.name);
+    const entryPath = path5.join(serverDir, entry.name);
     if (entry.isDirectory()) {
       const candidate = selectToolFile(entryPath, target);
       if (candidate) {
@@ -1436,7 +1679,7 @@ function selectToolFile(directory, target) {
     { name: "tool.ts", variant: "shared" }
   ] : [{ name: "tool.ts", variant: "shared" }];
   for (const candidate of candidates) {
-    const filePath = path4.join(directory, candidate.name);
+    const filePath = path5.join(directory, candidate.name);
     if (existsSyncSafe(filePath)) {
       return { filePath, variant: candidate.variant };
     }
@@ -1472,16 +1715,32 @@ function getExecuteFunction(definition, sourceFile) {
     return property;
   }
   if (Node4.isPropertyAssignment(property)) {
-    const initializer = property.getInitializer();
+    const initializer = unwrapExpression(property.getInitializer());
     if (initializer && (Node4.isArrowFunction(initializer) || Node4.isFunctionExpression(initializer))) {
       return initializer;
     }
+    const withParamsCall = getWithParamsCall(definition);
+    const wrappedExecute = unwrapExpression(withParamsCall?.getArguments()[1]);
+    if (wrappedExecute && (Node4.isArrowFunction(wrappedExecute) || Node4.isFunctionExpression(wrappedExecute))) {
+      return wrappedExecute;
+    }
   }
   throw new CompilerError(
     sourceFile,
     "execute must be a method, function expression, or arrow function."
   );
 }
+function getWithParamsCall(definition) {
+  const property = definition.getProperty("execute");
+  if (!property || !Node4.isPropertyAssignment(property)) {
+    return void 0;
+  }
+  const initializer = unwrapExpression(property.getInitializer());
+  if (!initializer || !Node4.isCallExpression(initializer)) {
+    return void 0;
+  }
+  return isNamedCall(initializer, "withParams") ? initializer : void 0;
+}
 function getRequiredStringProperty(definition, propertyName, sourceFile) {
   const value = getOptionalStringProperty(definition, propertyName);
   if (value === void 0 || !value.trim()) {
@@ -1636,17 +1895,17 @@ function readStringArrayProperty2(definition, propertyName) {
 }
 
 // packages/compiler/src/build.ts
-import { mkdir as mkdir8, writeFile as writeFile8 } from "fs/promises";
-import path17 from "path";
+import { mkdir as mkdir9, writeFile as writeFile9 } from "fs/promises";
+import path19 from "path";
 
 // packages/compiler/src/config.ts
-import path5 from "path";
+import path6 from "path";
 import {
   Node as Node5,
   SyntaxKind as SyntaxKind3
 } from "ts-morph";
 function analyzeProjectConfig(rootDir) {
-  const configPath = path5.join(rootDir, "sidecar.config.ts");
+  const configPath = path6.join(rootDir, "sidecar.config.ts");
   if (!existsSyncSafe(configPath)) {
     return defaultCompilerConfig();
   }
@@ -1658,6 +1917,13 @@ function analyzeProjectConfig(rootDir) {
     return defaultCompilerConfig();
   }
   return {
+    build: {
+      target: readTargetNested(definition, "build", "target"),
+      host: readHostNested(definition, "build", "host"),
+      outDir: readStringNested(definition, "build", "outDir"),
+      plugins: readBooleanNested(definition, "build", "plugins"),
+      widgets: readWidgetBuildConfig(definition)
+    },
     resources: {
       subscribe: readBooleanNested(definition, "resources", "subscribe") ?? false,
       listChanged: readBooleanNested(definition, "resources", "listChanged") ?? false
@@ -1669,13 +1935,52 @@ function analyzeProjectConfig(rootDir) {
       listChanged: readBooleanNested(definition, "tools", "listChanged") ?? false
     },
     pagination: {
-      pageSize: readNumberNested(definition, "pagination", "pageSize") ?? 10,
+      pageSize: readNumberNested(definition, "pagination", "pageSize") ?? 50,
       hasOverride: hasProperty(readObjectProperty3(definition, "pagination"), "override")
     }
   };
 }
+function readWidgetBuildConfig(definition) {
+  const widgets = readObjectProperty3(readObjectProperty3(definition, "build"), "widgets");
+  if (!widgets) {
+    return void 0;
+  }
+  const config = {};
+  const configure = readStringProperty3(widgets, "configure");
+  const esbuild3 = readWidgetEsbuildConfig(widgets);
+  if (configure) config.configure = configure;
+  if (esbuild3) config.esbuild = esbuild3;
+  return Object.keys(config).length ? config : void 0;
+}
+function readWidgetEsbuildConfig(widgets) {
+  const esbuild3 = readObjectProperty3(widgets, "esbuild");
+  if (!esbuild3) {
+    return void 0;
+  }
+  const config = {};
+  const alias = readStringRecordProperty(esbuild3, "alias");
+  const define = readStringRecordProperty(esbuild3, "define");
+  const external = readStringArrayProperty3(esbuild3, "external");
+  const loader = readStringRecordProperty(esbuild3, "loader");
+  const conditions = readStringArrayProperty3(esbuild3, "conditions");
+  const mainFields = readStringArrayProperty3(esbuild3, "mainFields");
+  const jsx = readStringProperty3(esbuild3, "jsx");
+  const jsxImportSource = readStringProperty3(esbuild3, "jsxImportSource");
+  if (alias) config.alias = alias;
+  if (define) config.define = define;
+  if (external) config.external = external;
+  if (loader) config.loader = loader;
+  if (conditions) config.conditions = conditions;
+  if (mainFields) config.mainFields = mainFields;
+  if (jsx === "automatic" || jsx === "transform" || jsx === "preserve") {
+    config.jsx = jsx;
+  }
+  if (jsxImportSource) config.jsxImportSource = jsxImportSource;
+  return Object.keys(config).length ? config : void 0;
+}
 function defaultCompilerConfig() {
   return {
+    build: {},
     resources: {
       subscribe: false,
       listChanged: false
@@ -1687,11 +1992,26 @@ function defaultCompilerConfig() {
       listChanged: false
     },
     pagination: {
-      pageSize: 10,
+      pageSize: 50,
       hasOverride: false
     }
   };
 }
+function readTargetNested(definition, section, propertyName) {
+  const value = readStringNested(definition, section, propertyName);
+  return value === "mcp" || value === "chatgpt" || value === "claude" ? value : void 0;
+}
+function readHostNested(definition, section, propertyName) {
+  const value = readStringNested(definition, section, propertyName);
+  return value === "node" || value === "vercel" ? value : void 0;
+}
+function readStringNested(definition, section, propertyName) {
+  const object = readObjectProperty3(definition, section);
+  if (!object) {
+    return void 0;
+  }
+  return readStringProperty3(object, propertyName);
+}
 function readBooleanNested(definition, section, propertyName) {
   const object = readObjectProperty3(definition, section);
   if (!object) {
@@ -1722,6 +2042,9 @@ function readNumberNested(definition, section, propertyName) {
   return initializer && Node5.isNumericLiteral(initializer) ? Number(initializer.getLiteralText()) : void 0;
 }
 function readObjectProperty3(definition, propertyName) {
+  if (!definition) {
+    return void 0;
+  }
   const property = definition.getProperty(propertyName);
   if (!property || !Node5.isPropertyAssignment(property)) {
     return void 0;
@@ -1729,40 +2052,79 @@ function readObjectProperty3(definition, propertyName) {
   const initializer = unwrapExpression(property.getInitializer());
   return initializer && Node5.isObjectLiteralExpression(initializer) ? initializer : void 0;
 }
+function readStringProperty3(definition, propertyName) {
+  const property = definition.getProperty(propertyName);
+  if (!property || !Node5.isPropertyAssignment(property)) {
+    return void 0;
+  }
+  const initializer = unwrapExpression(property.getInitializer());
+  return initializer && Node5.isStringLiteral(initializer) ? initializer.getLiteralText() : void 0;
+}
+function readStringArrayProperty3(definition, propertyName) {
+  const property = definition.getProperty(propertyName);
+  if (!property || !Node5.isPropertyAssignment(property)) {
+    return void 0;
+  }
+  const initializer = unwrapExpression(property.getInitializer());
+  if (!initializer || !Node5.isArrayLiteralExpression(initializer)) {
+    return void 0;
+  }
+  const values = initializer.getElements().map((element) => {
+    const unwrapped = unwrapExpression(element);
+    return unwrapped && Node5.isStringLiteral(unwrapped) ? unwrapped.getLiteralText() : void 0;
+  });
+  return values.every((value) => value !== void 0) ? values : void 0;
+}
+function readStringRecordProperty(definition, propertyName) {
+  const object = readObjectProperty3(definition, propertyName);
+  if (!object) {
+    return void 0;
+  }
+  const record = {};
+  for (const property of object.getProperties()) {
+    if (!Node5.isPropertyAssignment(property)) {
+      return void 0;
+    }
+    const initializer = unwrapExpression(property.getInitializer());
+    if (!initializer || !Node5.isStringLiteral(initializer)) {
+      return void 0;
+    }
+    record[property.getName().replace(/^["']|["']$/g, "")] = initializer.getLiteralText();
+  }
+  return record;
+}
 function hasProperty(definition, propertyName) {
   return Boolean(definition?.getProperty(propertyName));
 }
 
 // packages/compiler/src/diagnostics.ts
-import { existsSync as existsSync3 } from "fs";
+import { existsSync as existsSync4 } from "fs";
 import { readFile as readFile2 } from "fs/promises";
-import { createRequire } from "module";
-import path6 from "path";
+import path7 from "path";
 async function collectProjectDiagnostics(rootDir, input) {
   const diagnostics = [];
   const tools = Array.isArray(input) ? input : input.tools;
   const resources = Array.isArray(input) ? [] : input.resources ?? [];
   const prompts = Array.isArray(input) ? [] : input.prompts ?? [];
   const config = Array.isArray(input) ? void 0 : input.config;
-  const hasAuthConfig = existsSync3(path6.join(rootDir, "auth.ts"));
-  const hasOpenAiAppsSdkUi = canResolveOpenAiAppsSdkUi(rootDir);
+  const hasAuthConfig = existsSync4(path7.join(rootDir, "auth.ts"));
   for (const entry of tools) {
-    const toolPath = path6.join(rootDir, entry.sourceFile);
+    const toolPath = path7.join(rootDir, entry.sourceFile);
     const toolSource = await readFile2(toolPath, "utf8");
-    diagnostics.push(...diagnoseToolSource(rootDir, entry, toolSource, hasAuthConfig));
+    diagnostics.push(...diagnoseToolSource(entry, toolSource, hasAuthConfig));
     if (entry.widget) {
-      const widgetPath = path6.join(rootDir, entry.widget.sourceFile);
+      const widgetPath = path7.join(rootDir, entry.widget.sourceFile);
       const widgetSource = await readFile2(widgetPath, "utf8");
-      diagnostics.push(...diagnoseWidgetSource(rootDir, entry, widgetSource, hasOpenAiAppsSdkUi));
+      diagnostics.push(...diagnoseWidgetSource(rootDir, entry, widgetSource));
     }
   }
   for (const entry of resources) {
-    const resourcePath = path6.join(rootDir, entry.sourceFile);
+    const resourcePath = path7.join(rootDir, entry.sourceFile);
     const resourceSource = await readFile2(resourcePath, "utf8");
     diagnostics.push(...diagnoseResourceSource(entry, resourceSource));
   }
   for (const entry of prompts) {
-    const promptPath = path6.join(rootDir, entry.sourceFile);
+    const promptPath = path7.join(rootDir, entry.sourceFile);
     const promptSource = await readFile2(promptPath, "utf8");
     diagnostics.push(...diagnosePromptSource(entry, promptSource));
   }
@@ -1777,7 +2139,7 @@ function formatDiagnostic(diagnostic) {
   hint: ${diagnostic.hint}` : "";
   return `${location} - ${diagnostic.severity} ${diagnostic.code}: ${diagnostic.message}${hint}`;
 }
-function diagnoseToolSource(rootDir, entry, source, hasAuthConfig) {
+function diagnoseToolSource(entry, source, hasAuthConfig) {
   const diagnostics = [];
   const toolLocation = locate(source, "tool({");
   if (!entry.description.trim().startsWith("Use this when")) {
@@ -1854,7 +2216,7 @@ function diagnoseToolSource(rootDir, entry, source, hasAuthConfig) {
   }
   return diagnostics.filter((diagnostic) => !isIgnored(source, diagnostic.code));
 }
-function diagnoseWidgetSource(_rootDir, entry, source, hasOpenAiAppsSdkUi) {
+function diagnoseWidgetSource(_rootDir, entry, source) {
   const diagnostics = [];
   const widgetFile = entry.widget?.sourceFile;
   if (!widgetFile) {
@@ -1890,16 +2252,6 @@ function diagnoseWidgetSource(_rootDir, entry, source, hasOpenAiAppsSdkUi) {
       hint: "Use @sidecar-ai/native for portable primitives. Keep @sidecar-ai/openai/components for widgets intentionally targeted to ChatGPT."
     });
   }
-  if (/@sidecar-ai\/openai\/components/.test(source) && !hasOpenAiAppsSdkUi && !isIgnored(source, "SIDECAR_OPENAI_UI_SDK_MISSING")) {
-    diagnostics.push({
-      severity: "error",
-      code: "SIDECAR_OPENAI_UI_SDK_MISSING",
-      message: `Widget for "${entry.id}" imports @sidecar-ai/openai/components but @openai/apps-sdk-ui is not installed.`,
-      filePath: widgetFile,
-      ...locate(source, "@sidecar-ai/openai/components"),
-      hint: "Install it with: npm install @openai/apps-sdk-ui"
-    });
-  }
   if (entry.widget?.variant !== "anthropic" && /@sidecar-ai\/anthropic\/components/.test(source) && !isIgnored(source, "SIDECAR_ANTHROPIC_COMPONENT_CROSS_HOST")) {
     diagnostics.push({
       severity: "warning",
@@ -1989,14 +2341,6 @@ function hasCompanyKnowledgeShape(schema) {
   const id = properties.id;
   return query?.type === "string" || url?.type === "string" || id?.type === "string";
 }
-function canResolveOpenAiAppsSdkUi(rootDir) {
-  try {
-    createRequire(path6.join(rootDir, "package.json")).resolve("@openai/apps-sdk-ui/css");
-    return true;
-  } catch {
-    return false;
-  }
-}
 function locate(source, needle) {
   const index = Math.max(0, source.indexOf(needle));
   const prefix = source.slice(0, index);
@@ -2012,21 +2356,21 @@ function isIgnored(source, code) {
 
 // packages/compiler/src/generated.ts
 import { mkdir as mkdir2, writeFile as writeFile2 } from "fs/promises";
-import path7 from "path";
+import path8 from "path";
 async function writeGeneratedTypes(rootDir, tools) {
-  const generatedDir = path7.join(rootDir, ".sidecar", "generated");
+  const generatedDir = path8.join(rootDir, ".sidecar", "generated");
   await mkdir2(generatedDir, { recursive: true });
   const appCallableTools = tools.filter(isAppCallable);
   const methodNames = uniqueMethodNames(appCallableTools.map((entry) => toIdentifier(entry.id)));
   const imports = appCallableTools.map(
-    (entry, index) => `import type tool${index} from ${JSON.stringify(toImportSpecifier(generatedDir, path7.join(rootDir, entry.sourceFile), { extension: "js" }))};`
+    (entry, index) => `import type tool${index} from ${JSON.stringify(toImportSpecifier(generatedDir, path8.join(rootDir, entry.sourceFile), { extension: "js" }))};`
   ).join("\n");
   const ids = appCallableTools.map((entry, index) => `  ${methodNames[index]}: ${JSON.stringify(entry.id)}`).join(",\n");
   const toolTypes = appCallableTools.map(
-    (entry, index) => `  ${methodNames[index]}(params: ToolParams<typeof tool${index}>): Promise<ToolOutput<typeof tool${index}>>;`
+    (_entry, index) => `  ${methodNames[index]}(params: ToolParams<typeof tool${index}>): Promise<ToolOutput<typeof tool${index}>>;`
   ).join("\n");
   await writeFile2(
-    path7.join(generatedDir, "tools.ts"),
+    path8.join(generatedDir, "tools.ts"),
     `/**
  * Generated Sidecar widget tool client.
  *
@@ -2074,19 +2418,15 @@ function uniqueMethodNames(names) {
   });
 }
 
-// packages/compiler/src/plugins.ts
-import { mkdir as mkdir7, writeFile as writeFile7 } from "fs/promises";
-import path14 from "path";
-
 // packages/compiler/src/identity.ts
 import { readFile as readFile3 } from "fs/promises";
-import path8 from "path";
+import path9 from "path";
 async function loadProjectIdentity(rootDir) {
-  const packageJson = await readOptionalJson(path8.join(rootDir, "package.json"));
+  const packageJson = await readOptionalJson(path9.join(rootDir, "package.json"));
   const configText = await readOptionalText(
-    path8.join(rootDir, "sidecar.config.ts")
+    path9.join(rootDir, "sidecar.config.ts")
   );
-  const name = readConfigString(configText, "name") ?? packageJson?.name ?? path8.basename(rootDir);
+  const name = readConfigString(configText, "name") ?? packageJson?.name ?? path9.basename(rootDir);
   const version = readConfigString(configText, "version") ?? packageJson?.version ?? "0.0.0-dev";
   const description = readConfigString(configText, "description") ?? packageJson?.description ?? `${name} Sidecar app.`;
   return {
@@ -2118,30 +2458,34 @@ function readConfigString(configText, key) {
   return match?.[1];
 }
 
+// packages/compiler/src/plugins.ts
+import { mkdir as mkdir7, writeFile as writeFile7 } from "fs/promises";
+import path15 from "path";
+
 // packages/compiler/src/plugin-components/agents.ts
 import { mkdir as mkdir3, readdir as readdir2, readFile as readFile4, writeFile as writeFile3 } from "fs/promises";
-import path9 from "path";
+import path10 from "path";
 async function emitClaudeAgents(rootDir, destination) {
-  const source = path9.join(rootDir, "agents");
+  const source = path10.join(rootDir, "agents");
   if (!existsSyncSafe(source)) {
     return;
   }
   const entries = await readdir2(source, { withFileTypes: true });
   const agentDirs = entries.filter(
-    (entry) => entry.isDirectory() && existsSyncSafe(path9.join(source, entry.name, "agent.ts"))
+    (entry) => entry.isDirectory() && existsSyncSafe(path10.join(source, entry.name, "agent.ts"))
   );
   if (!agentDirs.length) {
     return;
   }
   await mkdir3(destination, { recursive: true });
   for (const entry of agentDirs) {
-    const sourceText = await readFile4(path9.join(source, entry.name, "agent.ts"), "utf8");
+    const sourceText = await readFile4(path10.join(source, entry.name, "agent.ts"), "utf8");
     const markdown = parseClaudeAgent(
       sourceText,
       entry.name
     );
     const agentName = readObjectString(sourceText, "name") ?? entry.name;
-    await writeFile3(path9.join(destination, `${safeFileStem(agentName)}.md`), markdown);
+    await writeFile3(path10.join(destination, `${safeFileStem(agentName)}.md`), markdown);
   }
 }
 function parseClaudeAgent(source, fallbackName) {
@@ -2170,41 +2514,41 @@ ${prompt.trim()}
 
 // packages/compiler/src/plugin-components/commands.ts
 import { cp, lstat, mkdir as mkdir4, readdir as readdir3, readFile as readFile5, writeFile as writeFile4 } from "fs/promises";
-import path10 from "path";
+import path11 from "path";
 async function copyCommands(rootDir, destination) {
-  const source = path10.join(rootDir, "commands");
+  const source = path11.join(rootDir, "commands");
   if (!existsSyncSafe(source)) {
     return;
   }
   await mkdir4(destination, { recursive: true });
   const entries = await readdir3(source, { withFileTypes: true });
   for (const entry of entries) {
-    const sourcePath = path10.join(source, entry.name);
+    const sourcePath = path11.join(source, entry.name);
     if (entry.isFile() && entry.name.endsWith(".md")) {
       if (await safeCommandCopyFilter(sourcePath)) {
-        await cp(sourcePath, path10.join(destination, safeFileStem(entry.name.replace(/\.md$/, "")) + ".md"));
+        await cp(sourcePath, path11.join(destination, safeFileStem(entry.name.replace(/\.md$/, "")) + ".md"));
       }
       continue;
     }
     if (!entry.isDirectory()) {
       continue;
     }
-    const dynamicCommand = path10.join(sourcePath, "command.ts");
+    const dynamicCommand = path11.join(sourcePath, "command.ts");
     if (existsSyncSafe(dynamicCommand)) {
       const sourceText = await readFile5(dynamicCommand, "utf8");
       const markdown = parseDynamicCommand(sourceText, entry.name);
       const commandName = readObjectString(sourceText, "name") ?? entry.name;
-      await writeFile4(path10.join(destination, `${safeFileStem(commandName)}.md`), markdown);
+      await writeFile4(path11.join(destination, `${safeFileStem(commandName)}.md`), markdown);
       continue;
     }
-    await cp(sourcePath, path10.join(destination, entry.name), {
+    await cp(sourcePath, path11.join(destination, entry.name), {
       recursive: true,
       filter: safeCommandCopyFilter
     });
   }
 }
 async function safeCommandCopyFilter(sourcePath) {
-  const basename = path10.basename(sourcePath);
+  const basename = path11.basename(sourcePath);
   if (basename === ".env" || basename.startsWith(".env.") || basename === "node_modules" || basename === ".git") {
     return false;
   }
@@ -2233,32 +2577,32 @@ ${Object.entries(frontmatter).map(([key, value]) => `${key}: ${yamlScalar(value)
 
 // packages/compiler/src/plugin-components/hooks.ts
 import { mkdir as mkdir5, readdir as readdir4, readFile as readFile6, writeFile as writeFile5 } from "fs/promises";
-import path11 from "path";
+import path12 from "path";
 import {
   Node as Node6,
   Project as Project2,
   SyntaxKind as SyntaxKind4
 } from "ts-morph";
 async function copyHooks(rootDir, destination) {
-  const source = path11.join(rootDir, "hooks");
+  const source = path12.join(rootDir, "hooks");
   if (!existsSyncSafe(source)) {
     return;
   }
   const entries = await readdir4(source, { withFileTypes: true });
   const hookDirs = entries.filter(
-    (entry) => entry.isDirectory() && existsSyncSafe(path11.join(source, entry.name, "hook.ts"))
+    (entry) => entry.isDirectory() && existsSyncSafe(path12.join(source, entry.name, "hook.ts"))
   );
   if (!hookDirs.length) {
     return;
   }
   const config = {};
   for (const entry of hookDirs) {
-    const filePath = path11.join(source, entry.name, "hook.ts");
+    const filePath = path12.join(source, entry.name, "hook.ts");
     mergeHooks(config, parseHookFile(await readFile6(filePath, "utf8"), entry.name));
   }
   await mkdir5(destination, { recursive: true });
   await writeFile5(
-    path11.join(destination, "hooks.json"),
+    path12.join(destination, "hooks.json"),
     `${JSON.stringify(config, null, 2)}
 `
   );
@@ -2285,7 +2629,7 @@ function parseHookFile(source, fallbackName) {
   throw new Error(`hooks/${fallbackName}/hook.ts must default-export hook({ ... }) or hooks({ ... }).`);
 }
 function parseHookDefinition(definition, fallbackName) {
-  const event = readStringProperty3(definition, "event");
+  const event = readStringProperty4(definition, "event");
   if (!event) {
     throw new Error(`hooks/${fallbackName}/hook.ts must declare an event string.`);
   }
@@ -2295,7 +2639,7 @@ function parseHookDefinition(definition, fallbackName) {
   }
   return {
     event,
-    matcher: readStringProperty3(definition, "matcher"),
+    matcher: readStringProperty4(definition, "matcher"),
     run: hooks
   };
 }
@@ -2315,7 +2659,7 @@ function parseHooksDefinition(definition, fallbackName) {
         throw new Error(`hooks/${fallbackName}/hook.ts event "${event}" entries must be objects.`);
       }
       return stripUndefined2({
-        matcher: readStringProperty3(entry, "matcher"),
+        matcher: readStringProperty4(entry, "matcher"),
         hooks: readHookArray(entry, "run", fallbackName)
       });
     });
@@ -2338,7 +2682,7 @@ function parseHookHandlers(handlers, fallbackName) {
 }
 function parseHookHandler(handler, fallbackName) {
   if (Node6.isObjectLiteralExpression(handler)) {
-    const type = readStringProperty3(handler, "type");
+    const type = readStringProperty4(handler, "type");
     if (type !== "command" && type !== "http") {
       throw new Error(`hooks/${fallbackName}/hook.ts hook handlers need type "command" or "http".`);
     }
@@ -2388,7 +2732,7 @@ function objectLiteralToRecord(object) {
   }
   return stripUndefined2(record);
 }
-function readStringProperty3(object, propertyName) {
+function readStringProperty4(object, propertyName) {
   const property = object.getProperty(propertyName);
   if (!property || !Node6.isPropertyAssignment(property)) {
     return void 0;
@@ -2432,7 +2776,7 @@ function mergeHooks(target, source) {
 
 // packages/compiler/src/plugin-components/passthrough.ts
 import { cp as cp2, lstat as lstat2 } from "fs/promises";
-import path12 from "path";
+import path13 from "path";
 async function copyClaudePassthroughDirectories(rootDir, pluginDir) {
   for (const directory of [
     "assets",
@@ -2441,18 +2785,18 @@ async function copyClaudePassthroughDirectories(rootDir, pluginDir) {
     "output-styles",
     "themes"
   ]) {
-    const source = path12.join(rootDir, directory);
+    const source = path13.join(rootDir, directory);
     if (!existsSyncSafe(source)) {
       continue;
     }
-    await cp2(source, path12.join(pluginDir, directory), {
+    await cp2(source, path13.join(pluginDir, directory), {
       recursive: true,
       filter: safePluginCopyFilter
     });
   }
 }
 async function safePluginCopyFilter(sourcePath) {
-  const basename = path12.basename(sourcePath);
+  const basename = path13.basename(sourcePath);
   if (basename === "node_modules" || basename === ".git" || basename === ".env" || basename.startsWith(".env.")) {
     return false;
   }
@@ -2461,11 +2805,11 @@ async function safePluginCopyFilter(sourcePath) {
 }
 
 // packages/compiler/src/plugin-components/skills.ts
-import { existsSync as existsSync4 } from "fs";
+import { existsSync as existsSync5 } from "fs";
 import { cp as cp3, lstat as lstat3, mkdir as mkdir6, readdir as readdir5, readFile as readFile7, writeFile as writeFile6 } from "fs/promises";
-import path13 from "path";
+import path14 from "path";
 async function copySkills(rootDir, destination) {
-  const source = path13.join(rootDir, "skills");
+  const source = path14.join(rootDir, "skills");
   if (!existsSyncSafe(source)) {
     return;
   }
@@ -2475,27 +2819,27 @@ async function copySkills(rootDir, destination) {
     if (!entry.isDirectory()) {
       continue;
     }
-    const sourceDir = path13.join(source, entry.name);
-    const destinationDir = path13.join(destination, entry.name);
-    const staticSkill = path13.join(sourceDir, "SKILL.md");
-    const dynamicSkill = path13.join(sourceDir, "skill.ts");
+    const sourceDir = path14.join(source, entry.name);
+    const destinationDir = path14.join(destination, entry.name);
+    const staticSkill = path14.join(sourceDir, "SKILL.md");
+    const dynamicSkill = path14.join(sourceDir, "skill.ts");
     await mkdir6(destinationDir, { recursive: true });
-    if (existsSync4(staticSkill)) {
+    if (existsSync5(staticSkill)) {
       await cp3(sourceDir, destinationDir, {
         recursive: true,
-        filter: async (sourcePath) => !sourcePath.endsWith(`${path13.sep}skill.ts`) && await safeSkillCopyFilter(sourcePath)
+        filter: async (sourcePath) => !sourcePath.endsWith(`${path14.sep}skill.ts`) && await safeSkillCopyFilter(sourcePath)
       });
-    } else if (existsSync4(dynamicSkill)) {
+    } else if (existsSync5(dynamicSkill)) {
       const generated = parseDynamicSkill(
         await readFile7(dynamicSkill, "utf8"),
         entry.name
       );
-      await writeFile6(path13.join(destinationDir, "SKILL.md"), generated);
+      await writeFile6(path14.join(destinationDir, "SKILL.md"), generated);
     }
   }
 }
 async function safeSkillCopyFilter(sourcePath) {
-  const basename = path13.basename(sourcePath);
+  const basename = path14.basename(sourcePath);
   if (basename === ".env" || basename.startsWith(".env.") || basename === "node_modules" || basename === ".git") {
     return false;
   }
@@ -2521,25 +2865,25 @@ async function buildPluginPackages(rootDir, outRoot, manifest) {
   await buildClaudePlugin(rootDir, outRoot, identity, manifest);
 }
 async function buildClaudePlugin(rootDir, outRoot, identity, manifest) {
-  const pluginDir = path14.join(outRoot, "claude-plugin");
-  await mkdir7(path14.join(pluginDir, ".claude-plugin"), { recursive: true });
-  await copySkills(rootDir, path14.join(pluginDir, "skills"));
-  await copyCommands(rootDir, path14.join(pluginDir, "commands"));
-  await copyHooks(rootDir, path14.join(pluginDir, "hooks"));
-  await emitClaudeAgents(rootDir, path14.join(pluginDir, "agents"));
+  const pluginDir = path15.join(outRoot, "claude-plugin");
+  await mkdir7(path15.join(pluginDir, ".claude-plugin"), { recursive: true });
+  await copySkills(rootDir, path15.join(pluginDir, "skills"));
+  await copyCommands(rootDir, path15.join(pluginDir, "commands"));
+  await copyHooks(rootDir, path15.join(pluginDir, "hooks"));
+  await emitClaudeAgents(rootDir, path15.join(pluginDir, "agents"));
   await copyClaudePassthroughDirectories(rootDir, pluginDir);
-  await writeJson(path14.join(pluginDir, ".claude-plugin", "plugin.json"), {
+  await writeJson(path15.join(pluginDir, ".claude-plugin", "plugin.json"), {
     name: identity.slug,
     version: identity.version,
     description: identity.description,
     displayName: identity.name,
     installationPreference: "available"
   });
-  await writeJson(path14.join(pluginDir, "version.json"), {
+  await writeJson(path15.join(pluginDir, "version.json"), {
     version: identity.version,
     generatedBy: "sidecar"
   });
-  await writeJson(path14.join(pluginDir, ".mcp.json"), {
+  await writeJson(path15.join(pluginDir, ".mcp.json"), {
     mcpServers: {
       [identity.slug]: {
         type: "http",
@@ -2547,7 +2891,7 @@ async function buildClaudePlugin(rootDir, outRoot, identity, manifest) {
       }
     }
   });
-  await writeJson(path14.join(pluginDir, "settings.json"), {
+  await writeJson(path15.join(pluginDir, "settings.json"), {
     sidecar: {
       tools: manifest.tools.map((entry) => entry.id),
       resources: manifest.resources.map((entry) => entry.uri),
@@ -2555,21 +2899,21 @@ async function buildClaudePlugin(rootDir, outRoot, identity, manifest) {
     }
   });
   await writeFile7(
-    path14.join(pluginDir, "README.md"),
+    path15.join(pluginDir, "README.md"),
     `# ${identity.name} Claude Plugin
 
 This package was generated by Sidecar.
 
 Set \`SIDECAR_MCP_URL\` to the hosted MCP endpoint for this app.
 
-For local testing, run \`sidecar dev --tunnel\` and use the printed HTTPS MCP URL.
+For local testing, run \`sidecar dev --tunnel\` and use the validated HTTPS MCP URL it prints. Temporary quick tunnels are public and best-effort; use a configured tunnel/domain or deployed preview for repeatable testing.
 
 Claude/Cowork plugin-specific components such as skills, slash commands, agents, hooks, output styles, themes, monitors, assets, and bin scripts will be emitted here when the source project defines them.
 `
   );
 }
 async function writeJson(filePath, value) {
-  await mkdir7(path14.dirname(filePath), { recursive: true });
+  await mkdir7(path15.dirname(filePath), { recursive: true });
   await writeFile7(
     filePath,
     `${JSON.stringify(stripUndefined2(value), null, 2)}
@@ -2579,13 +2923,13 @@ async function writeJson(filePath, value) {
 
 // packages/compiler/src/prompts.ts
 import { readdir as readdir6 } from "fs/promises";
-import path15 from "path";
+import path16 from "path";
 import {
   Node as Node7,
   SyntaxKind as SyntaxKind5
 } from "ts-morph";
 async function analyzeProjectPrompts(rootDir) {
-  const promptFiles = await findPromptFiles(path15.join(rootDir, "prompts"));
+  const promptFiles = await findPromptFiles(path16.join(rootDir, "prompts"));
   if (promptFiles.length === 0) {
     return [];
   }
@@ -2597,7 +2941,7 @@ async function analyzeProjectPrompts(rootDir) {
 function analyzePromptFile(sourceFile, rootDir) {
   const definition = findPromptDefinition(sourceFile);
   const absoluteFile = sourceFile.getFilePath();
-  const directory = path15.basename(path15.dirname(absoluteFile));
+  const directory = path16.basename(path16.dirname(absoluteFile));
   const name = getOptionalStringProperty2(definition, "name") ?? safePathSegment(directory);
   const title = getRequiredStringProperty2(definition, "title", sourceFile);
   const description = getOptionalStringProperty2(definition, "description");
@@ -2613,7 +2957,7 @@ function analyzePromptFile(sourceFile, rootDir) {
     throw new CompilerError(sourceFile, "prompt({ ... }) must include a run method.");
   }
   return {
-    sourceFile: path15.relative(rootDir, absoluteFile),
+    sourceFile: path16.relative(rootDir, absoluteFile),
     directory,
     name,
     title,
@@ -2632,7 +2976,7 @@ async function findPromptFiles(promptsDir) {
     if (!entry.isDirectory()) {
       continue;
     }
-    const filePath = path15.join(promptsDir, entry.name, "prompt.ts");
+    const filePath = path16.join(promptsDir, entry.name, "prompt.ts");
     if (existsSyncSafe(filePath)) {
       files.push(filePath);
     }
@@ -2754,7 +3098,7 @@ function readIcons(definition) {
     return [{
       src,
       mimeType: getOptionalStringProperty2(object, "mimeType"),
-      sizes: readStringArrayProperty3(object, "sizes")
+      sizes: readStringArrayProperty4(object, "sizes")
     }];
   });
   return icons.length ? icons : void 0;
@@ -2767,7 +3111,7 @@ function readObjectProperty4(definition, propertyName) {
   const initializer = unwrapExpression(property.getInitializer());
   return initializer && Node7.isObjectLiteralExpression(initializer) ? initializer : void 0;
 }
-function readStringArrayProperty3(definition, propertyName) {
+function readStringArrayProperty4(definition, propertyName) {
   const property = definition.getProperty(propertyName);
   if (!property || !Node7.isPropertyAssignment(property)) {
     return void 0;
@@ -2781,13 +3125,13 @@ function readStringArrayProperty3(definition, propertyName) {
 
 // packages/compiler/src/resources.ts
 import { readdir as readdir7 } from "fs/promises";
-import path16 from "path";
+import path17 from "path";
 import {
   Node as Node8,
   SyntaxKind as SyntaxKind6
 } from "ts-morph";
 async function analyzeProjectResources(rootDir) {
-  const resourceFiles = await findResourceFiles(path16.join(rootDir, "resources"));
+  const resourceFiles = await findResourceFiles(path17.join(rootDir, "resources"));
   if (resourceFiles.length === 0) {
     return [];
   }
@@ -2799,7 +3143,7 @@ async function analyzeProjectResources(rootDir) {
 function analyzeResourceFile(sourceFile, rootDir) {
   const definition = findResourceDefinition(sourceFile);
   const absoluteFile = sourceFile.getFilePath();
-  const directory = path16.basename(path16.dirname(absoluteFile));
+  const directory = path17.basename(path17.dirname(absoluteFile));
   const defaultUri = `sidecar://resources/${safePathSegment(directory)}`;
   const name = getRequiredStringProperty3(definition, "name", sourceFile);
   const uri = getOptionalStringProperty3(definition, "uri") ?? defaultUri;
@@ -2817,7 +3161,7 @@ function analyzeResourceFile(sourceFile, rootDir) {
     throw new CompilerError(sourceFile, "resource({ ... }) must include a read method.");
   }
   return {
-    sourceFile: path16.relative(rootDir, absoluteFile),
+    sourceFile: path17.relative(rootDir, absoluteFile),
     directory,
     uri,
     name,
@@ -2840,7 +3184,7 @@ async function findResourceFiles(resourcesDir) {
     if (!entry.isDirectory()) {
       continue;
     }
-    const filePath = path16.join(resourcesDir, entry.name, "resource.ts");
+    const filePath = path17.join(resourcesDir, entry.name, "resource.ts");
     if (existsSyncSafe(filePath)) {
       files.push(filePath);
     }
@@ -2919,7 +3263,7 @@ function readAnnotations2(definition) {
     return void 0;
   }
   const annotations = {};
-  const audience = readStringArrayProperty4(initializer, "audience")?.filter((value) => value === "user" || value === "assistant");
+  const audience = readStringArrayProperty5(initializer, "audience")?.filter((value) => value === "user" || value === "assistant");
   const priority = getOptionalNumberProperty(initializer, "priority");
   const lastModified = getOptionalStringProperty3(initializer, "lastModified");
   if (audience?.length) annotations.audience = audience;
@@ -2948,7 +3292,7 @@ function readIcons2(definition) {
     return [{
       src,
       mimeType: getOptionalStringProperty3(object, "mimeType"),
-      sizes: readStringArrayProperty4(object, "sizes")
+      sizes: readStringArrayProperty5(object, "sizes")
     }];
   });
   return icons.length ? icons : void 0;
@@ -2961,7 +3305,7 @@ function readObjectProperty5(definition, propertyName) {
   const initializer = unwrapExpression(property.getInitializer());
   return initializer && Node8.isObjectLiteralExpression(initializer) ? initializer : void 0;
 }
-function readStringArrayProperty4(definition, propertyName) {
+function readStringArrayProperty5(definition, propertyName) {
   const property = definition.getProperty(propertyName);
   if (!property || !Node8.isPropertyAssignment(property)) {
     return void 0;
@@ -2973,15 +3317,332 @@ function readStringArrayProperty4(definition, propertyName) {
   return initializer.getElements().filter(Node8.isStringLiteral).map((element) => element.getLiteralText());
 }
 
+// packages/compiler/src/server-output.ts
+import { existsSync as existsSync6 } from "fs";
+import { mkdir as mkdir8, rm, writeFile as writeFile8 } from "fs/promises";
+import path18 from "path";
+import { build as esbuild2 } from "esbuild";
+var SERVER_ENTRYPOINT = "server/index.js";
+var VERCEL_FUNCTION_DIR = "functions/api/sidecar.func";
+var VERCEL_ENTRYPOINT = `${VERCEL_FUNCTION_DIR}/index.js`;
+var VERCEL_HANDLER_FILE = "index.js";
+async function buildServerOutput(rootDir, outDir, manifest, identity, host = "node", options = {}) {
+  const cacheDir = path18.join(rootDir, ".sidecar", "cache", "server");
+  await mkdir8(cacheDir, { recursive: true });
+  const entryFile = path18.join(cacheDir, "index.ts");
+  await writeFile8(entryFile, renderServerEntry(rootDir, entryFile, manifest, identity));
+  const serverFile = path18.join(outDir, SERVER_ENTRYPOINT);
+  await mkdir8(path18.dirname(serverFile), { recursive: true });
+  await esbuild2({
+    absWorkingDir: rootDir,
+    alias: sidecarBundleAliases(rootDir),
+    banner: {
+      js: `import { createRequire as __sidecarCreateRequire } from "node:module";
+const require = __sidecarCreateRequire(import.meta.url);`
+    },
+    bundle: true,
+    entryPoints: [entryFile],
+    format: "esm",
+    legalComments: "none",
+    minify: false,
+    nodePaths: [
+      path18.join(rootDir, "node_modules"),
+      path18.join(process.cwd(), "node_modules")
+    ],
+    outfile: serverFile,
+    platform: "node",
+    sourcemap: false,
+    target: "node20"
+  });
+  await writeFile8(path18.join(outDir, "package.json"), renderServerPackage(identity));
+  if (host === "vercel") {
+    const vercelOutputDir = options.vercelOutputDir ?? outDir;
+    await rm(path18.join(vercelOutputDir, "api"), { recursive: true, force: true });
+    await rm(path18.join(vercelOutputDir, "vercel.json"), { force: true });
+    await writeFile8(path18.join(outDir, VERCEL_HANDLER_FILE), renderVercelEntrypoint());
+    await writeFile8(path18.join(outDir, ".vc-config.json"), renderVercelFunctionConfig());
+    await mkdir8(vercelOutputDir, { recursive: true });
+    await writeFile8(path18.join(vercelOutputDir, "config.json"), renderVercelOutputConfig());
+  } else {
+    await rm(path18.join(outDir, "api"), { recursive: true, force: true });
+    await rm(path18.join(outDir, "vercel.json"), { force: true });
+  }
+}
+function renderServerEntry(rootDir, entryFile, manifest, identity) {
+  const entryDir = path18.dirname(entryFile);
+  const tools = manifest.tools;
+  const resources = manifest.resources;
+  const prompts = manifest.prompts;
+  const imports = [
+    `import { readFileSync, realpathSync } from "node:fs";`,
+    `import { createServer } from "node:http";`,
+    `import { pathToFileURL } from "node:url";`,
+    `import { createSidecarHttpHandler } from "@sidecar-ai/server";`,
+    `import { isSidecarAuth } from "@sidecar-ai/auth";`,
+    `import { isSidecarPrompt, isSidecarResource, isSidecarTool } from "@sidecar-ai/core";`,
+    `import { isSidecarProxy } from "@sidecar-ai/server/proxy";`,
+    ...tools.map(
+      (entry, index) => `import tool${index} from ${JSON.stringify(toImportSpecifier(entryDir, path18.join(rootDir, entry.sourceFile)))};`
+    ),
+    ...resources.map(
+      (entry, index) => `import resource${index} from ${JSON.stringify(toImportSpecifier(entryDir, path18.join(rootDir, entry.sourceFile)))};`
+    ),
+    ...prompts.map(
+      (entry, index) => `import prompt${index} from ${JSON.stringify(toImportSpecifier(entryDir, path18.join(rootDir, entry.sourceFile)))};`
+    ),
+    existsSync6(path18.join(rootDir, "auth.ts")) ? `import authExport from ${JSON.stringify(toImportSpecifier(entryDir, path18.join(rootDir, "auth.ts")))};` : `const authExport = undefined;`,
+    existsSync6(path18.join(rootDir, "proxy.ts")) ? `import proxyExport from ${JSON.stringify(toImportSpecifier(entryDir, path18.join(rootDir, "proxy.ts")))};` : `const proxyExport = undefined;`,
+    existsSync6(path18.join(rootDir, "sidecar.config.ts")) ? `import configExport from ${JSON.stringify(toImportSpecifier(entryDir, path18.join(rootDir, "sidecar.config.ts")))};` : `const configExport = undefined;`
+  ].join("\n");
+  return `${imports}
+
+const manifest = ${JSON.stringify(manifest, null, 2)};
+const identity = ${JSON.stringify(identity, null, 2)};
+
+const loadedAuth = authExport === undefined ? undefined : assertAuth(authExport);
+const auth = loadedAuth && process.env.SIDECAR_MCP_URL
+  ? loadedAuth.withResource(process.env.SIDECAR_MCP_URL)
+  : loadedAuth;
+const proxy = proxyExport === undefined ? undefined : assertProxy(proxyExport);
+const runtimeConfig = configExport && typeof configExport === "object" ? configExport : undefined;
+
+if (auth && !process.env.SIDECAR_MCP_URL) {
+  console.warn("Sidecar auth is enabled. Set SIDECAR_MCP_URL to the public https://.../mcp URL before hosting.");
+}
+
+export const handler = createSidecarHttpHandler({
+  name: identity.name,
+  version: identity.version,
+  path: process.env.SIDECAR_MCP_PATH ?? "/mcp",
+  publicUrl: process.env.SIDECAR_PUBLIC_URL ?? process.env.SIDECAR_MCP_URL,
+  auth,
+  proxy,
+  tools: [
+${tools.map((entry, index) => `    loadTool(${JSON.stringify(entry.sourceFile)}, tool${index}, manifest.tools[${index}].descriptor),`).join("\n")}
+  ],
+  resources: [
+${renderWidgetResources(manifest)}
+${resources.map((entry, index) => `    loadResource(${JSON.stringify(entry.sourceFile)}, resource${index}, manifest.resources[${index}]),`).join("\n")}
+  ],
+  resourceTemplates: manifest.resourceTemplates.map((entry) => ({ descriptor: entry.descriptor })),
+  prompts: [
+${prompts.map((entry, index) => `    loadPrompt(${JSON.stringify(entry.sourceFile)}, prompt${index}, manifest.prompts[${index}].descriptor),`).join("\n")}
+  ],
+  capabilities: {
+    tools: runtimeConfig?.tools ?? manifest.config.tools,
+    resources: runtimeConfig?.resources ?? manifest.config.resources,
+    prompts: runtimeConfig?.prompts ?? manifest.config.prompts,
+  },
+  pagination: runtimeConfig?.pagination ?? {
+    pageSize: manifest.config.pagination.pageSize,
+  },
+});
+
+export default handler;
+
+export const server = createServer(handler);
+
+if (isDirectRun()) {
+  const port = readPort();
+  const host = process.env.SIDECAR_HOST ?? process.env.HOST ?? "0.0.0.0";
+  server.listen(port, host, () => {
+    const localHost = host === "0.0.0.0" ? "127.0.0.1" : host;
+    console.log(\`MCP running on Streamable HTTP at http://\${localHost}:\${port}\${process.env.SIDECAR_MCP_PATH ?? "/mcp"}\`);
+  });
+
+  process.on("SIGTERM", () => shutdown());
+  process.on("SIGINT", () => shutdown());
+}
+
+function loadTool(sourceFile, value, descriptor) {
+  const tool = unwrapRuntimeDefault(value);
+  if (!isSidecarTool(tool)) {
+    throw new Error(\`\${sourceFile} did not default-export a Sidecar tool.\`);
+  }
+  return { tool, descriptor };
+}
+
+function loadResource(sourceFile, value, entry) {
+  const resource = unwrapRuntimeDefault(value);
+  if (!isSidecarResource(resource)) {
+    throw new Error(\`\${sourceFile} did not default-export a Sidecar resource.\`);
+  }
+  return {
+    uri: entry.uri,
+    descriptor: entry.descriptor,
+    resource,
+  };
+}
+
+function loadPrompt(sourceFile, value, descriptor) {
+  const prompt = unwrapRuntimeDefault(value);
+  if (!isSidecarPrompt(prompt)) {
+    throw new Error(\`\${sourceFile} did not default-export a Sidecar prompt.\`);
+  }
+  return { prompt, descriptor };
+}
+
+function assertAuth(value) {
+  const authValue = unwrapRuntimeDefault(value);
+  if (!isSidecarAuth(authValue)) {
+    throw new Error("auth.ts must default-export auth({ ... }) from sidecar-ai.");
+  }
+  return authValue;
+}
+
+function assertProxy(value) {
+  const proxyValue = unwrapRuntimeDefault(value);
+  if (!isSidecarProxy(proxyValue)) {
+    throw new Error("proxy.ts must default-export proxy({ ... }) from @sidecar-ai/server/proxy.");
+  }
+  return proxyValue;
+}
+
+function unwrapRuntimeDefault(value) {
+  if (
+    value &&
+    typeof value === "object" &&
+    "default" in value &&
+    Object.keys(value).every((key) => key === "default" || key === "__esModule")
+  ) {
+    return unwrapRuntimeDefault(value.default);
+  }
+  return value;
+}
+
+function readWidget(outputFile) {
+  return readFileSync(new URL(\`../\${outputFile}\`, import.meta.url), "utf8");
+}
+
+function readPort() {
+  const raw = process.env.PORT ?? process.env.SIDECAR_PORT ?? "3001";
+  const port = Number(raw);
+  if (!Number.isInteger(port) || port < 0 || port > 65535) {
+    throw new Error(\`Invalid PORT/SIDECAR_PORT value: \${raw}\`);
+  }
+  return port;
+}
+
+function isDirectRun() {
+  const entry = process.argv[1];
+  if (!entry) {
+    return false;
+  }
+
+  return import.meta.url === pathToFileURL(realpathSync(entry)).href;
+}
+
+function shutdown() {
+  server.close(() => process.exit(0));
+}
+`;
+}
+function renderWidgetResources(manifest) {
+  return manifest.tools.filter((entry) => entry.widget?.outputFile).map((entry) => `    {
+      uri: ${JSON.stringify(entry.widget?.resourceUri)},
+      name: ${JSON.stringify(entry.name)},
+      description: ${JSON.stringify(entry.widget?.options?.description)},
+      mimeType: "text/html;profile=mcp-app",
+      text: readWidget(${JSON.stringify(entry.widget?.outputFile)}),
+      _meta: ${JSON.stringify(entry.widget?.resourceMeta ?? void 0)},
+    },`).join("\n");
+}
+function renderServerPackage(identity) {
+  return `${JSON.stringify({
+    name: `${identity.slug}-sidecar-server`,
+    version: identity.version,
+    private: true,
+    type: "module",
+    scripts: {
+      start: "node server/index.js"
+    },
+    engines: {
+      node: ">=20"
+    }
+  }, null, 2)}
+`;
+}
+function renderVercelEntrypoint() {
+  return `export { default } from "./server/index.js";
+`;
+}
+function renderVercelFunctionConfig() {
+  return `${JSON.stringify({
+    runtime: "nodejs22.x",
+    handler: VERCEL_HANDLER_FILE,
+    launcherType: "Nodejs",
+    shouldAddHelpers: true,
+    supportsResponseStreaming: true,
+    maxDuration: 300
+  }, null, 2)}
+`;
+}
+function renderVercelOutputConfig() {
+  return `${JSON.stringify({
+    version: 3,
+    routes: [
+      {
+        src: "/(.*)",
+        dest: "/api/sidecar"
+      }
+    ]
+  }, null, 2)}
+`;
+}
+function sidecarBundleAliases(rootDir) {
+  const repoRoot = findSidecarRepoRoot2(rootDir) ?? findSidecarRepoRoot2(process.cwd());
+  if (!repoRoot) {
+    return void 0;
+  }
+  return {
+    "sidecar-ai": path18.join(repoRoot, "packages", "sidecar-ai", "src", "index.ts"),
+    "@sidecar-ai/auth": path18.join(repoRoot, "packages", "auth", "src", "index.ts"),
+    "@sidecar-ai/core": path18.join(repoRoot, "packages", "core", "src", "index.ts"),
+    "@sidecar-ai/server": path18.join(repoRoot, "packages", "server", "src", "index.ts"),
+    "@sidecar-ai/server/proxy": path18.join(repoRoot, "packages", "server", "src", "proxy.ts"),
+    "@sidecar-ai/client": path18.join(repoRoot, "packages", "client", "src", "index.ts"),
+    "@sidecar-ai/react": path18.join(repoRoot, "packages", "react", "src", "index.ts"),
+    "@sidecar-ai/native": path18.join(repoRoot, "packages", "native", "src", "index.ts"),
+    "@sidecar-ai/native/components": path18.join(repoRoot, "packages", "native", "src", "components", "index.tsx"),
+    "@sidecar-ai/openai": path18.join(repoRoot, "packages", "openai", "src", "index.ts"),
+    "@sidecar-ai/openai/components": path18.join(repoRoot, "packages", "openai", "src", "components.tsx"),
+    "@sidecar-ai/openai/official": path18.join(repoRoot, "packages", "openai", "src", "official.ts"),
+    "@sidecar-ai/anthropic": path18.join(repoRoot, "packages", "anthropic", "src", "index.ts"),
+    "@sidecar-ai/anthropic/agent": path18.join(repoRoot, "packages", "anthropic", "src", "agent.ts"),
+    "@sidecar-ai/anthropic/command": path18.join(repoRoot, "packages", "anthropic", "src", "command.ts"),
+    "@sidecar-ai/anthropic/components": path18.join(repoRoot, "packages", "anthropic", "src", "components.tsx"),
+    "@sidecar-ai/anthropic/hooks": path18.join(repoRoot, "packages", "anthropic", "src", "hooks.ts"),
+    "@sidecar-ai/anthropic/mcp": path18.join(repoRoot, "packages", "anthropic", "src", "mcp.ts"),
+    "@sidecar-ai/anthropic/plugin": path18.join(repoRoot, "packages", "anthropic", "src", "plugin.ts"),
+    "@sidecar-ai/anthropic/skill": path18.join(repoRoot, "packages", "anthropic", "src", "skill.ts")
+  };
+}
+function findSidecarRepoRoot2(startDir) {
+  let current = path18.resolve(startDir);
+  while (true) {
+    if (existsSync6(path18.join(current, "packages", "core", "src", "index.ts"))) {
+      return current;
+    }
+    const parent = path18.dirname(current);
+    if (parent === current) {
+      return void 0;
+    }
+    current = parent;
+  }
+}
+
 // packages/compiler/src/build.ts
 async function buildProject(options) {
-  const rootDir = path17.resolve(options.rootDir);
-  const target = options.target ?? "mcp";
+  const rootDir = path19.resolve(options.rootDir);
   const config = analyzeProjectConfig(rootDir);
+  const target = options.target ?? config.build.target ?? "mcp";
+  const host = options.host ?? config.build.host ?? "node";
+  const plugins = options.plugins ?? config.build.plugins ?? false;
   const tools = await analyzeProjectTools(rootDir, { target });
   const resources = await analyzeProjectResources(rootDir);
   const resourceTemplates = [];
   const prompts = await analyzeProjectPrompts(rootDir);
+  const identity = await loadProjectIdentity(rootDir);
   const diagnostics = await collectProjectDiagnostics(rootDir, {
     tools,
     resources,
@@ -2992,11 +3653,13 @@ async function buildProject(options) {
   if (errors.length) {
     throw new Error(errors.map(formatDiagnostic).join("\n"));
   }
-  const outDir = resolveInsideRoot(rootDir, options.outDir ?? "out/mcp");
-  await buildWidgets(rootDir, outDir, tools);
+  const outDir = resolveInsideRoot(rootDir, options.outDir ?? config.build.outDir ?? defaultBuildOutDir(host, target));
+  const runtimeOutDir = resolveRuntimeOutputDir(outDir, host);
+  await buildWidgets(rootDir, runtimeOutDir, tools, config.build.widgets);
   const manifest = {
     version: 1,
     target,
+    host,
     rootDir: ".",
     generatedAt: (/* @__PURE__ */ new Date()).toISOString(),
     config,
@@ -3006,23 +3669,47 @@ async function buildProject(options) {
     prompts,
     diagnostics
   };
-  await mkdir8(outDir, { recursive: true });
-  await writeFile8(
-    path17.join(outDir, "manifest.sidecar.json"),
+  await mkdir9(runtimeOutDir, { recursive: true });
+  await writeFile9(
+    path19.join(runtimeOutDir, "manifest.sidecar.json"),
     `${JSON.stringify(manifest, null, 2)}
 `
   );
-  await writeFile8(path17.join(outDir, "README.md"), renderMcpReadme(manifest));
+  await writeFile9(path19.join(runtimeOutDir, "README.md"), renderMcpReadme(manifest));
   await writeGeneratedTypes(rootDir, tools);
-  if (options.plugins) {
-    await buildPluginPackages(rootDir, path17.dirname(outDir), manifest);
+  await buildServerOutput(rootDir, runtimeOutDir, manifest, identity, host, {
+    vercelOutputDir: outDir
+  });
+  if (plugins) {
+    await buildPluginPackages(rootDir, resolvePluginOutputBase(rootDir, outDir, host), manifest);
   }
   return manifest;
 }
+function defaultBuildOutDir(host, target) {
+  if (host === "vercel") {
+    return ".vercel/output";
+  }
+  return `out/${target}`;
+}
+function resolveRuntimeOutputDir(outDir, host) {
+  if (host === "vercel") {
+    return path19.join(outDir, VERCEL_FUNCTION_DIR);
+  }
+  return outDir;
+}
+function resolvePluginOutputBase(rootDir, outDir, host) {
+  if (host === "vercel" && isVercelBuildOutputDir(outDir)) {
+    return path19.join(rootDir, "out");
+  }
+  return path19.dirname(outDir);
+}
+function isVercelBuildOutputDir(outDir) {
+  return path19.basename(outDir) === "output" && path19.basename(path19.dirname(outDir)) === ".vercel";
+}
 function resolveInsideRoot(rootDir, output) {
-  const resolved = path17.resolve(rootDir, output);
-  const relative = path17.relative(rootDir, resolved);
-  if (relative.startsWith("..") || path17.isAbsolute(relative)) {
+  const resolved = path19.resolve(rootDir, output);
+  const relative = path19.relative(rootDir, resolved);
+  if (relative.startsWith("..") || path19.isAbsolute(relative)) {
     throw new Error(`Build output must stay inside the project root: ${output}`);
   }
   return resolved;
@@ -3047,9 +3734,35 @@ ${resources || "No resources detected."}
 
 ${prompts || "No prompts detected."}
 
+${manifest.host === "vercel" ? renderVercelReadmeSection() : renderNodeReadmeSection()}
+
 ## Local HTTPS Testing
 
-Run \`sidecar dev --tunnel\` from the project root to start the local MCP server on Streamable HTTP and print an HTTPS MCP URL that can be added to ChatGPT, Claude, or a Claude plugin install.
+Run \`sidecar dev --tunnel\` from the project root to start the local MCP server on Streamable HTTP and print a validated HTTPS MCP URL that can be added to ChatGPT, Claude, or a Claude plugin install. Temporary quick tunnels are public and best-effort; use a configured tunnel/domain or deployed preview for repeatable testing.
+`;
+}
+function renderNodeReadmeSection() {
+  return `## Run The Server
+
+This output includes a standalone Node MCP server. Start it with:
+
+\`\`\`sh
+npm start
+\`\`\`
+
+or:
+
+\`\`\`sh
+node server/index.js
+\`\`\`
+
+Set \`PORT\` or \`SIDECAR_PORT\` to choose the listen port. Hosted/authenticated MCPs should set \`SIDECAR_MCP_URL\` to the public \`https://.../mcp\` URL before starting.
+`;
+}
+function renderVercelReadmeSection() {
+  return `## Deploy To Vercel
+
+This output uses Vercel's Build Output API. The MCP function is emitted at \`${VERCEL_FUNCTION_DIR}\`, and \`config.json\` routes Streamable HTTP traffic to it. Set \`SIDECAR_MCP_URL\` to the public \`https://.../mcp\` URL in Vercel.
 `;
 }
 
@@ -3062,7 +3775,7 @@ import { randomUUID } from "crypto";
 var proxyBrand = /* @__PURE__ */ Symbol.for("sidecar.proxy");
 function isSidecarProxy(value) {
   return Boolean(
-    value && typeof value === "object" && value[proxyBrand] === true
+    value && typeof value === "object" && (value[proxyBrand] === true || value.kind === "sidecar.proxy")
   );
 }
 async function runProxy(proxyConfig, request) {
@@ -3075,8 +3788,90 @@ async function runProxy(proxyConfig, request) {
   return void 0;
 }
 
-// packages/server/src/index.ts
+// packages/server/src/sse.ts
 import { JSONRPC_VERSION } from "@modelcontextprotocol/sdk/types.js";
+var sseEventCounter = 0;
+function createSseHub() {
+  const streams = /* @__PURE__ */ new Set();
+  return {
+    open(response) {
+      const stream = createSseStream(response);
+      streams.add(stream);
+      response.on("close", () => {
+        streams.delete(stream);
+      });
+      return stream;
+    },
+    send(method, params) {
+      const stream = streams.values().next().value;
+      stream?.send(method, params);
+    }
+  };
+}
+function createSseStream(response, options = {}) {
+  let closed = false;
+  response.writeHead(200, {
+    "content-type": "text/event-stream",
+    "cache-control": "no-cache, no-transform",
+    "connection": "keep-alive",
+    "x-accel-buffering": "no"
+  });
+  response.flushHeaders?.();
+  const keepAlive = setInterval(() => {
+    writeRaw(": keepalive\n\n");
+  }, 3e4);
+  keepAlive.unref?.();
+  response.on("close", () => {
+    closed = true;
+    clearInterval(keepAlive);
+  });
+  writeRaw(`id: ${nextSseEventId()}
+data:
+
+`);
+  function writeRaw(frame) {
+    if (!closed && !response.destroyed) {
+      response.write(frame);
+    }
+  }
+  function sendJson(value) {
+    writeRaw([
+      `id: ${nextSseEventId()}`,
+      "event: message",
+      `data: ${JSON.stringify(value)}`,
+      "",
+      ""
+    ].join("\n"));
+  }
+  return {
+    supportsRequestProgress: options.supportsRequestProgress,
+    send(method, params) {
+      sendJson(omitUndefined({
+        jsonrpc: JSONRPC_VERSION,
+        method,
+        params
+      }));
+    },
+    sendJson,
+    end() {
+      closed = true;
+      clearInterval(keepAlive);
+      response.end();
+    }
+  };
+}
+function nextSseEventId() {
+  sseEventCounter += 1;
+  return `sidecar-${Date.now()}-${sseEventCounter}`;
+}
+function omitUndefined(value) {
+  return Object.fromEntries(
+    Object.entries(value).filter(([, entry]) => entry !== void 0)
+  );
+}
+
+// packages/server/src/index.ts
+import { JSONRPC_VERSION as JSONRPC_VERSION2 } from "@modelcontextprotocol/sdk/types.js";
 var SIDECAR_MCP_PROTOCOL_VERSION = "2025-11-25";
 var SidecarMcpServer = class {
   constructor(options) {
@@ -3120,6 +3915,8 @@ var SidecarMcpServer = class {
   resources = /* @__PURE__ */ new Map();
   prompts = /* @__PURE__ */ new Map();
   resourceTemplates;
+  activeRequests = /* @__PURE__ */ new Map();
+  subscribedResourceUris = /* @__PURE__ */ new Set();
   /** Returns all tool descriptors exposed through `tools/list`. */
   descriptors() {
     return [...this.tools.values()].map((loaded) => loaded.descriptor);
@@ -3144,13 +3941,16 @@ var SidecarMcpServer = class {
       const authorizedContext = { ...context, authSession };
       const result = await this.dispatch(request, authorizedContext);
       return {
-        jsonrpc: JSONRPC_VERSION,
+        jsonrpc: JSONRPC_VERSION2,
         id: request.id,
         result
       };
     } catch (error) {
+      if (error instanceof RequestCancelledError) {
+        return void 0;
+      }
       return {
-        jsonrpc: JSONRPC_VERSION,
+        jsonrpc: JSONRPC_VERSION2,
         id: request.id,
         error: normalizeError(error)
       };
@@ -3168,6 +3968,8 @@ var SidecarMcpServer = class {
             version: this.options.version ?? "0.0.0-dev"
           }
         };
+      case "ping":
+        return {};
       case "tools/list":
         return this.listTools(request, context);
       case "tools/call":
@@ -3262,7 +4064,7 @@ var SidecarMcpServer = class {
   /** Returns the server-chosen page size for all built-in list pagination. */
   pageSize() {
     const configured = this.options.pagination?.pageSize;
-    return configured && configured > 0 ? Math.floor(configured) : 10;
+    return configured && configured > 0 ? Math.floor(configured) : 50;
   }
   /** Executes a tool after request-level and tool-level auth checks. */
   async callTool(request, context) {
@@ -3280,29 +4082,39 @@ var SidecarMcpServer = class {
     if (authSession !== void 0) {
       ctx.auth = authSession;
     }
+    ctx.notify = this.createNotifications(context, request);
     const controller = new AbortController();
+    if (request.id !== null && request.id !== void 0) {
+      this.activeRequests.set(request.id, controller);
+    }
     ctx.request = {
       ...ctx.request,
       signal: controller.signal
     };
-    const args = loaded.descriptorProvided ? validateAgainstSchema(
-      loaded.descriptor.inputSchema,
-      params?.arguments ?? {},
-      `Invalid parameters for tool "${name}".`
-    ) : params?.arguments ?? {};
-    const result = await withTimeout(
-      executeTool(loaded.tool, args, ctx),
-      this.options.toolTimeoutMs,
-      controller
-    );
-    if (loaded.descriptorProvided) {
-      validateAgainstSchema(
-        loaded.descriptor.outputSchema,
-        result.structuredContent,
-        `Invalid structuredContent returned by tool "${name}".`
+    try {
+      const args = loaded.descriptorProvided ? validateAgainstSchema(
+        loaded.descriptor.inputSchema,
+        params?.arguments ?? {},
+        `Invalid parameters for tool "${name}".`
+      ) : params?.arguments ?? {};
+      const result = await withTimeout(
+        executeTool(loaded.tool, args, ctx),
+        this.options.toolTimeoutMs,
+        controller
       );
+      if (loaded.descriptorProvided) {
+        validateAgainstSchema(
+          loaded.descriptor.outputSchema,
+          result.structuredContent,
+          `Invalid structuredContent returned by tool "${name}".`
+        );
+      }
+      return result;
+    } finally {
+      if (request.id !== null && request.id !== void 0) {
+        this.activeRequests.delete(request.id);
+      }
     }
-    return result;
   }
   /** Authenticates the whole HTTP MCP request when auth.ts is configured. */
   async authorizeEndpoint(context) {
@@ -3354,12 +4166,14 @@ var SidecarMcpServer = class {
       if (context.authSession !== void 0) {
         toolContext.auth = context.authSession;
       }
+      toolContext.notify = this.createNotifications(context, request);
       return executeResource(resource.resource, toResourceContext(toolContext), {
         uri,
         mimeType: resource.descriptor.mimeType
       });
     }
     return {
+      _meta: resource._meta,
       contents: [
         {
           uri,
@@ -3379,6 +4193,7 @@ var SidecarMcpServer = class {
     if (!this.resources.has(uri)) {
       throw new JsonRpcError(-32002, `Resource not found: "${uri}".`, { uri });
     }
+    this.subscribedResourceUris.add(uri);
     return {};
   }
   /** Accepts a resource unsubscription when server-level support is enabled. */
@@ -3390,6 +4205,7 @@ var SidecarMcpServer = class {
     if (!this.resources.has(uri)) {
       throw new JsonRpcError(-32002, `Resource not found: "${uri}".`, { uri });
     }
+    this.subscribedResourceUris.delete(uri);
     return {};
   }
   /** Renders one named prompt with validated arguments. */
@@ -3407,20 +4223,61 @@ var SidecarMcpServer = class {
     if (context.authSession !== void 0) {
       toolContext.auth = context.authSession;
     }
+    toolContext.notify = this.createNotifications(context, request);
     return executePrompt(loaded.prompt, params?.arguments ?? {}, toPromptContext(toolContext));
   }
+  /** Creates notification helpers scoped by advertised server capabilities. */
+  createNotifications(context, request) {
+    const configured = this.options.capabilities ?? {};
+    return createRuntimeNotifications(
+      context.notifications,
+      readProgressToken(request),
+      {
+        toolsListChanged: Boolean(configured.tools?.listChanged),
+        resourcesListChanged: Boolean(configured.resources?.listChanged),
+        promptsListChanged: Boolean(configured.prompts?.listChanged),
+        isResourceSubscribed: (uri) => this.subscribedResourceUris.has(uri)
+      }
+    );
+  }
   /** Accepts notifications without side effects for client compatibility. */
-  async handleNotification(_request) {
+  async handleNotification(request) {
+    if (request.method === "notifications/cancelled") {
+      this.cancelRequest(request);
+    }
+  }
+  /** Applies a client cancellation notification to an active request. */
+  cancelRequest(request) {
+    const params = request.params;
+    const requestId = params?.requestId;
+    if (typeof requestId !== "string" && typeof requestId !== "number") {
+      return;
+    }
+    const controller = this.activeRequests.get(requestId);
+    if (!controller || controller.signal.aborted) {
+      return;
+    }
+    const reason = typeof params?.reason === "string" ? params.reason : "Request cancelled.";
+    controller.abort(new RequestCancelledError(reason));
   }
 };
 function createSidecarMcpServer(options) {
   return new SidecarMcpServer(options);
 }
 function createSidecarHttpServer(options) {
-  const mcp = createSidecarMcpServer(options);
+  return createServer(createSidecarHttpHandler(options));
+}
+function createSidecarHttpHandler(options) {
   const endpoint = options.path ?? "/mcp";
   const maxBodyBytes = options.maxBodyBytes ?? 1e6;
-  return createServer(async (request, response) => {
+  const streamHub = createSseHub();
+  const mcp = createSidecarMcpServer(options);
+  return async (request, response) => {
+    const pathname = request.url?.split("?")[0];
+    const requestLog = createHttpRequestLog(request, pathname);
+    response.once("finish", () => {
+      logHttpRequest(requestLog, response.statusCode);
+    });
     if (isRejectedOrigin(request, options.allowedOrigins)) {
       response.writeHead(403, { "content-type": "application/json" });
       response.end(JSON.stringify({ error: "forbidden_origin" }));
@@ -3432,23 +4289,59 @@ function createSidecarHttpServer(options) {
       response.end(proxyResult.body ?? "");
       return;
     }
-    const pathname = request.url?.split("?")[0];
     if (options.auth && request.method === "GET" && isProtectedResourceMetadataPath(pathname, endpoint)) {
       response.writeHead(200, { "content-type": "application/json" });
       response.end(JSON.stringify(options.auth.metadata()));
       return;
     }
+    if (options.auth && request.method === "GET" && pathname === "/.well-known/oauth-authorization-server") {
+      await proxyAuthorizationServerMetadata(options.auth, response);
+      return;
+    }
     if (request.method === "GET" && pathname === endpoint) {
-      response.writeHead(405, { "content-type": "application/json" });
-      response.end(JSON.stringify({ error: "sse_not_supported" }));
+      try {
+        const fetchRequest = toFetchRequest(request, options.publicUrl ?? options.auth?.resource);
+        if (options.auth) {
+          const authSession = await authorizeHttpRequest(options.auth, fetchRequest, response);
+          if (authSession === AUTH_RESPONSE_SENT) {
+            return;
+          }
+        }
+        validateProtocolVersion(request);
+        validateGetHeaders(request);
+        streamHub.open(response);
+      } catch (error) {
+        const status = error instanceof JsonRpcHttpError ? error.status : 400;
+        response.writeHead(status, { "content-type": "application/json" });
+        response.end(
+          JSON.stringify({
+            jsonrpc: JSONRPC_VERSION2,
+            id: null,
+            error: normalizeHttpError(error)
+          })
+        );
+      }
       return;
     }
-    if (request.method !== "POST" || pathname !== endpoint) {
+    if (pathname === endpoint && request.method !== "POST") {
+      response.writeHead(405, {
+        "allow": "GET, POST",
+        "content-type": "application/json"
+      });
+      response.end(JSON.stringify({ error: "method_not_allowed" }));
+      return;
+    }
+    if (pathname !== endpoint) {
       response.writeHead(404, { "content-type": "application/json" });
       response.end(JSON.stringify({ error: "not_found" }));
       return;
     }
     try {
+      const fetchRequest = toFetchRequest(request, options.publicUrl ?? options.auth?.resource);
+      const authSession = options.auth ? await authorizeHttpRequest(options.auth, fetchRequest, response) : void 0;
+      if (options.auth && authSession === AUTH_RESPONSE_SENT) {
+        return;
+      }
       validateProtocolVersion(request);
       validatePostHeaders(request);
       const body = await readJson(request, maxBodyBytes);
@@ -3461,14 +4354,23 @@ function createSidecarHttpServer(options) {
         return;
       }
       const rpcRequest = assertJsonRpcRequest(body);
-      const fetchRequest = toFetchRequest(request, options.publicUrl ?? options.auth?.resource);
-      const authSession = options.auth ? await authorizeHttpRequest(options.auth, fetchRequest, response) : void 0;
-      if (options.auth && authSession === AUTH_RESPONSE_SENT) {
+      if (rpcRequest.id !== void 0 && hasProgressToken(rpcRequest)) {
+        const stream = createSseStream(response, { supportsRequestProgress: true });
+        const payload2 = await mcp.handle(rpcRequest, {
+          request: fetchRequest,
+          authSession,
+          notifications: stream
+        });
+        if (payload2) {
+          stream.sendJson(payload2);
+        }
+        stream.end();
         return;
       }
       const payload = await mcp.handle(rpcRequest, {
         request: fetchRequest,
-        authSession
+        authSession,
+        notifications: streamHub
       }) ?? null;
       const responses = payload === null ? [] : [payload];
       if (!responses.length) {
@@ -3487,13 +4389,13 @@ function createSidecarHttpServer(options) {
       response.writeHead(status, { "content-type": "application/json" });
       response.end(
         JSON.stringify({
-          jsonrpc: JSONRPC_VERSION,
+          jsonrpc: JSONRPC_VERSION2,
           id: null,
           error: normalizeHttpError(error)
         })
       );
     }
-  });
+  };
 }
 var DEFAULT_ALLOWED_ORIGINS = [
   "https://chatgpt.com",
@@ -3543,6 +4445,73 @@ function escapeRegExp(value) {
 function isProtectedResourceMetadataPath(pathname, endpoint) {
   return pathname === "/.well-known/oauth-protected-resource" || pathname === `/.well-known/oauth-protected-resource${endpoint}`;
 }
+function createHttpRequestLog(request, pathname) {
+  return {
+    method: request.method,
+    path: pathname,
+    host: truncateHeader(singleHeader(request.headers.host)),
+    accept: truncateHeader(singleHeader(request.headers.accept)),
+    contentType: truncateHeader(singleHeader(request.headers["content-type"])),
+    contentLength: truncateHeader(singleHeader(request.headers["content-length"])),
+    mcpProtocolVersion: truncateHeader(singleHeader(request.headers["mcp-protocol-version"])),
+    origin: truncateHeader(singleHeader(request.headers.origin)),
+    userAgent: truncateHeader(singleHeader(request.headers["user-agent"])),
+    authorization: request.headers.authorization ? "present" : "absent",
+    cookie: request.headers.cookie ? "present" : "absent"
+  };
+}
+function logHttpRequest(metadata, status) {
+  const debug = process.env.SIDECAR_DEBUG === "1" || process.env.SIDECAR_LOG_LEVEL === "debug";
+  if (!debug && status < 400) {
+    return;
+  }
+  const message = JSON.stringify({
+    event: "sidecar.mcp.http",
+    status,
+    ...stripUndefined4(metadata)
+  });
+  if (status >= 500) {
+    console.error(message);
+  } else if (status >= 400) {
+    console.warn(message);
+  } else {
+    console.info(message);
+  }
+}
+function singleHeader(value) {
+  return Array.isArray(value) ? value.join(", ") : value;
+}
+function truncateHeader(value) {
+  if (!value) {
+    return void 0;
+  }
+  return value.length > 240 ? `${value.slice(0, 237)}...` : value;
+}
+async function proxyAuthorizationServerMetadata(auth, response) {
+  const [authorizationServer] = auth.authorizationServers;
+  if (!authorizationServer) {
+    response.writeHead(404, { "content-type": "application/json" });
+    response.end(JSON.stringify({ error: "authorization_server_not_configured" }));
+    return;
+  }
+  try {
+    const url = new URL("/.well-known/oauth-authorization-server", authorizationServer);
+    const upstream = await fetch(url, { headers: { accept: "application/json" } });
+    const body = await upstream.text();
+    response.writeHead(upstream.ok ? 200 : 502, {
+      "content-type": upstream.headers.get("content-type") ?? "application/json"
+    });
+    response.end(body);
+  } catch (error) {
+    console.warn(JSON.stringify({
+      event: "sidecar.mcp.authorization_metadata_proxy_failed",
+      authorizationServer,
+      message: error instanceof Error ? error.message : "Unknown error"
+    }));
+    response.writeHead(502, { "content-type": "application/json" });
+    response.end(JSON.stringify({ error: "authorization_metadata_unavailable" }));
+  }
+}
 var JsonRpcError = class extends Error {
   constructor(code, message, data) {
     super(message);
@@ -3561,6 +4530,12 @@ var JsonRpcHttpError = class extends JsonRpcError {
   }
   status;
 };
+var RequestCancelledError = class extends Error {
+  constructor(message = "Request cancelled.") {
+    super(message);
+    this.name = "RequestCancelledError";
+  }
+};
 var AUTH_RESPONSE_SENT = /* @__PURE__ */ Symbol("sidecar.auth.response-sent");
 async function authorizeHttpRequest(auth, request, response) {
   const result = await auth.authorizeRequest(request);
@@ -3573,7 +4548,7 @@ async function authorizeHttpRequest(auth, request, response) {
   });
   response.end(
     JSON.stringify({
-      jsonrpc: JSONRPC_VERSION,
+      jsonrpc: JSONRPC_VERSION2,
       id: null,
       error: {
         code: result.status === 401 ? -32001 : -32003,
@@ -3616,9 +4591,57 @@ function createDefaultContext(request) {
         memory.delete(key);
       }
     },
+    notify: noopNotifications,
     env: process.env
   };
 }
+var noopNotifications = {
+  async progress() {
+  },
+  async toolsChanged() {
+  },
+  async resourcesChanged() {
+  },
+  async promptsChanged() {
+  },
+  async resourceUpdated() {
+  }
+};
+function createRuntimeNotifications(sink, progressToken, options) {
+  return {
+    async progress(update) {
+      if (!sink?.supportsRequestProgress || progressToken === void 0) {
+        return;
+      }
+      sink.send("notifications/progress", stripUndefined4({
+        progressToken,
+        progress: update.progress,
+        total: update.total,
+        message: update.message
+      }));
+    },
+    async toolsChanged() {
+      if (options.toolsListChanged) {
+        sink?.send("notifications/tools/list_changed");
+      }
+    },
+    async resourcesChanged() {
+      if (options.resourcesListChanged) {
+        sink?.send("notifications/resources/list_changed");
+      }
+    },
+    async promptsChanged() {
+      if (options.promptsListChanged) {
+        sink?.send("notifications/prompts/list_changed");
+      }
+    },
+    async resourceUpdated(uri) {
+      if (options.isResourceSubscribed(uri)) {
+        sink?.send("notifications/resources/updated", { uri });
+      }
+    }
+  };
+}
 function toResourceContext(ctx) {
   return {
     auth: ctx.auth,
@@ -3626,6 +4649,7 @@ function toResourceContext(ctx) {
     services: ctx.services,
     log: ctx.log,
     storage: ctx.storage,
+    notify: ctx.notify,
     env: ctx.env
   };
 }
@@ -3636,6 +4660,7 @@ function toPromptContext(ctx) {
     services: ctx.services,
     log: ctx.log,
     storage: ctx.storage,
+    notify: ctx.notify,
     env: ctx.env
   };
 }
@@ -3657,6 +4682,27 @@ function readUriParam(request, method) {
   }
   return uri;
 }
+function readProgressToken(request) {
+  const params = request.params;
+  if (!params || typeof params !== "object") {
+    return void 0;
+  }
+  const meta = params._meta;
+  if (!meta || typeof meta !== "object") {
+    return void 0;
+  }
+  const progressToken = meta.progressToken;
+  if (typeof progressToken === "string") {
+    return progressToken;
+  }
+  if (typeof progressToken === "number" && Number.isInteger(progressToken)) {
+    return progressToken;
+  }
+  return void 0;
+}
+function hasProgressToken(request) {
+  return readProgressToken(request) !== void 0;
+}
 function selectPaginationOverride(override, operation) {
   if (!override) {
     return void 0;
@@ -3745,18 +4791,48 @@ function validatePostHeaders(request) {
     );
   }
 }
+function validateGetHeaders(request) {
+  const accept = request.headers.accept;
+  const acceptValue = Array.isArray(accept) ? accept.join(",") : accept;
+  if (!acceptValue || !acceptValue.toLowerCase().includes("text/event-stream")) {
+    throw new JsonRpcHttpError(
+      406,
+      -32600,
+      "GET Accept must include text/event-stream."
+    );
+  }
+}
 async function withTimeout(promise, timeoutMs, controller) {
+  let abortListener;
+  const abortPromise = new Promise((_resolve, reject) => {
+    abortListener = () => {
+      reject(abortReason(controller.signal.reason));
+    };
+    if (controller.signal.aborted) {
+      abortListener();
+      return;
+    }
+    controller.signal.addEventListener("abort", abortListener, { once: true });
+  });
   if (!timeoutMs || timeoutMs <= 0) {
-    return promise;
+    try {
+      return await Promise.race([promise, abortPromise]);
+    } finally {
+      if (abortListener) {
+        controller.signal.removeEventListener("abort", abortListener);
+      }
+    }
   }
   let timeout;
   try {
     return await Promise.race([
       promise,
+      abortPromise,
       new Promise((_resolve, reject) => {
         timeout = setTimeout(() => {
-          controller.abort();
-          reject(new JsonRpcError(-32e3, "Tool execution timed out."));
+          const error = new JsonRpcError(-32e3, "Tool execution timed out.");
+          controller.abort(error);
+          reject(error);
         }, timeoutMs);
       })
     ]);
@@ -3764,8 +4840,17 @@ async function withTimeout(promise, timeoutMs, controller) {
     if (timeout) {
       clearTimeout(timeout);
     }
+    if (abortListener) {
+      controller.signal.removeEventListener("abort", abortListener);
+    }
   }
 }
+function abortReason(reason) {
+  if (reason instanceof Error) {
+    return reason;
+  }
+  return new RequestCancelledError();
+}
 function validateAgainstSchema(schema, value, message, options = {}) {
   if (!schema || value === void 0 && options.optional) {
     return value;
@@ -3776,80 +4861,96 @@ function validateAgainstSchema(schema, value, message, options = {}) {
   }
   return value;
 }
-function schemaFailure(schema, value, path19) {
-  if (schema.anyOf?.length && !schema.anyOf.some((entry) => !schemaFailure(entry, value, path19))) {
-    return `${path19} must match one anyOf schema.`;
+function schemaFailure(schema, value, path21) {
+  if (schema.anyOf?.length && !schema.anyOf.some((entry) => !schemaFailure(entry, value, path21))) {
+    return `${path21} must match one anyOf schema.`;
   }
-  if (schema.oneOf?.length && schema.oneOf.filter((entry) => !schemaFailure(entry, value, path19)).length !== 1) {
-    return `${path19} must match exactly one oneOf schema.`;
+  if (schema.oneOf?.length && schema.oneOf.filter((entry) => !schemaFailure(entry, value, path21)).length !== 1) {
+    return `${path21} must match exactly one oneOf schema.`;
   }
   if (schema.allOf?.length) {
     for (const entry of schema.allOf) {
-      const failure = schemaFailure(entry, value, path19);
+      const failure = schemaFailure(entry, value, path21);
       if (failure) return failure;
     }
   }
   if (schema.const !== void 0 && value !== schema.const) {
-    return `${path19} must equal ${JSON.stringify(schema.const)}.`;
+    return `${path21} must equal ${JSON.stringify(schema.const)}.`;
   }
   if (schema.enum && !schema.enum.some((entry) => JSON.stringify(entry) === JSON.stringify(value))) {
-    return `${path19} must be one of the declared enum values.`;
+    return `${path21} must be one of the declared enum values.`;
   }
   if (schema.type) {
     const types = Array.isArray(schema.type) ? schema.type : [schema.type];
     if (!types.some((type) => matchesJsonSchemaType(type, value))) {
-      return `${path19} must be ${types.join(" or ")}.`;
+      return `${path21} must be ${types.join(" or ")}.`;
     }
   }
   if (schema.type === "object" || schema.properties || schema.required) {
     if (!value || typeof value !== "object" || Array.isArray(value)) {
-      return `${path19} must be an object.`;
+      return `${path21} must be an object.`;
     }
     const record = value;
     for (const required of schema.required ?? []) {
       if (!(required in record)) {
-        return `${path19}.${required} is required.`;
+        return `${path21}.${required} is required.`;
       }
     }
     for (const [key, propertySchema] of Object.entries(schema.properties ?? {})) {
       if (key in record) {
-        const failure = schemaFailure(propertySchema, record[key], `${path19}.${key}`);
+        const failure = schemaFailure(propertySchema, record[key], `${path21}.${key}`);
         if (failure) return failure;
       }
     }
+    const allowed = new Set(Object.keys(schema.properties ?? {}));
     if (schema.additionalProperties === false) {
-      const allowed = new Set(Object.keys(schema.properties ?? {}));
       const extra = Object.keys(record).find((key) => !allowed.has(key));
       if (extra) {
-        return `${path19}.${extra} is not allowed.`;
+        return `${path21}.${extra} is not allowed.`;
+      }
+    } else if (schema.additionalProperties && typeof schema.additionalProperties === "object") {
+      for (const [key, entry] of Object.entries(record)) {
+        if (!allowed.has(key)) {
+          const failure = schemaFailure(schema.additionalProperties, entry, `${path21}.${key}`);
+          if (failure) return failure;
+        }
       }
     }
   }
   if (schema.type === "array" || schema.items) {
     if (!Array.isArray(value)) {
-      return `${path19} must be an array.`;
+      return `${path21} must be an array.`;
+    }
+    if (schema.minItems !== void 0 && value.length < schema.minItems) {
+      return `${path21} must contain at least ${schema.minItems} items.`;
+    }
+    if (schema.maxItems !== void 0 && value.length > schema.maxItems) {
+      return `${path21} must contain at most ${schema.maxItems} items.`;
     }
     if (schema.items) {
       for (const [index, entry] of value.entries()) {
-        const failure = schemaFailure(schema.items, entry, `${path19}[${index}]`);
+        const failure = schemaFailure(schema.items, entry, `${path21}[${index}]`);
         if (failure) return failure;
       }
     }
   }
   if (typeof value === "string") {
     if (schema.minLength !== void 0 && value.length < schema.minLength) {
-      return `${path19} is shorter than ${schema.minLength}.`;
+      return `${path21} is shorter than ${schema.minLength}.`;
     }
     if (schema.maxLength !== void 0 && value.length > schema.maxLength) {
-      return `${path19} is longer than ${schema.maxLength}.`;
+      return `${path21} is longer than ${schema.maxLength}.`;
+    }
+    if (schema.pattern !== void 0 && !new RegExp(schema.pattern).test(value)) {
+      return `${path21} must match pattern ${schema.pattern}.`;
     }
   }
   if (typeof value === "number") {
     if (schema.minimum !== void 0 && value < schema.minimum) {
-      return `${path19} is less than ${schema.minimum}.`;
+      return `${path21} is less than ${schema.minimum}.`;
     }
     if (schema.maximum !== void 0 && value > schema.maximum) {
-      return `${path19} is greater than ${schema.maximum}.`;
+      return `${path21} is greater than ${schema.maximum}.`;
     }
   }
   return void 0;
@@ -3957,14 +5058,14 @@ function assertJsonRpcRequest(value) {
     throw new JsonRpcError(-32600, "Request must be a JSON object.");
   }
   const record = value;
-  if (record.jsonrpc !== JSONRPC_VERSION || typeof record.method !== "string") {
+  if (record.jsonrpc !== JSONRPC_VERSION2 || typeof record.method !== "string") {
     throw new JsonRpcError(-32600, "Invalid JSON-RPC request.");
   }
   if ("id" in record && record.id !== void 0 && record.id !== null && typeof record.id !== "string" && typeof record.id !== "number") {
     throw new JsonRpcError(-32600, "JSON-RPC id must be a string, number, or null.");
   }
   return {
-    jsonrpc: JSONRPC_VERSION,
+    jsonrpc: JSONRPC_VERSION2,
     id: typeof record.id === "string" || typeof record.id === "number" || record.id === null ? record.id : void 0,
     method: record.method,
     params: record.params
@@ -3975,7 +5076,7 @@ function isJsonRpcResponseMessage(value) {
     return false;
   }
   const record = value;
-  if (record.jsonrpc !== JSONRPC_VERSION || !("id" in record) || !("result" in record || "error" in record)) {
+  if (record.jsonrpc !== JSONRPC_VERSION2 || !("id" in record) || !("result" in record || "error" in record)) {
     return false;
   }
   return record.id === null || typeof record.id === "string" || typeof record.id === "number";
@@ -4027,11 +5128,31 @@ import { stdin, stdout } from "process";
 async function startTunnel(options) {
   const provider = await resolveProvider(options.provider);
   const localUrl = `http://127.0.0.1:${options.port}`;
-  const path19 = options.path ?? "/mcp";
+  const path21 = options.path ?? "/mcp";
   if (provider === "cloudflared") {
-    return startCloudflared(localUrl, path19, options.timeoutMs);
-  }
-  return startWrangler(localUrl, path19, options.timeoutMs);
+    return startCloudflared(localUrl, path21, options.timeoutMs);
+  }
+  return startWrangler(localUrl, path21, options.timeoutMs);
+}
+async function validateTunnelEndpoint(options) {
+  const timeoutMs = options.timeoutMs ?? 1e4;
+  const mcpUrl = new URL(options.mcpUrl);
+  if ((options.requireHttps ?? true) && mcpUrl.protocol !== "https:") {
+    throw new Error(`Tunnel URL must use https://, received ${options.mcpUrl}.`);
+  }
+  await retryTunnelValidation(async () => {
+    if (options.auth) {
+      await validateProtectedResourceMetadata({
+        mcpUrl,
+        expectedResource: options.expectedResource ?? options.mcpUrl,
+        timeoutMs
+      });
+      await validateAuthChallenge({ mcpUrl, timeoutMs });
+      return;
+    }
+    await validateInitialize({ mcpUrl, timeoutMs });
+    await validateToolsList({ mcpUrl, timeoutMs });
+  }, timeoutMs);
 }
 function tunnelInstallMessage(provider = "auto") {
   if (provider === "wrangler") {
@@ -4135,7 +5256,7 @@ function assertNpxAvailable() {
     throw new Error(tunnelInstallMessage("wrangler"));
   }
 }
-async function startCloudflared(localUrl, path19, timeoutMs = 2e4) {
+async function startCloudflared(localUrl, path21, timeoutMs = 2e4) {
   const child = spawn("cloudflared", ["tunnel", "--url", localUrl, "--no-autoupdate"], {
     stdio: ["ignore", "pipe", "pipe"]
   });
@@ -4143,13 +5264,13 @@ async function startCloudflared(localUrl, path19, timeoutMs = 2e4) {
   return {
     provider: "cloudflared",
     publicUrl,
-    mcpUrl: appendPath(publicUrl, path19),
+    mcpUrl: appendPath(publicUrl, path21),
     close() {
       child.kill("SIGTERM");
     }
   };
 }
-async function startWrangler(localUrl, path19, timeoutMs = 2e4) {
+async function startWrangler(localUrl, path21, timeoutMs = 2e4) {
   const child = spawn("npx", ["--yes", "wrangler", "tunnel", "quick-start", localUrl], {
     stdio: ["ignore", "pipe", "pipe"]
   });
@@ -4157,7 +5278,7 @@ async function startWrangler(localUrl, path19, timeoutMs = 2e4) {
   return {
     provider: "wrangler",
     publicUrl,
-    mcpUrl: appendPath(publicUrl, path19),
+    mcpUrl: appendPath(publicUrl, path21),
     close() {
       child.kill("SIGTERM");
     }
@@ -4166,15 +5287,20 @@ async function startWrangler(localUrl, path19, timeoutMs = 2e4) {
 function waitForTunnelUrl(child, pattern, timeoutMs) {
   return new Promise((resolve, reject) => {
     let settled = false;
+    let output = "";
     const timeout = setTimeout(() => {
       if (!settled) {
         settled = true;
         child.kill("SIGTERM");
-        reject(new Error("Timed out waiting for HTTPS tunnel URL."));
+        reject(new Error([
+          "Timed out waiting for HTTPS tunnel URL.",
+          tunnelOutputHint(output)
+        ].filter(Boolean).join("\n")));
       }
     }, timeoutMs);
     const inspect = (chunk) => {
-      const match = chunk.toString("utf8").match(pattern);
+      output = tail(`${output}${chunk.toString("utf8")}`, 4e3);
+      const match = output.match(pattern);
       if (match?.[0] && !settled) {
         settled = true;
         clearTimeout(timeout);
@@ -4194,11 +5320,209 @@ function waitForTunnelUrl(child, pattern, timeoutMs) {
       if (!settled) {
         settled = true;
         clearTimeout(timeout);
-        reject(new Error(`Tunnel process exited before producing a URL${code === null ? "" : ` with code ${code}`}.`));
+        reject(new Error([
+          `Tunnel process exited before producing a URL${code === null ? "" : ` with code ${code}`}.`,
+          tunnelOutputHint(output)
+        ].filter(Boolean).join("\n")));
       }
     });
   });
 }
+async function validateProtectedResourceMetadata(options) {
+  const metadataUrl = protectedResourceMetadataUrl(options.mcpUrl);
+  const response = await fetchWithTimeout(metadataUrl, {
+    headers: { accept: "application/json" },
+    timeoutMs: options.timeoutMs
+  });
+  const body = await readValidationBody(response);
+  assertNotHtml(response, body, metadataUrl);
+  if (response.status !== 200) {
+    if (isTransientHttpStatus(response.status)) {
+      throw new TransientTunnelValidationError(`Tunnel validation failed: ${metadataUrl} returned HTTP ${response.status}.`);
+    }
+    throw new Error(`Tunnel validation failed: ${metadataUrl} returned HTTP ${response.status}.`);
+  }
+  const metadata = parseJsonObject(body, metadataUrl);
+  if (metadata.resource !== options.expectedResource) {
+    throw new Error([
+      "Tunnel validation failed: OAuth protected-resource metadata does not match the public MCP URL.",
+      `  expected resource: ${options.expectedResource}`,
+      `  actual resource: ${String(metadata.resource)}`
+    ].join("\n"));
+  }
+}
+async function validateAuthChallenge(options) {
+  const response = await postJsonRpc(options.mcpUrl, {
+    jsonrpc: "2.0",
+    id: 1,
+    method: "initialize",
+    params: {
+      protocolVersion: "2025-11-25",
+      capabilities: {},
+      clientInfo: { name: "sidecar-tunnel-check", version: "0.0.0" }
+    }
+  }, options.timeoutMs);
+  const body = await readValidationBody(response);
+  assertNotHtml(response, body, options.mcpUrl.toString());
+  if (response.status !== 401) {
+    if (isTransientHttpStatus(response.status)) {
+      throw new TransientTunnelValidationError(`Tunnel validation failed: authenticated MCP endpoint returned HTTP ${response.status}.`);
+    }
+    throw new Error(`Tunnel validation failed: authenticated MCP endpoint should return HTTP 401 without a bearer token, received HTTP ${response.status}.`);
+  }
+  if (!response.headers.get("www-authenticate")?.toLowerCase().includes("bearer")) {
+    throw new Error("Tunnel validation failed: authenticated MCP endpoint did not include a Bearer WWW-Authenticate challenge.");
+  }
+  parseJsonObject(body, options.mcpUrl.toString());
+}
+async function validateInitialize(options) {
+  const response = await postJsonRpc(options.mcpUrl, {
+    jsonrpc: "2.0",
+    id: 1,
+    method: "initialize",
+    params: {
+      protocolVersion: "2025-11-25",
+      capabilities: {},
+      clientInfo: { name: "sidecar-tunnel-check", version: "0.0.0" }
+    }
+  }, options.timeoutMs);
+  const body = await readValidationBody(response);
+  assertNotHtml(response, body, options.mcpUrl.toString());
+  if (response.status !== 200) {
+    if (isTransientHttpStatus(response.status)) {
+      throw new TransientTunnelValidationError(`Tunnel validation failed: initialize returned HTTP ${response.status}.`);
+    }
+    throw new Error(`Tunnel validation failed: initialize returned HTTP ${response.status}.`);
+  }
+  const payload = parseJsonObject(body, options.mcpUrl.toString());
+  if (!isRecord3(payload.result) || typeof payload.result.protocolVersion !== "string") {
+    throw new Error("Tunnel validation failed: initialize did not return an MCP server result.");
+  }
+}
+async function validateToolsList(options) {
+  const response = await postJsonRpc(options.mcpUrl, {
+    jsonrpc: "2.0",
+    id: 2,
+    method: "tools/list"
+  }, options.timeoutMs);
+  const body = await readValidationBody(response);
+  assertNotHtml(response, body, options.mcpUrl.toString());
+  if (response.status !== 200) {
+    if (isTransientHttpStatus(response.status)) {
+      throw new TransientTunnelValidationError(`Tunnel validation failed: tools/list returned HTTP ${response.status}.`);
+    }
+    throw new Error(`Tunnel validation failed: tools/list returned HTTP ${response.status}.`);
+  }
+  const payload = parseJsonObject(body, options.mcpUrl.toString());
+  if (!isRecord3(payload.result) || !Array.isArray(payload.result.tools)) {
+    throw new Error("Tunnel validation failed: tools/list did not return a tools array.");
+  }
+}
+function postJsonRpc(url, payload, timeoutMs) {
+  return fetchWithTimeout(url.toString(), {
+    method: "POST",
+    headers: {
+      accept: "application/json, text/event-stream",
+      "content-type": "application/json"
+    },
+    body: JSON.stringify(payload),
+    timeoutMs
+  });
+}
+async function fetchWithTimeout(url, options) {
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), options.timeoutMs);
+  try {
+    return await fetch(url, {
+      ...options,
+      signal: controller.signal
+    });
+  } catch (error) {
+    if (error instanceof Error && error.name === "AbortError") {
+      throw new TransientTunnelValidationError(`Tunnel validation failed: timed out fetching ${url}.`);
+    }
+    throw new TransientTunnelValidationError(
+      `Tunnel validation failed: could not fetch ${url}: ${errorMessage(error)}.`
+    );
+  } finally {
+    clearTimeout(timeout);
+  }
+}
+async function retryTunnelValidation(validate, timeoutMs) {
+  const startedAt = Date.now();
+  let lastError;
+  while (Date.now() - startedAt <= timeoutMs) {
+    try {
+      await validate();
+      return;
+    } catch (error) {
+      lastError = error;
+      if (!(error instanceof TransientTunnelValidationError)) {
+        throw error;
+      }
+      await delay(500);
+    }
+  }
+  throw lastError instanceof Error ? lastError : new Error("Tunnel validation failed before the public endpoint became reachable.");
+}
+var TransientTunnelValidationError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "TransientTunnelValidationError";
+  }
+};
+function isTransientHttpStatus(status) {
+  return status === 408 || status === 425 || status === 429 || status >= 500;
+}
+function delay(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+async function readValidationBody(response) {
+  const text = await response.text();
+  return text.slice(0, 2e4);
+}
+function assertNotHtml(response, body, url) {
+  const contentType = response.headers.get("content-type")?.toLowerCase() ?? "";
+  const trimmed = body.trimStart().toLowerCase();
+  if (contentType.includes("text/html") || trimmed.startsWith("<!doctype html") || trimmed.startsWith("<html")) {
+    throw new Error([
+      `Tunnel validation failed: ${url} returned HTML instead of MCP JSON.`,
+      "This usually means the tunnel provider returned an interstitial, warning page, or bad route."
+    ].join("\n"));
+  }
+}
+function parseJsonObject(body, url) {
+  try {
+    const parsed = JSON.parse(body);
+    if (isRecord3(parsed)) {
+      return parsed;
+    }
+  } catch {
+  }
+  throw new Error(`Tunnel validation failed: ${url} did not return a JSON object.`);
+}
+function protectedResourceMetadataUrl(mcpUrl) {
+  const url = new URL(mcpUrl.origin);
+  const pathname = mcpUrl.pathname.replace(/\/+$/, "") || "/";
+  url.pathname = pathname === "/" ? "/.well-known/oauth-protected-resource" : `/.well-known/oauth-protected-resource${pathname}`;
+  return url.toString();
+}
+function tunnelOutputHint(output) {
+  const trimmed = output.trim();
+  return trimmed ? `Tunnel output:
+${trimmed}` : "";
+}
+function tail(value, maxLength) {
+  return value.length > maxLength ? value.slice(value.length - maxLength) : value;
+}
+function errorMessage(error) {
+  if (error instanceof Error) {
+    const cause = error.cause;
+    const causeMessage = cause instanceof Error ? ` (${cause.message})` : "";
+    return `${error.message}${causeMessage}`;
+  }
+  return String(error);
+}
 function hasCommand(command) {
   return spawnSync("which", [command], { stdio: "ignore" }).status === 0;
 }
@@ -4215,8 +5539,11 @@ function runInherited(command, args) {
     });
   });
 }
-function appendPath(origin, path19) {
-  return `${origin.replace(/\/+$/, "")}/${path19.replace(/^\/+/, "")}`;
+function appendPath(origin, path21) {
+  return `${origin.replace(/\/+$/, "")}/${path21.replace(/^\/+/, "")}`;
+}
+function isRecord3(value) {
+  return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
 
 // packages/cli/src/index.ts
@@ -4225,19 +5552,27 @@ async function main(argv) {
   const rootDir = readOption(argv, "--cwd") ?? cwd();
   switch (command) {
     case "build": {
-      const target = readTarget(argv);
-      const outDir = readOption(argv, "--out") ?? `out/${target}`;
-      const plugins = argv.includes("--plugins");
+      const target = readOptionalTarget(argv);
+      const host = readOptionalHost(argv) ?? detectHostFromEnvironment();
+      const outDir = readOption(argv, "--out");
+      const plugins = readOptionalPlugins(argv);
       const strict = argv.includes("--strict");
-      const manifest = await buildProject({ rootDir, outDir, plugins, strict, target });
+      const manifest = await buildProject({ rootDir, host, outDir, plugins, strict, target });
+      const resolvedOutDir = outDir ?? manifest.config.build.outDir ?? defaultBuildOutDir2(manifest.host, manifest.target);
       printDiagnostics(manifest.diagnostics ?? []);
       if (strict && manifest.diagnostics?.length) {
         exit(1);
       }
       console.log(
-        `Built ${manifest.tools.length} ${target} tool${manifest.tools.length === 1 ? "" : "s"}, ${manifest.resources.length} resource${manifest.resources.length === 1 ? "" : "s"}, and ${manifest.prompts.length} prompt${manifest.prompts.length === 1 ? "" : "s"} to ${outDir}.`
+        `Built ${manifest.tools.length} ${manifest.target} tool${manifest.tools.length === 1 ? "" : "s"}, ${manifest.resources.length} resource${manifest.resources.length === 1 ? "" : "s"}, and ${manifest.prompts.length} prompt${manifest.prompts.length === 1 ? "" : "s"} to ${resolvedOutDir}.`
       );
-      if (plugins) {
+      console.log(`Host runtime: ${manifest.host}`);
+      if (manifest.host === "vercel") {
+        console.log(`Vercel MCP function: ${path20.join(resolvedOutDir, VERCEL_ENTRYPOINT)}`);
+      } else {
+        console.log(`Hostable MCP server: ${path20.join(resolvedOutDir, SERVER_ENTRYPOINT)}`);
+      }
+      if (plugins ?? manifest.config.build.plugins) {
         console.log("Built claude-plugin package.");
       }
       return;
@@ -4268,18 +5603,20 @@ async function main(argv) {
       const target = readTarget(argv);
       const tunnelProvider = readTunnelProvider(argv);
       const outDir = `.sidecar/dev/${target}`;
+      const loadedAuth = await loadRuntimeAuth(rootDir);
+      const runtimeConfig = await loadRuntimeConfig(rootDir);
+      const proxy = await loadRuntimeProxy(rootDir);
+      const runtimeToolEntries = await analyzeProjectTools(rootDir, { target });
+      const runtimeTools = await loadRuntimeTools(rootDir, runtimeToolEntries);
       const manifest = await buildProject({ rootDir, outDir, target });
       printDiagnostics(manifest.diagnostics ?? []);
-      const tools = await loadRuntimeTools(rootDir, manifest);
+      const tools = attachBuiltToolDescriptors(runtimeTools, manifest);
       let tunnel;
       if (tunnelProvider) {
         tunnel = await startTunnel({ provider: tunnelProvider, port, path: "/mcp" });
         process.env.SIDECAR_MCP_URL = tunnel.mcpUrl;
       }
-      const loadedAuth = await loadRuntimeAuth(rootDir);
-      const runtimeConfig = await loadRuntimeConfig(rootDir);
       const auth = loadedAuth && tunnel ? loadedAuth.withResource(tunnel.mcpUrl) : loadedAuth;
-      const proxy = await loadRuntimeProxy(rootDir);
       const resources = await loadResources(rootDir, outDir, manifest);
       const prompts = await loadRuntimePrompts(rootDir, manifest);
       const server = createSidecarHttpServer({
@@ -4300,14 +5637,29 @@ async function main(argv) {
           pageSize: manifest.config.pagination.pageSize
         }
       });
-      server.listen(port, "127.0.0.1", () => {
+      let listening = false;
+      try {
+        await listenOnLocalhost(server, port);
+        listening = true;
+        if (tunnel) {
+          await validateTunnelEndpoint({
+            mcpUrl: tunnel.mcpUrl,
+            auth: Boolean(auth)
+          });
+        }
         console.log(`MCP running on Streamable HTTP (${target}) at http://127.0.0.1:${port}/mcp`);
         console.log(`Loaded ${tools.length} tool${tools.length === 1 ? "" : "s"}, ${resources.length} resource${resources.length === 1 ? "" : "s"}, and ${prompts.length} prompt${prompts.length === 1 ? "" : "s"}.`);
         if (tunnel) {
-          console.log(`HTTPS tunnel (${tunnel.provider}) ready: ${tunnel.mcpUrl}`);
+          console.log(`HTTPS tunnel (${tunnel.provider}) validated: ${tunnel.mcpUrl}`);
           console.log("Use this HTTPS MCP URL in ChatGPT, Claude, or a Claude plugin install.");
         }
-      });
+      } catch (error) {
+        tunnel?.close();
+        if (listening) {
+          await closeServer(server);
+        }
+        throw error;
+      }
       const shutdown = () => {
         tunnel?.close();
         server.close(() => exit(0));
@@ -4350,7 +5702,7 @@ async function main(argv) {
       console.log(`Sidecar
 
 Usage:
-  sidecar build [--cwd <dir>] [--target mcp|chatgpt|claude] [--out <dir>] [--plugins] [--strict]
+  sidecar build [--cwd <dir>] [--target mcp|chatgpt|claude] [--host node|vercel] [--out <dir>] [--plugins|--no-plugins] [--strict]
   sidecar check [--cwd <dir>] [--target mcp|chatgpt|claude] [--strict]
   sidecar dev [--cwd <dir>] [--target mcp|chatgpt|claude] [--port <port>] [--tunnel [cloudflared|wrangler]]
   sidecar inspect [--cwd <dir>] [--target mcp|chatgpt|claude]
@@ -4358,16 +5710,54 @@ Usage:
 `);
   }
 }
+function defaultBuildOutDir2(host, target) {
+  if (host === "vercel") {
+    return ".vercel/output";
+  }
+  return `out/${target}`;
+}
 function readTarget(argv) {
-  const target = readOption(argv, "--target") ?? "mcp";
+  const target = readOptionalTarget(argv) ?? "mcp";
+  return target;
+}
+function readOptionalTarget(argv) {
+  const target = readOption(argv, "--target");
+  if (!target) {
+    return void 0;
+  }
   if (target === "mcp" || target === "chatgpt" || target === "claude") {
     return target;
   }
   throw new Error(`Unsupported Sidecar target "${target}". Expected mcp, chatgpt, or claude.`);
 }
+function readOptionalHost(argv) {
+  const host = readOption(argv, "--host");
+  if (!host) {
+    return void 0;
+  }
+  if (host === "node" || host === "vercel") {
+    return host;
+  }
+  throw new Error(`Unsupported Sidecar host "${host}". Expected node or vercel.`);
+}
+function detectHostFromEnvironment() {
+  if (process.env.VERCEL === "1") {
+    return "vercel";
+  }
+  return void 0;
+}
+function readOptionalPlugins(argv) {
+  if (argv.includes("--plugins")) {
+    return true;
+  }
+  if (argv.includes("--no-plugins")) {
+    return false;
+  }
+  return void 0;
+}
 async function previewComponents(options) {
-  const cliDir = path18.dirname(fileURLToPath(import.meta.url));
-  const css = await readFile8(path18.join(cliDir, "../../native/src/styles.css"), "utf8").catch(() => readFile8(path18.join(process.cwd(), "packages/native/src/styles.css"), "utf8")).catch(() => "");
+  const cliDir = path20.dirname(fileURLToPath(import.meta.url));
+  const css = await readFile8(path20.join(cliDir, "../../native/src/styles.css"), "utf8").catch(() => readFile8(path20.join(process.cwd(), "packages/native/src/styles.css"), "utf8")).catch(() => "");
   const html = renderComponentPreviewHtml(
     options.host,
     options.compare,
@@ -4407,10 +5797,10 @@ async function previewComponents(options) {
   server.close();
 }
 async function writeComponentApproval(rootDir, approval) {
-  const dir = path18.join(rootDir, ".sidecar", "approvals");
-  await mkdir9(dir, { recursive: true });
-  await writeFile9(
-    path18.join(dir, `components.${approval.host}.json`),
+  const dir = path20.join(rootDir, ".sidecar", "approvals");
+  await mkdir10(dir, { recursive: true });
+  await writeFile10(
+    path20.join(dir, `components.${approval.host}.json`),
     `${JSON.stringify(approval, null, 2)}
 `
   );
@@ -4762,84 +6152,98 @@ function printDiagnostics(diagnostics) {
   }
 }
 async function loadRuntimeAuth(rootDir) {
-  const authPath = path18.join(rootDir, "auth.ts");
-  if (!existsSync5(authPath)) {
+  const authPath = path20.join(rootDir, "auth.ts");
+  if (!existsSync7(authPath)) {
     return void 0;
   }
-  const parentURL = pathToFileURL(path18.join(rootDir, "sidecar.config.ts")).href;
-  const tsconfigPath = path18.join(rootDir, "tsconfig.json");
-  const tsconfig = existsSync5(tsconfigPath) ? tsconfigPath : false;
-  const module = await tsImport(pathToFileURL(authPath).href, {
+  const parentURL = pathToFileURL3(path20.join(rootDir, "sidecar.config.ts")).href;
+  const tsconfigPath = path20.join(rootDir, "tsconfig.json");
+  const tsconfig = existsSync7(tsconfigPath) ? tsconfigPath : false;
+  const module = await tsImport2(pathToFileURL3(authPath).href, {
     parentURL,
     tsconfig
   });
-  if (!isSidecarAuth(module.default)) {
+  const defaultExport = unwrapRuntimeDefault2(module.default);
+  if (!isSidecarAuth(defaultExport)) {
     throw new Error("auth.ts must default-export auth({ ... }) from sidecar-ai.");
   }
-  return module.default;
+  return defaultExport;
 }
 async function loadRuntimeProxy(rootDir) {
-  const proxyPath = path18.join(rootDir, "proxy.ts");
-  if (!existsSync5(proxyPath)) {
+  const proxyPath = path20.join(rootDir, "proxy.ts");
+  if (!existsSync7(proxyPath)) {
     return void 0;
   }
-  const parentURL = pathToFileURL(path18.join(rootDir, "sidecar.config.ts")).href;
-  const tsconfigPath = path18.join(rootDir, "tsconfig.json");
-  const tsconfig = existsSync5(tsconfigPath) ? tsconfigPath : false;
-  const module = await tsImport(pathToFileURL(proxyPath).href, {
+  const parentURL = pathToFileURL3(path20.join(rootDir, "sidecar.config.ts")).href;
+  const tsconfigPath = path20.join(rootDir, "tsconfig.json");
+  const tsconfig = existsSync7(tsconfigPath) ? tsconfigPath : false;
+  const module = await tsImport2(pathToFileURL3(proxyPath).href, {
     parentURL,
     tsconfig
   });
-  if (!isSidecarProxy(module.default)) {
+  const defaultExport = unwrapRuntimeDefault2(module.default);
+  if (!isSidecarProxy(defaultExport)) {
     throw new Error("proxy.ts must default-export proxy({ ... }) from @sidecar-ai/server/proxy.");
   }
-  return module.default;
+  return defaultExport;
 }
 async function loadRuntimeConfig(rootDir) {
-  const configPath = path18.join(rootDir, "sidecar.config.ts");
-  if (!existsSync5(configPath)) {
+  const configPath = path20.join(rootDir, "sidecar.config.ts");
+  if (!existsSync7(configPath)) {
     return void 0;
   }
-  const parentURL = pathToFileURL(configPath).href;
-  const tsconfigPath = path18.join(rootDir, "tsconfig.json");
-  const tsconfig = existsSync5(tsconfigPath) ? tsconfigPath : false;
-  const module = await tsImport(pathToFileURL(configPath).href, {
+  const parentURL = pathToFileURL3(configPath).href;
+  const tsconfigPath = path20.join(rootDir, "tsconfig.json");
+  const tsconfig = existsSync7(tsconfigPath) ? tsconfigPath : false;
+  const module = await tsImport2(pathToFileURL3(configPath).href, {
     parentURL,
     tsconfig
   });
-  if (!module.default || typeof module.default !== "object") {
+  const defaultExport = unwrapRuntimeDefault2(module.default);
+  if (!defaultExport || typeof defaultExport !== "object") {
     throw new Error("sidecar.config.ts must default-export defineConfig({ ... }) from sidecar-ai.");
   }
-  return module.default;
+  return defaultExport;
 }
-async function loadRuntimeTools(rootDir, manifest) {
-  const parentURL = pathToFileURL(path18.join(rootDir, "sidecar.config.ts")).href;
-  const tsconfigPath = path18.join(rootDir, "tsconfig.json");
-  const tsconfig = existsSync5(tsconfigPath) ? tsconfigPath : false;
+async function loadRuntimeTools(rootDir, entries) {
+  const parentURL = pathToFileURL3(path20.join(rootDir, "sidecar.config.ts")).href;
+  const tsconfigPath = path20.join(rootDir, "tsconfig.json");
+  const tsconfig = existsSync7(tsconfigPath) ? tsconfigPath : false;
   const loaded = [];
-  for (const entry of manifest.tools) {
-    const sourcePath = path18.join(rootDir, entry.sourceFile);
-    const module = await tsImport(pathToFileURL(sourcePath).href, {
+  for (const entry of entries) {
+    const sourcePath = path20.join(rootDir, entry.sourceFile);
+    const module = await tsImport2(pathToFileURL3(sourcePath).href, {
       parentURL,
       tsconfig
     });
-    if (!isSidecarTool(module.default)) {
+    const defaultExport = unwrapRuntimeDefault2(module.default);
+    if (!isSidecarTool(defaultExport)) {
       throw new Error(`${entry.sourceFile} did not default-export a Sidecar tool.`);
     }
     loaded.push({
-      tool: module.default,
+      sourceFile: entry.sourceFile,
+      tool: defaultExport,
       descriptor: entry.descriptor
     });
   }
   return loaded;
 }
+function attachBuiltToolDescriptors(loadedTools, manifest) {
+  const descriptorsBySource = new Map(
+    manifest.tools.map((entry) => [entry.sourceFile, entry.descriptor])
+  );
+  return loadedTools.map(({ sourceFile, tool, descriptor }) => ({
+    tool,
+    descriptor: descriptorsBySource.get(sourceFile) ?? descriptor
+  }));
+}
 async function loadResources(rootDir, outDir, manifest) {
   const resources = [];
   for (const entry of manifest.tools) {
     if (!entry.widget?.outputFile) {
       continue;
     }
-    const text = await readFile8(path18.join(rootDir, outDir, entry.widget.outputFile), "utf8");
+    const text = await readFile8(path20.join(rootDir, outDir, entry.widget.outputFile), "utf8");
     resources.push({
       uri: entry.widget.resourceUri,
       name: entry.name,
@@ -4849,47 +6253,72 @@ async function loadResources(rootDir, outDir, manifest) {
       _meta: entry.widget.resourceMeta
     });
   }
-  const parentURL = pathToFileURL(path18.join(rootDir, "sidecar.config.ts")).href;
-  const tsconfigPath = path18.join(rootDir, "tsconfig.json");
-  const tsconfig = existsSync5(tsconfigPath) ? tsconfigPath : false;
+  const parentURL = pathToFileURL3(path20.join(rootDir, "sidecar.config.ts")).href;
+  const tsconfigPath = path20.join(rootDir, "tsconfig.json");
+  const tsconfig = existsSync7(tsconfigPath) ? tsconfigPath : false;
   for (const entry of manifest.resources) {
-    const sourcePath = path18.join(rootDir, entry.sourceFile);
-    const module = await tsImport(pathToFileURL(sourcePath).href, {
+    const sourcePath = path20.join(rootDir, entry.sourceFile);
+    const module = await tsImport2(pathToFileURL3(sourcePath).href, {
       parentURL,
       tsconfig
     });
-    if (!isSidecarResource(module.default)) {
+    const defaultExport = unwrapRuntimeDefault2(module.default);
+    if (!isSidecarResource(defaultExport)) {
       throw new Error(`${entry.sourceFile} did not default-export a Sidecar resource.`);
     }
     resources.push({
       uri: entry.uri,
       descriptor: entry.descriptor,
-      resource: module.default
+      resource: defaultExport
     });
   }
   return resources;
 }
 async function loadRuntimePrompts(rootDir, manifest) {
-  const parentURL = pathToFileURL(path18.join(rootDir, "sidecar.config.ts")).href;
-  const tsconfigPath = path18.join(rootDir, "tsconfig.json");
-  const tsconfig = existsSync5(tsconfigPath) ? tsconfigPath : false;
+  const parentURL = pathToFileURL3(path20.join(rootDir, "sidecar.config.ts")).href;
+  const tsconfigPath = path20.join(rootDir, "tsconfig.json");
+  const tsconfig = existsSync7(tsconfigPath) ? tsconfigPath : false;
   const loaded = [];
   for (const entry of manifest.prompts) {
-    const sourcePath = path18.join(rootDir, entry.sourceFile);
-    const module = await tsImport(pathToFileURL(sourcePath).href, {
+    const sourcePath = path20.join(rootDir, entry.sourceFile);
+    const module = await tsImport2(pathToFileURL3(sourcePath).href, {
       parentURL,
       tsconfig
     });
-    if (!isSidecarPrompt(module.default)) {
+    const defaultExport = unwrapRuntimeDefault2(module.default);
+    if (!isSidecarPrompt(defaultExport)) {
       throw new Error(`${entry.sourceFile} did not default-export a Sidecar prompt.`);
     }
     loaded.push({
-      prompt: module.default,
+      prompt: defaultExport,
       descriptor: entry.descriptor
     });
   }
   return loaded;
 }
+function unwrapRuntimeDefault2(value) {
+  if (value && typeof value === "object" && "default" in value && Object.keys(value).every((key) => key === "default" || key === "__esModule")) {
+    return unwrapRuntimeDefault2(value.default);
+  }
+  return value;
+}
+function listenOnLocalhost(server, port) {
+  return new Promise((resolve, reject) => {
+    const onError = (error) => {
+      reject(error);
+    };
+    server.once("error", onError);
+    server.listen(port, "127.0.0.1", () => {
+      server.off("error", onError);
+      resolve();
+    });
+  });
+}
+function closeServer(server) {
+  return new Promise((resolve) => {
+    server.close(() => resolve());
+  });
+}
 function readOption(argv, name) {
   const index = argv.indexOf(name);
   if (index === -1) {
@@ -4903,7 +6332,7 @@ function isDirectRun() {
     return false;
   }
   const entryPath = realpathSync.native(entry);
-  return import.meta.url === pathToFileURL(entryPath).href;
+  return import.meta.url === pathToFileURL3(entryPath).href;
 }
 if (isDirectRun()) {
   main(process.argv).catch((error) => {