alchemy 2.0.0-beta.74 → 2.0.0-beta.76

package/lib/Hetzner/actions.js

@@ -36,9 +36,8 @@ const backoff = Schedule.min([
 /**
  * Poll a Hetzner Action until it reaches `success` or `error`.
  *
- * Bounded: at most 10 polls, exponential backoff starting at 500ms and
- * capped at 5s (under 60s total). Already-finished actions return
- * immediately.
+ * Bounded: at most 24 polls, exponential backoff starting at 500ms and
+ * capped at 5s. Already-finished actions return immediately.
  */
 export const waitForAction = (ref) => Effect.gen(function* () {
     if (typeof ref !== "number" && "status" in ref) {
@@ -59,11 +58,8 @@ export const waitForAction = (ref) => Effect.gen(function* () {
         return action;
     })), Effect.retry({
         while: retryable,
-        times: 10,
-        schedule: Schedule.min([
-            Schedule.exponential(Duration.millis(500), 1.5),
-            Schedule.spaced(Duration.seconds(5)),
-        ]),
+        times: 24,
+        schedule: backoff,
     }), Effect.catchTag("ActionPending", (e) => new ActionTimeout({
         actionId: e.actionId,
         status: e.status,
@@ -101,11 +97,8 @@ export const waitForZoneAction = (ref) => Effect.gen(function* () {
         return action;
     })), Effect.retry({
         while: retryable,
-        times: 10,
-        schedule: Schedule.min([
-            Schedule.exponential(Duration.millis(500), 1.5),
-            Schedule.spaced(Duration.seconds(5)),
-        ]),
+        times: 24,
+        schedule: backoff,
     }), Effect.catchTag("ActionPending", (e) => new ActionTimeout({
         actionId: e.actionId,
         status: e.status,

package/lib/Hetzner/actions.js.map

@@ -1 +1 @@
-{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../src/Hetzner/actions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../src/Hetzner/actions.ts"],"names":[],"mappings":"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"}

package/lib/Hetzner/hosted.d.ts

@@ -1,9 +1,13 @@
 import { Services } from "@distilled.cloud/hetzner";
 import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Path from "effect/Path";
 import type * as rolldown from "rolldown";
 import * as Bundle from "../Bundle/Bundle.ts";
+import { type PackageInstall } from "../Bundle/InstalledPackages.ts";
 import type { ResourceBinding } from "../Resource.ts";
 import { createHostRuntimeContext, type HostRuntimeContext } from "../Server/Process.ts";
+import { extraFileDestination } from "../Util/extraFiles.ts";
 import type { ServiceBinding } from "./MountVolume.ts";
 import { type SshClient } from "./Ssh.ts";
 export type HetznerHostRuntimeContext = HostRuntimeContext;
@@ -16,14 +20,33 @@ declare class VolumeAttachTimeout extends VolumeAttachTimeout_base<{
 }> {
 }
 export declare const createHetznerHostRuntimeContext: typeof createHostRuntimeContext;
+export interface HetznerBuildOptions extends Bundle.BundleConfig {
+    /**
+     * Native or Node-only packages to `npm install` into the unit instead
+     * of bundling them. Same shape as Fly/Lambda `build.install`.
+     */
+    readonly install?: PackageInstall;
+}
 export interface HostedProgramProps {
     main: string;
     handler?: string;
     port?: number;
     env?: Record<string, any>;
     isExternal?: boolean;
-    build?: Bundle.BundleConfig;
+    build?: HetznerBuildOptions;
+    /**
+     * Extra host directories packed into the unit archive (framework
+     * client assets, Next.js `.next`, …). Hashed into `code.hash` so
+     * asset changes update the unit. Destination is relative to the
+     * unit root.
+     */
+    extraFiles?: ReadonlyArray<ExtraFile>;
+}
+export interface ExtraFile {
+    readonly source: string;
+    readonly destination: string;
 }
+export { extraFileDestination };
 export declare const renderEnvFile: (env: Record<string, unknown>) => string;
 export declare const collectBindingState: (bindings: ResourceBinding<ServiceBinding>[]) => {
     env: Record<string, any>;
@@ -41,11 +64,13 @@ export declare const createHetznerHostedSupport: ({ stackName, stage, virtualEnt
         ALCHEMY_STACK_NAME: string;
         ALCHEMY_STAGE: string;
         ALCHEMY_PHASE: string;
+        HOST: string;
     };
     bundleProgram: (_id: string, props: HostedProgramProps) => Effect.Effect<{
         archive: Buffer<ArrayBufferLike>;
         hash: string;
-    }, Bundle.BundleError | import("effect/PlatformError").PlatformError, import("effect/FileSystem").FileSystem | import("effect/Path").Path>;
+        entryRel: string;
+    }, Bundle.BundleError | import("effect/PlatformError").PlatformError, import("effect/unstable/process/ChildProcessSpawner").ChildProcessSpawner | FileSystem.FileSystem | Path.Path>;
     attachAndMount: (input: {
         ssh: SshClient;
         serverId: number;
@@ -59,6 +84,7 @@ export declare const createHetznerHostedSupport: ({ stackName, stage, virtualEnt
         unitName: string;
         archive: Uint8Array<ArrayBufferLike>;
         env: Record<string, unknown>;
+        entryRel?: string;
     }) => Effect.Effect<void, import("./Ssh.ts").SshError, import("./Ssh.ts").SshServices>;
     removeUnit: (input: {
         ssh: SshClient;
@@ -77,7 +103,6 @@ export declare const createHetznerHostedSupport: ({ stackName, stage, virtualEnt
         }, import("./Ssh.ts").SshError, import("effect/unstable/process/ChildProcessSpawner").ChildProcessSpawner | import("effect/Scope").Scope>;
         scp: (local: string | Uint8Array<ArrayBufferLike>, remote: string) => Effect.Effect<undefined, import("./Ssh.ts").SshError, import("effect/unstable/process/ChildProcessSpawner").ChildProcessSpawner | import("effect/Scope").Scope>;
         close: Effect.Effect<void, never, never>;
-    }, import("effect/PlatformError").PlatformError, import("effect/unstable/process/ChildProcessSpawner").ChildProcessSpawner | import("effect/FileSystem").FileSystem | import("effect/Path").Path | import("effect/Scope").Scope>;
+    }, import("effect/PlatformError").PlatformError, import("effect/unstable/process/ChildProcessSpawner").ChildProcessSpawner | FileSystem.FileSystem | Path.Path | import("effect/Scope").Scope>;
 };
-export {};
 //# sourceMappingURL=hosted.d.ts.map

package/lib/Hetzner/hosted.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hosted.d.ts","sourceRoot":"","sources":["../../src/Hetzner/hosted.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAGpD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,KAAK,KAAK,QAAQ,MAAM,UAAU,CAAC;AAC1C,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAC;AAE9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEtD,OAAO,EACL,wBAAwB,EACxB,KAAK,kBAAkB,EACxB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAiB,KAAK,SAAS,EAAE,MAAM,UAAU,CAAC;AAEzD,MAAM,MAAM,yBAAyB,GAAG,kBAAkB,CAAC;;;;AAE3D,cAAM,mBAAoB,SAAQ,yBAEhC;IACA,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;CAAG;AAEL,eAAO,MAAM,+BAA+B,iCAA2B,CAAC;AAExE,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC,YAAY,CAAC;CAC7B;AAQD,eAAO,MAAM,aAAa,QAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,WAI3C,CAAC;AAEhB,eAAO,MAAM,mBAAmB,aACpB,eAAe,CAAC,cAAc,CAAC,EAAE;;;kBASV,MAAM;cAAQ,MAAM;;CAWtD,CAAC;AAsEF,eAAO,MAAM,0BAA0B,8CAIpC;IACD,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,kBAAkB,EAAE,CAClB,OAAO,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,MAAM,KACpC,QAAQ,CAAC,MAAM,CAAC;CACtB;;;;;;;;;;;aAiGQ,SAAS;kBACJ,MAAM;iBACP,KAAK,CAAC;YAAE,QAAQ,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAA;SAAE,CAAC;;;aAgG7C,SAAS;kBACJ,MAAM;iBACP,UAAU,CAAC,eAAe,CAAC;aAC/B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;;aAuEvB,SAAS;kBACJ,MAAM;;sBA1LO,SAAS;;;;;;;;;;;;;;CAkNnC,CAAC"}
+{"version":3,"file":"hosted.d.ts","sourceRoot":"","sources":["../../src/Hetzner/hosted.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAGpD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AAEpC,OAAO,KAAK,KAAK,QAAQ,MAAM,UAAU,CAAC;AAC1C,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAIL,KAAK,cAAc,EACpB,MAAM,gCAAgC,CAAC;AAExC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EACL,wBAAwB,EACxB,KAAK,kBAAkB,EACxB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEL,oBAAoB,EAKrB,MAAM,uBAAuB,CAAC;AAI/B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAiB,KAAK,SAAS,EAAE,MAAM,UAAU,CAAC;AAEzD,MAAM,MAAM,yBAAyB,GAAG,kBAAkB,CAAC;;;;AAE3D,cAAM,mBAAoB,SAAQ,yBAEhC;IACA,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;CAAG;AAEL,eAAO,MAAM,+BAA+B,iCAA2B,CAAC;AAExE,MAAM,WAAW,mBAAoB,SAAQ,MAAM,CAAC,YAAY;IAC9D;;;OAGG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,cAAc,CAAC;CACnC;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,KAAK,CAAC,EAAE,mBAAmB,CAAC;IAC5B;;;;;OAKG;IACH,UAAU,CAAC,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC;CACvC;AAED,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC9B;AAkBD,OAAO,EAAE,oBAAoB,EAAE,CAAC;AAQhC,eAAO,MAAM,aAAa,QAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,WAI3C,CAAC;AAEhB,eAAO,MAAM,mBAAmB,aACpB,eAAe,CAAC,cAAc,CAAC,EAAE;;;kBASV,MAAM;cAAQ,MAAM;;CAWtD,CAAC;AAmFF,eAAO,MAAM,0BAA0B,8CAIpC;IACD,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,kBAAkB,EAAE,CAClB,OAAO,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,MAAM,KACpC,QAAQ,CAAC,MAAM,CAAC;CACtB;;;;;;;;;;;;;aAmMQ,SAAS;kBACJ,MAAM;iBACP,KAAK,CAAC;YAAE,QAAQ,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAA;SAAE,CAAC;;;aAiJ7C,SAAS;kBACJ,MAAM;iBACP,UAAU,CAAC,eAAe,CAAC;aAC/B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;mBACjB,MAAM;;;aA2EZ,SAAS;kBACJ,MAAM;;sBAxPO,SAAS;;;;;;;;;;;;;;CAgRnC,CAAC"}

package/lib/Hetzner/hosted.js

@@ -2,17 +2,31 @@ import { Services } from "@distilled.cloud/hetzner";
 import * as Data from "effect/Data";
 import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Path from "effect/Path";
 import * as Schedule from "effect/Schedule";
 import * as Bundle from "../Bundle/Bundle.js";
+import { matchesPackageRoot, normalizeInstallTargets, resolvePackageInstallIdentity, } from "../Bundle/InstalledPackages.js";
 import { findCwdForBundle, resolveMainPath } from "../Bundle/TempRoot.js";
-import { Self } from "../Self.js";
 import { createHostRuntimeContext, } from "../Server/Process.js";
-import { zipCode } from "../Util/zip.js";
+import { contextRootOf, extraFileDestination, hashExtraFiles, isContextRootDest, posixRelUnder, resolveExtraSource, } from "../Util/extraFiles.js";
+import { sha256, sha256Object } from "../Util/sha256.js";
+import { zipCode, zipFiles } from "../Util/zip.js";
 import { waitForAction } from "./actions.js";
 import { openSshClient } from "./Ssh.js";
 class VolumeAttachTimeout extends Data.TaggedError("Hetzner.VolumeAttachTimeout") {
 }
 export const createHetznerHostRuntimeContext = createHostRuntimeContext;
+const matchesConfiguredExternal = (external, moduleId, parentId, isResolved) => {
+    if (external === undefined)
+        return false;
+    if (typeof external === "function") {
+        return external(moduleId, parentId, isResolved) === true;
+    }
+    const matchers = Array.isArray(external) ? external : [external];
+    return matchers.some((matcher) => typeof matcher === "string" ? matcher === moduleId : matcher.test(moduleId));
+};
+export { extraFileDestination };
 const quoteEnvValue = (value) => {
     const text = typeof value === "string" ? value : JSON.stringify(value ?? null);
     return `'${text.replaceAll(/'/g, `'""'`).replaceAll(/\n/g, "\\n")}'`;
@@ -39,93 +53,103 @@ export const collectBindingState = (bindings) => {
     }
     return { env, volumes };
 };
+const skipExtraPath = (relative) => relative
+    .replaceAll("\\", "/")
+    .split("/")
+    .some((segment) => segment === "node_modules" ||
+    segment === ".git" ||
+    segment.startsWith(".alchemy-hetzner"));
+const toSharedExtraFiles = (extraFiles) => extraFiles?.map((file) => ({
+    source: file.source,
+    dest: file.destination,
+}));
+const collectExtraFiles = Effect.fn(function* (extraFiles) {
+    if (extraFiles === undefined || extraFiles.length === 0) {
+        return [];
+    }
+    const fs = yield* FileSystem.FileSystem;
+    const path = yield* Path.Path;
+    const files = [];
+    for (const extra of extraFiles) {
+        const dest = extraFileDestination(extra.destination);
+        const source = resolveExtraSource(extra.source, path);
+        if (!(yield* fs.exists(source)))
+            continue;
+        const rootStat = yield* fs.stat(source);
+        const skip = isContextRootDest(dest)
+            ? (relative) => relative
+                .replaceAll("\\", "/")
+                .split("/")
+                .some((segment) => segment === ".git" || segment.startsWith(".alchemy-hetzner"))
+            : skipExtraPath;
+        if (rootStat.type === "File") {
+            files.push({
+                path: isContextRootDest(dest) ? path.basename(source) : dest,
+                content: yield* fs.readFile(source),
+            });
+            continue;
+        }
+        const names = yield* fs.readDirectory(source, { recursive: true });
+        for (const name of names) {
+            if (skip(name))
+                continue;
+            const full = path.join(source, name);
+            const stat = yield* fs.stat(full);
+            if (stat.type !== "File")
+                continue;
+            const posixName = name.replaceAll("\\", "/");
+            files.push({
+                path: isContextRootDest(dest)
+                    ? posixName
+                    : `${dest}/${posixName}`.replaceAll(/\/+/g, "/"),
+                content: yield* fs.readFile(full),
+            });
+        }
+    }
+    return files;
+});
+/**
+ * The generated entry for `Hetzner.Service` units: a shim importing only
+ * `alchemy/Runtime/Bootstrap/Hetzner` plus the user's `main` — see that
+ * module for why the entry never imports alchemy's own dependencies.
+ */
 const makeBunBootstrap = (handler) => (importPath) => `
-import { BunServices } from "@effect/platform-bun";
-import { BunHttpServer } from "alchemy/Http";
-import { Stack } from "alchemy/Stack";
-import { makeEntrypointLayer, reifyBoundConfigProvider } from "alchemy/Runtime";
-import * as Config from "effect/Config";
-import * as ConfigProvider from "effect/ConfigProvider";
-import * as Context from "effect/Context";
-import * as Effect from "effect/Effect";
-import * as FetchHttpClient from "effect/unstable/http/FetchHttpClient";
-import * as Layer from "effect/Layer";
-import * as Logger from "effect/Logger";
-
+import { bootstrap } from "alchemy/Runtime/Bootstrap/Hetzner";
 import { ${handler} as entrypoint } from ${JSON.stringify(importPath)};
 
-const tag = Context.Service(${JSON.stringify(Self.key)});
-const layer = makeEntrypointLayer(tag, entrypoint);
-
-const platform = Layer.mergeAll(
-  BunServices.layer,
-  FetchHttpClient.layer,
-  Logger.layer([Logger.consolePretty()]),
-);
-
-const stack = Layer.effect(
-  Stack,
-  Effect.all([
-    Config.string("ALCHEMY_STACK_NAME"),
-    Config.string("ALCHEMY_STAGE")
-  ]).pipe(
-    Effect.map(([name, stage]) => ({
-      name,
-      stage,
-      bindings: {},
-      resources: {}
-    }))
-  )
-);
-
-const program = tag.pipe(
-  Effect.flatMap((service) => service.RuntimeContext.exports),
-  Effect.flatMap((exports) => exports.program),
-  Effect.provide(
-    layer.pipe(
-      Layer.provideMerge(stack),
-      Layer.provideMerge(BunHttpServer()),
-      Layer.provideMerge(platform),
-      Layer.provideMerge(
-        Layer.succeed(
-          ConfigProvider.ConfigProvider,
-          reifyBoundConfigProvider(ConfigProvider.fromEnv(), process.env)
-        )
-      ),
-    )
-  ),
-  Effect.scoped
-);
-
-console.log("Hetzner service bootstrap starting...");
-await Effect.runPromise(program).catch((err) => {
-  console.error("Hetzner service bootstrap failed:", err);
-  process.exit(1);
-});
+await bootstrap(entrypoint);
 `;
 export const createHetznerHostedSupport = ({ stackName, stage, virtualEntryPlugin, }) => {
     const alchemyEnv = {
         ALCHEMY_STACK_NAME: stackName,
         ALCHEMY_STAGE: stage,
         ALCHEMY_PHASE: "runtime",
+        HOST: "0.0.0.0",
     };
     const bundleProgram = Effect.fn(function* (_id, props) {
         const handler = props.handler ?? "default";
         const realMain = yield* resolveMainPath(props.main);
         const cwd = yield* findCwdForBundle(realMain);
+        const requested = yield* normalizeInstallTargets(props.build?.install);
+        const installRoots = new Set(Object.keys(requested));
+        const configuredExternal = props.build?.input?.external;
         const buildBundle = Effect.fn(function* (entry, plugins) {
             return yield* Bundle.build({
                 ...props.build?.input,
                 input: entry,
                 cwd,
                 platform: "node",
-                external: [
-                    "bun",
-                    "bun:*",
-                    ...(props.build?.input?.external ?? []),
-                ],
+                external: (moduleId, parentId, isResolved) => {
+                    if (moduleId === "bun" || moduleId.startsWith("bun:"))
+                        return true;
+                    for (const root of installRoots) {
+                        if (matchesPackageRoot(moduleId, root))
+                            return true;
+                    }
+                    return matchesConfiguredExternal(configuredExternal, moduleId, parentId, isResolved);
+                },
                 resolve: {
-                    conditionNames: ["bun", "import", "module", "default"],
+                    conditionNames: [...Bundle.NODE_CONDITION_NAMES],
                     ...props.build?.input?.resolve,
                 },
                 plugins: [props.build?.input?.plugins, plugins],
@@ -135,20 +159,77 @@ export const createHetznerHostedSupport = ({ stackName, stage, virtualEntryPlugi
                 sourcemap: props.build?.output?.sourcemap ?? false,
                 minify: props.build?.output?.minify ?? false,
                 entryFileNames: "index.mjs",
+                // Preserve init order for framework SSR bundles.
+                strictExecutionOrder: true,
+                keepNames: true,
             }, props.build);
         });
-        const bundleOutput = props.isExternal
-            ? yield* buildBundle(realMain)
-            : yield* buildBundle(realMain, virtualEntryPlugin(makeBunBootstrap(handler)));
         const toBytes = (content) => typeof content === "string" ? new TextEncoder().encode(content) : content;
+        const extraFiles = yield* collectExtraFiles(props.extraFiles);
+        const identity = Object.keys(requested).length > 0
+            ? yield* resolvePackageInstallIdentity({ cwd, requested })
+            : undefined;
+        const install = identity !== undefined && Object.keys(identity.resolved).length > 0
+            ? identity.resolved
+            : undefined;
+        const packageJson = install === undefined
+            ? undefined
+            : `${JSON.stringify({ private: true, type: "module", dependencies: install }, null, 2)}\n`;
+        const installFiles = packageJson !== undefined
+            ? [
+                {
+                    path: "package.json",
+                    content: new TextEncoder().encode(packageJson),
+                },
+            ]
+            : [];
+        // `isExternal` mains are already complete Node programs. Pack the
+        // dist tree as-built so relative imports (`../client`, nitro chunks)
+        // survive. Do not rolldown-flatten.
+        if (props.isExternal) {
+            const fs = yield* FileSystem.FileSystem;
+            const pathMod = yield* Path.Path;
+            const extras = toSharedExtraFiles(props.extraFiles) ?? [];
+            const root = contextRootOf(realMain, extras, pathMod, (source) => resolveExtraSource(source, pathMod));
+            const entryRel = posixRelUnder(root, realMain, pathMod) ?? pathMod.basename(realMain);
+            const entryBytes = yield* fs.readFile(realMain);
+            const zipEntries = [
+                ...extraFiles.filter((file) => !(file.path === "package.json" && packageJson !== undefined)),
+                ...installFiles,
+            ];
+            if (!zipEntries.some((file) => file.path === entryRel)) {
+                zipEntries.push({ path: entryRel, content: entryBytes });
+            }
+            const archive = yield* zipFiles(zipEntries);
+            const extraHash = yield* hashExtraFiles(toSharedExtraFiles(props.extraFiles));
+            const hash = yield* sha256Object({
+                bundle: yield* sha256(entryBytes),
+                extra: extraHash,
+                packageJson: packageJson ?? "",
+                entryRel,
+            });
+            return { archive, hash, entryRel };
+        }
+        const bundleOutput = yield* buildBundle(realMain, virtualEntryPlugin(makeBunBootstrap(handler)));
         const [entryFile, ...chunkFiles] = bundleOutput.files;
-        const archive = yield* zipCode(toBytes(entryFile.content), chunkFiles.map((file) => ({
-            path: file.path,
-            content: toBytes(file.content),
-        })));
-        return { archive, hash: bundleOutput.hash };
+        const zipExtras = [
+            ...chunkFiles.map((file) => ({
+                path: file.path,
+                content: toBytes(file.content),
+            })),
+            ...extraFiles,
+            ...installFiles,
+        ];
+        const archive = yield* zipCode(toBytes(entryFile.content), zipExtras);
+        const extraHash = yield* hashExtraFiles(toSharedExtraFiles(props.extraFiles));
+        const hash = yield* sha256Object({
+            bundle: bundleOutput.hash,
+            extra: extraHash,
+            packageJson: packageJson ?? "",
+        });
+        return { archive, hash, entryRel: "index.mjs" };
     });
-    const renderUnit = (unitName, appDir) => `[Unit]
+    const renderUnit = (unitName, appDir, entryRel) => `[Unit]
 Description=Alchemy Hetzner Service ${unitName}
 After=network-online.target
 Wants=network-online.target
@@ -157,7 +238,8 @@ Wants=network-online.target
 Type=simple
 WorkingDirectory=${appDir}
 EnvironmentFile=-${appDir}/env
-ExecStart=/root/.bun/bin/bun --no-install ${appDir}/index.mjs
+Environment=HOST=0.0.0.0
+ExecStart=/usr/bin/env node ${appDir}/${entryRel}
 Restart=always
 RestartSec=5
 
@@ -172,9 +254,22 @@ WantedBy=multi-user.target
             Schedule.spaced(Duration.seconds(5)),
         ]),
     }));
+    const hetznerTransient = (e) => e._tag === "TooManyRequests" ||
+        e._tag === "ServiceUnavailable" ||
+        e._tag === "InternalServerError" ||
+        e._tag === "BadGateway" ||
+        e._tag === "GatewayTimeout" ||
+        e._tag === "Locked";
     const attachAndMount = Effect.fn(function* (input) {
         for (const { volumeId, path } of input.volumes) {
-            let volume = yield* Services.volumes.getVolume({ id: volumeId }).pipe(Effect.map(({ volume }) => volume), Effect.catchTag("NotFound", () => Effect.succeed(undefined)));
+            let volume = yield* Services.volumes.getVolume({ id: volumeId }).pipe(Effect.map(({ volume }) => volume), Effect.retry({
+                while: hetznerTransient,
+                times: 8,
+                schedule: Schedule.min([
+                    Schedule.exponential(Duration.millis(500), 1.5),
+                    Schedule.spaced(Duration.seconds(5)),
+                ]),
+            }), Effect.catchTag("NotFound", () => Effect.succeed(undefined)));
             if (volume === undefined)
                 continue;
             if (volume.server !== input.serverId) {
@@ -185,9 +280,20 @@ WantedBy=multi-user.target
                     .attachVolume({
                     id: volumeId,
                     server: input.serverId,
-                    automount: true,
+                    // No automount: Hetzner would mount the device at
+                    // `/mnt/HC_Volume_{id}`, and a device mounted elsewhere makes
+                    // our own `mount` at the service path fail with
+                    // "already mounted". We own the mount + fstab below.
+                    automount: false,
                 })
-                    .pipe(Effect.tap(({ action }) => waitForAction(action).pipe(Effect.catchTag("ActionTimeout", () => Effect.void))), Effect.catchTag(["UnprocessableEntity", "Locked", "Conflict"], () => Effect.void));
+                    .pipe(Effect.retry({
+                    while: hetznerTransient,
+                    times: 8,
+                    schedule: Schedule.min([
+                        Schedule.exponential(Duration.millis(500), 1.5),
+                        Schedule.spaced(Duration.seconds(5)),
+                    ]),
+                }), Effect.tap(({ action }) => waitForAction(action).pipe(Effect.catchTag("ActionTimeout", () => Effect.void))), Effect.catchTag(["UnprocessableEntity", "Locked", "Conflict"], () => Effect.void));
                 volume = yield* Services.volumes.getVolume({ id: volumeId }).pipe(Effect.flatMap(({ volume }) => volume.server === input.serverId
                     ? Effect.succeed(volume)
                     : Effect.fail({ _tag: "AttachPending" })), Effect.retry({
@@ -212,11 +318,40 @@ WantedBy=multi-user.target
             const pathLit = JSON.stringify(path);
             const deviceLit = JSON.stringify(device);
             const fsLit = JSON.stringify(fsType);
+            // Attach returns before udev creates `/dev/disk/by-id/scsi-0HC_Volume_*`.
             yield* input.ssh.exec([
                 `set -euo pipefail`,
                 `mkdir -p ${pathLit}`,
                 `if ! findmnt -n ${pathLit} >/dev/null 2>&1; then`,
-                `  mount -t ${fsLit} ${deviceLit} ${pathLit} || findmnt -n ${pathLit} >/dev/null`,
+                `  udevadm settle --timeout=10 2>/dev/null || true`,
+                `  mounted=0`,
+                `  for i in 1 2 3 4 5 6 7 8 9 10; do`,
+                // A sibling Service sharing the same (volume, path) may have
+                // mounted it between iterations — that IS the desired state.
+                `    if findmnt -n ${pathLit} >/dev/null 2>&1; then`,
+                `      mounted=1`,
+                `      break`,
+                `    fi`,
+                `    if [ -e ${deviceLit} ]; then`,
+                // A previous attach with automount (or a leaked mount from an
+                // interrupted run) may hold the device at /mnt/HC_Volume_* —
+                // "already mounted" would fail our mount at the service path.
+                `      current="$(findmnt -n -o TARGET ${deviceLit} 2>/dev/null || true)"`,
+                `      if [ -n "$current" ] && [ "$current" != ${pathLit} ]; then`,
+                `        umount ${deviceLit} 2>/dev/null || true`,
+                `      fi`,
+                `      if mount -t ${fsLit} ${deviceLit} ${pathLit}; then`,
+                `        mounted=1`,
+                `        break`,
+                `      fi`,
+                `    fi`,
+                `    sleep 2`,
+                `  done`,
+                `  if [ "$mounted" != 1 ]; then`,
+                `    echo "volume ${deviceLit} could not be mounted at ${pathLit}" >&2`,
+                `    ls -l /dev/disk/by-id 2>/dev/null || true`,
+                `    exit 1`,
+                `  fi`,
                 `fi`,
                 `if ! grep -qF ${pathLit} /etc/fstab; then`,
                 `  echo ${JSON.stringify(`${device} ${path} ${fsType} defaults,nofail 0 2`)} >> /etc/fstab`,
@@ -230,31 +365,33 @@ WantedBy=multi-user.target
         yield* input.ssh.exec([
             `set -uo pipefail`,
             `export HOME=/root`,
-            `export BUN_INSTALL=/root/.bun`,
-            `export PATH="/root/.bun/bin:$PATH"`,
             `mkdir -p ${JSON.stringify(appDir)}`,
-            `if ! command -v curl >/dev/null 2>&1 || ! command -v unzip >/dev/null 2>&1; then`,
+            `if ! command -v curl >/dev/null 2>&1 || ! command -v unzip >/dev/null 2>&1 || ! command -v ca-certificates >/dev/null 2>&1; then`,
             `  apt-get update`,
             `  DEBIAN_FRONTEND=noninteractive apt-get install -y curl unzip ca-certificates`,
             `fi`,
-            `if [ ! -x /root/.bun/bin/bun ]; then`,
+            `if ! command -v node >/dev/null 2>&1 || ! node -e 'process.exit(Number(process.versions.node.split(".")[0])<26)'; then`,
             `  for attempt in 1 2 3 4 5; do`,
-            `    curl -fsSL https://bun.sh/install | bash && break`,
+            `    curl -fsSL https://deb.nodesource.com/setup_26.x | bash - && DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs && break`,
             `    sleep 5`,
             `  done`,
             `fi`,
-            `if [ ! -x /root/.bun/bin/bun ]; then`,
-            `  echo "bun install failed" >&2`,
+            `if ! command -v node >/dev/null 2>&1; then`,
+            `  echo "node install failed" >&2`,
             `  exit 1`,
             `fi`,
         ].join("\n"));
         yield* input.ssh.scp(input.archive, `${appDir}/bundle.zip`);
         yield* input.ssh.scp(new TextEncoder().encode(renderEnvFile(input.env)), `${appDir}/env`);
-        yield* input.ssh.scp(new TextEncoder().encode(renderUnit(input.unitName, appDir)), `/etc/systemd/system/${input.unitName}.service`);
+        yield* input.ssh.scp(new TextEncoder().encode(renderUnit(input.unitName, appDir, input.entryRel ?? "index.mjs")), `/etc/systemd/system/${input.unitName}.service`);
         yield* input.ssh.exec([
-            `set -uo pipefail`,
-            `if [ ! -x /root/.bun/bin/bun ]; then echo "bun missing at start" >&2; exit 1; fi`,
+            `set -euo pipefail`,
+            `export HOME=/root`,
+            `if ! command -v node >/dev/null 2>&1; then echo "node missing at start" >&2; exit 1; fi`,
             `unzip -o ${JSON.stringify(`${appDir}/bundle.zip`)} -d ${JSON.stringify(appDir)}`,
+            `if [ -f ${JSON.stringify(`${appDir}/package.json`)} ]; then`,
+            `  (cd ${JSON.stringify(appDir)} && npm install --omit=dev --no-fund --no-audit)`,
+            `fi`,
             `systemctl daemon-reload`,
             `systemctl enable --now ${input.unitName}.service`,
             `systemctl restart ${input.unitName}.service`,
@@ -265,7 +402,7 @@ WantedBy=multi-user.target
             : "true";
         yield* input.ssh.exec([
             `set -uo pipefail`,
-            `for attempt in 1 2 3 4 5 6 7 8 9 10; do`,
+            `for attempt in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30; do`,
             `  if systemctl is-active --quiet ${input.unitName}.service && ${health}; then`,
             `    exit 0`,
             `  fi`,