everything-dev 0.0.16 → 0.0.17

package/package.json

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

package/src/lib/orchestrator.ts

@@ -2,14 +2,14 @@ import { appendFile } from "node:fs/promises";
 import { BunContext, BunRuntime } from "@effect/platform-bun";
 import { Effect } from "every-plugin/effect";
 import path from "path";
-import type { AppConfig } from "../config";
 import {
   type DevViewHandle,
   type LogEntry,
   type ProcessState,
   renderDevView,
 } from "../components/dev-view";
-import { renderStreamingView, type StreamingViewHandle } from "../components/streaming-view";
+import { renderStreamingView } from "../components/streaming-view";
+import type { AppConfig, BosConfig } from "../config";
 import { getProcessConfig, makeDevProcess, type ProcessCallbacks, type ProcessHandle } from "./process";
 
 const LOG_NOISE_PATTERNS = [
@@ -32,6 +32,7 @@ export interface AppOrchestrator {
   env: Record<string, string>;
   description: string;
   appConfig: AppConfig;
+  bosConfig?: BosConfig;
   port?: number;
   interactive?: boolean;
   noLogs?: boolean;
@@ -79,12 +80,12 @@ export const runDevServers = (orchestrator: AppOrchestrator) =>
     const initialProcesses: ProcessState[] = orderedPackages.map((pkg) => {
       const portOverride = pkg === "host" ? orchestrator.port : undefined;
       const config = getProcessConfig(pkg, undefined, portOverride);
-      const source = pkg === "host" 
-        ? orchestrator.appConfig.host 
+      const source = pkg === "host"
+        ? orchestrator.appConfig.host
         : pkg === "ui" || pkg === "ui-ssr"
           ? orchestrator.appConfig.ui
-          : pkg === "api" 
-            ? orchestrator.appConfig.api 
+          : pkg === "api"
+            ? orchestrator.appConfig.api
             : undefined;
       return {
         name: pkg,
@@ -139,22 +140,22 @@ export const runDevServers = (orchestrator: AppOrchestrator) =>
     };
 
     const useInteractive = orchestrator.interactive ?? isInteractiveSupported();
-    
+
     view = useInteractive
       ? renderDevView(
-          initialProcesses,
-          orchestrator.description,
-          orchestrator.env,
-          () => cleanup(false),
-          () => cleanup(true)
-        )
+        initialProcesses,
+        orchestrator.description,
+        orchestrator.env,
+        () => cleanup(false),
+        () => cleanup(true)
+      )
       : renderStreamingView(
-          initialProcesses,
-          orchestrator.description,
-          orchestrator.env,
-          () => cleanup(false),
-          () => cleanup(true)
-        );
+        initialProcesses,
+        orchestrator.description,
+        orchestrator.env,
+        () => cleanup(false),
+        () => cleanup(true)
+      );
 
     const callbacks: ProcessCallbacks = {
       onStatus: (name, status, message) => {
@@ -182,7 +183,7 @@ export const runDevServers = (orchestrator: AppOrchestrator) =>
 
     for (const pkg of orderedPackages) {
       const portOverride = pkg === "host" ? orchestrator.port : undefined;
-      const handle = yield* makeDevProcess(pkg, orchestrator.env, callbacks, portOverride);
+      const handle = yield* makeDevProcess(pkg, orchestrator.env, callbacks, portOverride, orchestrator.bosConfig);
       handles.push(handle);
 
       yield* Effect.race(

package/src/lib/process.ts

@@ -1,7 +1,6 @@
-import { resolve } from "node:path";
 import { Command } from "@effect/platform";
 import { Deferred, Effect, Fiber, Ref, Stream } from "every-plugin/effect";
-import { getConfigDir, getPortsFromConfig, type SourceMode } from "../config";
+import { type BosConfig, getConfigDir, getPortsFromConfig, type SourceMode } from "../config";
 import type { ProcessStatus } from "../components/dev-view";
 import { loadSecretsFor } from "./secrets";
 
@@ -204,7 +203,7 @@ interface ServerHandle {
 }
 
 interface BootstrapConfig {
-  configPath?: string;
+  config?: BosConfig;
   secrets?: Record<string, string>;
   host?: { url?: string };
   ui?: { source?: SourceMode };
@@ -255,7 +254,8 @@ const patchConsole = (
 
 export const spawnRemoteHost = (
   config: DevProcess,
-  callbacks: ProcessCallbacks
+  callbacks: ProcessCallbacks,
+  bosConfig?: BosConfig
 ) =>
   Effect.gen(function* () {
     const remoteUrl = config.env?.HOST_REMOTE_URL;
@@ -272,9 +272,6 @@ export const spawnRemoteHost = (
 
     callbacks.onStatus(config.name, "starting");
 
-    const configDir = getConfigDir();
-    const configPath = resolve(configDir, "bos.config.json");
-
     let hostUrl = `http://localhost:${config.port}`;
     if (process.env.HOST_URL) {
       hostUrl = process.env.HOST_URL;
@@ -289,7 +286,7 @@ export const spawnRemoteHost = (
     const apiProxy = config.env?.API_PROXY;
 
     const bootstrap: BootstrapConfig = {
-      configPath,
+      config: bosConfig,
       secrets: allSecrets,
       host: { url: hostUrl },
       ui: { source: uiSource },
@@ -364,7 +361,8 @@ export const makeDevProcess = (
   pkg: string,
   env: Record<string, string> | undefined,
   callbacks: ProcessCallbacks,
-  portOverride?: number
+  portOverride?: number,
+  bosConfig?: BosConfig
 ) =>
   Effect.gen(function* () {
     const config = getProcessConfig(pkg, env, portOverride);
@@ -373,7 +371,7 @@ export const makeDevProcess = (
     }
 
     if (pkg === "host" && env?.HOST_SOURCE === "remote") {
-      return yield* spawnRemoteHost(config, callbacks);
+      return yield* spawnRemoteHost(config, callbacks, bosConfig);
     }
 
     return yield* spawnDevProcess(config, callbacks);

package/src/plugin.ts

@@ -224,6 +224,7 @@ export default createPlugin({
         env,
         description,
         appConfig,
+        bosConfig: deps.bosConfig ?? undefined,
         port: input.port,
         interactive: input.interactive,
       };
@@ -322,6 +323,7 @@ export default createPlugin({
           ui: "remote",
           api: "remote",
         },
+        bosConfig: config,
         port,
         interactive: input.interactive,
         noLogs: true,