Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion packages/opencode/src/tool/glob.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import { assertExternalDirectoryEffect } from "./external-directory"
import DESCRIPTION from "./glob.txt"
import * as Tool from "./tool"

const GLOB_TIMEOUT = "30 seconds"

export const Parameters = Schema.Struct({
pattern: Schema.String.annotate({ description: "The glob pattern to match files against" }),
path: Schema.optional(Schema.String).annotate({
Expand Down Expand Up @@ -47,7 +49,12 @@ export const GlobTool = Tool.define(
})

const limit = 100
const files = yield* ripgrep.glob({ cwd: search, pattern: params.pattern, limit })
const files = yield* ripgrep.glob({ cwd: search, pattern: params.pattern, limit }).pipe(
Effect.timeoutOrElse({
duration: GLOB_TIMEOUT,
orElse: () => Effect.fail(new Error(`Glob search timed out after ${GLOB_TIMEOUT}`)),
}),
)
const truncated = files.length === limit

const output = []
Expand Down
50 changes: 48 additions & 2 deletions packages/opencode/test/tool/glob.test.ts
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
import { PermissionV1 } from "@opencode-ai/core/v1/permission"
import { describe, expect } from "bun:test"
import path from "path"
import { Cause, Effect, Exit, Layer } from "effect"
import { Cause, Duration, Effect, Exit, Fiber, Layer } from "effect"
import * as TestClock from "effect/testing/TestClock"
import { GlobTool } from "../../src/tool/glob"
import { SessionID, MessageID } from "../../src/session/schema"
import { InstanceRef } from "../../src/effect/instance-ref"
import { CrossSpawnSpawner } from "@opencode-ai/core/cross-spawn-spawner"
import { Ripgrep } from "@opencode-ai/core/ripgrep"
import { FSUtil } from "@opencode-ai/core/fs-util"
import { Global } from "@opencode-ai/core/global"
import { Truncate } from "@/tool/truncate"
import { Agent } from "../../src/agent/agent"
import { TestInstance, tmpdirScoped } from "../fixture/fixture"
import { TestInstance } from "../fixture/fixture"
import { testEffect } from "../lib/effect"
import { Config } from "@/config/config"
import { RuntimeFlags } from "@/effect/runtime-flags"
import { Git } from "@/git"
import { Filesystem } from "@/util/filesystem"
import { Permission } from "../../src/permission"
import { ProjectV2 } from "@opencode-ai/core/project"
import type * as Tool from "../../src/tool/tool"

const toolLayer = (flags: Partial<RuntimeFlags.Info> = {}) =>
Expand Down Expand Up @@ -90,6 +93,49 @@ const git = Effect.fn("GlobToolTest.git")(function* (cwd: string, args: string[]
})

describe("tool.glob", () => {
it.effect("times out slow ripgrep searches", () =>
Effect.gen(function* () {
const directory = path.join(import.meta.dir, "..", "fixture")
const info = yield* GlobTool.pipe(
Effect.provide(
Layer.mock(Ripgrep.Service, {
glob: () => Effect.never,
}),
),
)
const glob = yield* info.init()
const fiber = yield* glob
.execute(
{
pattern: "**/*.ts",
path: directory,
},
ctx,
)
.pipe(
Effect.provideService(InstanceRef, {
directory,
worktree: directory,
project: {
id: ProjectV2.ID.global,
worktree: directory,
time: { created: 0, updated: 0 },
sandboxes: [],
},
}),
Effect.forkChild,
)

yield* TestClock.adjust(Duration.seconds(30))
const exit = yield* Fiber.await(fiber)
expect(Exit.isFailure(exit)).toBe(true)
if (Exit.isFailure(exit)) {
const err = Cause.squash(exit.cause)
expect(err instanceof Error ? err.message : String(err)).toContain("Glob search timed out after 30 seconds")
}
}),
)

it.instance("matches files from a directory path", () =>
Effect.gen(function* () {
const test = yield* TestInstance
Expand Down
Loading