The open source coding agent.
TypeScript
refactor(config): use cachedInvalidateWithTTL, bump effect to beta.37 (#19322)
Kit Langton1ebc92fd3683
diff --git a/bun.lock b/bun.lockindex 1c122b7317a..6052633505d 100644--- a/bun.lock+++ b/bun.lock@@ -599,7 +599,7 @@},"catalog": {"@cloudflare/workers-types": "4.20251008.0",- "@effect/platform-node": "4.0.0-beta.35",+ "@effect/platform-node": "4.0.0-beta.37","@hono/zod-validator": "0.4.2","@kobalte/core": "0.13.11","@octokit/rest": "22.0.0",@@ -623,7 +623,7 @@"dompurify": "3.3.1","drizzle-kit": "1.0.0-beta.19-d95b7a4","drizzle-orm": "1.0.0-beta.19-d95b7a4",- "effect": "4.0.0-beta.35",+ "effect": "4.0.0-beta.37","fuzzysort": "3.1.0","hono": "4.10.7","hono-openapi": "1.1.2",@@ -981,9 +981,9 @@"@effect/language-service": ["@effect/[email protected]", "", { "bin": { "effect-language-service": "cli.js" } }, "sha512-DEmIOsg1GjjP6s9HXH1oJrW+gDmzkhVv9WOZl6to5eNyyCrjz1S2PDqQ7aYrW/HuifhfwI5Bik1pK4pj7Z+lrg=="],- "@effect/platform-node": ["@effect/[email protected]", "", { "dependencies": { "@effect/platform-node-shared": "^4.0.0-beta.35", "mime": "^4.1.0", "undici": "^7.24.0" }, "peerDependencies": { "effect": "^4.0.0-beta.35", "ioredis": "^5.7.0" } }, "sha512-HPc2xZASl9F9y/xJ01bQgFD6Jf9XP4Fcv/BlVTvG0Yr/uN63lwKZYr/VXor5K5krHfBDeCBD8y7/SICPYZoq3A=="],+ "@effect/platform-node": ["@effect/[email protected]", "", { "dependencies": { "@effect/platform-node-shared": "^4.0.0-beta.37", "mime": "^4.1.0", "undici": "^7.24.0" }, "peerDependencies": { "effect": "^4.0.0-beta.37", "ioredis": "^5.7.0" } }, "sha512-dCfTNYGAT+1K+nu/0jw3FL/0DJXcobZCJs9SD5XJbj1DewWPhR9/AptP6zLGj8vdP8hXem6Aa53nze3HSujW3w=="],- "@effect/platform-node-shared": ["@effect/[email protected]", "", { "dependencies": { "@types/ws": "^8.18.1", "ws": "^8.19.0" }, "peerDependencies": { "effect": "^4.0.0-beta.35" } }, "sha512-9bPqNV988itKJ7MQoJuzmR014DB9EZRDOnhJt/+iJlb8qLoR9HnCzNJb9gfBdYhFmVYc8DMsQxG81rdJzpv9tg=="],+ "@effect/platform-node-shared": ["@effect/[email protected]", "", { "dependencies": { "@types/ws": "^8.18.1", "ws": "^8.19.0" }, "peerDependencies": { "effect": "^4.0.0-beta.40" } }, "sha512-WMRVG7T8ZDALKCOacsx2ZZj3Ccaoq8YGeD9q7ZL4q8RwQv8Nmrl+4+KZl95/zHCqXzgK9oUJOlBfQ7CZr6PQOQ=="],"@electron/asar": ["@electron/[email protected]", "", { "dependencies": { "commander": "^5.0.0", "glob": "^7.1.6", "minimatch": "^3.0.4" }, "bin": { "asar": "bin/asar.js" } }, "sha512-i4/rNPRS84t0vSRa2HorerGRXWyF4vThfHesw0dmcWHp+cspK743UanA0suA5Q5y8kzY2y6YKrvbIUn69BCAiA=="],@@ -2759,7 +2759,7 @@"ee-first": ["[email protected]", "", {}, "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="],- "effect": ["[email protected]", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "fast-check": "^4.5.3", "find-my-way-ts": "^0.1.6", "ini": "^6.0.0", "kubernetes-types": "^1.30.0", "msgpackr": "^1.11.8", "multipasta": "^0.2.7", "toml": "^3.0.0", "uuid": "^13.0.0", "yaml": "^2.8.2" } }, "sha512-64j8dgJmoEMeq6Y3WLYcZIRqPZ5E/lqnULCf6QW5te3hQ/sa13UodWLGwBEviEqBoq72U8lArhVX+T7ntzhJGQ=="],+ "effect": ["[email protected]", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "fast-check": "^4.5.3", "find-my-way-ts": "^0.1.6", "ini": "^6.0.0", "kubernetes-types": "^1.30.0", "msgpackr": "^1.11.8", "multipasta": "^0.2.7", "toml": "^3.0.0", "uuid": "^13.0.0", "yaml": "^2.8.2" } }, "sha512-AVMXXtb6n62W4uvo1EvT7FJ41HfDvQRX8IY2FGPvfP361dtBArKK2JtE5vmFXTsxkW90WUdvJZYpVATGIzr/BA=="],"ejs": ["[email protected]", "", { "dependencies": { "jake": "^10.8.5" }, "bin": { "ejs": "bin/cli.js" } }, "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA=="],diff --git a/package.json b/package.jsonindex 915e2ef0acb..dfc9840c2a8 100644--- a/package.json+++ b/package.json@@ -25,7 +25,7 @@"packages/slack"],"catalog": {- "@effect/platform-node": "4.0.0-beta.35",+ "@effect/platform-node": "4.0.0-beta.37","@types/bun": "1.3.11","@octokit/rest": "22.0.0","@hono/zod-validator": "0.4.2",@@ -45,7 +45,7 @@"dompurify": "3.3.1","drizzle-kit": "1.0.0-beta.19-d95b7a4","drizzle-orm": "1.0.0-beta.19-d95b7a4",- "effect": "4.0.0-beta.35",+ "effect": "4.0.0-beta.37","ai": "5.0.124","hono": "4.10.7","hono-openapi": "1.1.2",diff --git a/packages/opencode/src/config/config.ts b/packages/opencode/src/config/config.tsindex 645ae8814ad..67f298b427e 100644--- a/packages/opencode/src/config/config.ts+++ b/packages/opencode/src/config/config.ts@@ -40,7 +40,7 @@ import { Lock } from "@/util/lock"import { AppFileSystem } from "@/filesystem"import { InstanceState } from "@/effect/instance-state"import { makeRuntime } from "@/effect/run-service"-import { Effect, Layer, ServiceMap } from "effect"+import { Duration, Effect, Layer, ServiceMap } from "effect"export namespace Config {const ModelId = z.string().meta({ $ref: "https://models.dev/model-schema.json#/$defs/Model" })@@ -1241,7 +1241,15 @@ export namespace Config {return result})- let cachedGlobal = yield* Effect.cached(loadGlobal().pipe(Effect.orElseSucceed(() => ({}) as Info)))+ const [cachedGlobal, invalidateGlobal] = yield* Effect.cachedInvalidateWithTTL(+ loadGlobal().pipe(+ Effect.tapError((error) =>+ Effect.sync(() => log.error("failed to load global config, using defaults", { error: String(error) })),+ ),+ Effect.orElseSucceed((): Info => ({})),+ ),+ Duration.infinity,+ )const getGlobal = Effect.fn("Config.getGlobal")(function* () {return yield* cachedGlobal@@ -1446,7 +1454,7 @@ export namespace Config {})const invalidate = Effect.fn("Config.invalidate")(function* (wait?: boolean) {- cachedGlobal = yield* Effect.cached(loadGlobal().pipe(Effect.orElseSucceed(() => ({}) as Info)))+ yield* invalidateGlobalconst task = Instance.disposeAll().catch(() => undefined).finally(() =>