Skip to content

file: use Effect.cached for scan deduplication #19164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kitlangton merged 2 commits into from
Mar 26, 2026
Merged

file: use Effect.cached for scan deduplication #19164

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd6b7d0
file: use Effect.cached for scan deduplication
kitlangton Mar 25, 2026
64c6387
Merge branch 'dev' into kit/effect-cached-file
kitlangton Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 8 additions & 16 deletions packages/opencode/src/file/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { BusEvent } from "@/bus/bus-event"
import { InstanceState } from "@/effect/instance-state"
import { makeRunPromise } from "@/effect/run-service"
import { Git } from "@/git"
import { Effect, Fiber, Layer, Scope, ServiceMap } from "effect"
import { Effect, Layer, ServiceMap } from "effect"
import { formatPatch, structuredPatch } from "diff"
import fs from "fs"
import fuzzysort from "fuzzysort"
Expand Down Expand Up @@ -323,7 +323,6 @@ export namespace File {

interface State {
cache: Entry
fiber: Fiber.Fiber<void> | undefined
}

export interface Interface {
Expand All @@ -348,7 +347,6 @@ export namespace File {
Effect.fn("File.state")(() =>
Effect.succeed({
cache: { files: [], dirs: [] } as Entry,
fiber: undefined as Fiber.Fiber<void> | undefined,
}),
),
)
Expand Down Expand Up @@ -406,21 +404,15 @@ export namespace File {
s.cache = next
})

const scope = yield* Scope.Scope
let cachedScan = yield* Effect.cached(
scan().pipe(Effect.catchCause(() => Effect.void)),
)

const ensure = Effect.fn("File.ensure")(function* () {
const s = yield* InstanceState.get(state)
if (!s.fiber)
s.fiber = yield* scan().pipe(
Effect.catchCause(() => Effect.void),
Effect.ensuring(
Effect.sync(() => {
s.fiber = undefined
}),
),
Effect.forkIn(scope),
)
yield* Fiber.join(s.fiber)
yield* cachedScan
cachedScan = yield* Effect.cached(
scan().pipe(Effect.catchCause(() => Effect.void)),
)
})

const init = Effect.fn("File.init")(function* () {
Expand Down
Loading