diff --git a/packages/core/test/snapshot.test.ts b/packages/core/test/snapshot.test.ts index 678f68313e4..09269a9f60e 100644 --- a/packages/core/test/snapshot.test.ts +++ b/packages/core/test/snapshot.test.ts @@ -143,44 +143,47 @@ describe("Snapshot", () => { ), ) - testEffect(Layer.empty).live("isolates snapshot indexes by canonical Git worktree", () => - Effect.acquireUseRelease( - Effect.promise(() => tmpdir()), - (tmp) => - Effect.gen(function* () { - const project = path.join(tmp.path, "project") - const linked = path.join(tmp.path, "linked") - yield* Effect.promise(async () => { - await fs.mkdir(project) - await fs.writeFile(path.join(project, "tracked.txt"), "main\n") - await initGit(project, true) - await $`git -c core.fsmonitor=false worktree add --detach ${linked} HEAD`.cwd(project).quiet() - }) + testEffect(Layer.empty).live( + "isolates snapshot indexes by canonical Git worktree", + () => + Effect.acquireUseRelease( + Effect.promise(() => tmpdir()), + (tmp) => + Effect.gen(function* () { + const project = path.join(tmp.path, "project") + const linked = path.join(tmp.path, "linked") + yield* Effect.promise(async () => { + await fs.mkdir(project) + await fs.writeFile(path.join(project, "tracked.txt"), "main\n") + await initGit(project, true) + await $`git -c core.fsmonitor=false worktree add --detach ${linked} HEAD`.cwd(project).quiet() + }) - const capture = (directory: string) => - Effect.gen(function* () { - const snapshot = yield* Snapshot.Service - return yield* snapshot.capture() - }).pipe(Effect.provide(snapshotLayer(tmp.path, directory))) - expect(yield* capture(project)).toBeDefined() - expect(yield* capture(linked)).toBeDefined() + const capture = (directory: string) => + Effect.gen(function* () { + const snapshot = yield* Snapshot.Service + return yield* snapshot.capture() + }).pipe(Effect.provide(snapshotLayer(tmp.path, directory))) + expect(yield* capture(project)).toBeDefined() + expect(yield* capture(linked)).toBeDefined() - const projectID = yield* Effect.gen(function* () { - return (yield* Location.Service).project.id - }).pipe( - Effect.provide( - AppNodeBuilder.build(Location.boundNode(Location.Ref.make({ directory: AbsolutePath.make(project) }))), - ), - ) - expect( - yield* Effect.promise(() => fs.stat(path.join(tmp.path, "snapshot", projectID, Hash.fast(project)))), - ).toBeDefined() - expect( - yield* Effect.promise(() => fs.stat(path.join(tmp.path, "snapshot", projectID, Hash.fast(linked)))), - ).toBeDefined() - }), - (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()), - ), + const projectID = yield* Effect.gen(function* () { + return (yield* Location.Service).project.id + }).pipe( + Effect.provide( + AppNodeBuilder.build(Location.boundNode(Location.Ref.make({ directory: AbsolutePath.make(project) }))), + ), + ) + expect( + yield* Effect.promise(() => fs.stat(path.join(tmp.path, "snapshot", projectID, Hash.fast(project)))), + ).toBeDefined() + expect( + yield* Effect.promise(() => fs.stat(path.join(tmp.path, "snapshot", projectID, Hash.fast(linked)))), + ).toBeDefined() + }), + (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()), + ), + { timeout: 15_000 }, ) }) diff --git a/packages/core/test/tool-shell.test.ts b/packages/core/test/tool-shell.test.ts index e3170a406fa..8b713710107 100644 --- a/packages/core/test/tool-shell.test.ts +++ b/packages/core/test/tool-shell.test.ts @@ -387,57 +387,63 @@ describe("ShellTool", () => { ), ) - it.live("approves an explicit external workdir before shell execution", () => - Effect.acquireUseRelease( - Effect.promise(() => Promise.all([tmpdir(), tmpdir()])), - ([active, outside]) => { - reset() - return withSession(active.path, (registry) => - executeTool(registry, call({ command: cwdCommand, workdir: outside.path })), - ).pipe( - Effect.andThen( - Effect.sync(() => { - expect(assertions.map((item) => item.action)).toEqual(["external_directory", "shell"]) - expect(assertions[0]).toMatchObject({ - resources: [path.join(realpathSync(outside.path), "*").replaceAll("\\", "/")], - }) - }), + it.live( + "approves an explicit external workdir before shell execution", + () => + Effect.acquireUseRelease( + Effect.promise(() => Promise.all([tmpdir(), tmpdir()])), + ([active, outside]) => { + reset() + return withSession(active.path, (registry) => + executeTool(registry, call({ command: cwdCommand, workdir: outside.path })), + ).pipe( + Effect.andThen( + Effect.sync(() => { + expect(assertions.map((item) => item.action)).toEqual(["external_directory", "shell"]) + expect(assertions[0]).toMatchObject({ + resources: [path.join(realpathSync(outside.path), "*").replaceAll("\\", "/")], + }) + }), + ), + ) + }, + ([active, outside]) => + Effect.promise(() => + Promise.all([active[Symbol.asyncDispose](), outside[Symbol.asyncDispose]()]).then(() => undefined), ), - ) - }, - ([active, outside]) => - Effect.promise(() => - Promise.all([active[Symbol.asyncDispose](), outside[Symbol.asyncDispose]()]).then(() => undefined), - ), - ), + ), + { timeout: 15_000 }, ) - it.live("approves an external directory used by a directory-change command", () => - Effect.acquireUseRelease( - Effect.promise(() => Promise.all([tmpdir(), tmpdir()])), - ([active, outside]) => { - reset() - const command = isWindows - ? `Set-Location -LiteralPath '${outside.path}'; (Get-Location).Path` - : `cd '${outside.path}' && pwd` - return withSession(active.path, (registry) => - executeTool(registry, call({ command }, "call-external-cd")), - ).pipe( - Effect.andThen( - Effect.sync(() => { - expect(assertions.map((item) => item.action)).toEqual(["external_directory", "shell"]) - expect(assertions[0]).toMatchObject({ - resources: [path.join(realpathSync(outside.path), "*").replaceAll("\\", "/")], - }) - }), + it.live( + "approves an external directory used by a directory-change command", + () => + Effect.acquireUseRelease( + Effect.promise(() => Promise.all([tmpdir(), tmpdir()])), + ([active, outside]) => { + reset() + const command = isWindows + ? `Set-Location -LiteralPath '${outside.path}'; (Get-Location).Path` + : `cd '${outside.path}' && pwd` + return withSession(active.path, (registry) => + executeTool(registry, call({ command }, "call-external-cd")), + ).pipe( + Effect.andThen( + Effect.sync(() => { + expect(assertions.map((item) => item.action)).toEqual(["external_directory", "shell"]) + expect(assertions[0]).toMatchObject({ + resources: [path.join(realpathSync(outside.path), "*").replaceAll("\\", "/")], + }) + }), + ), + ) + }, + ([active, outside]) => + Effect.promise(() => + Promise.all([active[Symbol.asyncDispose](), outside[Symbol.asyncDispose]()]).then(() => undefined), ), - ) - }, - ([active, outside]) => - Effect.promise(() => - Promise.all([active[Symbol.asyncDispose](), outside[Symbol.asyncDispose]()]).then(() => undefined), - ), - ), + ), + { timeout: 15_000 }, ) it.live("approves an expanded external home directory", () => @@ -459,28 +465,31 @@ describe("ShellTool", () => { ), ) - it.live("does not execute after external-directory or shell denial", () => - Effect.acquireUseRelease( - Effect.promise(() => Promise.all([tmpdir(), tmpdir()])), - ([active, outside]) => - Effect.gen(function* () { - reset() - denyAction = "external_directory" - yield* withSession(active.path, (registry) => - executeTool(registry, call({ command: cwdCommand, workdir: outside.path })), - ) - expect(assertions.map((item) => item.action)).toEqual(["external_directory"]) + it.live( + "does not execute after external-directory or shell denial", + () => + Effect.acquireUseRelease( + Effect.promise(() => Promise.all([tmpdir(), tmpdir()])), + ([active, outside]) => + Effect.gen(function* () { + reset() + denyAction = "external_directory" + yield* withSession(active.path, (registry) => + executeTool(registry, call({ command: cwdCommand, workdir: outside.path })), + ) + expect(assertions.map((item) => item.action)).toEqual(["external_directory"]) - reset() - denyAction = "shell" - yield* withSession(active.path, (registry) => executeTool(registry, call({ command: cwdCommand }))) - expect(assertions.map((item) => item.action)).toEqual(["shell"]) - }), - ([active, outside]) => - Effect.promise(() => - Promise.all([active[Symbol.asyncDispose](), outside[Symbol.asyncDispose]()]).then(() => undefined), - ), - ), + reset() + denyAction = "shell" + yield* withSession(active.path, (registry) => executeTool(registry, call({ command: cwdCommand }))) + expect(assertions.map((item) => item.action)).toEqual(["shell"]) + }), + ([active, outside]) => + Effect.promise(() => + Promise.all([active[Symbol.asyncDispose](), outside[Symbol.asyncDispose]()]).then(() => undefined), + ), + ), + { timeout: 15_000 }, ) it.live("keeps non-zero exits useful", () => @@ -619,7 +628,7 @@ describe("ShellTool", () => { }, (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]().then(() => undefined)), ), - { timeout: 10_000 }, + { timeout: 15_000 }, ) it.live( @@ -630,7 +639,7 @@ describe("ShellTool", () => { (tmp) => { reset() return withSession(tmp.path, (registry) => - executeTool(registry, call({ command: timeoutOutputCommand, timeout: isWindows ? 3_000 : 50 })), + executeTool(registry, call({ command: timeoutOutputCommand, timeout: isWindows ? 3_000 : 500 })), ).pipe( Effect.andThen((settled) => Effect.sync(() => { diff --git a/packages/tui/test/component/tab-pulse.test.tsx b/packages/tui/test/component/tab-pulse.test.tsx index 6fceb27b2bb..0e157f6ba33 100644 --- a/packages/tui/test/component/tab-pulse.test.tsx +++ b/packages/tui/test/component/tab-pulse.test.tsx @@ -1,10 +1,6 @@ -/** @jsxImportSource @opentui/solid */ import { expect, test } from "bun:test" import { RGBA } from "@opentui/core" -import { testRender } from "@opentui/solid" -import { createSignal } from "solid-js" import { - TabPulse, blendTabPulseColor, completionPulseOpacity, glowIgnitionLevel, @@ -12,50 +8,6 @@ import { } from "../../src/component/tab-pulse" import { tint } from "../../src/theme/color" -test("a prompt pulse restarts the neutral edge flash while the tab remains busy", async () => { - const background = RGBA.fromHex("#101010") - const flash = RGBA.fromHex("#f0f0f0") - const [promptPulse, setPromptPulse] = createSignal(0) - const app = await testRender( - () => ( - - - - ), - { width: 8, height: 1 }, - ) - - const firstBackground = () => app.captureSpans().lines[0]?.spans[0]?.bg - - try { - await app.renderOnce() - expect(firstBackground()?.equals(background)).toBeTrue() - - setPromptPulse(1) - await Bun.sleep(80) - await app.renderOnce() - expect(firstBackground()?.equals(background)).toBeFalse() - expect(firstBackground()?.r ?? 0).toBeGreaterThan(0.17) - - await Bun.sleep(800) - await app.renderOnce() - expect(firstBackground()?.equals(background)).toBeTrue() - - setPromptPulse(2) - await Bun.sleep(80) - await app.renderOnce() - expect(firstBackground()?.equals(background)).toBeFalse() - } finally { - app.renderer.destroy() - } -}) - test("completion pulse rises quickly and fades over the remaining duration", () => { expect(completionPulseOpacity(0)).toBe(0) expect(completionPulseOpacity(0.06)).toBeCloseTo(0.5)