everything-dev 1.16.0 → 1.16.1

package/src/config.ts

@@ -1,6 +1,6 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, isAbsolute, join, resolve } from "node:path";
-import { fetchBosConfigFromFastKv, fetchPluginFromRegistry, parsePluginBosUrl } from "./fastkv";
+import { fetchBosConfigFromFastKv } from "./fastkv";
 import {
   type BosEnv,
   isPlainObject,
@@ -546,31 +546,6 @@ async function resolveRemotePluginRuntimeName(baseUrl: string, fallback: string)
   }
 }
 
-interface ResolvedBosPlugin {
-  url: string;
-  integrity?: string;
-}
-
-async function resolveBosPluginUrl(bosUrl: string): Promise<ResolvedBosPlugin | null> {
-  const parsed = parsePluginBosUrl(bosUrl);
-  if (!parsed) return null;
-
-  try {
-    const entry = await fetchPluginFromRegistry(parsed.accountId, parsed.pluginName);
-    if (!entry) return null;
-
-    const cdnUrl = entry.metadata.cdnUrl;
-    if (!cdnUrl) return null;
-
-    return {
-      url: cdnUrl,
-      integrity: entry.metadata.integrity ?? undefined,
-    };
-  } catch {
-    return null;
-  }
-}
-
 async function buildRuntimePluginConfig(
   pluginId: string,
   config: BosConfigInput,
@@ -586,16 +561,12 @@ async function buildRuntimePluginConfig(
   const sourceProduction = typeof source.production === "string" ? source.production : undefined;
   const proxy = typeof apiConfig.proxy === "string" ? apiConfig.proxy : undefined;
   const development = apiDevelopment ?? sourceDevelopment;
-  let production = apiProduction ?? sourceProduction;
+  const production = apiProduction ?? sourceProduction;
 
   if (production?.startsWith("bos://")) {
-    const resolved = await resolveBosPluginUrl(production);
-    if (resolved) {
-      production = resolved.url;
-      if (resolved.integrity && env === "production") {
-        source.integrity = resolved.integrity;
-      }
-    }
+    throw new Error(
+      `Plugin "${pluginId}" has unsupported production target "${production}". Use extends: "bos://account/domain" for plugin configs or a CDN URL for production.`,
+    );
   }
 
   const runtimeTarget =

package/src/contract.meta.ts

@@ -44,7 +44,7 @@ export const cliCommandMeta = {
     fields: {
       source: {
         positional: true,
-        description: "Plugin source (local:path, bos://account/plugins/name, or URL)",
+        description: "Plugin source (local:path, bos://account/domain, or URL)",
       },
       as: { description: "Plugin alias" },
       production: { description: "Production URL override" },
@@ -113,7 +113,7 @@ export const cliCommandMeta = {
   upgrade: {
     commandPath: ["upgrade"],
     summary: "Upgrade framework packages and sync template files",
-    interactive: false,
+    interactive: true,
     fields: {
       dryRun: { description: "Preview changes without writing" },
       force: { description: "Overwrite user-modified files during sync" },

package/src/contract.ts

@@ -201,6 +201,8 @@ export const UpgradeResultSchema = z.object({
   ),
   sync: SyncResultSchema.optional(),
   migrated: z.array(z.string()).optional(),
+  availablePlugins: z.array(z.string()).optional(),
+  selectedPlugins: z.array(z.string()).optional(),
   changelogUrl: z.string().optional(),
   error: z.string().optional(),
 });

package/src/fastkv.ts

@@ -139,78 +139,6 @@ export interface PluginManifest {
   additionalExports?: Array<{ path: string; exports: string[]; sha256: string }>;
 }
 
-export interface PluginMetadata {
-  title: string | null;
-  description: string | null;
-  repoUrl: string | null;
-  version: string;
-  publishedAt: string;
-  cdnUrl: string;
-  integrity: string | null;
-}
-
-export interface PluginRegistryEntry {
-  manifest: PluginManifest;
-  metadata: PluginMetadata;
-}
-
-export function parsePluginBosUrl(
-  source: string,
-): { accountId: string; pluginName: string } | null {
-  if (!source.startsWith("bos://")) return null;
-  const match = source.match(/^bos:\/\/([^/]+)\/plugins\/([^/]+)$/);
-  if (!match?.[1] || !match[2]) return null;
-  return { accountId: match[1], pluginName: match[2] };
-}
-
-async function fetchKvValue(accountId: string, key: string): Promise<unknown | null> {
-  const payload = await fetchJson<FastKvListResponse>(
-    `${getFastKvBaseUrlForAccount(accountId)}/v0/latest/${encodeURIComponent(getRegistryNamespaceForAccount(accountId))}/${encodeURIComponent(accountId)}`,
-    {
-      method: "POST",
-      body: JSON.stringify({ key, limit: 1 }),
-    },
-  );
-  const value = payload?.entries?.find(Boolean)?.value;
-  if (value == null) return null;
-  if (typeof value === "string") {
-    try {
-      return JSON.parse(value);
-    } catch {
-      return null;
-    }
-  }
-  return value;
-}
-
-export async function fetchPluginFromRegistry(
-  accountId: string,
-  pluginName: string,
-): Promise<PluginRegistryEntry | null> {
-  const manifestKey = `plugins/${accountId}/${pluginName}/manifest.json`;
-  const metadataKey = `plugins/${accountId}/${pluginName}/metadata`;
-
-  const [rawManifest, rawMetadata] = await Promise.all([
-    fetchKvValue(accountId, manifestKey),
-    fetchKvValue(accountId, metadataKey),
-  ]);
-
-  if (!rawManifest || typeof rawManifest !== "object") return null;
-
-  return {
-    manifest: rawManifest as PluginManifest,
-    metadata: (rawMetadata ?? {
-      title: null,
-      description: null,
-      repoUrl: null,
-      version: "",
-      publishedAt: "",
-      cdnUrl: "",
-      integrity: null,
-    }) as PluginMetadata,
-  };
-}
-
 export async function fetchRemotePluginManifest(cdnUrl: string): Promise<PluginManifest | null> {
   try {
     const baseUrl = cdnUrl.replace(/\/$/, "");

package/src/merge.ts

@@ -95,28 +95,15 @@ export function mergeBosConfigWithExtends(
   parent: BosConfigInput,
   child: BosConfigInput,
 ): BosConfigInput {
-  const merged = bosConfigMerger(child, parent) as BosConfigInput;
-
-  if (isPlainObject(parent.plugins) && isPlainObject(child.plugins)) {
-    const plugins: Record<string, unknown> = { ...parent.plugins };
-    for (const [key, rawValue] of Object.entries(child.plugins)) {
-      const value = rawValue as unknown;
-      if (value === null || value === false) {
-        delete plugins[key];
-      } else if (isPlainObject(plugins[key]) && isPlainObject(value)) {
-        plugins[key] = bosConfigMerger(
-          value as Record<string, unknown>,
-          plugins[key] as Record<string, unknown>,
-        );
-      } else {
-        plugins[key] = value;
-      }
-    }
-    (merged as Record<string, unknown>).plugins = plugins;
-  } else if (child.plugins !== undefined) {
+  const { plugins: _ignoredParentPlugins, ...parentWithoutPlugins } = parent;
+  const merged = bosConfigMerger(child, parentWithoutPlugins) as BosConfigInput;
+
+  if (child.plugins !== undefined && isPlainObject(child.plugins)) {
     (merged as Record<string, unknown>).plugins = cleanNullSentinels(
       child.plugins as Record<string, unknown>,
     );
+  } else {
+    delete (merged as Record<string, unknown>).plugins;
   }
 
   const mergedRecord = merged as Record<string, unknown>;

package/src/plugin.ts

@@ -711,32 +711,19 @@ export default createPlugin({
           pluginDomain = `${input.key}.${deps.bosConfig.domain ?? "everything.dev"}`;
         }
 
-        if (manifest && version) {
-          try {
-            const registryEntries: Record<string, string> = {
-              [`plugins/${account}/${input.key}/manifest.json`]: JSON.stringify(manifest),
-              [`plugins/${account}/${input.key}/metadata`]: JSON.stringify({
-                title: null,
-                description: null,
-                repoUrl: deps.bosConfig.repository ?? null,
-                version,
-                publishedAt: new Date().toISOString(),
-                cdnUrl: publishedUrl,
-                integrity,
-              }),
-              [`plugins/${account}/${input.key}/versions/${version}/manifest.json`]:
-                JSON.stringify(manifest),
-            };
+        try {
+          const registryEntries: Record<string, string> = {};
 
-            if (existsSync(pluginConfigPath)) {
-              try {
-                const publishedPluginConfig = JSON.parse(readFileSync(pluginConfigPath, "utf-8"));
-                delete publishedPluginConfig.development;
-                registryEntries[`apps/${account}/${pluginDomain}/bos.config.json`] =
-                  JSON.stringify(publishedPluginConfig);
-              } catch {}
-            }
+          if (existsSync(pluginConfigPath)) {
+            try {
+              const publishedPluginConfig = JSON.parse(readFileSync(pluginConfigPath, "utf-8"));
+              delete publishedPluginConfig.development;
+              registryEntries[`apps/${account}/${pluginDomain}/bos.config.json`] =
+                JSON.stringify(publishedPluginConfig);
+            } catch {}
+          }
 
+          if (Object.keys(registryEntries).length > 0) {
             const payload = JSON.stringify(registryEntries);
             const argsBase64 = Buffer.from(payload).toString("base64");
             const privateKey = process.env.NEAR_PRIVATE_KEY || process.env.BOS_NEAR_PRIVATE_KEY;
@@ -763,11 +750,11 @@ export default createPlugin({
                 );
               }
             }
-          } catch (registryError) {
-            console.warn(
-              `[publish] Plugin registry write skipped: ${registryError instanceof Error ? registryError.message : registryError}`,
-            );
           }
+        } catch (registryError) {
+          console.warn(
+            `[publish] Plugin registry write skipped: ${registryError instanceof Error ? registryError.message : registryError}`,
+          );
         }
 
         await generateCodeArtifacts(deps.configDir, deps.bosConfig);