the-moby-effect 1.48.0 → 1.48.2

package/src/internal/endpoints/containers.ts

@@ -1,23 +1,22 @@
+import type * as HttpBody from "@effect/platform/HttpBody";
+import type * as HttpClientError from "@effect/platform/HttpClientError";
+import type * as Layer from "effect/Layer";
+import type * as ParseResult from "effect/ParseResult";
+
 import * as PlatformError from "@effect/platform/Error";
-import * as HttpBody from "@effect/platform/HttpBody";
 import * as HttpClient from "@effect/platform/HttpClient";
-import * as HttpClientError from "@effect/platform/HttpClientError";
 import * as HttpClientRequest from "@effect/platform/HttpClientRequest";
 import * as HttpClientResponse from "@effect/platform/HttpClientResponse";
 import * as Socket from "@effect/platform/Socket";
 import * as Effect from "effect/Effect";
 import * as Function from "effect/Function";
-import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
-import * as ParseResult from "effect/ParseResult";
 import * as Predicate from "effect/Predicate";
 import * as Schema from "effect/Schema";
 import * as Stream from "effect/Stream";
 import * as Tuple from "effect/Tuple";
+import * as MobyDemux from "../../MobyDemux.js";
 
-import { responseToStreamingSocketOrFailUnsafe } from "../demux/hijack.js";
-import { MultiplexedSocket } from "../demux/multiplexed.js";
-import { makeRawSocket, RawSocket } from "../demux/raw.js";
 import {
     ContainerChange,
     ContainerConfig,
@@ -431,7 +430,7 @@ export class Containers extends Effect.Service<Containers>()("@the-moby-effect/e
                       readonly stderr?: boolean | undefined;
                   }
                 | undefined
-        ): Effect.Effect<RawSocket | MultiplexedSocket, ContainersError, never> =>
+        ): Effect.Effect<MobyDemux.RawSocket | MobyDemux.MultiplexedSocket, ContainersError, never> =>
             Function.pipe(
                 HttpClientRequest.post(`/containers/${encodeURIComponent(id)}/attach`),
                 HttpClientRequest.setHeader("Upgrade", "tcp"),
@@ -443,7 +442,7 @@ export class Containers extends Effect.Service<Containers>()("@the-moby-effect/e
                 maybeAddQueryParameter("stdout", Option.fromNullable(options?.stdout)),
                 maybeAddQueryParameter("stderr", Option.fromNullable(options?.stderr)),
                 maybeUpgradedClient.execute,
-                Effect.flatMap(responseToStreamingSocketOrFailUnsafe),
+                Effect.flatMap(MobyDemux.responseToStreamingSocketOrFailUnsafe),
                 Effect.mapError((cause) => new ContainersError({ method: "attach", cause }))
             );
 
@@ -460,7 +459,7 @@ export class Containers extends Effect.Service<Containers>()("@the-moby-effect/e
                       readonly stderr?: boolean | undefined;
                   }
                 | undefined
-        ): Effect.Effect<RawSocket, ContainersError, never> =>
+        ): Effect.Effect<MobyDemux.RawSocket, ContainersError, never> =>
             Function.pipe(
                 HttpClientRequest.get(`/containers/${encodeURIComponent(id)}/attach/ws`),
                 maybeAddQueryParameter("detachKeys", Option.fromNullable(options?.detachKeys)),
@@ -470,7 +469,7 @@ export class Containers extends Effect.Service<Containers>()("@the-moby-effect/e
                 maybeAddQueryParameter("stdout", Option.fromNullable(options?.stdout)),
                 maybeAddQueryParameter("stderr", Option.fromNullable(options?.stderr)),
                 websocketRequest,
-                Effect.map(makeRawSocket),
+                Effect.map(MobyDemux.makeRawSocket),
                 Effect.provideService(HttpClient.HttpClient, contextClient),
                 Effect.provideService(Socket.WebSocketConstructor, websocketConstructor),
                 Effect.mapError((cause) => new ContainersError({ method: "attachWebsocket", cause }))

package/src/internal/endpoints/distribution.ts

@@ -1,13 +1,14 @@
+import type * as HttpBody from "@effect/platform/HttpBody";
+import type * as HttpClientError from "@effect/platform/HttpClientError";
+import type * as Layer from "effect/Layer";
+import type * as ParseResult from "effect/ParseResult";
+
 import * as PlatformError from "@effect/platform/Error";
-import * as HttpBody from "@effect/platform/HttpBody";
 import * as HttpClient from "@effect/platform/HttpClient";
-import * as HttpClientError from "@effect/platform/HttpClientError";
 import * as HttpClientRequest from "@effect/platform/HttpClientRequest";
 import * as HttpClientResponse from "@effect/platform/HttpClientResponse";
 import * as Effect from "effect/Effect";
 import * as Function from "effect/Function";
-import * as Layer from "effect/Layer";
-import * as ParseResult from "effect/ParseResult";
 import * as Predicate from "effect/Predicate";
 
 import { RegistryDistributionInspect } from "../generated/index.js";

package/src/internal/endpoints/execs.ts

@@ -1,22 +1,21 @@
+import type * as HttpBody from "@effect/platform/HttpBody";
+import type * as HttpClientError from "@effect/platform/HttpClientError";
+import type * as Socket from "@effect/platform/Socket";
+import type * as Layer from "effect/Layer";
+import type * as ParseResult from "effect/ParseResult";
+
 import * as PlatformError from "@effect/platform/Error";
-import * as HttpBody from "@effect/platform/HttpBody";
 import * as HttpClient from "@effect/platform/HttpClient";
-import * as HttpClientError from "@effect/platform/HttpClientError";
 import * as HttpClientRequest from "@effect/platform/HttpClientRequest";
 import * as HttpClientResponse from "@effect/platform/HttpClientResponse";
-import * as Socket from "@effect/platform/Socket";
 import * as Effect from "effect/Effect";
 import * as Function from "effect/Function";
-import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
-import * as ParseResult from "effect/ParseResult";
 import * as Predicate from "effect/Predicate";
 import * as Schema from "effect/Schema";
 import * as Tuple from "effect/Tuple";
+import * as MobyDemux from "../../MobyDemux.js";
 
-import { responseToStreamingSocketOrFailUnsafe } from "../demux/hijack.js";
-import { MultiplexedSocket } from "../demux/multiplexed.js";
-import { RawSocket } from "../demux/raw.js";
 import {
     ContainerExecOptions as ContainerExecStartConfig,
     ContainerExecOptions as ExecConfig,
@@ -111,8 +110,16 @@ export class Execs extends Effect.Service<Execs>()("@the-moby-effect/endpoints/E
         const start_ = <T extends boolean | undefined = undefined>(
             id: string,
             execStartConfig: Omit<typeof ContainerExecStartConfig.Encoded, "Detach"> & { Detach?: T }
-        ): Effect.Effect<T extends true ? void : MultiplexedSocket | RawSocket, ExecsError, never> => {
-            type U = Effect.Effect<T extends true ? void : MultiplexedSocket | RawSocket, ExecsError, never>;
+        ): Effect.Effect<
+            T extends true ? void : MobyDemux.MultiplexedSocket | MobyDemux.RawSocket,
+            ExecsError,
+            never
+        > => {
+            type U = Effect.Effect<
+                T extends true ? void : MobyDemux.MultiplexedSocket | MobyDemux.RawSocket,
+                ExecsError,
+                never
+            >;
 
             const response = Function.pipe(
                 Schema.decode(ContainerExecStartConfig)(execStartConfig),
@@ -125,7 +132,7 @@ export class Execs extends Effect.Service<Execs>()("@the-moby-effect/endpoints/E
             );
 
             const toStreamingSock = Function.compose(
-                responseToStreamingSocketOrFailUnsafe,
+                MobyDemux.responseToStreamingSocketOrFailUnsafe,
                 Effect.mapError((cause) => new ExecsError({ method: "start", cause }))
             );
 

package/src/internal/endpoints/images.ts

@@ -1,14 +1,15 @@
+import type * as HttpBody from "@effect/platform/HttpBody";
+import type * as HttpClientError from "@effect/platform/HttpClientError";
+import type * as Layer from "effect/Layer";
+import type * as ParseResult from "effect/ParseResult";
+
 import * as PlatformError from "@effect/platform/Error";
-import * as HttpBody from "@effect/platform/HttpBody";
 import * as HttpClient from "@effect/platform/HttpClient";
-import * as HttpClientError from "@effect/platform/HttpClientError";
 import * as HttpClientRequest from "@effect/platform/HttpClientRequest";
 import * as HttpClientResponse from "@effect/platform/HttpClientResponse";
 import * as Effect from "effect/Effect";
 import * as Function from "effect/Function";
-import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
-import * as ParseResult from "effect/ParseResult";
 import * as Predicate from "effect/Predicate";
 import * as Schema from "effect/Schema";
 import * as Stream from "effect/Stream";

package/src/internal/endpoints/networks.ts

@@ -1,14 +1,15 @@
+import type * as HttpBody from "@effect/platform/HttpBody";
+import type * as HttpClientError from "@effect/platform/HttpClientError";
+import type * as Layer from "effect/Layer";
+import type * as ParseResult from "effect/ParseResult";
+
 import * as PlatformError from "@effect/platform/Error";
-import * as HttpBody from "@effect/platform/HttpBody";
 import * as HttpClient from "@effect/platform/HttpClient";
-import * as HttpClientError from "@effect/platform/HttpClientError";
 import * as HttpClientRequest from "@effect/platform/HttpClientRequest";
 import * as HttpClientResponse from "@effect/platform/HttpClientResponse";
 import * as Effect from "effect/Effect";
 import * as Function from "effect/Function";
-import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
-import * as ParseResult from "effect/ParseResult";
 import * as Predicate from "effect/Predicate";
 import * as Schema from "effect/Schema";
 import * as Tuple from "effect/Tuple";

package/src/internal/endpoints/nodes.ts

@@ -1,14 +1,15 @@
+import type * as HttpBody from "@effect/platform/HttpBody";
+import type * as HttpClientError from "@effect/platform/HttpClientError";
+import type * as Layer from "effect/Layer";
+import type * as ParseResult from "effect/ParseResult";
+
 import * as PlatformError from "@effect/platform/Error";
-import * as HttpBody from "@effect/platform/HttpBody";
 import * as HttpClient from "@effect/platform/HttpClient";
-import * as HttpClientError from "@effect/platform/HttpClientError";
 import * as HttpClientRequest from "@effect/platform/HttpClientRequest";
 import * as HttpClientResponse from "@effect/platform/HttpClientResponse";
 import * as Effect from "effect/Effect";
 import * as Function from "effect/Function";
-import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
-import * as ParseResult from "effect/ParseResult";
 import * as Predicate from "effect/Predicate";
 import * as Schema from "effect/Schema";
 

package/src/internal/endpoints/plugins.ts

@@ -1,17 +1,18 @@
+import type * as HttpBody from "@effect/platform/HttpBody";
+import type * as HttpClientError from "@effect/platform/HttpClientError";
+import type * as Layer from "effect/Layer";
+import type * as ParseResult from "effect/ParseResult";
+import type * as Stream from "effect/Stream";
+
 import * as PlatformError from "@effect/platform/Error";
-import * as HttpBody from "@effect/platform/HttpBody";
 import * as HttpClient from "@effect/platform/HttpClient";
-import * as HttpClientError from "@effect/platform/HttpClientError";
 import * as HttpClientRequest from "@effect/platform/HttpClientRequest";
 import * as HttpClientResponse from "@effect/platform/HttpClientResponse";
 import * as Effect from "effect/Effect";
 import * as Function from "effect/Function";
-import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
-import * as ParseResult from "effect/ParseResult";
 import * as Predicate from "effect/Predicate";
 import * as Schema from "effect/Schema";
-import * as Stream from "effect/Stream";
 
 import { Plugin, PluginPrivilege } from "../generated/index.js";
 import { maybeAddHeader, maybeAddQueryParameter } from "./common.js";

package/src/internal/endpoints/secrets.ts

@@ -1,14 +1,15 @@
+import type * as HttpBody from "@effect/platform/HttpBody";
+import type * as HttpClientError from "@effect/platform/HttpClientError";
+import type * as Layer from "effect/Layer";
+import type * as ParseResult from "effect/ParseResult";
+
 import * as PlatformError from "@effect/platform/Error";
-import * as HttpBody from "@effect/platform/HttpBody";
 import * as HttpClient from "@effect/platform/HttpClient";
-import * as HttpClientError from "@effect/platform/HttpClientError";
 import * as HttpClientRequest from "@effect/platform/HttpClientRequest";
 import * as HttpClientResponse from "@effect/platform/HttpClientResponse";
 import * as Effect from "effect/Effect";
 import * as Function from "effect/Function";
-import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
-import * as ParseResult from "effect/ParseResult";
 import * as Predicate from "effect/Predicate";
 import * as Schema from "effect/Schema";
 import * as Tuple from "effect/Tuple";

package/src/internal/endpoints/services.ts

@@ -1,14 +1,15 @@
+import type * as HttpBody from "@effect/platform/HttpBody";
+import type * as HttpClientError from "@effect/platform/HttpClientError";
+import type * as Layer from "effect/Layer";
+import type * as ParseResult from "effect/ParseResult";
+
 import * as PlatformError from "@effect/platform/Error";
-import * as HttpBody from "@effect/platform/HttpBody";
 import * as HttpClient from "@effect/platform/HttpClient";
-import * as HttpClientError from "@effect/platform/HttpClientError";
 import * as HttpClientRequest from "@effect/platform/HttpClientRequest";
 import * as HttpClientResponse from "@effect/platform/HttpClientResponse";
 import * as Effect from "effect/Effect";
 import * as Function from "effect/Function";
-import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
-import * as ParseResult from "effect/ParseResult";
 import * as Predicate from "effect/Predicate";
 import * as Schema from "effect/Schema";
 import * as Stream from "effect/Stream";

package/src/internal/endpoints/session.ts

@@ -1,11 +1,12 @@
+import type * as HttpClientError from "@effect/platform/HttpClientError";
+import type * as Socket from "@effect/platform/Socket";
+import type * as Layer from "effect/Layer";
+
 import * as PlatformError from "@effect/platform/Error";
 import * as HttpClient from "@effect/platform/HttpClient";
-import * as HttpClientError from "@effect/platform/HttpClientError";
 import * as HttpClientRequest from "@effect/platform/HttpClientRequest";
-import * as Socket from "@effect/platform/Socket";
 import * as Effect from "effect/Effect";
 import * as Function from "effect/Function";
-import * as Layer from "effect/Layer";
 import * as Predicate from "effect/Predicate";
 
 import { hijackResponseUnsafe } from "../demux/hijack.js";

package/src/internal/endpoints/swarm.ts

@@ -1,14 +1,15 @@
+import type * as HttpBody from "@effect/platform/HttpBody";
+import type * as HttpClientError from "@effect/platform/HttpClientError";
+import type * as Layer from "effect/Layer";
+import type * as ParseResult from "effect/ParseResult";
+
 import * as PlatformError from "@effect/platform/Error";
-import * as HttpBody from "@effect/platform/HttpBody";
 import * as HttpClient from "@effect/platform/HttpClient";
-import * as HttpClientError from "@effect/platform/HttpClientError";
 import * as HttpClientRequest from "@effect/platform/HttpClientRequest";
 import * as HttpClientResponse from "@effect/platform/HttpClientResponse";
 import * as Effect from "effect/Effect";
 import * as Function from "effect/Function";
-import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
-import * as ParseResult from "effect/ParseResult";
 import * as Predicate from "effect/Predicate";
 import * as Schema from "effect/Schema";
 import * as Tuple from "effect/Tuple";

package/src/internal/endpoints/system.ts

@@ -1,14 +1,15 @@
+import type * as HttpBody from "@effect/platform/HttpBody";
+import type * as HttpClientError from "@effect/platform/HttpClientError";
+import type * as Layer from "effect/Layer";
+import type * as ParseResult from "effect/ParseResult";
+
 import * as PlatformError from "@effect/platform/Error";
-import * as HttpBody from "@effect/platform/HttpBody";
 import * as HttpClient from "@effect/platform/HttpClient";
-import * as HttpClientError from "@effect/platform/HttpClientError";
 import * as HttpClientRequest from "@effect/platform/HttpClientRequest";
 import * as HttpClientResponse from "@effect/platform/HttpClientResponse";
 import * as Effect from "effect/Effect";
 import * as Function from "effect/Function";
-import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
-import * as ParseResult from "effect/ParseResult";
 import * as Predicate from "effect/Predicate";
 import * as Schema from "effect/Schema";
 import * as Stream from "effect/Stream";

package/src/internal/endpoints/tasks.ts

@@ -1,13 +1,14 @@
+import type * as HttpClientError from "@effect/platform/HttpClientError";
+import type * as Layer from "effect/Layer";
+import type * as ParseResult from "effect/ParseResult";
+
 import * as PlatformError from "@effect/platform/Error";
 import * as HttpClient from "@effect/platform/HttpClient";
-import * as HttpClientError from "@effect/platform/HttpClientError";
 import * as HttpClientRequest from "@effect/platform/HttpClientRequest";
 import * as HttpClientResponse from "@effect/platform/HttpClientResponse";
 import * as Effect from "effect/Effect";
 import * as Function from "effect/Function";
-import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
-import * as ParseResult from "effect/ParseResult";
 import * as Predicate from "effect/Predicate";
 import * as Schema from "effect/Schema";
 import * as Stream from "effect/Stream";

package/src/internal/endpoints/volumes.ts

@@ -1,14 +1,15 @@
+import type * as HttpBody from "@effect/platform/HttpBody";
+import type * as HttpClientError from "@effect/platform/HttpClientError";
+import type * as Layer from "effect/Layer";
+import type * as ParseResult from "effect/ParseResult";
+
 import * as PlatformError from "@effect/platform/Error";
-import * as HttpBody from "@effect/platform/HttpBody";
 import * as HttpClient from "@effect/platform/HttpClient";
-import * as HttpClientError from "@effect/platform/HttpClientError";
 import * as HttpClientRequest from "@effect/platform/HttpClientRequest";
 import * as HttpClientResponse from "@effect/platform/HttpClientResponse";
 import * as Effect from "effect/Effect";
 import * as Function from "effect/Function";
-import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
-import * as ParseResult from "effect/ParseResult";
 import * as Predicate from "effect/Predicate";
 import * as Schema from "effect/Schema";
 import * as Tuple from "effect/Tuple";

package/src/internal/engines/dind.ts

@@ -1,7 +1,10 @@
 import type * as PlatformError from "@effect/platform/Error";
 import type * as ParseResult from "effect/ParseResult";
+import type * as Schema from "effect/Schema";
 import type * as Scope from "effect/Scope";
+import type * as TarCommon from "eftar/Common";
 import type * as DindEngine from "../../DindEngine.js";
+import type * as BlobConstants from "../blobs/constants.js";
 
 import * as FileSystem from "@effect/platform/FileSystem";
 import * as Path from "@effect/platform/Path";
@@ -14,18 +17,15 @@ import * as Match from "effect/Match";
 import * as Number from "effect/Number";
 import * as Option from "effect/Option";
 import * as Schedule from "effect/Schedule";
-import * as Schema from "effect/Schema";
 import * as Stream from "effect/Stream";
 import * as String from "effect/String";
 import * as Tuple from "effect/Tuple";
-import * as TarCommon from "eftar/Common";
 import * as Tar from "eftar/Tar";
 import * as Untar from "eftar/Untar";
 import * as DockerEngine from "../../DockerEngine.js";
 import * as MobyConnection from "../../MobyConnection.js";
 import * as MobyConvey from "../../MobyConvey.js";
 import * as MobyEndpoints from "../../MobyEndpoints.js";
-import * as BlobConstants from "../blobs/constants.js";
 import * as internalHttpBlob from "../blobs/http.js";
 import * as internalHttpsBlob from "../blobs/https.js";
 import * as internalSocketBlob from "../blobs/socket.js";
@@ -165,7 +165,6 @@ const waitForDindContainerToBeReady = (
 export const makeDindLayerFromPlatformConstructor =
     <
         PlatformLayerConstructor extends (
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             connectionOptions: any
         ) => Layer.Layer<Layer.Layer.Success<DockerEngine.DockerLayer>, unknown, unknown>,
         SupportedConnectionOptions extends MobyConnection.MobyConnectionOptions = PlatformLayerConstructor extends (

package/src/internal/engines/docker.ts

@@ -1,8 +1,8 @@
+import type * as Socket from "@effect/platform/Socket";
 import type * as ParseResult from "effect/ParseResult";
 import type * as Scope from "effect/Scope";
 import type * as MobySchemas from "../../MobySchemas.js";
 
-import * as Socket from "@effect/platform/Socket";
 import * as Array from "effect/Array";
 import * as Channel from "effect/Channel";
 import * as Effect from "effect/Effect";
@@ -13,6 +13,7 @@ import * as MutableHashMap from "effect/MutableHashMap";
 import * as Option from "effect/Option";
 import * as Predicate from "effect/Predicate";
 import * as Schedule from "effect/Schedule";
+import * as Schema from "effect/Schema";
 import * as Sink from "effect/Sink";
 import * as Stream from "effect/Stream";
 import * as Tuple from "effect/Tuple";
@@ -272,28 +273,6 @@ const execWebsocketsRegistry = Global.globalValue("the-moby-effect/engines/docke
     MutableHashMap.empty<string, Effect.Semaphore>()
 );
 
-/** @internal */
-const validShellEntrypoints = Global.globalValue(
-    "the-moby-effect/engines/docker/execWebsocketsValidShellEntrypoints",
-    () =>
-        new Set([
-            "/bin/sh", // Basic shell available in most containers
-            "/bin/bash", // Bash shell (common in many Linux distributions)
-            "/usr/bin/bash", // Alternative location for bash
-            "/bin/dash", // Debian Almquist shell (lightweight shell)
-            "/bin/ash", // Lightweight shell used in Alpine Linux
-            "/bin/zsh", // Z shell
-            "/usr/bin/zsh", // Alternative location for zsh
-            "/bin/ksh", // Korn shell
-            "/bin/tcsh", // TENEX C shell
-            "/bin/csh", // C shell
-            "/usr/bin/fish", // Friendly interactive shell
-            "/usr/local/bin/bash", // Alternative location for bash
-            "/usr/local/bin/sh", // Alternative location for sh
-            "/busybox/sh", // Busybox shell
-        ])
-);
-
 /** @internal */
 export const execWebsocketsNonBlocking = ({
     command,
@@ -320,15 +299,27 @@ export const execWebsocketsNonBlocking = ({
         const acquire = Effect.gen(function* () {
             const inspect = yield* containers.inspect(containerId);
             const command = Array.join(inspect.Config?.Cmd ?? [], " ");
-            const entrypoint = Array.join(inspect.Config?.Entrypoint ?? [], " ");
-            if (!validShellEntrypoints.has(command) && !validShellEntrypoints.has(entrypoint)) {
-                return yield* new MobyEndpoints.ContainersError({
-                    method: "exec",
-                    cause: new Error(
-                        `The underlying container must have a shell entrypoint/command in order to use execWebsocket, your containers command was: ${command} and entrypoint is: ${entrypoint} neither of which are valid shell entrypoints`
-                    ),
-                });
-            }
+            yield* Effect.mapError(
+                Schema.decodeUnknown(
+                    Schema.Literal(
+                        "/bin/sh", // Basic shell available in most containers
+                        "/bin/bash", // Bash shell (common in many Linux distributions)
+                        "/usr/bin/bash", // Alternative location for bash
+                        "/bin/dash", // Debian Almquist shell (lightweight shell)
+                        "/bin/ash", // Lightweight shell used in Alpine Linux
+                        "/bin/zsh", // Z shell
+                        "/usr/bin/zsh", // Alternative location for zsh
+                        "/bin/ksh", // Korn shell
+                        "/bin/tcsh", // TENEX C shell
+                        "/bin/csh", // C shell
+                        "/usr/bin/fish", // Friendly interactive shell
+                        "/usr/local/bin/bash", // Alternative location for bash
+                        "/usr/local/bin/sh", // Alternative location for sh
+                        "/busybox/sh" // Busybox shell
+                    )
+                )(command),
+                (cause) => new MobyEndpoints.ContainersError({ method: "exec", cause })
+            );
             yield* mutex.take(1);
         });
 

package/src/internal/engines/dockerCompose.ts

@@ -1,4 +1,5 @@
 import type * as ParseResult from "effect/ParseResult";
+import type * as Scope from "effect/Scope";
 import type * as DockerComposeEngine from "../../DockerComposeEngine.js";
 
 import * as PlatformError from "@effect/platform/Error";
@@ -10,7 +11,6 @@ import * as Function from "effect/Function";
 import * as Layer from "effect/Layer";
 import * as Predicate from "effect/Predicate";
 import * as Record from "effect/Record";
-import * as Scope from "effect/Scope";
 import * as Sink from "effect/Sink";
 import * as Stream from "effect/Stream";
 import * as String from "effect/String";
@@ -152,7 +152,7 @@ export const make: Effect.Effect<
                 Stream.flatMap(stream, (a: A) => Stream.fromEffect(Effect.map(effect, Function.constant(a))));
 
             return streamFailableEnsuring(
-                MobyDemux.mergeToTaggedStream(stdout, stderr),
+                MobyDemux.mergeRawToTaggedStream(stdout, stderr),
                 MobyDemux.demuxRawToSingleSink(stdin, Stream.make(new Socket.CloseEvent()), Sink.drain)
             );
         }).pipe(

package/src/internal/platforms/agnostic.ts

@@ -72,7 +72,7 @@ export const websocketRequest = (
     });
 
 /** @internal */
-export const makeAgnosticHttpLayer = (
+export const makeAgnosticHttpClientLayer = (
     connectionOptions: MobyConnection.MobyConnectionOptions
 ): Layer.Layer<HttpClient.HttpClient, never, HttpClient.HttpClient> =>
     Function.pipe(
@@ -110,10 +110,10 @@ export const makeAgnosticWebsocketLayer = (
     );
 
 /** @internal */
-export const makeAgnosticHttpClientLayer = (
+export const makeAgnosticLayer = (
     connectionOptions: MobyConnection.MobyConnectionOptions
 ): Layer.Layer<Socket.WebSocketConstructor | HttpClient.HttpClient, never, HttpClient.HttpClient> => {
-    const httpClientLayer = makeAgnosticHttpLayer(connectionOptions);
+    const httpClientLayer = makeAgnosticHttpClientLayer(connectionOptions);
     const websocketLayer = makeAgnosticWebsocketLayer(connectionOptions);
     return Layer.merge(websocketLayer, httpClientLayer);
 };

package/src/internal/platforms/fetch.ts

@@ -10,4 +10,4 @@ import * as internalAgnostic from "./agnostic.js";
 export const makeFetchHttpClientLayer = (
     connectionOptions: MobyConnection.HttpConnectionOptionsTagged | MobyConnection.HttpsConnectionOptionsTagged
 ): Layer.Layer<HttpClient.HttpClient | Socket.WebSocketConstructor, never, never> =>
-    Layer.provide(internalAgnostic.makeAgnosticHttpClientLayer(connectionOptions), FetchHttpClient.layer);
+    Layer.provide(internalAgnostic.makeAgnosticLayer(connectionOptions), FetchHttpClient.layer);

package/src/internal/platforms/needs.ts

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/consistent-type-imports */
+
 import type * as Effect from "effect/Effect";
 import type * as Layer from "effect/Layer";
 

package/src/internal/platforms/node.ts

@@ -155,6 +155,6 @@ export const makeNodeHttpClientLayer = (
         ),
         Layer.unwrapEffect
     );
-    const agnosticHttpClientLayer = internalAgnostic.makeAgnosticHttpClientLayer(connectionOptions);
+    const agnosticHttpClientLayer = internalAgnostic.makeAgnosticLayer(connectionOptions);
     return Layer.provide(agnosticHttpClientLayer, nodeHttpClientLayer);
 };

package/src/internal/platforms/undici.ts

@@ -127,6 +127,6 @@ export const makeUndiciHttpClientLayer = (
         Layer.unwrapEffect
     );
 
-    const agnosticHttpClientLayer = internalAgnostic.makeAgnosticHttpClientLayer(connectionOptions);
+    const agnosticHttpClientLayer = internalAgnostic.makeAgnosticLayer(connectionOptions);
     return Layer.provide(agnosticHttpClientLayer, undiciLayer);
 };

package/src/internal/platforms/web.ts

@@ -16,6 +16,6 @@ export const makeWebHttpClientLayer = (
         Effect.map((browserHttpClientLazy) => browserHttpClientLazy.layerXMLHttpRequest),
         Layer.unwrapEffect
     );
-    const agnosticHttpClientLayer = internalAgnostic.makeAgnosticHttpClientLayer(connectionOptions);
+    const agnosticHttpClientLayer = internalAgnostic.makeAgnosticLayer(connectionOptions);
     return Layer.provide(agnosticHttpClientLayer, browserLayer);
 };

package/src/internal/schemas/cidrBlock.ts

@@ -4,6 +4,8 @@
  * @since 1.0.0
  */
 
+import type * as Family from "./family.js";
+
 import * as Array from "effect/Array";
 import * as Effect from "effect/Effect";
 import * as Function from "effect/Function";
@@ -12,7 +14,6 @@ import * as Schema from "effect/Schema";
 import * as Stream from "effect/Stream";
 import * as Address from "./address.js";
 import * as CidrBlockMask from "./cidrBlockMask.js";
-import * as Family from "./family.js";
 import * as IPv4 from "./ipv4.js";
 import * as IPv6 from "./ipv6.js";