everything-dev 1.6.0 → 1.7.0

package/src/api-contract.ts

@@ -88,6 +88,15 @@ function localApiContractSource(configDir: string): ContractSource {
   };
 }
 
+function localAuthContractSource(configDir: string): ContractSource {
+  const sourcePath = join(configDir, "plugins", "auth", "src", "contract.ts");
+  return {
+    key: "auth",
+    importName: "authContract",
+    sourceFilePath: sourcePath,
+  };
+}
+
 async function remoteContractSource(opts: {
   configDir: string;
   runtimeDir: string;
@@ -134,6 +143,7 @@ async function resolveContractSource(opts: {
   source: RuntimePluginConfig | { url: string; localPath?: string; name: string } | null;
   baseUrl: string;
   generatedSubdir: string;
+  localSourceFactory?: (configDir: string) => ContractSource;
 }): Promise<ContractSource> {
   if (
     opts.key === "api" &&
@@ -153,6 +163,25 @@ async function resolveContractSource(opts: {
     }
   }
 
+  if (
+    opts.key === "auth" &&
+    opts.localSourceFactory &&
+    (!opts.source || !("localPath" in opts.source) || opts.source.localPath)
+  ) {
+    const localPath = opts.source && "localPath" in opts.source ? opts.source.localPath : undefined;
+    if (localPath) {
+      return {
+        key: opts.key,
+        importName: "authContract",
+        sourceFilePath: join(localPath, "src", "contract.ts"),
+      };
+    }
+
+    if (!opts.baseUrl) {
+      return opts.localSourceFactory(opts.configDir);
+    }
+  }
+
   if (opts.source && "localPath" in opts.source && opts.source.localPath) {
     return {
       key: opts.key,
@@ -170,10 +199,11 @@ async function resolveContractSource(opts: {
   });
 }
 
-function writeAggregateContractFile(opts: {
+function writeGeneratedFiles(opts: {
   configDir: string;
   sources: ContractSource[];
   pluginKeys: string[];
+  authSource: ContractSource | null;
 }) {
   const baseSource = opts.sources.find((source) => source.key === "api");
   const pluginSources = opts.pluginKeys
@@ -194,15 +224,22 @@ function writeAggregateContractFile(opts: {
   }
 
   uiLines.push("");
-  if (pluginSources.length === 0) {
+
+  const compositeParts: string[] = [];
+  if (opts.authSource) {
+    compositeParts.push(`auth: ${opts.authSource.importName}`);
+  }
+  for (const source of pluginSources) {
+    const key = /^[$A-Z_][0-9A-Z_$]*$/i.test(source.key) ? source.key : JSON.stringify(source.key);
+    compositeParts.push(`${key}: ${source.importName}`);
+  }
+
+  if (compositeParts.length === 0) {
     uiLines.push(`export type ApiContract = ${baseSource.importName};`);
   } else {
     uiLines.push(`export type ApiContract = ${baseSource.importName} & {`);
-    for (const source of pluginSources) {
-      const key = /^[$A-Z_][0-9A-Z_$]*$/i.test(source.key)
-        ? source.key
-        : JSON.stringify(source.key);
-      uiLines.push(`  ${key}: ${source.importName};`);
+    for (const part of compositeParts) {
+      uiLines.push(`  ${part};`);
     }
     uiLines.push("};");
   }
@@ -244,6 +281,28 @@ function writeAggregateContractFile(opts: {
   mkdirSync(dirname(pluginsClientPath), { recursive: true });
   writeFileIfChanged(pluginsClientPath, `${pluginsClientLines.join("\n")}\n`);
 
+  // --- Generate api/src/auth-client.gen.ts ---
+  if (opts.authSource) {
+    const authClientPath = join(opts.configDir, "api", "src", "auth-client.gen.ts");
+    const authClientLines: string[] = [];
+
+    const importPath = toImportPath(authClientPath, opts.authSource.sourceFilePath);
+    authClientLines.push(
+      `import type { ContractType as ${opts.authSource.importName} } from "${importPath}";`,
+    );
+    authClientLines.push(
+      'import type { ContractRouterClient, AnyContractRouter } from "@orpc/contract";',
+    );
+    authClientLines.push(
+      "type ClientFactory<C extends AnyContractRouter> = (context?: Record<string, unknown>) => ContractRouterClient<C>;",
+    );
+    authClientLines.push("");
+    authClientLines.push(`export type AuthClient = ClientFactory<${opts.authSource.importName}>;`);
+
+    mkdirSync(dirname(authClientPath), { recursive: true });
+    writeFileIfChanged(authClientPath, `${authClientLines.join("\n")}\n`);
+  }
+
   return uiContractPath;
 }
 
@@ -264,6 +323,7 @@ export async function syncApiContractBridge(opts: {
   const sources: ContractSource[] = [];
   let manifest: ApiPluginManifest | null = null;
   let generatedPath: string | null = null;
+  let authSource: ContractSource | null = null;
 
   const baseSource = await resolveContractSource({
     configDir: opts.configDir,
@@ -275,6 +335,22 @@ export async function syncApiContractBridge(opts: {
   });
   sources.push(baseSource);
 
+  if (opts.runtimeConfig.auth) {
+    authSource = await resolveContractSource({
+      configDir: opts.configDir,
+      runtimeDir,
+      key: "auth",
+      source: opts.runtimeConfig.auth,
+      baseUrl: opts.runtimeConfig.auth.url,
+      generatedSubdir: "auth",
+      localSourceFactory: localAuthContractSource,
+    });
+    sources.push(authSource);
+    if (authSource.generatedPath) {
+      generatedPath = authSource.generatedPath;
+    }
+  }
+
   for (const [key, plugin] of pluginEntries) {
     const source = await resolveContractSource({
       configDir: opts.configDir,
@@ -290,10 +366,13 @@ export async function syncApiContractBridge(opts: {
     }
   }
 
-  writeAggregateContractFile({
+  const allPluginKeys = pluginEntries.map(([key]) => key);
+
+  writeGeneratedFiles({
     configDir: opts.configDir,
     sources,
-    pluginKeys: pluginEntries.map(([key]) => key),
+    pluginKeys: allPluginKeys,
+    authSource,
   });
 
   if (opts.runtimeConfig.api.source !== "local") {

package/src/app.ts

@@ -7,6 +7,7 @@ import {
   isLocalDevelopmentTarget,
   parsePort,
   resolveLocalDevelopmentPath,
+  resolvePluginRuntimeName,
 } from "./config";
 import { getNetworkIdForAccount } from "./network";
 import { makeDevProcess, type ProcessCallbacks, type ProcessHandle } from "./orchestrator";
@@ -23,10 +24,11 @@ export interface AppOrchestrator {
   interactive?: boolean;
 }
 
-const STARTUP_ORDER = ["ui-ssr", "ui", "api", "plugin", "host-build", "host"];
+const STARTUP_ORDER = ["ui-ssr", "ui", "auth", "api", "plugin", "host-build", "host"];
 const DEFAULT_HOST_PORT = 3000;
 const DEFAULT_UI_PORT = 3002;
 const DEFAULT_API_PORT = 3014;
+const DEFAULT_AUTH_PORT = 3020;
 const DEFAULT_PLUGIN_PORT_START = 3021;
 
 const sortByOrder = (packages: string[]): string[] => {
@@ -115,10 +117,7 @@ export const startDevServers = (
     const shutdown = Effect.gen(function* () {
       const reversed = [...handles].reverse();
       for (const handle of reversed) {
-        yield* Effect.tryPromise({
-          try: () => handle.kill(),
-          catch: () => null,
-        }).pipe(Effect.ignore);
+        yield* handle.kill.pipe(Effect.ignore);
       }
     });
 
@@ -162,6 +161,13 @@ export function detectLocalPackages(
     }
   }
 
+  const authLocalPath =
+    runtimeConfig?.auth?.localPath ??
+    resolveLocalDevelopmentPath(bosConfig?.app.auth?.development, configDir);
+  if (authLocalPath && existsSync(join(authLocalPath, "package.json"))) {
+    packages.push("auth");
+  }
+
   return packages;
 }
 
@@ -170,6 +176,7 @@ export function buildRuntimeConfig(
   options: {
     uiSource?: "local" | "remote";
     apiSource?: "local" | "remote";
+    authSource?: "local" | "remote";
     hostUrl: string;
     proxy?: string;
     env?: "development" | "production";
@@ -179,10 +186,15 @@ export function buildRuntimeConfig(
   const configDir = getProjectRoot();
   const uiConfig = bosConfig.app.ui;
   const apiConfig = bosConfig.app.api;
+  const authConfig = bosConfig.app.auth;
   const uiSource = options.uiSource ?? "local";
   const apiSource = options.apiSource ?? "local";
+  const authSource = options.authSource ?? "local";
   const uiLocalPath = resolveLocalDevelopmentPath(uiConfig.development, configDir);
   const apiLocalPath = resolveLocalDevelopmentPath(apiConfig.development, configDir);
+  const authLocalPath = authConfig
+    ? resolveLocalDevelopmentPath(authConfig.development, configDir)
+    : null;
   const uiLocalUrl =
     !uiLocalPath && uiConfig.development && !isLocalDevelopmentTarget(uiConfig.development)
       ? uiConfig.development
@@ -191,6 +203,13 @@ export function buildRuntimeConfig(
     !apiLocalPath && apiConfig.development && !isLocalDevelopmentTarget(apiConfig.development)
       ? apiConfig.development
       : "";
+  const authLocalUrl =
+    authConfig &&
+    !authLocalPath &&
+    authConfig.development &&
+    !isLocalDevelopmentTarget(authConfig.development)
+      ? authConfig.development
+      : "";
 
   return {
     env: options.env ?? "development",
@@ -213,7 +232,7 @@ export function buildRuntimeConfig(
           port: uiSource === "local" && uiLocalUrl ? parsePort(uiLocalUrl) : undefined,
           ssrUrl: uiSource === "remote" ? uiConfig.ssr : undefined,
           ssrIntegrity: uiSource === "remote" ? uiConfig.ssrIntegrity : undefined,
-          integrity: uiSource === "remote" ? uiConfig.productionIntegrity : undefined,
+          integrity: uiSource === "remote" ? uiConfig.integrity : undefined,
           source: uiSource === "local" ? (uiLocalPath ? "local" : "remote") : "remote",
         }
       : {
@@ -238,7 +257,7 @@ export function buildRuntimeConfig(
           proxy: options.proxy ?? apiConfig.proxy,
           variables: apiConfig.variables,
           secrets: apiConfig.secrets,
-          integrity: apiSource === "remote" ? apiConfig.productionIntegrity : undefined,
+          integrity: apiSource === "remote" ? apiConfig.integrity : undefined,
         }
       : {
           name: "api",
@@ -246,6 +265,29 @@ export function buildRuntimeConfig(
           entry: "/mf-manifest.json",
           source: apiSource,
         },
+    auth: authConfig
+      ? {
+          name: resolvePluginRuntimeName(
+            undefined,
+            authSource === "local" ? (authLocalPath ?? undefined) : undefined,
+            authConfig.name,
+          ),
+          url: authSource === "remote" ? (authConfig.production ?? "") : authLocalUrl,
+          entry:
+            authSource === "remote"
+              ? `${authConfig.production ?? ""}/mf-manifest.json`
+              : authLocalUrl
+                ? `${authLocalUrl}/mf-manifest.json`
+                : "/mf-manifest.json",
+          localPath: authSource === "local" ? (authLocalPath ?? undefined) : undefined,
+          port: authSource === "local" && authLocalUrl ? parsePort(authLocalUrl) : undefined,
+          source: authSource === "local" ? (authLocalPath ? "local" : "remote") : "remote",
+          proxy: authConfig.proxy,
+          variables: authConfig.variables,
+          secrets: authConfig.secrets,
+          integrity: authSource === "remote" ? authConfig.integrity : undefined,
+        }
+      : undefined,
     plugins: options.plugins,
   };
 }
@@ -308,6 +350,7 @@ export async function prepareDevelopmentRuntimeConfig(
     hostUrl: `http://localhost:${hostPort}`,
     ui: { ...runtimeConfig.ui },
     api: { ...runtimeConfig.api },
+    auth: runtimeConfig.auth ? { ...runtimeConfig.auth } : undefined,
     plugins: runtimeConfig.plugins ? { ...runtimeConfig.plugins } : undefined,
   };
 
@@ -342,5 +385,10 @@ export async function prepareDevelopmentRuntimeConfig(
     }
   }
 
+  if (next.auth?.source === "local" && next.auth.localPath) {
+    const authPort = await pickAvailablePort(next.auth.port ?? DEFAULT_AUTH_PORT, usedPorts);
+    next.auth = withLocalRuntimeUrl(next.auth, authPort);
+  }
+
   return next;
 }

package/src/cli/init.ts

@@ -223,8 +223,8 @@ export async function copyFilteredFiles(
     const stat = lstatSync(src);
     if (!stat.isFile()) continue;
 
-    const destPath = filePath.startsWith(".templates/")
-      ? filePath.slice(".templates/".length)
+    const destPath = filePath.startsWith(".github/templates/")
+      ? filePath.replace(/^\.github\/templates\//, ".github/")
       : filePath;
     const dest = join(destination, destPath);
     mkdirSync(dirname(dest), { recursive: true });
@@ -281,7 +281,7 @@ export async function personalizeConfig(
         if (entry && typeof entry === "object") {
           const e = entry as Record<string, unknown>;
           delete e.production;
-          delete e.productionIntegrity;
+          delete e.integrity;
           delete e.ssr;
           delete e.ssrIntegrity;
         }
@@ -304,7 +304,7 @@ export async function personalizeConfig(
         if (plugin && typeof plugin === "object") {
           const p = plugin as Record<string, unknown>;
           delete p.production;
-          delete p.productionIntegrity;
+          delete p.integrity;
         }
       }
 
@@ -500,8 +500,8 @@ export async function writeInitSnapshot(
     const stat = lstatSync(src);
     if (!stat.isFile()) continue;
     const content = readFileSync(src);
-    const destPath = filePath.startsWith(".templates/")
-      ? filePath.slice(".templates/".length)
+    const destPath = filePath.startsWith(".github/templates/")
+      ? filePath.replace(/^\.github\/templates\//, ".github/")
       : filePath;
     fileHashes[destPath] = computeHash(content);
   }

package/src/cli/sync.ts

@@ -117,13 +117,15 @@ function mergePackageJson(
 }
 
 function toDestPath(filePath: string): string {
-  return filePath.startsWith(".templates/") ? filePath.slice(".templates/".length) : filePath;
+  return filePath.startsWith(".github/templates/")
+    ? filePath.replace(/^\.github\/templates\//, ".github/")
+    : filePath;
 }
 
 function writeSyncedFile(sourceDir: string, projectDir: string, filePath: string): void {
   const src = join(sourceDir, filePath);
-  const destPath = filePath.startsWith(".templates/")
-    ? filePath.slice(".templates/".length)
+  const destPath = filePath.startsWith(".github/templates/")
+    ? filePath.replace(/^\.github\/templates\//, ".github/")
     : filePath;
   const dest = join(projectDir, destPath);
   mkdirSync(dirname(dest), { recursive: true });

package/src/cli.ts

@@ -119,7 +119,6 @@ async function main() {
       console.log();
       console.log(colors.dim("  Next steps:"));
       console.log(colors.dim(`    cd ${result.directory}`));
-      console.log(colors.dim("    cp .env.example .env   # then fill in your values"));
       if (result.status === "initialized" && !(input as any)?.noInstall) {
         console.log(colors.dim("    bun run dev"));
       } else {

package/src/components/streaming-view.ts

@@ -163,25 +163,5 @@ export function renderStreamingView(
 
   const unmount = () => onExit?.();
 
-  let signalCount = 0;
-  const forceExit = () => {
-    console.log("\n[CLI] Force exit");
-    process.exit(0);
-  };
-
-  process.on("SIGINT", () => {
-    signalCount++;
-    if (signalCount > 1) {
-      forceExit();
-      return;
-    }
-    console.log();
-    console.log(colors.dim(`[${getTimestamp()}] Shutting down...`));
-    const timeout = setTimeout(forceExit, 5000);
-    Promise.resolve(unmount()).then(() => {
-      clearTimeout(timeout);
-    });
-  });
-
   return { updateProcess, addLog, unmount };
 }

package/src/config.ts

@@ -2,22 +2,9 @@ import { existsSync, readFileSync } from "node:fs";
 import { dirname, isAbsolute, join, resolve } from "node:path";
 import { fetchBosConfigFromFastKv } from "./fastkv";
 import { getNetworkIdForAccount } from "./network";
-import type { BosConfig, RuntimeConfig, RuntimePluginConfig } from "./types";
+import type { BosConfig, BosConfigInput, RuntimeConfig, RuntimePluginConfig } from "./types";
 import { BosConfigSchema } from "./types";
 
-interface BosConfigInput extends Record<string, unknown> {
-  extends?: string;
-  development?: string;
-  production?: string;
-  productionIntegrity?: string;
-  proxy?: string;
-  variables?: Record<string, string>;
-  secrets?: string[];
-  app?: Record<string, Record<string, unknown>>;
-  shared?: Record<string, Record<string, Record<string, unknown>>>;
-  plugins?: Record<string, BosConfigInput>;
-}
-
 const LOCAL_PREFIX = "local:";
 const DEFAULT_HOST_PORT = 3000;
 
@@ -143,6 +130,7 @@ function buildRuntimeConfig(
 ): RuntimeConfig {
   const uiConfig = config.app.ui;
   const apiConfig = config.app.api;
+  const authConfig = config.app.auth;
   const uiRuntime =
     env === "development"
       ? resolveRuntimeTarget(uiConfig.development, baseDir)
@@ -151,6 +139,11 @@ function buildRuntimeConfig(
     env === "development"
       ? resolveRuntimeTarget(apiConfig.development, baseDir)
       : resolveRuntimeTarget(apiConfig.production, baseDir, "remote");
+  const authRuntime = authConfig
+    ? env === "development"
+      ? resolveRuntimeTarget(authConfig.development, baseDir)
+      : resolveRuntimeTarget(authConfig.production, baseDir, "remote")
+    : undefined;
 
   return {
     env,
@@ -171,7 +164,7 @@ function buildRuntimeConfig(
       port: uiRuntime.port,
       ssrUrl: uiConfig.ssr,
       ssrIntegrity: env === "production" ? uiConfig.ssrIntegrity : undefined,
-      integrity: env === "production" ? uiConfig.productionIntegrity : undefined,
+      integrity: env === "production" ? uiConfig.integrity : undefined,
       source: uiRuntime.source,
     },
     api: {
@@ -184,8 +177,22 @@ function buildRuntimeConfig(
       proxy: apiConfig.proxy,
       variables: apiConfig.variables,
       secrets: apiConfig.secrets,
-      integrity: env === "production" ? apiConfig.productionIntegrity : undefined,
+      integrity: env === "production" ? apiConfig.integrity : undefined,
     },
+    auth: authConfig
+      ? {
+          name: resolvePluginRuntimeName(undefined, authRuntime!.localPath, authConfig.name),
+          url: authRuntime!.url,
+          entry: authRuntime!.url ? `${authRuntime!.url}/mf-manifest.json` : "/mf-manifest.json",
+          localPath: authRuntime!.localPath,
+          port: authRuntime!.port,
+          source: authRuntime!.source,
+          proxy: authConfig.proxy,
+          variables: authConfig.variables,
+          secrets: authConfig.secrets,
+          integrity: env === "production" ? authConfig.integrity : undefined,
+        }
+      : undefined,
     plugins:
       options?.plugins && Object.keys(options.plugins).length > 0 ? options.plugins : undefined,
   };
@@ -264,11 +271,25 @@ async function resolveRuntimePlugins(
       env,
       pluginInput,
     );
+    if (
+      pluginInput.name &&
+      typeof pluginInput.name === "string" &&
+      !pluginRuntime.name.includes("/")
+    ) {
+      pluginRuntime.name = pluginInput.name;
+    }
+
+    const integrity = pluginInput.integrity;
+    if (env === "production" && integrity) {
+      pluginRuntime.integrity = integrity;
+    }
+
     if (
       pluginRuntime.source === "remote" &&
       pluginRuntime.url &&
       !pluginRuntime.localPath &&
-      typeof resolvedConfig.app?.api?.name !== "string"
+      typeof resolvedConfig.app?.api?.name !== "string" &&
+      !pluginInput.name
     ) {
       pluginRuntime.name = await resolveRemotePluginRuntimeName(
         pluginRuntime.url,
@@ -276,11 +297,6 @@ async function resolveRuntimePlugins(
       );
     }
 
-    const productionIntegrity = pluginInput.productionIntegrity;
-    if (env === "production" && productionIntegrity) {
-      pluginRuntime.integrity = productionIntegrity;
-    }
-
     out[runtimeKey] = pluginRuntime;
 
     if (resolvedConfig.plugins && Object.keys(resolvedConfig.plugins).length > 0) {
@@ -353,7 +369,7 @@ function buildRuntimePluginConfig(
   };
 }
 
-function resolvePluginRuntimeName(
+export function resolvePluginRuntimeName(
   explicitName: string | undefined,
   localPath: string | undefined,
   fallback: string,

package/src/contract.meta.ts

@@ -42,7 +42,10 @@ export const cliCommandMeta = {
     summary: "Add a plugin attachment",
     interactive: false,
     fields: {
-      source: { positional: true, description: "Plugin source (local:path or URL)" },
+      source: {
+        positional: true,
+        description: "Plugin source (local:path, bos://account/plugins/name, or URL)",
+      },
       as: { description: "Plugin alias" },
       production: { description: "Production URL override" },
     },

package/src/contract.ts

@@ -60,6 +60,8 @@ export const PluginAddResultSchema = z.object({
   key: z.string(),
   development: z.string().optional(),
   production: z.string().optional(),
+  integrity: z.string().optional(),
+  version: z.string().optional(),
   error: z.string().optional(),
 });
 
@@ -82,6 +84,9 @@ export const PluginListResultSchema = z.object({
       production: z.string().optional(),
       localPath: z.string().optional(),
       source: z.enum(["local", "remote"]),
+      integrity: z.string().optional(),
+      version: z.string().optional(),
+      name: z.string().optional(),
     }),
   ),
   error: z.string().optional(),
@@ -97,6 +102,8 @@ export const PluginPublishResultSchema = z.object({
   path: z.string().optional(),
   script: z.string().optional(),
   production: z.string().optional(),
+  integrity: z.string().optional(),
+  version: z.string().optional(),
   error: z.string().optional(),
 });