Apply PR #18798: fix: restore cross-spawn behavior for effect child processes

Author: opencode-agent[bot]

packages/opencode/src/installation/index.ts

@@ -1,6 +1,7 @@
-import { NodeChildProcessSpawner, NodeFileSystem, NodePath } from "@effect/platform-node"
+import { NodeFileSystem, NodePath } from "@effect/platform-node"
 import { Effect, Layer, Schema, ServiceMap, Stream } from "effect"
 import { FetchHttpClient, HttpClient, HttpClientRequest, HttpClientResponse } from "effect/unstable/http"
+import * as CrossSpawnSpawner from "@/effect/cross-spawn-spawner"
 import { makeRuntime } from "@/effect/run-service"
 import { withTransientReadRetry } from "@/util/effect-http-client"
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
@@ -340,7 +341,7 @@ export namespace Installation {
 
   export const defaultLayer = layer.pipe(
     Layer.provide(FetchHttpClient.layer),
-    Layer.provide(NodeChildProcessSpawner.layer),
+    Layer.provide(CrossSpawnSpawner.layer),
     Layer.provide(NodeFileSystem.layer),
     Layer.provide(NodePath.layer),
   )

packages/opencode/src/snapshot/index.ts

@@ -1,8 +1,9 @@
-import { NodeChildProcessSpawner, NodeFileSystem, NodePath } from "@effect/platform-node"
+import { NodeFileSystem, NodePath } from "@effect/platform-node"
 import { Cause, Duration, Effect, Layer, Schedule, ServiceMap, Stream } from "effect"
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
 import path from "path"
 import z from "zod"
+import * as CrossSpawnSpawner from "@/effect/cross-spawn-spawner"
 import { InstanceState } from "@/effect/instance-state"
 import { makeRuntime } from "@/effect/run-service"
 import { AppFileSystem } from "@/filesystem"
@@ -354,9 +355,9 @@ export namespace Snapshot {
     )
 
   export const defaultLayer = layer.pipe(
-    Layer.provide(NodeChildProcessSpawner.layer),
+    Layer.provide(CrossSpawnSpawner.layer),
     Layer.provide(AppFileSystem.defaultLayer),
-    Layer.provide(NodeFileSystem.layer), // needed by NodeChildProcessSpawner
+    Layer.provide(NodeFileSystem.layer), // needed by CrossSpawnSpawner
     Layer.provide(NodePath.layer),
   )
 

packages/opencode/test/effect/cross-spawn-spawner.test.ts

@@ -305,7 +305,7 @@ describe("cross-spawn spawner", () => {
     test("returns empty stream for unconfigured fd", async () => {
       const out = await runScoped(
         Effect.gen(function* () {
-          const handle = yield* ChildProcess.make("echo", ["test"])
+          const handle = yield* ChildProcess.make("sh", ["-c", "echo test"])
           const fd3Output = yield* decodeByteStream(handle.getOutputFd(3))
           yield* handle.exitCode
           return fd3Output
@@ -342,7 +342,10 @@ describe("cross-spawn spawner", () => {
             const handle = yield* ChildProcess.make("sh", ["-c", "seq 1 100000"])
             const output = yield* handle.stdout.pipe(
               Stream.decodeText(),
-              Stream.runFold(() => "", (acc, chunk) => acc + chunk),
+              Stream.runFold(
+                () => "",
+                (acc, chunk) => acc + chunk,
+              ),
             )
             yield* handle.exitCode
             return output