@opencode-ai/util 0.0.0-beta-18414 → 0.0.0-beta-18593

package/dist/cross-spawn-spawner.js

@@ -1,5 +1,3 @@
-import * as NodeFileSystem from "@effect/platform-node/NodeFileSystem";
-import * as NodePath from "@effect/platform-node/NodePath";
 import * as NodeSink from "@effect/platform-node/NodeSink";
 import * as NodeStream from "@effect/platform-node/NodeStream";
 import { Deferred, Effect, Exit, FileSystem, Layer, Path, PlatformError, Predicate, Sink, Stream } from "effect";
@@ -263,6 +261,16 @@ const makeCrossSpawnSpawner = Effect.gen(function* () {
             return Effect.void;
         return Effect.fail(toPlatformError("kill", new Error("Failed to kill child process"), command));
     });
+    const stop = (command, proc, exit, opts) => {
+        const send = (signal) => Effect.catch(killGroup(command, proc, signal), () => killOne(command, proc, signal));
+        const attempt = send(opts?.killSignal ?? "SIGTERM").pipe(Effect.andThen(Deferred.await(exit)), Effect.asVoid);
+        if (!opts?.forceKillAfter)
+            return attempt;
+        return Effect.timeoutOrElse(attempt, {
+            duration: opts.forceKillAfter,
+            orElse: () => send("SIGKILL").pipe(Effect.andThen(Deferred.await(exit)), Effect.asVoid),
+        });
+    };
     const timeout = (proc, command, opts) => (f) => {
         const signal = opts?.killSignal ?? "SIGTERM";
         if (Predicate.isUndefined(opts?.forceKillAfter))
@@ -313,16 +321,7 @@ const makeCrossSpawnSpawner = Effect.gen(function* () {
                             return yield* Effect.ignore(kill(killGroup));
                         return yield* Effect.void;
                     }
-                    const send = (s) => Effect.catch(killGroup(command, proc, s), () => killOne(command, proc, s));
-                    const sig = command.options.killSignal ?? "SIGTERM";
-                    const attempt = send(sig).pipe(Effect.andThen(Deferred.await(signal)), Effect.asVoid);
-                    const escalated = command.options.forceKillAfter
-                        ? Effect.timeoutOrElse(attempt, {
-                            duration: command.options.forceKillAfter,
-                            orElse: () => send("SIGKILL").pipe(Effect.andThen(Deferred.await(signal)), Effect.asVoid),
-                        })
-                        : attempt;
-                    return yield* Effect.ignore(escalated);
+                    return yield* Effect.ignore(stop(command, proc, signal, command.options));
                 }));
                 const fd = yield* setupFds(command, proc, extra);
                 const out = setupOutput(command, proc, sout, serr);
@@ -341,17 +340,7 @@ const makeCrossSpawnSpawner = Effect.gen(function* () {
                             return Effect.succeed(ExitCode(code));
                         return Effect.fail(toPlatformError("exitCode", new Error(`Process interrupted due to receipt of signal: '${signal}'`), command));
                     }),
-                    kill: (opts) => {
-                        const sig = opts?.killSignal ?? "SIGTERM";
-                        const send = (s) => Effect.catch(killGroup(command, proc, s), () => killOne(command, proc, s));
-                        const attempt = send(sig).pipe(Effect.andThen(Deferred.await(signal)), Effect.asVoid);
-                        if (!opts?.forceKillAfter)
-                            return attempt;
-                        return Effect.timeoutOrElse(attempt, {
-                            duration: opts.forceKillAfter,
-                            orElse: () => send("SIGKILL").pipe(Effect.andThen(Deferred.await(signal)), Effect.asVoid),
-                        });
-                    },
+                    kill: (opts) => stop(command, proc, signal, opts),
                     unref: Effect.sync(() => {
                         if (ref) {
                             proc.unref();

package/dist/effect/layer-node.js

@@ -64,14 +64,14 @@ function walk(root, visit, options = {}) {
         const cached = cache.get(target);
         if (cached !== undefined || cache.has(target))
             return cached;
-        if (options.detectCycles !== false && visiting.has(target)) {
+        if (visiting.has(target)) {
             const start = stack.indexOf(target);
             throw new Error(`Cycle detected in layer tree: ${[...stack.slice(start), target].map((item) => item.name).join(" -> ")}`);
         }
         visiting.add(target);
         stack.push(target);
         try {
-            const result = visit(target, { cache, visit: recur });
+            const result = visit(target, { visit: recur });
             if (!cache.has(target))
                 cache.set(target, result);
             return result;

package/dist/fs-util.js

@@ -1,4 +1,3 @@
-import * as NodeFileSystem from "@effect/platform-node/NodeFileSystem";
 import path, { dirname, isAbsolute, join, relative, sep } from "path";
 import { realpathSync } from "fs";
 import { readdir } from "fs/promises";

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/util",
-  "version": "0.0.0-beta-18414",
+  "version": "0.0.0-beta-18593",
   "type": "module",
   "license": "MIT",
   "repository": {
@@ -43,9 +43,9 @@
     "typecheck": "tsgo --noEmit"
   },
   "dependencies": {
-    "@effect/opentelemetry": "4.0.0-rc.111",
-    "@effect/platform-node": "4.0.0-rc.111",
-    "@effect/platform-node-shared": "4.0.0-rc.111",
+    "@effect/opentelemetry": "4.0.0-rc.112",
+    "@effect/platform-node": "4.0.0-rc.112",
+    "@effect/platform-node-shared": "4.0.0-rc.112",
     "@npmcli/arborist": "9.4.0",
     "@npmcli/config": "10.8.1",
     "@opentelemetry/api": "1.9.0",
@@ -54,7 +54,7 @@
     "@opentelemetry/sdk-trace-base": "2.6.1",
     "@opentelemetry/sdk-trace-node": "2.6.1",
     "cross-spawn": "7.0.6",
-    "effect": "4.0.0-rc.111",
+    "effect": "4.0.0-rc.112",
     "glob": "13.0.5",
     "mime-types": "3.0.2",
     "minimatch": "10.2.5",