@usegraft/cli 1.0.0-beta.0 → 1.0.0-beta.2

package/README.md

@@ -9,7 +9,7 @@ Part of [Graft](https://github.com/AndersonDesign1/graft), a CMS built so an AI
 ```bash
 npm i -D @usegraft/cli
 # or run it without installing
-npx @usegraft/cli init
+npx @usegraft/cli@latest init
 ```
 
 Once installed, the command is `graft`. Run it without installing under the
@@ -21,8 +21,8 @@ package, so `npx graft` fetches the wrong thing.
 A content project needs no services at all. `graft compile` writes the index to a SQLite artifact your app reads embedded.
 
 ```bash
-npx @usegraft/cli init      # scaffolds graft.config.ts, content/, llms.txt
-npx @usegraft/cli compile   # → .graft/index.db
+npx @usegraft/cli@latest init      # scaffolds graft.config.ts, content/, llms.txt
+npx @usegraft/cli@latest compile   # → .graft/index.db
 ```
 
 Move to Postgres by setting `DATABASE_URL` and changing one line in `graft.config.ts`:

package/dist/{chunk-CONTLKSZ.js → chunk-PSJ2OBWG.js}

@@ -102,7 +102,7 @@ function createNodeListener(handler, options = {}) {
       res.end(
         JSON.stringify({
           error: "FUNCTION_EXECUTION_FAILED",
-          message: `graft serve failed to relay the request: ${error instanceof Error ? error.message : String(error)}`,
+          message: "graft serve failed to relay the request.",
           fix: "Check the server logs; if this reproduces, file it \u2014 the adapter should never throw."
         })
       );
@@ -208,14 +208,11 @@ async function startServe(options) {
   const health = async () => {
     try {
       await branch.db.execute(sql`select 1`);
-    } catch (error) {
-      return new Response(
-        JSON.stringify({
-          ok: false,
-          error: error instanceof Error ? error.message : String(error)
-        }),
-        { status: 503, headers: { "content-type": "application/json" } }
-      );
+    } catch {
+      return new Response(JSON.stringify({ ok: false, error: "database_unavailable" }), {
+        status: 503,
+        headers: { "content-type": "application/json" }
+      });
     }
     return new Response(
       JSON.stringify({

package/dist/index.js

@@ -345,7 +345,7 @@ async function run(argv, options = {}) {
         return 0;
       }
       case "serve": {
-        const { serveCommand } = await import("./serve-5ADUQG66.js");
+        const { serveCommand } = await import("./serve-OP4OPK37.js");
         await serveCommand({
           cwd,
           branchId: args.branchId,
@@ -356,7 +356,7 @@ async function run(argv, options = {}) {
         return 0;
       }
       case "studio": {
-        const { studioCommand } = await import("./studio-7VAYFEWS.js");
+        const { studioCommand } = await import("./studio-HUGOTZOY.js");
         await studioCommand({
           cwd,
           branchId: args.branchId,

package/dist/{serve-5ADUQG66.js → serve-OP4OPK37.js}

@@ -5,7 +5,7 @@ import {
   createServeRouter,
   serveCommand,
   startServe
-} from "./chunk-CONTLKSZ.js";
+} from "./chunk-PSJ2OBWG.js";
 import "./chunk-2LG6TWYY.js";
 export {
   allowedHostsFor,

package/dist/studio-HUGOTZOY.js

@@ -0,0 +1,166 @@
+#!/usr/bin/env node
+import {
+  allowedHostsFor,
+  createNodeListener
+} from "./chunk-PSJ2OBWG.js";
+import {
+  findConfig,
+  loadConfig,
+  loadProjectEnv,
+  requireDatabaseUrl
+} from "./chunk-2LG6TWYY.js";
+
+// src/commands/studio.ts
+import { execFile } from "child_process";
+import { createServer } from "http";
+import { userInfo } from "os";
+import { GraftError } from "@usegraft/contracts";
+function isLoopback(host) {
+  return host === "127.0.0.1" || host === "localhost" || host === "::1";
+}
+function operatorIdentity() {
+  try {
+    return { kind: "human", id: userInfo().username };
+  } catch {
+    return { kind: "human", id: process.env.USERNAME ?? process.env.USER ?? "operator" };
+  }
+}
+function isGitPreviewBranch(branch) {
+  if (branch === "" || branch === "@") return false;
+  if (branch.includes("..") || branch.includes("@{") || branch.includes("//") || branch.includes("\\")) {
+    return false;
+  }
+  if (branch.startsWith("/") || branch.endsWith("/") || branch.endsWith(".")) return false;
+  if (!/^[A-Za-z0-9._/@+-]+$/.test(branch)) return false;
+  return branch.split("/").every((part) => part.length > 0 && !part.startsWith(".") && !part.endsWith(".lock"));
+}
+function assertGitPreviewBranch(branch) {
+  if (isGitPreviewBranch(branch)) return;
+  throw new GraftError({
+    code: "INPUT_VALIDATION_FAILED",
+    message: `Branch "${branch}" is not a safe preview query value.`,
+    fix: "Use a git-ref-shaped branch name (letters, digits, . _ / @ + -)."
+  });
+}
+function studioPreviewUrl(port, branch) {
+  if (!Number.isInteger(port) || port < 1 || port > 65535) {
+    throw new GraftError({
+      code: "INPUT_VALIDATION_FAILED",
+      message: `"${port}" is not a valid bound port.`,
+      fix: "Pass --port <1-65535> (0 picks a free port, then we read the one that bound)."
+    });
+  }
+  assertGitPreviewBranch(branch);
+  const preview = new URL(`http://127.0.0.1:${port}/`);
+  preview.searchParams.set("branch", branch);
+  if (preview.protocol !== "http:" || preview.hostname !== "127.0.0.1") {
+    throw new GraftError({
+      code: "INPUT_VALIDATION_FAILED",
+      message: `Preview URL is not loopback http.`,
+      fix: "graft studio only opens http://127.0.0.1."
+    });
+  }
+  return preview.href;
+}
+function openBrowser(url) {
+  let parsed;
+  try {
+    parsed = new URL(url);
+  } catch {
+    return;
+  }
+  if (parsed.protocol !== "http:" || parsed.hostname !== "127.0.0.1") return;
+  const platform = process.platform;
+  const cmd = platform === "win32" ? "cmd" : platform === "darwin" ? "open" : "xdg-open";
+  const args = platform === "win32" ? ["/c", "start", "", parsed.href] : [parsed.href];
+  execFile(cmd, args, () => {
+  });
+}
+async function studioCommand(options) {
+  loadProjectEnv(options.cwd);
+  const config = await loadConfig(findConfig(options.cwd));
+  const url = requireDatabaseUrl();
+  const [{ createStudioHandler }, { createDb, resolveBranchHandle, scopeWriteBranch }] = await Promise.all([import("@usegraft/studio"), import("@usegraft/db")]);
+  const branchName = options.branchId ?? "main";
+  assertGitPreviewBranch(branchName);
+  const control = createDb(url);
+  try {
+    const branch = await resolveBranchHandle(control.db, branchName, { databaseUrl: url });
+    const writeBranch = scopeWriteBranch(branch.scope);
+    let server;
+    try {
+      const host = options.host ?? process.env.HOST ?? "127.0.0.1";
+      const requestedPort = options.port ?? Number(process.env.GRAFT_STUDIO_PORT ?? 4983);
+      if (!Number.isInteger(requestedPort) || requestedPort < 0 || requestedPort > 65535) {
+        throw new GraftError({
+          code: "INPUT_VALIDATION_FAILED",
+          message: `"${options.port ?? process.env.GRAFT_STUDIO_PORT}" is not a valid port.`,
+          fix: "Pass --port <0-65535> (0 picks a free port)."
+        });
+      }
+      const loopback = isLoopback(host);
+      const devToken = process.env.GRAFT_DEV_TOKEN;
+      if (!loopback && !devToken) {
+        console.warn(
+          "[graft studio] WARNING: binding beyond loopback with no GRAFT_DEV_TOKEN \u2014 set a bearer token before exposing Studio to a network."
+        );
+      }
+      const authenticate = !loopback && devToken ? (request) => {
+        const header = request.headers.get("authorization") ?? "";
+        if (header !== `Bearer ${devToken}`) return null;
+        return {
+          ...operatorIdentity(),
+          scopes: ["studio:read", "studio:write", "approvals:decide"]
+        };
+      } : !loopback ? () => null : void 0;
+      const handler = createStudioHandler({
+        db: branch.db,
+        collections: config.collections,
+        contentDir: config.contentDir,
+        mdxTrust: config.mdxTrust,
+        defaultBranch: writeBranch,
+        decider: operatorIdentity,
+        authenticate
+      });
+      const listening = createServer(
+        createNodeListener(handler, { allowedHosts: allowedHostsFor(host) })
+      );
+      server = listening;
+      await new Promise((resolve, reject) => {
+        listening.once("error", reject);
+        listening.listen(requestedPort, host, () => resolve());
+      });
+      const address = listening.address();
+      const port = typeof address === "object" && address ? address.port : requestedPort;
+      const origin = loopback ? `http://127.0.0.1:${port}` : `http://${host}:${port}`;
+      console.log(
+        [
+          `graft studio \u2014 branch "${branchName}" (opt-in)`,
+          `  ui         GET  ${origin}/`,
+          `  openapi    GET  ${origin}/api/studio/v1/openapi.json`,
+          `  Edit content, approve/deny \u2014 same ops as MCP/CLI.`
+        ].join("\n")
+      );
+      if (loopback) openBrowser(studioPreviewUrl(port, branchName));
+      await new Promise((resolve) => {
+        const stop = () => resolve();
+        process.once("SIGINT", stop);
+        process.once("SIGTERM", stop);
+      });
+    } finally {
+      const bound = server;
+      if (bound?.listening) {
+        await new Promise((resolve, reject) => {
+          bound.close((err) => err ? reject(err) : resolve());
+        });
+      }
+      await branch.close();
+    }
+  } finally {
+    await control.close();
+  }
+}
+export {
+  studioCommand,
+  studioPreviewUrl
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@usegraft/cli",
-  "version": "1.0.0-beta.0",
+  "version": "1.0.0-beta.2",
   "description": "The graft CLI: scaffold, compile authored content, serve the runtime, and split your database credentials.",
   "keywords": [
     "agent",
@@ -34,22 +34,22 @@
     "access": "public"
   },
   "dependencies": {
-    "@usegraft/assets": "1.0.0-beta.0",
-    "@usegraft/auth": "1.0.0-beta.0",
-    "@usegraft/compiler": "1.0.0-beta.0",
-    "@usegraft/content-api": "1.0.0-beta.0",
-    "@usegraft/content-migrations": "1.0.0-beta.0",
-    "@usegraft/contracts": "1.0.0-beta.0",
-    "@usegraft/core": "1.0.0-beta.0",
-    "@usegraft/db": "1.0.0-beta.0",
-    "@usegraft/mcp": "1.0.0-beta.0",
-    "@usegraft/mdx-safety": "1.0.0-beta.0",
-    "@usegraft/registry": "1.0.0-beta.0",
-    "@usegraft/studio": "1.0.0-beta.0",
-    "jiti": "^2.4.0"
+    "@usegraft/assets": "1.0.0-beta.2",
+    "@usegraft/auth": "1.0.0-beta.2",
+    "@usegraft/compiler": "1.0.0-beta.2",
+    "@usegraft/content-api": "1.0.0-beta.2",
+    "@usegraft/content-migrations": "1.0.0-beta.2",
+    "@usegraft/contracts": "1.0.0-beta.2",
+    "@usegraft/core": "1.0.0-beta.2",
+    "@usegraft/db": "1.0.0-beta.2",
+    "@usegraft/mcp": "1.0.0-beta.2",
+    "@usegraft/mdx-safety": "1.0.0-beta.2",
+    "@usegraft/registry": "1.0.0-beta.2",
+    "@usegraft/studio": "1.0.0-beta.2",
+    "jiti": "^2.7.0"
   },
   "devDependencies": {
-    "@usegraft/sdk-core": "1.0.0-beta.0"
+    "@usegraft/sdk-core": "1.0.0-beta.2"
   },
   "engines": {
     "node": ">=22.16"

package/dist/studio-7VAYFEWS.js

@@ -1,109 +0,0 @@
-#!/usr/bin/env node
-import {
-  allowedHostsFor,
-  createNodeListener
-} from "./chunk-CONTLKSZ.js";
-import {
-  findConfig,
-  loadConfig,
-  loadProjectEnv,
-  requireDatabaseUrl
-} from "./chunk-2LG6TWYY.js";
-
-// src/commands/studio.ts
-import { execFile } from "child_process";
-import { createServer } from "http";
-import { userInfo } from "os";
-import { GraftError } from "@usegraft/contracts";
-function isLoopback(host) {
-  return host === "127.0.0.1" || host === "localhost" || host === "::1";
-}
-function operatorIdentity() {
-  try {
-    return { kind: "human", id: userInfo().username };
-  } catch {
-    return { kind: "human", id: process.env.USERNAME ?? process.env.USER ?? "operator" };
-  }
-}
-function openBrowser(url) {
-  const platform = process.platform;
-  const cmd = platform === "win32" ? "cmd" : platform === "darwin" ? "open" : "xdg-open";
-  const args = platform === "win32" ? ["/c", "start", "", url] : [url];
-  execFile(cmd, args, () => {
-  });
-}
-async function studioCommand(options) {
-  loadProjectEnv(options.cwd);
-  const config = await loadConfig(findConfig(options.cwd));
-  const url = requireDatabaseUrl();
-  const [{ createStudioHandler }, { createDb, resolveBranchHandle, scopeWriteBranch }] = await Promise.all([import("@usegraft/studio"), import("@usegraft/db")]);
-  const control = createDb(url);
-  const branchName = options.branchId ?? "main";
-  const branch = await resolveBranchHandle(control.db, branchName, { databaseUrl: url });
-  const writeBranch = scopeWriteBranch(branch.scope);
-  const host = options.host ?? process.env.HOST ?? "127.0.0.1";
-  const requestedPort = options.port ?? Number(process.env.GRAFT_STUDIO_PORT ?? 4983);
-  if (!Number.isInteger(requestedPort) || requestedPort < 0 || requestedPort > 65535) {
-    await branch.close();
-    await control.close();
-    throw new GraftError({
-      code: "INPUT_VALIDATION_FAILED",
-      message: `"${options.port ?? process.env.GRAFT_STUDIO_PORT}" is not a valid port.`,
-      fix: "Pass --port <0-65535> (0 picks a free port)."
-    });
-  }
-  const loopback = isLoopback(host);
-  const devToken = process.env.GRAFT_DEV_TOKEN;
-  if (!loopback && !devToken) {
-    console.warn(
-      "[graft studio] WARNING: binding beyond loopback with no GRAFT_DEV_TOKEN \u2014 set a bearer token before exposing Studio to a network."
-    );
-  }
-  const authenticate = !loopback && devToken ? (request) => {
-    const header = request.headers.get("authorization") ?? "";
-    if (header !== `Bearer ${devToken}`) return null;
-    return {
-      ...operatorIdentity(),
-      scopes: ["studio:read", "studio:write", "approvals:decide"]
-    };
-  } : !loopback ? () => null : void 0;
-  const handler = createStudioHandler({
-    db: branch.db,
-    collections: config.collections,
-    contentDir: config.contentDir,
-    mdxTrust: config.mdxTrust,
-    defaultBranch: writeBranch,
-    decider: operatorIdentity,
-    authenticate
-  });
-  const server = createServer(createNodeListener(handler, { allowedHosts: allowedHostsFor(host) }));
-  await new Promise((resolve, reject) => {
-    server.once("error", reject);
-    server.listen(requestedPort, host, () => resolve());
-  });
-  const address = server.address();
-  const port = typeof address === "object" && address ? address.port : requestedPort;
-  const base = `http://${host}:${port}`;
-  console.log(
-    [
-      `graft studio \u2014 branch "${branchName}" (opt-in)`,
-      `  ui         GET  ${base}/`,
-      `  openapi    GET  ${base}/api/studio/v1/openapi.json`,
-      `  Edit content, approve/deny \u2014 same ops as MCP/CLI.`
-    ].join("\n")
-  );
-  if (loopback) openBrowser(`${base}/?branch=${encodeURIComponent(branchName)}`);
-  await new Promise((resolve) => {
-    const stop = () => resolve();
-    process.once("SIGINT", stop);
-    process.once("SIGTERM", stop);
-  });
-  await new Promise((resolve, reject) => {
-    server.close((err) => err ? reject(err) : resolve());
-  });
-  await branch.close();
-  await control.close();
-}
-export {
-  studioCommand
-};