@sidecar-ai/cli 0.1.0-alpha.6 → 0.1.0-alpha.7

package/dist/index.js

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
 
 // packages/cli/src/index.ts
-import { existsSync as existsSync6, realpathSync } from "fs";
+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 path19 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");
@@ -66,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, {
@@ -112,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
   });
 }
@@ -453,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
@@ -623,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();
@@ -651,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);
@@ -864,11 +803,102 @@ 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 path4 from "path";
+import { pathToFileURL as pathToFileURL2 } from "url";
 import { build as esbuild } from "esbuild";
 import postcss from "postcss";
 import {
@@ -876,28 +906,29 @@ import {
   SyntaxKind
 } from "ts-morph";
 var CLAUDE_FONT_RESOURCE_DOMAIN = "https://assets.claude.ai";
-async function buildWidgets(rootDir, outDir, tools) {
+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(
@@ -905,7 +936,7 @@ createRoot(document.getElementById("root")!).render(
 );
 `
     );
-    const bundled = await esbuild({
+    const baseOptions = enforceWidgetBuildInvariants({
       absWorkingDir: rootDir,
       alias: devSidecarBundleAliases(rootDir),
       bundle: true,
@@ -914,55 +945,184 @@ createRoot(document.getElementById("root")!).render(
       jsx: "automatic",
       minify: false,
       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) {
+  return {
+    ...options,
+    absWorkingDir: required?.rootDir ?? options.absWorkingDir,
+    bundle: true,
+    entryPoints: required ? [required.entryFile] : options.entryPoints,
+    format: "iife",
+    outfile: "widget.js",
+    platform: "browser",
+    write: false
+  };
+}
+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;
     }
@@ -970,13 +1130,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;
 }
@@ -988,7 +1148,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());
@@ -1002,13 +1162,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`
   };
@@ -1190,17 +1350,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 };
     }
   }
@@ -1251,17 +1411,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)
     })
   );
 }
@@ -1270,7 +1436,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(
@@ -1283,7 +1449,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,
@@ -1301,7 +1467,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 = {
@@ -1312,7 +1478,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,
@@ -1327,6 +1493,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) {
@@ -1343,7 +1529,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 {};
   }
@@ -1425,12 +1611,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,
@@ -1445,7 +1631,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) {
@@ -1464,7 +1650,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 };
     }
@@ -1500,16 +1686,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()) {
@@ -1665,16 +1867,16 @@ function readStringArrayProperty2(definition, propertyName) {
 
 // packages/compiler/src/build.ts
 import { mkdir as mkdir9, writeFile as writeFile9 } from "fs/promises";
-import path18 from "path";
+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();
   }
@@ -1690,7 +1892,8 @@ function analyzeProjectConfig(rootDir) {
       target: readTargetNested(definition, "build", "target"),
       host: readHostNested(definition, "build", "host"),
       outDir: readStringNested(definition, "build", "outDir"),
-      plugins: readBooleanNested(definition, "build", "plugins")
+      plugins: readBooleanNested(definition, "build", "plugins"),
+      widgets: readWidgetBuildConfig(definition)
     },
     resources: {
       subscribe: readBooleanNested(definition, "resources", "subscribe") ?? false,
@@ -1708,6 +1911,44 @@ function analyzeProjectConfig(rootDir) {
     }
   };
 }
+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: {},
@@ -1740,12 +1981,7 @@ function readStringNested(definition, section, propertyName) {
   if (!object) {
     return void 0;
   }
-  const property = object.getProperty(propertyName);
-  if (!property || !Node5.isPropertyAssignment(property)) {
-    return void 0;
-  }
-  const initializer = unwrapExpression(property.getInitializer());
-  return initializer && Node5.isStringLiteral(initializer) ? initializer.getLiteralText() : void 0;
+  return readStringProperty3(object, propertyName);
 }
 function readBooleanNested(definition, section, propertyName) {
   const object = readObjectProperty3(definition, section);
@@ -1777,6 +2013,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;
@@ -1784,38 +2023,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 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 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));
     }
   }
   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));
   }
@@ -1830,7 +2110,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")) {
@@ -2047,21 +2327,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.
  *
@@ -2111,13 +2391,13 @@ function uniqueMethodNames(names) {
 
 // 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 {
@@ -2151,32 +2431,32 @@ function readConfigString(configText, key) {
 
 // packages/compiler/src/plugins.ts
 import { mkdir as mkdir7, writeFile as writeFile7 } from "fs/promises";
-import path14 from "path";
+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) {
@@ -2205,41 +2485,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;
   }
@@ -2268,32 +2548,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)}
 `
   );
@@ -2320,7 +2600,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.`);
   }
@@ -2330,7 +2610,7 @@ function parseHookDefinition(definition, fallbackName) {
   }
   return {
     event,
-    matcher: readStringProperty3(definition, "matcher"),
+    matcher: readStringProperty4(definition, "matcher"),
     run: hooks
   };
 }
@@ -2350,7 +2630,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)
       });
     });
@@ -2373,7 +2653,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".`);
     }
@@ -2423,7 +2703,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;
@@ -2467,7 +2747,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",
@@ -2476,18 +2756,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;
   }
@@ -2496,11 +2776,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;
   }
@@ -2510,27 +2790,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;
   }
@@ -2556,25 +2836,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",
@@ -2582,7 +2862,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),
@@ -2590,7 +2870,7 @@ 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.
@@ -2604,7 +2884,7 @@ Claude/Cowork plugin-specific components such as skills, slash commands, agents,
   );
 }
 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)}
@@ -2614,13 +2894,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 [];
   }
@@ -2632,7 +2912,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");
@@ -2648,7 +2928,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,
@@ -2667,7 +2947,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);
     }
@@ -2789,7 +3069,7 @@ function readIcons(definition) {
     return [{
       src,
       mimeType: getOptionalStringProperty2(object, "mimeType"),
-      sizes: readStringArrayProperty3(object, "sizes")
+      sizes: readStringArrayProperty4(object, "sizes")
     }];
   });
   return icons.length ? icons : void 0;
@@ -2802,7 +3082,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;
@@ -2816,13 +3096,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 [];
   }
@@ -2834,7 +3114,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;
@@ -2852,7 +3132,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,
@@ -2875,7 +3155,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);
     }
@@ -2954,7 +3234,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;
@@ -2983,7 +3263,7 @@ function readIcons2(definition) {
     return [{
       src,
       mimeType: getOptionalStringProperty3(object, "mimeType"),
-      sizes: readStringArrayProperty4(object, "sizes")
+      sizes: readStringArrayProperty5(object, "sizes")
     }];
   });
   return icons.length ? icons : void 0;
@@ -2996,7 +3276,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;
@@ -3009,21 +3289,21 @@ function readStringArrayProperty4(definition, propertyName) {
 }
 
 // packages/compiler/src/server-output.ts
-import { existsSync as existsSync5 } from "fs";
+import { existsSync as existsSync6 } from "fs";
 import { mkdir as mkdir8, rm, writeFile as writeFile8 } from "fs/promises";
-import path17 from "path";
+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 = path17.join(rootDir, ".sidecar", "cache", "server");
+  const cacheDir = path18.join(rootDir, ".sidecar", "cache", "server");
   await mkdir8(cacheDir, { recursive: true });
-  const entryFile = path17.join(cacheDir, "index.ts");
+  const entryFile = path18.join(cacheDir, "index.ts");
   await writeFile8(entryFile, renderServerEntry(rootDir, entryFile, manifest, identity));
-  const serverFile = path17.join(outDir, SERVER_ENTRYPOINT);
-  await mkdir8(path17.dirname(serverFile), { recursive: true });
+  const serverFile = path18.join(outDir, SERVER_ENTRYPOINT);
+  await mkdir8(path18.dirname(serverFile), { recursive: true });
   await esbuild2({
     absWorkingDir: rootDir,
     alias: sidecarBundleAliases(rootDir),
@@ -3037,30 +3317,30 @@ const require = __sidecarCreateRequire(import.meta.url);`
     legalComments: "none",
     minify: false,
     nodePaths: [
-      path17.join(rootDir, "node_modules"),
-      path17.join(process.cwd(), "node_modules")
+      path18.join(rootDir, "node_modules"),
+      path18.join(process.cwd(), "node_modules")
     ],
     outfile: serverFile,
     platform: "node",
     sourcemap: false,
     target: "node20"
   });
-  await writeFile8(path17.join(outDir, "package.json"), renderServerPackage(identity));
+  await writeFile8(path18.join(outDir, "package.json"), renderServerPackage(identity));
   if (host === "vercel") {
     const vercelOutputDir = options.vercelOutputDir ?? outDir;
-    await rm(path17.join(vercelOutputDir, "api"), { recursive: true, force: true });
-    await rm(path17.join(vercelOutputDir, "vercel.json"), { force: true });
-    await writeFile8(path17.join(outDir, VERCEL_HANDLER_FILE), renderVercelEntrypoint());
-    await writeFile8(path17.join(outDir, ".vc-config.json"), renderVercelFunctionConfig());
+    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(path17.join(vercelOutputDir, "config.json"), renderVercelOutputConfig());
+    await writeFile8(path18.join(vercelOutputDir, "config.json"), renderVercelOutputConfig());
   } else {
-    await rm(path17.join(outDir, "api"), { recursive: true, force: true });
-    await rm(path17.join(outDir, "vercel.json"), { force: true });
+    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 = path17.dirname(entryFile);
+  const entryDir = path18.dirname(entryFile);
   const tools = manifest.tools;
   const resources = manifest.resources;
   const prompts = manifest.prompts;
@@ -3073,17 +3353,17 @@ function renderServerEntry(rootDir, entryFile, manifest, identity) {
     `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, path17.join(rootDir, entry.sourceFile)))};`
+      (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, path17.join(rootDir, entry.sourceFile)))};`
+      (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, path17.join(rootDir, entry.sourceFile)))};`
+      (entry, index) => `import prompt${index} from ${JSON.stringify(toImportSpecifier(entryDir, path18.join(rootDir, entry.sourceFile)))};`
     ),
-    existsSync5(path17.join(rootDir, "auth.ts")) ? `import authExport from ${JSON.stringify(toImportSpecifier(entryDir, path17.join(rootDir, "auth.ts")))};` : `const authExport = undefined;`,
-    existsSync5(path17.join(rootDir, "proxy.ts")) ? `import proxyExport from ${JSON.stringify(toImportSpecifier(entryDir, path17.join(rootDir, "proxy.ts")))};` : `const proxyExport = undefined;`,
-    existsSync5(path17.join(rootDir, "sidecar.config.ts")) ? `import configExport from ${JSON.stringify(toImportSpecifier(entryDir, path17.join(rootDir, "sidecar.config.ts")))};` : `const configExport = undefined;`
+    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}
 
@@ -3194,7 +3474,7 @@ function unwrapRuntimeDefault(value) {
     value &&
     typeof value === "object" &&
     "default" in value &&
-    Object.keys(value).length === 1
+    Object.keys(value).every((key) => key === "default" || key === "__esModule")
   ) {
     return unwrapRuntimeDefault(value.default);
   }
@@ -3286,35 +3566,35 @@ function sidecarBundleAliases(rootDir) {
     return void 0;
   }
   return {
-    "sidecar-ai": path17.join(repoRoot, "packages", "sidecar-ai", "src", "index.ts"),
-    "@sidecar-ai/auth": path17.join(repoRoot, "packages", "auth", "src", "index.ts"),
-    "@sidecar-ai/core": path17.join(repoRoot, "packages", "core", "src", "index.ts"),
-    "@sidecar-ai/server": path17.join(repoRoot, "packages", "server", "src", "index.ts"),
-    "@sidecar-ai/server/proxy": path17.join(repoRoot, "packages", "server", "src", "proxy.ts"),
-    "@sidecar-ai/client": path17.join(repoRoot, "packages", "client", "src", "index.ts"),
-    "@sidecar-ai/react": path17.join(repoRoot, "packages", "react", "src", "index.ts"),
-    "@sidecar-ai/native": path17.join(repoRoot, "packages", "native", "src", "index.ts"),
-    "@sidecar-ai/native/components": path17.join(repoRoot, "packages", "native", "src", "components", "index.tsx"),
-    "@sidecar-ai/openai": path17.join(repoRoot, "packages", "openai", "src", "index.ts"),
-    "@sidecar-ai/openai/components": path17.join(repoRoot, "packages", "openai", "src", "components.tsx"),
-    "@sidecar-ai/openai/official": path17.join(repoRoot, "packages", "openai", "src", "official.ts"),
-    "@sidecar-ai/anthropic": path17.join(repoRoot, "packages", "anthropic", "src", "index.ts"),
-    "@sidecar-ai/anthropic/agent": path17.join(repoRoot, "packages", "anthropic", "src", "agent.ts"),
-    "@sidecar-ai/anthropic/command": path17.join(repoRoot, "packages", "anthropic", "src", "command.ts"),
-    "@sidecar-ai/anthropic/components": path17.join(repoRoot, "packages", "anthropic", "src", "components.tsx"),
-    "@sidecar-ai/anthropic/hooks": path17.join(repoRoot, "packages", "anthropic", "src", "hooks.ts"),
-    "@sidecar-ai/anthropic/mcp": path17.join(repoRoot, "packages", "anthropic", "src", "mcp.ts"),
-    "@sidecar-ai/anthropic/plugin": path17.join(repoRoot, "packages", "anthropic", "src", "plugin.ts"),
-    "@sidecar-ai/anthropic/skill": path17.join(repoRoot, "packages", "anthropic", "src", "skill.ts")
+    "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 = path17.resolve(startDir);
+  let current = path18.resolve(startDir);
   while (true) {
-    if (existsSync5(path17.join(current, "packages", "core", "src", "index.ts"))) {
+    if (existsSync6(path18.join(current, "packages", "core", "src", "index.ts"))) {
       return current;
     }
-    const parent = path17.dirname(current);
+    const parent = path18.dirname(current);
     if (parent === current) {
       return void 0;
     }
@@ -3324,7 +3604,7 @@ function findSidecarRepoRoot2(startDir) {
 
 // packages/compiler/src/build.ts
 async function buildProject(options) {
-  const rootDir = path18.resolve(options.rootDir);
+  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";
@@ -3346,7 +3626,7 @@ async function buildProject(options) {
   }
   const outDir = resolveInsideRoot(rootDir, options.outDir ?? config.build.outDir ?? defaultBuildOutDir(host, target));
   const runtimeOutDir = resolveRuntimeOutputDir(outDir, host);
-  await buildWidgets(rootDir, runtimeOutDir, tools);
+  await buildWidgets(rootDir, runtimeOutDir, tools, config.build.widgets);
   const manifest = {
     version: 1,
     target,
@@ -3362,11 +3642,11 @@ async function buildProject(options) {
   };
   await mkdir9(runtimeOutDir, { recursive: true });
   await writeFile9(
-    path18.join(runtimeOutDir, "manifest.sidecar.json"),
+    path19.join(runtimeOutDir, "manifest.sidecar.json"),
     `${JSON.stringify(manifest, null, 2)}
 `
   );
-  await writeFile9(path18.join(runtimeOutDir, "README.md"), renderMcpReadme(manifest));
+  await writeFile9(path19.join(runtimeOutDir, "README.md"), renderMcpReadme(manifest));
   await writeGeneratedTypes(rootDir, tools);
   await buildServerOutput(rootDir, runtimeOutDir, manifest, identity, host, {
     vercelOutputDir: outDir
@@ -3384,23 +3664,23 @@ function defaultBuildOutDir(host, target) {
 }
 function resolveRuntimeOutputDir(outDir, host) {
   if (host === "vercel") {
-    return path18.join(outDir, VERCEL_FUNCTION_DIR);
+    return path19.join(outDir, VERCEL_FUNCTION_DIR);
   }
   return outDir;
 }
 function resolvePluginOutputBase(rootDir, outDir, host) {
   if (host === "vercel" && isVercelBuildOutputDir(outDir)) {
-    return path18.join(rootDir, "out");
+    return path19.join(rootDir, "out");
   }
-  return path18.dirname(outDir);
+  return path19.dirname(outDir);
 }
 function isVercelBuildOutputDir(outDir) {
-  return path18.basename(outDir) === "output" && path18.basename(path18.dirname(outDir)) === ".vercel";
+  return path19.basename(outDir) === "output" && path19.basename(path19.dirname(outDir)) === ".vercel";
 }
 function resolveInsideRoot(rootDir, output) {
-  const resolved = path18.resolve(rootDir, output);
-  const relative = path18.relative(rootDir, resolved);
-  if (relative.startsWith("..") || path18.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;
@@ -4551,44 +4831,44 @@ function validateAgainstSchema(schema, value, message, options = {}) {
   }
   return value;
 }
-function schemaFailure(schema, value, path20) {
-  if (schema.anyOf?.length && !schema.anyOf.some((entry) => !schemaFailure(entry, value, path20))) {
-    return `${path20} 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, path20)).length !== 1) {
-    return `${path20} 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, path20);
+      const failure = schemaFailure(entry, value, path21);
       if (failure) return failure;
     }
   }
   if (schema.const !== void 0 && value !== schema.const) {
-    return `${path20} 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 `${path20} 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 `${path20} 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 `${path20} must be an object.`;
+      return `${path21} must be an object.`;
     }
     const record = value;
     for (const required of schema.required ?? []) {
       if (!(required in record)) {
-        return `${path20}.${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], `${path20}.${key}`);
+        const failure = schemaFailure(propertySchema, record[key], `${path21}.${key}`);
         if (failure) return failure;
       }
     }
@@ -4596,12 +4876,12 @@ function schemaFailure(schema, value, path20) {
     if (schema.additionalProperties === false) {
       const extra = Object.keys(record).find((key) => !allowed.has(key));
       if (extra) {
-        return `${path20}.${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, `${path20}.${key}`);
+          const failure = schemaFailure(schema.additionalProperties, entry, `${path21}.${key}`);
           if (failure) return failure;
         }
       }
@@ -4609,29 +4889,38 @@ function schemaFailure(schema, value, path20) {
   }
   if (schema.type === "array" || schema.items) {
     if (!Array.isArray(value)) {
-      return `${path20} 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, `${path20}[${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 `${path20} is shorter than ${schema.minLength}.`;
+      return `${path21} is shorter than ${schema.minLength}.`;
     }
     if (schema.maxLength !== void 0 && value.length > schema.maxLength) {
-      return `${path20} 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 `${path20} is less than ${schema.minimum}.`;
+      return `${path21} is less than ${schema.minimum}.`;
     }
     if (schema.maximum !== void 0 && value > schema.maximum) {
-      return `${path20} is greater than ${schema.maximum}.`;
+      return `${path21} is greater than ${schema.maximum}.`;
     }
   }
   return void 0;
@@ -4809,11 +5098,11 @@ 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 path20 = options.path ?? "/mcp";
+  const path21 = options.path ?? "/mcp";
   if (provider === "cloudflared") {
-    return startCloudflared(localUrl, path20, options.timeoutMs);
+    return startCloudflared(localUrl, path21, options.timeoutMs);
   }
-  return startWrangler(localUrl, path20, options.timeoutMs);
+  return startWrangler(localUrl, path21, options.timeoutMs);
 }
 async function validateTunnelEndpoint(options) {
   const timeoutMs = options.timeoutMs ?? 1e4;
@@ -4937,7 +5226,7 @@ function assertNpxAvailable() {
     throw new Error(tunnelInstallMessage("wrangler"));
   }
 }
-async function startCloudflared(localUrl, path20, timeoutMs = 2e4) {
+async function startCloudflared(localUrl, path21, timeoutMs = 2e4) {
   const child = spawn("cloudflared", ["tunnel", "--url", localUrl, "--no-autoupdate"], {
     stdio: ["ignore", "pipe", "pipe"]
   });
@@ -4945,13 +5234,13 @@ async function startCloudflared(localUrl, path20, timeoutMs = 2e4) {
   return {
     provider: "cloudflared",
     publicUrl,
-    mcpUrl: appendPath(publicUrl, path20),
+    mcpUrl: appendPath(publicUrl, path21),
     close() {
       child.kill("SIGTERM");
     }
   };
 }
-async function startWrangler(localUrl, path20, timeoutMs = 2e4) {
+async function startWrangler(localUrl, path21, timeoutMs = 2e4) {
   const child = spawn("npx", ["--yes", "wrangler", "tunnel", "quick-start", localUrl], {
     stdio: ["ignore", "pipe", "pipe"]
   });
@@ -4959,7 +5248,7 @@ async function startWrangler(localUrl, path20, timeoutMs = 2e4) {
   return {
     provider: "wrangler",
     publicUrl,
-    mcpUrl: appendPath(publicUrl, path20),
+    mcpUrl: appendPath(publicUrl, path21),
     close() {
       child.kill("SIGTERM");
     }
@@ -5220,8 +5509,8 @@ function runInherited(command, args) {
     });
   });
 }
-function appendPath(origin, path20) {
-  return `${origin.replace(/\/+$/, "")}/${path20.replace(/^\/+/, "")}`;
+function appendPath(origin, path21) {
+  return `${origin.replace(/\/+$/, "")}/${path21.replace(/^\/+/, "")}`;
 }
 function isRecord3(value) {
   return Boolean(value && typeof value === "object" && !Array.isArray(value));
@@ -5249,9 +5538,9 @@ async function main(argv) {
       );
       console.log(`Host runtime: ${manifest.host}`);
       if (manifest.host === "vercel") {
-        console.log(`Vercel MCP function: ${path19.join(resolvedOutDir, VERCEL_ENTRYPOINT)}`);
+        console.log(`Vercel MCP function: ${path20.join(resolvedOutDir, VERCEL_ENTRYPOINT)}`);
       } else {
-        console.log(`Hostable MCP server: ${path19.join(resolvedOutDir, SERVER_ENTRYPOINT)}`);
+        console.log(`Hostable MCP server: ${path20.join(resolvedOutDir, SERVER_ENTRYPOINT)}`);
       }
       if (plugins ?? manifest.config.build.plugins) {
         console.log("Built claude-plugin package.");
@@ -5437,8 +5726,8 @@ function readOptionalPlugins(argv) {
   return void 0;
 }
 async function previewComponents(options) {
-  const cliDir = path19.dirname(fileURLToPath(import.meta.url));
-  const css = await readFile8(path19.join(cliDir, "../../native/src/styles.css"), "utf8").catch(() => readFile8(path19.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,
@@ -5478,10 +5767,10 @@ async function previewComponents(options) {
   server.close();
 }
 async function writeComponentApproval(rootDir, approval) {
-  const dir = path19.join(rootDir, ".sidecar", "approvals");
+  const dir = path20.join(rootDir, ".sidecar", "approvals");
   await mkdir10(dir, { recursive: true });
   await writeFile10(
-    path19.join(dir, `components.${approval.host}.json`),
+    path20.join(dir, `components.${approval.host}.json`),
     `${JSON.stringify(approval, null, 2)}
 `
   );
@@ -5833,71 +6122,71 @@ function printDiagnostics(diagnostics) {
   }
 }
 async function loadRuntimeAuth(rootDir) {
-  const authPath = path19.join(rootDir, "auth.ts");
-  if (!existsSync6(authPath)) {
+  const authPath = path20.join(rootDir, "auth.ts");
+  if (!existsSync7(authPath)) {
     return void 0;
   }
-  const parentURL = pathToFileURL(path19.join(rootDir, "sidecar.config.ts")).href;
-  const tsconfigPath = path19.join(rootDir, "tsconfig.json");
-  const tsconfig = existsSync6(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
   });
-  const defaultExport = unwrapRuntimeDefault(module.default);
+  const defaultExport = unwrapRuntimeDefault2(module.default);
   if (!isSidecarAuth(defaultExport)) {
     throw new Error("auth.ts must default-export auth({ ... }) from sidecar-ai.");
   }
   return defaultExport;
 }
 async function loadRuntimeProxy(rootDir) {
-  const proxyPath = path19.join(rootDir, "proxy.ts");
-  if (!existsSync6(proxyPath)) {
+  const proxyPath = path20.join(rootDir, "proxy.ts");
+  if (!existsSync7(proxyPath)) {
     return void 0;
   }
-  const parentURL = pathToFileURL(path19.join(rootDir, "sidecar.config.ts")).href;
-  const tsconfigPath = path19.join(rootDir, "tsconfig.json");
-  const tsconfig = existsSync6(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
   });
-  const defaultExport = unwrapRuntimeDefault(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 defaultExport;
 }
 async function loadRuntimeConfig(rootDir) {
-  const configPath = path19.join(rootDir, "sidecar.config.ts");
-  if (!existsSync6(configPath)) {
+  const configPath = path20.join(rootDir, "sidecar.config.ts");
+  if (!existsSync7(configPath)) {
     return void 0;
   }
-  const parentURL = pathToFileURL(configPath).href;
-  const tsconfigPath = path19.join(rootDir, "tsconfig.json");
-  const tsconfig = existsSync6(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
   });
-  const defaultExport = unwrapRuntimeDefault(module.default);
+  const defaultExport = unwrapRuntimeDefault2(module.default);
   if (!defaultExport || typeof defaultExport !== "object") {
     throw new Error("sidecar.config.ts must default-export defineConfig({ ... }) from sidecar-ai.");
   }
   return defaultExport;
 }
 async function loadRuntimeTools(rootDir, entries) {
-  const parentURL = pathToFileURL(path19.join(rootDir, "sidecar.config.ts")).href;
-  const tsconfigPath = path19.join(rootDir, "tsconfig.json");
-  const tsconfig = existsSync6(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 entries) {
-    const sourcePath = path19.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
     });
-    const defaultExport = unwrapRuntimeDefault(module.default);
+    const defaultExport = unwrapRuntimeDefault2(module.default);
     if (!isSidecarTool(defaultExport)) {
       throw new Error(`${entry.sourceFile} did not default-export a Sidecar tool.`);
     }
@@ -5924,7 +6213,7 @@ async function loadResources(rootDir, outDir, manifest) {
     if (!entry.widget?.outputFile) {
       continue;
     }
-    const text = await readFile8(path19.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,
@@ -5934,16 +6223,16 @@ async function loadResources(rootDir, outDir, manifest) {
       _meta: entry.widget.resourceMeta
     });
   }
-  const parentURL = pathToFileURL(path19.join(rootDir, "sidecar.config.ts")).href;
-  const tsconfigPath = path19.join(rootDir, "tsconfig.json");
-  const tsconfig = existsSync6(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 = path19.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
     });
-    const defaultExport = unwrapRuntimeDefault(module.default);
+    const defaultExport = unwrapRuntimeDefault2(module.default);
     if (!isSidecarResource(defaultExport)) {
       throw new Error(`${entry.sourceFile} did not default-export a Sidecar resource.`);
     }
@@ -5956,17 +6245,17 @@ async function loadResources(rootDir, outDir, manifest) {
   return resources;
 }
 async function loadRuntimePrompts(rootDir, manifest) {
-  const parentURL = pathToFileURL(path19.join(rootDir, "sidecar.config.ts")).href;
-  const tsconfigPath = path19.join(rootDir, "tsconfig.json");
-  const tsconfig = existsSync6(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 = path19.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
     });
-    const defaultExport = unwrapRuntimeDefault(module.default);
+    const defaultExport = unwrapRuntimeDefault2(module.default);
     if (!isSidecarPrompt(defaultExport)) {
       throw new Error(`${entry.sourceFile} did not default-export a Sidecar prompt.`);
     }
@@ -5977,9 +6266,9 @@ async function loadRuntimePrompts(rootDir, manifest) {
   }
   return loaded;
 }
-function unwrapRuntimeDefault(value) {
-  if (value && typeof value === "object" && "default" in value && Object.keys(value).length === 1) {
-    return unwrapRuntimeDefault(value.default);
+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;
 }
@@ -6013,7 +6302,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) => {