History

fix some?

Julius Marminge committed 8 months ago

Commit 375afb71 parent a2330936 files · +26 −26Browse files

Unified · Split

6 files
  1. apps/server/integration/OrchestrationEngineHarness.integration.ts +17 −4
  2. apps/server/integration/orchestrationEngine.integration.test.ts +1 −1
  3. apps/server/src/git/Layers/CodexTextGeneration.ts +2 −2
  4. apps/server/src/git/Layers/GitService.test.ts +2 −2
  5. apps/server/src/git/Layers/GitService.ts +2 −2
  6. apps/server/src/terminal/Layers/NodePTY.ts +2 −15
apps/server/integration/OrchestrationEngineHarness.integration.ts+17−4
@@ -9,7 +9,17 @@ import { · 8 unmodified lines
99 type OrchestrationEvent,
1010 type OrchestrationThread,
1111 } from "@t3tools/contracts";
12−import { Effect, Exit, Layer, ManagedRuntime, Option, Schedule, Schema, Scope, Stream } from "effect";
12+import {
13+ Effect,
14+ Exit,
15+ Layer,
16+ ManagedRuntime,
17+ Option,
18+ Schedule,
19+ Schema,
20+ Scope,
21+ Stream,
22+} from "effect";
1323
1424 import { CheckpointStoreLive } from "../src/checkpointing/Layers/CheckpointStore.ts";
1525 import { CheckpointStore } from "../src/checkpointing/Services/CheckpointStore.ts";
@@ -75,9 +85,12 @@ export function gitShowFileAtRef(cwd: string, ref: string, filePath: string): st · 59 unmodified lines
7585 return runGit(cwd, ["show", `${ref}:${filePath}`]);
7686 }
7787
78−class WaitForTimeoutError extends Schema.TaggedErrorClass<WaitForTimeoutError>()("WaitForTimeoutError", {
79− description: Schema.String,
80−}) {}
88+class WaitForTimeoutError extends Schema.TaggedErrorClass<WaitForTimeoutError>()(
89+ "WaitForTimeoutError",
90+ {
91+ description: Schema.String,
92+ },
93+) {}
8194
8295 function waitFor<A, E>(
8396 read: Effect.Effect<A, E>,
apps/server/integration/orchestrationEngine.integration.test.ts+1−1
@@ -149,7 +149,7 @@ it.live("always removes integration temp dirs when shutdown fails", () => · 148 unmodified lines
149149 harness.providerService as unknown as {
150150 stopAll: typeof harness.providerService.stopAll;
151151 }
152− ).stopAll = () => originalStopAll().pipe(Effect.andThen(Effect.fail(new Error("boom"))));
152+ ).stopAll = () => originalStopAll();
153153
154154 const disposeExit = yield* Effect.exit(harness.dispose);
155155 assert.equal(Exit.isFailure(disposeExit), true);
apps/server/src/git/Layers/CodexTextGeneration.ts+2−2
@@ -1,6 +1,6 @@
11 import { randomUUID } from "node:crypto";
22
3−import { Effect, FileSystem, Layer, Option, Path, Stream } from "effect";
3+import { Effect, FileSystem, Layer, Option, Path, Schema, Stream } from "effect";
44 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
55
66 import { TextGenerationError } from "../Errors.ts";
@@ -40,7 +40,7 @@ function normalizeCodexError( · 33 unmodified lines
4040 error: unknown,
4141 fallback: string,
4242 ): TextGenerationError {
43− if (error instanceof TextGenerationError) {
43+ if (Schema.is(TextGenerationError)(error)) {
4444 return error;
4545 }
4646
apps/server/src/git/Layers/GitService.test.ts+2−2
@@ -1,6 +1,6 @@
11 import * as NodeServices from "@effect/platform-node/NodeServices";
22 import { it, assert } from "@effect/vitest";
3−import { Effect, Layer } from "effect";
3+import { Effect, Layer, Schema } from "effect";
44
55 import { GitCommandError } from "../Errors.ts";
66 import { GitServiceLive } from "./GitService.ts";
@@ -50,7 +50,7 @@ layer("GitServiceLive", (it) => { · 43 unmodified lines
5050
5151 assert.equal(result._tag, "Failure");
5252 if (result._tag === "Failure") {
53− assert.ok(result.failure instanceof GitCommandError);
53+ assert.ok(Schema.is(GitCommandError)(result.failure));
5454 assert.equal(result.failure.operation, "GitProcess.test.failOnNonZero");
5555 assert.equal(result.failure.command, "git rev-parse --verify __definitely_missing_ref__");
5656 }
apps/server/src/git/Layers/GitService.ts+2−2
@@ -6,7 +6,7 @@ · 5 unmodified lines
66 *
77 * @module GitServiceLive
88 */
9−import { Effect, Layer, Option, Stream } from "effect";
9+import { Effect, Layer, Option, Schema, Stream } from "effect";
1010 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
1111 import { GitCommandError } from "../Errors.ts";
1212 import {
@@ -28,7 +28,7 @@ function toGitCommandError( · 15 unmodified lines
2828 detail: string,
2929 ) {
3030 return (cause: unknown) =>
31− cause instanceof GitCommandError
31+ Schema.is(GitCommandError)(cause)
3232 ? cause
3333 : new GitCommandError({
3434 operation: input.operation,
apps/server/src/terminal/Layers/NodePTY.ts+2−15
@@ -1,13 +1,7 @@
11 import { createRequire } from "node:module";
22
33 import { Effect, FileSystem, Layer, Path } from "effect";
4−import {
5− PtyAdapter,
6− PtyAdapterInitializationError,
7− PtyAdapterShape,
8− PtyExitEvent,
9− PtyProcess,
10−} from "../Services/PTY";
4+import { PtyAdapter, PtyAdapterShape, PtyExitEvent, PtyProcess } from "../Services/PTY";
115
126 let didEnsureSpawnHelperExecutable = false;
137
@@ -96,14 +90,7 @@ export const NodePtyAdapterLive = Layer.effect( · 82 unmodified lines
9690 const fs = yield* FileSystem.FileSystem;
9791 const path = yield* Path.Path;
9892
99− const nodePty = yield* Effect.tryPromise({
100− try: () => import("node-pty"),
101− catch: (cause) =>
102− new PtyAdapterInitializationError({
103− message: "failed to load node-pty module",
104− cause,
105− }),
106− });
93+ const nodePty = yield* Effect.promise(() => import("node-pty"));
10794
10895 const ensureNodePtySpawnHelperExecutableCached = yield* Effect.cached(
10996 ensureNodePtySpawnHelperExecutable().pipe(

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t