@opencode-ai/util 0.0.0-next-17125 → 0.0.0-next-17126

package/dist/global.js

@@ -1,5 +1,5 @@
 import path from "path";
-import fs from "fs/promises";
+import fs from "fs";
 import { xdgData, xdgCache, xdgConfig, xdgState } from "xdg-basedir";
 import os from "os";
 import { Context, Effect, Layer } from "effect";
@@ -11,7 +11,6 @@ const cache = path.join(xdgCache, app);
 const config = path.join(xdgConfig, app);
 const state = path.join(xdgState, app);
 const tmp = path.join(os.tmpdir(), app);
-await fs.mkdir(tmp, { recursive: true });
 const paths = {
     get home() {
         return process.env.OPENCODE_TEST_HOME ?? os.homedir();
@@ -23,35 +22,34 @@ const paths = {
     cache,
     config,
     state,
-    tmp: await fs.realpath(tmp),
+    tmp,
 };
 export const Path = paths;
 Flock.setGlobal({ state });
-await Promise.all([
-    fs.mkdir(Path.data, { recursive: true }),
-    fs.mkdir(Path.config, { recursive: true }),
-    fs.mkdir(Path.state, { recursive: true }),
-    fs.mkdir(Path.log, { recursive: true }),
-    fs.mkdir(Path.bin, { recursive: true }),
-    fs.mkdir(Path.repos, { recursive: true }),
-]);
 export class Service extends Context.Service()("@opencode/Global") {
 }
 export function make(input = {}) {
+    // The acquired service canonicalizes default tmp; use it instead of Path.tmp for path comparisons.
     return {
         home: Path.home,
         data: Path.data,
         cache: Path.cache,
         config: Path.config,
         state: Path.state,
-        tmp: Path.tmp,
+        tmp: input.tmp ?? Path.tmp,
         bin: Path.bin,
         log: Path.log,
         repos: Path.repos,
         ...input,
     };
 }
-const layer = Layer.effect(Service, Effect.sync(() => Service.of(make({ config: process.env.OPENCODE_CONFIG_DIR ?? Path.config }))));
+const acquire = (input) => Effect.gen(function* () {
+    const service = Service.of(make(input));
+    yield* Effect.promise(() => Promise.all([service.data, service.config, service.state, service.log, service.bin, service.repos, service.tmp].map((directory) => fs.promises.mkdir(directory, { recursive: true }))));
+    const canonicalTmp = yield* Effect.promise(() => fs.promises.realpath(service.tmp));
+    return Service.of({ ...service, tmp: input.tmp ?? canonicalTmp });
+});
+const layer = Layer.effect(Service, Effect.suspend(() => acquire({ config: process.env.OPENCODE_CONFIG_DIR ?? Path.config })));
 export const node = makeGlobalNode({ service: Service, layer: layer, deps: [] });
-export const layerWith = (input) => Layer.effect(Service, Effect.sync(() => Service.of(make(input))));
+export const layerWith = (input) => Layer.effect(Service, acquire(input));
 export * as Global from "./global.js";

package/dist/observability/logging.d.ts

@@ -1,6 +1,6 @@
-import { Logger } from "effect";
+import { Effect, FileSystem, Logger } from "effect";
 export declare function file(local?: boolean, channel?: string): string;
-export declare function fileLogger(target?: string, id?: string): import("effect/Effect").Effect<Logger.Logger<unknown, void>, import("effect/PlatformError").PlatformError, import("effect/FileSystem").FileSystem | import("effect/Scope").Scope>;
+export declare function fileLogger(target?: string, id?: string): Effect.Effect<Logger.Logger<unknown, void>, import("effect/PlatformError").PlatformError, FileSystem.FileSystem | import("effect/Scope").Scope>;
 export declare function minimumLogLevel(): "Error" | "Warn" | "Info" | "Debug";
-export declare function loggers(local?: boolean, channel?: string): (import("effect/Effect").Effect<Logger.Logger<unknown, void>, import("effect/PlatformError").PlatformError, import("effect/FileSystem").FileSystem | import("effect/Scope").Scope> | Logger.Logger<unknown, boolean>)[];
+export declare function loggers(local?: boolean, channel?: string): (Effect.Effect<Logger.Logger<unknown, void>, import("effect/PlatformError").PlatformError, FileSystem.FileSystem | import("effect/Scope").Scope> | Logger.Logger<unknown, boolean>)[];
 export * as Logging from "./logging.js";

package/dist/observability/logging.js

@@ -1,4 +1,4 @@
-import { Formatter, Logger } from "effect";
+import { Effect, FileSystem, Formatter, Logger } from "effect";
 import path from "path";
 import { Global } from "../global.js";
 import { runID } from "./shared.js";
@@ -47,7 +47,11 @@ export function file(local = true, channel = "local") {
 }
 export function fileLogger(target = file(), id = runID) {
     // Do not set batchWindow to 0; it causes high idle CPU usage.
-    return Logger.toFile(formatter(id), target, { flag: "a" });
+    return Effect.gen(function* () {
+        const fs = yield* FileSystem.FileSystem;
+        yield* fs.makeDirectory(path.dirname(target), { recursive: true });
+        return yield* Logger.toFile(formatter(id), target, { flag: "a" });
+    });
 }
 const stderrLogger = Logger.make((options) => process.stderr.write(formatter().log(options) + "\n"));
 export function minimumLogLevel() {

package/package.json

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