trellis 3.2.2 → 3.2.4

package/dist/chunk-YC5I32PS.js

@@ -0,0 +1,147 @@
+import {
+  loadVmConfig
+} from "./chunk-UZRUP7QW.js";
+import {
+  readConfig
+} from "./chunk-JA7AIHRK.js";
+
+// src/mcp/gateway-config.ts
+import { existsSync, readFileSync, writeFileSync } from "fs";
+import { join, resolve } from "path";
+var GATEWAY_CONFIG_FILE = ".trellis-mcp-gateway.json";
+function gatewayConfigPath(dir = ".") {
+  return resolve(join(dir, GATEWAY_CONFIG_FILE));
+}
+function readGatewayConfig(dir = ".") {
+  const path = gatewayConfigPath(dir);
+  if (!existsSync(path)) return null;
+  try {
+    return JSON.parse(readFileSync(path, "utf8"));
+  } catch {
+    throw new Error(`Failed to parse ${path}: invalid JSON`);
+  }
+}
+function writeGatewayConfig(config, dir = ".") {
+  writeFileSync(
+    gatewayConfigPath(dir),
+    JSON.stringify(config, null, 2) + "\n",
+    "utf8"
+  );
+}
+
+// src/mcp/room-registry.ts
+import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
+import { resolve as resolve2 } from "path";
+function normalizeBaseUrl(url) {
+  return url.replace(/\/$/, "");
+}
+function roomMcpPathForUrl(baseUrl) {
+  const env = process.env.TRELLIS_MCP_PATH?.trim();
+  if (env) return env.startsWith("/") ? env : `/${env}`;
+  try {
+    const host = new URL(baseUrl).hostname;
+    if (/\.sprites\.app$/i.test(host)) return "/trellis/mcp";
+  } catch {
+  }
+  return "/mcp";
+}
+function toMcpUrl(base) {
+  const trimmed = normalizeBaseUrl(base);
+  if (trimmed.endsWith("/mcp") || trimmed.endsWith("/trellis/mcp")) {
+    return trimmed;
+  }
+  return `${trimmed}${roomMcpPathForUrl(trimmed)}`;
+}
+function parseRegistryJson(raw, source) {
+  try {
+    const data = JSON.parse(raw);
+    const rooms = Array.isArray(data) ? data : data.rooms ?? [];
+    return rooms.filter((r) => r.name && r.url).map((r) => ({
+      name: r.name,
+      url: normalizeBaseUrl(r.url),
+      mcpUrl: toMcpUrl(normalizeBaseUrl(r.url)),
+      apiKey: r.apiKey,
+      source,
+      deployedAt: r.deployedAt,
+      active: r.active
+    }));
+  } catch {
+    return [];
+  }
+}
+function listRegisteredRooms(opts = {}) {
+  const configDir = opts.configDir ?? ".";
+  const byUrl = /* @__PURE__ */ new Map();
+  const envRooms = process.env.TRELLIS_MCP_GATEWAY_ROOMS?.trim();
+  if (envRooms) {
+    for (const room of parseRegistryJson(envRooms, "env")) {
+      byUrl.set(room.url, room);
+    }
+  }
+  const registryPath = process.env.TRELLIS_ROOM_REGISTRY?.trim() ?? resolve2(configDir, ".trellis-rooms.json");
+  if (existsSync2(registryPath)) {
+    try {
+      const raw = readFileSync2(registryPath, "utf8");
+      for (const room of parseRegistryJson(raw, "registry")) {
+        byUrl.set(room.url, room);
+      }
+    } catch {
+    }
+  }
+  const vm = loadVmConfig();
+  for (const [name, sprite] of Object.entries(vm.sprites)) {
+    if (!sprite.hasTrellis && !sprite.apiKey) continue;
+    const url = normalizeBaseUrl(sprite.url);
+    byUrl.set(url, {
+      name,
+      url,
+      mcpUrl: toMcpUrl(url),
+      apiKey: sprite.apiKey,
+      source: "vm",
+      active: vm.activeSprite === name
+    });
+  }
+  const dbConfig = readConfig(configDir);
+  if (dbConfig?.mode === "remote" && dbConfig.url) {
+    const url = normalizeBaseUrl(dbConfig.url);
+    const name = dbConfig.spriteName ?? url.replace(/^https?:\/\//, "").split(".")[0];
+    if (!byUrl.has(url)) {
+      byUrl.set(url, {
+        name,
+        url,
+        mcpUrl: toMcpUrl(url),
+        apiKey: dbConfig.apiKey,
+        source: "project",
+        deployedAt: dbConfig.deployedAt,
+        active: true
+      });
+    }
+  }
+  return [...byUrl.values()].sort((a, b) => a.name.localeCompare(b.name));
+}
+function getRegisteredRoom(nameOrUrl, opts) {
+  const needle = nameOrUrl.trim().toLowerCase();
+  const rooms = listRegisteredRooms(opts);
+  return rooms.find(
+    (r) => r.name.toLowerCase() === needle || r.url.toLowerCase() === needle || r.mcpUrl.toLowerCase() === needle || normalizeBaseUrl(needle).endsWith(r.name.toLowerCase())
+  ) ?? null;
+}
+function gatewayPublicUrl(opts) {
+  const fromConfig = readGatewayConfig(opts?.configDir ?? ".")?.publicUrl?.trim();
+  if (fromConfig) return fromConfig.replace(/\/$/, "");
+  if (opts?.gatewayPublicUrl?.trim()) {
+    return opts.gatewayPublicUrl.trim().replace(/\/$/, "");
+  }
+  const env = process.env.TRELLIS_MCP_GATEWAY_PUBLIC_URL?.trim();
+  if (env) return env.replace(/\/$/, "");
+  return "https://mcp.trellis.computer";
+}
+
+export {
+  gatewayConfigPath,
+  writeGatewayConfig,
+  roomMcpPathForUrl,
+  listRegisteredRooms,
+  getRegisteredRoom,
+  gatewayPublicUrl
+};

package/dist/{chunk-VBYUTRXX.js → chunk-YKVB4LUQ.js}

@@ -6,15 +6,15 @@ import {
   init_types,
   issueEntityId,
   laneEntityId
-} from "./chunk-N6MYZT4O.js";
+} from "./chunk-547FZFKO.js";
 import {
   createVcsOp,
   init_ops
-} from "./chunk-GLM4HGN4.js";
+} from "./chunk-GRWQPKYK.js";
 import {
   __esm,
   __require
-} from "./chunk-KFQGP6VL.js";
+} from "./chunk-2ESYSVXG.js";
 
 // src/vcs/decompose.ts
 import { dirname } from "path";

package/dist/{chunk-7ZFRVCUE.js → chunk-YPT6XMS4.js}

@@ -1,3 +1,8 @@
+import {
+  SPRITE_PUBLIC_HTTP_PORT,
+  buildDeployUrl,
+  validateDeployName
+} from "./chunk-3XCOAP6G.js";
 import {
   SPRITE_ENSURE_BUN_SH,
   assertSpriteCli,
@@ -10,56 +15,13 @@ import {
 import {
   updateConfig
 } from "./chunk-JA7AIHRK.js";
-import {
-  __require
-} from "./chunk-KFQGP6VL.js";
 
 // src/server/deploy.ts
+import { execFile } from "child_process";
 import { existsSync, writeFileSync, mkdirSync } from "fs";
-import { join, resolve } from "path";
-
-// src/server/deploy-meta.ts
-var DEPLOY_NAME_RE = /^[a-z][a-z0-9]*(?:-[a-z0-9]+)*$/;
-var MIN_LEN = 3;
-var MAX_LEN = 32;
-var DeployNameError = class extends Error {
-  constructor(message) {
-    super(message);
-    this.name = "DeployNameError";
-  }
-};
-function normalizeDeployName(name) {
-  return name.trim().toLowerCase();
-}
-function validateDeployName(name) {
-  const normalized = normalizeDeployName(name);
-  if (!normalized) {
-    throw new DeployNameError("Deploy name is required.");
-  }
-  if (normalized.length < MIN_LEN || normalized.length > MAX_LEN) {
-    throw new DeployNameError(
-      `Deploy name must be ${MIN_LEN}\u2013${MAX_LEN} characters (got ${normalized.length}).`
-    );
-  }
-  if (normalized.includes("--")) {
-    throw new DeployNameError(
-      "Deploy name cannot contain consecutive hyphens."
-    );
-  }
-  if (!DEPLOY_NAME_RE.test(normalized)) {
-    throw new DeployNameError(
-      "Deploy name must start with a letter and use only lowercase letters, numbers, and single hyphens (e.g. my-app)."
-    );
-  }
-  return normalized;
-}
-function buildDeployUrl(name) {
-  const slug = validateDeployName(name);
-  return `https://${slug}.sprites.app`;
-}
-var SPRITE_PUBLIC_HTTP_PORT = 8080;
-
-// src/server/deploy.ts
+import { dirname, join, resolve } from "path";
+import { fileURLToPath } from "url";
+import { promisify } from "util";
 async function deploy(opts) {
   const { configDir = ".", onProgress = () => {
   } } = opts;
@@ -109,16 +71,22 @@ async function deploy(opts) {
   if (!bunPath.includes("bun")) {
     throw new Error(`Bun install failed on sprite ${name}: ${bunPath || "(no output)"}`);
   }
-  onProgress("Starting server...");
-  await runSpriteExec(
-    name,
-    'pkill -f "/home/sprite/trellis-db/server.js" 2>/dev/null || true'
-  ).catch(() => {
-  });
+  onProgress("Starting server (sprite-env service)...");
   const bun = bunPath.trim().split("\n").pop().trim();
   await runSpriteExec(
     name,
-    `cd /home/sprite/trellis-db && (nohup ${bun} run server.js >> server.log 2>&1 </dev/null &); exit 0`
+    `
+export PATH="$HOME/.bun/bin:$PATH"
+ENV="/.sprite/bin/sprite-env"
+BUN="${bun}"
+$ENV services delete trellis-db 2>/dev/null || true
+$ENV services create trellis-db \\
+  --cmd "$BUN" \\
+  --args run,server.js \\
+  --dir /home/sprite/trellis-db \\
+  --http-port ${listenPort} \\
+  --no-stream
+`.trim()
   );
   onProgress("Waiting for health check...");
   await waitForDeployHealth(url, 6e4);
@@ -162,8 +130,6 @@ function generateSecret(prefix) {
   return `${prefix}${b64}`;
 }
 async function runBun(args) {
-  const { execFile } = __require("child_process");
-  const { promisify } = __require("util");
   const execFileAsync = promisify(execFile);
   try {
     await execFileAsync("bun", args);
@@ -173,10 +139,33 @@ async function runBun(args) {
     );
   }
 }
+function resolveTrellisImports() {
+  const root = process.env.TRELLIS_NODE_ROOT?.trim();
+  if (root) {
+    return {
+      server: join(root, "dist/server/index.js").replace(/\\/g, "/"),
+      client: join(root, "dist/client/index.js").replace(/\\/g, "/")
+    };
+  }
+  const here = dirname(fileURLToPath(import.meta.url));
+  const packageRoots = [resolve(here, ".."), resolve(here, "..", "..")];
+  for (const packageRoot of packageRoots) {
+    const server = join(packageRoot, "dist/server/index.js");
+    const client = join(packageRoot, "dist/client/index.js");
+    if (existsSync(server) && existsSync(client)) {
+      return {
+        server: server.replace(/\\/g, "/"),
+        client: client.replace(/\\/g, "/")
+      };
+    }
+  }
+  return { server: "trellis/server", client: "trellis/client" };
+}
 function generateServerEntrypoint(opts) {
+  const { server, client } = resolveTrellisImports();
   return `
-import { TenantPool, startServer } from 'trellis/server';
-import { readConfig, defaultLocalConfig, writeConfig } from 'trellis/client';
+import { TenantPool, startServer } from '${server}';
+import { readConfig, defaultLocalConfig, writeConfig } from '${client}';
 import { join } from 'path';
 import { existsSync } from 'fs';
 
@@ -194,7 +183,7 @@ const config = readConfig(configDir)!;
 const pool = new TenantPool(dbPath, { backend: { backend: 'sqljs' } });
 await pool.preload();
 
-const server = startServer({ port: ${opts.port}, config, pool });
+await startServer({ port: ${opts.port}, config, pool, presenceRelay: true });
 
 console.log('Trellis DB running on port ${opts.port}');
 console.log(\`Listening on port ${opts.port}\`);
@@ -202,10 +191,5 @@ console.log(\`Listening on port ${opts.port}\`);
 }
 
 export {
-  DeployNameError,
-  normalizeDeployName,
-  validateDeployName,
-  buildDeployUrl,
-  SPRITE_PUBLIC_HTTP_PORT,
   deploy
 };

package/dist/cli/deploy-cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy-cli.d.ts","sourceRoot":"","sources":["../../src/cli/deploy-cli.ts"],"names":[],"mappings":"AAAA;;GAEG;AAOH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EACrD,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,OAAO,GACZ,IAAI,CAqBN;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAsCxE"}
+{"version":3,"file":"deploy-cli.d.ts","sourceRoot":"","sources":["../../src/cli/deploy-cli.ts"],"names":[],"mappings":"AAAA;;GAEG;AAQH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EACrD,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,OAAO,GACZ,IAAI,CA2CN;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmDxE"}

package/dist/{deploy-cli-C35HTITO.js → cli/deploy-cli.js}

@@ -1,12 +1,18 @@
 import {
-  DeployNameError,
   deploy
-} from "./chunk-7ZFRVCUE.js";
-import "./chunk-CAG4FULI.js";
+} from "../chunk-YPT6XMS4.js";
+import {
+  DeployNameError
+} from "../chunk-3XCOAP6G.js";
+import "../chunk-CAG4FULI.js";
+import {
+  roomMcpPathForUrl
+} from "../chunk-YC5I32PS.js";
+import "../chunk-UZRUP7QW.js";
 import {
   configPath
-} from "./chunk-JA7AIHRK.js";
-import "./chunk-KFQGP6VL.js";
+} from "../chunk-JA7AIHRK.js";
+import "../chunk-2ESYSVXG.js";
 
 // src/cli/deploy-cli.ts
 import chalk from "chalk";
@@ -22,7 +28,29 @@ function printDeploySuccess(result, configDir, stub) {
   console.log(chalk.dim(`  API key:  ${result.apiKey}`));
   console.log(chalk.dim(`  Config:   ${configPath(configDir)}`));
   console.log("");
+  const base = result.url.replace(/\/$/, "");
+  const mcpPath = roomMcpPathForUrl(base);
+  const mcpUrl = `${base}${mcpPath}`;
   console.log(chalk.dim(`  Health:   curl ${result.url}/health`));
+  console.log(chalk.dim(`  MCP:      ${mcpUrl}`));
+  if (mcpPath !== "/mcp") {
+    console.log(chalk.dim(`  (Sprites reserves /mcp \u2014 use ${mcpPath} on *.sprites.app)`));
+  }
+  console.log(chalk.dim(`  Gateway:  ${base}/gateway/mcp`));
+  console.log("");
+  console.log(chalk.bold("Cursor MCP (remote):"));
+  console.log(
+    chalk.cyan(
+      `  { "url": "${mcpUrl}", "headers": { "Authorization": "Bearer ${result.apiKey}" } }`
+    )
+  );
+  console.log("");
+  console.log(chalk.bold("Claude Desktop (stdio bridge):"));
+  console.log(
+    chalk.cyan(
+      `  npx trellis mcp bridge --room ${result.url} --api-key ${result.apiKey}`
+    )
+  );
   console.log("");
   console.log(chalk.bold("SDK:"));
   console.log(chalk.cyan(`  import { TrellisDb } from 'trellis/client';`));
@@ -35,7 +63,7 @@ function printDeploySuccess(result, configDir, stub) {
 async function runDeployCli(opts) {
   const configDir = opts.configDir ?? ".";
   const port = opts.port === void 0 ? void 0 : typeof opts.port === "string" ? parseInt(opts.port, 10) : opts.port;
-  const { readConfig } = await import("./config-PFTP67TR.js");
+  const { readConfig } = await import("../config-KMY6RRK3.js");
   const config = readConfig(configDir);
   const label = opts.stub ? "Stub deploy" : "Deploying to Sprites";
   console.log(chalk.bold(`${label}: ${opts.name}...`));
@@ -51,6 +79,17 @@ async function runDeployCli(opts) {
       onProgress: (msg) => console.log(chalk.dim(`  ${msg}`))
     });
     printDeploySuccess(result, configDir, !!opts.stub);
+    if (!opts.stub) {
+      try {
+        const { trackSprite } = await import("../vm-config-YZRJ3KUB.js");
+        trackSprite(result.name, {
+          url: result.url,
+          hasTrellis: true,
+          apiKey: result.apiKey
+        });
+      } catch {
+      }
+    }
   } catch (err) {
     if (err instanceof DeployNameError) {
       console.error(chalk.red(`Invalid name: ${err.message}`));

package/dist/cli/gateway-deploy-cli.d.ts

@@ -0,0 +1,19 @@
+/**
+ * `trellis mcp gateway deploy` handler.
+ */
+export interface GatewayDeployCliOptions {
+    name: string;
+    publicUrl?: string;
+    port?: string | number;
+    configDir?: string;
+    roomsFile?: string;
+    stub?: boolean;
+}
+export declare function printGatewayDeploySuccess(result: {
+    url: string;
+    publicUrl: string;
+    name: string;
+    roomCount: number;
+}, configDir: string, stub: boolean): void;
+export declare function runGatewayDeployCli(opts: GatewayDeployCliOptions): Promise<void>;
+//# sourceMappingURL=gateway-deploy-cli.d.ts.map

package/dist/cli/gateway-deploy-cli.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gateway-deploy-cli.d.ts","sourceRoot":"","sources":["../../src/cli/gateway-deploy-cli.ts"],"names":[],"mappings":"AAAA;;GAEG;AAOH,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,wBAAgB,yBAAyB,CACvC,MAAM,EAAE;IACN,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB,EACD,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,OAAO,GACZ,IAAI,CA8CN;AAED,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,uBAAuB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAiCf"}

package/dist/cli/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";AAEA;;;;;;;;;;;GAWG;AA4CH,MAAM,MAAM,OAAO,GACf,QAAQ,GACR,OAAO,GACP,QAAQ,GACR,SAAS,GACT,OAAO,GACP,QAAQ,GACR,MAAM,CAAC;AACX,MAAM,MAAM,kBAAkB,GAAG,SAAS,GAAG,UAAU,GAAG,MAAM,CAAC;AACjE,MAAM,MAAM,aAAa,GACrB,OAAO,GACP,KAAK,GACL,QAAQ,GACR,MAAM,GACN,MAAM,GACN,UAAU,GACV,MAAM,GACN,KAAK,GACL,MAAM,GACN,KAAK,GACL,SAAS,GACT,WAAW,GACX,OAAO,GACP,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";AAEA;;;;;;;;;;;GAWG;AA6CH,MAAM,MAAM,OAAO,GACf,QAAQ,GACR,OAAO,GACP,QAAQ,GACR,SAAS,GACT,OAAO,GACP,QAAQ,GACR,MAAM,CAAC;AACX,MAAM,MAAM,kBAAkB,GAAG,SAAS,GAAG,UAAU,GAAG,MAAM,CAAC;AACjE,MAAM,MAAM,aAAa,GACrB,OAAO,GACP,KAAK,GACL,QAAQ,GACR,MAAM,GACN,MAAM,GACN,UAAU,GACV,MAAM,GACN,KAAK,GACL,MAAM,GACN,KAAK,GACL,SAAS,GACT,WAAW,GACX,OAAO,GACP,MAAM,CAAC"}