Skip to content

Load PTY adapter at runtime #1311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shivamhwp wants to merge 3 commits into
base: main
Choose a base branch
from
+27 −10
Open

Load PTY adapter at runtime #1311

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f711aec
Load PTY adapter at runtime
shivamhwp Mar 22, 2026
aeb5481
Use Bun runtime services when running under Bun
shivamhwp Mar 22, 2026
d3ebbe6
Use Node runtime services in server entrypoint
shivamhwp Mar 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 27 additions & 10 deletions apps/server/src/serverLayers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as NodeServices from "@effect/platform-node/NodeServices";
import { Effect, FileSystem, Layer } from "effect";
import { Effect, FileSystem, Layer, Path } from "effect";
import * as SqlClient from "effect/unstable/sql/SqlClient";

import { CheckpointDiffQueryLive } from "./checkpointing/Layers/CheckpointDiffQuery";
Expand Down Expand Up @@ -32,10 +32,33 @@ import { GitCoreLive } from "./git/Layers/GitCore";
import { GitHubCliLive } from "./git/Layers/GitHubCli";
import { CodexTextGenerationLive } from "./git/Layers/CodexTextGeneration";
import { GitServiceLive } from "./git/Layers/GitService";
import { BunPtyAdapterLive } from "./terminal/Layers/BunPTY";
import { NodePtyAdapterLive } from "./terminal/Layers/NodePTY";
import { PtyAdapter } from "./terminal/Services/PTY";
import { AnalyticsService } from "./telemetry/Services/AnalyticsService";

type RuntimePtyAdapterLoader = {
layer: Layer.Layer<PtyAdapter, never, FileSystem.FileSystem | Path.Path>;
};

const runtimePtyAdapterLoaders = {
bun: () =>
import("./terminal/Layers/BunPTY").then(({ BunPtyAdapterLive }) => ({
layer: BunPtyAdapterLive,
})),
node: () =>
import("./terminal/Layers/NodePTY").then(({ NodePtyAdapterLive }) => ({
layer: NodePtyAdapterLive,
})),
} satisfies Record<string, () => Promise<RuntimePtyAdapterLoader>>;

const makeRuntimePtyAdapterLayer = () =>
Effect.gen(function* () {
const runtime =
process.versions.bun !== undefined && process.platform !== "win32" ? "bun" : "node";
const loader = runtimePtyAdapterLoaders[runtime];
const ptyAdapterModule = yield* Effect.promise(loader);
return ptyAdapterModule.layer;
}).pipe(Layer.unwrap);

export function makeServerProviderLayer(): Layer.Layer<
ProviderService,
ProviderUnsupportedError,
Expand Down Expand Up @@ -108,13 +131,7 @@ export function makeServerRuntimeServicesLayer() {
Layer.provideMerge(checkpointReactorLayer),
);

const terminalLayer = TerminalManagerLive.pipe(
Layer.provide(
typeof Bun !== "undefined" && process.platform !== "win32"
? BunPtyAdapterLive
: NodePtyAdapterLive,
),
);
const terminalLayer = TerminalManagerLive.pipe(Layer.provide(makeRuntimePtyAdapterLayer()));

const gitManagerLayer = GitManagerLive.pipe(
Layer.provideMerge(gitCoreLayer),
Expand Down