everything-dev 0.0.18 → 0.0.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "everything-dev",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "type": "module",
   "main": "src/index.ts",
   "exports": {

package/src/cli.ts

@@ -1,4 +1,5 @@
 #!/usr/bin/env bun
+import { spinner } from "@clack/prompts";
 import { program } from "commander";
 import { createPluginRuntime } from "every-plugin";
 import { getConfigDir, getConfigPath, getPackages, getTitle, loadConfig, type BosConfig } from "./config";
@@ -747,25 +748,31 @@ Zephyr Configuration:
     .option("--gateway <gateway>", "Gateway domain to sync from (default: everything.dev)")
     .option("--network <network>", "Network: mainnet | testnet", "mainnet")
     .option("--force", "Force sync even if versions match")
-    .action(async (options: { account?: string; gateway?: string; network?: string; force?: boolean }) => {
+    .option("--files", "Also sync template files (tsconfig, etc.)")
+    .action(async (options: { account?: string; gateway?: string; network?: string; force?: boolean; files?: boolean }) => {
       console.log();
       const source = options.account || options.gateway 
         ? `${options.account || "every.near"}/${options.gateway || "everything.dev"}`
         : "every.near/everything.dev";
-      console.log(`  ${icons.pkg} Syncing from ${colors.cyan(source)}...`);
+
+      const s = spinner();
+      s.start(`Syncing from ${source}...`);
 
       const result = await client.sync({
         account: options.account,
         gateway: options.gateway,
         network: (options.network as "mainnet" | "testnet") || "mainnet",
         force: options.force || false,
+        files: options.files || false,
       });
 
       if (result.status === "error") {
-        console.error(colors.error(`${icons.err} Sync failed: ${result.error || "Unknown error"}`));
+        s.stop(colors.error(`${icons.err} Sync failed: ${result.error || "Unknown error"}`));
         process.exit(1);
       }
 
+      s.stop(colors.green(`${icons.ok} Synced from ${source}`));
+
       console.log();
       console.log(colors.cyan(frames.top(52)));
       console.log(`  ${icons.ok} ${gradients.cyber("SYNCED")}`);
@@ -782,6 +789,18 @@ Zephyr Configuration:
       if (result.packagesUpdated.length > 0) {
         console.log(colors.green(`  ${icons.ok} Updated packages: ${result.packagesUpdated.join(", ")}`));
       }
+
+      if (result.filesSynced && result.filesSynced.length > 0) {
+        const totalFiles = result.filesSynced.reduce((sum, pkg) => sum + pkg.files.length, 0);
+        console.log(colors.green(`  ${icons.ok} Synced ${totalFiles} files`));
+        for (const pkg of result.filesSynced) {
+          console.log(colors.dim(`    ${pkg.package}: ${pkg.files.join(", ")}`));
+        }
+      }
+
+      if (!result.catalogUpdated && result.packagesUpdated.length === 0 && (!result.filesSynced || result.filesSynced.length === 0)) {
+        console.log(colors.dim(`  ${icons.ok} Already up to date`));
+      }
       
       console.log();
       console.log(colors.dim("  Run 'bun install' to update lockfile"));

package/src/lib/sync.ts

@@ -1,7 +1,7 @@
-import { mkdtemp, rm, cp, mkdir } from "fs/promises";
-import { tmpdir } from "os";
-import { join, dirname } from "path";
 import { execa } from "execa";
+import { cp, mkdir, mkdtemp, rm } from "fs/promises";
+import { tmpdir } from "os";
+import { dirname, join } from "path";
 import type { BosConfig } from "../config";
 
 export interface FileSyncResult {
@@ -24,6 +24,10 @@ export async function syncFiles(options: FileSyncOptions): Promise<FileSyncResul
   const results: FileSyncResult[] = [];
 
   for (const pkg of packages) {
+    const pkgDir = `${configDir}/${pkg}`;
+    const pkgDirExists = await Bun.file(`${pkgDir}/package.json`).exists();
+    if (!pkgDirExists) continue;
+
     const appConfig = bosConfig.app[pkg] as {
       template?: string;
       files?: string[];
@@ -44,7 +48,6 @@ export async function syncFiles(options: FileSyncOptions): Promise<FileSyncResul
       const filesSynced: string[] = [];
       const depsAdded: string[] = [];
       const depsUpdated: string[] = [];
-      const pkgDir = `${configDir}/${pkg}`;
 
       for (const file of appConfig.files) {
         const srcPath = join(tempDir, file);
@@ -53,7 +56,7 @@ export async function syncFiles(options: FileSyncOptions): Promise<FileSyncResul
         try {
           const destDir = dirname(destPath);
           await mkdir(destDir, { recursive: true });
-          await cp(srcPath, destPath, { force, recursive: true });
+          await cp(srcPath, destPath, { force: true, recursive: true });
           filesSynced.push(file);
         } catch {
         }

package/src/plugin.ts

@@ -1247,7 +1247,7 @@ export default createPlugin({
         const graph = new Graph();
         const configPath = `${account}/bos/gateways/${gateway}/bos.config.json`;
 
-        let remoteConfig: { cli?: { version?: string }; app?: { host?: { production?: string } } } | null = null;
+        let remoteConfig: BosConfigType | null = null;
 
         const data = await graph.get({ keys: [configPath] });
         if (data) {
@@ -1262,7 +1262,7 @@ export default createPlugin({
             }
           }
           if (typeof current === "string") {
-            remoteConfig = JSON.parse(current);
+            remoteConfig = JSON.parse(current) as BosConfigType;
           }
         }
 
@@ -1291,13 +1291,50 @@ export default createPlugin({
           };
         }
 
+        const mergeAppConfig = (localApp: Record<string, unknown>, remoteApp: Record<string, unknown>): Record<string, unknown> => {
+          const merged: Record<string, unknown> = {};
+          
+          for (const key of Object.keys(remoteApp)) {
+            const local = localApp[key] as Record<string, unknown> | undefined;
+            const remote = remoteApp[key] as Record<string, unknown>;
+            
+            if (!local) {
+              merged[key] = remote;
+              continue;
+            }
+
+            merged[key] = {
+              ...remote,
+              development: local.development,
+              secrets: [...new Set([
+                ...((remote.secrets as string[]) || []),
+                ...((local.secrets as string[]) || []),
+              ])],
+              variables: {
+                ...((remote.variables as Record<string, unknown>) || {}),
+                ...((local.variables as Record<string, unknown>) || {}),
+              },
+            };
+          }
+          
+          return merged;
+        };
 
+        const updatedBosConfig: BosConfigType = {
+          account: bosConfig.account,
+          testnet: bosConfig.testnet,
+          template: remoteConfig.template,
+          shared: remoteConfig.shared,
+          gateway: remoteConfig.gateway,
+          app: mergeAppConfig(
+            bosConfig.app as Record<string, unknown>,
+            remoteConfig.app as Record<string, unknown>
+          ) as BosConfigType["app"],
+        };
 
         const bosConfigPath = `${configDir}/bos.config.json`;
-        const updatedBosConfig = {
-          ...bosConfig,
-        };
         await Bun.write(bosConfigPath, JSON.stringify(updatedBosConfig, null, 2));
+        setConfig(updatedBosConfig, configDir);
 
         const sharedUiDeps: Record<string, string> = {};
         const sharedUi = updatedBosConfig.shared?.ui as Record<string, { requiredVersion?: string }> | undefined;
@@ -1325,10 +1362,12 @@ export default createPlugin({
         const packagesUpdated: string[] = [];
 
         for (const pkg of packages) {
-          const pkgPath = `${configDir}/${pkg}/package.json`;
-          const pkgFile = Bun.file(pkgPath);
+          const pkgDir = `${configDir}/${pkg}`;
+          const pkgDirExists = await Bun.file(`${pkgDir}/package.json`).exists();
+          if (!pkgDirExists) continue;
 
-          if (!(await pkgFile.exists())) continue;
+          const pkgPath = `${pkgDir}/package.json`;
+          const pkgFile = Bun.file(pkgPath);
 
           const pkgJson = await pkgFile.json() as {
             dependencies?: Record<string, string>;
@@ -1361,8 +1400,8 @@ export default createPlugin({
         if (input.files) {
           const results = await syncFiles({
             configDir,
-            packages: Object.keys(bosConfig.app),
-            bosConfig,
+            packages: Object.keys(updatedBosConfig.app),
+            bosConfig: updatedBosConfig,
             catalog: rootPkg.workspaces?.catalog ?? {},
             force: input.force,
           });