skybridge 2.0.0-beta.68a71cb → 2.0.0-beta.8f56a42

package/dist/cli/detect-port.js

@@ -33,7 +33,6 @@ export async function detectAvailablePort(startPort, host) {
         if (await isPortAvailable(port, host)) {
             return port;
         }
-        console.log(`Port ${port} is in use, trying another one...`);
     }
     throw new Error(`No available port found between ${startPort} and ${startPort + MAX_PORT_INCREMENT - 1}`);
 }

package/dist/cli/detect-port.js.map

@@ -1 +1 @@
-{"version":3,"file":"detect-port.js","sourceRoot":"","sources":["../../src/cli/detect-port.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,UAAU,CAAC;AAE3B,MAAM,YAAY,GAAG,IAAI,CAAC;AAC1B,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAE/B,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,QAAiB;IACjD,IAAI,QAAQ,IAAI,QAAQ,GAAG,CAAC,EAAE,CAAC;QAC7B,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IAC7C,CAAC;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;IAChC,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;QAC9B,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QAC3C,CAAC;QACD,OAAO;YACL,IAAI,EAAE,MAAM,mBAAmB,CAAC,YAAY,CAAC;YAC7C,QAAQ,EAAE,KAAK;YACf,UAAU,EAAE,iBAAiB,MAAM,+BAA+B;SACnE,CAAC;IACJ,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,mBAAmB,CAAC,YAAY,CAAC,CAAC;IACrD,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,KAAK,YAAY,EAAE,CAAC;AACnD,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,SAAiB,EACjB,IAAa;IAEb,KAAK,IAAI,IAAI,GAAG,SAAS,EAAE,IAAI,GAAG,SAAS,GAAG,kBAAkB,EAAE,IAAI,EAAE,EAAE,CAAC;QACzE,IAAI,MAAM,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC;YACtC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,mCAAmC,CAAC,CAAC;IAC/D,CAAC;IACD,MAAM,IAAI,KAAK,CACb,mCAAmC,SAAS,QAAQ,SAAS,GAAG,kBAAkB,GAAG,CAAC,EAAE,CACzF,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAC,IAAY,EAAE,IAAa;IAClD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,MAAM,MAAM,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC;QAElC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QAC3C,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE;YAC5B,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;AACL,CAAC","sourcesContent":["import net from \"node:net\";\n\nconst DEFAULT_PORT = 3000;\nconst MAX_PORT_INCREMENT = 100;\n\nexport async function resolvePort(flagPort?: number) {\n  if (flagPort && flagPort > 1) {\n    return { port: flagPort, fallback: false };\n  }\n\n  const rawEnv = process.env.PORT;\n  if (rawEnv) {\n    const parsed = Number(rawEnv);\n    if (Number.isInteger(parsed) && parsed > 0) {\n      return { port: parsed, fallback: false };\n    }\n    return {\n      port: await detectAvailablePort(DEFAULT_PORT),\n      fallback: false,\n      envWarning: `Invalid PORT=\"${rawEnv}\", ignoring and using default`,\n    };\n  }\n\n  const port = await detectAvailablePort(DEFAULT_PORT);\n  return { port, fallback: port !== DEFAULT_PORT };\n}\n\n/**\n * Returns the first available port at or after `startPort`, incrementing\n * by one until a free port is found or `MAX_PORT_INCREMENT` is reached.\n *\n * @param host - Bind address for the check. Pass `\"localhost\"` for\n *   services that bind to 127.0.0.1 (e.g. Vite HMR). Omit for\n *   services that bind to all interfaces (e.g. the HTTP server).\n */\nexport async function detectAvailablePort(\n  startPort: number,\n  host?: string,\n): Promise<number> {\n  for (let port = startPort; port < startPort + MAX_PORT_INCREMENT; port++) {\n    if (await isPortAvailable(port, host)) {\n      return port;\n    }\n    console.log(`Port ${port} is in use, trying another one...`);\n  }\n  throw new Error(\n    `No available port found between ${startPort} and ${startPort + MAX_PORT_INCREMENT - 1}`,\n  );\n}\n\nfunction isPortAvailable(port: number, host?: string): Promise<boolean> {\n  return new Promise((resolve) => {\n    const server = net.createServer();\n\n    server.once(\"error\", () => resolve(false));\n    server.once(\"listening\", () => {\n      server.close(() => resolve(true));\n    });\n\n    server.listen(port, host);\n  });\n}\n"]}
+{"version":3,"file":"detect-port.js","sourceRoot":"","sources":["../../src/cli/detect-port.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,UAAU,CAAC;AAE3B,MAAM,YAAY,GAAG,IAAI,CAAC;AAC1B,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAE/B,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,QAAiB;IACjD,IAAI,QAAQ,IAAI,QAAQ,GAAG,CAAC,EAAE,CAAC;QAC7B,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IAC7C,CAAC;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;IAChC,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;QAC9B,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QAC3C,CAAC;QACD,OAAO;YACL,IAAI,EAAE,MAAM,mBAAmB,CAAC,YAAY,CAAC;YAC7C,QAAQ,EAAE,KAAK;YACf,UAAU,EAAE,iBAAiB,MAAM,+BAA+B;SACnE,CAAC;IACJ,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,mBAAmB,CAAC,YAAY,CAAC,CAAC;IACrD,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,KAAK,YAAY,EAAE,CAAC;AACnD,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,SAAiB,EACjB,IAAa;IAEb,KAAK,IAAI,IAAI,GAAG,SAAS,EAAE,IAAI,GAAG,SAAS,GAAG,kBAAkB,EAAE,IAAI,EAAE,EAAE,CAAC;QACzE,IAAI,MAAM,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC;YACtC,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IACD,MAAM,IAAI,KAAK,CACb,mCAAmC,SAAS,QAAQ,SAAS,GAAG,kBAAkB,GAAG,CAAC,EAAE,CACzF,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAC,IAAY,EAAE,IAAa;IAClD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,MAAM,MAAM,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC;QAElC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QAC3C,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE;YAC5B,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;AACL,CAAC","sourcesContent":["import net from \"node:net\";\n\nconst DEFAULT_PORT = 3000;\nconst MAX_PORT_INCREMENT = 100;\n\nexport async function resolvePort(flagPort?: number) {\n  if (flagPort && flagPort > 1) {\n    return { port: flagPort, fallback: false };\n  }\n\n  const rawEnv = process.env.PORT;\n  if (rawEnv) {\n    const parsed = Number(rawEnv);\n    if (Number.isInteger(parsed) && parsed > 0) {\n      return { port: parsed, fallback: false };\n    }\n    return {\n      port: await detectAvailablePort(DEFAULT_PORT),\n      fallback: false,\n      envWarning: `Invalid PORT=\"${rawEnv}\", ignoring and using default`,\n    };\n  }\n\n  const port = await detectAvailablePort(DEFAULT_PORT);\n  return { port, fallback: port !== DEFAULT_PORT };\n}\n\n/**\n * Returns the first available port at or after `startPort`, incrementing\n * by one until a free port is found or `MAX_PORT_INCREMENT` is reached.\n *\n * @param host - Bind address for the check. Pass `\"localhost\"` for\n *   services that bind to 127.0.0.1 (e.g. Vite HMR). Omit for\n *   services that bind to all interfaces (e.g. the HTTP server).\n */\nexport async function detectAvailablePort(\n  startPort: number,\n  host?: string,\n): Promise<number> {\n  for (let port = startPort; port < startPort + MAX_PORT_INCREMENT; port++) {\n    if (await isPortAvailable(port, host)) {\n      return port;\n    }\n  }\n  throw new Error(\n    `No available port found between ${startPort} and ${startPort + MAX_PORT_INCREMENT - 1}`,\n  );\n}\n\nfunction isPortAvailable(port: number, host?: string): Promise<boolean> {\n  return new Promise((resolve) => {\n    const server = net.createServer();\n\n    server.once(\"error\", () => resolve(false));\n    server.once(\"listening\", () => {\n      server.close(() => resolve(true));\n    });\n\n    server.listen(port, host);\n  });\n}\n"]}

package/dist/cli/use-nodemon.js

@@ -1,8 +1,15 @@
 import { existsSync } from "node:fs";
+import { createRequire } from "node:module";
 import { resolve } from "node:path";
-import nodemonOriginal from "nodemon";
 import { useEffect } from "react";
-const nodemon = nodemonOriginal;
+function loadNodemon() {
+    try {
+        return createRequire(import.meta.url)("nodemon");
+    }
+    catch {
+        throw new Error('skybridge dev needs the "nodemon" peer dependency. Install it with `npm install -D nodemon`.');
+    }
+}
 const SOURCEMAP_WARNING = /^Sourcemap for ".*" points to missing source files$/;
 /**
  * Boot nodemon and wire its stdout/stderr to the provided handlers. Returns a
@@ -10,6 +17,7 @@ const SOURCEMAP_WARNING = /^Sourcemap for ".*" points to missing source files$/;
  * Ink-based dev UI (via {@link useNodemon}) and the `--plain` runner.
  */
 export function startNodemon(env, handlers) {
+    const nodemon = loadNodemon();
     const configFile = resolve(process.cwd(), "nodemon.json");
     const config = existsSync(configFile)
         ? {

package/dist/cli/use-nodemon.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-nodemon.js","sourceRoot":"","sources":["../../src/cli/use-nodemon.ts"],"names":[],"mappings":"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","sourcesContent":["import { existsSync } from \"node:fs\";\nimport { resolve } from \"node:path\";\nimport nodemonOriginal from \"nodemon\";\nimport { useEffect } from \"react\";\nimport type { ExtendedNodemon } from \"./nodemon.d.ts\";\nimport type { PushMessage } from \"./use-messages.js\";\n\nconst nodemon = nodemonOriginal as ExtendedNodemon;\n\nconst SOURCEMAP_WARNING = /^Sourcemap for \".*\" points to missing source files$/;\n\nexport interface NodemonHandlers {\n  /** A raw chunk of server stdout, forwarded untouched. */\n  onStdout: (chunk: Buffer) => void;\n  /** A (filtered) chunk of server stderr. */\n  onStderr: (message: string) => void;\n  /** The server restarted because the listed files changed. */\n  onRestart: (files: string[]) => void;\n}\n\n/**\n * Boot nodemon and wire its stdout/stderr to the provided handlers. Returns a\n * cleanup function that detaches the listeners and quits nodemon. Shared by the\n * Ink-based dev UI (via {@link useNodemon}) and the `--plain` runner.\n */\nexport function startNodemon(\n  env: NodeJS.ProcessEnv,\n  handlers: NodemonHandlers,\n): () => void {\n  const configFile = resolve(process.cwd(), \"nodemon.json\");\n\n  const config = existsSync(configFile)\n    ? {\n        configFile,\n      }\n    : {\n        watch: [\"src\"],\n        ext: \"ts,json,md\",\n        exec: \"tsx src/index.ts\",\n      };\n\n  nodemon({ ...config, env, stdout: false });\n\n  const handleStdoutData = (chunk: Buffer) => {\n    handlers.onStdout(chunk);\n  };\n\n  const handleStderrData = (chunk: Buffer) => {\n    const message = chunk.toString().trim();\n    if (!message) {\n      return;\n    }\n    // Node's source-map warnings for third-party deps (superjson, @mcp/sdk, …) — not actionable.\n    const filtered = message\n      .split(\"\\n\")\n      .filter((line) => !SOURCEMAP_WARNING.test(line))\n      .join(\"\\n\");\n    if (filtered) {\n      handlers.onStderr(filtered);\n    }\n  };\n\n  const setupStdoutListener = () => {\n    if (nodemon.stdout) {\n      nodemon.stdout.off(\"data\", handleStdoutData);\n      nodemon.stdout.on(\"data\", handleStdoutData);\n    }\n  };\n\n  const setupStderrListener = () => {\n    if (nodemon.stderr) {\n      nodemon.stderr.off(\"data\", handleStderrData);\n      nodemon.stderr.on(\"data\", handleStderrData);\n    }\n  };\n\n  nodemon.on(\"readable\", () => {\n    setupStdoutListener();\n    setupStderrListener();\n  });\n\n  nodemon.on(\"restart\", (files: string[]) => {\n    handlers.onRestart(files);\n    setupStdoutListener();\n    setupStderrListener();\n  });\n\n  return () => {\n    if (nodemon.stdout) {\n      nodemon.stdout.off(\"data\", handleStdoutData);\n    }\n    if (nodemon.stderr) {\n      nodemon.stderr.off(\"data\", handleStderrData);\n    }\n    nodemon.emit(\"quit\");\n  };\n}\n\nexport function useNodemon(\n  env: NodeJS.ProcessEnv,\n  pushMessage: PushMessage,\n): void {\n  useEffect(\n    () =>\n      startNodemon(env, {\n        onStdout: (chunk) => {\n          const message = chunk.toString().trim();\n          if (message) {\n            pushMessage(message, \"log\");\n          }\n        },\n        onStderr: (message) => pushMessage(message, \"error\"),\n        onRestart: (files) =>\n          pushMessage(\n            `Server restarted due to file changes: ${files.join(\", \")}`,\n            \"restart\",\n          ),\n      }),\n    [env, pushMessage],\n  );\n}\n"]}
+{"version":3,"file":"use-nodemon.js","sourceRoot":"","sources":["../../src/cli/use-nodemon.ts"],"names":[],"mappings":"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","sourcesContent":["import { existsSync } from \"node:fs\";\nimport { createRequire } from \"node:module\";\nimport { resolve } from \"node:path\";\nimport { useEffect } from \"react\";\nimport type { ExtendedNodemon } from \"./nodemon.d.ts\";\nimport type { PushMessage } from \"./use-messages.js\";\n\nfunction loadNodemon(): ExtendedNodemon {\n  try {\n    return createRequire(import.meta.url)(\"nodemon\") as ExtendedNodemon;\n  } catch {\n    throw new Error(\n      'skybridge dev needs the \"nodemon\" peer dependency. Install it with `npm install -D nodemon`.',\n    );\n  }\n}\n\nconst SOURCEMAP_WARNING = /^Sourcemap for \".*\" points to missing source files$/;\n\nexport interface NodemonHandlers {\n  /** A raw chunk of server stdout, forwarded untouched. */\n  onStdout: (chunk: Buffer) => void;\n  /** A (filtered) chunk of server stderr. */\n  onStderr: (message: string) => void;\n  /** The server restarted because the listed files changed. */\n  onRestart: (files: string[]) => void;\n}\n\n/**\n * Boot nodemon and wire its stdout/stderr to the provided handlers. Returns a\n * cleanup function that detaches the listeners and quits nodemon. Shared by the\n * Ink-based dev UI (via {@link useNodemon}) and the `--plain` runner.\n */\nexport function startNodemon(\n  env: NodeJS.ProcessEnv,\n  handlers: NodemonHandlers,\n): () => void {\n  const nodemon = loadNodemon();\n  const configFile = resolve(process.cwd(), \"nodemon.json\");\n\n  const config = existsSync(configFile)\n    ? {\n        configFile,\n      }\n    : {\n        watch: [\"src\"],\n        ext: \"ts,json,md\",\n        exec: \"tsx src/index.ts\",\n      };\n\n  nodemon({ ...config, env, stdout: false });\n\n  const handleStdoutData = (chunk: Buffer) => {\n    handlers.onStdout(chunk);\n  };\n\n  const handleStderrData = (chunk: Buffer) => {\n    const message = chunk.toString().trim();\n    if (!message) {\n      return;\n    }\n    // Node's source-map warnings for third-party deps (superjson, @mcp/sdk, …) — not actionable.\n    const filtered = message\n      .split(\"\\n\")\n      .filter((line) => !SOURCEMAP_WARNING.test(line))\n      .join(\"\\n\");\n    if (filtered) {\n      handlers.onStderr(filtered);\n    }\n  };\n\n  const setupStdoutListener = () => {\n    if (nodemon.stdout) {\n      nodemon.stdout.off(\"data\", handleStdoutData);\n      nodemon.stdout.on(\"data\", handleStdoutData);\n    }\n  };\n\n  const setupStderrListener = () => {\n    if (nodemon.stderr) {\n      nodemon.stderr.off(\"data\", handleStderrData);\n      nodemon.stderr.on(\"data\", handleStderrData);\n    }\n  };\n\n  nodemon.on(\"readable\", () => {\n    setupStdoutListener();\n    setupStderrListener();\n  });\n\n  nodemon.on(\"restart\", (files: string[]) => {\n    handlers.onRestart(files);\n    setupStdoutListener();\n    setupStderrListener();\n  });\n\n  return () => {\n    if (nodemon.stdout) {\n      nodemon.stdout.off(\"data\", handleStdoutData);\n    }\n    if (nodemon.stderr) {\n      nodemon.stderr.off(\"data\", handleStderrData);\n    }\n    nodemon.emit(\"quit\");\n  };\n}\n\nexport function useNodemon(\n  env: NodeJS.ProcessEnv,\n  pushMessage: PushMessage,\n): void {\n  useEffect(\n    () =>\n      startNodemon(env, {\n        onStdout: (chunk) => {\n          const message = chunk.toString().trim();\n          if (message) {\n            pushMessage(message, \"log\");\n          }\n        },\n        onStderr: (message) => pushMessage(message, \"error\"),\n        onRestart: (files) =>\n          pushMessage(\n            `Server restarted due to file changes: ${files.join(\", \")}`,\n            \"restart\",\n          ),\n      }),\n    [env, pushMessage],\n  );\n}\n"]}

package/dist/cli/use-typescript-check.js

@@ -26,7 +26,7 @@ function extractBestMessage(message, continuationLines) {
  * and the `--plain` runner.
  */
 export function startTypeScriptCheck(onErrors) {
-    const tsProcess = spawn("npx", ["tsc", "--noEmit", "--watch", "--pretty", "false"], {
+    const tsProcess = spawn("npx tsc --noEmit --watch --pretty false", {
         stdio: ["ignore", "pipe", "pipe"],
         shell: true,
     });

package/dist/cli/use-typescript-check.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-typescript-check.js","sourceRoot":"","sources":["../../src/cli/use-typescript-check.ts"],"names":[],"mappings":"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","sourcesContent":["import { isAbsolute, relative } from \"node:path\";\nimport spawn from \"cross-spawn\";\nimport { useEffect, useState } from \"react\";\n\nexport type TsError = {\n  file: string;\n  line: number;\n  col: number;\n  code: string;\n  message: string;\n};\n\n// TypeScript nests from general to specific — the deepest line is the root cause.\nfunction extractBestMessage(\n  message: string,\n  continuationLines: Array<string>,\n): string {\n  if (!continuationLines.length) {\n    return message;\n  }\n  let maxIndent = 0;\n  for (const line of continuationLines) {\n    const indent = line.length - line.trimStart().length;\n    if (indent > maxIndent) {\n      maxIndent = indent;\n    }\n  }\n  const deepest = continuationLines\n    .filter((l) => l.length - l.trimStart().length === maxIndent)\n    .map((l) => l.trim())\n    .filter(Boolean)[0];\n  return deepest ?? message;\n}\n\n/**\n * Spawn `tsc --noEmit --watch` and report each completed check via `onErrors`\n * (empty array when the check is clean). Returns a cleanup function that kills\n * the watcher. Shared by the Ink-based dev UI (via {@link useTypeScriptCheck})\n * and the `--plain` runner.\n */\nexport function startTypeScriptCheck(\n  onErrors: (errors: Array<TsError>) => void,\n): () => void {\n  const tsProcess = spawn(\n    \"npx\",\n    [\"tsc\", \"--noEmit\", \"--watch\", \"--pretty\", \"false\"],\n    {\n      stdio: [\"ignore\", \"pipe\", \"pipe\"],\n      shell: true,\n    },\n  );\n\n  let outputBuffer = \"\";\n  let currentErrors: Array<TsError> = [];\n  let pendingError: TsError | null = null;\n  let continuationLines: Array<string> = [];\n\n  const flushPending = () => {\n    if (!pendingError) {\n      return;\n    }\n    pendingError.message = extractBestMessage(\n      pendingError.message,\n      continuationLines,\n    );\n    currentErrors.push(pendingError);\n    pendingError = null;\n    continuationLines = [];\n  };\n\n  const processOutput = (data: Buffer) => {\n    outputBuffer += data.toString();\n    const lines = outputBuffer.split(\"\\n\");\n    outputBuffer = lines.pop() || \"\";\n\n    for (const line of lines) {\n      const trimmed = line.trim();\n\n      const errorMatch = trimmed.match(\n        /^(.+?)\\((\\d+),(\\d+)\\):\\s+error\\s+(TS\\d+)?\\s*:?\\s*(.+)$/,\n      );\n      if (errorMatch) {\n        flushPending();\n        const [, file, lineStr, colStr, code, message] = errorMatch;\n        if (file && lineStr && colStr && message) {\n          let cleanFile = file.trim();\n          if (isAbsolute(cleanFile)) {\n            cleanFile = relative(process.cwd(), cleanFile);\n          }\n          pendingError = {\n            file: cleanFile,\n            line: Number.parseInt(lineStr, 10),\n            col: Number.parseInt(colStr, 10),\n            code: code ?? \"\",\n            message: message.trim(),\n          };\n        }\n        continue;\n      }\n\n      if (pendingError && line.startsWith(\" \")) {\n        continuationLines.push(line);\n        continue;\n      }\n\n      if (trimmed.includes(\"Found\") && trimmed.includes(\"error\")) {\n        flushPending();\n        onErrors(trimmed.match(/Found 0 error/) ? [] : [...currentErrors]);\n        currentErrors = [];\n      }\n    }\n  };\n\n  if (tsProcess.stdout) {\n    tsProcess.stdout.on(\"data\", processOutput);\n  }\n  if (tsProcess.stderr) {\n    tsProcess.stderr.on(\"data\", processOutput);\n  }\n\n  return () => {\n    tsProcess.kill();\n  };\n}\n\nexport function useTypeScriptCheck(): Array<TsError> {\n  const [tsErrors, setTsErrors] = useState<Array<TsError>>([]);\n\n  useEffect(() => startTypeScriptCheck(setTsErrors), []);\n\n  return tsErrors;\n}\n"]}
+{"version":3,"file":"use-typescript-check.js","sourceRoot":"","sources":["../../src/cli/use-typescript-check.ts"],"names":[],"mappings":"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","sourcesContent":["import { isAbsolute, relative } from \"node:path\";\nimport spawn from \"cross-spawn\";\nimport { useEffect, useState } from \"react\";\n\nexport type TsError = {\n  file: string;\n  line: number;\n  col: number;\n  code: string;\n  message: string;\n};\n\n// TypeScript nests from general to specific — the deepest line is the root cause.\nfunction extractBestMessage(\n  message: string,\n  continuationLines: Array<string>,\n): string {\n  if (!continuationLines.length) {\n    return message;\n  }\n  let maxIndent = 0;\n  for (const line of continuationLines) {\n    const indent = line.length - line.trimStart().length;\n    if (indent > maxIndent) {\n      maxIndent = indent;\n    }\n  }\n  const deepest = continuationLines\n    .filter((l) => l.length - l.trimStart().length === maxIndent)\n    .map((l) => l.trim())\n    .filter(Boolean)[0];\n  return deepest ?? message;\n}\n\n/**\n * Spawn `tsc --noEmit --watch` and report each completed check via `onErrors`\n * (empty array when the check is clean). Returns a cleanup function that kills\n * the watcher. Shared by the Ink-based dev UI (via {@link useTypeScriptCheck})\n * and the `--plain` runner.\n */\nexport function startTypeScriptCheck(\n  onErrors: (errors: Array<TsError>) => void,\n): () => void {\n  const tsProcess = spawn(\"npx tsc --noEmit --watch --pretty false\", {\n    stdio: [\"ignore\", \"pipe\", \"pipe\"],\n    shell: true,\n  });\n\n  let outputBuffer = \"\";\n  let currentErrors: Array<TsError> = [];\n  let pendingError: TsError | null = null;\n  let continuationLines: Array<string> = [];\n\n  const flushPending = () => {\n    if (!pendingError) {\n      return;\n    }\n    pendingError.message = extractBestMessage(\n      pendingError.message,\n      continuationLines,\n    );\n    currentErrors.push(pendingError);\n    pendingError = null;\n    continuationLines = [];\n  };\n\n  const processOutput = (data: Buffer) => {\n    outputBuffer += data.toString();\n    const lines = outputBuffer.split(\"\\n\");\n    outputBuffer = lines.pop() || \"\";\n\n    for (const line of lines) {\n      const trimmed = line.trim();\n\n      const errorMatch = trimmed.match(\n        /^(.+?)\\((\\d+),(\\d+)\\):\\s+error\\s+(TS\\d+)?\\s*:?\\s*(.+)$/,\n      );\n      if (errorMatch) {\n        flushPending();\n        const [, file, lineStr, colStr, code, message] = errorMatch;\n        if (file && lineStr && colStr && message) {\n          let cleanFile = file.trim();\n          if (isAbsolute(cleanFile)) {\n            cleanFile = relative(process.cwd(), cleanFile);\n          }\n          pendingError = {\n            file: cleanFile,\n            line: Number.parseInt(lineStr, 10),\n            col: Number.parseInt(colStr, 10),\n            code: code ?? \"\",\n            message: message.trim(),\n          };\n        }\n        continue;\n      }\n\n      if (pendingError && line.startsWith(\" \")) {\n        continuationLines.push(line);\n        continue;\n      }\n\n      if (trimmed.includes(\"Found\") && trimmed.includes(\"error\")) {\n        flushPending();\n        onErrors(trimmed.match(/Found 0 error/) ? [] : [...currentErrors]);\n        currentErrors = [];\n      }\n    }\n  };\n\n  if (tsProcess.stdout) {\n    tsProcess.stdout.on(\"data\", processOutput);\n  }\n  if (tsProcess.stderr) {\n    tsProcess.stderr.on(\"data\", processOutput);\n  }\n\n  return () => {\n    tsProcess.kill();\n  };\n}\n\nexport function useTypeScriptCheck(): Array<TsError> {\n  const [tsErrors, setTsErrors] = useState<Array<TsError>>([]);\n\n  useEffect(() => startTypeScriptCheck(setTsErrors), []);\n\n  return tsErrors;\n}\n"]}

package/dist/server/app.d.ts

@@ -1,37 +1,79 @@
-import { type Implementation, type McpHttpHandler, type Server as SdkServer, type ServerOptions } from "@modelcontextprotocol/server";
+import type { Implementation, Server as SdkServer, ServerOptions } from "@modelcontextprotocol/server";
 import type { ErrorRequestHandler, Express, RequestHandler } from "express";
+import type { OAuthConfig } from "./auth/index.js";
 import type { ExtraClaims } from "./auth.js";
-import { McpServer, type McpServerTypes, type SkybridgeServerOptions, type ToolDef } from "./server.js";
+import { type JsonOptions, McpServer, type McpServerTypes, type ToolDef } from "./server.js";
 /**
- * Everything a Skybridge app needs in one bag: the MCP implementation info
- * (`name`, `version`, …), the SDK's {@link ServerOptions} (`capabilities`,
- * `instructions`, …), and the Skybridge-specific options (`oauth`, `json`,
- * `skills`).
+ * The `handler` field of {@link SkybridgeConfig}: builds the app's MCP
+ * surface. Runs again for **every incoming request**, on a fresh
+ * {@link McpServer}, so keep it to registration: hoist pools, timers, clients
+ * and any other side effect to module scope (or into `setup`) and close over
+ * them. It must **return** the chained server so `typeof app` carries the
+ * registered tool types.
+ *
+ * @typeParam TContext - What `setup` resolved to, passed as the second argument.
  */
-export type SkybridgeConfig<TAuthExtra extends ExtraClaims = ExtraClaims> = Implementation & ServerOptions & SkybridgeServerOptions<TAuthExtra>;
+export type SkybridgeHandler<TTools extends Record<string, ToolDef>, TContext, TAuthExtra extends ExtraClaims> = (server: McpServer<Record<never, ToolDef>, TAuthExtra>, context: TContext) => McpServer<TTools, TAuthExtra>;
 /**
- * The factory that declares an app's MCP surface. Called with a fresh
- * {@link McpServer} for every request, it must **return** the chained server so
- * `typeof app` carries the registered tool types.
+ * What the `oauth` field accepts: a resolved {@link OAuthConfig}, a promise of
+ * one (the branded providers are async), or a function of the `setup` result.
+ * A function or promise is resolved once — at {@link Skybridge.run} or on the
+ * first request, never at module import — so prefer a function when building
+ * the config has side effects (network discovery, secrets).
  */
-export type SkybridgeSetup<TTools extends Record<string, ToolDef>, TAuthExtra extends ExtraClaims> = (server: McpServer<Record<never, ToolDef>, TAuthExtra>) => McpServer<TTools, TAuthExtra>;
+export type SkybridgeOAuthInput<TContext, TExtra extends ExtraClaims> = OAuthConfig<TExtra> | Promise<OAuthConfig<TExtra>> | ((context: TContext) => OAuthConfig<TExtra> | Promise<OAuthConfig<TExtra>>);
 /**
- * A Skybridge app: the HTTP surface (Express, OAuth metadata, the `/mcp`
- * route) plus a factory that builds the MCP server for each request.
+ * Everything a Skybridge app needs in one bag: the MCP implementation info
+ * (`name`, `version`, …), the SDK's {@link ServerOptions} (`capabilities`,
+ * `instructions`, …), the Express and skills options, and the app's behavior
+ * (`setup`, `oauth`, `handler`).
  *
- * The factory runs once per request, so tools, resources, prompts and views
- * are always registered on the instance that serves the request. It also runs
- * once at construction time, which surfaces registration errors at boot and
- * gives the OAuth layer the set of per-tool security schemes.
+ * All type parameters are inferred from the value: the context from `setup`,
+ * the auth claims from `oauth`, and the tool registry from the server
+ * `handler` returns.
+ */
+export type SkybridgeConfig<TTools extends Record<string, ToolDef> = Record<never, ToolDef>, TContext = undefined, TAuthExtra extends ExtraClaims = ExtraClaims> = Implementation & ServerOptions & {
+    /** Options for the built-in `express.json()` middleware, e.g. `{ limit: "10mb" }`. */
+    json?: JsonOptions;
+    /**
+     * @experimental Serve Agent Skills from `src/skills` over MCP (SEP-2640).
+     * API may change.
+     */
+    skills?: boolean;
+    /**
+     * Loads whatever the app needs up front (remote config, secrets, datasets,
+     * …). Runs **once** — at {@link Skybridge.run} or on the first request,
+     * never at module import — and its awaited return value is passed to an
+     * `oauth` function and to `handler` as the second argument.
+     */
+    setup?: () => TContext;
+    /**
+     * Resource-server OAuth. When set, mounts the well-known metadata routes
+     * and bearer auth on `/mcp`, and the verifier's claims type
+     * `extra.http.authInfo.extra` in tool handlers.
+     */
+    oauth?: SkybridgeOAuthInput<Awaited<TContext>, TAuthExtra>;
+    /** Registers the MCP surface, per request. See {@link SkybridgeHandler}. */
+    handler: SkybridgeHandler<TTools, Awaited<TContext>, TAuthExtra>;
+};
+/**
+ * A Skybridge app: the HTTP surface (Express, OAuth metadata, the `/mcp`
+ * route) plus a handler that builds the MCP server for each request.
  *
- * @typeParam TTools - Accumulated tool registry, inferred from the server the
- * factory returns. You almost never set this manually.
+ * The handler runs for every request, so tools, resources, prompts and views
+ * are always registered on the instance that serves the request. Anything in
+ * the handler body other than registration therefore runs per request too.
+ * Anything asynchronous the app needs (remote config, secrets, …) goes in
+ * `setup`, which runs once and feeds the handler's second argument.
  *
  * @example
  * ```ts
- * export const app = new Skybridge(
- *   { name: "my-app", version: "1.0.0", capabilities: {} },
- *   (server) =>
+ * export const app = new Skybridge({
+ *   name: "my-app",
+ *   version: "1.0.0",
+ *   setup: async () => loadConfig(),
+ *   oauth: (config) => descopeProvider({ url: config.mcpServerUrl }),
+ *   handler: (server, config) =>
  *     server.registerTool(
  *       {
  *         name: "search",
@@ -40,32 +82,45 @@ export type SkybridgeSetup<TTools extends Record<string, ToolDef>, TAuthExtra ex
  *       },
  *       async ({ query }) => ({ content: `Results for ${query}` }),
  *     ),
- * );
+ * });
  *
  * export type AppType = typeof app;
  * ```
  *
  * @see https://docs.skybridge.tech/api-reference/mcp-server
  */
-export declare class Skybridge<TTools extends Record<string, ToolDef> = Record<never, ToolDef>, TAuthExtra extends ExtraClaims = ExtraClaims> {
+export declare class Skybridge<TTools extends Record<string, ToolDef> = Record<never, ToolDef>, TContext = undefined, TAuthExtra extends ExtraClaims = ExtraClaims> {
     readonly $types: McpServerTypes<TTools>;
     private readonly serverInfo;
     private readonly serverOptions;
-    private readonly skybridgeOptions;
-    private readonly setup;
+    private readonly skills?;
+    private oauthEnabled;
+    private readonly handler;
+    private readonly setup?;
+    private readonly oauthInput?;
+    private context?;
     private readonly expressApp;
     private readonly errorMiddleware;
     private readonly monitoringEntry;
     private resolveResourceMetadataUrl?;
-    private cachedFetchHandler?;
-    constructor(config: SkybridgeConfig<TAuthExtra>, setup: SkybridgeSetup<TTools, TAuthExtra>);
+    private readyPromise?;
+    private slowHandlerWarned;
+    constructor(config: SkybridgeConfig<TTools, TContext, TAuthExtra>);
+    /**
+     * Resolve `setup` and `oauth`, then wire OAuth onto the Express app. Runs
+     * once; every entry point that needs a built server awaits it, and a failed
+     * attempt is retried on the next call.
+     *
+     * @internal
+     */
+    ready(): Promise<void>;
     /**
      * The underlying Express app. Use this to extend the HTTP server with
      * custom routes, middleware, or settings — e.g.
      * `app.express.get("/health", ...)`.
      *
      * `express.json()` is pre-applied — tune it via the `json` config field,
-     * e.g. `new Skybridge({ name, version, json: { limit: "10mb" } }, setup)`.
+     * e.g. `new Skybridge({ name, version, json: { limit: "10mb" }, handler })`.
      * Register your handlers before `run()`; after `run()`, dev-mode middleware,
      * the `/mcp` route, and the default error handler are appended in that order.
      *
@@ -73,21 +128,17 @@ export declare class Skybridge<TTools extends Record<string, ToolDef> = Record<n
      * locally and on self-hosted deployments.
      */
     get express(): Express;
-    /**
-     * The app's fetch handler for `/mcp`: a `Request` → `Response` function that
-     * builds a fresh MCP server per request. Memoized, so the same handler is
-     * reused across requests.
-     */
-    get fetchHandler(): McpHttpHandler;
     /**
      * Build a fresh server for one stateless HTTP request, as
-     * `createMcpHandler`'s factory contract requires: the factory runs again so
+     * `createMcpHandler`'s factory contract requires: the handler runs again so
      * the SDK's handler closures belong to the instance whose protocol era it
      * stamps. Sharing one instance's handler maps instead would bind them to an
      * instance that is never marked, pinning every request to the 2025 codec and
      * letting concurrent callers overwrite each other's negotiated version.
+     *
+     * Awaits `setup` and the `oauth` input on first use.
      */
-    createServerInstance(): SdkServer;
+    createServerInstance(): Promise<SdkServer>;
     /**
      * Connect a Skybridge app to an MCP transport. Use this when you're
      * embedding Skybridge in a host that already manages its own transport

package/dist/server/app.js

@@ -1,27 +1,28 @@
 import http from "node:http";
-import { createMcpHandler, } from "@modelcontextprotocol/server";
 import { setupOAuth } from "./auth/setup.js";
-import { createApp, createBaseApp } from "./express.js";
+import { buildMcpHandler, createApp, createBaseApp } from "./express.js";
 import { createMiddlewareEntry } from "./metric.js";
 import { buildMiddlewareChain, getHandlerMaps } from "./middleware.js";
 import { McpServer, } from "./server.js";
+const SLOW_HANDLER_THRESHOLD_MS = 50;
 /**
  * A Skybridge app: the HTTP surface (Express, OAuth metadata, the `/mcp`
- * route) plus a factory that builds the MCP server for each request.
+ * route) plus a handler that builds the MCP server for each request.
  *
- * The factory runs once per request, so tools, resources, prompts and views
- * are always registered on the instance that serves the request. It also runs
- * once at construction time, which surfaces registration errors at boot and
- * gives the OAuth layer the set of per-tool security schemes.
- *
- * @typeParam TTools - Accumulated tool registry, inferred from the server the
- * factory returns. You almost never set this manually.
+ * The handler runs for every request, so tools, resources, prompts and views
+ * are always registered on the instance that serves the request. Anything in
+ * the handler body other than registration therefore runs per request too.
+ * Anything asynchronous the app needs (remote config, secrets, …) goes in
+ * `setup`, which runs once and feeds the handler's second argument.
  *
  * @example
  * ```ts
- * export const app = new Skybridge(
- *   { name: "my-app", version: "1.0.0", capabilities: {} },
- *   (server) =>
+ * export const app = new Skybridge({
+ *   name: "my-app",
+ *   version: "1.0.0",
+ *   setup: async () => loadConfig(),
+ *   oauth: (config) => descopeProvider({ url: config.mcpServerUrl }),
+ *   handler: (server, config) =>
  *     server.registerTool(
  *       {
  *         name: "search",
@@ -30,7 +31,7 @@ import { McpServer, } from "./server.js";
  *       },
  *       async ({ query }) => ({ content: `Results for ${query}` }),
  *     ),
- * );
+ * });
  *
  * export type AppType = typeof app;
  * ```
@@ -40,24 +41,53 @@ import { McpServer, } from "./server.js";
 export class Skybridge {
     serverInfo;
     serverOptions;
-    skybridgeOptions;
+    skills;
+    oauthEnabled = false;
+    handler;
     setup;
+    oauthInput;
+    context;
     expressApp;
     errorMiddleware = [];
     monitoringEntry = createMiddlewareEntry();
     resolveResourceMetadataUrl;
-    cachedFetchHandler;
-    constructor(config, setup) {
-        const { name, title, version, description, icons, websiteUrl, json, oauth, skills, ...serverOptions } = config;
+    readyPromise;
+    slowHandlerWarned = false;
+    constructor(config) {
+        const { name, title, version, description, icons, websiteUrl, json, skills, setup, oauth, handler, ...serverOptions } = config;
         this.serverInfo = { name, title, version, description, icons, websiteUrl };
         this.serverOptions = serverOptions;
-        this.skybridgeOptions = { json, oauth, skills };
+        this.skills = skills;
         this.setup = setup;
-        const sample = this.buildServer();
+        this.oauthInput = oauth;
+        this.handler = handler;
         this.expressApp = createBaseApp(json);
-        if (oauth) {
-            this.resolveResourceMetadataUrl = setupOAuth(this.expressApp, oauth, sample.securitySchemesByTool);
-        }
+    }
+    /**
+     * Resolve `setup` and `oauth`, then wire OAuth onto the Express app. Runs
+     * once; every entry point that needs a built server awaits it, and a failed
+     * attempt is retried on the next call.
+     *
+     * @internal
+     */
+    ready() {
+        this.readyPromise ??= (async () => {
+            if (this.setup) {
+                this.context = await this.setup();
+            }
+            const oauth = typeof this.oauthInput === "function"
+                ? await this.oauthInput(this.context)
+                : await this.oauthInput;
+            this.oauthEnabled = Boolean(oauth);
+            const sample = this.buildServer();
+            if (oauth) {
+                this.resolveResourceMetadataUrl = setupOAuth(this.expressApp, oauth, sample.securitySchemesByTool);
+            }
+        })().catch((error) => {
+            this.readyPromise = undefined;
+            throw error;
+        });
+        return this.readyPromise;
     }
     /**
      * The underlying Express app. Use this to extend the HTTP server with
@@ -65,7 +95,7 @@ export class Skybridge {
      * `app.express.get("/health", ...)`.
      *
      * `express.json()` is pre-applied — tune it via the `json` config field,
-     * e.g. `new Skybridge({ name, version, json: { limit: "10mb" } }, setup)`.
+     * e.g. `new Skybridge({ name, version, json: { limit: "10mb" }, handler })`.
      * Register your handlers before `run()`; after `run()`, dev-mode middleware,
      * the `/mcp` route, and the default error handler are appended in that order.
      *
@@ -75,28 +105,18 @@ export class Skybridge {
     get express() {
         return this.expressApp;
     }
-    /**
-     * The app's fetch handler for `/mcp`: a `Request` → `Response` function that
-     * builds a fresh MCP server per request. Memoized, so the same handler is
-     * reused across requests.
-     */
-    get fetchHandler() {
-        this.cachedFetchHandler ??= createMcpHandler(() => this.createServerInstance(), {
-            onerror: (error) => {
-                console.error("Error handling MCP request:", error);
-            },
-        });
-        return this.cachedFetchHandler;
-    }
     /**
      * Build a fresh server for one stateless HTTP request, as
-     * `createMcpHandler`'s factory contract requires: the factory runs again so
+     * `createMcpHandler`'s factory contract requires: the handler runs again so
      * the SDK's handler closures belong to the instance whose protocol era it
      * stamps. Sharing one instance's handler maps instead would bind them to an
      * instance that is never marked, pinning every request to the 2025 codec and
      * letting concurrent callers overwrite each other's negotiated version.
+     *
+     * Awaits `setup` and the `oauth` input on first use.
      */
-    createServerInstance() {
+    async createServerInstance() {
+        await this.ready();
         const server = this.buildServer();
         this.instrumentHandlers(server);
         return server.server;
@@ -108,7 +128,8 @@ export class Skybridge {
      * which sets the transport up for you.
      */
     async connect(transport) {
-        await this.createServerInstance().connect(transport);
+        const instance = await this.createServerInstance();
+        await instance.connect(transport);
     }
     use(pathOrHandler, ...handlers) {
         // Branching is load-bearing: Express's `app.use` overloads can't be
@@ -158,9 +179,11 @@ export class Skybridge {
             return this.expressApp;
         }
         const httpServer = http.createServer();
+        const mcpHandler = buildMcpHandler(this);
         await createApp({
             app: this,
             httpServer,
+            mcpHandler,
             errorMiddleware: this.errorMiddleware,
         });
         httpServer.on("request", this.expressApp);
@@ -190,6 +213,7 @@ export class Skybridge {
             // (force-quit on a second Ctrl+C while drain is hanging).
             process.off("SIGTERM", shutdown);
             process.off("SIGINT", shutdown);
+            mcpHandler.close().catch(() => { });
             httpServer.close(() => process.exit(0));
             // Force exit if connections don't drain in time so the port is still
             // released promptly (e.g. for nodemon restarts).
@@ -200,11 +224,21 @@ export class Skybridge {
         return undefined;
     }
     buildServer() {
-        const server = new McpServer(this.serverInfo, this.serverOptions, this.skybridgeOptions);
+        const server = new McpServer(this.serverInfo, this.serverOptions, { skills: this.skills, oauth: this.oauthEnabled });
         if (this.resolveResourceMetadataUrl) {
             server.setResourceMetadataUrlResolver(this.resolveResourceMetadataUrl);
         }
-        return this.setup(server);
+        const startedAt = performance.now();
+        const built = this.handler(server, this.context);
+        const elapsed = performance.now() - startedAt;
+        if (typeof built.then === "function") {
+            throw new Error("The Skybridge handler must be synchronous — it runs on every request. Load config or secrets in `setup` instead and read them from the handler's second argument.");
+        }
+        if (elapsed > SLOW_HANDLER_THRESHOLD_MS && !this.slowHandlerWarned) {
+            this.slowHandlerWarned = true;
+            console.warn(`The Skybridge handler took ${Math.round(elapsed)}ms — it runs on every request, so this cost is paid per request. Hoist expensive work to module scope or into \`setup\`, whose result is passed to the handler.`);
+        }
+        return built;
     }
     middlewareEntries(server) {
         return [