diff --git a/packages/core/src/project.ts b/packages/core/src/project.ts index 63a523b5fb0..5a6356926e5 100644 --- a/packages/core/src/project.ts +++ b/packages/core/src/project.ts @@ -309,7 +309,7 @@ const layer = Layer.effect( const cached = Effect.fnUntraced(function* (dir: string) { return yield* fs.readFileString(path.join(dir, "opencode")).pipe( Effect.map((value) => value.trim()), - Effect.map((value) => (value ? ID.make(value) : undefined)), + Effect.map((value) => (value && !/[\u0000-\u001f\u007f]/.test(value) ? ID.make(value) : undefined)), Effect.orElseSucceed(() => undefined), ) }) diff --git a/packages/core/test/project.test.ts b/packages/core/test/project.test.ts index c2dd1b98f90..a9ed0a0ead4 100644 --- a/packages/core/test/project.test.ts +++ b/packages/core/test/project.test.ts @@ -551,6 +551,20 @@ describe("Project.resolve", () => { }), ) + it.live("ignores a cached id with control characters", () => + Effect.gen(function* () { + const tmp = yield* tmpdirScoped() + yield* Effect.promise(() => initRepo(tmp.path, { commit: true })) + yield* Effect.promise(() => Bun.write(path.join(tmp.path, ".git", "opencode"), "\u0000".repeat(40))) + const project = yield* Project.Service + + const result = yield* project.resolve(abs(tmp.path)) + + expect(result.previous).toBeUndefined() + expect(result.id).toBe(Project.ID.make(yield* Effect.promise(() => rootCommit(tmp.path)))) + }), + ) + it.live("does not write the cache while resolving", () => Effect.gen(function* () { const tmp = yield* tmpdirScoped()