everything-dev 1.12.2 → 1.12.4

package/dist/ui/runtime.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.mts","names":[],"sources":["../../src/ui/runtime.ts"],"mappings":";;;QAKQ,MAAA;EAAA,UACI,MAAA;IACR,kBAAA,GAAqB,mBAAA;EAAA;AAAA;AAAA,iBAIT,gBAAA,CAAA,GAAoB,mBAAA;AAAA,iBAYpB,gBAAA,CAAiB,aAAA,GAAgB,OAAA,CAAQ,mBAAA;;;;;;;iBAIzC,kBAAA,CAAmB,aAAA,GAAgB,OAAA,CAAQ,mBAAA;AAAA,iBAI3C,gBAAA,CAAiB,QAAA,UAAkB,aAAA,GAAgB,OAAA,CAAQ,mBAAA;AAAA,iBAa3D,yBAAA,CAA0B,SAAA;AAAA,iBAI1B,yBAAA,CAA0B,SAAA,UAAmB,SAAA;AAAA,iBAI7C,YAAA,CAAa,MAAA,GAAS,OAAA,CAAQ,mBAAA;AAAA,iBAK9B,UAAA,CAAW,MAAA,GAAS,OAAA,CAAQ,mBAAA;AAAA,iBAM5B,aAAA,CAAc,MAAA,GAAS,OAAA,CAAQ,mBAAA;AAAA,iBAO/B,UAAA,CAAW,MAAA,GAAS,OAAA,CAAQ,mBAAA;AAAA,iBAK5B,YAAA,CAAa,MAAA,GAAS,OAAA,CAAQ,mBAAA;AAAA,iBAK9B,aAAA,CAAc,MAAA,GAAS,OAAA,CAAQ,mBAAA;AAAA,iBAK/B,WAAA,CAAY,MAAA,GAAS,OAAA,CAAQ,mBAAA"}
+{"version":3,"file":"runtime.d.mts","names":[],"sources":["../../src/ui/runtime.ts"],"mappings":";;;QAIQ,MAAA;EAAA,UACI,MAAA;IACR,kBAAA,GAAqB,mBAAA;EAAA;AAAA;AAAA,iBAIT,gBAAA,CAAA,GAAoB,mBAAA;AAAA,iBAYpB,gBAAA,CAAiB,QAAA,UAAkB,aAAA,GAAgB,OAAA,CAAQ,mBAAA;AAAA,iBAa3D,yBAAA,CAA0B,SAAA;AAAA,iBAI1B,yBAAA,CAA0B,SAAA,UAAmB,SAAA"}

package/dist/ui/runtime.mjs

@@ -1,19 +1,11 @@
-import { getNetworkIdForAccount } from "../network.mjs";
-
 //#region src/ui/runtime.ts
 function getRuntimeConfig() {
 	if (typeof window === "undefined") throw new Error("Runtime config is only available in the browser");
 	if (!window.__RUNTIME_CONFIG__) throw new Error("Missing runtime config");
 	return window.__RUNTIME_CONFIG__;
 }
-function getActiveRuntime(runtimeConfig) {
-	return runtimeConfig?.runtime;
-}
-function getRuntimeBasePath(runtimeConfig) {
-	return getActiveRuntime(runtimeConfig)?.runtimeBasePath || "/";
-}
 function buildRuntimeHref(pathname, runtimeConfig) {
-	const basePath = getRuntimeBasePath(runtimeConfig);
+	const basePath = runtimeConfig?.runtime?.runtimeBasePath ?? "/";
 	if (basePath === "/") return pathname;
 	if (!pathname.startsWith("/")) return `${basePath}/${pathname}`;
 	return pathname === "/" ? basePath : `${basePath}${pathname}`;
@@ -24,33 +16,7 @@ function buildPublishedAccountHref(accountId) {
 function buildPublishedGatewayHref(accountId, gatewayId) {
 	return `${buildPublishedAccountHref(accountId)}/${encodeURIComponent(gatewayId)}`;
 }
-function getAssetsUrl(config) {
-	return (config ?? getRuntimeConfig())?.assetsUrl ?? "";
-}
-function getHostUrl(config) {
-	const cfg = config ?? getRuntimeConfig();
-	if (typeof window === "undefined") return "";
-	return cfg?.hostUrl ?? window.location.origin;
-}
-function getApiBaseUrl(config) {
-	const base = (config ?? getRuntimeConfig())?.rpcBase;
-	if (typeof window === "undefined") return "/api/rpc";
-	return base ? `${window.location.origin}${base}` : `${window.location.origin}/api/rpc`;
-}
-function getAccount(config) {
-	return (config ?? getRuntimeConfig())?.account ?? "every.near";
-}
-function getNetworkId(config) {
-	const cfg = config ?? getRuntimeConfig();
-	return cfg?.networkId ?? getNetworkIdForAccount(cfg?.account ?? "every.near");
-}
-function getRepository(config) {
-	return (config ?? getRuntimeConfig())?.repository;
-}
-function getCspNonce(config) {
-	return (config ?? getRuntimeConfig())?.cspNonce;
-}
 
 //#endregion
-export { buildPublishedAccountHref, buildPublishedGatewayHref, buildRuntimeHref, getAccount, getActiveRuntime, getApiBaseUrl, getAssetsUrl, getCspNonce, getHostUrl, getNetworkId, getRepository, getRuntimeBasePath, getRuntimeConfig };
+export { buildPublishedAccountHref, buildPublishedGatewayHref, buildRuntimeHref, getRuntimeConfig };
 //# sourceMappingURL=runtime.mjs.map

package/dist/ui/runtime.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.mjs","names":[],"sources":["../../src/ui/runtime.ts"],"sourcesContent":["import { getNetworkIdForAccount } from \"../network\";\nimport type { ClientRuntimeConfig } from \"../types\";\n\nexport type { ClientRuntimeInfo } from \"../types\";\n\ndeclare global {\n  interface Window {\n    __RUNTIME_CONFIG__?: ClientRuntimeConfig;\n  }\n}\n\nexport function getRuntimeConfig(): ClientRuntimeConfig {\n  if (typeof window === \"undefined\") {\n    throw new Error(\"Runtime config is only available in the browser\");\n  }\n\n  if (!window.__RUNTIME_CONFIG__) {\n    throw new Error(\"Missing runtime config\");\n  }\n\n  return window.__RUNTIME_CONFIG__;\n}\n\nexport function getActiveRuntime(runtimeConfig?: Partial<ClientRuntimeConfig>) {\n  return runtimeConfig?.runtime;\n}\n\nexport function getRuntimeBasePath(runtimeConfig?: Partial<ClientRuntimeConfig>) {\n  return getActiveRuntime(runtimeConfig)?.runtimeBasePath || \"/\";\n}\n\nexport function buildRuntimeHref(pathname: string, runtimeConfig?: Partial<ClientRuntimeConfig>) {\n  const basePath = getRuntimeBasePath(runtimeConfig);\n  if (basePath === \"/\") {\n    return pathname;\n  }\n\n  if (!pathname.startsWith(\"/\")) {\n    return `${basePath}/${pathname}`;\n  }\n\n  return pathname === \"/\" ? basePath : `${basePath}${pathname}`;\n}\n\nexport function buildPublishedAccountHref(accountId: string) {\n  return `/apps/${encodeURIComponent(accountId)}`;\n}\n\nexport function buildPublishedGatewayHref(accountId: string, gatewayId: string) {\n  return `${buildPublishedAccountHref(accountId)}/${encodeURIComponent(gatewayId)}`;\n}\n\nexport function getAssetsUrl(config?: Partial<ClientRuntimeConfig>): string {\n  const cfg = config ?? getRuntimeConfig();\n  return cfg?.assetsUrl ?? \"\";\n}\n\nexport function getHostUrl(config?: Partial<ClientRuntimeConfig>): string {\n  const cfg = config ?? getRuntimeConfig();\n  if (typeof window === \"undefined\") return \"\";\n  return cfg?.hostUrl ?? window.location.origin;\n}\n\nexport function getApiBaseUrl(config?: Partial<ClientRuntimeConfig>): string {\n  const cfg = config ?? getRuntimeConfig();\n  const base = cfg?.rpcBase;\n  if (typeof window === \"undefined\") return \"/api/rpc\";\n  return base ? `${window.location.origin}${base}` : `${window.location.origin}/api/rpc`;\n}\n\nexport function getAccount(config?: Partial<ClientRuntimeConfig>): string {\n  const cfg = config ?? getRuntimeConfig();\n  return cfg?.account ?? \"every.near\";\n}\n\nexport function getNetworkId(config?: Partial<ClientRuntimeConfig>): \"mainnet\" | \"testnet\" {\n  const cfg = config ?? getRuntimeConfig();\n  return cfg?.networkId ?? getNetworkIdForAccount(cfg?.account ?? \"every.near\");\n}\n\nexport function getRepository(config?: Partial<ClientRuntimeConfig>): string | undefined {\n  const cfg = config ?? getRuntimeConfig();\n  return cfg?.repository;\n}\n\nexport function getCspNonce(config?: Partial<ClientRuntimeConfig>): string | undefined {\n  const cfg = config ?? getRuntimeConfig();\n  return cfg?.cspNonce;\n}\n"],"mappings":";;;AAWA,SAAgB,mBAAwC;AACtD,KAAI,OAAO,WAAW,YACpB,OAAM,IAAI,MAAM,kDAAkD;AAGpE,KAAI,CAAC,OAAO,mBACV,OAAM,IAAI,MAAM,yBAAyB;AAG3C,QAAO,OAAO;;AAGhB,SAAgB,iBAAiB,eAA8C;AAC7E,QAAO,eAAe;;AAGxB,SAAgB,mBAAmB,eAA8C;AAC/E,QAAO,iBAAiB,cAAc,EAAE,mBAAmB;;AAG7D,SAAgB,iBAAiB,UAAkB,eAA8C;CAC/F,MAAM,WAAW,mBAAmB,cAAc;AAClD,KAAI,aAAa,IACf,QAAO;AAGT,KAAI,CAAC,SAAS,WAAW,IAAI,CAC3B,QAAO,GAAG,SAAS,GAAG;AAGxB,QAAO,aAAa,MAAM,WAAW,GAAG,WAAW;;AAGrD,SAAgB,0BAA0B,WAAmB;AAC3D,QAAO,SAAS,mBAAmB,UAAU;;AAG/C,SAAgB,0BAA0B,WAAmB,WAAmB;AAC9E,QAAO,GAAG,0BAA0B,UAAU,CAAC,GAAG,mBAAmB,UAAU;;AAGjF,SAAgB,aAAa,QAA+C;AAE1E,SADY,UAAU,kBAAkB,GAC5B,aAAa;;AAG3B,SAAgB,WAAW,QAA+C;CACxE,MAAM,MAAM,UAAU,kBAAkB;AACxC,KAAI,OAAO,WAAW,YAAa,QAAO;AAC1C,QAAO,KAAK,WAAW,OAAO,SAAS;;AAGzC,SAAgB,cAAc,QAA+C;CAE3E,MAAM,QADM,UAAU,kBAAkB,GACtB;AAClB,KAAI,OAAO,WAAW,YAAa,QAAO;AAC1C,QAAO,OAAO,GAAG,OAAO,SAAS,SAAS,SAAS,GAAG,OAAO,SAAS,OAAO;;AAG/E,SAAgB,WAAW,QAA+C;AAExE,SADY,UAAU,kBAAkB,GAC5B,WAAW;;AAGzB,SAAgB,aAAa,QAA8D;CACzF,MAAM,MAAM,UAAU,kBAAkB;AACxC,QAAO,KAAK,aAAa,uBAAuB,KAAK,WAAW,aAAa;;AAG/E,SAAgB,cAAc,QAA2D;AAEvF,SADY,UAAU,kBAAkB,GAC5B;;AAGd,SAAgB,YAAY,QAA2D;AAErF,SADY,UAAU,kBAAkB,GAC5B"}
+{"version":3,"file":"runtime.mjs","names":[],"sources":["../../src/ui/runtime.ts"],"sourcesContent":["import type { ClientRuntimeConfig } from \"../types\";\n\nexport type { ClientRuntimeInfo } from \"../types\";\n\ndeclare global {\n  interface Window {\n    __RUNTIME_CONFIG__?: ClientRuntimeConfig;\n  }\n}\n\nexport function getRuntimeConfig(): ClientRuntimeConfig {\n  if (typeof window === \"undefined\") {\n    throw new Error(\"Runtime config is only available in the browser\");\n  }\n\n  if (!window.__RUNTIME_CONFIG__) {\n    throw new Error(\"Missing runtime config\");\n  }\n\n  return window.__RUNTIME_CONFIG__;\n}\n\nexport function buildRuntimeHref(pathname: string, runtimeConfig?: Partial<ClientRuntimeConfig>) {\n  const basePath = runtimeConfig?.runtime?.runtimeBasePath ?? \"/\";\n  if (basePath === \"/\") {\n    return pathname;\n  }\n\n  if (!pathname.startsWith(\"/\")) {\n    return `${basePath}/${pathname}`;\n  }\n\n  return pathname === \"/\" ? basePath : `${basePath}${pathname}`;\n}\n\nexport function buildPublishedAccountHref(accountId: string) {\n  return `/apps/${encodeURIComponent(accountId)}`;\n}\n\nexport function buildPublishedGatewayHref(accountId: string, gatewayId: string) {\n  return `${buildPublishedAccountHref(accountId)}/${encodeURIComponent(gatewayId)}`;\n}\n"],"mappings":";AAUA,SAAgB,mBAAwC;AACtD,KAAI,OAAO,WAAW,YACpB,OAAM,IAAI,MAAM,kDAAkD;AAGpE,KAAI,CAAC,OAAO,mBACV,OAAM,IAAI,MAAM,yBAAyB;AAG3C,QAAO,OAAO;;AAGhB,SAAgB,iBAAiB,UAAkB,eAA8C;CAC/F,MAAM,WAAW,eAAe,SAAS,mBAAmB;AAC5D,KAAI,aAAa,IACf,QAAO;AAGT,KAAI,CAAC,SAAS,WAAW,IAAI,CAC3B,QAAO,GAAG,SAAS,GAAG;AAGxB,QAAO,aAAa,MAAM,WAAW,GAAG,WAAW;;AAGrD,SAAgB,0BAA0B,WAAmB;AAC3D,QAAO,SAAS,mBAAmB,UAAU;;AAG/C,SAAgB,0BAA0B,WAAmB,WAAmB;AAC9E,QAAO,GAAG,0BAA0B,UAAU,CAAC,GAAG,mBAAmB,UAAU"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "everything-dev",
-  "version": "1.12.2",
+  "version": "1.12.4",
   "type": "module",
   "publishConfig": {
     "access": "public"

package/src/app.ts

@@ -2,13 +2,10 @@ import { existsSync } from "node:fs";
 import { createConnection } from "node:net";
 import { join } from "node:path";
 import {
+  buildRuntimeConfig as configBuildRuntimeConfig,
   getProjectRoot,
-  isLocalDevelopmentTarget,
-  parsePort,
   resolveLocalDevelopmentPath,
-  resolvePluginRuntimeName,
 } from "./config";
-import { getNetworkIdForAccount } from "./network";
 import type { AppOrchestrator } from "./service-descriptor";
 import type { BosConfig, RuntimeConfig, RuntimePluginConfig } from "./types";
 
@@ -78,116 +75,14 @@ export function buildRuntimeConfig(
     plugins?: Record<string, RuntimePluginConfig>;
   },
 ): RuntimeConfig {
-  const configDir = getProjectRoot();
-  const hostConfig = bosConfig.app.host;
-  const uiConfig = bosConfig.app.ui;
-  const apiConfig = bosConfig.app.api;
-  const authConfig = bosConfig.app.auth;
-
-  function resolveDevelopmentEntry(
-    entry: { development?: string; production?: string },
-    preferredSource: "local" | "remote",
-  ): { source: "local" | "remote"; url: string; localPath?: string; port?: number } {
-    if (preferredSource === "remote") {
-      return { source: "remote", url: entry.production ?? "" };
-    }
-
-    const localPath = resolveLocalDevelopmentPath(entry.development, configDir);
-    if (localPath && existsSync(localPath)) {
-      return { source: "local", url: "", localPath };
-    }
-
-    const devUrl =
-      entry.development && !isLocalDevelopmentTarget(entry.development)
-        ? entry.development.replace(/\/$/, "")
-        : null;
-    if (devUrl) {
-      return { source: "local", url: devUrl, port: parsePort(devUrl) };
-    }
-
-    return { source: "remote", url: entry.production ?? "" };
-  }
-
-  const hostEntry = resolveDevelopmentEntry(hostConfig, options.hostSource ?? "local");
-  const uiEntry = resolveDevelopmentEntry(uiConfig, options.uiSource ?? "local");
-  const apiEntry = resolveDevelopmentEntry(apiConfig, options.apiSource ?? "local");
-  const authEntry = authConfig
-    ? resolveDevelopmentEntry(authConfig, options.authSource ?? "local")
-    : undefined;
-
-  const hostUrl = `http://localhost:${DEFAULT_HOST_PORT}`;
-
-  return {
-    env: options.env ?? "development",
-    account: bosConfig.account,
-    domain: bosConfig.domain,
-    networkId: getNetworkIdForAccount(bosConfig.account),
-    host: {
-      name: "host",
-      url: hostUrl,
-      entry: `${hostUrl}/mf-manifest.json`,
-      localPath: hostEntry.localPath,
-      port: hostEntry.port ?? DEFAULT_HOST_PORT,
-      secrets: hostConfig.secrets,
-      integrity: hostEntry.source === "remote" ? hostConfig.integrity : undefined,
-      source: hostEntry.source,
-      remoteUrl: hostEntry.source === "remote" ? hostEntry.url : undefined,
-    },
-    shared: bosConfig.shared,
-    ui: uiConfig
-      ? {
-          name: uiConfig.name,
-          url: uiEntry.url,
-          entry: uiEntry.url ? `${uiEntry.url}/mf-manifest.json` : "/mf-manifest.json",
-          localPath: uiEntry.localPath,
-          port: uiEntry.port,
-          ssrUrl: uiEntry.source === "remote" ? uiConfig.ssr : undefined,
-          ssrIntegrity: uiEntry.source === "remote" ? uiConfig.ssrIntegrity : undefined,
-          integrity: uiEntry.source === "remote" ? uiConfig.integrity : undefined,
-          source: uiEntry.source,
-        }
-      : {
-          name: "ui",
-          url: "",
-          entry: "/mf-manifest.json",
-          source: uiEntry.source,
-        },
-    api: apiConfig
-      ? {
-          name: apiConfig.name,
-          url: apiEntry.url,
-          entry: apiEntry.url ? `${apiEntry.url}/mf-manifest.json` : "/mf-manifest.json",
-          localPath: apiEntry.localPath,
-          port: apiEntry.port,
-          source: apiEntry.source,
-          proxy: options.proxy ?? apiConfig.proxy,
-          variables: apiConfig.variables,
-          secrets: apiConfig.secrets,
-          integrity: apiEntry.source === "remote" ? apiConfig.integrity : undefined,
-        }
-      : {
-          name: "api",
-          url: "",
-          entry: "/mf-manifest.json",
-          source: apiEntry.source,
-        },
-    auth:
-      authEntry && authConfig
-        ? {
-            name: resolvePluginRuntimeName(undefined, authEntry.localPath, authConfig.name),
-            url: authEntry.url,
-            entry: authEntry.url ? `${authEntry.url}/mf-manifest.json` : "/mf-manifest.json",
-            localPath: authEntry.localPath,
-            port: authEntry.port,
-            source: authEntry.source,
-            proxy: authConfig.proxy,
-            variables: authConfig.variables,
-            secrets: authConfig.secrets,
-            integrity: authEntry.source === "remote" ? authConfig.integrity : undefined,
-          }
-        : undefined,
+  return configBuildRuntimeConfig(bosConfig, getProjectRoot(), options.env ?? "development", {
+    hostSource: options.hostSource,
+    uiSource: options.uiSource,
+    apiSource: options.apiSource,
+    authSource: options.authSource,
+    proxy: options.proxy,
     plugins: options.plugins,
-  };
+  });
 }
 
 function probeTcpOpen(port: number, timeoutMs = 250): Promise<boolean> {

package/src/cli/framework-version.ts

@@ -0,0 +1,61 @@
+import { existsSync, readFileSync } from "node:fs";
+import { join } from "node:path";
+
+function stripVersionPrefix(version: string): string {
+  return version.replace(/^[\^~>=]+/, "");
+}
+
+export function readRootCatalogVersion(
+  projectDir: string,
+  packageName: string,
+): string | undefined {
+  const pkgPath = join(projectDir, "package.json");
+  if (!existsSync(pkgPath)) return undefined;
+  const pkg = JSON.parse(readFileSync(pkgPath, "utf-8")) as {
+    workspaces?: { catalog?: Record<string, string> };
+  };
+  const version = pkg.workspaces?.catalog?.[packageName];
+  return version ? stripVersionPrefix(version) : undefined;
+}
+
+export function readNodeModulesVersion(
+  projectDir: string,
+  packageName: string,
+): string | undefined {
+  const pkgPath = join(projectDir, "node_modules", packageName, "package.json");
+  if (!existsSync(pkgPath)) return undefined;
+  const pkg = JSON.parse(readFileSync(pkgPath, "utf-8")) as { version?: string };
+  return pkg.version;
+}
+
+export function readInstalledFrameworkVersion(
+  projectDir: string,
+  packageName: string,
+): string | undefined {
+  const pkgPath = join(projectDir, "package.json");
+  if (!existsSync(pkgPath)) return undefined;
+  const pkg = JSON.parse(readFileSync(pkgPath, "utf-8")) as Record<string, unknown>;
+  const deps = (pkg.dependencies ?? {}) as Record<string, string>;
+  const devDeps = (pkg.devDependencies ?? {}) as Record<string, string>;
+  const version = deps[packageName] || devDeps[packageName];
+
+  if (!version) {
+    return (
+      readRootCatalogVersion(projectDir, packageName) ??
+      readNodeModulesVersion(projectDir, packageName)
+    );
+  }
+
+  if (version.startsWith("catalog:")) {
+    return (
+      readRootCatalogVersion(projectDir, packageName) ??
+      readNodeModulesVersion(projectDir, packageName)
+    );
+  }
+
+  if (version.startsWith("workspace:") || version.startsWith("file:")) {
+    return readNodeModulesVersion(projectDir, packageName);
+  }
+
+  return stripVersionPrefix(version);
+}

package/src/cli/init.ts

@@ -404,14 +404,25 @@ export async function personalizeConfig(
       delete deps["everything-dev"];
     }
 
+    if (!pkg.workspaces || typeof pkg.workspaces !== "object") {
+      pkg.workspaces = { packages: [], catalog: {} };
+    }
+    const workspaces = pkg.workspaces as { packages?: string[]; catalog?: Record<string, string> };
+    if (!workspaces.catalog || typeof workspaces.catalog !== "object") {
+      workspaces.catalog = {};
+    }
+
     if (!pkg.dependencies) pkg.dependencies = {};
     const deps = pkg.dependencies as Record<string, string>;
     const spec = opts.workspaceOpts?.sourceDir
       ? loadManifestNormalizationSpec(opts.workspaceOpts.sourceDir)
       : null;
-    if (!deps["everything-dev"] && spec)
-      deps["everything-dev"] = spec.rootCatalog["everything-dev"];
-    if (!deps["every-plugin"] && spec) deps["every-plugin"] = spec.rootCatalog["every-plugin"];
+    if (spec) {
+      workspaces.catalog["everything-dev"] = spec.rootCatalog["everything-dev"];
+      workspaces.catalog["every-plugin"] = spec.rootCatalog["every-plugin"];
+    }
+    if (!deps["everything-dev"] && spec) deps["everything-dev"] = "catalog:";
+    if (!deps["every-plugin"] && spec) deps["every-plugin"] = "catalog:";
 
     writeFileSync(pkgPath, `${JSON.stringify(pkg, null, 2)}\n`);
   }
@@ -500,7 +511,8 @@ async function resolveWorkspaceRefs(
   await normalizePackageManifestsInTree({
     sourceRootDir: options?.sourceDir ?? destination,
     targetDir: destination,
-    resolveCatalogRefs: true,
+    resolveCatalogRefs: false,
+    preserveCatalogRefs: true,
     removeWorkspaceDeps: ["host"],
   });
 

package/src/cli/status.ts

@@ -2,6 +2,7 @@ import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
 import type { StatusResult } from "../contract";
 import { fetchBosConfigFromFastKv } from "../fastkv";
+import { readInstalledFrameworkVersion } from "./framework-version";
 import { readSnapshot } from "./snapshot";
 
 const FRAMEWORK_PACKAGES = ["everything-dev", "every-plugin"];
@@ -21,21 +22,7 @@ async function fetchLatestNpmVersion(packageName: string): Promise<string | null
 }
 
 function readInstalledVersion(projectDir: string, packageName: string): string | undefined {
-  const pkgPath = join(projectDir, "package.json");
-  if (!existsSync(pkgPath)) return undefined;
-  const pkg = JSON.parse(readFileSync(pkgPath, "utf-8")) as Record<string, unknown>;
-  const deps = (pkg.dependencies ?? {}) as Record<string, string>;
-  const devDeps = (pkg.devDependencies ?? {}) as Record<string, string>;
-  const version = deps[packageName] || devDeps[packageName];
-  if (!version) return undefined;
-  if (
-    version.startsWith("workspace:") ||
-    version.startsWith("catalog:") ||
-    version.startsWith("file:")
-  ) {
-    return undefined;
-  }
-  return version.replace(/^[\^~>=]+/, "");
+  return readInstalledFrameworkVersion(projectDir, packageName);
 }
 
 function checkEnvFile(projectDir: string): "found" | "missing" | "example-only" {

package/src/cli/sync.ts

@@ -19,6 +19,37 @@ import {
 } from "./init";
 import { readSnapshot, writeSnapshot } from "./snapshot";
 
+const FRAMEWORK_OWNED_SYNC_FILES = new Set([
+  ".gitignore",
+  "biome.json",
+  "bos.config.json",
+  "package.json",
+  ".github/workflows/release-sync.yml",
+  "ui/package.json",
+  "ui/postcss.config.mjs",
+  "ui/rsbuild.config.ts",
+  "ui/tsconfig.json",
+  "ui/src/app.ts",
+  "ui/src/hydrate.tsx",
+  "ui/src/lib/api.ts",
+  "ui/src/lib/auth.ts",
+  "ui/src/router.server.tsx",
+  "ui/src/router.tsx",
+  "ui/src/routes/__root.tsx",
+  "api/package.json",
+  "api/plugin.dev.ts",
+  "api/rspack.config.js",
+  "api/tsconfig.contract.json",
+  "api/tsconfig.json",
+  "api/src/lib/auth.ts",
+]);
+
+type PackageJson = Record<string, unknown>;
+
+export function isFrameworkOwnedSyncFile(filePath: string): boolean {
+  return FRAMEWORK_OWNED_SYNC_FILES.has(filePath);
+}
+
 function readExcludeFile(filePath: string): string[] {
   if (!existsSync(filePath)) return [];
   const content = readFileSync(filePath, "utf-8");
@@ -152,11 +183,52 @@ function mergeBosConfig(
   return merged;
 }
 
-function mergePackageJson(
-  local: Record<string, unknown>,
-  template: Record<string, unknown>,
-): Record<string, unknown> {
-  const merged = { ...template };
+function mergeStringMaps(
+  local: Record<string, string> | undefined,
+  template: Record<string, string> | undefined,
+): Record<string, string> | undefined {
+  if (!local && !template) return undefined;
+
+  const merged: Record<string, string> = { ...(local ?? {}) };
+  for (const [name, value] of Object.entries(template ?? {})) {
+    merged[name] = value;
+  }
+
+  return Object.keys(merged).length > 0 ? merged : undefined;
+}
+
+function mergeWorkspacePackages(local: unknown, template: unknown): string[] | undefined {
+  const localPackages = Array.isArray(local) ? local : [];
+  const templatePackages = Array.isArray(template) ? template : [];
+  if (localPackages.length === 0 && templatePackages.length === 0) return undefined;
+
+  const ordered = new Set<string>();
+  for (const entry of templatePackages) {
+    if (typeof entry === "string" && entry.length > 0) ordered.add(entry);
+  }
+  for (const entry of localPackages) {
+    if (typeof entry === "string" && entry.length > 0) ordered.add(entry);
+  }
+
+  return ordered.size > 0 ? [...ordered] : undefined;
+}
+
+export function mergePackageJson(
+  filePath: string,
+  local: PackageJson,
+  template: PackageJson,
+): PackageJson {
+  const merged: PackageJson = { ...local, ...template };
+
+  if (filePath === "package.json") {
+    for (const key of ["name", "private", "version"] as const) {
+      if (key in local) {
+        merged[key] = local[key];
+      }
+    }
+  } else if ("version" in local) {
+    merged.version = local.version;
+  }
 
   for (const depField of [
     "dependencies",
@@ -167,28 +239,69 @@ function mergePackageJson(
     const localDeps = local[depField] as Record<string, string> | undefined;
     const templateDeps = template[depField] as Record<string, string> | undefined;
 
-    if (!localDeps && !templateDeps) continue;
-
-    const mergedDeps: Record<string, string> = { ...(templateDeps ?? {}) };
-
-    if (localDeps) {
-      for (const [name, version] of Object.entries(localDeps)) {
-        if (!(name in mergedDeps)) {
-          mergedDeps[name] = version;
-        }
-      }
+    const mergedDeps = mergeStringMaps(localDeps, templateDeps);
+    if (mergedDeps) {
+      merged[depField] = mergedDeps;
+    } else {
+      delete merged[depField];
     }
+  }
 
-    if (Object.keys(mergedDeps).length > 0) {
-      merged[depField] = mergedDeps;
+  if (
+    (local.scripts && typeof local.scripts === "object") ||
+    (template.scripts && typeof template.scripts === "object")
+  ) {
+    const mergedScripts = mergeStringMaps(
+      local.scripts as Record<string, string> | undefined,
+      template.scripts as Record<string, string> | undefined,
+    );
+    if (mergedScripts) {
+      merged.scripts = mergedScripts;
+    } else {
+      delete merged.scripts;
     }
   }
 
-  if (local.scripts && typeof local.scripts === "object") {
-    merged.scripts = {
-      ...((template.scripts as Record<string, string>) ?? {}),
-      ...(local.scripts as Record<string, string>),
+  if (
+    (local.workspaces && typeof local.workspaces === "object") ||
+    (template.workspaces && typeof template.workspaces === "object")
+  ) {
+    const localWorkspaces = (local.workspaces ?? {}) as {
+      packages?: string[];
+      catalog?: Record<string, string>;
+    };
+    const templateWorkspaces = (template.workspaces ?? {}) as {
+      packages?: string[];
+      catalog?: Record<string, string>;
     };
+
+    const mergedWorkspaces: { packages?: string[]; catalog?: Record<string, string> } = {
+      ...localWorkspaces,
+      ...templateWorkspaces,
+    };
+
+    const mergedPackages = mergeWorkspacePackages(
+      localWorkspaces.packages,
+      templateWorkspaces.packages,
+    );
+    if (mergedPackages) {
+      mergedWorkspaces.packages = mergedPackages;
+    } else {
+      delete mergedWorkspaces.packages;
+    }
+
+    const mergedCatalog = mergeStringMaps(localWorkspaces.catalog, templateWorkspaces.catalog);
+    if (mergedCatalog) {
+      mergedWorkspaces.catalog = mergedCatalog;
+    } else {
+      delete mergedWorkspaces.catalog;
+    }
+
+    if (Object.keys(mergedWorkspaces).length > 0) {
+      merged.workspaces = mergedWorkspaces;
+    } else {
+      delete merged.workspaces;
+    }
   }
 
   return merged;
@@ -228,7 +341,7 @@ function writeSyncedFile(sourceDir: string, projectDir: string, filePath: string
     if (localContent) {
       const local = JSON.parse(localContent) as Record<string, unknown>;
       const template = JSON.parse(templateContent) as Record<string, unknown>;
-      const merged = mergePackageJson(local, template);
+      const merged = mergePackageJson(destPath, local, template);
       writeFileSync(dest, `${JSON.stringify(merged, null, 2)}\n`);
       return;
     }
@@ -355,7 +468,8 @@ export async function syncTemplate(projectDir: string, options: SyncOptions): Pr
 
     for (const filePath of filteredFiles) {
       const destPath = toDestPath(filePath);
-      if (isExcluded(destPath, excludePatterns)) continue;
+      const frameworkOwned = isFrameworkOwnedSyncFile(destPath);
+      if (isExcluded(destPath, excludePatterns) && !frameworkOwned) continue;
 
       const localHash = computeLocalHash(projectDir, destPath);
       const sourceContent = readFileSync(join(sourceDir, filePath));
@@ -368,6 +482,11 @@ export async function syncTemplate(projectDir: string, options: SyncOptions): Pr
 
       if (localHash === sourceHash) continue;
 
+      if (frameworkOwned) {
+        updated.push(destPath);
+        continue;
+      }
+
       const snapshotHash = snapshot?.files[destPath];
 
       if (snapshotHash === undefined) {
@@ -395,7 +514,9 @@ export async function syncTemplate(projectDir: string, options: SyncOptions): Pr
       };
     }
 
-    const filesToWrite = [...updated, ...added].filter((f) => !isExcluded(f, excludePatterns));
+    const filesToWrite = [...updated, ...added].filter(
+      (f) => isFrameworkOwnedSyncFile(f) || !isExcluded(f, excludePatterns),
+    );
 
     const destToSource = new Map<string, string>();
     for (const filePath of filteredFiles) {