@opencode-ai/util 0.0.0-dev-18636 → 0.0.0-dev-18650

package/dist/bom.d.ts

@@ -1,6 +1,6 @@
 export * as Bom from "./bom.js";
 import { Effect } from "effect";
-import { FSUtil } from "./fs-util.js";
+import type { FSUtil } from "./fs-util.js";
 export declare function split(text: string): {
     bom: boolean;
     text: string;

package/dist/bom.js

@@ -1,6 +1,5 @@
 export * as Bom from "./bom.js";
 import { Effect } from "effect";
-import { FSUtil } from "./fs-util.js";
 const code = 0xfeff;
 const value = String.fromCharCode(code);
 export function split(text) {

package/dist/cross-spawn-spawner.js

@@ -1,3 +1,4 @@
+import { isArrayNonEmpty } from "effect/Array";
 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";
@@ -46,11 +47,10 @@ const flatten = (command) => {
         }
     };
     walk(command);
-    if (commands.length === 0)
+    if (!isArrayNonEmpty(commands))
         throw new Error("flatten produced empty commands array");
-    const [head, ...tail] = commands;
     return {
-        commands: [head, ...tail],
+        commands,
         opts,
     };
 };

package/dist/effect-flock.js

@@ -171,9 +171,10 @@ export var EffectFlock;
             // acquireRelease: acquire is uninterruptible, release is guaranteed
             const handle = yield* Effect.acquireRelease(acquireHandle(lockfile, key, { staleMs, timeoutMs }), (handle) => release(handle));
             // Heartbeat fiber — scoped, so it's interrupted before release runs
-            yield* fs
-                .utimes(handle.heartbeatPath, new Date(), new Date())
-                .pipe(Effect.ignore, Effect.repeat(Schedule.spaced(Math.max(100, Math.floor(staleMs / 3)))), Effect.forkScoped);
+            yield* Effect.suspend(() => {
+                const now = new Date();
+                return fs.utimes(handle.heartbeatPath, now, now);
+            }).pipe(Effect.ignore, Effect.repeat(Schedule.spaced(Math.max(100, Math.floor(staleMs / 3)))), Effect.forkScoped);
         });
         const withLock = Function.dual((args) => Effect.isEffect(args[0]), (body, key, dir) => Effect.scoped(Effect.gen(function* () {
             yield* acquire(key, dir);

package/dist/process.js

@@ -115,7 +115,7 @@ const layer = Layer.effect(Service, Effect.gen(function* () {
         const aborted = options?.signal
             ? timed.pipe(Effect.raceFirst(waitForAbort(options.signal).pipe(Effect.mapError((cause) => wrapError(description, cause)))))
             : timed;
-        return aborted.pipe(Effect.catch((cause) => Effect.fail(wrapError(description, cause))));
+        return aborted.pipe(Effect.mapError((cause) => wrapError(description, cause)));
     };
     const run = Effect.fn("AppProcess.run")(function* (command, options) {
         if (options?.stdin === undefined)
@@ -137,9 +137,14 @@ const layer = Layer.effect(Service, Effect.gen(function* () {
         const okExitCodes = options?.okExitCodes;
         const built = Stream.unwrap(Effect.gen(function* () {
             const handle = yield* spawner.spawn(command);
-            const stderrFiber = yield* Effect.forkScoped(collectStream(handle.stderr, options?.maxErrorBytes).pipe(Effect.map((x) => x.buffer.toString("utf8"))));
-            const source = options?.includeStderr === true ? handle.all : handle.stdout;
-            const lines = source.pipe(Stream.decodeText, Stream.splitLines, Stream.filter((line) => line.length > 0));
+            const streams = options?.includeStderr === true
+                ? yield* handle.stderr.pipe(Stream.broadcastN({ n: 2, capacity: 16 }), Effect.map((copies) => ({
+                    source: Stream.merge(handle.stdout, copies[0]),
+                    diagnostics: copies[1],
+                })))
+                : { source: handle.stdout, diagnostics: handle.stderr };
+            const stderrFiber = yield* Effect.forkScoped(collectStream(streams.diagnostics, options?.maxErrorBytes).pipe(Effect.map((x) => x.buffer.toString("utf8"))));
+            const lines = streams.source.pipe(Stream.decodeText, Stream.splitLines, Stream.filter((line) => line.length > 0));
             const tail = Stream.unwrap(Effect.gen(function* () {
                 const code = yield* handle.exitCode;
                 if (okExitCodes && okExitCodes.length > 0 && !okExitCodes.includes(code)) {
@@ -150,7 +155,7 @@ const layer = Layer.effect(Service, Effect.gen(function* () {
             }));
             return Stream.concat(lines, tail);
         }));
-        const mapped = built.pipe(Stream.catch((cause) => Stream.fail(wrapError(description, cause))));
+        const mapped = built.pipe(Stream.mapError((cause) => wrapError(description, cause)));
         if (!options?.signal)
             return mapped;
         const signal = options.signal;

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/util",
-  "version": "0.0.0-dev-18636",
+  "version": "0.0.0-dev-18650",
   "type": "module",
   "license": "MIT",
   "repository": {