Address Codex review feedback

Julius Marminge committed 7 months ago

Commit fa4a29f1 parent 3a38f065 files · +75 −8Browse files

Showing the changes to packages/effect-codex-app-server (2 of 5 files). Show all

Unified · Split

2 files

@@ -121,4 +121,34 @@ it.layer(NodeServices.layer)("effect-codex-app-server client", (it) => { · 120 unmodified lines
121	]);	121	]);
122	}),	122	}),
123	);	123	);
		124
		125	it.effect("initializes a command-backed app-server client", () =>
		126	Effect.gen(function* () {
		127	const path = yield* Path.Path;
		128	const scope = yield* Scope.make();
		129	const clientLayer = CodexClient.layerCommand({
		130	command: "bun",
		131	args: ["run", yield* mockPeerPath],
		132	cwd: path.join(import.meta.dirname, ".."),
		133	});
		134	const context = yield* Layer.buildWithScope(clientLayer, scope);
		135
		136	const initialized = yield* Effect.gen(function* () {
		137	const client = yield* CodexClient.CodexAppServerClient;
		138	return yield* client.request("initialize", {
		139	clientInfo: {
		140	name: "effect-codex-app-server-test",
		141	title: "Effect Codex App Server Test",
		142	version: "0.0.0",
		143	},
		144	capabilities: {
		145	experimentalApi: true,
		146	optOutNotificationMethods: null,
		147	},
		148	});
		149	}).pipe(Effect.provide(context), Effect.ensuring(Scope.close(scope, Exit.void)));
		150
		151	assert.equal(initialized.userAgent, "mock-codex-app-server");
		152	}),
		153	);
124	});	154	});

           ...(options.env ? { env: { ...process.env, ...options.env } } : {}),
           shell: process.platform === "win32",
         });
-        const handle = yield* spawner.spawn(command).pipe(
+        return yield* spawner.spawn(command).pipe(
           Effect.mapError(
             (cause) =>
               new CodexError.CodexAppServerSpawnError({
               }),
           ),
         );
-        const client = yield* make(makeChildStdio(handle), options, makeTerminationError(handle));
-        return { client, handle };
       }),
-      ({ handle }) => handle.kill().pipe(Effect.orDie),
+      (handle) => handle.kill().pipe(Effect.orDie),
-    ).pipe(Effect.map(({ client }) => client)),
+    ).pipe(
+      Effect.flatMap((handle) =>
+        make(makeChildStdio(handle), options, makeTerminationError(handle)),
+      ),
+    ),
   );