@genex-ai/cli-demo 1.34.2 → 1.34.3-dev.704

package/README.md

@@ -67,7 +67,7 @@ as the latest available snapshot.
    claude,codex,cursor`, or a single custom dir with `--dir`.
 2. **Authorizes you** — opens the Genex auth site (web) in your browser. If the
    browser can't open, it prints the URL to open manually.
-3. **Saves your token** — writes `GENEX_TOKEN` to `~/.genex/env` (per-user;
+3. **Saves your token** — saves an origin-bound credential under `~/.genex/env.origins/` (per-user;
    reused across projects).
 4. **Creates the draft project** — `POST /api/projects` provisions a managed
    Forgejo repo (one per user; no SSH key) and stores the project metadata (id,
@@ -285,7 +285,25 @@ GENEX_AUTH_URL=https://staging.genex.dev genex init
 The token env file path is configurable the same way: `--env <path>` per
 command, or `GENEX_ENV_FILE=<path>` for a whole session (an explicit `--env`
 still wins). Useful for running as a second account — a curator or a test
-runner — without touching the default `~/.genex/env`.
+runner — without touching the default profile. Each profile stores credentials
+under `<env-path>.origins/<origin-hash>.json`, and pending sign-ins under
+`<env-path>.auth/<origin-hash>.json`. Dev, production and custom servers coexist.
+
+API destinations must be HTTPS origins without paths, queries, fragments or
+embedded credentials. HTTP is supported for exact loopback hosts (`localhost`,
+`127.0.0.1`, `[::1]`). Select custom servers explicitly with `--api-url` (and
+`--auth-url` for their dashboard). Project metadata can select a saved credential
+for its server, but cannot redirect a credential or initiate a new custom login.
+API redirects are refused, including device-code polls.
+
+Legacy `GENEX_TOKEN` files remain readable only at the configured CLI origin
+(the installed channel's default or `GENEX_API_URL`), never a metadata-selected
+origin. The first read records that binding permanently; switching channels
+cannot move it. The legacy file remains intact, including hosted-session token
+rotation. For an old custom-server file, set `GENEX_API_URL` to its known issuer
+before the first read, or run `genex auth --api-url <origin>` to sign in again.
+Older CLI versions do not read the new profiles; use the updated CLI for both
+stands.
 
 To control which browser is launched, set `GENEX_BROWSER` (or the conventional
 `BROWSER`) to an opener command. It's parsed like a shell command, so arguments
@@ -346,7 +364,7 @@ The CLI uses a loopback-redirect flow (the same pattern as `gh auth login` and
    > the exact `state` it received. A missing or mismatched `state` is rejected
    > (CSRF protection).
 
-3. The CLI verifies `state`, writes `GENEX_TOKEN=<TOKEN>` to `~/.genex/env`, and
+3. The CLI verifies `state`, saves the credential in the selected origin/profile, and
    shows a success page in the browser.
 
 If the browser can't be opened, the URL is printed and — when run in an

package/dist/{blender-mcp-X66ZZ4TN.js → blender-mcp-XLEK6SLM.js}

@@ -7,10 +7,10 @@ import {
   isRenderMode,
   sceneSummary,
   sheetOf
-} from "./chunk-OJAXYQ5L.js";
+} from "./chunk-MRV3Q3WU.js";
 import {
   getCliVersion
-} from "./chunk-5FA2WLM7.js";
+} from "./chunk-AQW7HUPV.js";
 
 // src/commands/blender-mcp.ts
 import fs from "fs/promises";

package/dist/{blender-serve-PVVCH3S6.js → blender-serve-GW3LTFOX.js}

@@ -1,7 +1,7 @@
 import {
   c,
   getTemplatesDir
-} from "./chunk-5FA2WLM7.js";
+} from "./chunk-AQW7HUPV.js";
 
 // src/lib/blender-serve.ts
 import { spawn } from "child_process";

package/dist/{chunk-5FA2WLM7.js → chunk-AQW7HUPV.js}

@@ -1,9 +1,44 @@
+// src/lib/credential-origin.ts
+import { createHash } from "crypto";
+function normalizeApiOrigin(raw) {
+  const url = new URL(raw);
+  const loopback = ["localhost", "127.0.0.1", "[::1]"].includes(url.hostname);
+  if (url.protocol !== "https:" && !(url.protocol === "http:" && loopback) || url.username || url.password || url.search || url.hash || url.pathname.replace(/\/+$/, "") !== "") {
+    throw new Error("Genex API URL must be an HTTPS origin (HTTP is allowed on loopback only), without credentials, a path, query or fragment.");
+  }
+  return url.origin;
+}
+function originKey(apiUrl) {
+  return createHash("sha256").update(normalizeApiOrigin(apiUrl)).digest("hex");
+}
+var destinations = /* @__PURE__ */ new Map();
+function bindToken(token, apiUrl) {
+  const key = createHash("sha256").update(token).digest("hex");
+  const origins = destinations.get(key) ?? /* @__PURE__ */ new Set();
+  origins.add(normalizeApiOrigin(apiUrl));
+  destinations.set(key, origins);
+  return token;
+}
+function assertTokenDestination(token, requestUrl) {
+  const key = createHash("sha256").update(token).digest("hex");
+  const origins = destinations.get(key);
+  const url = new URL(requestUrl);
+  if (url.username || url.password || origins && !origins.has(url.origin)) {
+    throw new Error("Refusing to send a Genex credential to a different API origin. Run genex auth for the intended server.");
+  }
+}
+function assertAuthorizationOrigin(apiUrl, selectedApiUrl) {
+  if (normalizeApiOrigin(apiUrl) !== normalizeApiOrigin(selectedApiUrl)) {
+    throw new Error(`No saved sign-in for ${normalizeApiOrigin(apiUrl)}. Select that server explicitly with genex auth --api-url before retrying.`);
+  }
+}
+
 // src/config.ts
 import fs from "fs";
 import os from "os";
 import path from "path";
 import { fileURLToPath } from "url";
-var RAW_CHANNEL = "latest";
+var RAW_CHANNEL = "dev";
 var CLI_CHANNEL = RAW_CHANNEL === "dev" ? "dev" : "latest";
 var STANDS = {
   prod: { api: "https://api.genex.games", dashboard: "https://genex.games" },
@@ -20,7 +55,6 @@ function getAnimsBase(override) {
 function getAnimsCacheDir() {
   return path.join(getGenexDir(), "cache", "anims");
 }
-var ENV_TOKEN_KEY = "GENEX_TOKEN";
 var AUTH_URL_ENV = "GENEX_AUTH_URL";
 var API_URL_ENV = "GENEX_API_URL";
 var ENV_FILE_ENV = "GENEX_ENV_FILE";
@@ -30,7 +64,7 @@ function getAuthUrl(override) {
 }
 function getApiUrl(override) {
   const raw = override || process.env[API_URL_ENV] || DEFAULT_API_URL;
-  return raw.replace(/\/+$/, "");
+  return normalizeApiOrigin(raw);
 }
 function getGenexDir() {
   return path.join(os.homedir(), ".genex");
@@ -107,13 +141,17 @@ var c = {
 };
 
 export {
+  normalizeApiOrigin,
+  originKey,
+  bindToken,
+  assertTokenDestination,
+  assertAuthorizationOrigin,
   CLI_CHANNEL,
   STANDS,
   DEFAULT_AUTH_URL,
   DEFAULT_API_URL,
   getAnimsBase,
   getAnimsCacheDir,
-  ENV_TOKEN_KEY,
   ENV_FILE_ENV,
   getAuthUrl,
   getApiUrl,

package/dist/{chunk-OJAXYQ5L.js → chunk-MRV3Q3WU.js}

@@ -1,13 +1,16 @@
 import {
   CLI_CHANNEL,
   ENV_FILE_ENV,
-  ENV_TOKEN_KEY,
+  assertTokenDestination,
+  bindToken,
   c,
   getApiUrl,
   getAuthUrl,
   getCliVersion,
-  getGenexEnvPath
-} from "./chunk-5FA2WLM7.js";
+  getGenexEnvPath,
+  normalizeApiOrigin,
+  originKey
+} from "./chunk-AQW7HUPV.js";
 
 // src/lib/terms.ts
 import readline from "readline";
@@ -396,7 +399,9 @@ async function apiFetch(url, init = {}, opts = {}) {
   if (assetsMode && !headers.has(ASSETS_MODE_HEADER)) {
     headers.set(ASSETS_MODE_HEADER, assetsMode);
   }
-  const res = await fetch(url, { ...init, headers });
+  const bearer = headers.get("authorization")?.replace(/^Bearer\s+/i, "");
+  if (bearer) assertTokenDestination(bearer, url);
+  const res = await fetch(url, { ...init, headers, redirect: "error" });
   if (res.status === 403 && !opts.noTermsWait && await isTermsRefusal(res)) {
     const log = stderrLogger;
     reportTermsRefusal(log, await termsRefusalUrl(res));
@@ -490,46 +495,22 @@ async function fetchSignedInEmail(apiUrl, token) {
 }
 
 // src/lib/blender-client.ts
-import fs4 from "fs";
-import path4 from "path";
+import fs5 from "fs";
+import path5 from "path";
 
 // src/lib/store.ts
+import fs4 from "fs/promises";
+import path4 from "path";
+
+// src/lib/secret-file.ts
 import fs3 from "fs/promises";
 import path3 from "path";
+import { randomUUID } from "crypto";
 
 // src/lib/env.ts
 import fs2 from "fs/promises";
 import path2 from "path";
 import { spawn as spawn2 } from "child_process";
-async function writeEnvVar(envPath, key, value) {
-  let content = "";
-  let existed = false;
-  try {
-    content = await fs2.readFile(envPath, "utf8");
-    existed = true;
-  } catch {
-  }
-  const assignment = `${key}=${formatValue(value)}`;
-  const keyPattern = new RegExp(
-    `^(\\s*export\\s+)?${escapeRegExp(key)}=.*$`,
-    "gm"
-  );
-  let next;
-  let mode;
-  if (keyPattern.test(content)) {
-    next = content.replace(keyPattern, assignment);
-    mode = "updated";
-  } else {
-    let prefix = content;
-    if (prefix.length > 0 && !prefix.endsWith("\n")) prefix += "\n";
-    next = prefix + assignment + "\n";
-    mode = existed ? "appended" : "created";
-  }
-  await fs2.mkdir(path2.dirname(envPath), { recursive: true });
-  await fs2.writeFile(envPath, next, { mode: 384 });
-  await restrictFilePermissions(envPath);
-  return { mode, path: envPath };
-}
 async function restrictFilePermissions(filePath) {
   if (process.platform !== "win32") {
     await fs2.chmod(filePath, 384).catch(() => {
@@ -552,26 +533,31 @@ async function restrictFilePermissions(filePath) {
     }
   });
 }
-function formatValue(value) {
-  if (/[\s#"'$`\\]/.test(value)) {
-    return `"${value.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
+
+// src/lib/secret-file.ts
+async function writeSecretFile(file, content, exclusive = false) {
+  await fs3.mkdir(path3.dirname(file), { recursive: true, mode: 448 });
+  const temporary = `${file}.${randomUUID()}.tmp`;
+  try {
+    await fs3.writeFile(temporary, content, { mode: 384, flag: "wx" });
+    await restrictFilePermissions(temporary);
+    if (exclusive) await fs3.link(temporary, file);
+    else await fs3.rename(temporary, file);
+  } finally {
+    await fs3.rm(temporary, { force: true });
   }
-  return value;
-}
-function escapeRegExp(s) {
-  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 
 // src/lib/store.ts
 function getProjectMetadataPath(cwd = process.cwd()) {
-  return path3.join(cwd, ".genex", "project.json");
+  return path4.join(cwd, ".genex", "project.json");
 }
 function getWorkspacePath(cwd = process.cwd()) {
-  return path3.join(cwd, ".genex", "workspace.json");
+  return path4.join(cwd, ".genex", "workspace.json");
 }
 async function readWorkspace(cwd = process.cwd()) {
   try {
-    const raw = await fs3.readFile(getWorkspacePath(cwd), "utf8");
+    const raw = await fs4.readFile(getWorkspacePath(cwd), "utf8");
     return JSON.parse(raw);
   } catch {
     return null;
@@ -579,39 +565,72 @@ async function readWorkspace(cwd = process.cwd()) {
 }
 async function writeWorkspace(meta, cwd = process.cwd()) {
   const file = getWorkspacePath(cwd);
-  await fs3.mkdir(path3.dirname(file), { recursive: true });
-  await fs3.writeFile(file, JSON.stringify(meta, null, 2) + "\n", { mode: 384 });
-  await fs3.chmod(file, 384).catch(() => {
+  await fs4.mkdir(path4.dirname(file), { recursive: true });
+  await fs4.writeFile(file, JSON.stringify(meta, null, 2) + "\n", { mode: 384 });
+  await fs4.chmod(file, 384).catch(() => {
   });
   return { path: file };
 }
-async function writeUserToken(token, envPath) {
-  const { path: written } = await writeEnvVar(getGenexEnvPath(envPath), ENV_TOKEN_KEY, token);
-  return { path: written };
+function credentialPath(envPath, apiUrl = getApiUrl()) {
+  return path4.join(`${getGenexEnvPath(envPath)}.origins`, `${originKey(apiUrl)}.json`);
+}
+async function writeUserToken(token, envPath, apiUrl = getApiUrl()) {
+  const origin = normalizeApiOrigin(apiUrl);
+  const file = credentialPath(envPath, origin);
+  await writeSecretFile(file, JSON.stringify({ apiUrl: origin, token }) + "\n");
+  bindToken(token, origin);
+  return { path: file };
 }
-async function rotateRejectedEnv(envPath) {
-  const file = getGenexEnvPath(envPath);
-  const stamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
-  const aside = `${file}.rejected-${stamp}`;
+async function rotateRejectedEnv(envPath, apiUrl = getApiUrl()) {
+  const file = credentialPath(envPath, apiUrl);
+  const aside = `${file}.rejected-${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}`;
   try {
-    await fs3.rename(file, aside);
+    await fs4.rename(file, aside);
+    await writeSecretFile(file, JSON.stringify({ apiUrl: normalizeApiOrigin(apiUrl), token: null }));
     return aside;
-  } catch {
+  } catch (error) {
+    if (error.code !== "ENOENT") throw error;
+    await writeSecretFile(file, JSON.stringify({ apiUrl: normalizeApiOrigin(apiUrl), token: null }));
     return null;
   }
 }
-async function readUserToken(envPath) {
-  const fromGenex = await readTokenFromFile(getGenexEnvPath(envPath));
-  if (fromGenex) return fromGenex;
-  if (!envPath && !process.env[ENV_FILE_ENV]) {
-    return readTokenFromFile(path3.join(process.cwd(), ".env"));
+async function readUserToken(envPath, apiUrl = getApiUrl()) {
+  const origin = normalizeApiOrigin(apiUrl);
+  const file = credentialPath(envPath, origin);
+  try {
+    const record = JSON.parse(await fs4.readFile(file, "utf8"));
+    return record.apiUrl === origin && typeof record.token === "string" && record.token ? bindToken(record.token, origin) : null;
+  } catch (error) {
+    if (error.code !== "ENOENT") return null;
+  }
+  let legacyFile = getGenexEnvPath(envPath);
+  let token = await readTokenFromFile(legacyFile);
+  if (!token && !envPath && !process.env[ENV_FILE_ENV]) {
+    legacyFile = path4.join(process.cwd(), ".env");
+    token = await readTokenFromFile(legacyFile);
+  }
+  if (!token) return null;
+  const claim = `${legacyFile}.origins/legacy-origin.json`;
+  let claimed;
+  try {
+    claimed = JSON.parse(await fs4.readFile(claim, "utf8"));
+  } catch (error) {
+    if (error.code !== "ENOENT") return null;
+    if (origin !== getApiUrl()) return null;
+    try {
+      await writeSecretFile(claim, JSON.stringify({ apiUrl: origin }), true);
+    } catch (error2) {
+      if (error2.code !== "EEXIST") throw error2;
+    }
+    claimed = JSON.parse(await fs4.readFile(claim, "utf8"));
   }
-  return null;
+  if (claimed.apiUrl !== origin) return null;
+  return bindToken(token, origin);
 }
 async function readTokenFromFile(file) {
   let content;
   try {
-    content = await fs3.readFile(file, "utf8");
+    content = await fs4.readFile(file, "utf8");
   } catch {
     return null;
   }
@@ -627,7 +646,7 @@ function stripQuotes(v) {
 }
 async function readProject(cwd = process.cwd()) {
   try {
-    const raw = await fs3.readFile(getProjectMetadataPath(cwd), "utf8");
+    const raw = await fs4.readFile(getProjectMetadataPath(cwd), "utf8");
     return JSON.parse(raw);
   } catch {
     return null;
@@ -636,11 +655,11 @@ async function readProject(cwd = process.cwd()) {
 var SCRATCH_DIR = ".genex/scratch";
 async function writeProject(meta, cwd = process.cwd()) {
   const file = getProjectMetadataPath(cwd);
-  await fs3.mkdir(path3.dirname(file), { recursive: true });
-  await fs3.mkdir(path3.join(cwd, SCRATCH_DIR), { recursive: true }).catch(() => {
+  await fs4.mkdir(path4.dirname(file), { recursive: true });
+  await fs4.mkdir(path4.join(cwd, SCRATCH_DIR), { recursive: true }).catch(() => {
   });
-  await fs3.writeFile(file, JSON.stringify(meta, null, 2) + "\n", { mode: 384 });
-  await fs3.chmod(file, 384).catch(() => {
+  await fs4.writeFile(file, JSON.stringify(meta, null, 2) + "\n", { mode: 384 });
+  await fs4.chmod(file, 384).catch(() => {
   });
   return { path: file };
 }
@@ -678,10 +697,10 @@ function sheetOf(r) {
 function sheetExt(mime) {
   return mime === "image/webp" ? "webp" : "png";
 }
-var SEAT_FILE = path4.join(".genex", "blender-seat.json");
+var SEAT_FILE = path5.join(".genex", "blender-seat.json");
 function readSeatGrant(cwd = process.cwd()) {
   try {
-    const raw = JSON.parse(fs4.readFileSync(path4.join(cwd, SEAT_FILE), "utf8"));
+    const raw = JSON.parse(fs5.readFileSync(path5.join(cwd, SEAT_FILE), "utf8"));
     if (typeof raw.url !== "string" || typeof raw.token !== "string") return null;
     return {
       url: raw.url,
@@ -694,13 +713,13 @@ function readSeatGrant(cwd = process.cwd()) {
   }
 }
 function writeSeatGrant(grant, cwd = process.cwd()) {
-  const file = path4.join(cwd, SEAT_FILE);
-  fs4.mkdirSync(path4.dirname(file), { recursive: true });
-  fs4.writeFileSync(file, JSON.stringify(grant, null, 2) + "\n", { mode: 384 });
+  const file = path5.join(cwd, SEAT_FILE);
+  fs5.mkdirSync(path5.dirname(file), { recursive: true });
+  fs5.writeFileSync(file, JSON.stringify(grant, null, 2) + "\n", { mode: 384 });
 }
 function deleteSeatGrant(cwd = process.cwd()) {
   try {
-    fs4.unlinkSync(path4.join(cwd, SEAT_FILE));
+    fs5.unlinkSync(path5.join(cwd, SEAT_FILE));
   } catch {
   }
 }
@@ -710,7 +729,7 @@ async function touchCliSeat() {
   if (Date.now() - lastTouchAt < TOUCH_THROTTLE_MS) return;
   lastTouchAt = Date.now();
   try {
-    const token = await readUserToken();
+    const token = await readUserToken(void 0, getApiUrl());
     if (!token) return;
     await apiFetch(`${getApiUrl()}/api/blender/seat/touch`, {
       method: "POST",
@@ -782,7 +801,7 @@ ${json.trace.slice(-4e3)}` : "";
     }
     if (seat?.kind === "cli") void touchCliSeat();
     if (seat?.kind === "hosted" && seat.seatId && route === "/health") {
-      const token = await readUserToken();
+      const token = await readUserToken(void 0, getApiUrl());
       if (!token) throw new Error("Cannot acknowledge Blender readiness: not signed in");
       const claim = await apiFetch(`${getApiUrl()}/api/blender/seat/touch`, {
         method: "POST",
@@ -816,7 +835,7 @@ async function acquireSeat(opts) {
   const held = readSeatGrant(opts.cwd);
   if (held) return { kind: "granted", grant: held };
   if (!hostedBlenderLane()) return { kind: "off" };
-  const token = opts.token !== void 0 ? opts.token : await readUserToken();
+  const token = opts.token !== void 0 ? opts.token : await readUserToken(void 0, getApiUrl());
   if (!token) return { kind: "refused", reason: "not signed in" };
   const doFetch = opts.fetchImpl ?? apiFetch;
   const sleep = opts.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
@@ -857,7 +876,7 @@ async function acquireSeat(opts) {
   }
 }
 async function acquireCliSeat(opts) {
-  const token = opts.token !== void 0 ? opts.token : await readUserToken();
+  const token = opts.token !== void 0 ? opts.token : await readUserToken(void 0, getApiUrl());
   if (!token) return { kind: "refused", reason: "not signed in" };
   const doFetch = opts.fetchImpl ?? apiFetch;
   const sleep = opts.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
@@ -909,7 +928,7 @@ async function acquireCliSeat(opts) {
   }
 }
 async function releaseCliSeat(opts) {
-  const token = opts.token !== void 0 ? opts.token : await readUserToken();
+  const token = opts.token !== void 0 ? opts.token : await readUserToken(void 0, getApiUrl());
   if (!token) return { ok: false, reason: "not signed in" };
   const doFetch = opts.fetchImpl ?? apiFetch;
   const res = await doFetch(`${getApiUrl()}/api/blender/seat`, {
@@ -944,7 +963,7 @@ export {
   printedStructuredError,
   apiFetch,
   fetchSignedInEmail,
-  restrictFilePermissions,
+  writeSecretFile,
   readWorkspace,
   writeWorkspace,
   writeUserToken,