@objectstack/cli 1.1.0 → 2.0.0

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @objectstack/cli@1.1.0 build /home/runner/work/spec/spec/packages/cli
+> @objectstack/cli@2.0.0 build /home/runner/work/spec/spec/packages/cli
 > tsup
 
 CLI Building entry: src/bin.ts
@@ -15,10 +15,10 @@
 ESM Build start
 CLI Cleaning output folder
 ESM Build start
-ESM dist/index.js 61.35 KB
-ESM ⚡️ Build success in 69ms
-ESM dist/bin.js 63.96 KB
-ESM ⚡️ Build success in 68ms
+ESM dist/index.js 57.98 KB
+ESM ⚡️ Build success in 106ms
+ESM dist/bin.js 60.60 KB
+ESM ⚡️ Build success in 119ms
 DTS Build start
-DTS ⚡️ Build success in 4303ms
+DTS ⚡️ Build success in 9596ms
 DTS dist/index.d.ts 2.93 KB

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @objectstack/cli
 
+## 2.0.0
+
+### Patch Changes
+
+- Updated dependencies [38e5dd5]
+- Updated dependencies [38e5dd5]
+  - @objectstack/spec@2.0.0
+  - @objectstack/core@2.0.0
+  - @objectstack/objectql@2.0.0
+  - @objectstack/driver-memory@2.0.0
+  - @objectstack/plugin-hono-server@2.0.0
+  - @objectstack/rest@2.0.0
+  - @objectstack/runtime@2.0.0
+
 ## 1.0.12
 
 ### Patch Changes

package/dist/bin.js

@@ -132,7 +132,7 @@ function printServerReady(opts) {
   console.log("");
   console.log(chalk.cyan("  \u279C") + chalk.bold("  API:     ") + chalk.cyan(base + "/"));
   if (opts.uiEnabled && opts.studioPath) {
-    console.log(chalk.cyan("  \u279C") + chalk.bold("  Console: ") + chalk.cyan(base + opts.studioPath + "/"));
+    console.log(chalk.cyan("  \u279C") + chalk.bold("  Studio:  ") + chalk.cyan(base + opts.studioPath + "/"));
   }
   console.log("");
   console.log(chalk.dim(`  Config:  ${opts.configFile}`));
@@ -314,7 +314,7 @@ import chalk4 from "chalk";
 import { execSync, spawn } from "child_process";
 import fs3 from "fs";
 import path3 from "path";
-var devCommand = new Command2("dev").description("Start development mode with hot-reload").argument("[package]", "Package name or filter pattern", "all").option("-w, --watch", "Enable watch mode (default)", true).option("--ui", "Enable Console UI at /_studio/").option("-v, --verbose", "Verbose output").action(async (packageName, options) => {
+var devCommand = new Command2("dev").description("Start development mode with hot-reload").argument("[package]", "Package name or filter pattern", "all").option("-w, --watch", "Enable watch mode (default)", true).option("--ui", "Enable Studio UI at /_studio/").option("-v, --verbose", "Verbose output").action(async (packageName, options) => {
   printHeader("Development Mode");
   const configPath = path3.resolve(process.cwd(), "objectstack.config.ts");
   if (packageName === "all" && fs3.existsSync(configPath)) {
@@ -740,30 +740,27 @@ var createCommand = new Command4("create").description("Create a new package, pl
 import { Command as Command5 } from "commander";
 import path7 from "path";
 import fs7 from "fs";
-import net2 from "net";
+import net from "net";
 import chalk7 from "chalk";
 import { bundleRequire as bundleRequire2 } from "bundle-require";
 
-// src/utils/console.ts
+// src/utils/studio.ts
 import path6 from "path";
 import fs6 from "fs";
-import net from "net";
-import { spawn as spawn2 } from "child_process";
 var STUDIO_PATH = "/_studio";
-var VITE_PORT_START = 24678;
-function resolveConsolePath() {
+function resolveStudioPath() {
   const cwd = process.cwd();
   const candidates = [
-    path6.resolve(cwd, "apps/console"),
-    path6.resolve(cwd, "../../apps/console"),
-    path6.resolve(cwd, "../apps/console")
+    path6.resolve(cwd, "apps/studio"),
+    path6.resolve(cwd, "../../apps/studio"),
+    path6.resolve(cwd, "../apps/studio")
   ];
   for (const candidate of candidates) {
     const pkgPath = path6.join(candidate, "package.json");
     if (fs6.existsSync(pkgPath)) {
       try {
         const pkg2 = JSON.parse(fs6.readFileSync(pkgPath, "utf-8"));
-        if (pkg2.name === "@objectstack/console") return candidate;
+        if (pkg2.name === "@objectstack/studio") return candidate;
       } catch {
       }
     }
@@ -771,142 +768,41 @@ function resolveConsolePath() {
   try {
     const { createRequire: createRequire2 } = __require("module");
     const req = createRequire2(import.meta.url);
-    const resolved = req.resolve("@objectstack/console/package.json");
+    const resolved = req.resolve("@objectstack/studio/package.json");
     return path6.dirname(resolved);
   } catch {
     return null;
   }
 }
-function hasConsoleDist(consolePath) {
-  return fs6.existsSync(path6.join(consolePath, "dist", "index.html"));
-}
-function findAvailablePort(start = VITE_PORT_START) {
-  return new Promise((resolve, reject) => {
-    const server = net.createServer();
-    server.once("error", () => {
-      findAvailablePort(start + 1).then(resolve, reject);
-    });
-    server.once("listening", () => {
-      server.close(() => resolve(start));
-    });
-    server.listen(start);
-  });
-}
-async function spawnViteDevServer(consolePath, options = {}) {
-  const vitePort = await findAvailablePort(VITE_PORT_START);
-  const viteBinCandidates = [
-    path6.join(consolePath, "node_modules", ".bin", "vite"),
-    path6.join(consolePath, "..", "..", "node_modules", ".bin", "vite")
-  ];
-  let viteBin = null;
-  for (const candidate of viteBinCandidates) {
-    if (fs6.existsSync(candidate)) {
-      viteBin = candidate;
-      break;
-    }
-  }
-  const command = viteBin || "npx";
-  const args = viteBin ? ["--port", String(vitePort), "--strictPort"] : ["vite", "--port", String(vitePort), "--strictPort"];
-  const child = spawn2(command, args, {
-    cwd: consolePath,
-    env: {
-      ...process.env,
-      VITE_BASE: `${STUDIO_PATH}/`,
-      VITE_PORT: String(vitePort),
-      VITE_HMR_PORT: String(vitePort),
-      VITE_RUNTIME_MODE: "server",
-      VITE_SERVER_URL: "",
-      // Same-origin API
-      NODE_ENV: "development"
-    },
-    stdio: ["ignore", "pipe", "pipe"]
-  });
-  let stderr = "";
-  child.stderr?.on("data", (data) => {
-    stderr += data.toString();
-  });
-  await new Promise((resolve, reject) => {
-    const timeout = setTimeout(() => {
-      child.kill();
-      reject(new Error(`Vite dev server timed out after 30 s.
-${stderr}`));
-    }, 3e4);
-    child.stdout?.on("data", (data) => {
-      const output = data.toString();
-      if (output.includes("Local:") || output.includes("ready in")) {
-        clearTimeout(timeout);
-        resolve();
-      }
-    });
-    child.on("error", (err) => {
-      clearTimeout(timeout);
-      reject(err);
-    });
-    child.on("exit", (code) => {
-      if (code !== 0 && code !== null) {
-        clearTimeout(timeout);
-        reject(new Error(`Vite exited with code ${code}.
-${stderr}`));
-      }
-    });
-  });
-  return { port: vitePort, process: child };
-}
-function createConsoleProxyPlugin(vitePort) {
-  return {
-    name: "com.objectstack.console-proxy",
-    init: async () => {
-    },
-    start: async (ctx) => {
-      const httpServer = ctx.getService?.("http.server");
-      if (!httpServer?.getRawApp) {
-        ctx.logger?.warn?.("Console proxy: http.server service not found \u2014 skipping");
-        return;
-      }
-      const app = httpServer.getRawApp();
-      app.get(STUDIO_PATH, (c) => c.redirect(`${STUDIO_PATH}/`));
-      app.all(`${STUDIO_PATH}/*`, async (c) => {
-        const targetUrl = `http://localhost:${vitePort}${c.req.path}`;
-        try {
-          const headers = new Headers(c.req.raw.headers);
-          headers.delete("host");
-          const isBodyAllowed = !["GET", "HEAD"].includes(c.req.method);
-          const resp = await fetch(targetUrl, {
-            method: c.req.method,
-            headers,
-            body: isBodyAllowed ? c.req.raw.body : void 0,
-            // @ts-expect-error — duplex required for streaming request body
-            duplex: isBodyAllowed ? "half" : void 0
-          });
-          return new Response(resp.body, {
-            status: resp.status,
-            headers: resp.headers
-          });
-        } catch {
-          return c.text("Console dev server is starting\u2026", 502);
-        }
-      });
-    }
-  };
+function hasStudioDist(studioPath) {
+  return fs6.existsSync(path6.join(studioPath, "dist", "index.html"));
 }
-function createConsoleStaticPlugin(distPath) {
+function createStudioStaticPlugin(distPath, options) {
   return {
-    name: "com.objectstack.console-static",
+    name: "com.objectstack.studio-static",
     init: async () => {
     },
     start: async (ctx) => {
       const httpServer = ctx.getService?.("http.server");
       if (!httpServer?.getRawApp) {
-        ctx.logger?.warn?.("Console static: http.server service not found \u2014 skipping");
+        ctx.logger?.warn?.("Studio static: http.server service not found \u2014 skipping");
         return;
       }
       const app = httpServer.getRawApp();
       const absoluteDist = path6.resolve(distPath);
       const indexPath = path6.join(absoluteDist, "index.html");
       if (!fs6.existsSync(indexPath)) {
-        ctx.logger?.warn?.(`Console static: dist not found at ${absoluteDist}`);
+        ctx.logger?.warn?.(`Studio static: dist not found at ${absoluteDist}`);
         return;
       }
+      const rawHtml = fs6.readFileSync(indexPath, "utf-8");
+      const rewrittenHtml = rawHtml.replace(
+        /(\s(?:href|src))="\/(?!\/)/g,
+        `$1="${STUDIO_PATH}/`
+      );
+      if (options?.isDev) {
+        app.get("/", (c) => c.redirect(`${STUDIO_PATH}/`));
+      }
       app.get(STUDIO_PATH, (c) => c.redirect(`${STUDIO_PATH}/`));
       app.get(`${STUDIO_PATH}/*`, async (c) => {
         const reqPath = c.req.path.substring(STUDIO_PATH.length) || "/";
@@ -920,8 +816,7 @@ function createConsoleStaticPlugin(distPath) {
             headers: { "content-type": mimeType(filePath) }
           });
         }
-        const html = fs6.readFileSync(indexPath);
-        return new Response(html, {
+        return new Response(rewrittenHtml, {
           headers: { "content-type": "text/html; charset=utf-8" }
         });
       });
@@ -954,7 +849,7 @@ function mimeType(filePath) {
 var getAvailablePort = async (startPort) => {
   const isPortAvailable = (port2) => {
     return new Promise((resolve) => {
-      const server = net2.createServer();
+      const server = net.createServer();
       server.once("error", (err) => {
         resolve(false);
       });
@@ -973,7 +868,7 @@ var getAvailablePort = async (startPort) => {
   }
   return port;
 };
-var serveCommand = new Command5("serve").description("Start ObjectStack server with plugins from configuration").argument("[config]", "Configuration file path", "objectstack.config.ts").option("-p, --port <port>", "Server port", "3000").option("--dev", "Run in development mode (load devPlugins)").option("--ui", "Enable Console UI at /_studio/").option("--no-server", "Skip starting HTTP server plugin").action(async (configPath, options) => {
+var serveCommand = new Command5("serve").description("Start ObjectStack server with plugins from configuration").argument("[config]", "Configuration file path", "objectstack.config.ts").option("-p, --port <port>", "Server port", "3000").option("--dev", "Run in development mode (load devPlugins)").option("--ui", "Enable Studio UI at /_studio/ (default: true in dev mode)").option("--no-server", "Skip starting HTTP server plugin").action(async (configPath, options) => {
   let port = parseInt(options.port);
   try {
     const availablePort = await getAvailablePort(port);
@@ -1101,29 +996,30 @@ var serveCommand = new Command5("serve").description("Start ObjectStack server w
       } catch (e) {
         console.warn(chalk7.yellow(`  \u26A0 HTTP server plugin not available: ${e.message}`));
       }
+      try {
+        const { createRestApiPlugin } = await import("@objectstack/rest");
+        await kernel.use(createRestApiPlugin());
+        trackPlugin("RestAPI");
+      } catch (e) {
+      }
+      try {
+        const { createDispatcherPlugin } = await import("@objectstack/runtime");
+        await kernel.use(createDispatcherPlugin());
+        trackPlugin("Dispatcher");
+      } catch (e) {
+      }
     }
-    let viteProcess = null;
-    if (options.ui) {
-      const consolePath = resolveConsolePath();
-      if (!consolePath) {
-        console.warn(chalk7.yellow(`  \u26A0 @objectstack/console not found \u2014 skipping UI`));
-      } else if (isDev) {
-        try {
-          const result = await spawnViteDevServer(consolePath, { serverPort: port });
-          viteProcess = result.process;
-          await kernel.use(createConsoleProxyPlugin(result.port));
-          trackPlugin("ConsoleUI");
-        } catch (e) {
-          console.warn(chalk7.yellow(`  \u26A0 Console UI failed to start: ${e.message}`));
-        }
+    const enableUI = options.ui ?? isDev;
+    if (enableUI) {
+      const studioPath = resolveStudioPath();
+      if (!studioPath) {
+        console.warn(chalk7.yellow(`  \u26A0 @objectstack/studio not found \u2014 skipping UI`));
+      } else if (hasStudioDist(studioPath)) {
+        const distPath = path7.join(studioPath, "dist");
+        await kernel.use(createStudioStaticPlugin(distPath, { isDev }));
+        trackPlugin("StudioUI");
       } else {
-        const distPath = path7.join(consolePath, "dist");
-        if (hasConsoleDist(consolePath)) {
-          await kernel.use(createConsoleStaticPlugin(distPath));
-          trackPlugin("ConsoleUI");
-        } else {
-          console.warn(chalk7.yellow(`  \u26A0 Console dist not found \u2014 run "pnpm --filter @objectstack/console build" first`));
-        }
+        console.warn(chalk7.yellow(`  \u26A0 Studio dist not found \u2014 run "pnpm --filter @objectstack/studio build" first`));
       }
     }
     await runtime.start();
@@ -1135,17 +1031,13 @@ var serveCommand = new Command5("serve").description("Start ObjectStack server w
       isDev,
       pluginCount: loadedPlugins.length,
       pluginNames: loadedPlugins,
-      uiEnabled: !!options.ui,
+      uiEnabled: enableUI,
       studioPath: STUDIO_PATH
     });
     process.on("SIGINT", async () => {
       console.warn(chalk7.yellow(`
 
 \u23F9  Stopping server...`));
-      if (viteProcess) {
-        viteProcess.kill();
-        viteProcess = null;
-      }
       await runtime.getKernel().shutdown();
       console.log(chalk7.green(`\u2705 Server stopped`));
       process.exit(0);
@@ -1161,8 +1053,8 @@ var serveCommand = new Command5("serve").description("Start ObjectStack server w
 
 // src/commands/studio.ts
 import { Command as Command6 } from "commander";
-import { spawn as spawn3 } from "child_process";
-var studioCommand = new Command6("studio").description("Launch Console UI with development server").argument("[config]", "Configuration file path", "objectstack.config.ts").option("-p, --port <port>", "Server port", "3000").action(async (configPath, options) => {
+import { spawn as spawn2 } from "child_process";
+var studioCommand = new Command6("studio").description("Launch Studio UI with development server").argument("[config]", "Configuration file path", "objectstack.config.ts").option("-p, --port <port>", "Server port", "3000").action(async (configPath, options) => {
   printHeader("Studio");
   printKV("Mode", "dev + ui", "\u{1F3A8}");
   printStep("Delegating to serve --dev --ui \u2026");
@@ -1177,7 +1069,7 @@ var studioCommand = new Command6("studio").description("Launch Console UI with d
     "--port",
     options.port
   ];
-  const child = spawn3(process.execPath, args, {
+  const child = spawn2(process.execPath, args, {
     stdio: "inherit",
     env: { ...process.env, NODE_ENV: "development" }
   });
@@ -1979,7 +1871,7 @@ ${chalk13.bold("Workflow:")}
   ${chalk13.dim("$")} os generate object task       ${chalk13.dim("# Add metadata")}
   ${chalk13.dim("$")} os validate                   ${chalk13.dim("# Check configuration")}
   ${chalk13.dim("$")} os dev                        ${chalk13.dim("# Start dev server")}
-  ${chalk13.dim("$")} os studio                     ${chalk13.dim("# Dev server + Console UI")}
+  ${chalk13.dim("$")} os studio                     ${chalk13.dim("# Dev server + Studio UI")}
   ${chalk13.dim("$")} os compile                    ${chalk13.dim("# Build for production")}
 
 ${chalk13.dim("Aliases: objectstack | os")}

package/dist/index.js

@@ -126,7 +126,7 @@ function printServerReady(opts) {
   console.log("");
   console.log(chalk.cyan("  \u279C") + chalk.bold("  API:     ") + chalk.cyan(base + "/"));
   if (opts.uiEnabled && opts.studioPath) {
-    console.log(chalk.cyan("  \u279C") + chalk.bold("  Console: ") + chalk.cyan(base + opts.studioPath + "/"));
+    console.log(chalk.cyan("  \u279C") + chalk.bold("  Studio:  ") + chalk.cyan(base + opts.studioPath + "/"));
   }
   console.log("");
   console.log(chalk.dim(`  Config:  ${opts.configFile}`));
@@ -1251,7 +1251,7 @@ import chalk9 from "chalk";
 import { execSync, spawn } from "child_process";
 import fs6 from "fs";
 import path6 from "path";
-var devCommand = new Command7("dev").description("Start development mode with hot-reload").argument("[package]", "Package name or filter pattern", "all").option("-w, --watch", "Enable watch mode (default)", true).option("--ui", "Enable Console UI at /_studio/").option("-v, --verbose", "Verbose output").action(async (packageName, options) => {
+var devCommand = new Command7("dev").description("Start development mode with hot-reload").argument("[package]", "Package name or filter pattern", "all").option("-w, --watch", "Enable watch mode (default)", true).option("--ui", "Enable Studio UI at /_studio/").option("-v, --verbose", "Verbose output").action(async (packageName, options) => {
   printHeader("Development Mode");
   const configPath = path6.resolve(process.cwd(), "objectstack.config.ts");
   if (packageName === "all" && fs6.existsSync(configPath)) {
@@ -1293,30 +1293,27 @@ var devCommand = new Command7("dev").description("Start development mode with ho
 import { Command as Command8 } from "commander";
 import path8 from "path";
 import fs8 from "fs";
-import net2 from "net";
+import net from "net";
 import chalk10 from "chalk";
 import { bundleRequire as bundleRequire2 } from "bundle-require";
 
-// src/utils/console.ts
+// src/utils/studio.ts
 import path7 from "path";
 import fs7 from "fs";
-import net from "net";
-import { spawn as spawn2 } from "child_process";
 var STUDIO_PATH = "/_studio";
-var VITE_PORT_START = 24678;
-function resolveConsolePath() {
+function resolveStudioPath() {
   const cwd = process.cwd();
   const candidates = [
-    path7.resolve(cwd, "apps/console"),
-    path7.resolve(cwd, "../../apps/console"),
-    path7.resolve(cwd, "../apps/console")
+    path7.resolve(cwd, "apps/studio"),
+    path7.resolve(cwd, "../../apps/studio"),
+    path7.resolve(cwd, "../apps/studio")
   ];
   for (const candidate of candidates) {
     const pkgPath = path7.join(candidate, "package.json");
     if (fs7.existsSync(pkgPath)) {
       try {
         const pkg = JSON.parse(fs7.readFileSync(pkgPath, "utf-8"));
-        if (pkg.name === "@objectstack/console") return candidate;
+        if (pkg.name === "@objectstack/studio") return candidate;
       } catch {
       }
     }
@@ -1324,142 +1321,41 @@ function resolveConsolePath() {
   try {
     const { createRequire } = __require("module");
     const req = createRequire(import.meta.url);
-    const resolved = req.resolve("@objectstack/console/package.json");
+    const resolved = req.resolve("@objectstack/studio/package.json");
     return path7.dirname(resolved);
   } catch {
     return null;
   }
 }
-function hasConsoleDist(consolePath) {
-  return fs7.existsSync(path7.join(consolePath, "dist", "index.html"));
-}
-function findAvailablePort(start = VITE_PORT_START) {
-  return new Promise((resolve, reject) => {
-    const server = net.createServer();
-    server.once("error", () => {
-      findAvailablePort(start + 1).then(resolve, reject);
-    });
-    server.once("listening", () => {
-      server.close(() => resolve(start));
-    });
-    server.listen(start);
-  });
-}
-async function spawnViteDevServer(consolePath, options = {}) {
-  const vitePort = await findAvailablePort(VITE_PORT_START);
-  const viteBinCandidates = [
-    path7.join(consolePath, "node_modules", ".bin", "vite"),
-    path7.join(consolePath, "..", "..", "node_modules", ".bin", "vite")
-  ];
-  let viteBin = null;
-  for (const candidate of viteBinCandidates) {
-    if (fs7.existsSync(candidate)) {
-      viteBin = candidate;
-      break;
-    }
-  }
-  const command = viteBin || "npx";
-  const args = viteBin ? ["--port", String(vitePort), "--strictPort"] : ["vite", "--port", String(vitePort), "--strictPort"];
-  const child = spawn2(command, args, {
-    cwd: consolePath,
-    env: {
-      ...process.env,
-      VITE_BASE: `${STUDIO_PATH}/`,
-      VITE_PORT: String(vitePort),
-      VITE_HMR_PORT: String(vitePort),
-      VITE_RUNTIME_MODE: "server",
-      VITE_SERVER_URL: "",
-      // Same-origin API
-      NODE_ENV: "development"
-    },
-    stdio: ["ignore", "pipe", "pipe"]
-  });
-  let stderr = "";
-  child.stderr?.on("data", (data) => {
-    stderr += data.toString();
-  });
-  await new Promise((resolve, reject) => {
-    const timeout = setTimeout(() => {
-      child.kill();
-      reject(new Error(`Vite dev server timed out after 30 s.
-${stderr}`));
-    }, 3e4);
-    child.stdout?.on("data", (data) => {
-      const output = data.toString();
-      if (output.includes("Local:") || output.includes("ready in")) {
-        clearTimeout(timeout);
-        resolve();
-      }
-    });
-    child.on("error", (err) => {
-      clearTimeout(timeout);
-      reject(err);
-    });
-    child.on("exit", (code) => {
-      if (code !== 0 && code !== null) {
-        clearTimeout(timeout);
-        reject(new Error(`Vite exited with code ${code}.
-${stderr}`));
-      }
-    });
-  });
-  return { port: vitePort, process: child };
-}
-function createConsoleProxyPlugin(vitePort) {
-  return {
-    name: "com.objectstack.console-proxy",
-    init: async () => {
-    },
-    start: async (ctx) => {
-      const httpServer = ctx.getService?.("http.server");
-      if (!httpServer?.getRawApp) {
-        ctx.logger?.warn?.("Console proxy: http.server service not found \u2014 skipping");
-        return;
-      }
-      const app = httpServer.getRawApp();
-      app.get(STUDIO_PATH, (c) => c.redirect(`${STUDIO_PATH}/`));
-      app.all(`${STUDIO_PATH}/*`, async (c) => {
-        const targetUrl = `http://localhost:${vitePort}${c.req.path}`;
-        try {
-          const headers = new Headers(c.req.raw.headers);
-          headers.delete("host");
-          const isBodyAllowed = !["GET", "HEAD"].includes(c.req.method);
-          const resp = await fetch(targetUrl, {
-            method: c.req.method,
-            headers,
-            body: isBodyAllowed ? c.req.raw.body : void 0,
-            // @ts-expect-error — duplex required for streaming request body
-            duplex: isBodyAllowed ? "half" : void 0
-          });
-          return new Response(resp.body, {
-            status: resp.status,
-            headers: resp.headers
-          });
-        } catch {
-          return c.text("Console dev server is starting\u2026", 502);
-        }
-      });
-    }
-  };
+function hasStudioDist(studioPath) {
+  return fs7.existsSync(path7.join(studioPath, "dist", "index.html"));
 }
-function createConsoleStaticPlugin(distPath) {
+function createStudioStaticPlugin(distPath, options) {
   return {
-    name: "com.objectstack.console-static",
+    name: "com.objectstack.studio-static",
     init: async () => {
     },
     start: async (ctx) => {
       const httpServer = ctx.getService?.("http.server");
       if (!httpServer?.getRawApp) {
-        ctx.logger?.warn?.("Console static: http.server service not found \u2014 skipping");
+        ctx.logger?.warn?.("Studio static: http.server service not found \u2014 skipping");
         return;
       }
       const app = httpServer.getRawApp();
       const absoluteDist = path7.resolve(distPath);
       const indexPath = path7.join(absoluteDist, "index.html");
       if (!fs7.existsSync(indexPath)) {
-        ctx.logger?.warn?.(`Console static: dist not found at ${absoluteDist}`);
+        ctx.logger?.warn?.(`Studio static: dist not found at ${absoluteDist}`);
         return;
       }
+      const rawHtml = fs7.readFileSync(indexPath, "utf-8");
+      const rewrittenHtml = rawHtml.replace(
+        /(\s(?:href|src))="\/(?!\/)/g,
+        `$1="${STUDIO_PATH}/`
+      );
+      if (options?.isDev) {
+        app.get("/", (c) => c.redirect(`${STUDIO_PATH}/`));
+      }
       app.get(STUDIO_PATH, (c) => c.redirect(`${STUDIO_PATH}/`));
       app.get(`${STUDIO_PATH}/*`, async (c) => {
         const reqPath = c.req.path.substring(STUDIO_PATH.length) || "/";
@@ -1473,8 +1369,7 @@ function createConsoleStaticPlugin(distPath) {
             headers: { "content-type": mimeType(filePath) }
           });
         }
-        const html = fs7.readFileSync(indexPath);
-        return new Response(html, {
+        return new Response(rewrittenHtml, {
           headers: { "content-type": "text/html; charset=utf-8" }
         });
       });
@@ -1507,7 +1402,7 @@ function mimeType(filePath) {
 var getAvailablePort = async (startPort) => {
   const isPortAvailable = (port2) => {
     return new Promise((resolve) => {
-      const server = net2.createServer();
+      const server = net.createServer();
       server.once("error", (err) => {
         resolve(false);
       });
@@ -1526,7 +1421,7 @@ var getAvailablePort = async (startPort) => {
   }
   return port;
 };
-var serveCommand = new Command8("serve").description("Start ObjectStack server with plugins from configuration").argument("[config]", "Configuration file path", "objectstack.config.ts").option("-p, --port <port>", "Server port", "3000").option("--dev", "Run in development mode (load devPlugins)").option("--ui", "Enable Console UI at /_studio/").option("--no-server", "Skip starting HTTP server plugin").action(async (configPath, options) => {
+var serveCommand = new Command8("serve").description("Start ObjectStack server with plugins from configuration").argument("[config]", "Configuration file path", "objectstack.config.ts").option("-p, --port <port>", "Server port", "3000").option("--dev", "Run in development mode (load devPlugins)").option("--ui", "Enable Studio UI at /_studio/ (default: true in dev mode)").option("--no-server", "Skip starting HTTP server plugin").action(async (configPath, options) => {
   let port = parseInt(options.port);
   try {
     const availablePort = await getAvailablePort(port);
@@ -1654,29 +1549,30 @@ var serveCommand = new Command8("serve").description("Start ObjectStack server w
       } catch (e) {
         console.warn(chalk10.yellow(`  \u26A0 HTTP server plugin not available: ${e.message}`));
       }
+      try {
+        const { createRestApiPlugin } = await import("@objectstack/rest");
+        await kernel.use(createRestApiPlugin());
+        trackPlugin("RestAPI");
+      } catch (e) {
+      }
+      try {
+        const { createDispatcherPlugin } = await import("@objectstack/runtime");
+        await kernel.use(createDispatcherPlugin());
+        trackPlugin("Dispatcher");
+      } catch (e) {
+      }
     }
-    let viteProcess = null;
-    if (options.ui) {
-      const consolePath = resolveConsolePath();
-      if (!consolePath) {
-        console.warn(chalk10.yellow(`  \u26A0 @objectstack/console not found \u2014 skipping UI`));
-      } else if (isDev) {
-        try {
-          const result = await spawnViteDevServer(consolePath, { serverPort: port });
-          viteProcess = result.process;
-          await kernel.use(createConsoleProxyPlugin(result.port));
-          trackPlugin("ConsoleUI");
-        } catch (e) {
-          console.warn(chalk10.yellow(`  \u26A0 Console UI failed to start: ${e.message}`));
-        }
+    const enableUI = options.ui ?? isDev;
+    if (enableUI) {
+      const studioPath = resolveStudioPath();
+      if (!studioPath) {
+        console.warn(chalk10.yellow(`  \u26A0 @objectstack/studio not found \u2014 skipping UI`));
+      } else if (hasStudioDist(studioPath)) {
+        const distPath = path8.join(studioPath, "dist");
+        await kernel.use(createStudioStaticPlugin(distPath, { isDev }));
+        trackPlugin("StudioUI");
       } else {
-        const distPath = path8.join(consolePath, "dist");
-        if (hasConsoleDist(consolePath)) {
-          await kernel.use(createConsoleStaticPlugin(distPath));
-          trackPlugin("ConsoleUI");
-        } else {
-          console.warn(chalk10.yellow(`  \u26A0 Console dist not found \u2014 run "pnpm --filter @objectstack/console build" first`));
-        }
+        console.warn(chalk10.yellow(`  \u26A0 Studio dist not found \u2014 run "pnpm --filter @objectstack/studio build" first`));
       }
     }
     await runtime.start();
@@ -1688,17 +1584,13 @@ var serveCommand = new Command8("serve").description("Start ObjectStack server w
       isDev,
       pluginCount: loadedPlugins.length,
       pluginNames: loadedPlugins,
-      uiEnabled: !!options.ui,
+      uiEnabled: enableUI,
       studioPath: STUDIO_PATH
     });
     process.on("SIGINT", async () => {
       console.warn(chalk10.yellow(`
 
 \u23F9  Stopping server...`));
-      if (viteProcess) {
-        viteProcess.kill();
-        viteProcess = null;
-      }
       await runtime.getKernel().shutdown();
       console.log(chalk10.green(`\u2705 Server stopped`));
       process.exit(0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@objectstack/cli",
-  "version": "1.1.0",
+  "version": "2.0.0",
   "description": "Command Line Interface for ObjectStack Protocol",
   "main": "dist/index.js",
   "bin": {
@@ -22,15 +22,16 @@
     "commander": "^14.0.3",
     "tsx": "^4.7.1",
     "zod": "^3.24.1",
-    "@objectstack/core": "1.1.0",
-    "@objectstack/driver-memory": "^1.1.0",
-    "@objectstack/objectql": "^1.1.0",
-    "@objectstack/plugin-hono-server": "1.1.0",
-    "@objectstack/runtime": "^1.1.0",
-    "@objectstack/spec": "1.1.0"
+    "@objectstack/core": "2.0.0",
+    "@objectstack/driver-memory": "^2.0.0",
+    "@objectstack/objectql": "^2.0.0",
+    "@objectstack/plugin-hono-server": "2.0.0",
+    "@objectstack/rest": "2.0.0",
+    "@objectstack/runtime": "^2.0.0",
+    "@objectstack/spec": "2.0.0"
   },
   "peerDependencies": {
-    "@objectstack/core": "^1.0.12"
+    "@objectstack/core": "2.0.0"
   },
   "devDependencies": {
     "@types/node": "^25.1.0",

package/src/bin.ts

@@ -1,3 +1,5 @@
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+
 import { createRequire } from 'module';
 import { Command } from 'commander';
 import chalk from 'chalk';
@@ -46,7 +48,7 @@ ${chalk.bold('Workflow:')}
   ${chalk.dim('$')} os generate object task       ${chalk.dim('# Add metadata')}
   ${chalk.dim('$')} os validate                   ${chalk.dim('# Check configuration')}
   ${chalk.dim('$')} os dev                        ${chalk.dim('# Start dev server')}
-  ${chalk.dim('$')} os studio                     ${chalk.dim('# Dev server + Console UI')}
+  ${chalk.dim('$')} os studio                     ${chalk.dim('# Dev server + Studio UI')}
   ${chalk.dim('$')} os compile                    ${chalk.dim('# Build for production')}
 
 ${chalk.dim('Aliases: objectstack | os')}

package/src/commands/compile.ts

@@ -1,3 +1,5 @@
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+
 import { Command } from 'commander';
 import path from 'path';
 import fs from 'fs';

package/src/commands/create.ts

@@ -1,3 +1,5 @@
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+
 import { Command } from 'commander';
 import chalk from 'chalk';
 import fs from 'fs';

package/src/commands/dev.ts

@@ -1,3 +1,5 @@
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+
 import { Command } from 'commander';
 import chalk from 'chalk';
 import { execSync, spawn } from 'child_process';
@@ -9,7 +11,7 @@ export const devCommand = new Command('dev')
   .description('Start development mode with hot-reload')
   .argument('[package]', 'Package name or filter pattern', 'all')
   .option('-w, --watch', 'Enable watch mode (default)', true)
-  .option('--ui', 'Enable Console UI at /_studio/')
+  .option('--ui', 'Enable Studio UI at /_studio/')
   .option('-v, --verbose', 'Verbose output')
   .action(async (packageName, options) => {
     printHeader('Development Mode');

package/src/commands/doctor.ts

@@ -1,3 +1,5 @@
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+
 import { Command } from 'commander';
 import chalk from 'chalk';
 import { execSync } from 'child_process';

package/src/commands/generate.ts

@@ -1,3 +1,5 @@
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+
 import { Command } from 'commander';
 import chalk from 'chalk';
 import fs from 'fs';

package/src/commands/info.ts

@@ -1,3 +1,5 @@
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+
 import { Command } from 'commander';
 import chalk from 'chalk';
 import { loadConfig } from '../utils/config.js';

package/src/commands/init.ts

@@ -1,3 +1,5 @@
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+
 import { Command } from 'commander';
 import chalk from 'chalk';
 import fs from 'fs';

package/src/commands/serve.ts

@@ -1,3 +1,5 @@
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+
 import { Command } from 'commander';
 import path from 'path';
 import fs from 'fs';
@@ -16,12 +18,10 @@ import {
 } from '../utils/format.js';
 import {
   STUDIO_PATH,
-  resolveConsolePath,
-  hasConsoleDist,
-  spawnViteDevServer,
-  createConsoleProxyPlugin,
-  createConsoleStaticPlugin,
-} from '../utils/console.js';
+  resolveStudioPath,
+  hasStudioDist,
+  createStudioStaticPlugin,
+} from '../utils/studio.js';
 
 // Helper to find available port
 const getAvailablePort = async (startPort: number): Promise<number> => {
@@ -53,7 +53,7 @@ export const serveCommand = new Command('serve')
   .argument('[config]', 'Configuration file path', 'objectstack.config.ts')
   .option('-p, --port <port>', 'Server port', '3000')
   .option('--dev', 'Run in development mode (load devPlugins)')
-  .option('--ui', 'Enable Console UI at /_studio/')
+  .option('--ui', 'Enable Studio UI at /_studio/ (default: true in dev mode)')
   .option('--no-server', 'Skip starting HTTP server plugin')
   .action(async (configPath, options) => {
     let port = parseInt(options.port);
@@ -226,34 +226,41 @@ export const serveCommand = new Command('serve')
         } catch (e: any) {
           console.warn(chalk.yellow(`  ⚠ HTTP server plugin not available: ${e.message}`));
         }
-      }
 
-      // ── Console UI (--ui) ───────────────────────────────────────────
-      let viteProcess: import('child_process').ChildProcess | null = null;
+        // Register REST API plugin (consumes http.server + protocol services)
+        try {
+          const { createRestApiPlugin } = await import('@objectstack/rest');
+          await kernel.use(createRestApiPlugin());
+          trackPlugin('RestAPI');
+        } catch (e: any) {
+          // @objectstack/rest is optional
+        }
 
-      if (options.ui) {
-        const consolePath = resolveConsolePath();
-        if (!consolePath) {
-          console.warn(chalk.yellow(`  ⚠ @objectstack/console not found — skipping UI`));
-        } else if (isDev) {
-          // Dev mode → spawn Vite dev server & proxy through Hono
-          try {
-            const result = await spawnViteDevServer(consolePath, { serverPort: port });
-            viteProcess = result.process;
-            await kernel.use(createConsoleProxyPlugin(result.port));
-            trackPlugin('ConsoleUI');
-          } catch (e: any) {
-            console.warn(chalk.yellow(`  ⚠ Console UI failed to start: ${e.message}`));
-          }
+        // Register Dispatcher plugin (auth, graphql, analytics, packages, hub, storage, automation)
+        try {
+          const { createDispatcherPlugin } = await import('@objectstack/runtime');
+          await kernel.use(createDispatcherPlugin());
+          trackPlugin('Dispatcher');
+        } catch (e: any) {
+          // optional
+        }
+      }
+
+      // ── Studio UI ─────────────────────────────────────────────────
+      // In dev mode, Studio UI is enabled by default (use --no-ui to disable).
+      // Always serves the pre-built dist/ — no Vite dev server, no extra port.
+      const enableUI = options.ui ?? isDev;
+
+      if (enableUI) {
+        const studioPath = resolveStudioPath();
+        if (!studioPath) {
+          console.warn(chalk.yellow(`  ⚠ @objectstack/studio not found — skipping UI`));
+        } else if (hasStudioDist(studioPath)) {
+          const distPath = path.join(studioPath, 'dist');
+          await kernel.use(createStudioStaticPlugin(distPath, { isDev }));
+          trackPlugin('StudioUI');
         } else {
-          // Production mode → serve pre-built static files
-          const distPath = path.join(consolePath, 'dist');
-          if (hasConsoleDist(consolePath)) {
-            await kernel.use(createConsoleStaticPlugin(distPath));
-            trackPlugin('ConsoleUI');
-          } else {
-            console.warn(chalk.yellow(`  ⚠ Console dist not found — run "pnpm --filter @objectstack/console build" first`));
-          }
+          console.warn(chalk.yellow(`  ⚠ Studio dist not found — run "pnpm --filter @objectstack/studio build" first`));
         }
       }
 
@@ -271,17 +278,13 @@ export const serveCommand = new Command('serve')
         isDev,
         pluginCount: loadedPlugins.length,
         pluginNames: loadedPlugins,
-        uiEnabled: !!options.ui,
+        uiEnabled: enableUI,
         studioPath: STUDIO_PATH,
       });
 
       // Keep process alive
       process.on('SIGINT', async () => {
         console.warn(chalk.yellow(`\n\n⏹  Stopping server...`));
-        if (viteProcess) {
-          viteProcess.kill();
-          viteProcess = null;
-        }
         await runtime.getKernel().shutdown();
         console.log(chalk.green(`✅ Server stopped`));
         process.exit(0);

package/src/commands/studio.ts

@@ -1,17 +1,19 @@
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+
 import { Command } from 'commander';
 import chalk from 'chalk';
 import { spawn } from 'child_process';
 import { printHeader, printKV, printStep } from '../utils/format.js';
 
 /**
- * `objectstack studio` — Launch the ObjectStack Console UI.
+ * `objectstack studio` — Launch the ObjectStack Studio UI.
  *
  * Alias for `objectstack serve --dev --ui`.
- * Starts the ObjectStack server in development mode with the Console
+ * Starts the ObjectStack server in development mode with the Studio
  * UI available at http://localhost:<port>/_studio/
  */
 export const studioCommand = new Command('studio')
-  .description('Launch Console UI with development server')
+  .description('Launch Studio UI with development server')
   .argument('[config]', 'Configuration file path', 'objectstack.config.ts')
   .option('-p, --port <port>', 'Server port', '3000')
   .action(async (configPath, options) => {

package/src/commands/test.ts

@@ -1,3 +1,5 @@
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+
 import { Command } from 'commander';
 import chalk from 'chalk';
 import path from 'path';

package/src/commands/validate.ts

@@ -1,3 +1,5 @@
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+
 import { Command } from 'commander';
 import chalk from 'chalk';
 import { ZodError } from 'zod';

package/src/index.ts

@@ -1,3 +1,5 @@
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+
 export * from './commands/compile.js';
 export * from './commands/validate.js';
 export * from './commands/info.js';

package/src/utils/config.ts

@@ -1,3 +1,5 @@
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+
 import path from 'path';
 import fs from 'fs';
 import chalk from 'chalk';

package/src/utils/format.ts

@@ -1,3 +1,5 @@
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+
 import chalk from 'chalk';
 import type { ZodError } from 'zod';
 
@@ -188,7 +190,7 @@ export function printServerReady(opts: ServerReadyOptions) {
   console.log('');
   console.log(chalk.cyan('  ➜') + chalk.bold('  API:     ') + chalk.cyan(base + '/'));
   if (opts.uiEnabled && opts.studioPath) {
-    console.log(chalk.cyan('  ➜') + chalk.bold('  Console: ') + chalk.cyan(base + opts.studioPath + '/'));
+    console.log(chalk.cyan('  ➜') + chalk.bold('  Studio:  ') + chalk.cyan(base + opts.studioPath + '/'));
   }
   console.log('');
   console.log(chalk.dim(`  Config:  ${opts.configFile}`));

package/src/utils/{console.ts → studio.ts}

@@ -1,7 +1,9 @@
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+
 /**
- * Console UI Integration Utilities
+ * Studio UI Integration Utilities
  *
- * Handles resolving, spawning, and proxying the @objectstack/console
+ * Handles resolving, spawning, and proxying the @objectstack/studio
  * frontend when the CLI is started with --ui or via the `studio` command.
  */
 import path from 'path';
@@ -21,17 +23,17 @@ const VITE_PORT_START = 24678;
 // ─── Path Resolution ────────────────────────────────────────────────
 
 /**
- * Resolve the filesystem path to the @objectstack/console package.
+ * Resolve the filesystem path to the @objectstack/studio package.
  * Searches workspace locations first, then falls back to node_modules.
  */
-export function resolveConsolePath(): string | null {
+export function resolveStudioPath(): string | null {
   const cwd = process.cwd();
 
   // Workspace candidates (monorepo layouts)
   const candidates = [
-    path.resolve(cwd, 'apps/console'),
-    path.resolve(cwd, '../../apps/console'),
-    path.resolve(cwd, '../apps/console'),
+    path.resolve(cwd, 'apps/studio'),
+    path.resolve(cwd, '../../apps/studio'),
+    path.resolve(cwd, '../apps/studio'),
   ];
 
   for (const candidate of candidates) {
@@ -39,7 +41,7 @@ export function resolveConsolePath(): string | null {
     if (fs.existsSync(pkgPath)) {
       try {
         const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
-        if (pkg.name === '@objectstack/console') return candidate;
+        if (pkg.name === '@objectstack/studio') return candidate;
       } catch {
         // Skip invalid package.json
       }
@@ -50,7 +52,7 @@ export function resolveConsolePath(): string | null {
   try {
     const { createRequire } = require('module');
     const req = createRequire(import.meta.url);
-    const resolved = req.resolve('@objectstack/console/package.json');
+    const resolved = req.resolve('@objectstack/studio/package.json');
     return path.dirname(resolved);
   } catch {
     return null;
@@ -58,10 +60,10 @@ export function resolveConsolePath(): string | null {
 }
 
 /**
- * Check whether the Console has a pre-built `dist/` directory.
+ * Check whether the Studio has a pre-built `dist/` directory.
  */
-export function hasConsoleDist(consolePath: string): boolean {
-  return fs.existsSync(path.join(consolePath, 'dist', 'index.html'));
+export function hasStudioDist(studioPath: string): boolean {
+  return fs.existsSync(path.join(studioPath, 'dist', 'index.html'));
 }
 
 // ─── Port Utilities ─────────────────────────────────────────────────
@@ -98,19 +100,19 @@ export interface ViteDevResult {
  * Sets environment variables so the Console runs in server mode and
  * connects to the ObjectStack API on the same origin.
  *
- * @param consolePath - Absolute path to the @objectstack/console package
+ * @param studioPath - Absolute path to the @objectstack/studio package
  * @param options.serverPort - The main ObjectStack server port (for display only)
  */
 export async function spawnViteDevServer(
-  consolePath: string,
+  studioPath: string,
   options: { serverPort?: number } = {},
 ): Promise<ViteDevResult> {
   const vitePort = await findAvailablePort(VITE_PORT_START);
 
-  // Resolve the Vite binary from the Console's own dependencies
+  // Resolve the Vite binary from the Studio's own dependencies
   const viteBinCandidates = [
-    path.join(consolePath, 'node_modules', '.bin', 'vite'),
-    path.join(consolePath, '..', '..', 'node_modules', '.bin', 'vite'),
+    path.join(studioPath, 'node_modules', '.bin', 'vite'),
+    path.join(studioPath, '..', '..', 'node_modules', '.bin', 'vite'),
   ];
 
   let viteBin: string | null = null;
@@ -127,7 +129,7 @@ export async function spawnViteDevServer(
     : ['vite', '--port', String(vitePort), '--strictPort'];
 
   const child = spawn(command, args, {
-    cwd: consolePath,
+    cwd: studioPath,
     env: {
       ...process.env,
       VITE_BASE: `${STUDIO_PATH}/`,
@@ -184,16 +186,16 @@ export async function spawnViteDevServer(
  * Create a lightweight kernel plugin that proxies `/_studio/*` requests
  * to the Vite dev server. Used in development mode.
  */
-export function createConsoleProxyPlugin(vitePort: number) {
+export function createStudioProxyPlugin(vitePort: number) {
   return {
-    name: 'com.objectstack.console-proxy',
+    name: 'com.objectstack.studio-proxy',
 
     init: async () => {},
 
     start: async (ctx: any) => {
       const httpServer = ctx.getService?.('http.server');
       if (!httpServer?.getRawApp) {
-        ctx.logger?.warn?.('Console proxy: http.server service not found — skipping');
+        ctx.logger?.warn?.('Studio proxy: http.server service not found — skipping');
         return;
       }
 
@@ -234,22 +236,22 @@ export function createConsoleProxyPlugin(vitePort: number) {
 }
 
 /**
- * Create a lightweight kernel plugin that serves the pre-built Console
+ * Create a lightweight kernel plugin that serves the pre-built Studio
  * static files at `/_studio/*`. Used in production mode.
  *
  * Uses Node.js built-in fs for static file serving to avoid external
  * bundling dependencies.
  */
-export function createConsoleStaticPlugin(distPath: string) {
+export function createStudioStaticPlugin(distPath: string, options?: { isDev?: boolean }) {
   return {
-    name: 'com.objectstack.console-static',
+    name: 'com.objectstack.studio-static',
 
     init: async () => {},
 
     start: async (ctx: any) => {
       const httpServer = ctx.getService?.('http.server');
       if (!httpServer?.getRawApp) {
-        ctx.logger?.warn?.('Console static: http.server service not found — skipping');
+        ctx.logger?.warn?.('Studio static: http.server service not found — skipping');
         return;
       }
 
@@ -258,10 +260,23 @@ export function createConsoleStaticPlugin(distPath: string) {
 
       const indexPath = path.join(absoluteDist, 'index.html');
       if (!fs.existsSync(indexPath)) {
-        ctx.logger?.warn?.(`Console static: dist not found at ${absoluteDist}`);
+        ctx.logger?.warn?.(`Studio static: dist not found at ${absoluteDist}`);
         return;
       }
 
+      // Read and rewrite index.html so asset paths respect the mount path.
+      // The dist may have been built with base '/' (absolute paths like
+      // /assets/...) which won't resolve when mounted under /_studio/.
+      const rawHtml = fs.readFileSync(indexPath, 'utf-8');
+      const rewrittenHtml = rawHtml.replace(
+        /(\s(?:href|src))="\/(?!\/)/g,
+        `$1="${STUDIO_PATH}/`,
+      );
+
+      // In dev mode, redirect root to Studio for convenience
+      if (options?.isDev) {
+        app.get('/', (c: any) => c.redirect(`${STUDIO_PATH}/`));
+      }
       // Redirect bare path
       app.get(STUDIO_PATH, (c: any) => c.redirect(`${STUDIO_PATH}/`));
 
@@ -283,9 +298,8 @@ export function createConsoleStaticPlugin(distPath: string) {
           });
         }
 
-        // SPA fallback: serve index.html for non-file routes
-        const html = fs.readFileSync(indexPath);
-        return new Response(html, {
+        // SPA fallback: serve rewritten index.html for non-file routes
+        return new Response(rewrittenHtml, {
           headers: { 'content-type': 'text/html; charset=utf-8' },
         });
       });

package/tsup.config.ts

@@ -1,3 +1,5 @@
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+
 import { defineConfig } from 'tsup';
 
 export default defineConfig([