primitive-app 3.1.0 → 3.1.2

package/dist/dev-tools/vite-plugin/index.js

@@ -63,93 +63,127 @@ export const keyboardShortcut = ${JSON.stringify(s)};
 		}
 	};
 }
-var h = ".primitive", g = "config.json", _ = "local.json", v = ".primitive/config.json", y = ".primitive/local.json", b = class extends Error {
+var h = "primitive", g = ".primitive", _ = "config.json", v = "local.json", y = "primitive/config.json", b = ".primitive/local.json";
+function x(e, t) {
+	return `Found ${e} but no ${t}: this project still uses the retired layout under ${g}/, which is never read.`;
+}
+function S(e) {
+	return `No ${y} found in ${e} or any parent directory. Primitive commands run inside a Primitive project: it is where the CLI reads the environment, the app that environment names, and the configuration tree from. Run 'primitive init' to create one.`;
+}
+var C = class extends Error {
 	kind;
 	path;
 	constructor(e, t, n) {
 		super(t), this.name = "PrimitiveEnvError", this.kind = e, this.path = n;
 	}
 };
-function x(e) {
+function w(e) {
+	if (typeof e != "string") return;
+	let t = e.trim();
+	if (!t) return;
+	let n;
+	try {
+		n = new URL(t);
+	} catch {
+		return;
+	}
+	if (!(n.protocol !== "https:" && n.protocol !== "http:") && !(n.protocol === "http:" && n.hostname !== "localhost" && n.hostname !== "127.0.0.1") && !(n.username || n.password) && !(n.pathname !== "/" && n.pathname !== "") && !(n.search || n.hash)) return n.origin;
+}
+function T(e, t) {
+	return `Environment "${e}" in ${t ? `${y} (${t})` : y} has no "appId". Every environment names exactly one app — add "appId": "<app-id>" to that environment in ${y}. Find the app id in the Primitive admin UI, with 'primitive apps list' run from another Primitive project, or as the residual "currentAppId" in .primitive/credentials.json if this environment was ever pointed at an app by the retired per-machine app selection.`;
+}
+function E(e) {
+	if (typeof e == "string") return e.trim() || void 0;
+}
+function D(e) {
 	return e.startsWith("https://") ? "wss://" + e.slice(8) : e.startsWith("http://") ? "ws://" + e.slice(7) : e;
 }
-function S(t = {}) {
+function O(t = {}) {
 	let n = (t.env ?? process.env).PRIMITIVE_PROJECT_CONFIG;
 	if (n) {
 		let t = c(n);
+		if (a(o(t)) === ".primitive") throw new C("stale-layout", x(t, s(o(o(t)), h, _)), t);
 		return e(t) ? t : null;
 	}
 	let r = c(t.cwd ?? process.cwd());
 	for (;;) {
-		let t = s(r, h, g);
+		let t = s(r, h, _);
 		if (e(t)) return t;
-		let n = o(r);
-		if (n === r) return null;
-		r = n;
+		let n = s(r, g, _);
+		if (e(n)) throw new C("stale-layout", x(n, t), n);
+		let i = o(r);
+		if (i === r) return null;
+		r = i;
 	}
 }
-function C(e) {
+function k(e) {
 	let t = o(e);
-	return a(t) === ".primitive" ? o(t) : t;
+	return a(t) === "primitive" ? o(t) : t;
 }
-function w(e) {
-	return s(o(e), _);
+function A(e) {
+	return s(k(e), g, v);
+}
+function j(e) {
+	return e instanceof Error ? e.message : String(e);
 }
-function T(n) {
-	if (!e(n)) throw new b("missing-config", `No ${v} found at ${n}. Run 'primitive init' to create one.`, n);
+function M(n) {
+	if (!e(n)) throw new C("missing-config", S(o(n)), n);
 	let r;
 	try {
 		r = t(n, "utf-8");
 	} catch (e) {
-		throw new b("malformed-config", `Failed to read ${v} (${n}): ${e.message}`, n);
+		throw new C("malformed-config", `Failed to read ${y} (${n}): ${j(e)}`, n);
 	}
 	let i;
 	try {
 		i = JSON.parse(r);
 	} catch (e) {
-		throw new b("malformed-config", `Failed to parse ${v} (${n}): ${e.message}`, n);
+		throw new C("malformed-config", `Failed to parse ${y} (${n}): ${j(e)}`, n);
 	}
-	if (!i || typeof i != "object" || Array.isArray(i)) throw new b("malformed-config", `${v} (${n}) must contain a JSON object at the top level.`, n);
+	if (!i || typeof i != "object" || Array.isArray(i)) throw new C("malformed-config", `${y} (${n}) must contain a JSON object at the top level.`, n);
 	let a = i;
-	if (typeof a.version != "number" || !Number.isInteger(a.version)) throw new b("malformed-config", `${v} (${n}) is missing required integer field "version".`, n);
-	if (a.version !== 1) throw new b("unsupported-version", `${v} (${n}) has version ${a.version}, but this tool understands version 1.`, n);
-	if (!a.environments || typeof a.environments != "object" || Array.isArray(a.environments)) throw new b("malformed-config", `${v} (${n}) is missing required "environments" object.`, n);
-	let o = {};
+	if (typeof a.version != "number" || !Number.isInteger(a.version)) throw new C("malformed-config", `${y} (${n}) is missing required integer field "version".`, n);
+	if (a.version !== 1) throw new C("unsupported-version", `${y} (${n}) has version ${a.version}, but this tool understands version 1.`, n);
+	if (!a.environments || typeof a.environments != "object" || Array.isArray(a.environments)) throw new C("malformed-config", `${y} (${n}) is missing required "environments" object.`, n);
+	let s = {};
 	for (let [e, t] of Object.entries(a.environments)) {
-		if (!t || typeof t != "object" || Array.isArray(t)) throw new b("malformed-config", `Environment "${e}" must be an object in ${v} (${n}).`, n);
+		if (!t || typeof t != "object" || Array.isArray(t)) throw new C("malformed-config", `Environment "${e}" must be an object in ${y} (${n}).`, n);
 		let r = t;
-		if (typeof r.apiUrl != "string" || !r.apiUrl) throw new b("malformed-config", `Environment "${e}" must have a non-empty "apiUrl" string in ${v} (${n}).`, n);
-		o[e] = {
+		if (typeof r.apiUrl != "string" || !r.apiUrl) throw new C("malformed-config", `Environment "${e}" must have a non-empty "apiUrl" string in ${y} (${n}).`, n);
+		let i = E(r.appId);
+		if (!i) throw new C("missing-app-id", T(e, n), n);
+		s[e] = {
 			apiUrl: r.apiUrl.replace(/\/$/, ""),
-			appId: typeof r.appId == "string" ? r.appId : void 0,
+			appId: i,
 			appName: typeof r.appName == "string" ? r.appName : void 0,
+			webUrl: w(r.webUrl),
 			description: typeof r.description == "string" ? r.description : void 0
 		};
 	}
 	return {
 		version: a.version,
 		defaultEnvironment: typeof a.defaultEnvironment == "string" && a.defaultEnvironment ? a.defaultEnvironment : void 0,
-		environments: o
+		environments: s
 	};
 }
-function E(n) {
-	let r = w(n);
+function N(n) {
+	let r = A(n);
 	if (!e(r)) return null;
 	let i = (e) => {
-		throw new b("corrupt-local-state", `${y} (${r}) is unreadable: ${e}. Delete the file or re-run 'primitive env use <name>'.`, r);
+		throw new C("corrupt-local-state", `${b} (${r}) is unreadable: ${e}. Delete the file or re-run 'primitive env use <name>'.`, r);
 	}, a;
 	try {
 		a = JSON.parse(t(r, "utf-8"));
 	} catch (e) {
-		return i(e.message);
+		return i(j(e));
 	}
 	if (!a || typeof a != "object" || Array.isArray(a)) return i("expected a JSON object");
 	let o = a.selectedEnvironment;
 	return o == null || o === "" ? null : typeof o == "string" ? o : i("\"selectedEnvironment\" must be a string");
 }
-function D(e, t) {
-	let n = Object.keys(e.environments), r = n.join(", ") || "(none)", i = t.configPath ? `${v} (${t.configPath})` : v, a = (n, a, o) => {
-		if (!e.environments[n]) throw new b("unknown-environment", `Environment "${n}" is not defined in ${i} (selected ${o}). Available: ${r}`, t.configPath);
+function P(e, t) {
+	let n = Object.keys(e.environments), r = n.join(", ") || "(none)", i = t.configPath ? `${y} (${t.configPath})` : y, a = (n, a, o) => {
+		if (!e.environments[n]) throw new C("unknown-environment", `Environment "${n}" is not defined in ${i} (selected ${o}). Available: ${r}`, t.configPath);
 		return {
 			name: n,
 			source: a
@@ -157,61 +191,60 @@ function D(e, t) {
 	};
 	if (t.explicitEnvName) return a(t.explicitEnvName, "explicit", "explicitly");
 	if (t.envVarName) return a(t.envVarName, "env-var", "via PRIMITIVE_ENV");
-	if (t.localSelection) return a(t.localSelection, "local", `in ${y}`);
+	if (t.localSelection) return a(t.localSelection, "local", `in ${b}`);
 	if (e.defaultEnvironment) return a(e.defaultEnvironment, "default", "as \"defaultEnvironment\"");
 	if (n.length === 1) return {
 		name: n[0],
 		source: "sole"
 	};
-	throw n.length === 0 ? new b("no-selection", `${i} has no environments defined. Run 'primitive env add <name>' or 'primitive init'.`, t.configPath) : new b("no-selection", `No environment selected. Run 'primitive env use <name>', set "defaultEnvironment" in ${i}, or export PRIMITIVE_ENV. Available: ${r}`, t.configPath);
+	throw n.length === 0 ? new C("no-selection", `${i} has no environments defined. Run 'primitive env add <name>' or 'primitive init'.`, t.configPath) : new C("no-selection", `No environment selected. Run 'primitive env use <name>', set "defaultEnvironment" in ${i}, or export PRIMITIVE_ENV. Available: ${r}`, t.configPath);
 }
-function O(e = {}) {
-	let t = e.env ?? process.env, n = e.configPath ?? S({
+function F(e = {}) {
+	let t = e.env ?? process.env, n = e.configPath ?? O({
 		cwd: e.cwd,
 		env: t
 	});
-	if (!n) throw new b("missing-config", `No ${v} found in ${e.cwd ?? process.cwd()} or any parent directory. Run 'primitive init' to create one, or 'primitive env add <name>' to add an environment.`);
-	let r = T(n), { name: i, source: a } = D(r, {
+	if (!n) throw new C("missing-config", S(e.cwd ?? process.cwd()));
+	let r = k(n), i = M(n), { name: a, source: o } = P(i, {
 		explicitEnvName: e.explicitEnvName || null,
 		envVarName: t.PRIMITIVE_ENV || null,
-		localSelection: E(n),
+		localSelection: N(n),
 		configPath: n
-	}), o = r.environments[i];
-	if (e.requireAppId && !o.appId) throw new b("missing-app-id", `Environment "${i}" in ${v} (${n}) has no "appId", which this build needs. Add one with 'primitive env add ${i} --api-url ${o.apiUrl} --app-id <id>' or edit the config.`, n);
+	}), s = i.environments[a];
 	return {
-		name: i,
-		apiUrl: o.apiUrl,
-		wsUrl: x(o.apiUrl),
-		appId: o.appId,
-		appName: o.appName,
-		description: o.description,
-		source: a,
+		name: a,
+		apiUrl: s.apiUrl,
+		wsUrl: D(s.apiUrl),
+		appId: s.appId,
+		appName: s.appName,
+		webUrl: s.webUrl,
+		description: s.description,
+		source: o,
 		configPath: n,
-		localStatePath: w(n),
-		projectRoot: C(n)
+		localStatePath: A(n),
+		projectRoot: r
 	};
 }
 //#endregion
 //#region src/dev-tools/vite-plugin/primitive-env.ts
-var k = [
+var I = [
 	"VITE_APP_ID",
 	"VITE_API_URL",
 	"VITE_WS_URL",
 	"VITE_APP_NAME"
-], A = "VITE_EXPECTED_PRIMITIVE_ENV", j = /* @__PURE__ */ new Map();
-function M(e, t) {
+], L = "VITE_EXPECTED_PRIMITIVE_ENV", R = /* @__PURE__ */ new Map();
+function z(e, t) {
 	let n = process.env[e];
-	n !== void 0 && n !== "" && j.get(e) !== n || (process.env[e] = t, j.set(e, t));
+	n !== void 0 && n !== "" && R.get(e) !== n || (process.env[e] = t, R.set(e, t));
 }
-function N(e = {}) {
-	return O({
+function B(e = {}) {
+	return F({
 		cwd: e.root,
 		env: e.env,
-		explicitEnvName: e.primitiveEnv ?? null,
-		requireAppId: e.requireAppId
+		explicitEnvName: e.primitiveEnv ?? null
 	});
 }
-function P(e, t, n) {
+function V(e, t, n) {
 	let r = (e) => n.includes(e) ? "  (overridden)" : "", i = [
 		`[primitive-env] Primitive environment: ${e.name} (selected: ${e.source})`,
 		`[primitive-env]   apiUrl:  ${t.apiUrl}${r("VITE_API_URL")}`,
@@ -222,12 +255,12 @@ function P(e, t, n) {
 	];
 	return n.length > 0 && i.push(`[primitive-env]   overridden by the environment: ${n.join(", ")}`), i.join("\n");
 }
-function F(e, t) {
+function H(e, t) {
 	let n = e?.envDir;
 	return n === !1 ? null : typeof n == "string" && n !== "" ? c(t, n) : t;
 }
-function I(e, t) {
-	let n = process.env[A];
+function U(e, t) {
+	let n = process.env[L];
 	if (n !== void 0 && n !== "") return {
 		value: n,
 		where: "the process environment"
@@ -239,7 +272,7 @@ function I(e, t) {
 		".env.local",
 		".env"
 	]) {
-		let e = V(s(t, n))[A];
+		let e = J(s(t, n))[L];
 		if (e !== void 0) return {
 			value: e,
 			where: n
@@ -247,48 +280,47 @@ function I(e, t) {
 	}
 	return null;
 }
-function L(e, t, n) {
+function W(e, t, n) {
 	return [
 		`[primitive-env] Wrong pair: vite mode "${e}" is declared to run against Primitive environment "${t.value}", but "${n.name}" resolved.`,
-		`[primitive-env]   expected: ${t.value}  (${A} in ${t.where})`,
+		`[primitive-env]   expected: ${t.value}  (${L} in ${t.where})`,
 		`[primitive-env]   resolved: ${n.name}  (selected: ${n.source})`,
 		`[primitive-env]   config:   ${n.configPath}`,
 		"",
-		`Run the pair you meant — PRIMITIVE_ENV=${t.value} <command> --mode ${e}, or 'primitive env use ${t.value}' — or change/remove ${A} in ${t.where}.`,
+		`Run the pair you meant — PRIMITIVE_ENV=${t.value} <command> --mode ${e}, or 'primitive env use ${t.value}' — or change/remove ${L} in ${t.where}.`,
 		"",
 		`A mode declares this when its .env.${e} carries values coupled to one backend, so continuing would run this environment's identity with another's configuration.`
 	].join("\n");
 }
-function R(e, t, n) {
-	let r = I(e, t);
-	if (r && r.value !== "" && r.value !== n.name) throw Error(L(e, r, n));
+function G(e, t, n) {
+	let r = U(e, t);
+	if (r && r.value !== "" && r.value !== n.name) throw Error(W(e, r, n));
 }
-function z(e = {}) {
+function K(e = {}) {
 	let t = null, n = null, r, i = [], a = !1, o = null;
 	return {
 		name: "primitive-env",
 		enforce: "pre",
 		config(s, c) {
 			a = c?.command === "serve", o = null;
-			let l = s?.root ?? process.cwd(), u = c?.mode ?? "development", d = B(u, l), f = {};
-			for (let e of k) {
-				let t = process.env[e], n = t !== void 0 && j.get(e) !== t ? t : d[e];
+			let l = s?.root ?? process.cwd(), u = c?.mode ?? "development", d = q(u, l), f = {};
+			for (let e of I) {
+				let t = process.env[e], n = t !== void 0 && R.get(e) !== t ? t : d[e];
 				n !== void 0 && n !== "" && (f[e] = n);
 			}
 			let p;
 			try {
-				p = O({
+				p = F({
 					cwd: l,
-					explicitEnvName: e.primitiveEnv ?? null,
-					requireAppId: !f.VITE_APP_ID
+					explicitEnvName: e.primitiveEnv ?? null
 				});
 			} catch (e) {
-				if (e instanceof b && e.kind === "missing-config" && f.VITE_APP_ID && f.VITE_API_URL) return console.warn("[primitive-env] No .primitive/config.json found; using VITE_APP_ID / VITE_API_URL from the environment. Run 'primitive init' to make the project the source of truth."), r = f.VITE_APP_NAME, {};
+				if (e instanceof C && e.kind === "missing-config" && f.VITE_APP_ID && f.VITE_API_URL) return console.warn("[primitive-env] No primitive/config.json found; using VITE_APP_ID / VITE_API_URL from the environment. Run 'primitive init' to make the project the source of truth."), r = f.VITE_APP_NAME, {};
 				throw e;
 			}
 			if (!(f.VITE_APP_ID && f.VITE_API_URL)) {
-				let e = F(s, l);
-				R(u, e, p), o = {
+				let e = H(s, l);
+				G(u, e, p), o = {
 					root: l,
 					mode: u,
 					dir: e
@@ -301,25 +333,25 @@ function z(e = {}) {
 				VITE_WS_URL: p.wsUrl,
 				VITE_APP_NAME: p.appName
 			}, h = { "import.meta.env.VITE_PRIMITIVE_ENV": JSON.stringify(p.name) }, g = [];
-			for (let e of k) {
+			for (let e of I) {
 				if (f[e] !== void 0) {
 					g.push(e);
 					continue;
 				}
 				let t = m[e];
-				t !== void 0 && (h[`import.meta.env.${e}`] = JSON.stringify(t), M(e, t));
+				t !== void 0 && (h[`import.meta.env.${e}`] = JSON.stringify(t), z(e, t));
 			}
-			return M("VITE_PRIMITIVE_ENV", p.name), i = g, n = {
+			return z("VITE_PRIMITIVE_ENV", p.name), i = g, n = {
 				apiUrl: f.VITE_API_URL ?? p.apiUrl,
 				wsUrl: f.VITE_WS_URL ?? p.wsUrl,
 				appId: f.VITE_APP_ID ?? p.appId,
 				appName: r
-			}, e.logResolved !== !1 && console.log(P(p, n, g)), g.length > 0 && console.warn(`[primitive-env] Overridden by an explicit value in .env or the shell: ${g.join(", ")}. Remove it to use .primitive/config.json (deploys reject these outright).`), { define: h };
+			}, e.logResolved !== !1 && console.log(V(p, n, g)), g.length > 0 && console.warn(`[primitive-env] Overridden by an explicit value in .env or the shell: ${g.join(", ")}. Remove it to use primitive/config.json (deploys reject these outright).`), { define: h };
 		},
 		configResolved(e) {
 			if (!o || !t) return;
-			let n = F(e, o.root), r = e?.mode ?? o.mode;
-			n === o.dir && r === o.mode || (R(r, n, t), o = {
+			let n = H(e, o.root), r = e?.mode ?? o.mode;
+			n === o.dir && r === o.mode || (G(r, n, t), o = {
 				root: o.root,
 				mode: r,
 				dir: n
@@ -342,17 +374,17 @@ function z(e = {}) {
 		}
 	};
 }
-function B(e, t) {
+function q(e, t) {
 	let n = [
 		".env",
 		".env.local",
 		`.env.${e}`,
 		`.env.${e}.local`
 	], r = {};
-	for (let e of n) Object.assign(r, V(s(t, e)));
+	for (let e of n) Object.assign(r, J(s(t, e)));
 	return r;
 }
-function V(n) {
+function J(n) {
 	if (!e(n)) return {};
 	let r = {};
 	for (let e of t(n, "utf-8").split(/\r?\n/)) {
@@ -366,4 +398,4 @@ function V(n) {
 	return r;
 }
 //#endregion
-export { b as PrimitiveEnvError, m as primitiveDevTools, z as primitiveEnv, N as resolvePrimitiveEnv };
+export { C as PrimitiveEnvError, m as primitiveDevTools, K as primitiveEnv, B as resolvePrimitiveEnv };

package/dist/dev-tools/vite-plugin/primitive-env.d.ts

@@ -2,7 +2,7 @@
  * `primitiveEnv()` — Primitive environment configuration for a Vite app (#2873).
  *
  * A scaffolded app used to type its backend URL and app ID twice: once in
- * `.primitive/config.json` (which every `primitive` command reads) and again in
+ * `primitive/config.json` (which every `primitive` command reads) and again in
  * `.env` / `.env.production`. This plugin removes the second copy. It resolves
  * the selected Primitive environment at config time and `define`s the keys the
  * app already reads:
@@ -45,8 +45,6 @@ export interface ResolvePrimitiveEnvOptions {
     env?: Record<string, string | undefined>;
     /** An explicit environment name (e.g. from `--primitive-env`). */
     primitiveEnv?: string | null;
-    /** Fail when the resolved environment has no `appId`. */
-    requireAppId?: boolean;
 }
 /**
  * Resolves the Primitive environment for a project. A thin wrapper over the