From c74350dc223b47b8c6bdbdc23e3f12a60ecc14d8 Mon Sep 17 00:00:00 2001 From: Kit Langton Date: Thu, 16 Apr 2026 23:13:47 -0400 Subject: [PATCH] refactor: use InstanceState context in File service --- packages/opencode/src/file/index.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/opencode/src/file/index.ts b/packages/opencode/src/file/index.ts index af4fbf76c8..db1cf081a9 100644 --- a/packages/opencode/src/file/index.ts +++ b/packages/opencode/src/file/index.ts @@ -11,7 +11,6 @@ import ignore from "ignore" import path from "path" import z from "zod" import { Global } from "../global" -import { Instance } from "../project/instance" import { Log } from "../util" import { Protected } from "./protected" import { Ripgrep } from "./ripgrep" @@ -513,6 +512,7 @@ export const layer = Layer.effect( const ctx = yield* InstanceState.context const full = path.join(ctx.directory, file) +<<<<<<< HEAD if (!Instance.containsPath(full, ctx)) { throw new Error("Access denied: path escapes project directory") } @@ -592,6 +592,7 @@ export const layer = Layer.effect( ignored = ig.ignores.bind(ig) } +<<<<<<< HEAD const resolved = dir ? path.join(ctx.directory, dir) : ctx.directory if (!Instance.containsPath(resolved, ctx)) { throw new Error("Access denied: path escapes project directory")