| author |  Julius Marminge <julius0216@outlook.com> 2026-10-09 16:38:41-07:00 |
| committer |  GitHub <noreply@github.com> 2026-10-09 16:38:41-07:00 |
| log | e30852213ed3954037091582057f71918918e19f |
| tree | 51e589b0a25d66a2141abdd66d4c7b483f0a1c1c |
| parent | 58916b6554f45ac518bd8150dd10f1f536e40aac |
| signature | Signed by PGP key B5690EEEBB952194 |
refactor(shared): host process references live in a HostProcess module (#17641)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>235 files changed, 1028 insertions(+), 1225 deletions(-)
apps
desktop
src
server
src
- bootstrap.test.ts
- bootstrap.ts
checkpointing
htmlRender
- keybindings.test.ts
mcp
toolkits
device
observability
- os-jank.ts
- processRunner.test.ts
provider
- AntigravityInstallation.test.ts
- AntigravityInstallation.ts
- CodexInstallation.test.ts
- CodexInstallation.ts
- CodexProvider.ts
- ProviderInstanceRegistry.test.ts
- antigravityAuthSupport.test.ts
- antigravityAuthSupport.ts
- claudeResetCredits.test.ts
- claudeResetCredits.ts
- providerInstallation.test.ts
- providerMaintenanceRunner.test.ts
review
sourceControl
- storageCleanup.ts
textGeneration
- ws.test.ts
oxlint-plugin-t3code
packages
provider-acp-registry
provider-acp
src
server
provider-cursor
provider-grok
provider-muse
src
server
provider-pi
src
provider-testing
src
source-control-forgejo
src
server
source-control-github
tailscale
scripts
- vite.config.ts
apps/desktop/src/app/DesktopApp.ts+2-2
| ... | ... | @@ -35,7 +35,7 @@ import * as DesktopUpdates from "../updates/DesktopUpdates.ts"; |
| 35 | 35 | import * as DesktopSnapShot from "../snapShot/DesktopSnapShot.ts"; |
| 36 | 36 | import * as DesktopWslBackend from "../wsl/DesktopWslBackend.ts"; |
| 37 | 37 | import * as DesktopRendererHistory from "../telemetry/DesktopRendererHistory.ts"; |
| 38 | import { HostProcessHomeDirectory } from "@t3tools/shared/hostProcess"; | |
| 38 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 39 | 39 | |
| 40 | 40 | const DEFAULT_DESKTOP_BACKEND_PORT = 3773; |
| 41 | 41 | const MAX_TCP_PORT = 65_535; |
| ... | ... | @@ -286,7 +286,7 @@ const startup = Effect.gen(function* () { |
| 286 | 286 | const linuxElectronOptions = |
| 287 | 287 | environment.platform === "linux" && !hasCommandLinePasswordStore |
| 288 | 288 | ? DesktopPreReadyPlatform.resolveEarlyLinuxElectronOptionsFromProcess( |
| 289 | yield* HostProcessHomeDirectory, | |
| 289 | yield* HostProcess.HomeDirectory, | |
| 290 | 290 | ) |
| 291 | 291 | : preReadyElectronOptions.linux; |
| 292 | 292 | if (linuxElectronOptions !== null && !hasCommandLinePasswordStore) { |
apps/desktop/src/app/DesktopAppActivation.test.ts+9-9
| ... | ... | @@ -11,7 +11,7 @@ import { |
| 11 | 11 | type DesktopAppActivationResponse, |
| 12 | 12 | } from "@t3tools/contracts"; |
| 13 | 13 | import { resolveDesktopAppControlAddress } from "@t3tools/shared/desktopAppControl"; |
| 14 | import { HostProcessPlatform, HostProcessUserId } from "@t3tools/shared/hostProcess"; | |
| 14 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 15 | 15 | import { it } from "@effect/vitest"; |
| 16 | 16 | import * as Effect from "effect/Effect"; |
| 17 | 17 | import { afterEach, describe, expect } from "vite-plus/test"; |
| ... | ... | @@ -83,8 +83,8 @@ function exchange(address: string, payload: DesktopAppActivationRequest) { |
| 83 | 83 | describe("desktop app control server", () => { |
| 84 | 84 | it.effect("roundtrips a request and removes its socket on shutdown", () => |
| 85 | 85 | Effect.gen(function* () { |
| 86 | const platform = yield* HostProcessPlatform; | |
| 87 | const userId = yield* HostProcessUserId; | |
| 86 | const platform = yield* HostProcess.Platform; | |
| 87 | const userId = yield* HostProcess.UserId; | |
| 88 | 88 | yield* Effect.promise(async () => { |
| 89 | 89 | const root = await NodeFSP.mkdtemp(NodePath.join(NodeOS.tmpdir(), "t3-app-control-test-")); |
| 90 | 90 | const target = makeTarget(NodePath.join(root, "userdata"), platform, userId); |
| ... | ... | @@ -123,8 +123,8 @@ describe("desktop app control server", () => { |
| 123 | 123 | |
| 124 | 124 | it.effect("cancels a queued request when the client disconnects", () => |
| 125 | 125 | Effect.gen(function* () { |
| 126 | const platform = yield* HostProcessPlatform; | |
| 127 | const userId = yield* HostProcessUserId; | |
| 126 | const platform = yield* HostProcess.Platform; | |
| 127 | const userId = yield* HostProcess.UserId; | |
| 128 | 128 | yield* Effect.promise(async () => { |
| 129 | 129 | const root = await NodeFSP.mkdtemp(NodePath.join(NodeOS.tmpdir(), "t3-app-cancel-test-")); |
| 130 | 130 | const target = makeTarget(NodePath.join(root, "userdata"), platform, userId); |
| ... | ... | @@ -162,8 +162,8 @@ describe("desktop app control server", () => { |
| 162 | 162 | // Two desktop apps can share one state dir, such as nightly and a preview build. |
| 163 | 163 | it.effect("keeps a newer app's socket when an older app on the same state dir quits", () => |
| 164 | 164 | Effect.gen(function* () { |
| 165 | const platform = yield* HostProcessPlatform; | |
| 166 | const userId = yield* HostProcessUserId; | |
| 165 | const platform = yield* HostProcess.Platform; | |
| 166 | const userId = yield* HostProcess.UserId; | |
| 167 | 167 | if (platform === "win32") return; |
| 168 | 168 | yield* Effect.promise(async () => { |
| 169 | 169 | const root = await NodeFSP.mkdtemp(NodePath.join(NodeOS.tmpdir(), "t3-app-takeover-test-")); |
| ... | ... | @@ -183,8 +183,8 @@ describe("desktop app control server", () => { |
| 183 | 183 | |
| 184 | 184 | it.effect("binds its address again after the socket file is removed", () => |
| 185 | 185 | Effect.gen(function* () { |
| 186 | const platform = yield* HostProcessPlatform; | |
| 187 | const userId = yield* HostProcessUserId; | |
| 186 | const platform = yield* HostProcess.Platform; | |
| 187 | const userId = yield* HostProcess.UserId; | |
| 188 | 188 | if (platform === "win32") return; |
| 189 | 189 | yield* Effect.promise(async () => { |
| 190 | 190 | const root = await NodeFSP.mkdtemp(NodePath.join(NodeOS.tmpdir(), "t3-app-reclaim-test-")); |
apps/desktop/src/app/DesktopAppActivation.ts+2-2
| ... | ... | @@ -12,7 +12,7 @@ import { |
| 12 | 12 | type DesktopAppActivationResponse, |
| 13 | 13 | } from "@t3tools/contracts"; |
| 14 | 14 | import { resolveDesktopAppControlAddress } from "@t3tools/shared/desktopAppControl"; |
| 15 | import { HostProcessUserId } from "@t3tools/shared/hostProcess"; | |
| 15 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 16 | 16 | import * as Context from "effect/Context"; |
| 17 | 17 | import * as Effect from "effect/Effect"; |
| 18 | 18 | import * as Layer from "effect/Layer"; |
| ... | ... | @@ -315,7 +315,7 @@ export const make = Effect.gen(function* () { |
| 315 | 315 | const desktopWindow = yield* DesktopWindow.DesktopWindow; |
| 316 | 316 | const electronWindow = yield* ElectronWindow.ElectronWindow; |
| 317 | 317 | const path = yield* Path.Path; |
| 318 | const userId = yield* HostProcessUserId; | |
| 318 | const userId = yield* HostProcess.UserId; | |
| 319 | 319 | const runPromise = Effect.runPromiseWith(yield* Effect.context<never>()); |
| 320 | 320 | const address = resolveDesktopAppControlAddress({ |
| 321 | 321 | stateDir: path.resolve(desktopEnvironment.stateDir), |
apps/desktop/src/app/DesktopClerk.test.ts+2-2
| ... | ... | @@ -3,7 +3,7 @@ import * as NodeHttp from "node:http"; |
| 3 | 3 | import * as NodePath from "@effect/platform-node/NodePath"; |
| 4 | 4 | import { codexAuthHandoffUrl, readCodexAuthDelivery } from "@t3tools/shared/codexAuthHandoff"; |
| 5 | 5 | import { EnvironmentId, ProviderInstanceId } from "@t3tools/contracts"; |
| 6 | import { HostProcessArguments } from "@t3tools/shared/hostProcess"; | |
| 6 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 7 | 7 | import { assert, describe, it } from "@effect/vitest"; |
| 8 | 8 | import * as Cause from "effect/Cause"; |
| 9 | 9 | import * as Effect from "effect/Effect"; |
| ... | ... | @@ -375,7 +375,7 @@ it.effect.each(["startup", "open-url"] as const)( |
| 375 | 375 | assert.strictEqual(delivery?.returnUrl, request.returnUrl); |
| 376 | 376 | }).pipe( |
| 377 | 377 | Effect.provide(layerDesktopClerk(true, [], "darwin", undefined, shell)), |
| 378 | Effect.provideService(HostProcessArguments, entry === "startup" ? ["t3", link] : ["t3"]), | |
| 378 | Effect.provideService(HostProcess.Arguments, entry === "startup" ? ["t3", link] : ["t3"]), | |
| 379 | 379 | Effect.provideService(ElectronApp.ElectronApp, electronApp), |
| 380 | 380 | Effect.provideService( |
| 381 | 381 | ElectronWindow.ElectronWindow, |
apps/desktop/src/app/DesktopClerk.ts+2-2
| ... | ... | @@ -11,7 +11,7 @@ import { codexAuthDeliveryUrl, readCodexAuthHandoff } from "@t3tools/shared/code |
| 11 | 11 | import { receiveCodexAuthCallback, CodexAuthCallbackError } from "./CodexAuthCallback.ts"; |
| 12 | 12 | import * as ElectronShell from "../electron/ElectronShell.ts"; |
| 13 | 13 | import { providerAuthReturnUrl } from "@t3tools/shared/providerAuthReturnUrl"; |
| 14 | import { HostProcessArguments } from "@t3tools/shared/hostProcess"; | |
| 14 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 15 | 15 | import { clerkFrontendApiHostnameFromPublishableKey } from "@t3tools/shared/relayAuth"; |
| 16 | 16 | import * as ElectronApp from "../electron/ElectronApp.ts"; |
| 17 | 17 | import * as ElectronProtocol from "../electron/ElectronProtocol.ts"; |
| ... | ... | @@ -182,7 +182,7 @@ export const make = Effect.gen(function* () { |
| 182 | 182 | ); |
| 183 | 183 | return true; |
| 184 | 184 | }; |
| 185 | const args = yield* HostProcessArguments; | |
| 185 | const args = yield* HostProcess.Arguments; | |
| 186 | 186 | args.some((value) => startProviderAuthHandoff(value)); |
| 187 | 187 | yield* electronApp.on("open-url", (event: { preventDefault: () => void }, url: string) => { |
| 188 | 188 | if (startProviderAuthHandoff(url) || resumeProviderAuth(url)) event.preventDefault(); |
apps/desktop/src/app/DesktopPreReadyFileSystem.test.ts+2-2
| ... | ... | @@ -1,6 +1,6 @@ |
| 1 | 1 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 2 | 2 | import { assert, it } from "@effect/vitest"; |
| 3 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 3 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 4 | 4 | import * as Effect from "effect/Effect"; |
| 5 | 5 | import * as Exit from "effect/Exit"; |
| 6 | 6 | import * as FileSystem from "effect/FileSystem"; |
| ... | ... | @@ -32,7 +32,7 @@ it.layer(NodeServices.layer)("DesktopPreReadyFileSystem", (it) => { |
| 32 | 32 | }), |
| 33 | 33 | ); |
| 34 | 34 | |
| 35 | it.effect.skipIf(HostProcessPlatform.defaultValue() === "win32" || process.getuid?.() === 0)( | |
| 35 | it.effect.skipIf(HostProcess.Platform.defaultValue() === "win32" || process.getuid?.() === 0)( | |
| 36 | 36 | "fails instead of treating an unreadable profile as missing", |
| 37 | 37 | () => |
| 38 | 38 | Effect.gen(function* () { |
apps/desktop/src/app/DesktopPreReadyPlatform.test.ts+6-6
| ... | ... | @@ -1,5 +1,5 @@ |
| 1 | 1 | import { assert, describe, it } from "@effect/vitest"; |
| 2 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 2 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 3 | 3 | import * as Context from "effect/Context"; |
| 4 | 4 | import * as Effect from "effect/Effect"; |
| 5 | 5 | import * as Layer from "effect/Layer"; |
| ... | ... | @@ -75,7 +75,7 @@ describe("DesktopPreReadyPlatform", () => { |
| 75 | 75 | }).pipe( |
| 76 | 76 | Effect.provide( |
| 77 | 77 | DesktopPreReadyPlatform.layer.pipe( |
| 78 | Layer.provide(Layer.succeed(HostProcessPlatform, "linux")), | |
| 78 | Layer.provide(Layer.succeed(HostProcess.Platform, "linux")), | |
| 79 | 79 | ), |
| 80 | 80 | ), |
| 81 | 81 | ); |
| ... | ... | @@ -111,7 +111,7 @@ describe("DesktopPreReadyPlatform", () => { |
| 111 | 111 | })); |
| 112 | 112 | yield* Layer.build( |
| 113 | 113 | DesktopPreReadyPlatform.layer.pipe( |
| 114 | Layer.provide(Layer.succeed(HostProcessPlatform, "linux")), | |
| 114 | Layer.provide(Layer.succeed(HostProcess.Platform, "linux")), | |
| 115 | 115 | ), |
| 116 | 116 | ); |
| 117 | 117 | const identity = yield* Effect.promise(() => portalIdentity); |
| ... | ... | @@ -135,7 +135,7 @@ describe("DesktopPreReadyPlatform", () => { |
| 135 | 135 | }); |
| 136 | 136 | |
| 137 | 137 | return DesktopPreReadyPlatform.make.pipe( |
| 138 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 138 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 139 | 139 | Effect.asVoid, |
| 140 | 140 | ); |
| 141 | 141 | }); |
| ... | ... | @@ -151,7 +151,7 @@ describe("DesktopPreReadyPlatform", () => { |
| 151 | 151 | assert.include(contents, "MimeType=x-scheme-handler/t3code;"); |
| 152 | 152 | assert.include(contents, "Icon="); |
| 153 | 153 | assert.equal(setDesktopNameMock.mock.calls.length, 1); |
| 154 | }).pipe(Effect.provideService(HostProcessPlatform, "linux")); | |
| 154 | }).pipe(Effect.provideService(HostProcess.Platform, "linux")); | |
| 155 | 155 | }); |
| 156 | 156 | |
| 157 | 157 | it.effect( |
| ... | ... | @@ -168,7 +168,7 @@ describe("DesktopPreReadyPlatform", () => { |
| 168 | 168 | }); |
| 169 | 169 | |
| 170 | 170 | const layerPreReady = DesktopPreReadyPlatform.layer.pipe( |
| 171 | Layer.provide(Layer.succeed(HostProcessPlatform, "darwin")), | |
| 171 | Layer.provide(Layer.succeed(HostProcess.Platform, "darwin")), | |
| 172 | 172 | ); |
| 173 | 173 | |
| 174 | 174 | const layerClerkShaped = Layer.effect( |
apps/desktop/src/app/DesktopPreReadyPlatform.ts+3-3
| ... | ... | @@ -6,7 +6,7 @@ import * as Effect from "effect/Effect"; |
| 6 | 6 | import * as Layer from "effect/Layer"; |
| 7 | 7 | |
| 8 | 8 | import * as Electron from "electron"; |
| 9 | import { HostProcessHomeDirectory, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 9 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 10 | 10 | |
| 11 | 11 | import * as DesktopEarlyElectronStartup from "./DesktopEarlyElectronStartup.ts"; |
| 12 | 12 | import { resolveDesktopAppBranding } from "./DesktopEnvironment.ts"; |
| ... | ... | @@ -50,8 +50,8 @@ export class DesktopPreReadyElectronOptions extends Context.Service< |
| 50 | 50 | |
| 51 | 51 | /** @public Service construction is part of the canonical Effect module API. */ |
| 52 | 52 | export const make = Effect.gen(function* () { |
| 53 | const platform = yield* HostProcessPlatform; | |
| 54 | const homeDirectory = yield* HostProcessHomeDirectory; | |
| 53 | const platform = yield* HostProcess.Platform; | |
| 54 | const homeDirectory = yield* HostProcess.HomeDirectory; | |
| 55 | 55 | return yield* Effect.sync((): DesktopPreReadyElectronOptions["Service"] => { |
| 56 | 56 | const linuxPasswordStoreCommandLine = |
| 57 | 57 | platform === "linux" |
apps/desktop/src/backend/DesktopNetworkInterfaces.test.ts+2-2
| ... | ... | @@ -1,5 +1,5 @@ |
| 1 | 1 | import { assert, describe, it } from "@effect/vitest"; |
| 2 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 2 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 3 | 3 | import * as Cause from "effect/Cause"; |
| 4 | 4 | import * as Effect from "effect/Effect"; |
| 5 | 5 | import * as Layer from "effect/Layer"; |
| ... | ... | @@ -16,7 +16,7 @@ vi.mock("node:os", () => ({ |
| 16 | 16 | import * as DesktopNetworkInterfaces from "./DesktopNetworkInterfaces.ts"; |
| 17 | 17 | |
| 18 | 18 | const layerTest = DesktopNetworkInterfaces.layer.pipe( |
| 19 | Layer.provide(Layer.succeed(HostProcessPlatform, "linux")), | |
| 19 | Layer.provide(Layer.succeed(HostProcess.Platform, "linux")), | |
| 20 | 20 | ); |
| 21 | 21 | |
| 22 | 22 | describe("DesktopNetworkInterfaces", () => { |
apps/desktop/src/backend/DesktopNetworkInterfaces.ts+2-2
| ... | ... | @@ -1,6 +1,6 @@ |
| 1 | 1 | import * as NodeOS from "node:os"; |
| 2 | 2 | |
| 3 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 3 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 4 | 4 | import * as Context from "effect/Context"; |
| 5 | 5 | import * as Effect from "effect/Effect"; |
| 6 | 6 | import * as Layer from "effect/Layer"; |
| ... | ... | @@ -41,7 +41,7 @@ export class DesktopNetworkInterfaces extends Context.Service< |
| 41 | 41 | |
| 42 | 42 | /** @public Service construction is part of the canonical Effect module API. */ |
| 43 | 43 | export const make = Effect.gen(function* () { |
| 44 | const platform = yield* HostProcessPlatform; | |
| 44 | const platform = yield* HostProcess.Platform; | |
| 45 | 45 | return DesktopNetworkInterfaces.of({ |
| 46 | 46 | read: Effect.try({ |
| 47 | 47 | try: () => NodeOS.networkInterfaces(), |
apps/desktop/src/electron/ElectronMenu.test.ts+2-2
| ... | ... | @@ -1,5 +1,5 @@ |
| 1 | 1 | import { assert, describe, it } from "@effect/vitest"; |
| 2 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 2 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 3 | 3 | import * as Cause from "effect/Cause"; |
| 4 | 4 | import * as Effect from "effect/Effect"; |
| 5 | 5 | import * as Layer from "effect/Layer"; |
| ... | ... | @@ -28,7 +28,7 @@ vi.mock("electron", () => ({ |
| 28 | 28 | import * as ElectronMenu from "./ElectronMenu.ts"; |
| 29 | 29 | |
| 30 | 30 | const layerTest = ElectronMenu.layer.pipe( |
| 31 | Layer.provide(Layer.succeed(HostProcessPlatform, "linux")), | |
| 31 | Layer.provide(Layer.succeed(HostProcess.Platform, "linux")), | |
| 32 | 32 | ); |
| 33 | 33 | |
| 34 | 34 | const makeWindow = (zoomFactor = 1): Electron.BrowserWindow => |
apps/desktop/src/electron/ElectronMenu.ts+2-2
| ... | ... | @@ -1,5 +1,5 @@ |
| 1 | 1 | import type { ContextMenuItem } from "@t3tools/contracts"; |
| 2 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 2 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 3 | 3 | import * as Context from "effect/Context"; |
| 4 | 4 | import * as Effect from "effect/Effect"; |
| 5 | 5 | import * as Layer from "effect/Layer"; |
| ... | ... | @@ -114,7 +114,7 @@ const normalizePosition = ( |
| 114 | 114 | |
| 115 | 115 | /** @public Service construction is part of the canonical Effect module API. */ |
| 116 | 116 | export const make = Effect.gen(function* () { |
| 117 | const platform = yield* HostProcessPlatform; | |
| 117 | const platform = yield* HostProcess.Platform; | |
| 118 | 118 | let destructiveMenuIconCache: Option.Option<Electron.NativeImage> | undefined; |
| 119 | 119 | |
| 120 | 120 | const getDestructiveMenuIcon = (): Option.Option<Electron.NativeImage> => { |
apps/desktop/src/electron/ElectronSafeStorage.ts+2-2
| ... | ... | @@ -5,7 +5,7 @@ import * as Option from "effect/Option"; |
| 5 | 5 | import * as Schema from "effect/Schema"; |
| 6 | 6 | |
| 7 | 7 | import * as Electron from "electron"; |
| 8 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 8 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 9 | 9 | |
| 10 | 10 | const electronSafeStorageErrorFields = { |
| 11 | 11 | cause: Schema.Defect(), |
| ... | ... | @@ -67,7 +67,7 @@ export class ElectronSafeStorage extends Context.Service< |
| 67 | 67 | |
| 68 | 68 | /** @public Service construction is part of the canonical Effect module API. */ |
| 69 | 69 | export const make = Effect.gen(function* () { |
| 70 | const platform = yield* HostProcessPlatform; | |
| 70 | const platform = yield* HostProcess.Platform; | |
| 71 | 71 | |
| 72 | 72 | return ElectronSafeStorage.of({ |
| 73 | 73 | isEncryptionAvailable: Effect.try({ |
apps/desktop/src/electron/ElectronWindow.test.ts+2-2
| ... | ... | @@ -1,5 +1,5 @@ |
| 1 | 1 | import { assert, describe, it } from "@effect/vitest"; |
| 2 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 2 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 3 | 3 | import * as Cause from "effect/Cause"; |
| 4 | 4 | import * as Effect from "effect/Effect"; |
| 5 | 5 | import * as Fiber from "effect/Fiber"; |
| ... | ... | @@ -58,7 +58,7 @@ vi.mock("electron", () => ({ |
| 58 | 58 | import * as ElectronWindow from "./ElectronWindow.ts"; |
| 59 | 59 | |
| 60 | 60 | const layerTestFor = (platform: NodeJS.Platform) => |
| 61 | ElectronWindow.layer.pipe(Layer.provide(Layer.succeed(HostProcessPlatform, platform))); | |
| 61 | ElectronWindow.layer.pipe(Layer.provide(Layer.succeed(HostProcess.Platform, platform))); | |
| 62 | 62 | |
| 63 | 63 | const layerTest = layerTestFor("linux"); |
| 64 | 64 |
apps/desktop/src/electron/ElectronWindow.ts+2-2
| ... | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | |
| 3 | 3 | import * as NodePath from "node:path"; |
| 4 | 4 | |
| 5 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 5 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 6 | 6 | import type * as Cause from "effect/Cause"; |
| 7 | 7 | import * as Context from "effect/Context"; |
| 8 | 8 | import * as Effect from "effect/Effect"; |
| ... | ... | @@ -129,7 +129,7 @@ export class ElectronWindow extends Context.Service< |
| 129 | 129 | |
| 130 | 130 | /** @public Service construction is part of the canonical Effect module API. */ |
| 131 | 131 | export const make = Effect.gen(function* () { |
| 132 | const platform = yield* HostProcessPlatform; | |
| 132 | const platform = yield* HostProcess.Platform; | |
| 133 | 133 | // The focus worker loads a native accessibility module. Start it on the first |
| 134 | 134 | // capture reveal so users who never capture pay nothing at launch. |
| 135 | 135 | let windowsForegroundFocus: ReturnType<typeof startWindowsForegroundFocusThread> | undefined; |
apps/desktop/src/ipc/methods/notificationBadge.test.ts+2-2
| ... | ... | @@ -1,7 +1,7 @@ |
| 1 | 1 | import * as Effect from "effect/Effect"; |
| 2 | 2 | import { beforeEach, expect, vi } from "vite-plus/test"; |
| 3 | 3 | import { it } from "@effect/vitest"; |
| 4 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 4 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 5 | 5 | |
| 6 | 6 | const native = vi.hoisted(() => ({ |
| 7 | 7 | setBadgeCount: vi.fn(), |
| ... | ... | @@ -122,7 +122,7 @@ it.effect("validates IPC and clears on native focus, quit, and disposal", () => |
| 122 | 122 | expect(native.setBadgeCount).toHaveBeenLastCalledWith(0); |
| 123 | 123 | }), |
| 124 | 124 | ).pipe( |
| 125 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 125 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 126 | 126 | Effect.provide([ |
| 127 | 127 | ElectronApp.layer, |
| 128 | 128 | DesktopIpc.layer({ |
apps/desktop/src/ipc/methods/notificationBadge.ts+2-2
| ... | ... | @@ -1,7 +1,7 @@ |
| 1 | 1 | import * as Electron from "electron"; |
| 2 | 2 | import * as Effect from "effect/Effect"; |
| 3 | 3 | import * as Schema from "effect/Schema"; |
| 4 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 4 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 5 | 5 | |
| 6 | 6 | import * as ElectronApp from "../../electron/ElectronApp.ts"; |
| 7 | 7 | import * as DesktopIpc from "../DesktopIpc.ts"; |
| ... | ... | @@ -45,7 +45,7 @@ export const installNotificationBadge = Effect.fn("desktop.ipc.installNotificati |
| 45 | 45 | function* () { |
| 46 | 46 | const ipc = yield* DesktopIpc.DesktopIpc; |
| 47 | 47 | const app = yield* ElectronApp.ElectronApp; |
| 48 | const platform = yield* HostProcessPlatform; | |
| 48 | const platform = yield* HostProcess.Platform; | |
| 49 | 49 | const clear = () => { |
| 50 | 50 | applyNotificationBadge(platform, { count: 0, image: null }); |
| 51 | 51 | for (const window of Electron.BrowserWindow.getAllWindows()) { |
apps/desktop/src/ipc/methods/window.test.ts+4-4
| ... | ... | @@ -1,6 +1,6 @@ |
| 1 | 1 | import { assert, describe, it } from "@effect/vitest"; |
| 2 | 2 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 3 | import { HostProcessEnvironment, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 3 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 4 | 4 | import * as FileSystem from "effect/FileSystem"; |
| 5 | 5 | import * as Path from "effect/Path"; |
| 6 | 6 | import * as Effect from "effect/Effect"; |
| ... | ... | @@ -314,7 +314,7 @@ describe("pickProjectFavicon", () => { |
| 314 | 314 | ); |
| 315 | 315 | }); |
| 316 | 316 | |
| 317 | it.effect.skipIf(HostProcessPlatform.defaultValue() === "win32")( | |
| 317 | it.effect.skipIf(HostProcess.Platform.defaultValue() === "win32")( | |
| 318 | 318 | "finds remote editors installed without PATH launchers", |
| 319 | 319 | () => |
| 320 | 320 | Effect.gen(function* () { |
| ... | ... | @@ -333,11 +333,11 @@ it.effect.skipIf(HostProcessPlatform.defaultValue() === "win32")( |
| 333 | 333 | yield* fs.chmod(executable, 0o755); |
| 334 | 334 | } |
| 335 | 335 | const editors = yield* probeRemoteEditors.handler(undefined).pipe( |
| 336 | Effect.provideService(HostProcessEnvironment, { | |
| 336 | Effect.provideService(HostProcess.Environment, { | |
| 337 | 337 | HOME: home, |
| 338 | 338 | PATH: path.join(home, "empty"), |
| 339 | 339 | }), |
| 340 | Effect.provideService(HostProcessPlatform, "darwin"), | |
| 340 | Effect.provideService(HostProcess.Platform, "darwin"), | |
| 341 | 341 | ); |
| 342 | 342 | assert.include(editors, "cursor"); |
| 343 | 343 | assert.include(editors, "vscode"); |
apps/desktop/src/ipc/methods/window.ts+3-4
| ... | ... | @@ -15,7 +15,7 @@ import { |
| 15 | 15 | } from "@t3tools/contracts"; |
| 16 | 16 | import { WORKSPACE_IMAGE_PREVIEW_EXTENSIONS } from "@t3tools/shared/filePreview"; |
| 17 | 17 | import { resolveEditorCommand } from "@t3tools/shared/editor"; |
| 18 | import * as HostProcess from "@t3tools/shared/hostProcess"; | |
| 18 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 19 | 19 | import * as FileSystem from "effect/FileSystem"; |
| 20 | 20 | import * as Path from "effect/Path"; |
| 21 | 21 | import * as Effect from "effect/Effect"; |
| ... | ... | @@ -45,7 +45,6 @@ import { |
| 45 | 45 | resolveWslPickFolderDefaultPath, |
| 46 | 46 | wslUncPathToLinuxPath, |
| 47 | 47 | } from "../../wsl/wslPathParsing.ts"; |
| 48 | import { HostProcessHomeDirectory } from "@t3tools/shared/hostProcess"; | |
| 49 | 48 | |
| 50 | 49 | const ContextMenuPosition = Schema.Struct({ |
| 51 | 50 | x: Schema.Number, |
| ... | ... | @@ -345,7 +344,7 @@ export const probeRemoteEditors = DesktopIpc.makeIpcMethod({ |
| 345 | 344 | result: Schema.Array(EditorId), |
| 346 | 345 | handler: Effect.fn("desktop.ipc.window.probeRemoteEditors")(function* () { |
| 347 | 346 | const available: Array<EditorId> = []; |
| 348 | const env = yield* HostProcess.HostProcessEnvironment; | |
| 347 | const env = yield* HostProcess.Environment; | |
| 349 | 348 | for (const editorId of REMOTE_CAPABLE_EDITOR_IDS) { |
| 350 | 349 | const editor = EDITORS.find((editor) => editor.id === editorId); |
| 351 | 350 | if (editor && Option.isSome(yield* resolveEditorCommand(editor, env))) { |
| ... | ... | @@ -398,7 +397,7 @@ export const pickThemeFiles = DesktopIpc.makeIpcMethod({ |
| 398 | 397 | // The VS Code extensions directory is the same dotfolder on Windows, |
| 399 | 398 | // macOS, and Linux; when it is missing the picker opens wherever the |
| 400 | 399 | // platform would by default. |
| 401 | const extensionsDir = path.join(yield* HostProcessHomeDirectory, ".vscode", "extensions"); | |
| 400 | const extensionsDir = path.join(yield* HostProcess.HomeDirectory, ".vscode", "extensions"); | |
| 402 | 401 | const defaultPath = yield* fileSystem |
| 403 | 402 | .exists(extensionsDir) |
| 404 | 403 | .pipe(Effect.orElseSucceed(() => false)); |
apps/desktop/src/main.ts+3-3
| ... | ... | @@ -18,7 +18,7 @@ import * as Option from "effect/Option"; |
| 18 | 18 | import * as Electron from "electron"; |
| 19 | 19 | |
| 20 | 20 | import * as NetService from "@t3tools/shared/Net"; |
| 21 | import { HostProcessArchitecture, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 21 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 22 | 22 | import type { RemoteT3RunnerOptions } from "@t3tools/ssh/tunnel"; |
| 23 | 23 | import serverPackageJson from "../../server/package.json" with { type: "json" }; |
| 24 | 24 | |
| ... | ... | @@ -90,8 +90,8 @@ const layerDesktopEnvironment = Layer.unwrap( |
| 90 | 90 | const metadata = yield* Effect.service(ElectronApp.ElectronApp).pipe( |
| 91 | 91 | Effect.flatMap((app) => app.metadata), |
| 92 | 92 | ); |
| 93 | const platform = yield* HostProcessPlatform; | |
| 94 | const processArch = yield* HostProcessArchitecture; | |
| 93 | const platform = yield* HostProcess.Platform; | |
| 94 | const processArch = yield* HostProcess.Architecture; | |
| 95 | 95 | return DesktopEnvironment.layer({ |
| 96 | 96 | dirname: __dirname, |
| 97 | 97 | homeDirectory: NodeOS.homedir(), |
apps/desktop/src/preview/BrowserImport/BrowserImport.test.ts+6-10
| ... | ... | @@ -1,10 +1,6 @@ |
| 1 | 1 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 2 | 2 | import { assert, describe, it } from "@effect/vitest"; |
| 3 | import { | |
| 4 | HostProcessEnvironment, | |
| 5 | HostProcessExecutablePath, | |
| 6 | HostProcessPlatform, | |
| 7 | } from "@t3tools/shared/hostProcess"; | |
| 3 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 8 | 4 | import * as Effect from "effect/Effect"; |
| 9 | 5 | import * as FileSystem from "effect/FileSystem"; |
| 10 | 6 | import * as Fiber from "effect/Fiber"; |
| ... | ... | @@ -52,10 +48,10 @@ const layerRejectedBeforeSession = Layer.succeed( |
| 52 | 48 | const withImporter = Effect.fnUntraced(function* () { |
| 53 | 49 | const fileSystem = yield* FileSystem.FileSystem; |
| 54 | 50 | const home = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3code-import-" }); |
| 55 | const layerEnvironment = Layer.succeed(HostProcessEnvironment, { HOME: home }); | |
| 51 | const layerEnvironment = Layer.succeed(HostProcess.Environment, { HOME: home }); | |
| 56 | 52 | const context = yield* sourcePathContext.pipe( |
| 57 | Effect.provideService(HostProcessEnvironment, { HOME: home }), | |
| 58 | Effect.provideService(HostProcessPlatform, "darwin"), | |
| 53 | Effect.provideService(HostProcess.Environment, { HOME: home }), | |
| 54 | Effect.provideService(HostProcess.Platform, "darwin"), | |
| 59 | 55 | ); |
| 60 | 56 | const root = helium.userDataDirectory(context); |
| 61 | 57 | if (root === undefined) throw new Error("Helium has no macOS user-data directory"); |
| ... | ... | @@ -69,8 +65,8 @@ const withImporter = Effect.fnUntraced(function* () { |
| 69 | 65 | BrowserImport.layer.pipe( |
| 70 | 66 | Layer.provide(layerRejectedBeforeSession), |
| 71 | 67 | Layer.provide(layerEnvironment), |
| 72 | Layer.provide(Layer.succeed(HostProcessPlatform, "darwin")), | |
| 73 | Layer.provide(Layer.succeed(HostProcessExecutablePath, "/Applications/T3 Code.app")), | |
| 68 | Layer.provide(Layer.succeed(HostProcess.Platform, "darwin")), | |
| 69 | Layer.provide(Layer.succeed(HostProcess.ExecutablePath, "/Applications/T3 Code.app")), | |
| 74 | 70 | Layer.provide(NodeServices.layer), |
| 75 | 71 | ), |
| 76 | 72 | ), |
apps/desktop/src/preview/BrowserImport/BrowserImport.ts+3-3
| ... | ... | @@ -21,7 +21,7 @@ import * as Schema from "effect/Schema"; |
| 21 | 21 | import * as Scope from "effect/Scope"; |
| 22 | 22 | import { ChildProcessSpawner } from "effect/process"; |
| 23 | 23 | |
| 24 | import { HostProcessExecutablePath, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 24 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 25 | 25 | |
| 26 | 26 | import * as BrowserSession from "../BrowserSession.ts"; |
| 27 | 27 | import { ChromiumCookieReadError, readChromiumCookies } from "./ChromiumCookies.ts"; |
| ... | ... | @@ -169,8 +169,8 @@ export const writeCookies = Effect.fn("BrowserImport.writeCookies")(function* ( |
| 169 | 169 | /** @public Service construction is part of the canonical Effect module API. */ |
| 170 | 170 | export const make = Effect.gen(function* BrowserImportMake() { |
| 171 | 171 | const browserSession = yield* BrowserSession.BrowserSession; |
| 172 | const platform = yield* HostProcessPlatform; | |
| 173 | const executablePath = yield* HostProcessExecutablePath; | |
| 172 | const platform = yield* HostProcess.Platform; | |
| 173 | const executablePath = yield* HostProcess.ExecutablePath; | |
| 174 | 174 | // Captured here so the service's methods stay free of a requirements |
| 175 | 175 | // channel: the layer is built where NodeServices is already in scope. |
| 176 | 176 | const platformServices = yield* Effect.context< |
apps/desktop/src/preview/BrowserImport/ChromiumCookies.ts+1-1
| ... | ... | @@ -315,7 +315,7 @@ export interface ChromiumCookieSource { |
| 315 | 315 | readonly keychainAccount: string | undefined; |
| 316 | 316 | readonly linuxSecretApplication: string | undefined; |
| 317 | 317 | readonly windowsLocalStatePath?: string; |
| 318 | /** Supplied by the caller from `HostProcessPlatform` rather than read here. */ | |
| 318 | /** Supplied by the caller from `HostProcess.Platform` rather than read here. */ | |
| 319 | 319 | readonly platform: NodeJS.Platform; |
| 320 | 320 | } |
| 321 | 321 |
apps/desktop/src/preview/BrowserImport/ChromiumKeys.test.ts+3-3
| ... | ... | @@ -1,5 +1,5 @@ |
| 1 | 1 | import { describe, expect, it } from "@effect/vitest"; |
| 2 | import { HostProcessEnvironment } from "@t3tools/shared/hostProcess"; | |
| 2 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 3 | 3 | import * as Deferred from "effect/Deferred"; |
| 4 | 4 | import * as Effect from "effect/Effect"; |
| 5 | 5 | import * as Layer from "effect/Layer"; |
| ... | ... | @@ -232,7 +232,7 @@ describe("Linux Chromium secrets", () => { |
| 232 | 232 | capture: (value) => (captured = value), |
| 233 | 233 | }), |
| 234 | 234 | ), |
| 235 | Effect.provideService(HostProcessEnvironment, { | |
| 235 | Effect.provideService(HostProcess.Environment, { | |
| 236 | 236 | PATH: "/synthetic/bin", |
| 237 | 237 | SESSION_MARKER: "kept", |
| 238 | 238 | LC_ALL: "localized", |
| ... | ... | @@ -322,7 +322,7 @@ describe("Windows Chromium secrets", () => { |
| 322 | 322 | Effect.provide( |
| 323 | 323 | layerHelper({ stdout: key.toString("base64"), capture: (value) => (captured = value) }), |
| 324 | 324 | ), |
| 325 | Effect.provideService(HostProcessEnvironment, { SystemRoot: "C:\\Windows" }), | |
| 325 | Effect.provideService(HostProcess.Environment, { SystemRoot: "C:\\Windows" }), | |
| 326 | 326 | ); |
| 327 | 327 | }); |
| 328 | 328 | }); |
apps/desktop/src/preview/BrowserImport/ChromiumKeys.ts+3-3
| ... | ... | @@ -19,7 +19,7 @@ |
| 19 | 19 | */ |
| 20 | 20 | import * as NodeCrypto from "node:crypto"; |
| 21 | 21 | |
| 22 | import { HostProcessEnvironment } from "@t3tools/shared/hostProcess"; | |
| 22 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 23 | 23 | |
| 24 | 24 | import * as Effect from "effect/Effect"; |
| 25 | 25 | import * as Base64 from "effect/encoding/Base64"; |
| ... | ... | @@ -138,7 +138,7 @@ export const readLinuxSecret = Effect.fn("ChromiumKeys.readLinuxSecret")(functio |
| 138 | 138 | return yield* Effect.scoped( |
| 139 | 139 | Effect.gen(function* () { |
| 140 | 140 | const spawner = yield* ChildProcessSpawner.ChildProcessSpawner; |
| 141 | const environment = yield* HostProcessEnvironment; | |
| 141 | const environment = yield* HostProcess.Environment; | |
| 142 | 142 | const helper = yield* LinuxBrowserSecretPath; |
| 143 | 143 | if (helper === undefined) { |
| 144 | 144 | return yield* new ChromiumKeyError({ reason: "keychainUnavailable" }); |
| ... | ... | @@ -219,7 +219,7 @@ export const decodeWindowsWrappedKey = Effect.fn("ChromiumKeys.decodeWindowsWrap |
| 219 | 219 | export const unwrapWindowsDpapiKey = Effect.fn("ChromiumKeys.unwrapWindowsDpapiKey")(function* ( |
| 220 | 220 | wrapped: Buffer, |
| 221 | 221 | ) { |
| 222 | const environment = yield* HostProcessEnvironment; | |
| 222 | const environment = yield* HostProcess.Environment; | |
| 223 | 223 | return yield* Effect.scoped( |
| 224 | 224 | Effect.gen(function* () { |
| 225 | 225 | const spawner = yield* ChildProcessSpawner.ChildProcessSpawner; |
apps/desktop/src/preview/BrowserImport/SafariPermission.test.ts+5-5
| ... | ... | @@ -1,6 +1,6 @@ |
| 1 | 1 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 2 | 2 | import { assert, it } from "@effect/vitest"; |
| 3 | import { HostProcessEnvironment, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 3 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 4 | 4 | import * as Effect from "effect/Effect"; |
| 5 | 5 | import * as FileSystem from "effect/FileSystem"; |
| 6 | 6 | import * as PlatformError from "effect/PlatformError"; |
| ... | ... | @@ -30,8 +30,8 @@ it.effect("detects Safari access becoming available without reading or importing |
| 30 | 30 | ), |
| 31 | 31 | }); |
| 32 | 32 | const check = yield* safariPermissionCheck.pipe( |
| 33 | Effect.provideService(HostProcessEnvironment, { HOME: home }), | |
| 34 | Effect.provideService(HostProcessPlatform, "darwin"), | |
| 33 | Effect.provideService(HostProcess.Environment, { HOME: home }), | |
| 34 | Effect.provideService(HostProcess.Platform, "darwin"), | |
| 35 | 35 | Effect.provideService(FileSystem.FileSystem, guardedFs), |
| 36 | 36 | ); |
| 37 | 37 | assert.isFalse(yield* Effect.promise(check)); |
| ... | ... | @@ -47,8 +47,8 @@ it.effect("recognizes access when cookies exist only in a named Safari profile", |
| 47 | 47 | const fs = yield* FileSystem.FileSystem; |
| 48 | 48 | const home = yield* fs.makeTempDirectoryScoped({ prefix: "t3-safari-named-access-" }); |
| 49 | 49 | const check = yield* safariPermissionCheck.pipe( |
| 50 | Effect.provideService(HostProcessEnvironment, { HOME: home }), | |
| 51 | Effect.provideService(HostProcessPlatform, "darwin"), | |
| 50 | Effect.provideService(HostProcess.Environment, { HOME: home }), | |
| 51 | Effect.provideService(HostProcess.Platform, "darwin"), | |
| 52 | 52 | ); |
| 53 | 53 | assert.isFalse(yield* Effect.promise(check)); |
| 54 | 54 | const directory = `${home}/Library/Containers/com.apple.Safari/Data/Library/WebKit/WebsiteDataStore/12345678-1234-1234-1234-123456789abc/Cookies`; |
apps/desktop/src/preview/BrowserImport/Sources.test.ts+30-34
| ... | ... | @@ -3,11 +3,7 @@ |
| 3 | 3 | import * as NodePath from "node:path"; |
| 4 | 4 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 5 | 5 | import { assert, describe, it } from "@effect/vitest"; |
| 6 | import { | |
| 7 | HostProcessEnvironment, | |
| 8 | HostProcessHostname, | |
| 9 | HostProcessPlatform, | |
| 10 | } from "@t3tools/shared/hostProcess"; | |
| 6 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 11 | 7 | import * as Effect from "effect/Effect"; |
| 12 | 8 | import * as FileSystem from "effect/FileSystem"; |
| 13 | 9 | import * as Path from "effect/Path"; |
| ... | ... | @@ -80,8 +76,8 @@ const withSourceHome = Effect.fnUntraced(function* () { |
| 80 | 76 | const fileSystem = yield* FileSystem.FileSystem; |
| 81 | 77 | const home = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3code-sources-" }); |
| 82 | 78 | const context = yield* sourcePathContext.pipe( |
| 83 | Effect.provideService(HostProcessEnvironment, { HOME: home }), | |
| 84 | Effect.provideService(HostProcessPlatform, "darwin"), | |
| 79 | Effect.provideService(HostProcess.Environment, { HOME: home }), | |
| 80 | Effect.provideService(HostProcess.Platform, "darwin"), | |
| 85 | 81 | ); |
| 86 | 82 | yield* fileSystem.makeDirectory(userDataDirectory(context), { recursive: true }); |
| 87 | 83 | return context; |
| ... | ... | @@ -133,8 +129,8 @@ describe("Helium on Linux", () => { |
| 133 | 129 | const fileSystem = yield* FileSystem.FileSystem; |
| 134 | 130 | const home = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3code-helium-linux-" }); |
| 135 | 131 | const context = yield* sourcePathContext.pipe( |
| 136 | Effect.provideService(HostProcessEnvironment, { HOME: home }), | |
| 137 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 132 | Effect.provideService(HostProcess.Environment, { HOME: home }), | |
| 133 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 138 | 134 | ); |
| 139 | 135 | const root = `${home}/.config/net.imput.helium`; |
| 140 | 136 | yield* fileSystem.makeDirectory(`${root}/Default`, { recursive: true }); |
| ... | ... | @@ -162,11 +158,11 @@ describe("Helium on Windows", () => { |
| 162 | 158 | run( |
| 163 | 159 | Effect.gen(function* () { |
| 164 | 160 | const context = yield* sourcePathContext.pipe( |
| 165 | Effect.provideService(HostProcessEnvironment, { | |
| 161 | Effect.provideService(HostProcess.Environment, { | |
| 166 | 162 | USERPROFILE: "C:\\Users\\browser-user", |
| 167 | 163 | LOCALAPPDATA: "C:\\Users\\browser-user\\AppData\\Local", |
| 168 | 164 | }), |
| 169 | Effect.provideService(HostProcessPlatform, "win32"), | |
| 165 | Effect.provideService(HostProcess.Platform, "win32"), | |
| 170 | 166 | ); |
| 171 | 167 | |
| 172 | 168 | assert.include(helium.platforms, "win32"); |
| ... | ... | @@ -198,11 +194,11 @@ describe("isSourceRunning", () => { |
| 198 | 194 | prefix: "t3code-helium-windows-lock-", |
| 199 | 195 | }); |
| 200 | 196 | const context = yield* sourcePathContext.pipe( |
| 201 | Effect.provideService(HostProcessEnvironment, { | |
| 197 | Effect.provideService(HostProcess.Environment, { | |
| 202 | 198 | HOME: home, |
| 203 | 199 | LOCALAPPDATA: home, |
| 204 | 200 | }), |
| 205 | Effect.provideService(HostProcessPlatform, "win32"), | |
| 201 | Effect.provideService(HostProcess.Platform, "win32"), | |
| 206 | 202 | ); |
| 207 | 203 | const profile = context.path.join(helium.userDataDirectory(context)!, "Default"); |
| 208 | 204 | const database = context.path.join(profile, "Network", "Cookies"); |
| ... | ... | @@ -259,12 +255,12 @@ describe("isSourceRunning", () => { |
| 259 | 255 | |
| 260 | 256 | assert.isTrue( |
| 261 | 257 | yield* isSourceRunning(helium, paths).pipe( |
| 262 | Effect.provideService(HostProcessHostname, "another-host"), | |
| 258 | Effect.provideService(HostProcess.Hostname, "another-host"), | |
| 263 | 259 | ), |
| 264 | 260 | ); |
| 265 | 261 | assert.isFalse( |
| 266 | 262 | yield* isSourceRunning(helium, paths).pipe( |
| 267 | Effect.provideService(HostProcessHostname, "lock-owner"), | |
| 263 | Effect.provideService(HostProcess.Hostname, "lock-owner"), | |
| 268 | 264 | ), |
| 269 | 265 | ); |
| 270 | 266 | }), |
| ... | ... | @@ -656,8 +652,8 @@ describe("cookieDatabaseCandidatePaths", () => { |
| 656 | 652 | Effect.gen(function* () { |
| 657 | 653 | const path = yield* Path.Path; |
| 658 | 654 | const context = yield* sourcePathContext.pipe( |
| 659 | Effect.provideService(HostProcessEnvironment, { HOME: "/tmp/test" }), | |
| 660 | Effect.provideService(HostProcessPlatform, "darwin"), | |
| 655 | Effect.provideService(HostProcess.Environment, { HOME: "/tmp/test" }), | |
| 656 | Effect.provideService(HostProcess.Platform, "darwin"), | |
| 661 | 657 | ); |
| 662 | 658 | const candidates = cookieDatabaseCandidatePaths(firefox, context, "Profiles/abc.default"); |
| 663 | 659 | assert.deepEqual(candidates, [ |
| ... | ... | @@ -684,8 +680,8 @@ describe("Firefox Snap profiles", () => { |
| 684 | 680 | prefix: "t3code-firefox-snap-", |
| 685 | 681 | }); |
| 686 | 682 | const context = yield* sourcePathContext.pipe( |
| 687 | Effect.provideService(HostProcessEnvironment, { HOME: home }), | |
| 688 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 683 | Effect.provideService(HostProcess.Environment, { HOME: home }), | |
| 684 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 689 | 685 | ); |
| 690 | 686 | const root = context.path.join(home, "snap", "firefox", "common", ".mozilla", "firefox"); |
| 691 | 687 | const directory = context.path.join(root, "abcd.default"); |
| ... | ... | @@ -724,8 +720,8 @@ describe("Firefox Snap profiles", () => { |
| 724 | 720 | const fileSystem = yield* FileSystem.FileSystem; |
| 725 | 721 | const home = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3code-firefox-snap-" }); |
| 726 | 722 | const context = yield* sourcePathContext.pipe( |
| 727 | Effect.provideService(HostProcessEnvironment, { HOME: home }), | |
| 728 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 723 | Effect.provideService(HostProcess.Environment, { HOME: home }), | |
| 724 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 729 | 725 | ); |
| 730 | 726 | const native = context.path.join(home, ".mozilla", "firefox"); |
| 731 | 727 | const snap = context.path.join(home, "snap", "firefox", "common", ".mozilla", "firefox"); |
| ... | ... | @@ -775,11 +771,11 @@ describe("listSourceProfiles Firefox fallback", () => { |
| 775 | 771 | }); |
| 776 | 772 | const appData = path.join(home, "AppData", "Roaming"); |
| 777 | 773 | const context = yield* sourcePathContext.pipe( |
| 778 | Effect.provideService(HostProcessEnvironment, { | |
| 774 | Effect.provideService(HostProcess.Environment, { | |
| 779 | 775 | HOME: home, |
| 780 | 776 | APPDATA: appData, |
| 781 | 777 | }), |
| 782 | Effect.provideService(HostProcessPlatform, platform), | |
| 778 | Effect.provideService(HostProcess.Platform, platform), | |
| 783 | 779 | ); |
| 784 | 780 | const root = firefox.userDataDirectory(context)!; |
| 785 | 781 | const scanRoot = platform === "linux" ? root : path.join(root, "Profiles"); |
| ... | ... | @@ -812,8 +808,8 @@ describe("listSourceProfiles Firefox fallback", () => { |
| 812 | 808 | prefix: "t3code-firefox-stale-ini-", |
| 813 | 809 | }); |
| 814 | 810 | const context = yield* sourcePathContext.pipe( |
| 815 | Effect.provideService(HostProcessEnvironment, { HOME: home }), | |
| 816 | Effect.provideService(HostProcessPlatform, "darwin"), | |
| 811 | Effect.provideService(HostProcess.Environment, { HOME: home }), | |
| 812 | Effect.provideService(HostProcess.Platform, "darwin"), | |
| 817 | 813 | ); |
| 818 | 814 | const root = firefox.userDataDirectory(context)!; |
| 819 | 815 | // `profiles.ini` names a profile that was never launched (no cookie |
| ... | ... | @@ -851,8 +847,8 @@ describe("listSourceProfiles Firefox fallback", () => { |
| 851 | 847 | prefix: "t3code-firefox-counts-", |
| 852 | 848 | }); |
| 853 | 849 | const context = yield* sourcePathContext.pipe( |
| 854 | Effect.provideService(HostProcessEnvironment, { HOME: home }), | |
| 855 | Effect.provideService(HostProcessPlatform, "darwin"), | |
| 850 | Effect.provideService(HostProcess.Environment, { HOME: home }), | |
| 851 | Effect.provideService(HostProcess.Platform, "darwin"), | |
| 856 | 852 | ); |
| 857 | 853 | const root = firefox.userDataDirectory(context)!; |
| 858 | 854 | const declaredDirectory = path.join(root, "Profiles", "declared.default"); |
| ... | ... | @@ -902,8 +898,8 @@ describe("isSourceRunning for Firefox", () => { |
| 902 | 898 | const fileSystem = yield* FileSystem.FileSystem; |
| 903 | 899 | const home = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3code-firefox-" }); |
| 904 | 900 | const context = yield* sourcePathContext.pipe( |
| 905 | Effect.provideService(HostProcessEnvironment, { HOME: home }), | |
| 906 | Effect.provideService(HostProcessPlatform, "darwin"), | |
| 901 | Effect.provideService(HostProcess.Environment, { HOME: home }), | |
| 902 | Effect.provideService(HostProcess.Platform, "darwin"), | |
| 907 | 903 | ); |
| 908 | 904 | const root = firefox.userDataDirectory(context)!; |
| 909 | 905 | const profile = `${root}/Profiles/abcd.default-release`; |
| ... | ... | @@ -952,7 +948,7 @@ describe("isSourceRunning for Firefox", () => { |
| 952 | 948 | ); |
| 953 | 949 | |
| 954 | 950 | // Holds the lock with python3's fcntl, which does not exist on Windows. |
| 955 | it.effect.skipIf(HostProcessPlatform.defaultValue() === "win32")( | |
| 951 | it.effect.skipIf(HostProcess.Platform.defaultValue() === "win32")( | |
| 956 | 952 | "detects a live fcntl lock on .parentlock, as macOS Firefox leaves it", |
| 957 | 953 | () => |
| 958 | 954 | run( |
| ... | ... | @@ -961,8 +957,8 @@ describe("isSourceRunning for Firefox", () => { |
| 961 | 957 | const spawner = yield* ChildProcessSpawner.ChildProcessSpawner; |
| 962 | 958 | const home = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3code-firefox-" }); |
| 963 | 959 | const context = yield* sourcePathContext.pipe( |
| 964 | Effect.provideService(HostProcessEnvironment, { HOME: home }), | |
| 965 | Effect.provideService(HostProcessPlatform, "darwin"), | |
| 960 | Effect.provideService(HostProcess.Environment, { HOME: home }), | |
| 961 | Effect.provideService(HostProcess.Platform, "darwin"), | |
| 966 | 962 | ); |
| 967 | 963 | const root = firefox.userDataDirectory(context)!; |
| 968 | 964 | const profile = `${root}/Profiles/abcd.default-release`; |
| ... | ... | @@ -1033,11 +1029,11 @@ describe("isSourceRunning for Firefox", () => { |
| 1033 | 1029 | const context = yield* sourcePathContext.pipe( |
| 1034 | 1030 | // Firefox's win32 root hangs off %APPDATA%; without it the root is |
| 1035 | 1031 | // undefined and the fixture would escape the sandbox into the repo. |
| 1036 | Effect.provideService(HostProcessEnvironment, { | |
| 1032 | Effect.provideService(HostProcess.Environment, { | |
| 1037 | 1033 | HOME: home, |
| 1038 | 1034 | APPDATA: `${home}/AppData/Roaming`, |
| 1039 | 1035 | }), |
| 1040 | Effect.provideService(HostProcessPlatform, "win32"), | |
| 1036 | Effect.provideService(HostProcess.Platform, "win32"), | |
| 1041 | 1037 | ); |
| 1042 | 1038 | const root = firefox.userDataDirectory(context)!; |
| 1043 | 1039 | const profile = `${root}/Profiles/gx7x7fqx.default-release`; |
apps/desktop/src/preview/BrowserImport/Sources.ts+6-11
| ... | ... | @@ -17,12 +17,7 @@ |
| 17 | 17 | */ |
| 18 | 18 | import type { BrowserImportSourceId, BrowserImportSourceProfile } from "@t3tools/contracts"; |
| 19 | 19 | import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient"; |
| 20 | import { | |
| 21 | HostProcessEnvironment, | |
| 22 | HostProcessAddresses, | |
| 23 | HostProcessHostname, | |
| 24 | HostProcessPlatform, | |
| 25 | } from "@t3tools/shared/hostProcess"; | |
| 20 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 26 | 21 | import * as Effect from "effect/Effect"; |
| 27 | 22 | import * as FileSystem from "effect/FileSystem"; |
| 28 | 23 | import * as Path from "effect/Path"; |
| ... | ... | @@ -335,8 +330,8 @@ export function parseFirefoxProfiles( |
| 335 | 330 | */ |
| 336 | 331 | export const sourcePathContext = Effect.gen(function* () { |
| 337 | 332 | const path = yield* Path.Path; |
| 338 | const platform = yield* HostProcessPlatform; | |
| 339 | const environment = yield* HostProcessEnvironment; | |
| 333 | const platform = yield* HostProcess.Platform; | |
| 334 | const environment = yield* HostProcess.Environment; | |
| 340 | 335 | return { |
| 341 | 336 | path, |
| 342 | 337 | platform, |
| ... | ... | @@ -782,7 +777,7 @@ export const posixLockIsHeld = Effect.fnUntraced(function* ( |
| 782 | 777 | interpreters: ReadonlyArray<string> = FCNTL_PROBE_INTERPRETERS, |
| 783 | 778 | ) { |
| 784 | 779 | const spawner = yield* ChildProcessSpawner.ChildProcessSpawner; |
| 785 | const environment = yield* HostProcessEnvironment; | |
| 780 | const environment = yield* HostProcess.Environment; | |
| 786 | 781 | for (const interpreter of interpreters) { |
| 787 | 782 | const verdict = yield* Effect.scoped( |
| 788 | 783 | Effect.gen(function* () { |
| ... | ... | @@ -872,7 +867,7 @@ export const isSourceRunning = Effect.fn("BrowserImportSources.isSourceRunning") |
| 872 | 867 | if (context.platform === "win32") { |
| 873 | 868 | return yield* windowsChromiumCookiesAreHeld(definition, context); |
| 874 | 869 | } |
| 875 | const currentHost = yield* HostProcessHostname; | |
| 870 | const currentHost = yield* HostProcess.Hostname; | |
| 876 | 871 | const lock = context.path.join(root, "SingletonLock"); |
| 877 | 872 | return yield* fileSystem.readLink(lock).pipe( |
| 878 | 873 | Effect.flatMap((target) => chromiumSingletonLockIsHeld(target, currentHost, processIsAlive)), |
| ... | ... | @@ -883,7 +878,7 @@ export const isSourceRunning = Effect.fn("BrowserImportSources.isSourceRunning") |
| 883 | 878 | const profiles = yield* listSourceProfiles(definition, context); |
| 884 | 879 | // Only the Linux `lock` symlink names an address, so Windows skips the lookup. |
| 885 | 880 | const localAddresses: ReadonlySet<string> = |
| 886 | context.platform === "win32" ? new Set() : yield* yield* HostProcessAddresses; | |
| 881 | context.platform === "win32" ? new Set() : yield* yield* HostProcess.Addresses; | |
| 887 | 882 | const found = yield* Effect.forEach(profiles, (profile) => { |
| 888 | 883 | const directory = context.path.isAbsolute(profile.directory) |
| 889 | 884 | ? profile.directory |
apps/desktop/src/preview/Manager.test.ts+2-2
| ... | ... | @@ -5,7 +5,7 @@ import type { |
| 5 | 5 | DesktopPreviewRecordingFrame, |
| 6 | 6 | DesktopPreviewRecordingInputEvent, |
| 7 | 7 | } from "@t3tools/contracts"; |
| 8 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 8 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 9 | 9 | import { parseKeybindingShortcut } from "@t3tools/shared/keybindings"; |
| 10 | 10 | import * as Cause from "effect/Cause"; |
| 11 | 11 | import * as Deferred from "effect/Deferred"; |
| ... | ... | @@ -313,7 +313,7 @@ const managerLayer = (platform: NodeJS.Platform = "darwin") => |
| 313 | 313 | Layer.provideMerge(layerFileSystem), |
| 314 | 314 | Layer.provideMerge(Path.layer), |
| 315 | 315 | Layer.provideMerge(NodeCrypto.layer), |
| 316 | Layer.provideMerge(Layer.succeed(HostProcessPlatform, platform)), | |
| 316 | Layer.provideMerge(Layer.succeed(HostProcess.Platform, platform)), | |
| 317 | 317 | ); |
| 318 | 318 | |
| 319 | 319 | const withManager = <A>( |
apps/desktop/src/preview/Manager.ts+2-2
| ... | ... | @@ -25,7 +25,7 @@ import type { |
| 25 | 25 | DesktopPreviewTabDefaults, |
| 26 | 26 | PreviewForwardedShortcut, |
| 27 | 27 | } from "@t3tools/contracts"; |
| 28 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 28 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 29 | 29 | import { matchesKeybindingShortcut } from "@t3tools/shared/keybindings"; |
| 30 | 30 | import { normalizePreviewUrl } from "@t3tools/shared/preview"; |
| 31 | 31 | import { |
| ... | ... | @@ -544,7 +544,7 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function |
| 544 | 544 | ) { |
| 545 | 545 | const fileSystem = yield* FileSystem.FileSystem; |
| 546 | 546 | const rendererHistory = yield* DesktopRendererHistory.DesktopRendererHistory; |
| 547 | const hostPlatform = yield* HostProcessPlatform; | |
| 547 | const hostPlatform = yield* HostProcess.Platform; | |
| 548 | 548 | const path = yield* Path.Path; |
| 549 | 549 | const crypto = yield* Crypto.Crypto; |
| 550 | 550 | const parentScope = yield* Scope.Scope; |
apps/desktop/src/snapShot/DesktopSnapShot.ts+2-2
| ... | ... | @@ -88,7 +88,7 @@ import { |
| 88 | 88 | snapShotShortcutRegistrationFailureMessage, |
| 89 | 89 | snapShotShortcutSystemConflict, |
| 90 | 90 | } from "./snapShot.ts"; |
| 91 | import { HostProcessHomeDirectory } from "@t3tools/shared/hostProcess"; | |
| 91 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 92 | 92 | |
| 93 | 93 | const MAX_CAPTURE_WIDTH = 2_560; |
| 94 | 94 | const MAX_CAPTURE_HEIGHT = 1_600; |
| ... | ... | @@ -728,7 +728,7 @@ export const make = Effect.gen(function* () { |
| 728 | 728 | const runPromise = Effect.runPromiseWith(context); |
| 729 | 729 | const captureDirectory = path.join(environment.stateDir, "snap-shots"); |
| 730 | 730 | const linuxAppId = environment.linuxDesktopEntryName.replace(/\.desktop$/, ""); |
| 731 | const home = yield* HostProcessHomeDirectory; | |
| 731 | const home = yield* HostProcess.HomeDirectory; | |
| 732 | 732 | let shortcutVerified = false; |
| 733 | 733 | const gnomeSetupPaths = { |
| 734 | 734 | bundle: environment.isPackaged |
apps/desktop/src/snapShot/snapShot.test.ts+2-2
| ... | ... | @@ -1,5 +1,5 @@ |
| 1 | 1 | import { it as effectIt } from "@effect/vitest"; |
| 2 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 2 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 3 | 3 | import * as Effect from "effect/Effect"; |
| 4 | 4 | import { describe, expect, it, vi } from "vite-plus/test"; |
| 5 | 5 | |
| ... | ... | @@ -703,7 +703,7 @@ describe("isWaylandSession", () => { |
| 703 | 703 | "falls back to a live runtime directory socket when session variables are stripped", |
| 704 | 704 | () => |
| 705 | 705 | Effect.gen(function* () { |
| 706 | if ((yield* HostProcessPlatform) !== "linux") return; | |
| 706 | if ((yield* HostProcess.Platform) !== "linux") return; | |
| 707 | 707 | yield* Effect.promise(async () => { |
| 708 | 708 | const { mkdtemp, rm, writeFile } = await import("node:fs/promises"); |
| 709 | 709 | const { createServer } = await import("node:net"); |
apps/server/scripts/record-codex-app-server-replay-fixture.ts+3-2
| ... | ... | @@ -5,7 +5,7 @@ import { revertCodexThread } from "../src/provider/CodexThreadRevert.ts"; |
| 5 | 5 | import { buildCodexInitializeParams } from "../src/provider/CodexProvider.ts"; |
| 6 | 6 | import * as NodeRuntime from "@effect/platform-node/NodeRuntime"; |
| 7 | 7 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 8 | import { HostProcessEnvironment } from "@t3tools/shared/hostProcess"; | |
| 8 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 9 | 9 | import { resolveSpawnCommand } from "@t3tools/shared/shell"; |
| 10 | 10 | import * as Console from "effect/Console"; |
| 11 | 11 | import * as Deferred from "effect/Deferred"; |
| ... | ... | @@ -1211,7 +1211,8 @@ function layerCodex({ recorder }: { readonly recorder: Recorder }) { |
| 1211 | 1211 | Effect.gen(function* () { |
| 1212 | 1212 | // The vp node shim marks its children with VP_TOOL_RECURSION, which makes every |
| 1213 | 1213 | // `node` the agent runs through a shell fail. Codex must not inherit it. |
| 1214 | const { VP_TOOL_RECURSION: _vpToolRecursion, ...environment } = yield* HostProcessEnvironment; | |
| 1214 | const { VP_TOOL_RECURSION: _vpToolRecursion, ...environment } = | |
| 1215 | yield* HostProcess.Environment; | |
| 1215 | 1216 | const spawner = yield* ChildProcessSpawner.ChildProcessSpawner; |
| 1216 | 1217 | const commandName = environment.T3_CODEX_BIN ?? environment.CODEX_BIN ?? "codex"; |
| 1217 | 1218 | const spawnCommand = yield* resolveSpawnCommand(commandName, ["app-server"], { |
apps/server/scripts/record-grok-acp-replay-fixture.ts+3-3
| ... | ... | @@ -12,7 +12,7 @@ |
| 12 | 12 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 13 | 13 | import { type ProviderReplayEntry } from "@t3tools/contracts"; |
| 14 | 14 | import { GrokSettings } from "@t3tools/provider-grok/settings"; |
| 15 | import { HostProcessEnvironment, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 15 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 16 | 16 | import { resolveSelfInvocation } from "@t3tools/shared/nodeRuntime"; |
| 17 | 17 | import * as Clock from "effect/Clock"; |
| 18 | 18 | import * as Console from "effect/Console"; |
| ... | ... | @@ -442,12 +442,12 @@ const recordScenario = Effect.fn("recordGrokScenario")(function* (fixtureName: s |
| 442 | 442 | const settings = { ...DEFAULT_GROK_SETTINGS, binaryPath: process.env.T3_GROK_BIN ?? "grok" }; |
| 443 | 443 | const layerRegistry = ProviderAdapterRegistry.layerFromAdaptersEffect( |
| 444 | 444 | Effect.gen(function* () { |
| 445 | const environment = yield* HostProcessEnvironment; | |
| 445 | const environment = yield* HostProcess.Environment; | |
| 446 | 446 | const adapter = yield* makeGrokAdapterV2({ |
| 447 | 447 | instanceId: GROK_DEFAULT_INSTANCE_ID, |
| 448 | 448 | settings, |
| 449 | 449 | environment, |
| 450 | hostPlatform: yield* HostProcessPlatform, | |
| 450 | hostPlatform: yield* HostProcess.Platform, | |
| 451 | 451 | selfInvocation: yield* resolveSelfInvocation(), |
| 452 | 452 | continuationRequests: yield* ProviderContinuationRequests.ProviderContinuationRequests, |
| 453 | 453 | // Production's runtime factory, with the protocol logger teeing raw lines. |
apps/server/scripts/t3-sqlite-state.test.ts+2-2
| ... | ... | @@ -7,7 +7,7 @@ import * as SqlClient from "effect/sql/SqlClient"; |
| 7 | 7 | |
| 8 | 8 | import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient"; |
| 9 | 9 | import { runSqliteState } from "./t3-sqlite-state.ts"; |
| 10 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 10 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 11 | 11 | import { symlinksSupported } from "@t3tools/shared/testing/symlinks"; |
| 12 | 12 | |
| 13 | 13 | const createFixtureDatabase = Effect.fn("createSqliteStateFixtureDatabase")(function* ( |
| ... | ... | @@ -90,7 +90,7 @@ it.layer(NodeServices.layer)("t3-sqlite-state", (it) => { |
| 90 | 90 | sql: "INSERT INTO fixtures (id, label) VALUES (2, 'seeded')", |
| 91 | 91 | }); |
| 92 | 92 | assert.equal(mutation.operation, "exec"); |
| 93 | if (mutation.operation === "exec" && (yield* HostProcessPlatform) !== "win32") { | |
| 93 | if (mutation.operation === "exec" && (yield* HostProcess.Platform) !== "win32") { | |
| 94 | 94 | // NTFS has no POSIX mode bits to report. |
| 95 | 95 | assert.equal((yield* fs.stat(mutation.backup)).mode & 0o777, 0o600); |
| 96 | 96 | } |
apps/server/src/assets/AssetAccess.test.ts+2-2
| ... | ... | @@ -36,7 +36,7 @@ import { openMediaFile } from "./MediaFile.ts"; |
| 36 | 36 | import { symlinksSupported } from "@t3tools/shared/testing/symlinks"; |
| 37 | 37 | import * as GitHubCredentials from "@t3tools/source-control-github/server/GitHubCredentials"; |
| 38 | 38 | import { githubMediaResponse } from "./GitHubMediaFetch.ts"; |
| 39 | import { HostProcessHomeDirectory } from "@t3tools/shared/hostProcess"; | |
| 39 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 40 | 40 | |
| 41 | 41 | vi.mock("node:fs/promises", async (importOriginal) => { |
| 42 | 42 | const actual = await importOriginal<typeof NodeFSP>(); |
| ... | ... | @@ -326,7 +326,7 @@ describe("AssetAccess", () => { |
| 326 | 326 | expect(yield* Effect.promise(() => response.text())).toBe("recording bytes"); |
| 327 | 327 | } |
| 328 | 328 | } |
| 329 | }).pipe(Effect.provideService(HostProcessHomeDirectory, home)); | |
| 329 | }).pipe(Effect.provideService(HostProcess.HomeDirectory, home)); | |
| 330 | 330 | }).pipe(Effect.provide(layerTest)), |
| 331 | 331 | ); |
| 332 | 332 |
apps/server/src/assets/AssetAccess.ts+2-2
| ... | ... | @@ -58,7 +58,7 @@ import * as ProjectFaviconResolver from "../project/ProjectFaviconResolver.ts"; |
| 58 | 58 | import * as WorkspacePaths from "../workspace/WorkspacePaths.ts"; |
| 59 | 59 | import * as NativeAppIconResolver from "./NativeAppIconResolver.ts"; |
| 60 | 60 | import { openMediaFile, readMediaFileHeader, type OpenMediaFile } from "./MediaFile.ts"; |
| 61 | import { HostProcessHomeDirectory } from "@t3tools/shared/hostProcess"; | |
| 61 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 62 | 62 | |
| 63 | 63 | export const ASSET_ROUTE_PREFIX = "/api/assets"; |
| 64 | 64 | |
| ... | ... | @@ -470,7 +470,7 @@ export const issueAssetUrl = Effect.fn("AssetAccess.issueAssetUrl")(function* (i |
| 470 | 470 | |
| 471 | 471 | switch (input.resource._tag) { |
| 472 | 472 | case "media-file": { |
| 473 | let requestedPath = expandHomePath(input.resource.path, yield* HostProcessHomeDirectory); | |
| 473 | let requestedPath = expandHomePath(input.resource.path, yield* HostProcess.HomeDirectory); | |
| 474 | 474 | if (!path.isAbsolute(requestedPath)) { |
| 475 | 475 | if (!input.workspaceRoot) { |
| 476 | 476 | return yield* new AssetWorkspaceContextNotFoundError({ resource: input.resource }); |
apps/server/src/assets/NativeAppIconResolver.test.ts+2-2
| ... | ... | @@ -5,7 +5,7 @@ import * as Layer from "effect/Layer"; |
| 5 | 5 | import * as Sink from "effect/Sink"; |
| 6 | 6 | import * as Stream from "effect/Stream"; |
| 7 | 7 | import { ChildProcessSpawner } from "effect/process"; |
| 8 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 8 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 9 | 9 | |
| 10 | 10 | import * as ServerConfig from "../config.ts"; |
| 11 | 11 | import * as NativeAppIconResolver from "./NativeAppIconResolver.ts"; |
| ... | ... | @@ -44,7 +44,7 @@ describe("resolveNativeAppIcon", () => { |
| 44 | 44 | }); |
| 45 | 45 | const layerDependencies = Layer.mergeAll( |
| 46 | 46 | layerConfig, |
| 47 | Layer.succeed(HostProcessPlatform, "darwin"), | |
| 47 | Layer.succeed(HostProcess.Platform, "darwin"), | |
| 48 | 48 | Layer.succeed(ChildProcessSpawner.ChildProcessSpawner, spawner), |
| 49 | 49 | ).pipe(Layer.provideMerge(NodeServices.layer)); |
| 50 | 50 | const layerTest = NativeAppIconResolver.layer.pipe(Layer.provide(layerDependencies)); |
apps/server/src/assets/NativeAppIconResolver.ts+2-2
| ... | ... | @@ -15,7 +15,7 @@ import * as PlatformError from "effect/PlatformError"; |
| 15 | 15 | import * as Semaphore from "effect/Semaphore"; |
| 16 | 16 | import * as Hex from "effect/encoding/Hex"; |
| 17 | 17 | import { ChildProcess, ChildProcessSpawner } from "effect/process"; |
| 18 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 18 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 19 | 19 | |
| 20 | 20 | import * as ServerConfig from "../config.ts"; |
| 21 | 21 | |
| ... | ... | @@ -214,7 +214,7 @@ const resolveNativeAppIconUncached = Effect.fn("NativeAppIconResolver.resolveUnc |
| 214 | 214 | /** @public Service construction is part of the canonical Effect module API. */ |
| 215 | 215 | export const make = Effect.gen(function* () { |
| 216 | 216 | const fileSystem = yield* FileSystem.FileSystem; |
| 217 | const hostPlatform = yield* HostProcessPlatform; | |
| 217 | const hostPlatform = yield* HostProcess.Platform; | |
| 218 | 218 | const resolutionSemaphore = yield* Semaphore.make(2); |
| 219 | 219 | const resolutionCache: Cache.Cache< |
| 220 | 220 | string, |
apps/server/src/bootstrap.test.ts+4-4
| ... | ... | @@ -11,7 +11,7 @@ import * as Effect from "effect/Effect"; |
| 11 | 11 | import * as Fiber from "effect/Fiber"; |
| 12 | 12 | import * as TestClock from "effect/testing/TestClock"; |
| 13 | 13 | import { vi } from "vite-plus/test"; |
| 14 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 14 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 15 | 15 | |
| 16 | 16 | import { |
| 17 | 17 | BootstrapEnvelopeDecodeError, |
| ... | ... | @@ -55,7 +55,7 @@ vi.mock("node:fs", async (importOriginal) => { |
| 55 | 55 | }; |
| 56 | 56 | }); |
| 57 | 57 | |
| 58 | const windowsHost = HostProcessPlatform.defaultValue() === "win32"; | |
| 58 | const windowsHost = HostProcess.Platform.defaultValue() === "win32"; | |
| 59 | 59 | const nullDevice = windowsHost ? "\\\\.\\NUL" : "/dev/null"; |
| 60 | 60 | const closeIfOpen = (fd: number) => { |
| 61 | 61 | try { |
| ... | ... | @@ -116,7 +116,7 @@ it.layer(NodeServices.layer)("readBootstrapEnvelope", (it) => { |
| 116 | 116 | try { |
| 117 | 117 | const payload = yield* readBootstrapEnvelope(TestEnvelopeSchema, fd, { |
| 118 | 118 | timeoutMs: 100, |
| 119 | }).pipe(Effect.provideService(HostProcessPlatform, "linux")); | |
| 119 | }).pipe(Effect.provideService(HostProcess.Platform, "linux")); | |
| 120 | 120 | assertSome(payload, { |
| 121 | 121 | mode: "desktop", |
| 122 | 122 | }); |
| ... | ... | @@ -141,7 +141,7 @@ it.layer(NodeServices.layer)("readBootstrapEnvelope", (it) => { |
| 141 | 141 | try { |
| 142 | 142 | const error = yield* readBootstrapEnvelope(TestEnvelopeSchema, fd, { |
| 143 | 143 | timeoutMs: 100, |
| 144 | }).pipe(Effect.provideService(HostProcessPlatform, "linux"), Effect.flip); | |
| 144 | }).pipe(Effect.provideService(HostProcess.Platform, "linux"), Effect.flip); | |
| 145 | 145 | |
| 146 | 146 | assert.instanceOf(error, BootstrapInputStreamOpenError); |
| 147 | 147 | assert.equal(error.fd, fd); |
apps/server/src/bootstrap.ts+2-2
| ... | ... | @@ -10,7 +10,7 @@ import * as Predicate from "effect/Predicate"; |
| 10 | 10 | import * as Result from "effect/Result"; |
| 11 | 11 | import * as Schema from "effect/Schema"; |
| 12 | 12 | import { decodeJsonResult } from "@t3tools/shared/schemaJson"; |
| 13 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 13 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 14 | 14 | |
| 15 | 15 | export class BootstrapFdStatError extends Schema.TaggedError<BootstrapFdStatError>()( |
| 16 | 16 | "BootstrapFdStatError", |
| ... | ... | @@ -168,7 +168,7 @@ const isFdReady = (fd: number) => |
| 168 | 168 | |
| 169 | 169 | const makeBootstrapInputStream = (fd: number) => |
| 170 | 170 | Effect.gen(function* () { |
| 171 | const platform = yield* HostProcessPlatform; | |
| 171 | const platform = yield* HostProcess.Platform; | |
| 172 | 172 | const fdPath = resolveFdPath(fd, platform); |
| 173 | 173 | return yield* Effect.try<NodeStream.Readable, BootstrapInputStreamOpenError>({ |
| 174 | 174 | try: () => { |
apps/server/src/checkpointing/CheckpointStore.test.ts+2-2
| ... | ... | @@ -4,7 +4,7 @@ import * as NodePath from "node:path"; |
| 4 | 4 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 5 | 5 | import { it } from "@effect/vitest"; |
| 6 | 6 | import { ThreadId, type VcsError } from "@t3tools/contracts"; |
| 7 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 7 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 8 | 8 | import * as Effect from "effect/Effect"; |
| 9 | 9 | import * as FileSystem from "effect/FileSystem"; |
| 10 | 10 | import * as Layer from "effect/Layer"; |
| ... | ... | @@ -329,7 +329,7 @@ it.layer(layerTest)("CheckpointStore.layer", (it) => { |
| 329 | 329 | const copiedText = Array.from({ length: 20 }, (_, index) => `copy line ${index}\n`).join( |
| 330 | 330 | "", |
| 331 | 331 | ); |
| 332 | const platform = yield* HostProcessPlatform; | |
| 332 | const platform = yield* HostProcess.Platform; | |
| 333 | 333 | const renamedPath = platform === "win32" ? "renamed café.txt" : "renamed\tcafé\nname.txt"; |
| 334 | 334 | const addedPath = platform === "win32" ? "new café.txt" : "new\tfile\n名.txt"; |
| 335 | 335 | for (const [path, contents] of Object.entries({ |
apps/server/src/cli/app.test.ts+15-20
| ... | ... | @@ -8,12 +8,7 @@ import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 8 | 8 | import { it } from "@effect/vitest"; |
| 9 | 9 | import type { DesktopAppActivationRequest } from "@t3tools/contracts"; |
| 10 | 10 | import { resolveDesktopAppControlAddress } from "@t3tools/shared/desktopAppControl"; |
| 11 | import { | |
| 12 | HostProcessHomeDirectory, | |
| 13 | HostProcessPlatform, | |
| 14 | HostProcessUserId, | |
| 15 | HostProcessWorkingDirectory, | |
| 16 | } from "@t3tools/shared/hostProcess"; | |
| 11 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 17 | 12 | import * as NetService from "@t3tools/shared/Net"; |
| 18 | 13 | import * as ConfigProvider from "effect/ConfigProvider"; |
| 19 | 14 | import * as Effect from "effect/Effect"; |
| ... | ... | @@ -110,8 +105,8 @@ async function startFakeDesktop(input: { |
| 110 | 105 | const fakeDesktop = Effect.fn(function* ( |
| 111 | 106 | input: Omit<Parameters<typeof startFakeDesktop>[0], "platform" | "userId">, |
| 112 | 107 | ) { |
| 113 | const platform = yield* HostProcessPlatform; | |
| 114 | const userId = yield* HostProcessUserId; | |
| 108 | const platform = yield* HostProcess.Platform; | |
| 109 | const userId = yield* HostProcess.UserId; | |
| 115 | 110 | return yield* Effect.acquireRelease( |
| 116 | 111 | Effect.promise(() => startFakeDesktop({ ...input, platform, userId })), |
| 117 | 112 | (server) => Effect.promise(() => server.close()), |
| ... | ... | @@ -142,7 +137,7 @@ describe("t3 server command safety", () => { |
| 142 | 137 | "C:new-project", |
| 143 | 138 | ]) { |
| 144 | 139 | const error = yield* runCli([word, "--base-dir", baseDir]).pipe( |
| 145 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 140 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 146 | 141 | Effect.flip, |
| 147 | 142 | ); |
| 148 | 143 | expect(String(error)).toContain(`Unknown command "${word}"`); |
| ... | ... | @@ -181,7 +176,7 @@ describe("t3 server command safety", () => { |
| 181 | 176 | yield* Effect.promise(() => NodeFSP.mkdir(stateDir, { recursive: true })); |
| 182 | 177 | yield* Effect.promise(() => NodeFSP.writeFile(statePath, record)); |
| 183 | 178 | const newDirectory = NodePath.join(root, "new-project"); |
| 184 | const platform = yield* HostProcessPlatform; | |
| 179 | const platform = yield* HostProcess.Platform; | |
| 185 | 180 | for (const args of [ |
| 186 | 181 | [], |
| 187 | 182 | ["start"], |
| ... | ... | @@ -193,7 +188,7 @@ describe("t3 server command safety", () => { |
| 193 | 188 | ]) { |
| 194 | 189 | const error = yield* runCli(args, { T3CODE_HOME: baseDir }).pipe( |
| 195 | 190 | Effect.provideService( |
| 196 | HostProcessPlatform, | |
| 191 | HostProcess.Platform, | |
| 197 | 192 | args[0] === "C:new-project" ? "win32" : platform, |
| 198 | 193 | ), |
| 199 | 194 | Effect.flip, |
| ... | ... | @@ -234,7 +229,7 @@ describe("t3 app", () => { |
| 234 | 229 | Effect.gen(function* () { |
| 235 | 230 | const baseDir = NodePath.join(root, "missing-t3-home"); |
| 236 | 231 | const error = yield* runCli(["app", "--base-dir", baseDir]).pipe( |
| 237 | Effect.provideService(HostProcessPlatform, "freebsd"), | |
| 232 | Effect.provideService(HostProcess.Platform, "freebsd"), | |
| 238 | 233 | Effect.flip, |
| 239 | 234 | ); |
| 240 | 235 | |
| ... | ... | @@ -257,7 +252,7 @@ describe("t3 app", () => { |
| 257 | 252 | expect(error).toMatchObject({ |
| 258 | 253 | _tag: "DesktopAppUnreachableError", |
| 259 | 254 | candidateAddresses: [expect.any(String)], |
| 260 | workspaceRoot: yield* HostProcessWorkingDirectory, | |
| 255 | workspaceRoot: yield* HostProcess.WorkingDirectory, | |
| 261 | 256 | message: expect.stringContaining("Could not reach the T3 Code desktop app."), |
| 262 | 257 | cause: { code: "ENOENT" }, |
| 263 | 258 | }); |
| ... | ... | @@ -271,8 +266,8 @@ describe("t3 app", () => { |
| 271 | 266 | Effect.gen(function* () { |
| 272 | 267 | const baseDir = NodePath.join(root, "t3-home"); |
| 273 | 268 | const explicitPath = NodePath.join(root, "project"); |
| 274 | const platform = yield* HostProcessPlatform; | |
| 275 | const workingDirectory = yield* HostProcessWorkingDirectory; | |
| 269 | const platform = yield* HostProcess.Platform; | |
| 270 | const workingDirectory = yield* HostProcess.WorkingDirectory; | |
| 276 | 271 | const desktop = yield* fakeDesktop({ baseDir }); |
| 277 | 272 | |
| 278 | 273 | yield* runCli(["app"], { T3CODE_HOME: baseDir }); |
| ... | ... | @@ -298,7 +293,7 @@ describe("t3 app", () => { |
| 298 | 293 | |
| 299 | 294 | expect(desktop.received).toHaveLength(1); |
| 300 | 295 | expect(development.received).toHaveLength(0); |
| 301 | }).pipe(Effect.provideService(HostProcessHomeDirectory, root), Effect.scoped), | |
| 296 | }).pipe(Effect.provideService(HostProcess.HomeDirectory, root), Effect.scoped), | |
| 302 | 297 | ), |
| 303 | 298 | ); |
| 304 | 299 | |
| ... | ... | @@ -313,7 +308,7 @@ describe("t3 app", () => { |
| 313 | 308 | |
| 314 | 309 | expect(development.received).toHaveLength(2); |
| 315 | 310 | expect(yield* pathExists(baseDir)).toBe(false); |
| 316 | }).pipe(Effect.provideService(HostProcessHomeDirectory, root), Effect.scoped), | |
| 311 | }).pipe(Effect.provideService(HostProcess.HomeDirectory, root), Effect.scoped), | |
| 317 | 312 | ), |
| 318 | 313 | ); |
| 319 | 314 | |
| ... | ... | @@ -329,7 +324,7 @@ describe("t3 app", () => { |
| 329 | 324 | expect(flagError).toMatchObject({ _tag: "DesktopAppUnreachableError" }); |
| 330 | 325 | expect(envError).toMatchObject({ _tag: "DesktopAppUnreachableError" }); |
| 331 | 326 | expect(development.received).toHaveLength(0); |
| 332 | }).pipe(Effect.provideService(HostProcessHomeDirectory, root), Effect.scoped), | |
| 327 | }).pipe(Effect.provideService(HostProcess.HomeDirectory, root), Effect.scoped), | |
| 333 | 328 | ), |
| 334 | 329 | ); |
| 335 | 330 | |
| ... | ... | @@ -363,7 +358,7 @@ describe("t3 app", () => { |
| 363 | 358 | _tag: "DesktopAppRequestFailedError", |
| 364 | 359 | code: "project-create-failed", |
| 365 | 360 | requestId: desktop.received[0]?.requestId, |
| 366 | workspaceRoot: yield* HostProcessWorkingDirectory, | |
| 361 | workspaceRoot: yield* HostProcess.WorkingDirectory, | |
| 367 | 362 | message: expect.stringContaining("project-create-failed"), |
| 368 | 363 | cause: { |
| 369 | 364 | ok: false, |
| ... | ... | @@ -377,7 +372,7 @@ describe("t3 app", () => { |
| 377 | 372 | cause: { message: "The desktop app response is invalid." }, |
| 378 | 373 | }); |
| 379 | 374 | } |
| 380 | }).pipe(Effect.provideService(HostProcessHomeDirectory, root), Effect.scoped), | |
| 375 | }).pipe(Effect.provideService(HostProcess.HomeDirectory, root), Effect.scoped), | |
| 381 | 376 | ), |
| 382 | 377 | ); |
| 383 | 378 | }); |
apps/server/src/cli/app.ts+4-8
| ... | ... | @@ -10,11 +10,7 @@ import { |
| 10 | 10 | type DesktopAppActivationRequest, |
| 11 | 11 | } from "@t3tools/contracts"; |
| 12 | 12 | import { resolveDesktopAppControlAddress } from "@t3tools/shared/desktopAppControl"; |
| 13 | import { | |
| 14 | HostProcessPlatform, | |
| 15 | HostProcessUserId, | |
| 16 | HostProcessWorkingDirectory, | |
| 17 | } from "@t3tools/shared/hostProcess"; | |
| 13 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 18 | 14 | import * as Config from "effect/Config"; |
| 19 | 15 | import * as Console from "effect/Console"; |
| 20 | 16 | import * as Crypto from "effect/Crypto"; |
| ... | ... | @@ -188,7 +184,7 @@ const runAppCommand = Effect.fn("cli.app")(function* (flags: { |
| 188 | 184 | readonly workspaceRoot: Option.Option<string>; |
| 189 | 185 | }) { |
| 190 | 186 | const environment = yield* appEnvironment; |
| 191 | const hostPlatform = yield* HostProcessPlatform; | |
| 187 | const hostPlatform = yield* HostProcess.Platform; | |
| 192 | 188 | if (Option.isSome(environment.sshConnection) || Option.isSome(environment.sshTty)) { |
| 193 | 189 | return yield* new DesktopAppSshUnsupportedError({}); |
| 194 | 190 | } |
| ... | ... | @@ -201,9 +197,9 @@ const runAppCommand = Effect.fn("cli.app")(function* (flags: { |
| 201 | 197 | const baseDir = yield* resolveBaseDir(configuredBaseDir); |
| 202 | 198 | const allowDevFallback = Option.isNone(flags.baseDir) && !environment.t3Home?.trim(); |
| 203 | 199 | const rawWorkspaceRoot = |
| 204 | Option.getOrUndefined(flags.workspaceRoot) ?? (yield* HostProcessWorkingDirectory); | |
| 200 | Option.getOrUndefined(flags.workspaceRoot) ?? (yield* HostProcess.WorkingDirectory); | |
| 205 | 201 | const workspaceRoot = path.resolve(yield* expandHomePath(rawWorkspaceRoot)); |
| 206 | const userId = yield* HostProcessUserId; | |
| 202 | const userId = yield* HostProcess.UserId; | |
| 207 | 203 | const resolveAddress = (stateSubdirectory: "userdata" | "dev") => |
| 208 | 204 | resolveDesktopAppControlAddress({ |
| 209 | 205 | stateDir: path.join(baseDir, stateSubdirectory), |
apps/server/src/cli/browser.ts+4-8
| ... | ... | @@ -10,11 +10,7 @@ |
| 10 | 10 | * Both need root. Without it, the command prints what it would change and the |
| 11 | 11 | * `sudo` line to run. It is safe to run again; it skips what is already done. |
| 12 | 12 | */ |
| 13 | import { | |
| 14 | HostProcessEnvironment, | |
| 15 | HostProcessPlatform, | |
| 16 | HostProcessUserId, | |
| 17 | } from "@t3tools/shared/hostProcess"; | |
| 13 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 18 | 14 | import * as Console from "effect/Console"; |
| 19 | 15 | import * as Effect from "effect/Effect"; |
| 20 | 16 | import * as FileSystem from "effect/FileSystem"; |
| ... | ... | @@ -61,7 +57,7 @@ const runStep = Effect.fn("browserSetup.runStep")(function* ( |
| 61 | 57 | * unspecified home falls back to the invoking user's `~/.t3`. |
| 62 | 58 | */ |
| 63 | 59 | const setupBaseDir = Effect.fn("browserSetup.baseDir")(function* (explicit: Option.Option<string>) { |
| 64 | const env = yield* HostProcessEnvironment; | |
| 60 | const env = yield* HostProcess.Environment; | |
| 65 | 61 | const raw = Option.getOrUndefined(explicit) ?? env.T3CODE_HOME; |
| 66 | 62 | if (raw !== undefined || env.SUDO_USER === undefined) return yield* resolveBaseDir(raw); |
| 67 | 63 | const spawner = yield* ChildProcessSpawner.ChildProcessSpawner; |
| ... | ... | @@ -109,11 +105,11 @@ const browserSetupCommand = Command.make("setup", { baseDir: baseDirFlag }).pipe |
| 109 | 105 | ), |
| 110 | 106 | Command.withHandler(({ baseDir }) => |
| 111 | 107 | Effect.gen(function* () { |
| 112 | if ((yield* HostProcessPlatform) !== "linux") { | |
| 108 | if ((yield* HostProcess.Platform) !== "linux") { | |
| 113 | 109 | return yield* Console.log("Nothing to set up: T3's browser runs as is on this system."); |
| 114 | 110 | } |
| 115 | 111 | const fs = yield* FileSystem.FileSystem; |
| 116 | const isRoot = (yield* HostProcessUserId) === 0; | |
| 112 | const isRoot = (yield* HostProcess.UserId) === 0; | |
| 117 | 113 | const setupCommand = yield* resolveRootCliCommand(PreviewBrowserHost.SETUP_SUBCOMMAND); |
| 118 | 114 | |
| 119 | 115 | const needsProfile = yield* PreviewBrowserHost.sandboxBlocked; |
apps/server/src/cli/connect.ts+2-2
| ... | ... | @@ -5,7 +5,7 @@ import { |
| 5 | 5 | type RelayClientInstallProgressStage, |
| 6 | 6 | } from "@t3tools/contracts"; |
| 7 | 7 | import { RelayOkResponse } from "@t3tools/contracts/relay"; |
| 8 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 8 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 9 | 9 | import * as RelayClient from "@t3tools/shared/relayClient"; |
| 10 | 10 | import { withRelayClientTracing } from "@t3tools/shared/relayTracing"; |
| 11 | 11 | import * as Cause from "effect/Cause"; |
| ... | ... | @@ -686,7 +686,7 @@ export const connectCommand = Command.make("connect", { |
| 686 | 686 | // show how to run the server manually. |
| 687 | 687 | const background = yield* recoverServiceOnboardingOffer(offerServiceDuringOnboarding); |
| 688 | 688 | if (background) { |
| 689 | const platform = yield* HostProcessPlatform; | |
| 689 | const platform = yield* HostProcess.Platform; | |
| 690 | 690 | yield* Console.log( |
| 691 | 691 | platform === "darwin" |
| 692 | 692 | ? "\n✓ Background service ready\n\nT3 Code is set to run while you are logged in to this Mac. The server establishes the T3 Connect link on startup." |
apps/server/src/cli/invocation.test.ts+18-24
| ... | ... | @@ -1,12 +1,6 @@ |
| 1 | 1 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 2 | 2 | import { assert, expect, it } from "@effect/vitest"; |
| 3 | import { | |
| 4 | HostProcessArguments, | |
| 5 | HostProcessEnvironment, | |
| 6 | HostProcessExecutablePath, | |
| 7 | HostProcessIsExecutable, | |
| 8 | HostProcessPlatform, | |
| 9 | } from "@t3tools/shared/hostProcess"; | |
| 3 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 10 | 4 | import * as Effect from "effect/Effect"; |
| 11 | 5 | import * as FileSystem from "effect/FileSystem"; |
| 12 | 6 | import * as Path from "effect/Path"; |
| ... | ... | @@ -113,11 +107,11 @@ it.layer(NodeServices.layer)("root CLI commands", (it) => { |
| 113 | 107 | readonly executable?: boolean; |
| 114 | 108 | }) => |
| 115 | 109 | resolveRootCliCommand("browser setup").pipe( |
| 116 | Effect.provideService(HostProcessExecutablePath, input.node), | |
| 117 | Effect.provideService(HostProcessArguments, [input.node, input.entry]), | |
| 118 | Effect.provideService(HostProcessIsExecutable, input.executable ?? false), | |
| 119 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 120 | Effect.provideService(HostProcessEnvironment, { PATH: input.path ?? "", ...input.env }), | |
| 110 | Effect.provideService(HostProcess.ExecutablePath, input.node), | |
| 111 | Effect.provideService(HostProcess.Arguments, [input.node, input.entry]), | |
| 112 | Effect.provideService(HostProcess.IsExecutable, input.executable ?? false), | |
| 113 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 114 | Effect.provideService(HostProcess.Environment, { PATH: input.path ?? "", ...input.env }), | |
| 121 | 115 | ); |
| 122 | 116 | |
| 123 | 117 | /** A directory holding an executable `t3`, to stand in for one on PATH. */ |
| ... | ... | @@ -201,9 +195,9 @@ it.layer(NodeServices.layer)("manual server installation ownership", (it) => { |
| 201 | 195 | yield* fs.makeDirectory(path.dirname(entry), { recursive: true }); |
| 202 | 196 | yield* fs.writeFileString(entry, ""); |
| 203 | 197 | const installation = yield* resolveServerInstallation.pipe( |
| 204 | Effect.provideService(HostProcessArguments, ["node", entry]), | |
| 205 | Effect.provideService(HostProcessExecutablePath, entry), | |
| 206 | Effect.provideService(HostProcessIsExecutable, entry.endsWith("/t3")), | |
| 198 | Effect.provideService(HostProcess.Arguments, ["node", entry]), | |
| 199 | Effect.provideService(HostProcess.ExecutablePath, entry), | |
| 200 | Effect.provideService(HostProcess.IsExecutable, entry.endsWith("/t3")), | |
| 207 | 201 | ); |
| 208 | 202 | expect(installation).toEqual({ kind }); |
| 209 | 203 | } |
| ... | ... | @@ -227,9 +221,9 @@ it.layer(NodeServices.layer)("manual server installation ownership", (it) => { |
| 227 | 221 | '{"name":"t3","version":"0.0.45","bin":{"t3":"./dist/bin.mjs"}}', |
| 228 | 222 | ); |
| 229 | 223 | const resolve = resolveServerInstallation.pipe( |
| 230 | Effect.provideService(HostProcessArguments, ["node", entry]), | |
| 231 | Effect.provideService(HostProcessIsExecutable, false), | |
| 232 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 224 | Effect.provideService(HostProcess.Arguments, ["node", entry]), | |
| 225 | Effect.provideService(HostProcess.IsExecutable, false), | |
| 226 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 233 | 227 | ); |
| 234 | 228 | expect(yield* resolve).toBeNull(); |
| 235 | 229 | yield* fs.symlink(entry, globalBin); |
| ... | ... | @@ -237,7 +231,7 @@ it.layer(NodeServices.layer)("manual server installation ownership", (it) => { |
| 237 | 231 | yield* fs.remove(globalBin); |
| 238 | 232 | yield* fs.writeFileString(globalBin, "an unrelated t3 command"); |
| 239 | 233 | expect(yield* resolve).toBeNull(); |
| 240 | expect(yield* resolve.pipe(Effect.provideService(HostProcessPlatform, "win32"))).toBeNull(); | |
| 234 | expect(yield* resolve.pipe(Effect.provideService(HostProcess.Platform, "win32"))).toBeNull(); | |
| 241 | 235 | }), |
| 242 | 236 | ); |
| 243 | 237 | |
| ... | ... | @@ -261,9 +255,9 @@ it.layer(NodeServices.layer)("manual server installation ownership", (it) => { |
| 261 | 255 | ); |
| 262 | 256 | yield* fs.symlink(launcher, path.join(prefix, "bin/t3")); |
| 263 | 257 | const resolve = resolveServerInstallation.pipe( |
| 264 | Effect.provideService(HostProcessExecutablePath, entry), | |
| 265 | Effect.provideService(HostProcessIsExecutable, true), | |
| 266 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 258 | Effect.provideService(HostProcess.ExecutablePath, entry), | |
| 259 | Effect.provideService(HostProcess.IsExecutable, true), | |
| 260 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 267 | 261 | ); |
| 268 | 262 | for (const [version, expected] of [ |
| 269 | 263 | ["0.0.44", null], |
| ... | ... | @@ -296,8 +290,8 @@ it.layer(NodeServices.layer)("manual server installation ownership", (it) => { |
| 296 | 290 | } |
| 297 | 291 | expect( |
| 298 | 292 | yield* resolveServerInstallation.pipe( |
| 299 | Effect.provideService(HostProcessArguments, ["node", entry]), | |
| 300 | Effect.provideService(HostProcessIsExecutable, false), | |
| 293 | Effect.provideService(HostProcess.Arguments, ["node", entry]), | |
| 294 | Effect.provideService(HostProcess.IsExecutable, false), | |
| 301 | 295 | ), |
| 302 | 296 | ).toBeNull(); |
| 303 | 297 | } |
apps/server/src/cli/invocation.ts+10-16
| ... | ... | @@ -5,13 +5,7 @@ import * as Path from "effect/Path"; |
| 5 | 5 | import * as Schema from "effect/Schema"; |
| 6 | 6 | |
| 7 | 7 | import type { ServerInstallation } from "@t3tools/contracts"; |
| 8 | import { | |
| 9 | HostProcessArguments, | |
| 10 | HostProcessEnvironment, | |
| 11 | HostProcessExecutablePath, | |
| 12 | HostProcessIsExecutable, | |
| 13 | HostProcessPlatform, | |
| 14 | } from "@t3tools/shared/hostProcess"; | |
| 8 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 15 | 9 | import { isCommandAvailable } from "@t3tools/shared/shell"; |
| 16 | 10 | |
| 17 | 11 | import packageJson from "../../package.json" with { type: "json" }; |
| ... | ... | @@ -60,10 +54,10 @@ const decodeInstallManifest = Schema.decodeUnknownEffect(Schema.fromJsonString(I |
| 60 | 54 | export const resolveServerInstallation = Effect.gen(function* () { |
| 61 | 55 | const fs = yield* FileSystem.FileSystem; |
| 62 | 56 | const path = yield* Path.Path; |
| 63 | const args = yield* HostProcessArguments; | |
| 64 | const executable = yield* HostProcessIsExecutable; | |
| 65 | const executablePath = yield* HostProcessExecutablePath; | |
| 66 | const platform = yield* HostProcessPlatform; | |
| 57 | const args = yield* HostProcess.Arguments; | |
| 58 | const executable = yield* HostProcess.IsExecutable; | |
| 59 | const executablePath = yield* HostProcess.ExecutablePath; | |
| 60 | const platform = yield* HostProcess.Platform; | |
| 67 | 61 | const entry = yield* fs.realPath(executable ? executablePath : (args[1] ?? "")); |
| 68 | 62 | const match = |
| 69 | 63 | /^(.*)\/lib\/node_modules\/t3\/(?:dist\/bin\.mjs|bin\/t3\.js|node_modules\/@t3code\/t3-[^/]+\/t3)$/.exec( |
| ... | ... | @@ -141,7 +135,7 @@ export function formatCliCommand(input: { |
| 141 | 135 | |
| 142 | 136 | /** `formatCliCommand` against this process's real entry path and version. */ |
| 143 | 137 | export const resolveCliCommand = (subcommand: string) => |
| 144 | Effect.map(HostProcessArguments, (processArguments) => | |
| 138 | Effect.map(HostProcess.Arguments, (processArguments) => | |
| 145 | 139 | formatCliCommand({ |
| 146 | 140 | subcommand, |
| 147 | 141 | entryPath: processArguments[1] ?? "", |
| ... | ... | @@ -161,12 +155,12 @@ const shellWord = (value: string) => |
| 161 | 155 | */ |
| 162 | 156 | const resolveInstallLauncher = Effect.gen(function* () { |
| 163 | 157 | const fs = yield* FileSystem.FileSystem; |
| 164 | const shim = (yield* HostProcessEnvironment).T3CODE_CLI_PATH?.trim(); | |
| 158 | const shim = (yield* HostProcess.Environment).T3CODE_CLI_PATH?.trim(); | |
| 165 | 159 | if (shim && (yield* fs.exists(shim).pipe(Effect.orElseSucceed(() => false)))) { |
| 166 | 160 | return Option.some(shim); |
| 167 | 161 | } |
| 168 | return (yield* HostProcessIsExecutable) | |
| 169 | ? Option.some(yield* HostProcessExecutablePath) | |
| 162 | return (yield* HostProcess.IsExecutable) | |
| 163 | ? Option.some(yield* HostProcess.ExecutablePath) | |
| 170 | 164 | : Option.none<string>(); |
| 171 | 165 | }); |
| 172 | 166 | |
| ... | ... | @@ -197,7 +191,7 @@ export const resolveRootCliCommand = (subcommand: string) => |
| 197 | 191 | Effect.gen(function* () { |
| 198 | 192 | const { command, launcher } = yield* resolveHostCliCommand(subcommand); |
| 199 | 193 | if (launcher) return `sudo ${command}`; |
| 200 | const executablePath = yield* HostProcessExecutablePath; | |
| 194 | const executablePath = yield* HostProcess.ExecutablePath; | |
| 201 | 195 | const systemNode = ROOT_PATH_DIRECTORIES.some((directory) => |
| 202 | 196 | executablePath.startsWith(`${directory}/`), |
| 203 | 197 | ); |
apps/server/src/cli/pair.test.ts+2-2
| ... | ... | @@ -7,7 +7,7 @@ import * as NodePath from "node:path"; |
| 7 | 7 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 8 | 8 | import { AuthStandardClientScopes } from "@t3tools/contracts"; |
| 9 | 9 | import * as NetService from "@t3tools/shared/Net"; |
| 10 | import { HostProcessEnvironment } from "@t3tools/shared/hostProcess"; | |
| 10 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 11 | 11 | import { assert, describe, expect, it } from "@effect/vitest"; |
| 12 | 12 | import * as Effect from "effect/Effect"; |
| 13 | 13 | import * as Layer from "effect/Layer"; |
| ... | ... | @@ -184,7 +184,7 @@ describe("t3 pair", () => { |
| 184 | 184 | }), |
| 185 | 185 | ).pipe( |
| 186 | 186 | Effect.provide(NodeServices.layer), |
| 187 | Effect.provideService(HostProcessEnvironment, { | |
| 187 | Effect.provideService(HostProcess.Environment, { | |
| 188 | 188 | ...process.env, |
| 189 | 189 | [SERVICE_LAUNCHER_CONTEXT_ENV]: JSON.stringify({ |
| 190 | 190 | protocol: SERVICE_LAUNCHER_PROTOCOL, |
apps/server/src/cli/server.ts+2-2
| ... | ... | @@ -1,4 +1,4 @@ |
| 1 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 1 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 2 | 2 | import * as Effect from "effect/Effect"; |
| 3 | 3 | import * as FileSystem from "effect/FileSystem"; |
| 4 | 4 | import * as Option from "effect/Option"; |
| ... | ... | @@ -32,7 +32,7 @@ export const runDefaultServerCommand = (flags: CliServerFlags) => |
| 32 | 32 | if (Option.isSome(flags.cwd)) { |
| 33 | 33 | const cwd = flags.cwd.value.trim(); |
| 34 | 34 | const fs = yield* FileSystem.FileSystem; |
| 35 | const platform = yield* HostProcessPlatform; | |
| 35 | const platform = yield* HostProcess.Platform; | |
| 36 | 36 | const explicitPath = |
| 37 | 37 | cwd === "." || |
| 38 | 38 | cwd === ".." || |
apps/server/src/cli/service.test.ts+4-4
| ... | ... | @@ -1,6 +1,6 @@ |
| 1 | 1 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 2 | 2 | import { assert, expect, it } from "@effect/vitest"; |
| 3 | import { HostProcessEnvironment } from "@t3tools/shared/hostProcess"; | |
| 3 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 4 | 4 | import * as NetService from "@t3tools/shared/Net"; |
| 5 | 5 | import * as ConfigProvider from "effect/ConfigProvider"; |
| 6 | 6 | import * as Effect from "effect/Effect"; |
| ... | ... | @@ -136,7 +136,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, NetService.layer))("service commands |
| 136 | 136 | "--base-dir", |
| 137 | 137 | baseDir, |
| 138 | 138 | ]).pipe( |
| 139 | Effect.provideService(HostProcessEnvironment, {}), | |
| 139 | Effect.provideService(HostProcess.Environment, {}), | |
| 140 | 140 | Effect.provide(ConfigProvider.layer(ConfigProvider.fromEnv({ env: {} }))), |
| 141 | 141 | ); |
| 142 | 142 | |
| ... | ... | @@ -161,7 +161,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, NetService.layer))("service commands |
| 161 | 161 | "--base-dir", |
| 162 | 162 | baseDir, |
| 163 | 163 | ]).pipe( |
| 164 | Effect.provideService(HostProcessEnvironment, {}), | |
| 164 | Effect.provideService(HostProcess.Environment, {}), | |
| 165 | 165 | Effect.provide(ConfigProvider.layer(ConfigProvider.fromEnv({ env: {} }))), |
| 166 | 166 | Effect.flip, |
| 167 | 167 | ); |
| ... | ... | @@ -190,7 +190,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, NetService.layer))("service commands |
| 190 | 190 | baseDir, |
| 191 | 191 | "--allow-downgrade", |
| 192 | 192 | ]).pipe( |
| 193 | Effect.provideService(HostProcessEnvironment, {}), | |
| 193 | Effect.provideService(HostProcess.Environment, {}), | |
| 194 | 194 | Effect.provide(ConfigProvider.layer(ConfigProvider.fromEnv({ env: {} }))), |
| 195 | 195 | ); |
| 196 | 196 |
apps/server/src/cli/service.ts+2-2
| ... | ... | @@ -1,4 +1,4 @@ |
| 1 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 1 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 2 | 2 | import * as Console from "effect/Console"; |
| 3 | 3 | import * as Effect from "effect/Effect"; |
| 4 | 4 | import * as Layer from "effect/Layer"; |
| ... | ... | @@ -241,7 +241,7 @@ export const offerServiceDuringOnboarding = Effect.gen(function* () { |
| 241 | 241 | } |
| 242 | 242 | // A LaunchAgent starts at login and dies at logout; there is no |
| 243 | 243 | // enable-linger equivalent on macOS. Do not promise more than that. |
| 244 | const platform = yield* HostProcessPlatform; | |
| 244 | const platform = yield* HostProcess.Platform; | |
| 245 | 245 | const wanted = yield* Prompt.run( |
| 246 | 246 | Prompt.Confirm({ |
| 247 | 247 | message: installed |
apps/server/src/cli/theme.test.ts+2-2
| ... | ... | @@ -14,11 +14,11 @@ import { Command } from "effect/cli"; |
| 14 | 14 | |
| 15 | 15 | import { cli } from "../binCli.ts"; |
| 16 | 16 | import { symlinksSupported } from "@t3tools/shared/testing/symlinks"; |
| 17 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 17 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 18 | 18 | |
| 19 | 19 | // These force a failure with chmod, which Windows ignores for directories and |
| 20 | 20 | // cannot use to make a file unreadable, so the failure never happens there. |
| 21 | const windowsHost = HostProcessPlatform.defaultValue() === "win32"; | |
| 21 | const windowsHost = HostProcess.Platform.defaultValue() === "win32"; | |
| 22 | 22 | |
| 23 | 23 | const runCli = (args: ReadonlyArray<string>) => |
| 24 | 24 | Command.runWith(cli, { version: "0.0.0" })(args).pipe( |
apps/server/src/cli/triage.ts+2-2
| ... | ... | @@ -14,7 +14,7 @@ import * as NodeChildProcess from "node:child_process"; |
| 14 | 14 | import * as NodeOS from "node:os"; |
| 15 | 15 | import * as NodeReadlinePromises from "node:readline/promises"; |
| 16 | 16 | |
| 17 | import { HostProcessArchitecture, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 17 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 18 | 18 | import { isCommandAvailable, resolveSpawnCommand } from "@t3tools/shared/shell"; |
| 19 | 19 | import * as Config from "effect/Config"; |
| 20 | 20 | import * as Console from "effect/Console"; |
| ... | ... | @@ -193,7 +193,7 @@ export const triageCommand = Command.make("triage", { |
| 193 | 193 | releaseTag: /^[^-+]+-(?:nightly|preview)\./.test(version) |
| 194 | 194 | ? `v${version} (prerelease build; if this tag does not exist, clone main)` |
| 195 | 195 | : `v${version}`, |
| 196 | os: `${yield* HostProcessPlatform} ${yield* HostProcessArchitecture} (${NodeOS.release()})`, | |
| 196 | os: `${yield* HostProcess.Platform} ${yield* HostProcess.Architecture} (${NodeOS.release()})`, | |
| 197 | 197 | nodeVersion: process.version, |
| 198 | 198 | launchedAs: yield* resolveCliCommand("triage"), |
| 199 | 199 | server: yield* describeServerProcess(paths.serverRuntimeStatePath), |
apps/server/src/cli/uninstall.test.ts+2-2
| ... | ... | @@ -3,7 +3,7 @@ import { assert, it } from "@effect/vitest"; |
| 3 | 3 | import * as Effect from "effect/Effect"; |
| 4 | 4 | import * as FileSystem from "effect/FileSystem"; |
| 5 | 5 | import * as Path from "effect/Path"; |
| 6 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 6 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 7 | 7 | |
| 8 | 8 | import { findOwnedLauncher } from "./uninstall.ts"; |
| 9 | 9 | |
| ... | ... | @@ -32,6 +32,6 @@ it.layer(NodeServices.layer)("t3 uninstall launcher", (it) => { |
| 32 | 32 | assert.isUndefined(yield* findOwnedLauncher({ launchedAs: theirs, versionsDir })); |
| 33 | 33 | assert.isUndefined(yield* findOwnedLauncher({ launchedAs: copy, versionsDir })); |
| 34 | 34 | assert.isUndefined(yield* findOwnedLauncher({ launchedAs: undefined, versionsDir })); |
| 35 | }).pipe(Effect.scoped, Effect.provideService(HostProcessPlatform, "linux")), | |
| 35 | }).pipe(Effect.scoped, Effect.provideService(HostProcess.Platform, "linux")), | |
| 36 | 36 | ); |
| 37 | 37 | }); |
apps/server/src/cli/uninstall.ts+6-10
| ... | ... | @@ -4,11 +4,7 @@ |
| 4 | 4 | // cannot express: it kills the child when the scope closes. |
| 5 | 5 | import * as NodeChildProcess from "node:child_process"; |
| 6 | 6 | |
| 7 | import { | |
| 8 | HostProcessEnvironment, | |
| 9 | HostProcessIsExecutable, | |
| 10 | HostProcessPlatform, | |
| 11 | } from "@t3tools/shared/hostProcess"; | |
| 7 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 12 | 8 | import * as Console from "effect/Console"; |
| 13 | 9 | import * as Effect from "effect/Effect"; |
| 14 | 10 | import * as FileSystem from "effect/FileSystem"; |
| ... | ... | @@ -58,7 +54,7 @@ export const findOwnedLauncher = Effect.fn("cli.uninstall.find_launcher")(functi |
| 58 | 54 | }) { |
| 59 | 55 | const fs = yield* FileSystem.FileSystem; |
| 60 | 56 | const path = yield* Path.Path; |
| 61 | const platform = yield* HostProcessPlatform; | |
| 57 | const platform = yield* HostProcess.Platform; | |
| 62 | 58 | if (input.launchedAs === undefined) return undefined; |
| 63 | 59 | if (platform === "win32") { |
| 64 | 60 | const shimPath = yield* findWindowsShim(input.launchedAs); |
| ... | ... | @@ -87,7 +83,7 @@ const planUninstall = Effect.fn("cli.uninstall.plan")(function* (input: { |
| 87 | 83 | path.resolve(status.installedBaseDir) === path.resolve(input.baseDir); |
| 88 | 84 | const versionsDir = pinnedRuntimeVersionsDir(path, input.baseDir); |
| 89 | 85 | const runtimeDir = path.dirname(versionsDir); |
| 90 | const launchedAs = (yield* HostProcessIsExecutable) ? yield* resolveLauncherPath : undefined; | |
| 86 | const launchedAs = (yield* HostProcess.IsExecutable) ? yield* resolveLauncherPath : undefined; | |
| 91 | 87 | const plan: UninstallPlan = { |
| 92 | 88 | service: status.supported && status.installed && servesThisHome, |
| 93 | 89 | launcher: yield* findOwnedLauncher({ launchedAs, versionsDir }), |
| ... | ... | @@ -128,14 +124,14 @@ const runUninstall = Effect.fn("cli.uninstall.run")(function* (input: { |
| 128 | 124 | readonly assumeYes: boolean; |
| 129 | 125 | }) { |
| 130 | 126 | const fs = yield* FileSystem.FileSystem; |
| 131 | const platform = yield* HostProcessPlatform; | |
| 132 | const environment = yield* HostProcessEnvironment; | |
| 127 | const platform = yield* HostProcess.Platform; | |
| 128 | const environment = yield* HostProcess.Environment; | |
| 133 | 129 | const service = yield* BootService.BootService; |
| 134 | 130 | const plan = yield* planUninstall({ baseDir: input.baseDir }); |
| 135 | 131 | |
| 136 | 132 | if (!plan.service && plan.launcher === undefined && plan.runtimeDir === undefined) { |
| 137 | 133 | yield* Console.log(`Nothing to remove: t3 is not installed for ${input.baseDir}.`); |
| 138 | if (!(yield* HostProcessIsExecutable)) { | |
| 134 | if (!(yield* HostProcess.IsExecutable)) { | |
| 139 | 135 | yield* Console.log( |
| 140 | 136 | " This t3 runs from a Node script, so it was installed by npm or built from source. Remove it the same way (`npm uninstall -g t3`, or delete the checkout).", |
| 141 | 137 | ); |
apps/server/src/cli/update.test.ts+13-18
| ... | ... | @@ -4,12 +4,7 @@ import * as Effect from "effect/Effect"; |
| 4 | 4 | import * as FileSystem from "effect/FileSystem"; |
| 5 | 5 | import * as Option from "effect/Option"; |
| 6 | 6 | import * as Path from "effect/Path"; |
| 7 | import { | |
| 8 | HostProcessEnvironment, | |
| 9 | HostProcessInvokedAs, | |
| 10 | HostProcessPlatform, | |
| 11 | HostProcessWorkingDirectory, | |
| 12 | } from "@t3tools/shared/hostProcess"; | |
| 7 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 13 | 8 | |
| 14 | 9 | import { repointLauncher, resolveLauncherPath } from "./update.ts"; |
| 15 | 10 | |
| ... | ... | @@ -37,7 +32,7 @@ it.layer(NodeServices.layer)("t3 update launcher", (it) => { |
| 37 | 32 | |
| 38 | 33 | assert.deepStrictEqual(Option.getOrUndefined(repointed), launcher); |
| 39 | 34 | assert.equal(yield* fs.readLink(launcher), newExe); |
| 40 | }).pipe(Effect.scoped, Effect.provideService(HostProcessPlatform, "linux")), | |
| 35 | }).pipe(Effect.scoped, Effect.provideService(HostProcess.Platform, "linux")), | |
| 41 | 36 | ); |
| 42 | 37 | |
| 43 | 38 | it.effect("leaves a plain copy or a foreign symlink alone", () => |
| ... | ... | @@ -71,7 +66,7 @@ it.layer(NodeServices.layer)("t3 update launcher", (it) => { |
| 71 | 66 | } |
| 72 | 67 | assert.equal(yield* fs.readLink(foreign), elsewhere); |
| 73 | 68 | assert.equal(yield* fs.readLink(otherLauncher), otherHome); |
| 74 | }).pipe(Effect.scoped, Effect.provideService(HostProcessPlatform, "linux")), | |
| 69 | }).pipe(Effect.scoped, Effect.provideService(HostProcess.Platform, "linux")), | |
| 75 | 70 | ); |
| 76 | 71 | |
| 77 | 72 | it.effect("finds the launcher a bare command name resolved to on PATH", () => |
| ... | ... | @@ -84,26 +79,26 @@ it.layer(NodeServices.layer)("t3 update launcher", (it) => { |
| 84 | 79 | yield* fs.writeFileString(launcher, ""); |
| 85 | 80 | |
| 86 | 81 | const bare = yield* resolveLauncherPath.pipe( |
| 87 | Effect.provideService(HostProcessInvokedAs, "t3"), | |
| 88 | Effect.provideService(HostProcessEnvironment, { | |
| 82 | Effect.provideService(HostProcess.InvokedAs, "t3"), | |
| 83 | Effect.provideService(HostProcess.Environment, { | |
| 89 | 84 | PATH: `${path.join(root, "missing")}:${path.join(root, "bin")}`, |
| 90 | 85 | }), |
| 91 | Effect.provideService(HostProcessWorkingDirectory, root), | |
| 86 | Effect.provideService(HostProcess.WorkingDirectory, root), | |
| 92 | 87 | ); |
| 93 | 88 | const relative = yield* resolveLauncherPath.pipe( |
| 94 | Effect.provideService(HostProcessInvokedAs, "./bin/t3"), | |
| 95 | Effect.provideService(HostProcessEnvironment, { PATH: "" }), | |
| 96 | Effect.provideService(HostProcessWorkingDirectory, root), | |
| 89 | Effect.provideService(HostProcess.InvokedAs, "./bin/t3"), | |
| 90 | Effect.provideService(HostProcess.Environment, { PATH: "" }), | |
| 91 | Effect.provideService(HostProcess.WorkingDirectory, root), | |
| 97 | 92 | ); |
| 98 | 93 | const absent = yield* resolveLauncherPath.pipe( |
| 99 | Effect.provideService(HostProcessInvokedAs, "t3"), | |
| 100 | Effect.provideService(HostProcessEnvironment, { PATH: path.join(root, "missing") }), | |
| 101 | Effect.provideService(HostProcessWorkingDirectory, root), | |
| 94 | Effect.provideService(HostProcess.InvokedAs, "t3"), | |
| 95 | Effect.provideService(HostProcess.Environment, { PATH: path.join(root, "missing") }), | |
| 96 | Effect.provideService(HostProcess.WorkingDirectory, root), | |
| 102 | 97 | ); |
| 103 | 98 | |
| 104 | 99 | assert.equal(bare, launcher); |
| 105 | 100 | assert.equal(relative, launcher); |
| 106 | 101 | assert.equal(absent, undefined); |
| 107 | }).pipe(Effect.scoped, Effect.provideService(HostProcessPlatform, "linux")), | |
| 102 | }).pipe(Effect.scoped, Effect.provideService(HostProcess.Platform, "linux")), | |
| 108 | 103 | ); |
| 109 | 104 | }); |
apps/server/src/cli/update.ts+12-19
| ... | ... | @@ -1,11 +1,4 @@ |
| 1 | import { | |
| 2 | HostProcessArchitecture, | |
| 3 | HostProcessEnvironment, | |
| 4 | HostProcessInvokedAs, | |
| 5 | HostProcessIsExecutable, | |
| 6 | HostProcessPlatform, | |
| 7 | HostProcessWorkingDirectory, | |
| 8 | } from "@t3tools/shared/hostProcess"; | |
| 1 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 9 | 2 | import { |
| 10 | 3 | CLI_RELEASE_BASE_URL_ENV, |
| 11 | 4 | CLI_RELEASE_CHANNELS, |
| ... | ... | @@ -121,7 +114,7 @@ export const repointLauncher = Effect.fn("cli.update.repoint_launcher")(function |
| 121 | 114 | }) { |
| 122 | 115 | const fs = yield* FileSystem.FileSystem; |
| 123 | 116 | const path = yield* Path.Path; |
| 124 | const platform = yield* HostProcessPlatform; | |
| 117 | const platform = yield* HostProcess.Platform; | |
| 125 | 118 | if (input.launchedAs === undefined) return Option.none<string>(); |
| 126 | 119 | const ownsTarget = (candidate: string) => |
| 127 | 120 | launcherOwnsVersionsDir(path, input.versionsDir, candidate); |
| ... | ... | @@ -170,10 +163,10 @@ export const repointLauncher = Effect.fn("cli.update.repoint_launcher")(function |
| 170 | 163 | export const resolveLauncherPath = Effect.gen(function* () { |
| 171 | 164 | const path = yield* Path.Path; |
| 172 | 165 | const fs = yield* FileSystem.FileSystem; |
| 173 | const invokedAs = yield* HostProcessInvokedAs; | |
| 174 | const cwd = yield* HostProcessWorkingDirectory; | |
| 175 | const environment = yield* HostProcessEnvironment; | |
| 176 | const platform = yield* HostProcessPlatform; | |
| 166 | const invokedAs = yield* HostProcess.InvokedAs; | |
| 167 | const cwd = yield* HostProcess.WorkingDirectory; | |
| 168 | const environment = yield* HostProcess.Environment; | |
| 169 | const platform = yield* HostProcess.Platform; | |
| 177 | 170 | if (invokedAs.includes("/") || invokedAs.includes("\\")) { |
| 178 | 171 | return path.resolve(cwd, invokedAs); |
| 179 | 172 | } |
| ... | ... | @@ -198,7 +191,7 @@ export const findWindowsShim = Effect.fn("cli.update.find_windows_shim")(functio |
| 198 | 191 | ) { |
| 199 | 192 | const fs = yield* FileSystem.FileSystem; |
| 200 | 193 | const path = yield* Path.Path; |
| 201 | const environment = yield* HostProcessEnvironment; | |
| 194 | const environment = yield* HostProcess.Environment; | |
| 202 | 195 | const candidates = [ |
| 203 | 196 | ...(environment["T3CODE_INSTALL_BIN_DIR"] ? [environment["T3CODE_INSTALL_BIN_DIR"]] : []), |
| 204 | 197 | ...(environment["PATH"] ?? environment["Path"] ?? "").split(";"), |
| ... | ... | @@ -299,7 +292,7 @@ const findForegroundServer = Effect.fn("cli.update.find_foreground_server")(func |
| 299 | 292 | const belongsToBootService = Effect.fn("cli.update.belongs_to_boot_service")(function* ( |
| 300 | 293 | pid: number, |
| 301 | 294 | ) { |
| 302 | const platform = yield* HostProcessPlatform; | |
| 295 | const platform = yield* HostProcess.Platform; | |
| 303 | 296 | const fs = yield* FileSystem.FileSystem; |
| 304 | 297 | const runner = yield* ProcessRunner.ProcessRunner; |
| 305 | 298 | if (platform === "linux") { |
| ... | ... | @@ -340,9 +333,9 @@ const runUpdate = Effect.fn("cli.update.run")(function* (input: { |
| 340 | 333 | const fs = yield* FileSystem.FileSystem; |
| 341 | 334 | const path = yield* Path.Path; |
| 342 | 335 | const runner = yield* ProcessRunner.ProcessRunner; |
| 343 | const platform = yield* HostProcessPlatform; | |
| 344 | const arch = yield* HostProcessArchitecture; | |
| 345 | const environment = yield* HostProcessEnvironment; | |
| 336 | const platform = yield* HostProcess.Platform; | |
| 337 | const arch = yield* HostProcess.Architecture; | |
| 338 | const environment = yield* HostProcess.Environment; | |
| 346 | 339 | const httpClient = yield* HttpClient.HttpClient; |
| 347 | 340 | const service = yield* BootService.BootService; |
| 348 | 341 | |
| ... | ... | @@ -531,7 +524,7 @@ const runUpdate = Effect.fn("cli.update.run")(function* (input: { |
| 531 | 524 | ), |
| 532 | 525 | ); |
| 533 | 526 | |
| 534 | const launchedAs = (yield* HostProcessIsExecutable) ? yield* resolveLauncherPath : undefined; | |
| 527 | const launchedAs = (yield* HostProcess.IsExecutable) ? yield* resolveLauncherPath : undefined; | |
| 535 | 528 | const repointed = yield* repointLauncher({ |
| 536 | 529 | launchedAs, |
| 537 | 530 | versionsDir: path.dirname(runtime.versionDir), |
apps/server/src/cloud/bootService.test.ts+4-8
| ... | ... | @@ -1,10 +1,6 @@ |
| 1 | 1 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 2 | 2 | import { expect, it } from "@effect/vitest"; |
| 3 | import { | |
| 4 | HostProcessExecutablePath, | |
| 5 | HostProcessPlatform, | |
| 6 | HostProcessUserId, | |
| 7 | } from "@t3tools/shared/hostProcess"; | |
| 3 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 8 | 4 | import * as ConfigProvider from "effect/ConfigProvider"; |
| 9 | 5 | import * as Duration from "effect/Duration"; |
| 10 | 6 | import * as Effect from "effect/Effect"; |
| ... | ... | @@ -226,9 +222,9 @@ const makeHarness = Effect.fn("test.make_boot_service_harness")(function* ( |
| 226 | 222 | Effect.provideService(ProcessRunner.ProcessRunner, runner), |
| 227 | 223 | Effect.provide( |
| 228 | 224 | Layer.mergeAll( |
| 229 | Layer.succeed(HostProcessPlatform, platform), | |
| 230 | Layer.succeed(HostProcessUserId, 501), | |
| 231 | Layer.succeed(HostProcessExecutablePath, "/usr/bin/t3"), | |
| 225 | Layer.succeed(HostProcess.Platform, platform), | |
| 226 | Layer.succeed(HostProcess.UserId, 501), | |
| 227 | Layer.succeed(HostProcess.ExecutablePath, "/usr/bin/t3"), | |
| 232 | 228 | Layer.succeed( |
| 233 | 229 | HttpClient.HttpClient, |
| 234 | 230 | HttpClient.make(() => Effect.die("no release download expected")), |
apps/server/src/cloud/bootService.ts+5-10
| ... | ... | @@ -1,9 +1,4 @@ |
| 1 | import { | |
| 2 | HostProcessArchitecture, | |
| 3 | HostProcessExecutablePath, | |
| 4 | HostProcessPlatform, | |
| 5 | HostProcessUserId, | |
| 6 | } from "@t3tools/shared/hostProcess"; | |
| 1 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 7 | 2 | import * as Config from "effect/Config"; |
| 8 | 3 | import * as Context from "effect/Context"; |
| 9 | 4 | import * as DateTime from "effect/DateTime"; |
| ... | ... | @@ -558,10 +553,10 @@ export const make = Effect.fn("cloud.boot_service.make")(function* (input: { |
| 558 | 553 | readonly cliVersion: string; |
| 559 | 554 | readonly host?: BootServiceHost; |
| 560 | 555 | }) { |
| 561 | const hostExecPath = yield* HostProcessExecutablePath; | |
| 562 | const platform = yield* HostProcessPlatform; | |
| 563 | const arch = yield* HostProcessArchitecture; | |
| 564 | const uid = yield* HostProcessUserId; | |
| 556 | const hostExecPath = yield* HostProcess.ExecutablePath; | |
| 557 | const platform = yield* HostProcess.Platform; | |
| 558 | const arch = yield* HostProcess.Architecture; | |
| 559 | const uid = yield* HostProcess.UserId; | |
| 565 | 560 | const httpClient = yield* HttpClient.HttpClient; |
| 566 | 561 | const releaseBaseUrl = Option.getOrUndefined( |
| 567 | 562 | yield* Config.String(CLI_RELEASE_BASE_URL_ENV).pipe(Config.option), |
apps/server/src/cloud/selfUpdate.test.ts+3-3
| ... | ... | @@ -1,7 +1,7 @@ |
| 1 | 1 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 2 | 2 | import { expect, it } from "@effect/vitest"; |
| 3 | 3 | import { ServerSelfUpdateError, ThreadId } from "@t3tools/contracts"; |
| 4 | import { HostProcessArchitecture, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 4 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 5 | 5 | import * as Cause from "effect/Cause"; |
| 6 | 6 | import * as Deferred from "effect/Deferred"; |
| 7 | 7 | import * as Effect from "effect/Effect"; |
| ... | ... | @@ -120,8 +120,8 @@ const makeHarness = Effect.fn("test.make_self_update_harness")(function* ( |
| 120 | 120 | }, |
| 121 | 121 | ), |
| 122 | 122 | Effect.provideService(HttpClient.HttpClient, releaseHttpClient(order)), |
| 123 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 124 | Effect.provideService(HostProcessArchitecture, "x64"), | |
| 123 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 124 | Effect.provideService(HostProcess.Architecture, "x64"), | |
| 125 | 125 | Effect.provide(ServerConfig.layer({ ...config, mode: options.mode ?? "web" })), |
| 126 | 126 | ); |
| 127 | 127 | return { selfUpdate, order }; |
apps/server/src/cloud/selfUpdate.ts+3-3
| ... | ... | @@ -6,7 +6,7 @@ import { |
| 6 | 6 | type ServerSelfUpdateResult, |
| 7 | 7 | type ThreadId, |
| 8 | 8 | } from "@t3tools/contracts"; |
| 9 | import { HostProcessArchitecture, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 9 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 10 | 10 | import * as Cause from "effect/Cause"; |
| 11 | 11 | import * as Config from "effect/Config"; |
| 12 | 12 | import * as Context from "effect/Context"; |
| ... | ... | @@ -176,8 +176,8 @@ export const make = Effect.fn("cloud.server_self_update.make")(function* () { |
| 176 | 176 | const runner = yield* ProcessRunner.ProcessRunner; |
| 177 | 177 | const fs = yield* FileSystem.FileSystem; |
| 178 | 178 | const path = yield* Path.Path; |
| 179 | const platform = yield* HostProcessPlatform; | |
| 180 | const arch = yield* HostProcessArchitecture; | |
| 179 | const platform = yield* HostProcess.Platform; | |
| 180 | const arch = yield* HostProcess.Architecture; | |
| 181 | 181 | // Archive-distributed targets download from GitHub Releases. The client is |
| 182 | 182 | // optional so callers without one (tests, npm-only hosts) still construct. |
| 183 | 183 | const httpClient = yield* HttpClient.HttpClient; |
apps/server/src/cloud/serviceLauncherClient.test.ts+2-2
| ... | ... | @@ -1,5 +1,5 @@ |
| 1 | 1 | import { expect, it } from "@effect/vitest"; |
| 2 | import { HostProcessEnvironment } from "@t3tools/shared/hostProcess"; | |
| 2 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 3 | 3 | import * as Effect from "effect/Effect"; |
| 4 | 4 | import * as Fiber from "effect/Fiber"; |
| 5 | 5 | |
| ... | ... | @@ -45,7 +45,7 @@ class FakeLauncherProcess { |
| 45 | 45 | const makeClient = (host: FakeLauncherProcess, currentVersion: string) => |
| 46 | 46 | ServiceLauncherClient.make({ currentVersion }).pipe( |
| 47 | 47 | Effect.provideService(ServiceLauncherClient.ServiceLauncherHostProcess, host), |
| 48 | Effect.provideService(HostProcessEnvironment, host.env), | |
| 48 | Effect.provideService(HostProcess.Environment, host.env), | |
| 49 | 49 | ); |
| 50 | 50 | |
| 51 | 51 | it.effect("waits for the launcher to durably commit the trial update ID", () => |
apps/server/src/cloud/serviceLauncherClient.ts+2-2
| ... | ... | @@ -1,5 +1,5 @@ |
| 1 | 1 | import type { ServerSelfUpdateOutcome } from "@t3tools/contracts"; |
| 2 | import { HostProcessEnvironment } from "@t3tools/shared/hostProcess"; | |
| 2 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 3 | 3 | import * as Context from "effect/Context"; |
| 4 | 4 | import * as Effect from "effect/Effect"; |
| 5 | 5 | import * as Layer from "effect/Layer"; |
| ... | ... | @@ -114,7 +114,7 @@ export class ServiceLauncherClient extends Context.Service< |
| 114 | 114 | const resolveStartup = Effect.fn("cloud.service_launcher_client.resolve_startup")( |
| 115 | 115 | function* (options?: { readonly currentVersion?: string }) { |
| 116 | 116 | const host = yield* ServiceLauncherHostProcess; |
| 117 | const environment = yield* HostProcessEnvironment; | |
| 117 | const environment = yield* HostProcess.Environment; | |
| 118 | 118 | const currentVersion = options?.currentVersion ?? packageJson.version; |
| 119 | 119 | const rawContext = environment[SERVICE_LAUNCHER_CONTEXT_ENV]; |
| 120 | 120 | const context = rawContext === undefined ? undefined : decodeServiceLauncherContext(rawContext); |
apps/server/src/device/AgentDeviceShim.ts+2-2
| ... | ... | @@ -5,7 +5,7 @@ |
| 5 | 5 | * types `agent-device …` and gets the version the injected instructions were |
| 6 | 6 | * written for, regardless of what is or is not globally installed. |
| 7 | 7 | */ |
| 8 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 8 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 9 | 9 | import { resolveNodeExecutable } from "@t3tools/shared/nodeRuntime"; |
| 10 | 10 | import * as Effect from "effect/Effect"; |
| 11 | 11 | import * as FileSystem from "effect/FileSystem"; |
| ... | ... | @@ -20,7 +20,7 @@ export const ensureAgentDeviceShim = Effect.fn("AgentDeviceShim.ensure")(functio |
| 20 | 20 | const { entryPath } = input; |
| 21 | 21 | const fs = yield* FileSystem.FileSystem; |
| 22 | 22 | const path = yield* Path.Path; |
| 23 | const platform = yield* HostProcessPlatform; | |
| 23 | const platform = yield* HostProcess.Platform; | |
| 24 | 24 | const node = yield* resolveNodeExecutable("Device automation"); |
| 25 | 25 | const shimDir = path.join(input.stateDir, SHIM_DIR); |
| 26 | 26 | yield* fs.makeDirectory(shimDir, { recursive: true }); |
apps/server/src/device/AgentDeviceTarget.test.ts+4-8
| ... | ... | @@ -1,9 +1,5 @@ |
| 1 | 1 | // @effect-diagnostics nodeBuiltinImport:off - exercises concurrent real CLI subprocesses. |
| 2 | import { | |
| 3 | HostProcessExecutablePath, | |
| 4 | HostProcessIsExecutable, | |
| 5 | HostProcessPlatform, | |
| 6 | } from "@t3tools/shared/hostProcess"; | |
| 2 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 7 | 3 | import { describe, expect, it } from "@effect/vitest"; |
| 8 | 4 | import * as NodeChildProcess from "node:child_process"; |
| 9 | 5 | import * as NodeUtil from "node:util"; |
| ... | ... | @@ -26,7 +22,7 @@ describe("host-bound agent commands", () => { |
| 26 | 22 | const fs = yield* FileSystem.FileSystem; |
| 27 | 23 | const path = yield* Path.Path; |
| 28 | 24 | const temp = yield* fs.makeTempDirectoryScoped({ prefix: "t3-device-target-" }); |
| 29 | const platform = yield* HostProcessPlatform; | |
| 25 | const platform = yield* HostProcess.Platform; | |
| 30 | 26 | const dir = path.join( |
| 31 | 27 | temp, |
| 32 | 28 | platform === "win32" ? "paths with spaces" : "quotes '\" $HOME `literal`", |
| ... | ... | @@ -92,8 +88,8 @@ if (process.env.AGENT_DEVICE_DAEMON_BASE_URL) process.exit(2);`, |
| 92 | 88 | } |
| 93 | 89 | }).pipe( |
| 94 | 90 | Effect.scoped, |
| 95 | Effect.provideService(HostProcessIsExecutable, true), | |
| 96 | Effect.provideService(HostProcessExecutablePath, "/packaged/t3"), | |
| 91 | Effect.provideService(HostProcess.IsExecutable, true), | |
| 92 | Effect.provideService(HostProcess.ExecutablePath, "/packaged/t3"), | |
| 97 | 93 | Effect.provide(NodeServices.layer), |
| 98 | 94 | ), |
| 99 | 95 | ); |
apps/server/src/device/LocalDeviceHost.test.ts+10-15
| ... | ... | @@ -1,11 +1,6 @@ |
| 1 | 1 | import { describe, expect, it } from "@effect/vitest"; |
| 2 | 2 | import * as NodePath from "@effect/platform-node/NodePath"; |
| 3 | import { | |
| 4 | HostProcessEnvironment, | |
| 5 | HostProcessPlatform, | |
| 6 | HostProcessIsExecutable, | |
| 7 | HostProcessUserId, | |
| 8 | } from "@t3tools/shared/hostProcess"; | |
| 3 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 9 | 4 | import * as Effect from "effect/Effect"; |
| 10 | 5 | import * as Layer from "effect/Layer"; |
| 11 | 6 | import * as Option from "effect/Option"; |
| ... | ... | @@ -26,8 +21,8 @@ const diagnose = ( |
| 26 | 21 | platform: NodeJS.Platform = "darwin", |
| 27 | 22 | ) => |
| 28 | 23 | LocalDeviceHost.__testing.platformReason("android").pipe( |
| 29 | Effect.provideService(HostProcessEnvironment, environment), | |
| 30 | Effect.provideService(HostProcessPlatform, platform), | |
| 24 | Effect.provideService(HostProcess.Environment, environment), | |
| 25 | Effect.provideService(HostProcess.Platform, platform), | |
| 31 | 26 | Effect.provideService( |
| 32 | 27 | FileSystem.FileSystem, |
| 33 | 28 | FileSystem.makeNoop({ |
| ... | ... | @@ -155,8 +150,8 @@ it.effect( |
| 155 | 150 | ] as const) { |
| 156 | 151 | const environment = { PATH: "/usr/bin", XDG_RUNTIME_DIR: runtimeDir }; |
| 157 | 152 | const result = yield* LocalDeviceHost.__testing.hubEnvironment(environment).pipe( |
| 158 | Effect.provideService(HostProcessPlatform, platform), | |
| 159 | Effect.provideService(HostProcessUserId, uid), | |
| 153 | Effect.provideService(HostProcess.Platform, platform), | |
| 154 | Effect.provideService(HostProcess.UserId, uid), | |
| 160 | 155 | Effect.provideService( |
| 161 | 156 | FileSystem.FileSystem, |
| 162 | 157 | FileSystem.makeNoop({ |
| ... | ... | @@ -176,8 +171,8 @@ it.effect( |
| 176 | 171 | const missing = yield* LocalDeviceHost.__testing |
| 177 | 172 | .hubEnvironment({}) |
| 178 | 173 | .pipe( |
| 179 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 180 | Effect.provideService(HostProcessUserId, 1000), | |
| 174 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 175 | Effect.provideService(HostProcess.UserId, 1000), | |
| 181 | 176 | Effect.provideService(FileSystem.FileSystem, FileSystem.makeNoop({})), |
| 182 | 177 | ); |
| 183 | 178 | expect(missing.XDG_RUNTIME_DIR).toBeUndefined(); |
| ... | ... | @@ -192,8 +187,8 @@ it.effect( |
| 192 | 187 | const baseDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-device-consent-" }); |
| 193 | 188 | const host = yield* LocalDeviceHost.make().pipe( |
| 194 | 189 | Effect.provide(Layer.mergeAll(ServerConfig.layerTest(baseDir, baseDir), NetService.layer)), |
| 195 | Effect.provideService(HostProcessEnvironment, { HOME: baseDir, PATH: "" }), | |
| 196 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 190 | Effect.provideService(HostProcess.Environment, { HOME: baseDir, PATH: "" }), | |
| 191 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 197 | 192 | Effect.provideService( |
| 198 | 193 | ChildProcessSpawner.ChildProcessSpawner, |
| 199 | 194 | ChildProcessSpawner.make(() => |
| ... | ... | @@ -213,7 +208,7 @@ it.effect( |
| 213 | 208 | expect(yield* host.current).toBeNull(); |
| 214 | 209 | const error = yield* host |
| 215 | 210 | .ensureReady(() => Effect.die("Must not install without Node")) |
| 216 | .pipe(Effect.flip, Effect.provideService(HostProcessIsExecutable, true)); | |
| 211 | .pipe(Effect.flip, Effect.provideService(HostProcess.IsExecutable, true)); | |
| 217 | 212 | expect(error.message).toContain("Local device support requires Node.js"); |
| 218 | 213 | expect(error.message).toContain("Install Node.js"); |
| 219 | 214 | yield* host.stop; |
apps/server/src/device/LocalDeviceHost.ts+10-14
| ... | ... | @@ -19,11 +19,7 @@ import { |
| 19 | 19 | LOCAL_DEVICE_HOST_ID, |
| 20 | 20 | } from "@t3tools/contracts"; |
| 21 | 21 | import { waitForHttpReady } from "@t3tools/shared/httpReadiness"; |
| 22 | import { | |
| 23 | HostProcessEnvironment, | |
| 24 | HostProcessPlatform, | |
| 25 | HostProcessUserId, | |
| 26 | } from "@t3tools/shared/hostProcess"; | |
| 22 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 27 | 23 | import { |
| 28 | 24 | resolveNodeExecutable, |
| 29 | 25 | type NodeRuntimeUnavailableError, |
| ... | ... | @@ -107,7 +103,7 @@ interface RunningHost { |
| 107 | 103 | const platformReason = Effect.fn("LocalDeviceHost.platformReason")(function* ( |
| 108 | 104 | platform: DevicePlatform, |
| 109 | 105 | ): Effect.fn.Return<string | null, never, FileSystem.FileSystem | Path.Path> { |
| 110 | const hostPlatform = yield* HostProcessPlatform; | |
| 106 | const hostPlatform = yield* HostProcess.Platform; | |
| 111 | 107 | if (platform === "ios") { |
| 112 | 108 | if (hostPlatform !== "darwin") return "iOS Simulators need macOS with Xcode."; |
| 113 | 109 | if (!(yield* isCommandAvailable("xcrun"))) return "Xcode command line tools were not found."; |
| ... | ... | @@ -132,8 +128,8 @@ const platformReason = Effect.fn("LocalDeviceHost.platformReason")(function* ( |
| 132 | 128 | const androidSdk = Effect.gen(function* () { |
| 133 | 129 | const fs = yield* FileSystem.FileSystem; |
| 134 | 130 | const path = yield* Path.Path; |
| 135 | const environment = yield* HostProcessEnvironment; | |
| 136 | const platform = yield* HostProcessPlatform; | |
| 131 | const environment = yield* HostProcess.Environment; | |
| 132 | const platform = yield* HostProcess.Platform; | |
| 137 | 133 | const home = environment.HOME ?? environment.USERPROFILE ?? ""; |
| 138 | 134 | const explicit = environment.ANDROID_HOME?.trim() || environment.ANDROID_SDK_ROOT?.trim(); |
| 139 | 135 | const candidates = explicit |
| ... | ... | @@ -208,8 +204,8 @@ const hubEnvironment = Effect.fn("LocalDeviceHost.hubEnvironment")(function* ( |
| 208 | 204 | environment: NodeJS.ProcessEnv, |
| 209 | 205 | ) { |
| 210 | 206 | const env: NodeJS.ProcessEnv = { ...environment, FORCE_COLOR: "0", NO_COLOR: "1" }; |
| 211 | const platform = yield* HostProcessPlatform; | |
| 212 | const uid = yield* HostProcessUserId; | |
| 207 | const platform = yield* HostProcess.Platform; | |
| 208 | const uid = yield* HostProcess.UserId; | |
| 213 | 209 | if (platform === "linux" && env.XDG_RUNTIME_DIR === undefined && uid !== undefined) { |
| 214 | 210 | // SSH sessions may omit the directory where the emulator publishes its gRPC token. |
| 215 | 211 | const runtimeDir = `/run/user/${uid}`; |
| ... | ... | @@ -234,8 +230,8 @@ export const make = Effect.fn("LocalDeviceHost.make")(function* () { |
| 234 | 230 | const net = yield* NetService.NetService; |
| 235 | 231 | const runner = yield* ProcessRunner.ProcessRunner; |
| 236 | 232 | const httpClient = yield* HttpClient.HttpClient; |
| 237 | const environment = yield* HostProcessEnvironment; | |
| 238 | const hostPlatform = yield* HostProcessPlatform; | |
| 233 | const environment = yield* HostProcess.Environment; | |
| 234 | const hostPlatform = yield* HostProcess.Platform; | |
| 239 | 235 | const sdk = yield* androidSdk; |
| 240 | 236 | const hostEnvironment = deviceHostEnvironment(environment, sdk.root, hostPlatform, path); |
| 241 | 237 | const startLock = yield* Semaphore.make(1); |
| ... | ... | @@ -406,7 +402,7 @@ export const make = Effect.fn("LocalDeviceHost.make")(function* () { |
| 406 | 402 | stderr: "pipe", |
| 407 | 403 | env: yield* hubEnvironment(hostEnvironment).pipe( |
| 408 | 404 | Effect.provideService(FileSystem.FileSystem, fs), |
| 409 | Effect.provideService(HostProcessPlatform, hostPlatform), | |
| 405 | Effect.provideService(HostProcess.Platform, hostPlatform), | |
| 410 | 406 | ), |
| 411 | 407 | }, |
| 412 | 408 | ), |
| ... | ... | @@ -598,7 +594,7 @@ export const make = Effect.fn("LocalDeviceHost.make")(function* () { |
| 598 | 594 | const nodePath = yield* resolveNodeExecutable("Local device support", hostEnvironment).pipe( |
| 599 | 595 | Effect.provideService(FileSystem.FileSystem, fs), |
| 600 | 596 | Effect.provideService(Path.Path, path), |
| 601 | Effect.provideService(HostProcessPlatform, hostPlatform), | |
| 597 | Effect.provideService(HostProcess.Platform, hostPlatform), | |
| 602 | 598 | ); |
| 603 | 599 | const installed = yield* isDeviceHubInstalled(config.baseDir).pipe( |
| 604 | 600 | Effect.provideService(FileSystem.FileSystem, fs), |
apps/server/src/device/sshDeviceScript.test.ts+4-4
| ... | ... | @@ -1,6 +1,6 @@ |
| 1 | 1 | // @effect-diagnostics nodeBuiltinImport:off globalFetchInEffect:off - verifies generated remote scripts using real shell and Node processes. |
| 2 | 2 | import * as Effect from "effect/Effect"; |
| 3 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 3 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 4 | 4 | import { describe, expect, it } from "@effect/vitest"; |
| 5 | 5 | import * as NodeChildProcess from "node:child_process"; |
| 6 | 6 | import * as NodeFSP from "node:fs/promises"; |
| ... | ... | @@ -14,7 +14,7 @@ const exec = NodeUtil.promisify(NodeChildProcess.execFile); |
| 14 | 14 | |
| 15 | 15 | it.effect("finds Android Studio Java for a non-interactive SSH session", () => |
| 16 | 16 | Effect.gen(function* () { |
| 17 | if ((yield* HostProcessPlatform) === "win32") return; | |
| 17 | if ((yield* HostProcess.Platform) === "win32") return; | |
| 18 | 18 | yield* Effect.promise(async () => { |
| 19 | 19 | const home = await NodeFSP.mkdtemp(NodePath.join(NodeOS.tmpdir(), "t3-ssh-java-")); |
| 20 | 20 | try { |
| ... | ... | @@ -38,7 +38,7 @@ it.effect("finds Android Studio Java for a non-interactive SSH session", () => |
| 38 | 38 | |
| 39 | 39 | it.effect("preserves shell metacharacters and newlines in remote arguments", () => |
| 40 | 40 | Effect.gen(function* () { |
| 41 | if ((yield* HostProcessPlatform) === "win32") return; | |
| 41 | if ((yield* HostProcess.Platform) === "win32") return; | |
| 42 | 42 | yield* Effect.promise(async () => { |
| 43 | 43 | const value = "quotes ' \" ; $(echo expanded) $HOME\nnext line"; |
| 44 | 44 | const result = await exec("sh", ["-c", `printf %s ${quoteRemoteArg(value)}`]); |
| ... | ... | @@ -50,7 +50,7 @@ it.effect("preserves shell metacharacters and newlines in remote arguments", () |
| 50 | 50 | describe("remote helper lifecycle", () => { |
| 51 | 51 | it.effect("reuses its own healthy helpers and stops only its own runtime", () => |
| 52 | 52 | Effect.gen(function* () { |
| 53 | if ((yield* HostProcessPlatform) === "win32") return; | |
| 53 | if ((yield* HostProcess.Platform) === "win32") return; | |
| 54 | 54 | yield* Effect.promise(async () => { |
| 55 | 55 | const home = await NodeFSP.mkdtemp(NodePath.join(NodeOS.tmpdir(), "t3-remote-script-")); |
| 56 | 56 | const bin = NodePath.join(home, "bin"); |
apps/server/src/environment/RemoteOpenTargets.test.ts+2-2
| ... | ... | @@ -1,5 +1,5 @@ |
| 1 | 1 | import { it } from "@effect/vitest"; |
| 2 | import { HostProcessHostname } from "@t3tools/shared/hostProcess"; | |
| 2 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 3 | 3 | import * as NetService from "@t3tools/shared/Net"; |
| 4 | 4 | import * as Effect from "effect/Effect"; |
| 5 | 5 | import * as Layer from "effect/Layer"; |
| ... | ... | @@ -54,7 +54,7 @@ const resolveTargets = (input: { |
| 54 | 54 | readonly hostname: string; |
| 55 | 55 | }) => |
| 56 | 56 | Effect.flatMap(RemoteOpenTargets.RemoteOpenTargets, (service) => service.resolveTargets()).pipe( |
| 57 | Effect.provideService(HostProcessHostname, input.hostname), | |
| 57 | Effect.provideService(HostProcess.Hostname, input.hostname), | |
| 58 | 58 | Effect.provide( |
| 59 | 59 | RemoteOpenTargets.layer.pipe( |
| 60 | 60 | Layer.provide(Layer.mergeAll(layerNet(input.sshd), layerSpawner(input.tailscale))), |
apps/server/src/environment/RemoteOpenTargets.ts+2-2
| ... | ... | @@ -9,7 +9,7 @@ |
| 9 | 9 | * on the tailnet; `<hostname>.local` only on the same LAN). |
| 10 | 10 | */ |
| 11 | 11 | import { type RemoteOpenTarget } from "@t3tools/contracts"; |
| 12 | import { HostProcessHostname } from "@t3tools/shared/hostProcess"; | |
| 12 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 13 | 13 | import * as NetService from "@t3tools/shared/Net"; |
| 14 | 14 | import { readTailscaleStatus } from "@t3tools/tailscale"; |
| 15 | 15 | import * as Context from "effect/Context"; |
| ... | ... | @@ -58,7 +58,7 @@ export const make = Effect.gen(function* () { |
| 58 | 58 | |
| 59 | 59 | // os.hostname() may already be an FQDN (macOS often reports |
| 60 | 60 | // "Name.local"); mDNS names are always `<first-label>.local`. |
| 61 | const hostname = yield* HostProcessHostname; | |
| 61 | const hostname = yield* HostProcess.Hostname; | |
| 62 | 62 | const shortHostname = hostname.split(".")[0]?.trim(); |
| 63 | 63 | if (shortHostname !== undefined && shortHostname.length > 0) { |
| 64 | 64 | targets.push({ kind: "mdns", host: `${shortHostname}.local` }); |
apps/server/src/environment/ServerEnvironment.test.ts+5-10
| ... | ... | @@ -10,12 +10,7 @@ import * as PlatformError from "effect/PlatformError"; |
| 10 | 10 | import * as Schema from "effect/Schema"; |
| 11 | 11 | |
| 12 | 12 | import { DEFAULT_SIGNAL_EXPORT } from "@t3tools/shared/observability"; |
| 13 | import { | |
| 14 | HostProcessArguments, | |
| 15 | HostProcessEnvironment, | |
| 16 | HostProcessIsExecutable, | |
| 17 | HostProcessPlatform, | |
| 18 | } from "@t3tools/shared/hostProcess"; | |
| 13 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 19 | 14 | import * as OtelEnvironment from "@t3tools/shared/otelEnvironment"; |
| 20 | 15 | |
| 21 | 16 | import * as ServerSecretStore from "../auth/ServerSecretStore.ts"; |
| ... | ... | @@ -112,10 +107,10 @@ it.layer(NodeServices.layer)("ServerEnvironmentLive", (it) => { |
| 112 | 107 | Layer.provide(ServerConfig.layer({ ...config, mode })), |
| 113 | 108 | ), |
| 114 | 109 | ), |
| 115 | Effect.provideService(HostProcessArguments, ["node", entry]), | |
| 116 | Effect.provideService(HostProcessIsExecutable, false), | |
| 117 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 118 | Effect.provideService(HostProcessEnvironment, {}), | |
| 110 | Effect.provideService(HostProcess.Arguments, ["node", entry]), | |
| 111 | Effect.provideService(HostProcess.IsExecutable, false), | |
| 112 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 113 | Effect.provideService(HostProcess.Environment, {}), | |
| 119 | 114 | ); |
| 120 | 115 | expect(descriptor.capabilities.serverInstallation).toEqual( |
| 121 | 116 | mode === "web" ? { kind: "npm-global", prefix } : undefined, |
apps/server/src/environment/ServerEnvironment.ts+3-3
| ... | ... | @@ -4,7 +4,7 @@ import { |
| 4 | 4 | PROVIDER_SEND_TURN_MAX_FILE_BYTES, |
| 5 | 5 | type ExecutionEnvironmentDescriptor, |
| 6 | 6 | } from "@t3tools/contracts"; |
| 7 | import { HostProcessArchitecture, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 7 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 8 | 8 | import * as Context from "effect/Context"; |
| 9 | 9 | import * as Crypto from "effect/Crypto"; |
| 10 | 10 | import * as Effect from "effect/Effect"; |
| ... | ... | @@ -186,8 +186,8 @@ export const make = Effect.gen(function* () { |
| 186 | 186 | const serverConfig = yield* ServerConfig.ServerConfig; |
| 187 | 187 | const secrets = yield* ServerSecretStore.ServerSecretStore; |
| 188 | 188 | const identity = yield* ServerEnvironmentIdentity; |
| 189 | const hostPlatform = yield* HostProcessPlatform; | |
| 190 | const hostArchitecture = yield* HostProcessArchitecture; | |
| 189 | const hostPlatform = yield* HostProcess.Platform; | |
| 190 | const hostArchitecture = yield* HostProcess.Architecture; | |
| 191 | 191 | const environmentId = yield* identity.getEnvironmentId; |
| 192 | 192 | const cwdBaseName = path.basename(serverConfig.cwd).trim(); |
| 193 | 193 | const label = yield* resolveServerEnvironmentLabel({ cwdBaseName }); |
apps/server/src/environment/ServerEnvironmentLabel.test.ts+3-3
| ... | ... | @@ -7,7 +7,7 @@ import * as PlatformError from "effect/PlatformError"; |
| 7 | 7 | import * as References from "effect/References"; |
| 8 | 8 | import * as Schema from "effect/Schema"; |
| 9 | 9 | import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner"; |
| 10 | import { HostProcessHostname, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 10 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 11 | 11 | import { vi } from "vite-plus/test"; |
| 12 | 12 | |
| 13 | 13 | import * as ProcessRunner from "../processRunner.ts"; |
| ... | ... | @@ -52,8 +52,8 @@ const withHostPlatform = <ROut, E, RIn>( |
| 52 | 52 | ) => |
| 53 | 53 | Layer.mergeAll( |
| 54 | 54 | layer, |
| 55 | Layer.succeed(HostProcessPlatform, platform), | |
| 56 | Layer.succeed(HostProcessHostname, hostname), | |
| 55 | Layer.succeed(HostProcess.Platform, platform), | |
| 56 | Layer.succeed(HostProcess.Hostname, hostname), | |
| 57 | 57 | ); |
| 58 | 58 | |
| 59 | 59 | afterEach(() => { |
apps/server/src/environment/ServerEnvironmentLabel.ts+3-3
| ... | ... | @@ -1,4 +1,4 @@ |
| 1 | import { HostProcessHostname, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 1 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 2 | 2 | import * as Effect from "effect/Effect"; |
| 3 | 3 | import * as FileSystem from "effect/FileSystem"; |
| 4 | 4 | import * as Option from "effect/Option"; |
| ... | ... | @@ -151,7 +151,7 @@ const runFriendlyLabelCommand = Effect.fn("runFriendlyLabelCommand")(function* ( |
| 151 | 151 | }); |
| 152 | 152 | |
| 153 | 153 | const resolveFriendlyHostLabel = Effect.fn("resolveFriendlyHostLabel")(function* () { |
| 154 | const platform = yield* HostProcessPlatform; | |
| 154 | const platform = yield* HostProcess.Platform; | |
| 155 | 155 | if (platform === "darwin") { |
| 156 | 156 | return yield* runFriendlyLabelCommand({ |
| 157 | 157 | probe: "macos-computer-name", |
| ... | ... | @@ -187,7 +187,7 @@ export const resolveServerEnvironmentLabel = Effect.fn("resolveServerEnvironment |
| 187 | 187 | return friendlyHostLabel; |
| 188 | 188 | } |
| 189 | 189 | |
| 190 | const hostname = normalizeLabel(yield* HostProcessHostname); | |
| 190 | const hostname = normalizeLabel(yield* HostProcess.Hostname); | |
| 191 | 191 | if (hostname) { |
| 192 | 192 | return hostname; |
| 193 | 193 | } |
apps/server/src/environment/ServerEnvironmentMachine.test.ts+2-2
| ... | ... | @@ -4,7 +4,7 @@ import * as FileSystem from "effect/FileSystem"; |
| 4 | 4 | import * as Layer from "effect/Layer"; |
| 5 | 5 | import * as PlatformError from "effect/PlatformError"; |
| 6 | 6 | import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner"; |
| 7 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 7 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 8 | 8 | import { vi } from "vite-plus/test"; |
| 9 | 9 | |
| 10 | 10 | import * as ProcessRunner from "../processRunner.ts"; |
| ... | ... | @@ -52,7 +52,7 @@ const layerDmiFileSystem = (files: Readonly<Record<string, string>>) => |
| 52 | 52 | }); |
| 53 | 53 | |
| 54 | 54 | const withPlatform = (platform: NodeJS.Platform, fileSystem = FileSystem.layerNoop({})) => |
| 55 | Layer.mergeAll(layerProcessRunnerTest, fileSystem, Layer.succeed(HostProcessPlatform, platform)); | |
| 55 | Layer.mergeAll(layerProcessRunnerTest, fileSystem, Layer.succeed(HostProcess.Platform, platform)); | |
| 56 | 56 | |
| 57 | 57 | afterEach(() => { |
| 58 | 58 | runMock.mockReset(); |
apps/server/src/environment/ServerEnvironmentMachine.ts+2-2
| ... | ... | @@ -1,5 +1,5 @@ |
| 1 | 1 | import type { EnvironmentMachineKind } from "@t3tools/contracts"; |
| 2 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 2 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 3 | 3 | import * as Effect from "effect/Effect"; |
| 4 | 4 | import * as FileSystem from "effect/FileSystem"; |
| 5 | 5 | |
| ... | ... | @@ -161,7 +161,7 @@ const detectLinuxMachineKind = Effect.fn("detectLinuxMachineKind")(function* () |
| 161 | 161 | |
| 162 | 162 | export const detectServerEnvironmentMachineKind = Effect.fn("detectServerEnvironmentMachineKind")( |
| 163 | 163 | function* () { |
| 164 | const platform = yield* HostProcessPlatform; | |
| 164 | const platform = yield* HostProcess.Platform; | |
| 165 | 165 | switch (platform) { |
| 166 | 166 | case "darwin": |
| 167 | 167 | return yield* detectDarwinMachineKind(); |
apps/server/src/htmlRender/HtmlRender.test.ts+5-5
| ... | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 3 | 3 | import { describe, expect, it } from "@effect/vitest"; |
| 4 | 4 | import { ThreadId } from "@t3tools/contracts"; |
| 5 | import { HostProcessEnvironment } from "@t3tools/shared/hostProcess"; | |
| 5 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 6 | 6 | import { |
| 7 | 7 | HTML_RENDER_MEASURE_FONTS, |
| 8 | 8 | HTML_RENDER_MEASURE_WIDTHS, |
| ... | ... | @@ -238,7 +238,7 @@ describe("HtmlRender", () => { |
| 238 | 238 | "screenshots the page in headless Chrome with the requested theme and every console level", |
| 239 | 239 | (ctx) => |
| 240 | 240 | Effect.gen(function* () { |
| 241 | const executable = (yield* HostProcessEnvironment)[TEST_BROWSER_ENV]; | |
| 241 | const executable = (yield* HostProcess.Environment)[TEST_BROWSER_ENV]; | |
| 242 | 242 | if (!executable) return ctx.skip(`Set ${TEST_BROWSER_ENV} to run this test.`); |
| 243 | 243 | yield* Effect.gen(function* () { |
| 244 | 244 | const htmlRender = yield* HtmlRender.HtmlRender; |
| ... | ... | @@ -292,7 +292,7 @@ describe("HtmlRender", () => { |
| 292 | 292 | "keeps every local file but the page itself out of the browser", |
| 293 | 293 | (ctx) => |
| 294 | 294 | Effect.gen(function* () { |
| 295 | const executable = (yield* HostProcessEnvironment)[TEST_BROWSER_ENV]; | |
| 295 | const executable = (yield* HostProcess.Environment)[TEST_BROWSER_ENV]; | |
| 296 | 296 | if (!executable) return ctx.skip(`Set ${TEST_BROWSER_ENV} to run this test.`); |
| 297 | 297 | yield* Effect.gen(function* () { |
| 298 | 298 | const fileSystem = yield* FileSystem.FileSystem; |
| ... | ... | @@ -323,7 +323,7 @@ describe("HtmlRender", () => { |
| 323 | 323 | "keeps the page off this machine's local network", |
| 324 | 324 | (ctx) => |
| 325 | 325 | Effect.gen(function* () { |
| 326 | const executable = (yield* HostProcessEnvironment)[TEST_BROWSER_ENV]; | |
| 326 | const executable = (yield* HostProcess.Environment)[TEST_BROWSER_ENV]; | |
| 327 | 327 | if (!executable) return ctx.skip(`Set ${TEST_BROWSER_ENV} to run this test.`); |
| 328 | 328 | // The page's connections go through a proxy that only reaches public |
| 329 | 329 | // addresses, and WebRTC is gone. Each line below is a way out that |
| ... | ... | @@ -381,7 +381,7 @@ describe("HtmlRender", () => { |
| 381 | 381 | "measures a published page at every client width with a fresh load each", |
| 382 | 382 | (ctx) => |
| 383 | 383 | Effect.gen(function* () { |
| 384 | const executable = (yield* HostProcessEnvironment)[TEST_BROWSER_ENV]; | |
| 384 | const executable = (yield* HostProcess.Environment)[TEST_BROWSER_ENV]; | |
| 385 | 385 | if (!executable) return ctx.skip(`Set ${TEST_BROWSER_ENV} to run this test.`); |
| 386 | 386 | yield* Effect.gen(function* () { |
| 387 | 387 | const htmlRender = yield* HtmlRender.HtmlRender; |
apps/server/src/htmlRender/HtmlRender.ts+2-2
| ... | ... | @@ -1,5 +1,5 @@ |
| 1 | 1 | import type { ThreadId } from "@t3tools/contracts"; |
| 2 | import { HostProcessEnvironment } from "@t3tools/shared/hostProcess"; | |
| 2 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 3 | 3 | import { |
| 4 | 4 | clampHtmlRenderHeight, |
| 5 | 5 | HTML_RENDER_COLUMN_WIDTH, |
| ... | ... | @@ -341,7 +341,7 @@ const make = Effect.gen(function* () { |
| 341 | 341 | const browsers = yield* Semaphore.make(MAX_CONCURRENT_BROWSERS); |
| 342 | 342 | // Chrome's sandbox stays on unless the operator explicitly turns it off. |
| 343 | 343 | // Chrome also refuses it as root, where that opt-out is the only way to run. |
| 344 | const noSandbox = PreviewBrowserHost.sandboxDisabled(yield* HostProcessEnvironment); | |
| 344 | const noSandbox = PreviewBrowserHost.sandboxDisabled(yield* HostProcess.Environment); | |
| 345 | 345 | const setupCommand = yield* resolveRootCliCommand(PreviewBrowserHost.SETUP_SUBCOMMAND); |
| 346 | 346 | |
| 347 | 347 | /** Runs one browser launch; a host that cannot start it gets setup steps instead. */ |
apps/server/src/keybindings.test.ts+2-2
| ... | ... | @@ -12,7 +12,7 @@ import * as Schema from "effect/Schema"; |
| 12 | 12 | import * as ServerConfig from "./config.ts"; |
| 13 | 13 | import * as Keybindings from "./keybindings.ts"; |
| 14 | 14 | import { KeybindingsConfigError, MAX_KEYBINDINGS_COUNT } from "@t3tools/contracts"; |
| 15 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 15 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 16 | 16 | |
| 17 | 17 | const KeybindingsConfigJson = Schema.fromJsonString(KeybindingsConfig); |
| 18 | 18 | const encodeKeybindingsConfigJson = Schema.encodeEffect(KeybindingsConfigJson); |
| ... | ... | @@ -564,7 +564,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => { |
| 564 | 564 | ); |
| 565 | 565 | |
| 566 | 566 | // chmod cannot make a directory unwritable on Windows, so the write succeeds. |
| 567 | it.effect.skipIf(HostProcessPlatform.defaultValue() === "win32")( | |
| 567 | it.effect.skipIf(HostProcess.Platform.defaultValue() === "win32")( | |
| 568 | 568 | "fails when config directory is not writable", |
| 569 | 569 | () => |
| 570 | 570 | Effect.gen(function* () { |
apps/server/src/mcp/toolkits/device/handlers.ts+2-2
| ... | ... | @@ -9,7 +9,7 @@ import { |
| 9 | 9 | } from "@t3tools/contracts"; |
| 10 | 10 | import * as Effect from "effect/Effect"; |
| 11 | 11 | import * as Path from "effect/Path"; |
| 12 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 12 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 13 | 13 | import * as ServerConfig from "../../../config.ts"; |
| 14 | 14 | import { ensureAgentDeviceShim } from "../../../device/AgentDeviceShim.ts"; |
| 15 | 15 | import { nodeRuntimeUnavailableMessage } from "@t3tools/shared/nodeRuntime"; |
| ... | ... | @@ -179,7 +179,7 @@ const handlers = { |
| 179 | 179 | const targetArgs = [...agentDeviceTargetArgs(device), ...agentArgs]; |
| 180 | 180 | const config = yield* ServerConfig.ServerConfig; |
| 181 | 181 | const path = yield* Path.Path; |
| 182 | const platform = yield* HostProcessPlatform; | |
| 182 | const platform = yield* HostProcess.Platform; | |
| 183 | 183 | const shimDir = yield* ensureAgentDeviceShim({ |
| 184 | 184 | entryPath: yield* devices.agentCli, |
| 185 | 185 | stateDir: config.stateDir, |
apps/server/src/observability/HeapSnapshot.ts+2-2
| ... | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | import * as NodePath from "node:path"; |
| 3 | 3 | import * as NodeV8 from "node:v8"; |
| 4 | 4 | |
| 5 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 5 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 6 | 6 | import * as DateTime from "effect/DateTime"; |
| 7 | 7 | import * as Effect from "effect/Effect"; |
| 8 | 8 | import * as FileSystem from "effect/FileSystem"; |
| ... | ... | @@ -40,7 +40,7 @@ export const writeHeapSnapshot = Effect.fn("server.heapSnapshot", { root: true } |
| 40 | 40 | */ |
| 41 | 41 | export const layer = Layer.effectDiscard( |
| 42 | 42 | Effect.gen(function* () { |
| 43 | if ((yield* HostProcessPlatform) === "win32") return; | |
| 43 | if ((yield* HostProcess.Platform) === "win32") return; | |
| 44 | 44 | const { logsDir } = yield* ServerConfig.ServerConfig; |
| 45 | 45 | const runFork = Effect.runForkWith(yield* Effect.context<FileSystem.FileSystem>()); |
| 46 | 46 | const onSignal = () => void runFork(writeHeapSnapshot(logsDir)); |
apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts+9-9
| ... | ... | @@ -27,7 +27,7 @@ import { |
| 27 | 27 | type OrchestrationV2ProviderThread, |
| 28 | 28 | } from "@t3tools/contracts"; |
| 29 | 29 | import { GrokSettings } from "@t3tools/provider-grok/settings"; |
| 30 | import { HostProcessIsExecutable, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 30 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 31 | 31 | import { resolveSelfInvocation } from "@t3tools/shared/nodeRuntime"; |
| 32 | 32 | import * as DateTime from "effect/DateTime"; |
| 33 | 33 | import * as Deferred from "effect/Deferred"; |
| ... | ... | @@ -705,7 +705,7 @@ describe("AcpAdapterV2", () => { |
| 705 | 705 | const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner; |
| 706 | 706 | const path = yield* Path.Path; |
| 707 | 707 | const selfInvocation = yield* resolveSelfInvocation().pipe( |
| 708 | Effect.provideService(HostProcessIsExecutable, true), | |
| 708 | Effect.provideService(HostProcess.IsExecutable, true), | |
| 709 | 709 | ); |
| 710 | 710 | const mockAgentPath = yield* path.fromFileUrl( |
| 711 | 711 | new URL("../../../scripts/acp-mock-agent.ts", import.meta.url), |
| ... | ... | @@ -1833,7 +1833,7 @@ describe("AcpAdapterV2", () => { |
| 1833 | 1833 | |
| 1834 | 1834 | it.live("cleans detached fixtures when an assertion aborts the test scope", () => |
| 1835 | 1835 | Effect.gen(function* () { |
| 1836 | if ((yield* HostProcessPlatform) !== "linux") return; | |
| 1836 | if ((yield* HostProcess.Platform) !== "linux") return; | |
| 1837 | 1837 | const fileSystem = yield* FileSystem.FileSystem; |
| 1838 | 1838 | let published: ReadonlyArray<number> = []; |
| 1839 | 1839 | const failed = yield* Effect.scoped( |
| ... | ... | @@ -1947,7 +1947,7 @@ describe("AcpAdapterV2", () => { |
| 1947 | 1947 | |
| 1948 | 1948 | it.live("reaps detached native work when the provider exits before explicit teardown", () => |
| 1949 | 1949 | Effect.gen(function* () { |
| 1950 | if ((yield* HostProcessPlatform) !== "linux") return; | |
| 1950 | if ((yield* HostProcess.Platform) !== "linux") return; | |
| 1951 | 1951 | const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner; |
| 1952 | 1952 | const fileSystem = yield* FileSystem.FileSystem; |
| 1953 | 1953 | const path = yield* Path.Path; |
| ... | ... | @@ -2026,7 +2026,7 @@ describe("AcpAdapterV2", () => { |
| 2026 | 2026 | |
| 2027 | 2027 | it.live("surfaces reduced guarantee when delegated cgroup containment is unavailable", () => |
| 2028 | 2028 | Effect.gen(function* () { |
| 2029 | if ((yield* HostProcessPlatform) !== "linux") return; | |
| 2029 | if ((yield* HostProcess.Platform) !== "linux") return; | |
| 2030 | 2030 | const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner; |
| 2031 | 2031 | const path = yield* Path.Path; |
| 2032 | 2032 | const selfInvocation = yield* resolveSelfInvocation(); |
| ... | ... | @@ -3100,7 +3100,7 @@ describe("AcpAdapterV2", () => { |
| 3100 | 3100 | instanceId, |
| 3101 | 3101 | settings: DEFAULT_GROK_SETTINGS, |
| 3102 | 3102 | environment: {}, |
| 3103 | hostPlatform: yield* HostProcessPlatform, | |
| 3103 | hostPlatform: yield* HostProcess.Platform, | |
| 3104 | 3104 | selfInvocation: yield* resolveSelfInvocation(), |
| 3105 | 3105 | // Production Grok runtimes are wrapped by the x.ai prompt runtime. |
| 3106 | 3106 | makeRuntime: (input) => |
| ... | ... | @@ -3147,7 +3147,7 @@ describe("AcpAdapterV2", () => { |
| 3147 | 3147 | instanceId, |
| 3148 | 3148 | settings: DEFAULT_GROK_SETTINGS, |
| 3149 | 3149 | environment: {}, |
| 3150 | hostPlatform: yield* HostProcessPlatform, | |
| 3150 | hostPlatform: yield* HostProcess.Platform, | |
| 3151 | 3151 | selfInvocation: yield* resolveSelfInvocation(), |
| 3152 | 3152 | // Production Grok runtimes are wrapped by the x.ai prompt runtime. |
| 3153 | 3153 | makeRuntime: (input) => |
| ... | ... | @@ -13147,7 +13147,7 @@ describe("AcpAdapterV2", () => { |
| 13147 | 13147 | |
| 13148 | 13148 | it.live("direct Stop skips uninterruptible ACP cancel and recovers after native teardown", () => |
| 13149 | 13149 | Effect.gen(function* () { |
| 13150 | if ((yield* HostProcessPlatform) !== "linux") return; | |
| 13150 | if ((yield* HostProcess.Platform) !== "linux") return; | |
| 13151 | 13151 | const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner; |
| 13152 | 13152 | const fileSystem = yield* FileSystem.FileSystem; |
| 13153 | 13153 | const idAllocator = yield* IdAllocator.IdAllocatorV2; |
| ... | ... | @@ -13567,7 +13567,7 @@ describe("AcpAdapterV2", () => { |
| 13567 | 13567 | |
| 13568 | 13568 | it.live("restart_active terminates native work and reloads a clean runtime", () => |
| 13569 | 13569 | Effect.gen(function* () { |
| 13570 | if ((yield* HostProcessPlatform) !== "linux") return; | |
| 13570 | if ((yield* HostProcess.Platform) !== "linux") return; | |
| 13571 | 13571 | const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner; |
| 13572 | 13572 | const fileSystem = yield* FileSystem.FileSystem; |
| 13573 | 13573 | const idAllocator = yield* IdAllocator.IdAllocatorV2; |
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts+2-2
| ... | ... | @@ -47,7 +47,7 @@ import * as Stream from "effect/Stream"; |
| 47 | 47 | import * as TestClock from "effect/testing/TestClock"; |
| 48 | 48 | import { Tool } from "effect/ai"; |
| 49 | 49 | import { formatClaudeResumeCompactionQuestion } from "@t3tools/shared/claudeCompaction"; |
| 50 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 50 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 51 | 51 | import { SpawnExecutableResolution } from "@t3tools/shared/shell"; |
| 52 | 52 | |
| 53 | 53 | import { attachmentRelativePath } from "../../attachmentStore.ts"; |
| ... | ... | @@ -1171,7 +1171,7 @@ describe("ClaudeAdapterV2 executable path", () => { |
| 1171 | 1171 | const npmDir = "C:\\Users\\dev\\AppData\\Roaming\\npm"; |
| 1172 | 1172 | const packageExe = `${npmDir}\\node_modules\\@anthropic-ai\\claude-code\\bin\\claude.exe`; |
| 1173 | 1173 | const executablePaths = yield* captureSdkExecutablePaths("claude").pipe( |
| 1174 | Effect.provideService(HostProcessPlatform, "win32"), | |
| 1174 | Effect.provideService(HostProcess.Platform, "win32"), | |
| 1175 | 1175 | Effect.provideService(SpawnExecutableResolution, () => `${npmDir}\\claude.cmd`), |
| 1176 | 1176 | Effect.provideService(ClaudeExecutableFileCheck, (filePath) => filePath === packageExe), |
| 1177 | 1177 | ); |
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.testkit.ts+2-2
| ... | ... | @@ -8,7 +8,7 @@ import { |
| 8 | 8 | type SDKUserMessage, |
| 9 | 9 | } from "@anthropic-ai/claude-agent-sdk"; |
| 10 | 10 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 11 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 11 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 12 | 12 | import { SpawnExecutableResolution } from "@t3tools/shared/shell"; |
| 13 | 13 | import { |
| 14 | 14 | ProviderReplayEntry, |
| ... | ... | @@ -1440,7 +1440,7 @@ async function recordMessagesUntilToolUse(input: { |
| 1440 | 1440 | const resolveClaudeRecordingExecutablePath = Effect.fn("resolveClaudeRecordingExecutablePath")( |
| 1441 | 1441 | function* (environment: NodeJS.ProcessEnv) { |
| 1442 | 1442 | const resolveExecutable = yield* SpawnExecutableResolution; |
| 1443 | const platform = yield* HostProcessPlatform; | |
| 1443 | const platform = yield* HostProcess.Platform; | |
| 1444 | 1444 | const resolved = resolveExecutable("claude", platform, environment); |
| 1445 | 1445 | if (resolved === undefined) { |
| 1446 | 1446 | return undefined; |
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts+4-4
| ... | ... | @@ -31,7 +31,7 @@ import type { |
| 31 | 31 | WebSearchOutput, |
| 32 | 32 | } from "@anthropic-ai/claude-agent-sdk/sdk-tools"; |
| 33 | 33 | import { parseCliArgs } from "@t3tools/shared/cliArgs"; |
| 34 | import { HostProcessEnvironment, HostProcessHomeDirectory } from "@t3tools/shared/hostProcess"; | |
| 34 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 35 | 35 | import { applyClaudePromptEffortPrefix } from "@t3tools/shared/model"; |
| 36 | 36 | import { |
| 37 | 37 | CLAUDE_RESUME_COMPACTION_NEVER_ANSWER, |
| ... | ... | @@ -8176,7 +8176,7 @@ export const createClaudeAdapterV2 = Effect.fn("ClaudeAdapterV2Driver.create")( |
| 8176 | 8176 | ) { |
| 8177 | 8177 | const { instanceId, environment, enabled, config } = input; |
| 8178 | 8178 | const fileSystem = yield* FileSystem.FileSystem; |
| 8179 | const hostEnvironment = yield* HostProcessEnvironment; | |
| 8179 | const hostEnvironment = yield* HostProcess.Environment; | |
| 8180 | 8180 | const idAllocator = yield* IdAllocator.IdAllocatorV2; |
| 8181 | 8181 | const queryRunner = yield* ClaudeAgentSdkQueryRunner; |
| 8182 | 8182 | const serverConfig = yield* ServerConfig.ServerConfig; |
| ... | ... | @@ -8186,7 +8186,7 @@ export const createClaudeAdapterV2 = Effect.fn("ClaudeAdapterV2Driver.create")( |
| 8186 | 8186 | const path = yield* Path.Path; |
| 8187 | 8187 | const crypto = yield* Crypto.Crypto; |
| 8188 | 8188 | const binaryPath = yield* resolveClaudeSdkExecutablePath( |
| 8189 | expandHomePath(config.binaryPath, yield* HostProcessHomeDirectory), | |
| 8189 | expandHomePath(config.binaryPath, yield* HostProcess.HomeDirectory), | |
| 8190 | 8190 | claudeEnvironment, |
| 8191 | 8191 | ); |
| 8192 | 8192 | return yield* makeClaudeAdapterV2({ |
| ... | ... | @@ -8231,7 +8231,7 @@ const makeDefaultClaudeAdapterV2 = Effect.fn("ClaudeAdapterV2.layer")(function* |
| 8231 | 8231 | const fileSystem = yield* FileSystem.FileSystem; |
| 8232 | 8232 | const path = yield* Path.Path; |
| 8233 | 8233 | const crypto = yield* Crypto.Crypto; |
| 8234 | const hostEnvironment = yield* HostProcessEnvironment; | |
| 8234 | const hostEnvironment = yield* HostProcess.Environment; | |
| 8235 | 8235 | const idAllocator = yield* IdAllocator.IdAllocatorV2; |
| 8236 | 8236 | const queryRunner = yield* ClaudeAgentSdkQueryRunner; |
| 8237 | 8237 | const serverConfig = yield* ServerConfig.ServerConfig; |
apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.test.ts+6-6
| ... | ... | @@ -29,7 +29,7 @@ import { |
| 29 | 29 | TurnItemId, |
| 30 | 30 | } from "@t3tools/contracts"; |
| 31 | 31 | import { assert, describe, it } from "@effect/vitest"; |
| 32 | import { HostProcessEnvironment, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 32 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 33 | 33 | import { SpawnExecutableResolution } from "@t3tools/shared/shell"; |
| 34 | 34 | import * as CodexClient from "effect-codex-app-server/client"; |
| 35 | 35 | import * as CodexError from "effect-codex-app-server/errors"; |
| ... | ... | @@ -698,8 +698,8 @@ describe("CodexAdapterV2 process spawning", () => { |
| 698 | 698 | assert.deepEqual(command.options.env, { CUSTOM: "1" }); |
| 699 | 699 | assert.equal(command.options.extendEnv, true); |
| 700 | 700 | }).pipe( |
| 701 | Effect.provideService(HostProcessPlatform, "win32"), | |
| 702 | Effect.provideService(HostProcessEnvironment, { | |
| 701 | Effect.provideService(HostProcess.Platform, "win32"), | |
| 702 | Effect.provideService(HostProcess.Environment, { | |
| 703 | 703 | PATH: "C:\\Windows\\System32", |
| 704 | 704 | HOST_ONLY: "1", |
| 705 | 705 | }), |
| ... | ... | @@ -726,7 +726,7 @@ describe("CodexAdapterV2 process spawning", () => { |
| 726 | 726 | assert.deepEqual(command.args, ["app-server"]); |
| 727 | 727 | assert.equal(command.options.shell, false); |
| 728 | 728 | }).pipe( |
| 729 | Effect.provideService(HostProcessPlatform, "win32"), | |
| 729 | Effect.provideService(HostProcess.Platform, "win32"), | |
| 730 | 730 | Effect.provideService(SpawnExecutableResolution, () => "C:\\bin\\codex.exe"), |
| 731 | 731 | ), |
| 732 | 732 | ); |
| ... | ... | @@ -774,7 +774,7 @@ describe("CodexAdapterV2 process spawning", () => { |
| 774 | 774 | ["app-server", "--strict-config", "-c", "model_reasoning_summary=detailed"], |
| 775 | 775 | ["app-server", "--enable", "env-feature"], |
| 776 | 776 | ]); |
| 777 | }).pipe(Effect.provideService(HostProcessPlatform, "linux")), | |
| 777 | }).pipe(Effect.provideService(HostProcess.Platform, "linux")), | |
| 778 | 778 | ); |
| 779 | 779 | |
| 780 | 780 | it.effect("expands ~ in the configured binary path before spawning", () => |
| ... | ... | @@ -821,7 +821,7 @@ describe("CodexAdapterV2 process spawning", () => { |
| 821 | 821 | Effect.provide( |
| 822 | 822 | Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer), |
| 823 | 823 | ), |
| 824 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 824 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 825 | 825 | ), |
| 826 | 826 | ); |
| 827 | 827 | }); |
apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts+4-4
| ... | ... | @@ -30,7 +30,7 @@ import { |
| 30 | 30 | type ProviderSetupError, |
| 31 | 31 | } from "@t3tools/contracts"; |
| 32 | 32 | import { SKILL_MENTION_PATTERN } from "@t3tools/shared/composerInlineTokens"; |
| 33 | import { HostProcessEnvironment, HostProcessHomeDirectory } from "@t3tools/shared/hostProcess"; | |
| 33 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 34 | 34 | import { dynamicToolTitle } from "@t3tools/shared/toolActivity"; |
| 35 | 35 | import { getModelSelectionStringOptionValue, modelSelectionsEqual } from "@t3tools/shared/model"; |
| 36 | 36 | import { resolveSpawnCommand } from "@t3tools/shared/shell"; |
| ... | ... | @@ -1562,7 +1562,7 @@ export const createCodexAdapterV2 = ( |
| 1562 | 1562 | const continuationRequests = yield* ProviderContinuationRequests.ProviderContinuationRequests; |
| 1563 | 1563 | const crypto = yield* Crypto.Crypto; |
| 1564 | 1564 | const fileSystem = yield* FileSystem.FileSystem; |
| 1565 | const hostEnvironment = yield* HostProcessEnvironment; | |
| 1565 | const hostEnvironment = yield* HostProcess.Environment; | |
| 1566 | 1566 | const idAllocator = yield* IdAllocator.IdAllocatorV2; |
| 1567 | 1567 | const serverConfig = yield* ServerConfig; |
| 1568 | 1568 | const homeLayout = yield* resolveCodexHomeLayout(config); |
| ... | ... | @@ -1582,7 +1582,7 @@ export const createCodexAdapterV2 = ( |
| 1582 | 1582 | const settings = { |
| 1583 | 1583 | ...config, |
| 1584 | 1584 | enabled, |
| 1585 | binaryPath: expandHomePath(config.binaryPath, yield* HostProcessHomeDirectory), | |
| 1585 | binaryPath: expandHomePath(config.binaryPath, yield* HostProcess.HomeDirectory), | |
| 1586 | 1586 | homePath: homeLayout.effectiveHomePath ?? "", |
| 1587 | 1587 | } satisfies CodexSettings; |
| 1588 | 1588 | |
| ... | ... | @@ -1623,7 +1623,7 @@ const layer: Layer.Layer< |
| 1623 | 1623 | const continuationRequests = yield* ProviderContinuationRequests.ProviderContinuationRequests; |
| 1624 | 1624 | const crypto = yield* Crypto.Crypto; |
| 1625 | 1625 | const fileSystem = yield* FileSystem.FileSystem; |
| 1626 | const hostEnvironment = yield* HostProcessEnvironment; | |
| 1626 | const hostEnvironment = yield* HostProcess.Environment; | |
| 1627 | 1627 | const idAllocator = yield* IdAllocator.IdAllocatorV2; |
| 1628 | 1628 | const serverConfig = yield* ServerConfig; |
| 1629 | 1629 |
apps/server/src/orchestration-v2/Adapters/CursorAdapterV2.testkit.ts+2-2
| ... | ... | @@ -1,4 +1,4 @@ |
| 1 | import { HostProcessEnvironment } from "@t3tools/shared/hostProcess"; | |
| 1 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 2 | 2 | import type { InteractionUpdate, RunResult } from "@cursor/sdk"; |
| 3 | 3 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 4 | 4 | import { |
| ... | ... | @@ -519,7 +519,7 @@ export function layer( |
| 519 | 519 | // Skill discovery also scans user roots under HOME; an empty HOME keeps |
| 520 | 520 | // replays from picking up the host's own skills. |
| 521 | 521 | const layerHostEnvironment = Layer.effect( |
| 522 | HostProcessEnvironment, | |
| 522 | HostProcess.Environment, | |
| 523 | 523 | Effect.gen(function* () { |
| 524 | 524 | const fs = yield* FileSystem.FileSystem; |
| 525 | 525 | const home = yield* fs.makeTempDirectoryScoped({ prefix: "t3-cursor-replay-home-" }); |
apps/server/src/orchestration-v2/Adapters/GrokAdapterV2.test.ts+2-2
| ... | ... | @@ -7,7 +7,7 @@ import { |
| 7 | 7 | ThreadId, |
| 8 | 8 | } from "@t3tools/contracts"; |
| 9 | 9 | import { GrokSettings } from "@t3tools/provider-grok/settings"; |
| 10 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 10 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 11 | 11 | import { resolveSelfInvocation } from "@t3tools/shared/nodeRuntime"; |
| 12 | 12 | import * as EffectAcpErrors from "effect-acp/errors"; |
| 13 | 13 | import { xAiRateLimitedErrorCode } from "@t3tools/provider-grok/testing"; |
| ... | ... | @@ -364,7 +364,7 @@ describe("Grok launch permission mode", () => { |
| 364 | 364 | return launches; |
| 365 | 365 | }).pipe( |
| 366 | 366 | // Keep the launch argv unwrapped by the Linux cgroup shim. |
| 367 | Effect.provideService(HostProcessPlatform, "darwin"), | |
| 367 | Effect.provideService(HostProcess.Platform, "darwin"), | |
| 368 | 368 | Effect.provide(layerTest), |
| 369 | 369 | ); |
| 370 | 370 |
apps/server/src/orchestration-v2/Adapters/GrokAdapterV2.testkit.ts+2-2
| ... | ... | @@ -6,7 +6,7 @@ import * as Layer from "effect/Layer"; |
| 6 | 6 | import * as Path from "effect/Path"; |
| 7 | 7 | import * as Schema from "effect/Schema"; |
| 8 | 8 | import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner"; |
| 9 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 9 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 10 | 10 | import { resolveSelfInvocation } from "@t3tools/shared/nodeRuntime"; |
| 11 | 11 | |
| 12 | 12 | import * as TestProviderHost from "@t3tools/provider-testing/TestProviderHost"; |
| ... | ... | @@ -43,7 +43,7 @@ function layerGrokProviderAdapterRegistryReplay( |
| 43 | 43 | const fileSystem = yield* FileSystem.FileSystem; |
| 44 | 44 | const path = yield* Path.Path; |
| 45 | 45 | const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner; |
| 46 | const hostPlatform = yield* HostProcessPlatform; | |
| 46 | const hostPlatform = yield* HostProcess.Platform; | |
| 47 | 47 | // Same queue the continuation worker drains when the fixture runs it. |
| 48 | 48 | const continuationRequests = yield* ProviderContinuationRequests.ProviderContinuationRequests; |
| 49 | 49 | const replayGate = options.replayGate; |
apps/server/src/orchestration-v2/workflowScriptQuery.ts+2-2
| ... | ... | @@ -18,7 +18,7 @@ import * as NodePath from "node:path"; |
| 18 | 18 | |
| 19 | 19 | import { OrchestrationGetWorkflowScriptError } from "@t3tools/contracts"; |
| 20 | 20 | import * as Effect from "effect/Effect"; |
| 21 | import { HostProcessHomeDirectory } from "@t3tools/shared/hostProcess"; | |
| 21 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 22 | 22 | |
| 23 | 23 | const SCRIPT_BYTE_CAP = 256 * 1024; |
| 24 | 24 | |
| ... | ... | @@ -38,7 +38,7 @@ export const readWorkflowScript = Effect.fn("orchestration.readWorkflowScript")( |
| 38 | 38 | }); |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | const home = yield* HostProcessHomeDirectory; | |
| 41 | const home = yield* HostProcess.HomeDirectory; | |
| 42 | 42 | const root = yield* Effect.tryPromise({ |
| 43 | 43 | try: () => NodeFSP.realpath(scriptsRoot(home)), |
| 44 | 44 | catch: (cause) => |
apps/server/src/os-jank.ts+5-9
| ... | ... | @@ -1,8 +1,4 @@ |
| 1 | import { | |
| 2 | HostProcessEnvironment, | |
| 3 | HostProcessHomeDirectory, | |
| 4 | HostProcessPlatform, | |
| 5 | } from "@t3tools/shared/hostProcess"; | |
| 1 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 6 | 2 | import { |
| 7 | 3 | listLoginShellCandidates, |
| 8 | 4 | mergePathEntries, |
| ... | ... | @@ -57,8 +53,8 @@ export const fixPath = Effect.fn("fixPath")(function* (): Effect.fn.Return< |
| 57 | 53 | never, |
| 58 | 54 | FileSystem.FileSystem | Path.Path |
| 59 | 55 | > { |
| 60 | const platform = yield* HostProcessPlatform; | |
| 61 | const env = yield* HostProcessEnvironment; | |
| 56 | const platform = yield* HostProcess.Platform; | |
| 57 | const env = yield* HostProcess.Environment; | |
| 62 | 58 | |
| 63 | 59 | if (platform === "win32") { |
| 64 | 60 | const repairedEnvironment = yield* resolveWindowsEnvironment(env).pipe( |
| ... | ... | @@ -97,7 +93,7 @@ export const fixPath = Effect.fn("fixPath")(function* (): Effect.fn.Return< |
| 97 | 93 | |
| 98 | 94 | export const expandHomePath = Effect.fn(function* (input: string) { |
| 99 | 95 | const { join } = yield* Path.Path; |
| 100 | const home = yield* HostProcessHomeDirectory; | |
| 96 | const home = yield* HostProcess.HomeDirectory; | |
| 101 | 97 | if (input === "~") { |
| 102 | 98 | return home; |
| 103 | 99 | } |
| ... | ... | @@ -110,7 +106,7 @@ export const expandHomePath = Effect.fn(function* (input: string) { |
| 110 | 106 | export const resolveBaseDir = Effect.fn(function* (raw: string | undefined) { |
| 111 | 107 | const { join, resolve } = yield* Path.Path; |
| 112 | 108 | if (!raw || raw.trim().length === 0) { |
| 113 | return join(yield* HostProcessHomeDirectory, ".t3"); | |
| 109 | return join(yield* HostProcess.HomeDirectory, ".t3"); | |
| 114 | 110 | } |
| 115 | 111 | return resolve(yield* expandHomePath(raw.trim())); |
| 116 | 112 | }); |
apps/server/src/preview/PortScanner.test.ts+4-4
| ... | ... | @@ -6,7 +6,7 @@ import { |
| 6 | 6 | PREVIEW_URL_MAX_LENGTH, |
| 7 | 7 | type DiscoveredLocalServer, |
| 8 | 8 | } from "@t3tools/contracts"; |
| 9 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 9 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 10 | 10 | import * as Net from "@t3tools/shared/Net"; |
| 11 | 11 | import * as Cause from "effect/Cause"; |
| 12 | 12 | import * as Clock from "effect/Clock"; |
| ... | ... | @@ -74,7 +74,7 @@ const layerProbeFailure = ( |
| 74 | 74 | reserveLoopbackPort: () => Effect.succeed(40_000), |
| 75 | 75 | findAvailablePort: (preferred) => Effect.succeed(preferred), |
| 76 | 76 | }), |
| 77 | Layer.succeed(HostProcessPlatform, "linux"), | |
| 77 | Layer.succeed(HostProcess.Platform, "linux"), | |
| 78 | 78 | FetchHttpClient.layer.pipe(Layer.provide(Layer.succeed(FetchHttpClient.Fetch, fetch))), |
| 79 | 79 | ), |
| 80 | 80 | ), |
| ... | ... | @@ -86,7 +86,7 @@ const layerTestPortDiscovery = PortScanner.layer.pipe( |
| 86 | 86 | layerNoProc, |
| 87 | 87 | layerTestProcessRunner, |
| 88 | 88 | layerTestIntegrationNet, |
| 89 | Layer.succeed(HostProcessPlatform, "win32"), | |
| 89 | Layer.succeed(HostProcess.Platform, "win32"), | |
| 90 | 90 | FetchHttpClient.layer, |
| 91 | 91 | ), |
| 92 | 92 | ), |
| ... | ... | @@ -122,7 +122,7 @@ const layerLsofScanner = (input: { |
| 122 | 122 | reserveLoopbackPort: () => Effect.succeed(40_000), |
| 123 | 123 | findAvailablePort: (preferred) => Effect.succeed(preferred), |
| 124 | 124 | }), |
| 125 | Layer.succeed(HostProcessPlatform, "linux"), | |
| 125 | Layer.succeed(HostProcess.Platform, "linux"), | |
| 126 | 126 | FetchHttpClient.layer.pipe( |
| 127 | 127 | Layer.provide(Layer.succeed(FetchHttpClient.Fetch, input.fetch)), |
| 128 | 128 | ), |
apps/server/src/preview/PortScanner.ts+2-2
| ... | ... | @@ -25,7 +25,7 @@ import { |
| 25 | 25 | ThreadId, |
| 26 | 26 | type DiscoveredLocalServer, |
| 27 | 27 | } from "@t3tools/contracts"; |
| 28 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 28 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 29 | 29 | import * as Net from "@t3tools/shared/Net"; |
| 30 | 30 | import { isLoopbackHost, LSOF_LOCAL_HOST_TOKENS } from "@t3tools/shared/preview"; |
| 31 | 31 | import * as Cause from "effect/Cause"; |
| ... | ... | @@ -342,7 +342,7 @@ export const make = Effect.gen(function* PortDiscoveryMake() { |
| 342 | 342 | const net = yield* Net.NetService; |
| 343 | 343 | const processRunner = yield* ProcessRunner.ProcessRunner; |
| 344 | 344 | const fileSystem = yield* FileSystem.FileSystem; |
| 345 | const hostPlatform = yield* HostProcessPlatform; | |
| 345 | const hostPlatform = yield* HostProcess.Platform; | |
| 346 | 346 | const httpClient = (yield* HttpClient.HttpClient).pipe(HttpClient.withScope); |
| 347 | 347 | const stateRef = yield* Ref.make<ScannerState>({ |
| 348 | 348 | listeners: new Map(), |
apps/server/src/preview/PreviewBrowser.test.ts+4-4
| ... | ... | @@ -1,6 +1,6 @@ |
| 1 | 1 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 2 | 2 | import { expect, it } from "@effect/vitest"; |
| 3 | import { HostProcessArchitecture, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 3 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 4 | 4 | import * as Deferred from "effect/Deferred"; |
| 5 | 5 | import * as Crypto from "effect/Crypto"; |
| 6 | 6 | import type * as Duration from "effect/Duration"; |
| ... | ... | @@ -20,7 +20,7 @@ import * as PreviewBrowser from "./PreviewBrowser.ts"; |
| 20 | 20 | |
| 21 | 21 | // POSIX modes cannot be checked on NTFS, so follow the host like the Antigravity suite. |
| 22 | 22 | const hostPlatform: NodeJS.Platform = |
| 23 | HostProcessPlatform.defaultValue() === "win32" ? "win32" : "linux"; | |
| 23 | HostProcess.Platform.defaultValue() === "win32" ? "win32" : "linux"; | |
| 24 | 24 | const executableName = |
| 25 | 25 | hostPlatform === "win32" ? "chrome-headless-shell.exe" : "chrome-headless-shell"; |
| 26 | 26 | const ROOT = "chrome-headless-shell-fixture/"; |
| ... | ... | @@ -105,8 +105,8 @@ const makeHarness = Effect.fn("test.makePreviewBrowser")(function* ( |
| 105 | 105 | }, |
| 106 | 106 | ...(options.wait === undefined ? {} : { wait: options.wait }), |
| 107 | 107 | }).pipe( |
| 108 | Effect.provideService(HostProcessPlatform, hostPlatform), | |
| 109 | Effect.provideService(HostProcessArchitecture, "x64"), | |
| 108 | Effect.provideService(HostProcess.Platform, hostPlatform), | |
| 109 | Effect.provideService(HostProcess.Architecture, "x64"), | |
| 110 | 110 | Effect.provideService( |
| 111 | 111 | HttpClient.HttpClient, |
| 112 | 112 | HttpClient.make((request) => |
apps/server/src/preview/PreviewBrowser.ts+3-3
| ... | ... | @@ -1,6 +1,6 @@ |
| 1 | 1 | // @effect-diagnostics nodeBuiltinImport:off - Effect has no incremental digest. |
| 2 | 2 | import * as EffectNodeStream from "@effect/platform-node/NodeStream"; |
| 3 | import { HostProcessArchitecture, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 3 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 4 | 4 | import * as Cause from "effect/Cause"; |
| 5 | 5 | import * as Clock from "effect/Clock"; |
| 6 | 6 | import * as Context from "effect/Context"; |
| ... | ... | @@ -175,8 +175,8 @@ export const makePreviewBrowser = Effect.fn("PreviewBrowser.make")(function* ( |
| 175 | 175 | const http = yield* HttpClient.HttpClient; |
| 176 | 176 | // Installs belong to the service, so they finish even when no caller is still waiting. |
| 177 | 177 | const serviceScope = yield* Effect.scope; |
| 178 | const platform = yield* HostProcessPlatform; | |
| 179 | const arch = yield* HostProcessArchitecture; | |
| 178 | const platform = yield* HostProcess.Platform; | |
| 179 | const arch = yield* HostProcess.Architecture; | |
| 180 | 180 | const release = |
| 181 | 181 | options.release === undefined ? previewBrowserRelease(platform, arch) : options.release; |
| 182 | 182 | const wait = options.wait ?? "45 seconds"; |
apps/server/src/preview/PreviewBrowserHost.test.ts+2-2
| ... | ... | @@ -1,5 +1,5 @@ |
| 1 | 1 | import { describe, expect, it } from "@effect/vitest"; |
| 2 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 2 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 3 | 3 | import * as Effect from "effect/Effect"; |
| 4 | 4 | import * as Sink from "effect/Sink"; |
| 5 | 5 | import * as Stream from "effect/Stream"; |
| ... | ... | @@ -67,7 +67,7 @@ const diagnose = (input: { |
| 67 | 67 | setupCommand: "sudo t3 browser setup", |
| 68 | 68 | }).pipe( |
| 69 | 69 | Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner), |
| 70 | Effect.provideService(HostProcessPlatform, input.platform), | |
| 70 | Effect.provideService(HostProcess.Platform, input.platform), | |
| 71 | 71 | Effect.map((error) => ({ error, commands })), |
| 72 | 72 | ); |
| 73 | 73 | }; |
apps/server/src/preview/PreviewBrowserHost.ts+3-3
| ... | ... | @@ -7,7 +7,7 @@ |
| 7 | 7 | * gets the command instead, and only the operator's explicit |
| 8 | 8 | * `T3CODE_SERVER_BROWSER_SANDBOX=0` launches without it. |
| 9 | 9 | */ |
| 10 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 10 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 11 | 11 | import * as Effect from "effect/Effect"; |
| 12 | 12 | import * as FileSystem from "effect/FileSystem"; |
| 13 | 13 | import * as Schema from "effect/Schema"; |
| ... | ... | @@ -108,7 +108,7 @@ export const diagnoseLaunchFailure = Effect.fn("PreviewBrowserHost.diagnoseLaunc |
| 108 | 108 | if (input.output.includes(NO_SANDBOX_SIGNATURE)) { |
| 109 | 109 | return new PreviewBrowserSandboxError({ setupCommand }); |
| 110 | 110 | } |
| 111 | if ((yield* HostProcessPlatform) !== "linux") return undefined; | |
| 111 | if ((yield* HostProcess.Platform) !== "linux") return undefined; | |
| 112 | 112 | const libraries = yield* missingLibraries(input.executable); |
| 113 | 113 | return libraries.length === 0 |
| 114 | 114 | ? undefined |
| ... | ... | @@ -147,7 +147,7 @@ export const missingLibraries = Effect.fn("PreviewBrowserHost.missingLibraries") |
| 147 | 147 | * root, so the server checks it at startup. |
| 148 | 148 | */ |
| 149 | 149 | export const sandboxBlocked = Effect.gen(function* () { |
| 150 | if ((yield* HostProcessPlatform) !== "linux") return false; | |
| 150 | if ((yield* HostProcess.Platform) !== "linux") return false; | |
| 151 | 151 | const fs = yield* FileSystem.FileSystem; |
| 152 | 152 | const restricted = yield* fs.readFileString(USERNS_RESTRICTION).pipe( |
| 153 | 153 | Effect.map((value) => value.trim() === "1"), |
apps/server/src/preview/ServerBrowser.ts+3-7
| ... | ... | @@ -42,11 +42,7 @@ import { |
| 42 | 42 | SERVER_BROWSER_AUTOMATION_CLIENT_ID, |
| 43 | 43 | type PreviewAppearancePreference, |
| 44 | 44 | } from "@t3tools/contracts"; |
| 45 | import { | |
| 46 | HostProcessArchitecture, | |
| 47 | HostProcessEnvironment, | |
| 48 | HostProcessPlatform, | |
| 49 | } from "@t3tools/shared/hostProcess"; | |
| 45 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 50 | 46 | import { normalizePreviewUrl } from "@t3tools/shared/preview"; |
| 51 | 47 | import { resolvePreviewViewport } from "@t3tools/shared/previewViewport"; |
| 52 | 48 | import * as NodeCrypto from "node:crypto"; |
| ... | ... | @@ -476,7 +472,7 @@ const CLIPBOARD_SCRIPT = `(() => { |
| 476 | 472 | |
| 477 | 473 | const make = Effect.gen(function* () { |
| 478 | 474 | const config = yield* ServerConfig.ServerConfig; |
| 479 | const host = { platform: yield* HostProcessPlatform, arch: yield* HostProcessArchitecture }; | |
| 475 | const host = { platform: yield* HostProcess.Platform, arch: yield* HostProcess.Architecture }; | |
| 480 | 476 | const manager = yield* PreviewManager.PreviewManager; |
| 481 | 477 | const broker = yield* PreviewAutomationBroker.PreviewAutomationBroker; |
| 482 | 478 | const environment = yield* ServerEnvironment.ServerEnvironment; |
| ... | ... | @@ -2367,7 +2363,7 @@ const make = Effect.gen(function* () { |
| 2367 | 2363 | yield* manager.events.pipe(Stream.runForEach(mirrorManagerEvent), Effect.forkScoped); |
| 2368 | 2364 | // Whoever runs the server learns the fix before anyone opens a tab. |
| 2369 | 2365 | if ( |
| 2370 | !PreviewBrowserHost.sandboxDisabled(yield* HostProcessEnvironment) && | |
| 2366 | !PreviewBrowserHost.sandboxDisabled(yield* HostProcess.Environment) && | |
| 2371 | 2367 | (yield* PreviewBrowserHost.sandboxBlocked) |
| 2372 | 2368 | ) { |
| 2373 | 2369 | yield* Effect.logWarning( |
apps/server/src/process/externalLauncher.test.ts+5-5
| ... | ... | @@ -17,7 +17,7 @@ import * as Stream from "effect/Stream"; |
| 17 | 17 | import * as TestClock from "effect/testing/TestClock"; |
| 18 | 18 | import { ChildProcess, ChildProcessSpawner } from "effect/process"; |
| 19 | 19 | |
| 20 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 20 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 21 | 21 | import { SpawnExecutableResolution } from "@t3tools/shared/shell"; |
| 22 | 22 | import * as ExternalLauncher from "./externalLauncher.ts"; |
| 23 | 23 | |
| ... | ... | @@ -25,7 +25,7 @@ import * as ExternalLauncher from "./externalLauncher.ts"; |
| 25 | 25 | // directory to a posix-mocked resolver as PATH. On a Windows host the temp |
| 26 | 26 | // path carries a drive letter, so the posix `:` split shatters it; there is |
| 27 | 27 | // no posix executable to find there anyway. |
| 28 | const windowsHost = HostProcessPlatform.defaultValue() === "win32"; | |
| 28 | const windowsHost = HostProcess.Platform.defaultValue() === "win32"; | |
| 29 | 29 | |
| 30 | 30 | interface MockSpawnResult { |
| 31 | 31 | readonly exitCode?: number; |
| ... | ... | @@ -85,7 +85,7 @@ const layerTest = (input: { |
| 85 | 85 | |
| 86 | 86 | return Layer.mergeAll( |
| 87 | 87 | ExternalLauncher.layer.pipe(Layer.provide(Layer.merge(NodeServices.layer, layerSpawner))), |
| 88 | Layer.succeed(HostProcessPlatform, input.platform), | |
| 88 | Layer.succeed(HostProcess.Platform, input.platform), | |
| 89 | 89 | Layer.succeed( |
| 90 | 90 | SpawnExecutableResolution, |
| 91 | 91 | (command) => input.resolveExecutable?.(command) ?? command, |
| ... | ... | @@ -1302,7 +1302,7 @@ it.effect("memoizes editor discovery and refreshes after the cache window", () = |
| 1302 | 1302 | Effect.provide( |
| 1303 | 1303 | Layer.mergeAll( |
| 1304 | 1304 | layerLauncher, |
| 1305 | Layer.succeed(HostProcessPlatform, "win32"), | |
| 1305 | Layer.succeed(HostProcess.Platform, "win32"), | |
| 1306 | 1306 | ConfigProvider.layer( |
| 1307 | 1307 | ConfigProvider.fromEnv({ |
| 1308 | 1308 | env: { |
| ... | ... | @@ -1367,7 +1367,7 @@ it.effect("keeps scanning after the caller is interrupted and shares that scan", |
| 1367 | 1367 | Effect.provide( |
| 1368 | 1368 | Layer.mergeAll( |
| 1369 | 1369 | layerLauncher, |
| 1370 | Layer.succeed(HostProcessPlatform, "win32"), | |
| 1370 | Layer.succeed(HostProcess.Platform, "win32"), | |
| 1371 | 1371 | ConfigProvider.layer( |
| 1372 | 1372 | ConfigProvider.fromEnv({ |
| 1373 | 1373 | env: { |
apps/server/src/process/externalLauncher.ts+5-5
| ... | ... | @@ -19,7 +19,7 @@ import { |
| 19 | 19 | type LaunchEditorInput, |
| 20 | 20 | } from "@t3tools/contracts"; |
| 21 | 21 | import { resolveEditorCommand } from "@t3tools/shared/editor"; |
| 22 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 22 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 23 | 23 | import { |
| 24 | 24 | isCommandAvailable, |
| 25 | 25 | resolveSpawnCommand, |
| ... | ... | @@ -441,20 +441,20 @@ const buildAvailableEditors = Effect.fn("externalLauncher.buildAvailableEditors" |
| 441 | 441 | const resolveBrowserLaunch = Effect.fn("externalLauncher.resolveBrowserLaunch")(function* ( |
| 442 | 442 | target: string, |
| 443 | 443 | ) { |
| 444 | const platform = yield* HostProcessPlatform; | |
| 444 | const platform = yield* HostProcess.Platform; | |
| 445 | 445 | const env = yield* readBrowserLaunchEnv; |
| 446 | 446 | return buildBrowserLaunch(target, platform, env); |
| 447 | 447 | }); |
| 448 | 448 | |
| 449 | 449 | const resolveAvailableEditors = Effect.fn("externalLauncher.resolveAvailableEditors")(function* () { |
| 450 | const platform = yield* HostProcessPlatform; | |
| 450 | const platform = yield* HostProcess.Platform; | |
| 451 | 451 | const env = { ...(yield* readBrowserLaunchEnv), ...(yield* readCommandLookupEnv) }; |
| 452 | 452 | return yield* buildAvailableEditors(platform, env).pipe(withPathDirectoryListings); |
| 453 | 453 | }); |
| 454 | 454 | |
| 455 | 455 | const resolveFileManagerRevealKind = Effect.fn("externalLauncher.resolveFileManagerRevealKind")( |
| 456 | 456 | function* () { |
| 457 | const platform = yield* HostProcessPlatform; | |
| 457 | const platform = yield* HostProcess.Platform; | |
| 458 | 458 | const env = { ...(yield* readBrowserLaunchEnv), ...(yield* readCommandLookupEnv) }; |
| 459 | 459 | return yield* fileManagerRevealKindForPlatform(platform, env); |
| 460 | 460 | }, |
| ... | ... | @@ -519,7 +519,7 @@ const resolveEditorLaunch = Effect.fn("resolveEditorLaunch")(function* ( |
| 519 | 519 | ExternalLauncherError, |
| 520 | 520 | FileSystem.FileSystem | Path.Path | ChildProcessSpawner.ChildProcessSpawner |
| 521 | 521 | > { |
| 522 | const platform = yield* HostProcessPlatform; | |
| 522 | const platform = yield* HostProcess.Platform; | |
| 523 | 523 | const env = { ...(yield* readBrowserLaunchEnv), ...(yield* readCommandLookupEnv) }; |
| 524 | 524 | yield* Effect.annotateCurrentSpan({ |
| 525 | 525 | "externalLauncher.editor": input.editor, |
apps/server/src/processRunner.test.ts+4-4
| ... | ... | @@ -9,7 +9,7 @@ import * as Sink from "effect/Sink"; |
| 9 | 9 | import * as Stream from "effect/Stream"; |
| 10 | 10 | import { TestClock } from "effect/testing"; |
| 11 | 11 | import { ChildProcessSpawner } from "effect/process"; |
| 12 | import { HostProcessEnvironment, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 12 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 13 | 13 | import { SpawnExecutableResolution } from "@t3tools/shared/shell"; |
| 14 | 14 | |
| 15 | 15 | import * as ProcessRunner from "./processRunner.ts"; |
| ... | ... | @@ -145,8 +145,8 @@ describe("runProcess", () => { |
| 145 | 145 | args: ["repos", "pr", "list", "--source-branch", "feature & release"], |
| 146 | 146 | env: { AZURE_CONFIG_DIR: "C:\\Users\\tester\\.azure" }, |
| 147 | 147 | }).pipe( |
| 148 | Effect.provideService(HostProcessPlatform, "win32"), | |
| 149 | Effect.provideService(HostProcessEnvironment, { | |
| 148 | Effect.provideService(HostProcess.Platform, "win32"), | |
| 149 | Effect.provideService(HostProcess.Environment, { | |
| 150 | 150 | PATH: "C:\\Users\\tester\\AppData\\Roaming\\npm", |
| 151 | 151 | PATHEXT: ".COM;.EXE;.BAT;.CMD", |
| 152 | 152 | }), |
| ... | ... | @@ -407,7 +407,7 @@ describe("isWindowsCommandNotFound", () => { |
| 407 | 407 | const isCommandNotFound = yield* ProcessRunner.isWindowsCommandNotFound( |
| 408 | 408 | 1, |
| 409 | 409 | "wird nicht als interner oder externer Befehl, betriebsfahiges Programm oder Batch-Datei erkannt", |
| 410 | ).pipe(Effect.provideService(HostProcessPlatform, "win32")); | |
| 410 | ).pipe(Effect.provideService(HostProcess.Platform, "win32")); | |
| 411 | 411 | expect(isCommandNotFound).toBe(true); |
| 412 | 412 | }), |
| 413 | 413 | ); |
apps/server/src/project/AgentSessionScanner.ts+4-8
| ... | ... | @@ -44,11 +44,7 @@ import { |
| 44 | 44 | parseGitHubRepositoryNameWithOwnerFromRemoteUrl, |
| 45 | 45 | parseOriginUrlFromGitConfig, |
| 46 | 46 | } from "@t3tools/shared/git"; |
| 47 | import { | |
| 48 | HostProcessEnvironment, | |
| 49 | HostProcessHomeDirectory, | |
| 50 | HostProcessPlatform, | |
| 51 | } from "@t3tools/shared/hostProcess"; | |
| 47 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 52 | 48 | import { normalizeProjectPathForComparison } from "@t3tools/shared/path"; |
| 53 | 49 | |
| 54 | 50 | import * as ServerConfig from "../config.ts"; |
| ... | ... | @@ -633,9 +629,9 @@ export const make = Effect.gen(function* () { |
| 633 | 629 | const worktreesDir = path.resolve(serverConfig.worktreesDir); |
| 634 | 630 | // Windows filesystems are case-insensitive, so path prefix checks there |
| 635 | 631 | // must case fold. |
| 636 | const foldWorktreeCase = (yield* HostProcessPlatform) === "win32"; | |
| 637 | const hostEnvironment = yield* HostProcessEnvironment; | |
| 638 | const homeDir = yield* HostProcessHomeDirectory; | |
| 632 | const foldWorktreeCase = (yield* HostProcess.Platform) === "win32"; | |
| 633 | const hostEnvironment = yield* HostProcess.Environment; | |
| 634 | const homeDir = yield* HostProcess.HomeDirectory; | |
| 639 | 635 | // `/private/tmp` is what macOS reports for sessions started in `/tmp`. |
| 640 | 636 | const excludedProjectRoots = new Set( |
| 641 | 637 | [homeDir, NodeOS.tmpdir(), "/tmp", "/private/tmp"].map((directory) => |
apps/server/src/project/ProjectSetupScriptRunner.ts+3-3
| ... | ... | @@ -1,5 +1,5 @@ |
| 1 | 1 | import { ProjectId, type ProjectScript } from "@t3tools/contracts"; |
| 2 | import { HostProcessEnvironment, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 2 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 3 | 3 | import { |
| 4 | 4 | projectScriptRuntimeEnv, |
| 5 | 5 | resolveProjectScripts, |
| ... | ... | @@ -206,8 +206,8 @@ export const make = Effect.gen(function* () { |
| 206 | 206 | const serverSettings = yield* ServerSettings.ServerSettingsService; |
| 207 | 207 | const crypto = yield* Crypto.Crypto; |
| 208 | 208 | const completionShell = resolveCompletionShell( |
| 209 | yield* HostProcessPlatform, | |
| 210 | yield* HostProcessEnvironment, | |
| 209 | yield* HostProcess.Platform, | |
| 210 | yield* HostProcess.Environment, | |
| 211 | 211 | ); |
| 212 | 212 | |
| 213 | 213 | /** |
apps/server/src/provider/AntigravityInstallation.test.ts+7-12
| ... | ... | @@ -1,11 +1,6 @@ |
| 1 | 1 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 2 | 2 | import { expect, it } from "@effect/vitest"; |
| 3 | import { | |
| 4 | HostProcessArchitecture, | |
| 5 | HostProcessEnvironment, | |
| 6 | HostProcessIsExecutable, | |
| 7 | HostProcessPlatform, | |
| 8 | } from "@t3tools/shared/hostProcess"; | |
| 3 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 9 | 4 | import * as Crypto from "effect/Crypto"; |
| 10 | 5 | import * as Deferred from "effect/Deferred"; |
| 11 | 6 | import * as Effect from "effect/Effect"; |
| ... | ... | @@ -62,7 +57,7 @@ const zipFixtures = { |
| 62 | 57 | // the host and let the fixture names follow; the suite is about install |
| 63 | 58 | // mechanics, which are the same on every platform. |
| 64 | 59 | const hostPlatform: NodeJS.Platform = |
| 65 | HostProcessPlatform.defaultValue() === "win32" ? "win32" : "linux"; | |
| 60 | HostProcess.Platform.defaultValue() === "win32" ? "win32" : "linux"; | |
| 66 | 61 | const completeArchive = Buffer.from( |
| 67 | 62 | hostPlatform === "win32" ? zipFixtures.windows : zipFixtures.complete, |
| 68 | 63 | "base64", |
| ... | ... | @@ -189,9 +184,9 @@ const makeHarness = Effect.fn("test.makeAntigravityInstallation")(function* ( |
| 189 | 184 | }), |
| 190 | 185 | }).pipe( |
| 191 | 186 | Effect.provideService(FileSystem.FileSystem, trackedFs), |
| 192 | Effect.provideService(HostProcessPlatform, platform), | |
| 193 | Effect.provideService(HostProcessArchitecture, "x64"), | |
| 194 | Effect.provideService(HostProcessEnvironment, { PATH: options.path ?? "" }), | |
| 187 | Effect.provideService(HostProcess.Platform, platform), | |
| 188 | Effect.provideService(HostProcess.Architecture, "x64"), | |
| 189 | Effect.provideService(HostProcess.Environment, { PATH: options.path ?? "" }), | |
| 195 | 190 | Effect.provideService( |
| 196 | 191 | HttpClient.HttpClient, |
| 197 | 192 | HttpClient.make((request) => |
| ... | ... | @@ -259,7 +254,7 @@ it.layer(NodeServices.layer)("Antigravity installation", (it) => { |
| 259 | 254 | }); |
| 260 | 255 | expect(requests).toEqual([]); |
| 261 | 256 | expect(validations).toEqual([]); |
| 262 | }).pipe(Effect.provideService(HostProcessIsExecutable, true)), | |
| 257 | }).pipe(Effect.provideService(HostProcess.IsExecutable, true)), | |
| 263 | 258 | ); |
| 264 | 259 | |
| 265 | 260 | it.effect("verifies both files before activating a streamed download", () => |
| ... | ... | @@ -734,7 +729,7 @@ it.layer(NodeServices.layer)("Antigravity installation", (it) => { |
| 734 | 729 | |
| 735 | 730 | // Real posix executables in a real temp dir, resolved by a linux-mocked |
| 736 | 731 | // PATH walk; a Windows temp path cannot be split on `:`. |
| 737 | it.effect.skipIf(HostProcessPlatform.defaultValue() === "win32")( | |
| 732 | it.effect.skipIf(HostProcess.Platform.defaultValue() === "win32")( | |
| 738 | 733 | "honors explicit paths and reports invalid overrides without falling back", |
| 739 | 734 | () => |
| 740 | 735 | Effect.gen(function* () { |
apps/server/src/provider/AntigravityInstallation.ts+5-9
| ... | ... | @@ -1,11 +1,7 @@ |
| 1 | 1 | // @effect-diagnostics nodeBuiltinImport:off - Effect has no incremental digest or free-space query. |
| 2 | 2 | import * as EffectNodeStream from "@effect/platform-node/NodeStream"; |
| 3 | 3 | import { ProviderDriverKind, type ProviderInstallState } from "@t3tools/contracts"; |
| 4 | import { | |
| 5 | HostProcessArchitecture, | |
| 6 | HostProcessEnvironment, | |
| 7 | HostProcessPlatform, | |
| 8 | } from "@t3tools/shared/hostProcess"; | |
| 4 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 9 | 5 | import { resolveNodeExecutable, nodeRuntimeUnavailableMessage } from "@t3tools/shared/nodeRuntime"; |
| 10 | 6 | import * as Clock from "effect/Clock"; |
| 11 | 7 | import * as Cause from "effect/Cause"; |
| ... | ... | @@ -156,9 +152,9 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma |
| 156 | 152 | const http = yield* HttpClient.HttpClient; |
| 157 | 153 | const spawner = yield* ChildProcessSpawner.ChildProcessSpawner; |
| 158 | 154 | const serviceScope = yield* Effect.scope; |
| 159 | const platform = yield* HostProcessPlatform; | |
| 160 | const arch = yield* HostProcessArchitecture; | |
| 161 | const environment = yield* HostProcessEnvironment; | |
| 155 | const platform = yield* HostProcess.Platform; | |
| 156 | const arch = yield* HostProcess.Architecture; | |
| 157 | const environment = yield* HostProcess.Environment; | |
| 162 | 158 | const releaseAsset = |
| 163 | 159 | options.releaseAsset === undefined |
| 164 | 160 | ? resolveAntigravityReleaseAsset(platform, arch) |
| ... | ... | @@ -410,7 +406,7 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma |
| 410 | 406 | yield* resolveNodeExecutable("Antigravity", environment).pipe( |
| 411 | 407 | Effect.provideService(FileSystem.FileSystem, fs), |
| 412 | 408 | Effect.provideService(Path.Path, path), |
| 413 | Effect.provideService(HostProcessPlatform, platform), | |
| 409 | Effect.provideService(HostProcess.Platform, platform), | |
| 414 | 410 | Effect.mapError((cause) => |
| 415 | 411 | installationError("verify", nodeRuntimeUnavailableMessage("Antigravity"), cause), |
| 416 | 412 | ), |
apps/server/src/provider/CodexInstallation.test.ts+4-8
| ... | ... | @@ -1,11 +1,7 @@ |
| 1 | 1 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 2 | 2 | import * as ModelManifest from "./ModelManifest.ts"; |
| 3 | 3 | import { expect, it } from "@effect/vitest"; |
| 4 | import { | |
| 5 | HostProcessArchitecture, | |
| 6 | HostProcessEnvironment, | |
| 7 | HostProcessPlatform, | |
| 8 | } from "@t3tools/shared/hostProcess"; | |
| 4 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 9 | 5 | import * as Crypto from "effect/Crypto"; |
| 10 | 6 | import * as Deferred from "effect/Deferred"; |
| 11 | 7 | import * as Effect from "effect/Effect"; |
| ... | ... | @@ -66,9 +62,9 @@ const makeHarness = Effect.fn("test.makeCodexInstallation")(function* ( |
| 66 | 62 | forceRefresh: Effect.succeed(ModelManifest.BUNDLED_MODEL_MANIFEST), |
| 67 | 63 | refreshInBackground: Effect.void, |
| 68 | 64 | }), |
| 69 | Effect.provideService(HostProcessPlatform, "darwin"), | |
| 70 | Effect.provideService(HostProcessArchitecture, "arm64"), | |
| 71 | Effect.provideService(HostProcessEnvironment, { PATH: input.local ? localDirectory : "" }), | |
| 65 | Effect.provideService(HostProcess.Platform, "darwin"), | |
| 66 | Effect.provideService(HostProcess.Architecture, "arm64"), | |
| 67 | Effect.provideService(HostProcess.Environment, { PATH: input.local ? localDirectory : "" }), | |
| 72 | 68 | Effect.provideService( |
| 73 | 69 | HttpClient.HttpClient, |
| 74 | 70 | HttpClient.make((request) => |
apps/server/src/provider/CodexInstallation.ts+6-10
| ... | ... | @@ -1,10 +1,6 @@ |
| 1 | 1 | // @effect-diagnostics nodeBuiltinImport:off - Effect has no incremental digest. |
| 2 | 2 | import { ProviderDriverKind, type ProviderInstallState } from "@t3tools/contracts"; |
| 3 | import { | |
| 4 | HostProcessArchitecture, | |
| 5 | HostProcessEnvironment, | |
| 6 | HostProcessPlatform, | |
| 7 | } from "@t3tools/shared/hostProcess"; | |
| 3 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 8 | 4 | import { resolveCommandPath, resolveSpawnCommand } from "@t3tools/shared/shell"; |
| 9 | 5 | import * as Clock from "effect/Clock"; |
| 10 | 6 | import * as Cause from "effect/Cause"; |
| ... | ... | @@ -169,9 +165,9 @@ export const makeCodexInstallation = Effect.fn("makeCodexInstallation")(function |
| 169 | 165 | const http = yield* HttpClient.HttpClient; |
| 170 | 166 | const spawner = yield* ChildProcessSpawner.ChildProcessSpawner; |
| 171 | 167 | const serviceScope = yield* Effect.scope; |
| 172 | const platform = yield* HostProcessPlatform; | |
| 173 | const environment = yield* HostProcessEnvironment; | |
| 174 | const arch = yield* HostProcessArchitecture; | |
| 168 | const platform = yield* HostProcess.Platform; | |
| 169 | const environment = yield* HostProcess.Environment; | |
| 170 | const arch = yield* HostProcess.Architecture; | |
| 175 | 171 | const asset = |
| 176 | 172 | options.releaseAsset === undefined |
| 177 | 173 | ? resolveCodexReleaseAsset(platform, arch) |
| ... | ... | @@ -311,7 +307,7 @@ export const makeCodexInstallation = Effect.fn("makeCodexInstallation")(function |
| 311 | 307 | args: ReadonlyArray<string>, |
| 312 | 308 | ) { |
| 313 | 309 | const resolved = yield* resolveSpawnCommand(command, args).pipe( |
| 314 | Effect.provideService(HostProcessPlatform, platform), | |
| 310 | Effect.provideService(HostProcess.Platform, platform), | |
| 315 | 311 | ); |
| 316 | 312 | const child = yield* spawner.spawn( |
| 317 | 313 | ChildProcess.make(resolved.command, resolved.args, { shell: resolved.shell }), |
| ... | ... | @@ -335,7 +331,7 @@ export const makeCodexInstallation = Effect.fn("makeCodexInstallation")(function |
| 335 | 331 | const resolveLocal = Effect.fn("CodexInstallation.resolveLocal")( |
| 336 | 332 | function* () { |
| 337 | 333 | const executablePath = yield* resolveCommandPath("codex", { env: environment }).pipe( |
| 338 | Effect.provideService(HostProcessPlatform, platform), | |
| 334 | Effect.provideService(HostProcess.Platform, platform), | |
| 339 | 335 | Effect.provideService(FileSystem.FileSystem, fs), |
| 340 | 336 | Effect.provideService(Path.Path, path), |
| 341 | 337 | ); |
apps/server/src/provider/CodexProvider.ts+2-2
| ... | ... | @@ -47,7 +47,7 @@ import { |
| 47 | 47 | type CodexRateLimitSnapshot, |
| 48 | 48 | type CodexResetCreditsSummary, |
| 49 | 49 | } from "./codexUsageLimits.ts"; |
| 50 | import { HostProcessHomeDirectory } from "@t3tools/shared/hostProcess"; | |
| 50 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 51 | 51 | import packageJson from "../../package.json" with { type: "json" }; |
| 52 | 52 | const isCodexAppServerSpawnError = Schema.is(CodexErrors.CodexAppServerSpawnError); |
| 53 | 53 | const RATE_LIMITS_PROBE_TIMEOUT_MS = 3_000; |
| ... | ... | @@ -376,7 +376,7 @@ export const withCodexAppServerClient = Effect.fn("withCodexAppServerClient")(fu |
| 376 | 376 | // "CODEX_HOME points to '~/.codex_work', but that path does not exist". |
| 377 | 377 | // Expand here for parity with `CodexTextGeneration`. |
| 378 | 378 | const resolvedHomePath = input.homePath |
| 379 | ? expandHomePath(input.homePath, yield* HostProcessHomeDirectory) | |
| 379 | ? expandHomePath(input.homePath, yield* HostProcess.HomeDirectory) | |
| 380 | 380 | : undefined; |
| 381 | 381 | const spawner = yield* ChildProcessSpawner.ChildProcessSpawner; |
| 382 | 382 | const environment = { |
apps/server/src/provider/Drivers/AntigravityDriver.test.ts+6-11
| ... | ... | @@ -5,12 +5,7 @@ import { |
| 5 | 5 | ProviderInstanceId, |
| 6 | 6 | type AntigravitySettings, |
| 7 | 7 | } from "@t3tools/contracts"; |
| 8 | import { | |
| 9 | HostProcessEnvironment, | |
| 10 | HostProcessExecutablePath, | |
| 11 | HostProcessIsExecutable, | |
| 12 | HostProcessPlatform, | |
| 13 | } from "@t3tools/shared/hostProcess"; | |
| 8 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 14 | 9 | import * as Effect from "effect/Effect"; |
| 15 | 10 | import * as Deferred from "effect/Deferred"; |
| 16 | 11 | import * as Fiber from "effect/Fiber"; |
| ... | ... | @@ -37,7 +32,7 @@ import { AntigravityDriver } from "./AntigravityDriver.ts"; |
| 37 | 32 | import * as ProviderHostLive from "../ProviderHostLive.ts"; |
| 38 | 33 | import * as ServerSecretStore from "../../auth/ServerSecretStore.ts"; |
| 39 | 34 | |
| 40 | const hostPlatform = HostProcessPlatform.defaultValue(); | |
| 35 | const hostPlatform = HostProcess.Platform.defaultValue(); | |
| 41 | 36 | const windowsHost = hostPlatform === "win32"; |
| 42 | 37 | const decodeRequest = Schema.decodeEffect( |
| 43 | 38 | Schema.fromJsonString( |
| ... | ... | @@ -65,8 +60,8 @@ const makeHarness = Effect.fn("makeAntigravityDriverHarness")(function* ( |
| 65 | 60 | const path = yield* Path.Path; |
| 66 | 61 | const config = yield* ServerConfig.ServerConfig; |
| 67 | 62 | const spawner = yield* ChildProcessSpawner.ChildProcessSpawner; |
| 68 | const nodePath = yield* HostProcessExecutablePath; | |
| 69 | const baseEnv = yield* HostProcessEnvironment; | |
| 63 | const nodePath = yield* HostProcess.ExecutablePath; | |
| 64 | const baseEnv = yield* HostProcess.Environment; | |
| 70 | 65 | const root = yield* fs.makeTempDirectoryScoped({ prefix: "t3-antigravity-driver-" }); |
| 71 | 66 | const instanceId = ProviderInstanceId.make(path.basename(root)); |
| 72 | 67 | const mockAgentPath = yield* path.fromFileUrl( |
| ... | ... | @@ -283,8 +278,8 @@ it.layer(layerTest)("AntigravityDriver", (it) => { |
| 283 | 278 | expect(h.launches).toEqual([]); |
| 284 | 279 | }).pipe( |
| 285 | 280 | Effect.scoped, |
| 286 | Effect.provideService(HostProcessIsExecutable, true), | |
| 287 | Effect.provideService(HostProcessEnvironment, { PATH: "" }), | |
| 281 | Effect.provideService(HostProcess.IsExecutable, true), | |
| 282 | Effect.provideService(HostProcess.Environment, { PATH: "" }), | |
| 288 | 283 | ), |
| 289 | 284 | ); |
| 290 | 285 |
apps/server/src/provider/Drivers/AntigravityDriver.ts+3-3
| ... | ... | @@ -1,7 +1,7 @@ |
| 1 | 1 | import { withAgentDeviceEnvironment } from "@t3tools/provider-core/server/mcpSession"; |
| 2 | 2 | import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSessions"; |
| 3 | 3 | import { AntigravitySettings, ProviderDriverKind, ProviderSetupError } from "@t3tools/contracts"; |
| 4 | import { HostProcessHomeDirectory, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 4 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 5 | 5 | import { resolveSelfInvocation } from "@t3tools/shared/nodeRuntime"; |
| 6 | 6 | import { |
| 7 | 7 | NodeRuntimeUnavailableError, |
| ... | ... | @@ -115,9 +115,9 @@ export const AntigravityDriver: ProviderDriver< |
| 115 | 115 | const authConfigIssue = antigravityAuthConfigIssue(auth); |
| 116 | 116 | const processEnvironment = yield* mergeProviderInstanceEnvironment(environment); |
| 117 | 117 | const userHome = resolveAntigravityUserHome( |
| 118 | yield* HostProcessPlatform, | |
| 118 | yield* HostProcess.Platform, | |
| 119 | 119 | processEnvironment, |
| 120 | yield* HostProcessHomeDirectory, | |
| 120 | yield* HostProcess.HomeDirectory, | |
| 121 | 121 | ); |
| 122 | 122 | const directories = yield* resolveAntigravityInstanceDirectories( |
| 123 | 123 | host.paths.stateDir, |
apps/server/src/provider/Drivers/AntigravityUsage.ts+3-3
| ... | ... | @@ -17,7 +17,7 @@ import type { |
| 17 | 17 | ProviderUsageReader, |
| 18 | 18 | ProviderUsageScan, |
| 19 | 19 | } from "@t3tools/provider-core/server/usage"; |
| 20 | import { HostProcessEnvironment, HostProcessHomeDirectory } from "@t3tools/shared/hostProcess"; | |
| 20 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 21 | 21 | import * as Context from "effect/Context"; |
| 22 | 22 | import * as Crypto from "effect/Crypto"; |
| 23 | 23 | import * as Effect from "effect/Effect"; |
| ... | ... | @@ -44,12 +44,12 @@ const make = Effect.gen(function* () { |
| 44 | 44 | const fileSystem = yield* FileSystem.FileSystem; |
| 45 | 45 | const path = yield* Path.Path; |
| 46 | 46 | const host = yield* ProviderHost.ProviderHost; |
| 47 | const hostEnvironment = yield* HostProcessEnvironment; | |
| 47 | const hostEnvironment = yield* HostProcess.Environment; | |
| 48 | 48 | const cache = makeAntigravityUsageCache(); |
| 49 | 49 | |
| 50 | 50 | /** `ANTIGRAVITY_DATA_DIR` (comma-separated) or the defaults, canonicalized. */ |
| 51 | 51 | const dataRoots = Effect.gen(function* () { |
| 52 | const home = yield* HostProcessHomeDirectory; | |
| 52 | const home = yield* HostProcess.HomeDirectory; | |
| 53 | 53 | const configured = hostEnvironment["ANTIGRAVITY_DATA_DIR"] |
| 54 | 54 | ?.split(",") |
| 55 | 55 | .map((value) => value.trim()) |
apps/server/src/provider/Drivers/ClaudeDriver.ts+2-2
| ... | ... | @@ -71,7 +71,7 @@ import { |
| 71 | 71 | makeClaudeContinuationGroupKey, |
| 72 | 72 | resolveClaudeHomePath, |
| 73 | 73 | } from "./ClaudeHome.ts"; |
| 74 | import { HostProcessHomeDirectory } from "@t3tools/shared/hostProcess"; | |
| 74 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 75 | 75 | const decodeClaudeSettings = Schema.decodeSync(ClaudeSettings); |
| 76 | 76 | |
| 77 | 77 | const DRIVER_KIND = ProviderDriverKind.make("claudeAgent"); |
| ... | ... | @@ -139,7 +139,7 @@ export const ClaudeDriver: ProviderDriver<ClaudeSettings, ClaudeDriverEnv, Path. |
| 139 | 139 | const effectiveConfig = { |
| 140 | 140 | ...config, |
| 141 | 141 | enabled, |
| 142 | binaryPath: expandHomePath(config.binaryPath, yield* HostProcessHomeDirectory), | |
| 142 | binaryPath: expandHomePath(config.binaryPath, yield* HostProcess.HomeDirectory), | |
| 143 | 143 | } satisfies ClaudeSettings; |
| 144 | 144 | const resolveMaintenance = yield* makeCachedProviderMaintenanceResolution( |
| 145 | 145 | resolveProviderMaintenanceCapabilitiesEffect(UPDATE, { |
apps/server/src/provider/Drivers/ClaudeExecutable.test.ts+3-3
| ... | ... | @@ -1,5 +1,5 @@ |
| 1 | 1 | import { describe, expect, it } from "@effect/vitest"; |
| 2 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 2 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 3 | 3 | import { SpawnExecutableResolution } from "@t3tools/shared/shell"; |
| 4 | 4 | import * as Effect from "effect/Effect"; |
| 5 | 5 | |
| ... | ... | @@ -17,7 +17,7 @@ function withWindowsResolution(input: { |
| 17 | 17 | const existing = new Set(input.existingFiles ?? []); |
| 18 | 18 | return <A, E, R>(effect: Effect.Effect<A, E, R>) => |
| 19 | 19 | effect.pipe( |
| 20 | Effect.provideService(HostProcessPlatform, "win32"), | |
| 20 | Effect.provideService(HostProcess.Platform, "win32"), | |
| 21 | 21 | Effect.provideService(SpawnExecutableResolution, () => input.resolvedCommand), |
| 22 | 22 | Effect.provideService(ClaudeExecutableFileCheck, (filePath) => existing.has(filePath)), |
| 23 | 23 | ); |
| ... | ... | @@ -28,7 +28,7 @@ describe("resolveClaudeSdkExecutablePath", () => { |
| 28 | 28 | Effect.gen(function* () { |
| 29 | 29 | expect( |
| 30 | 30 | yield* resolveClaudeSdkExecutablePath("claude", {}).pipe( |
| 31 | Effect.provideService(HostProcessPlatform, "darwin"), | |
| 31 | Effect.provideService(HostProcess.Platform, "darwin"), | |
| 32 | 32 | Effect.provideService(SpawnExecutableResolution, () => { |
| 33 | 33 | throw new Error("must not resolve on non-Windows platforms"); |
| 34 | 34 | }), |
apps/server/src/provider/Drivers/ClaudeExecutable.ts+2-2
| ... | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | import * as NodeFS from "node:fs"; |
| 3 | 3 | import * as NodePath from "node:path"; |
| 4 | 4 | |
| 5 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 5 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 6 | 6 | import { SpawnExecutableResolution } from "@t3tools/shared/shell"; |
| 7 | 7 | import * as Context from "effect/Context"; |
| 8 | 8 | import * as Effect from "effect/Effect"; |
| ... | ... | @@ -67,7 +67,7 @@ export const ClaudeExecutableFileCheck = Context.Reference<ExecutableFileCheck>( |
| 67 | 67 | */ |
| 68 | 68 | export const resolveClaudeSdkExecutablePath = Effect.fn("resolveClaudeSdkExecutablePath")( |
| 69 | 69 | function* (binaryPath: string, environment: NodeJS.ProcessEnv): Effect.fn.Return<string> { |
| 70 | const platform = yield* HostProcessPlatform; | |
| 70 | const platform = yield* HostProcess.Platform; | |
| 71 | 71 | if (platform !== "win32") { |
| 72 | 72 | return binaryPath; |
| 73 | 73 | } |
apps/server/src/provider/Drivers/ClaudeHome.ts+2-2
| ... | ... | @@ -4,7 +4,7 @@ import * as Path from "effect/Path"; |
| 4 | 4 | import * as Schema from "effect/Schema"; |
| 5 | 5 | |
| 6 | 6 | import { expandHomePath } from "@t3tools/provider-core/server/pathExpansion"; |
| 7 | import { HostProcessHomeDirectory } from "@t3tools/shared/hostProcess"; | |
| 7 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 8 | 8 | |
| 9 | 9 | const quotePath = Schema.encodeSync(Schema.fromJsonString(Schema.String)); |
| 10 | 10 | |
| ... | ... | @@ -20,7 +20,7 @@ export const resolveClaudeHomePath = Effect.fn("resolveClaudeHomePath")(function |
| 20 | 20 | environment?: NodeJS.ProcessEnv, |
| 21 | 21 | ): Effect.fn.Return<string, never, Path.Path> { |
| 22 | 22 | const path = yield* Path.Path; |
| 23 | const home = yield* HostProcessHomeDirectory; | |
| 23 | const home = yield* HostProcess.HomeDirectory; | |
| 24 | 24 | const homePath = config.homePath.trim(); |
| 25 | 25 | if (homePath.length > 0) { |
| 26 | 26 | return path.resolve(expandHomePath(homePath, home)); |
apps/server/src/provider/Drivers/ClaudeSkills.ts+3-3
| ... | ... | @@ -19,7 +19,7 @@ import * as Effect from "effect/Effect"; |
| 19 | 19 | import * as FileSystem from "effect/FileSystem"; |
| 20 | 20 | import * as Path from "effect/Path"; |
| 21 | 21 | import * as Schema from "effect/Schema"; |
| 22 | import { HostProcessHomeDirectory, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 22 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 23 | 23 | import { fromLenientJson } from "@t3tools/shared/schemaJson"; |
| 24 | 24 | import { parse as parseYamlDocument } from "yaml"; |
| 25 | 25 | |
| ... | ... | @@ -242,7 +242,7 @@ const readSkillOverrides = Effect.fn("readSkillOverrides")(function* ( |
| 242 | 242 | ): Effect.fn.Return<ReadonlyMap<string, SkillOverride>, never, FileSystem.FileSystem | Path.Path> { |
| 243 | 243 | const fileSystem = yield* FileSystem.FileSystem; |
| 244 | 244 | const path = yield* Path.Path; |
| 245 | const platform = yield* HostProcessPlatform; | |
| 245 | const platform = yield* HostProcess.Platform; | |
| 246 | 246 | const overridesByName = new Map<string, SkillOverride>(); |
| 247 | 247 | const repositoryRoot = cwd === undefined ? undefined : yield* findRepositoryRoot(cwd); |
| 248 | 248 | |
| ... | ... | @@ -295,7 +295,7 @@ const resolveClaudeConfigDirPath = Effect.fn("resolveClaudeConfigDirPath")(funct |
| 295 | 295 | cwd?: string, |
| 296 | 296 | ): Effect.fn.Return<string, never, Path.Path> { |
| 297 | 297 | const path = yield* Path.Path; |
| 298 | const home = yield* HostProcessHomeDirectory; | |
| 298 | const home = yield* HostProcess.HomeDirectory; | |
| 299 | 299 | const homePath = config.homePath.trim(); |
| 300 | 300 | if (homePath.length > 0) { |
| 301 | 301 | return path.resolve(expandHomePath(homePath, home)); |
apps/server/src/provider/Drivers/CodexDriver.test.ts+2-2
| ... | ... | @@ -7,7 +7,7 @@ import * as NodeOS from "node:os"; |
| 7 | 7 | import * as NodePath from "node:path"; |
| 8 | 8 | import { expect, it } from "@effect/vitest"; |
| 9 | 9 | import { EnvironmentId, ProviderInstanceId, ProviderSessionId, ThreadId } from "@t3tools/contracts"; |
| 10 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 10 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 11 | 11 | import * as Effect from "effect/Effect"; |
| 12 | 12 | import * as Deferred from "effect/Deferred"; |
| 13 | 13 | import * as Fiber from "effect/Fiber"; |
| ... | ... | @@ -88,7 +88,7 @@ const layerDeps = ServerConfig.layerTest(process.cwd(), { |
| 88 | 88 | const layerTest = ProviderHostLive.layer.pipe(Layer.provideMerge(layerDeps)); |
| 89 | 89 | |
| 90 | 90 | // The `#!/bin/sh` stub below cannot be resolved as an executable on Windows. |
| 91 | const windowsHost = HostProcessPlatform.defaultValue() === "win32"; | |
| 91 | const windowsHost = HostProcess.Platform.defaultValue() === "win32"; | |
| 92 | 92 | |
| 93 | 93 | const noSpawn = ChildProcessSpawner.make(() => |
| 94 | 94 | Effect.die("Disabled Codex must not spawn a process"), |
apps/server/src/provider/Drivers/CodexDriver.ts+2-2
| ... | ... | @@ -77,7 +77,7 @@ import { codexUsageReader } from "./codexUsage.ts"; |
| 77 | 77 | import * as CodexInstallation from "../CodexInstallation.ts"; |
| 78 | 78 | import * as ServerSecretStore from "../../auth/ServerSecretStore.ts"; |
| 79 | 79 | import * as ServerEnvironment from "../../environment/ServerEnvironment.ts"; |
| 80 | import { HostProcessHomeDirectory } from "@t3tools/shared/hostProcess"; | |
| 80 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 81 | 81 | const decodeCodexSettings = Schema.decodeSync(CodexSettings); |
| 82 | 82 | |
| 83 | 83 | const DRIVER_KIND = ProviderDriverKind.make("codex"); |
| ... | ... | @@ -179,7 +179,7 @@ export const CodexDriver: ProviderDriver<CodexSettings, CodexDriverEnv, Path.Pat |
| 179 | 179 | const effectiveConfig = { |
| 180 | 180 | ...config, |
| 181 | 181 | enabled, |
| 182 | binaryPath: expandHomePath(config.binaryPath, yield* HostProcessHomeDirectory), | |
| 182 | binaryPath: expandHomePath(config.binaryPath, yield* HostProcess.HomeDirectory), | |
| 183 | 183 | homePath: homeLayout.effectiveHomePath ?? "", |
| 184 | 184 | } satisfies CodexSettings; |
| 185 | 185 | const resolveMaintenance = yield* makeCachedProviderMaintenanceResolution( |
apps/server/src/provider/Drivers/CodexHomeLayout.ts+2-2
| ... | ... | @@ -6,7 +6,7 @@ import * as Schema from "effect/Schema"; |
| 6 | 6 | import * as PlatformError from "effect/PlatformError"; |
| 7 | 7 | |
| 8 | 8 | import { expandHomePath } from "@t3tools/provider-core/server/pathExpansion"; |
| 9 | import { HostProcessHomeDirectory } from "@t3tools/shared/hostProcess"; | |
| 9 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 10 | 10 | |
| 11 | 11 | export interface CodexHomeLayout { |
| 12 | 12 | readonly mode: "direct" | "authOverlay"; |
| ... | ... | @@ -42,7 +42,7 @@ export const resolveCodexHomeLayout = Effect.fn("resolveCodexHomeLayout")(functi |
| 42 | 42 | config: CodexSettings, |
| 43 | 43 | ): Effect.fn.Return<CodexHomeLayout, never, Path.Path> { |
| 44 | 44 | const path = yield* Path.Path; |
| 45 | const home = yield* HostProcessHomeDirectory; | |
| 45 | const home = yield* HostProcess.HomeDirectory; | |
| 46 | 46 | const sharedHomePath = resolveHomePath(path, home, config.homePath); |
| 47 | 47 | const shadowHomePath = config.shadowHomePath.trim(); |
| 48 | 48 | if (shadowHomePath.length === 0) { |
apps/server/src/provider/Drivers/claudeUsage.ts+2-2
| ... | ... | @@ -17,7 +17,7 @@ import { |
| 17 | 17 | type TranscriptUsageFormat, |
| 18 | 18 | type UsageRecord, |
| 19 | 19 | } from "@t3tools/provider-core/server/usage"; |
| 20 | import { HostProcessHomeDirectory } from "@t3tools/shared/hostProcess"; | |
| 20 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 21 | 21 | |
| 22 | 22 | /** |
| 23 | 23 | * Parses one line of a Claude Code transcript. |
| ... | ... | @@ -111,7 +111,7 @@ export const claudeUsageReader: ProviderUsageReader<ClaudeSettings, Path.Path> = |
| 111 | 111 | // An undecodable config has no trustworthy home to read. |
| 112 | 112 | if (config === undefined) return []; |
| 113 | 113 | const path = yield* Path.Path; |
| 114 | const homeDirectory = yield* HostProcessHomeDirectory; | |
| 114 | const homeDirectory = yield* HostProcess.HomeDirectory; | |
| 115 | 115 | const configured = config.homePath.trim(); |
| 116 | 116 | const home = configured |
| 117 | 117 | ? expandHomePath(configured, homeDirectory) |
apps/server/src/provider/ProviderInstanceRegistry.test.ts+5-9
| ... | ... | @@ -39,11 +39,7 @@ import * as ProviderLatestVersions from "@t3tools/provider-core/server/ProviderL |
| 39 | 39 | import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSessions"; |
| 40 | 40 | import type { GrokSettings } from "@t3tools/provider-grok/settings"; |
| 41 | 41 | import type { CursorSettings } from "@t3tools/provider-cursor/settings"; |
| 42 | import { | |
| 43 | HostProcessHomeDirectory, | |
| 44 | HostProcessPlatform, | |
| 45 | isHostWindows, | |
| 46 | } from "@t3tools/shared/hostProcess"; | |
| 42 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 47 | 43 | import * as DateTime from "effect/DateTime"; |
| 48 | 44 | import * as Effect from "effect/Effect"; |
| 49 | 45 | import * as FileSystem from "effect/FileSystem"; |
| ... | ... | @@ -156,7 +152,7 @@ const makeTildeProviderFixtures = Effect.fn( |
| 156 | 152 | )(function* () { |
| 157 | 153 | const fileSystem = yield* FileSystem.FileSystem; |
| 158 | 154 | const path = yield* Path.Path; |
| 159 | const homePath = yield* HostProcessHomeDirectory; | |
| 155 | const homePath = yield* HostProcess.HomeDirectory; | |
| 160 | 156 | const fixtureDir = yield* fileSystem.makeTempDirectoryScoped({ |
| 161 | 157 | directory: homePath, |
| 162 | 158 | prefix: ".t3-provider-path-test-", |
| ... | ... | @@ -349,7 +345,7 @@ describe("ProviderInstanceRegistry — multi-instance codex slice", () => { |
| 349 | 345 | |
| 350 | 346 | it.live("reports Codex's answer when a redemption changed nothing", () => |
| 351 | 347 | Effect.gen(function* () { |
| 352 | if (yield* isHostWindows) return; | |
| 348 | if (yield* HostProcess.isWindows) return; | |
| 353 | 349 | const fileSystem = yield* FileSystem.FileSystem; |
| 354 | 350 | const fixtures = yield* makeTildeProviderFixtures(); |
| 355 | 351 | yield* fileSystem.writeFileString( |
| ... | ... | @@ -386,7 +382,7 @@ describe("ProviderInstanceRegistry — multi-instance codex slice", () => { |
| 386 | 382 | |
| 387 | 383 | it.live("runs Codex and Claude readiness probes from configured tilde paths", () => |
| 388 | 384 | Effect.gen(function* () { |
| 389 | if (yield* isHostWindows) return; | |
| 385 | if (yield* HostProcess.isWindows) return; | |
| 390 | 386 | |
| 391 | 387 | const fixtures = yield* makeTildeProviderFixtures(); |
| 392 | 388 | |
| ... | ... | @@ -503,7 +499,7 @@ describe("ProviderInstanceRegistry — multi-instance codex slice", () => { |
| 503 | 499 | return { outcome, after: yield* instance!.snapshot.getSnapshot }; |
| 504 | 500 | }).pipe( |
| 505 | 501 | // macOS logins live in the Keychain, where resets are never read. |
| 506 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 502 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 507 | 503 | Effect.provide(layerTest), |
| 508 | 504 | ); |
| 509 | 505 |
apps/server/src/provider/acp/AcpSessionRuntime.processTree.test.ts+5-5
| ... | ... | @@ -5,7 +5,7 @@ import * as NodePath from "node:path"; |
| 5 | 5 | import * as NodeURL from "node:url"; |
| 6 | 6 | |
| 7 | 7 | import { describe, expect, it, vi } from "@effect/vitest"; |
| 8 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 8 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 9 | 9 | import * as Clock from "effect/Clock"; |
| 10 | 10 | import * as Effect from "effect/Effect"; |
| 11 | 11 | import * as Exit from "effect/Exit"; |
| ... | ... | @@ -155,7 +155,7 @@ describe("terminatePosixOwnedProcessTree", () => { |
| 155 | 155 | |
| 156 | 156 | it.live("preserves exact argv and strips wrapper-only environment before exec", () => |
| 157 | 157 | Effect.gen(function* () { |
| 158 | if ((yield* HostProcessPlatform) !== "linux") return; | |
| 158 | if ((yield* HostProcess.Platform) !== "linux") return; | |
| 159 | 159 | const lease = AcpSessionRuntime.makeLinuxCgroupController().create(); |
| 160 | 160 | if (lease === undefined) return; |
| 161 | 161 | const scratchRoot = NodePath.join(process.cwd(), "tmp"); |
| ... | ... | @@ -235,7 +235,7 @@ describe("terminatePosixOwnedProcessTree", () => { |
| 235 | 235 | ); |
| 236 | 236 | |
| 237 | 237 | it("contains a packaged-runtime command without requiring cgroup delegation", () => { |
| 238 | if (HostProcessPlatform.defaultValue() !== "linux") return; | |
| 238 | if (HostProcess.Platform.defaultValue() !== "linux") return; | |
| 239 | 239 | const scratchRoot = NodePath.join(process.cwd(), "tmp"); |
| 240 | 240 | NodeFS.mkdirSync(scratchRoot, { recursive: true }); |
| 241 | 241 | const scratch = NodeFS.mkdtempSync(NodePath.join(scratchRoot, "acp-cgroup-wrapper-fake-")); |
| ... | ... | @@ -316,7 +316,7 @@ describe("terminatePosixOwnedProcessTree", () => { |
| 316 | 316 | |
| 317 | 317 | it.live("kills a post-TERM detached double fork without touching an unrelated sentinel", () => |
| 318 | 318 | Effect.gen(function* () { |
| 319 | if ((yield* HostProcessPlatform) !== "linux") return; | |
| 319 | if ((yield* HostProcess.Platform) !== "linux") return; | |
| 320 | 320 | const controller = AcpSessionRuntime.makeLinuxCgroupController(); |
| 321 | 321 | const lease = controller.create(); |
| 322 | 322 | if (lease === undefined) return; |
| ... | ... | @@ -531,7 +531,7 @@ describe("terminatePosixOwnedProcessTree", () => { |
| 531 | 531 | |
| 532 | 532 | it.live("finds a child forked by a non-leader pthread", () => |
| 533 | 533 | Effect.gen(function* () { |
| 534 | if ((yield* HostProcessPlatform) !== "linux") return; | |
| 534 | if ((yield* HostProcess.Platform) !== "linux") return; | |
| 535 | 535 | const scratchRoot = NodePath.join(process.cwd(), "tmp"); |
| 536 | 536 | NodeFS.mkdirSync(scratchRoot, { recursive: true }); |
| 537 | 537 | const scratch = NodeFS.mkdtempSync(NodePath.join(scratchRoot, "acp-pthread-spawn-")); |
apps/server/src/provider/antigravityAuthSupport.test.ts+5-9
| ... | ... | @@ -5,11 +5,7 @@ import * as NodeCrypto from "@effect/platform-node/NodeCrypto"; |
| 5 | 5 | import * as NodePath from "@effect/platform-node/NodePath"; |
| 6 | 6 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 7 | 7 | import { ProviderInstanceId } from "@t3tools/contracts"; |
| 8 | import { | |
| 9 | HostProcessExecutablePath, | |
| 10 | HostProcessIsExecutable, | |
| 11 | HostProcessPlatform, | |
| 12 | } from "@t3tools/shared/hostProcess"; | |
| 8 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 13 | 9 | import { describe, expect, it } from "@effect/vitest"; |
| 14 | 10 | import * as Effect from "effect/Effect"; |
| 15 | 11 | import * as FileSystem from "effect/FileSystem"; |
| ... | ... | @@ -574,8 +570,8 @@ it.layer(NodeServices.layer)("Antigravity profile preparation", (it) => { |
| 574 | 570 | expect(profile.browserCommand).not.toContain("/packaged/t3"); |
| 575 | 571 | expect(yield* fs.exists(profile.acpDirectory)).toBe(true); |
| 576 | 572 | }).pipe( |
| 577 | Effect.provideService(HostProcessIsExecutable, true), | |
| 578 | Effect.provideService(HostProcessExecutablePath, "/packaged/t3"), | |
| 573 | Effect.provideService(HostProcess.IsExecutable, true), | |
| 574 | Effect.provideService(HostProcess.ExecutablePath, "/packaged/t3"), | |
| 579 | 575 | ), |
| 580 | 576 | ); |
| 581 | 577 | |
| ... | ... | @@ -601,7 +597,7 @@ it.layer(NodeServices.layer)("Antigravity profile preparation", (it) => { |
| 601 | 597 | }); |
| 602 | 598 | } |
| 603 | 599 | expect(yield* fs.exists(profileDirectory)).toBe(false); |
| 604 | }).pipe(Effect.provideService(HostProcessIsExecutable, true)), | |
| 600 | }).pipe(Effect.provideService(HostProcess.IsExecutable, true)), | |
| 605 | 601 | ); |
| 606 | 602 | |
| 607 | 603 | it.effect("preflights the no-browser helper and creates private directories only", () => |
| ... | ... | @@ -616,7 +612,7 @@ it.layer(NodeServices.layer)("Antigravity profile preparation", (it) => { |
| 616 | 612 | expect(profile.geminiHome).toBe(path.join(temporaryDirectory, "profile")); |
| 617 | 613 | expect(yield* fs.exists(profile.acpDirectory)).toBe(true); |
| 618 | 614 | expect(yield* fs.exists(profile.tokenPath)).toBe(false); |
| 619 | if ((yield* HostProcessPlatform) !== "win32") { | |
| 615 | if ((yield* HostProcess.Platform) !== "win32") { | |
| 620 | 616 | expect((yield* fs.stat(profile.geminiHome)).mode & 0o777).toBe(0o700); |
| 621 | 617 | expect((yield* fs.stat(profile.acpDirectory)).mode & 0o777).toBe(0o700); |
| 622 | 618 | } |
apps/server/src/provider/antigravityAuthSupport.ts+3-3
| ... | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | import * as NodeFSP from "node:fs/promises"; |
| 3 | 3 | |
| 4 | 4 | import type { AntigravityAuthMethod, ProviderInstanceId } from "@t3tools/contracts"; |
| 5 | import { HostProcessHomeDirectory, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 5 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 6 | 6 | import { resolveNodeExecutable, nodeRuntimeUnavailableMessage } from "@t3tools/shared/nodeRuntime"; |
| 7 | 7 | import * as Crypto from "effect/Crypto"; |
| 8 | 8 | import * as Effect from "effect/Effect"; |
| ... | ... | @@ -315,13 +315,13 @@ export const prepareAntigravityProfile = Effect.fn("prepareAntigravityProfile")( |
| 315 | 315 | const fs = yield* FileSystem.FileSystem; |
| 316 | 316 | const path = yield* Path.Path; |
| 317 | 317 | const spawner = yield* ChildProcessSpawner.ChildProcessSpawner; |
| 318 | const platform = input.platform ?? (yield* HostProcessPlatform); | |
| 318 | const platform = input.platform ?? (yield* HostProcess.Platform); | |
| 319 | 319 | const userHome = |
| 320 | 320 | input.userHome ?? |
| 321 | 321 | resolveAntigravityUserHome( |
| 322 | 322 | platform, |
| 323 | 323 | input.baseEnv ?? process.env, |
| 324 | yield* HostProcessHomeDirectory, | |
| 324 | yield* HostProcess.HomeDirectory, | |
| 325 | 325 | ); |
| 326 | 326 | const runtimeExecutablePath = |
| 327 | 327 | input.runtimeExecutablePath ?? |
apps/server/src/provider/claudeResetCredits.test.ts+6-6
| ... | ... | @@ -1,6 +1,6 @@ |
| 1 | 1 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 2 | 2 | import { it as effectIt } from "@effect/vitest"; |
| 3 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 3 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 4 | 4 | import * as Deferred from "effect/Deferred"; |
| 5 | 5 | import * as Effect from "effect/Effect"; |
| 6 | 6 | import * as FileSystem from "effect/FileSystem"; |
| ... | ... | @@ -111,7 +111,7 @@ effectIt.layer(NodeServices.layer)("readClaudeResetCredits", (it) => { |
| 111 | 111 | ); |
| 112 | 112 | }); |
| 113 | 113 | const credits = yield* ClaudeResetCredits.readClaudeResetCredits(configDir, "2.1.0").pipe( |
| 114 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 114 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 115 | 115 | Effect.provideService(HttpClient.HttpClient, client), |
| 116 | 116 | ); |
| 117 | 117 | expect(credits).toEqual({ availableCount: 1, nextCreditId: "grant_a" }); |
| ... | ... | @@ -122,11 +122,11 @@ effectIt.layer(NodeServices.layer)("readClaudeResetCredits", (it) => { |
| 122 | 122 | Effect.gen(function* () { |
| 123 | 123 | const { configDir } = yield* writeLogin; |
| 124 | 124 | const darwin = yield* ClaudeResetCredits.readClaudeResetCredits(configDir, "2.1.0").pipe( |
| 125 | Effect.provideService(HostProcessPlatform, "darwin"), | |
| 125 | Effect.provideService(HostProcess.Platform, "darwin"), | |
| 126 | 126 | Effect.provideService(HttpClient.HttpClient, refuseRequests), |
| 127 | 127 | ); |
| 128 | 128 | const limited = yield* ClaudeResetCredits.readClaudeResetCredits(configDir, "2.1.0").pipe( |
| 129 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 129 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 130 | 130 | Effect.provideService(HttpClient.HttpClient, respond(429, {})), |
| 131 | 131 | ); |
| 132 | 132 | expect([darwin, limited]).toEqual([undefined, undefined]); |
| ... | ... | @@ -147,7 +147,7 @@ const consume = (client: HttpClient.HttpClient, ids = { grantId: "grant_a", requ |
| 147 | 147 | version: "2.1.0", |
| 148 | 148 | ...ids, |
| 149 | 149 | }).pipe( |
| 150 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 150 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 151 | 151 | Effect.provideService(HttpClient.HttpClient, client), |
| 152 | 152 | Effect.result, |
| 153 | 153 | ); |
| ... | ... | @@ -228,7 +228,7 @@ effectIt.layer(NodeServices.layer)("consumeClaudeResetCredit", (it) => { |
| 228 | 228 | grantId: "grant_a", |
| 229 | 229 | requestId: "r-1", |
| 230 | 230 | }).pipe( |
| 231 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 231 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 232 | 232 | Effect.provideService(HttpClient.HttpClient, client), |
| 233 | 233 | Effect.result, |
| 234 | 234 | Effect.forkChild, |
apps/server/src/provider/claudeResetCredits.ts+3-3
| ... | ... | @@ -11,7 +11,7 @@ import type { |
| 11 | 11 | ProviderConsumeResetCreditOutcome, |
| 12 | 12 | ServerProviderResetCredits, |
| 13 | 13 | } from "@t3tools/contracts"; |
| 14 | import { HostProcessHomeDirectory, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 14 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 15 | 15 | import * as DateTime from "effect/DateTime"; |
| 16 | 16 | import * as Effect from "effect/Effect"; |
| 17 | 17 | import * as FileSystem from "effect/FileSystem"; |
| ... | ... | @@ -149,7 +149,7 @@ const readJson = <S extends Schema.Top>(schema: S, file: string) => |
| 149 | 149 | |
| 150 | 150 | const readAccessToken = (configDir: string) => |
| 151 | 151 | Effect.gen(function* () { |
| 152 | if ((yield* HostProcessPlatform) === "darwin") return undefined; | |
| 152 | if ((yield* HostProcess.Platform) === "darwin") return undefined; | |
| 153 | 153 | const path = yield* Path.Path; |
| 154 | 154 | const credentials = yield* readJson(Credentials, path.join(configDir, ".credentials.json")); |
| 155 | 155 | return credentials.claudeAiOauth?.accessToken?.trim() || undefined; |
| ... | ... | @@ -195,7 +195,7 @@ export const claudeAccountConfigPath = Effect.fn("claudeAccountConfigPath")(func |
| 195 | 195 | const path = yield* Path.Path; |
| 196 | 196 | return configDir |
| 197 | 197 | ? path.join(configDir, ".claude.json") |
| 198 | : path.join(yield* HostProcessHomeDirectory, ".claude.json"); | |
| 198 | : path.join(yield* HostProcess.HomeDirectory, ".claude.json"); | |
| 199 | 199 | }); |
| 200 | 200 | |
| 201 | 201 | const CLAIM_OUTCOMES = { |
apps/server/src/provider/providerInstallation.test.ts+2-2
| ... | ... | @@ -5,7 +5,7 @@ import { |
| 5 | 5 | ProviderInstanceId, |
| 6 | 6 | type ProviderInstallState, |
| 7 | 7 | } from "@t3tools/contracts"; |
| 8 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 8 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 9 | 9 | import * as Effect from "effect/Effect"; |
| 10 | 10 | import * as FileSystem from "effect/FileSystem"; |
| 11 | 11 | import * as Layer from "effect/Layer"; |
| ... | ... | @@ -215,7 +215,7 @@ describe("provider installation routing", () => { |
| 215 | 215 | Effect.gen(function* () { |
| 216 | 216 | const fs = yield* FileSystem.FileSystem; |
| 217 | 217 | const path = yield* Path.Path; |
| 218 | const platform = yield* HostProcessPlatform; | |
| 218 | const platform = yield* HostProcess.Platform; | |
| 219 | 219 | const directory = yield* fs.makeTempDirectoryScoped({ prefix: "t3-provider-install-route-" }); |
| 220 | 220 | const binary = platform === "win32" ? "agy-test.exe" : "agy-test"; |
| 221 | 221 | const executable = path.join(directory, binary); |
apps/server/src/provider/providerMaintenanceRunner.test.ts+4-4
| ... | ... | @@ -20,7 +20,7 @@ import * as Stream from "effect/Stream"; |
| 20 | 20 | import * as TestClock from "effect/testing/TestClock"; |
| 21 | 21 | import { HttpClient, HttpClientResponse } from "effect/http"; |
| 22 | 22 | import { ChildProcessSpawner } from "effect/process"; |
| 23 | import { HostProcessEnvironment, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 23 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 24 | 24 | import { SpawnExecutableResolution } from "@t3tools/shared/shell"; |
| 25 | 25 | |
| 26 | 26 | import * as ProviderRegistry from "./ProviderRegistry.ts"; |
| ... | ... | @@ -45,7 +45,7 @@ const encoder = new TextEncoder(); |
| 45 | 45 | // `{ command, args }` assertions below hold deterministically on any host |
| 46 | 46 | // (including Windows). Windows-specific resolution is covered by the dedicated |
| 47 | 47 | // win32 case at the end of this suite. |
| 48 | const layerNonWindowsPlatform = Layer.succeed(HostProcessPlatform, "linux"); | |
| 48 | const layerNonWindowsPlatform = Layer.succeed(HostProcess.Platform, "linux"); | |
| 49 | 49 | |
| 50 | 50 | function lifecycleFor(provider: ProviderDriverKind): ProviderMaintenanceCapabilities { |
| 51 | 51 | if (provider === NATIVE_CLI_DRIVER) { |
| ... | ... | @@ -962,8 +962,8 @@ describe("providerMaintenanceRunner", () => { |
| 962 | 962 | }).pipe( |
| 963 | 963 | Effect.provide( |
| 964 | 964 | Layer.mergeAll( |
| 965 | Layer.succeed(HostProcessPlatform, "win32"), | |
| 966 | Layer.succeed(HostProcessEnvironment, { | |
| 965 | Layer.succeed(HostProcess.Platform, "win32"), | |
| 966 | Layer.succeed(HostProcess.Environment, { | |
| 967 | 967 | PATH: "C:\\fake\\npm", |
| 968 | 968 | PATHEXT: ".COM;.EXE;.BAT;.CMD", |
| 969 | 969 | }), |
apps/server/src/resourceTelemetry/HostResources.ts+2-2
| ... | ... | @@ -1,6 +1,6 @@ |
| 1 | 1 | import * as NodeOS from "node:os"; |
| 2 | 2 | import type { HostResourcesSnapshot } from "@t3tools/contracts"; |
| 3 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 3 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 4 | 4 | import * as Cache from "effect/Cache"; |
| 5 | 5 | import * as Context from "effect/Context"; |
| 6 | 6 | import * as DateTime from "effect/DateTime"; |
| ... | ... | @@ -40,7 +40,7 @@ function darwinAvailableMemory(output: string): number | null { |
| 40 | 40 | |
| 41 | 41 | const make = Effect.fn("makeHostResources")(function* () { |
| 42 | 42 | const fs = yield* FileSystem.FileSystem; |
| 43 | const platform = yield* HostProcessPlatform; | |
| 43 | const platform = yield* HostProcess.Platform; | |
| 44 | 44 | const spawner = yield* ChildProcessSpawner.ChildProcessSpawner; |
| 45 | 45 | |
| 46 | 46 | const sample = Effect.fn("HostResources.sample")(function* () { |
apps/server/src/resourceTelemetry/ResourceMonitorBinary.test.ts+20-24
| ... | ... | @@ -1,9 +1,5 @@ |
| 1 | 1 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 2 | import { | |
| 3 | HostProcessArchitecture, | |
| 4 | HostProcessEnvironment, | |
| 5 | HostProcessPlatform, | |
| 6 | } from "@t3tools/shared/hostProcess"; | |
| 2 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 7 | 3 | import { afterEach, assert, describe, expect, it, vi } from "@effect/vitest"; |
| 8 | 4 | import * as Effect from "effect/Effect"; |
| 9 | 5 | import * as FileSystem from "effect/FileSystem"; |
| ... | ... | @@ -13,7 +9,7 @@ import * as ResourceMonitorBinary from "./ResourceMonitorBinary.ts"; |
| 13 | 9 | |
| 14 | 10 | // The override checks POSIX exec bits on a real file under a linux platform |
| 15 | 11 | // mock; NTFS never reports those bits, so the check cannot be satisfied there. |
| 16 | const windowsHost = HostProcessPlatform.defaultValue() === "win32"; | |
| 12 | const windowsHost = HostProcess.Platform.defaultValue() === "win32"; | |
| 17 | 13 | |
| 18 | 14 | describe("ResourceMonitorBinary", () => { |
| 19 | 15 | afterEach(() => { |
| ... | ... | @@ -34,9 +30,9 @@ describe("ResourceMonitorBinary", () => { |
| 34 | 30 | |
| 35 | 31 | const service = yield* ResourceMonitorBinary.make().pipe( |
| 36 | 32 | Effect.provide(ServerConfig.layerTest(process.cwd(), baseDir)), |
| 37 | Effect.provideService(HostProcessPlatform, "win32"), | |
| 38 | Effect.provideService(HostProcessArchitecture, "arm64"), | |
| 39 | Effect.provideService(HostProcessEnvironment, { | |
| 33 | Effect.provideService(HostProcess.Platform, "win32"), | |
| 34 | Effect.provideService(HostProcess.Architecture, "arm64"), | |
| 35 | Effect.provideService(HostProcess.Environment, { | |
| 40 | 36 | T3CODE_RESOURCE_MONITOR_PATH: binaryPath, |
| 41 | 37 | }), |
| 42 | 38 | ); |
| ... | ... | @@ -58,10 +54,10 @@ describe("ResourceMonitorBinary", () => { |
| 58 | 54 | |
| 59 | 55 | const service = yield* ResourceMonitorBinary.make().pipe( |
| 60 | 56 | Effect.provide(ServerConfig.layerTest(process.cwd(), baseDir)), |
| 61 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 62 | Effect.provideService(HostProcessArchitecture, "x64"), | |
| 57 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 58 | Effect.provideService(HostProcess.Architecture, "x64"), | |
| 63 | 59 | Effect.provideService(ResourceMonitorBinary.ResourceMonitorHostLinuxLibc, "musl"), |
| 64 | Effect.provideService(HostProcessEnvironment, { | |
| 60 | Effect.provideService(HostProcess.Environment, { | |
| 65 | 61 | T3CODE_RESOURCE_MONITOR_PATH: binaryPath, |
| 66 | 62 | }), |
| 67 | 63 | ); |
| ... | ... | @@ -82,9 +78,9 @@ describe("ResourceMonitorBinary", () => { |
| 82 | 78 | |
| 83 | 79 | const service = yield* ResourceMonitorBinary.make().pipe( |
| 84 | 80 | Effect.provide(ServerConfig.layerTest(process.cwd(), baseDir)), |
| 85 | Effect.provideService(HostProcessPlatform, "freebsd"), | |
| 86 | Effect.provideService(HostProcessArchitecture, "ia32"), | |
| 87 | Effect.provideService(HostProcessEnvironment, { | |
| 81 | Effect.provideService(HostProcess.Platform, "freebsd"), | |
| 82 | Effect.provideService(HostProcess.Architecture, "ia32"), | |
| 83 | Effect.provideService(HostProcess.Environment, { | |
| 88 | 84 | T3CODE_RESOURCE_MONITOR_PATH: binaryPath, |
| 89 | 85 | }), |
| 90 | 86 | ); |
| ... | ... | @@ -105,10 +101,10 @@ describe("ResourceMonitorBinary", () => { |
| 105 | 101 | |
| 106 | 102 | const service = yield* ResourceMonitorBinary.make().pipe( |
| 107 | 103 | Effect.provide(ServerConfig.layerTest(process.cwd(), baseDir)), |
| 108 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 109 | Effect.provideService(HostProcessArchitecture, "x64"), | |
| 104 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 105 | Effect.provideService(HostProcess.Architecture, "x64"), | |
| 110 | 106 | Effect.provideService(ResourceMonitorBinary.ResourceMonitorHostLinuxLibc, "gnu"), |
| 111 | Effect.provideService(HostProcessEnvironment, { | |
| 107 | Effect.provideService(HostProcess.Environment, { | |
| 112 | 108 | T3CODE_RESOURCE_MONITOR_PATH: binaryPath, |
| 113 | 109 | }), |
| 114 | 110 | ); |
| ... | ... | @@ -127,9 +123,9 @@ describe("ResourceMonitorBinary", () => { |
| 127 | 123 | }); |
| 128 | 124 | const service = yield* ResourceMonitorBinary.make().pipe( |
| 129 | 125 | Effect.provide(ServerConfig.layerTest(process.cwd(), baseDir)), |
| 130 | Effect.provideService(HostProcessPlatform, "freebsd"), | |
| 131 | Effect.provideService(HostProcessArchitecture, "ia32"), | |
| 132 | Effect.provideService(HostProcessEnvironment, {}), | |
| 126 | Effect.provideService(HostProcess.Platform, "freebsd"), | |
| 127 | Effect.provideService(HostProcess.Architecture, "ia32"), | |
| 128 | Effect.provideService(HostProcess.Environment, {}), | |
| 133 | 129 | ); |
| 134 | 130 | const error = yield* Effect.flip(service.resolve); |
| 135 | 131 | |
| ... | ... | @@ -145,10 +141,10 @@ describe("ResourceMonitorBinary", () => { |
| 145 | 141 | }); |
| 146 | 142 | const service = yield* ResourceMonitorBinary.make().pipe( |
| 147 | 143 | Effect.provide(ServerConfig.layerTest(process.cwd(), baseDir)), |
| 148 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 149 | Effect.provideService(HostProcessArchitecture, "x64"), | |
| 144 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 145 | Effect.provideService(HostProcess.Architecture, "x64"), | |
| 150 | 146 | Effect.provideService(ResourceMonitorBinary.ResourceMonitorHostLinuxLibc, "musl"), |
| 151 | Effect.provideService(HostProcessEnvironment, {}), | |
| 147 | Effect.provideService(HostProcess.Environment, {}), | |
| 152 | 148 | ); |
| 153 | 149 | const error = yield* Effect.flip(service.resolve); |
| 154 | 150 |
apps/server/src/resourceTelemetry/ResourceMonitorBinary.ts+4-8
| ... | ... | @@ -1,8 +1,4 @@ |
| 1 | import { | |
| 2 | HostProcessArchitecture, | |
| 3 | HostProcessEnvironment, | |
| 4 | HostProcessPlatform, | |
| 5 | } from "@t3tools/shared/hostProcess"; | |
| 1 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 6 | 2 | import * as Context from "effect/Context"; |
| 7 | 3 | import * as Effect from "effect/Effect"; |
| 8 | 4 | import * as FileSystem from "effect/FileSystem"; |
| ... | ... | @@ -139,9 +135,9 @@ export const make = Effect.fn("resourceTelemetry.resourceMonitorBinary.make")(fu |
| 139 | 135 | const config = yield* ServerConfig.ServerConfig; |
| 140 | 136 | const fileSystem = yield* FileSystem.FileSystem; |
| 141 | 137 | const path = yield* Path.Path; |
| 142 | const platform = yield* HostProcessPlatform; | |
| 143 | const architecture = yield* HostProcessArchitecture; | |
| 144 | const environment = yield* HostProcessEnvironment; | |
| 138 | const platform = yield* HostProcess.Platform; | |
| 139 | const architecture = yield* HostProcess.Architecture; | |
| 140 | const environment = yield* HostProcess.Environment; | |
| 145 | 141 | const linuxLibc = platform === "linux" ? yield* ResourceMonitorHostLinuxLibc : undefined; |
| 146 | 142 | const executableName = binaryName(platform); |
| 147 | 143 | const platformKey = resourceMonitorPlatformKey(platform, architecture); |
apps/server/src/review/ReviewService.ts+2-2
| ... | ... | @@ -20,7 +20,7 @@ import * as GitVcsDriver from "../vcs/GitVcsDriver.ts"; |
| 20 | 20 | import * as VcsDriverRegistry from "../vcs/VcsDriverRegistry.ts"; |
| 21 | 21 | import * as ServerSettings from "../serverSettings.ts"; |
| 22 | 22 | import { isFilesystemRoot, managedWorktreesDirectories } from "../worktreesDirectory.ts"; |
| 23 | import { HostProcessHomeDirectory } from "@t3tools/shared/hostProcess"; | |
| 23 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 24 | 24 | |
| 25 | 25 | export class ReviewService extends Context.Service< |
| 26 | 26 | ReviewService, |
| ... | ... | @@ -74,7 +74,7 @@ export const make = Effect.gen(function* () { |
| 74 | 74 | const worktreesDirectories = yield* settings.getSettings.pipe( |
| 75 | 75 | Effect.orElseSucceed(() => ({ worktreesDirectory: "", previousWorktreesDirectories: [] })), |
| 76 | 76 | ); |
| 77 | const home = yield* HostProcessHomeDirectory; | |
| 77 | const home = yield* HostProcess.HomeDirectory; | |
| 78 | 78 | const [candidate, workspaceRoot, worktreesRoots] = yield* Effect.all([ |
| 79 | 79 | canonicalizePath(cwd), |
| 80 | 80 | canonicalizePath(config.cwd), |
apps/server/src/sourceControl/SourceControlRepositoryService.ts+2-2
| ... | ... | @@ -29,7 +29,7 @@ import { |
| 29 | 29 | import * as GitVcsDriver from "../vcs/GitVcsDriver.ts"; |
| 30 | 30 | import * as BitbucketApi from "@t3tools/source-control-bitbucket/server/BitbucketApi"; |
| 31 | 31 | import * as SourceControlProviderRegistry from "./SourceControlProviderRegistry.ts"; |
| 32 | import { HostProcessHomeDirectory } from "@t3tools/shared/hostProcess"; | |
| 32 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 33 | 33 | const isSourceControlRepositoryError = Schema.is(SourceControlRepositoryError); |
| 34 | 34 | const isSourceControlProviderError = Schema.is(SourceControlProviderError); |
| 35 | 35 | const isBitbucketRepositoryLocatorError = Schema.is(BitbucketApi.BitbucketRepositoryLocatorError); |
| ... | ... | @@ -214,7 +214,7 @@ export const make = Effect.gen(function* () { |
| 214 | 214 | }); |
| 215 | 215 | } |
| 216 | 216 | |
| 217 | return path.resolve(expandHomePath(trimmed, yield* HostProcessHomeDirectory)); | |
| 217 | return path.resolve(expandHomePath(trimmed, yield* HostProcess.HomeDirectory)); | |
| 218 | 218 | }, |
| 219 | 219 | ); |
| 220 | 220 |
apps/server/src/storageCleanup.ts+2-2
| ... | ... | @@ -38,7 +38,7 @@ import * as TerminalManager from "./terminal/Manager.ts"; |
| 38 | 38 | import { isFilesystemRoot, managedWorktreesDirectories } from "./worktreesDirectory.ts"; |
| 39 | 39 | import * as GitVcsDriver from "./vcs/GitVcsDriver.ts"; |
| 40 | 40 | import { withWorkspaceLease } from "./workspace/workspaceLease.ts"; |
| 41 | import { HostProcessHomeDirectory } from "@t3tools/shared/hostProcess"; | |
| 41 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 42 | 42 | |
| 43 | 43 | const decodeCleanupThread = Schema.decodeUnknownEffect( |
| 44 | 44 | Schema.fromJsonString(OrchestrationV2AppThreadJson), |
| ... | ... | @@ -214,7 +214,7 @@ export const make = Effect.gen(function* () { |
| 214 | 214 | serverSettings, |
| 215 | 215 | config.worktreesDir, |
| 216 | 216 | path, |
| 217 | yield* HostProcessHomeDirectory, | |
| 217 | yield* HostProcess.HomeDirectory, | |
| 218 | 218 | )) { |
| 219 | 219 | // An unmounted drive only skips its own worktrees. |
| 220 | 220 | const root = yield* fs.exists(directory).pipe( |
apps/server/src/telemetry/AnalyticsService.test.ts+7-7
| ... | ... | @@ -11,7 +11,7 @@ import * as HttpClientError from "effect/http/HttpClientError"; |
| 11 | 11 | import * as HttpServer from "effect/http/HttpServer"; |
| 12 | 12 | import * as HttpServerRequest from "effect/http/HttpServerRequest"; |
| 13 | 13 | import * as HttpServerResponse from "effect/http/HttpServerResponse"; |
| 14 | import { HostProcessArchitecture, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 14 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 15 | 15 | |
| 16 | 16 | import * as ServerConfig from "../config.ts"; |
| 17 | 17 | import { getTelemetryIdentifier } from "./Identify.ts"; |
| ... | ... | @@ -105,8 +105,8 @@ it.layer(NodeServices.layer)("AnalyticsService test", (it) => { |
| 105 | 105 | ), |
| 106 | 106 | Layer.provide( |
| 107 | 107 | Layer.mergeAll( |
| 108 | Layer.succeed(HostProcessPlatform, "win32"), | |
| 109 | Layer.succeed(HostProcessArchitecture, "x64"), | |
| 108 | Layer.succeed(HostProcess.Platform, "win32"), | |
| 109 | Layer.succeed(HostProcess.Architecture, "x64"), | |
| 110 | 110 | layerAcceptThenFailClient(batches), |
| 111 | 111 | ), |
| 112 | 112 | ), |
| ... | ... | @@ -167,8 +167,8 @@ it.layer(NodeServices.layer)("AnalyticsService test", (it) => { |
| 167 | 167 | Layer.provide(layerConfig), |
| 168 | 168 | Layer.provide( |
| 169 | 169 | Layer.mergeAll( |
| 170 | Layer.succeed(HostProcessPlatform, "linux"), | |
| 171 | Layer.succeed(HostProcessArchitecture, "arm64"), | |
| 170 | Layer.succeed(HostProcess.Platform, "linux"), | |
| 171 | Layer.succeed(HostProcess.Architecture, "arm64"), | |
| 172 | 172 | ), |
| 173 | 173 | ), |
| 174 | 174 | Layer.provideMerge(NodeHttpServer.layerTest), |
| ... | ... | @@ -257,8 +257,8 @@ it.layer(NodeServices.layer)("AnalyticsService test", (it) => { |
| 257 | 257 | Layer.provide(layerConfig), |
| 258 | 258 | Layer.provide( |
| 259 | 259 | Layer.mergeAll( |
| 260 | Layer.succeed(HostProcessPlatform, "linux"), | |
| 261 | Layer.succeed(HostProcessArchitecture, "arm64"), | |
| 260 | Layer.succeed(HostProcess.Platform, "linux"), | |
| 261 | Layer.succeed(HostProcess.Architecture, "arm64"), | |
| 262 | 262 | ), |
| 263 | 263 | ), |
| 264 | 264 | Layer.provideMerge(NodeHttpServer.layerTest), |
apps/server/src/telemetry/AnalyticsService.ts+3-3
| ... | ... | @@ -8,7 +8,7 @@ |
| 8 | 8 | * |
| 9 | 9 | * @module AnalyticsService |
| 10 | 10 | */ |
| 11 | import { HostProcessArchitecture, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 11 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 12 | 12 | import type { ClientOs } from "@t3tools/contracts"; |
| 13 | 13 | import * as Clock from "effect/Clock"; |
| 14 | 14 | import * as Config from "effect/Config"; |
| ... | ... | @@ -136,8 +136,8 @@ export const make = Effect.gen(function* () { |
| 136 | 136 | // The background flush and the shutdown flush must not send the same batch at once. |
| 137 | 137 | const flushLock = yield* Semaphore.make(1); |
| 138 | 138 | const clientType = serverConfig.mode === "desktop" ? "desktop-app" : "cli-web-client"; |
| 139 | const hostPlatform = yield* HostProcessPlatform; | |
| 140 | const hostArchitecture = yield* HostProcessArchitecture; | |
| 139 | const hostPlatform = yield* HostProcess.Platform; | |
| 140 | const hostArchitecture = yield* HostProcess.Architecture; | |
| 141 | 141 | |
| 142 | 142 | const enqueueBufferedEvent = ( |
| 143 | 143 | uuid: string, |
apps/server/src/telemetry/Identify.ts+2-2
| ... | ... | @@ -9,7 +9,7 @@ import * as Schema from "effect/Schema"; |
| 9 | 9 | |
| 10 | 10 | import { writeFileStringAtomically } from "@t3tools/shared/atomicWrite"; |
| 11 | 11 | import * as ServerConfig from "../config.ts"; |
| 12 | import { HostProcessHomeDirectory } from "@t3tools/shared/hostProcess"; | |
| 12 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 13 | 13 | |
| 14 | 14 | /** |
| 15 | 15 | * Codex writes `tokens` only for ChatGPT logins and omits the key for API-key, |
| ... | ... | @@ -312,6 +312,6 @@ export const getTelemetryIdentifierForHome = Effect.fn("getTelemetryIdentifierFo |
| 312 | 312 | ); |
| 313 | 313 | |
| 314 | 314 | export const getTelemetryIdentifier = Effect.flatMap( |
| 315 | HostProcessHomeDirectory, | |
| 315 | HostProcess.HomeDirectory, | |
| 316 | 316 | getTelemetryIdentifierForHome, |
| 317 | 317 | ); |
apps/server/src/terminal/Manager.test.ts+6-6
| ... | ... | @@ -12,7 +12,7 @@ import { |
| 12 | 12 | ServerSettingsError, |
| 13 | 13 | TerminalProviderInstanceNotFoundError, |
| 14 | 14 | } from "@t3tools/contracts"; |
| 15 | import { HostProcessPlatform, HostProcessArchitecture } from "@t3tools/shared/hostProcess"; | |
| 15 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 16 | 16 | import * as Data from "effect/Data"; |
| 17 | 17 | import * as Clock from "effect/Clock"; |
| 18 | 18 | import * as Deferred from "effect/Deferred"; |
| ... | ... | @@ -315,7 +315,7 @@ const createManager = ( |
| 315 | 315 | ); |
| 316 | 316 | |
| 317 | 317 | const layerWithHostPlatform = (platform: NodeJS.Platform) => |
| 318 | Layer.succeed(HostProcessPlatform, platform); | |
| 318 | Layer.succeed(HostProcess.Platform, platform); | |
| 319 | 319 | |
| 320 | 320 | // Apply the existing line policy, then find the longest code-point-aligned byte tail. |
| 321 | 321 | function retainedHistory(text: string, maxLines: number, maxBytes = Infinity): string { |
| ... | ... | @@ -619,7 +619,7 @@ it.layer( |
| 619 | 619 | |
| 620 | 620 | it.effect("preserves non-notFound cwd stat failures", () => |
| 621 | 621 | Effect.gen(function* () { |
| 622 | if ((yield* HostProcessPlatform) === "win32") return; | |
| 622 | if ((yield* HostProcess.Platform) === "win32") return; | |
| 623 | 623 | |
| 624 | 624 | const path = yield* Path.Path; |
| 625 | 625 | |
| ... | ... | @@ -1826,7 +1826,7 @@ it.layer( |
| 1826 | 1826 | |
| 1827 | 1827 | it.effect("retries with fallback shells when preferred shell spawn fails", () => |
| 1828 | 1828 | Effect.gen(function* () { |
| 1829 | const platform = yield* HostProcessPlatform; | |
| 1829 | const platform = yield* HostProcess.Platform; | |
| 1830 | 1830 | const missingShell = |
| 1831 | 1831 | platform === "win32" ? "C:\\definitely\\missing-shell.exe" : "/definitely/missing-shell -l"; |
| 1832 | 1832 | const { manager, ptyAdapter } = yield* createManager(5, { |
| ... | ... | @@ -1933,7 +1933,7 @@ it.layer( |
| 1933 | 1933 | Effect.provide( |
| 1934 | 1934 | Layer.merge( |
| 1935 | 1935 | layerWithHostPlatform("win32"), |
| 1936 | Layer.succeed(HostProcessArchitecture, "x64"), | |
| 1936 | Layer.succeed(HostProcess.Architecture, "x64"), | |
| 1937 | 1937 | ), |
| 1938 | 1938 | ), |
| 1939 | 1939 | ); |
| ... | ... | @@ -2513,7 +2513,7 @@ it.layer( |
| 2513 | 2513 | |
| 2514 | 2514 | it.effect("starts zsh with prompt spacer disabled to avoid `%` end markers", () => |
| 2515 | 2515 | Effect.gen(function* () { |
| 2516 | if ((yield* HostProcessPlatform) === "win32") return; | |
| 2516 | if ((yield* HostProcess.Platform) === "win32") return; | |
| 2517 | 2517 | const { manager, ptyAdapter } = yield* createManager(5, { |
| 2518 | 2518 | shellResolver: () => "/bin/zsh", |
| 2519 | 2519 | }); |
apps/server/src/terminal/Manager.ts+4-8
| ... | ... | @@ -42,11 +42,7 @@ import { |
| 42 | 42 | } from "@t3tools/contracts"; |
| 43 | 43 | import { makeKeyedCoalescingWorker } from "@t3tools/shared/KeyedCoalescingWorker"; |
| 44 | 44 | import * as KeyedLock from "@t3tools/shared/KeyedLock"; |
| 45 | import { | |
| 46 | HostProcessArchitecture, | |
| 47 | HostProcessHomeDirectory, | |
| 48 | HostProcessPlatform, | |
| 49 | } from "@t3tools/shared/hostProcess"; | |
| 45 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 50 | 46 | import { mergePathEntries } from "@t3tools/shared/shell"; |
| 51 | 47 | |
| 52 | 48 | import { acpRegistryManagedBinaryDirectories } from "@t3tools/provider-acp-registry/server"; |
| ... | ... | @@ -1482,8 +1478,8 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func |
| 1482 | 1478 | const logsDir = options.logsDir; |
| 1483 | 1479 | const historyLineLimit = options.historyLineLimit ?? DEFAULT_HISTORY_LINE_LIMIT; |
| 1484 | 1480 | const historyByteLimit = options.historyByteLimit ?? DEFAULT_HISTORY_BYTE_LIMIT; |
| 1485 | const platform = yield* HostProcessPlatform; | |
| 1486 | const architecture = yield* HostProcessArchitecture; | |
| 1481 | const platform = yield* HostProcess.Platform; | |
| 1482 | const architecture = yield* HostProcess.Architecture; | |
| 1487 | 1483 | // Terminals must inherit the user's full environment (minus the blocklist |
| 1488 | 1484 | // applied in createTerminalSpawnEnv) — an allowlist here silently strips |
| 1489 | 1485 | // things like PSModulePath, DISPLAY, proxies, and toolchain variables. |
| ... | ... | @@ -2253,7 +2249,7 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func |
| 2253 | 2249 | baseEnv, |
| 2254 | 2250 | session.runtimeEnv, |
| 2255 | 2251 | platform, |
| 2256 | yield* HostProcessHomeDirectory, | |
| 2252 | yield* HostProcess.HomeDirectory, | |
| 2257 | 2253 | ); |
| 2258 | 2254 | // Append (never prepend) managed ACP agent install directories so |
| 2259 | 2255 | // `kimi login` and friends resolve by name without shadowing any |
apps/server/src/terminal/NodePtyAdapter.test.ts+5-5
| ... | ... | @@ -3,7 +3,7 @@ import * as NodeNet from "node:net"; |
| 3 | 3 | |
| 4 | 4 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 5 | 5 | import { assert, it } from "@effect/vitest"; |
| 6 | import { HostProcessArchitecture, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 6 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 7 | 7 | import * as Cause from "effect/Cause"; |
| 8 | 8 | import * as Effect from "effect/Effect"; |
| 9 | 9 | import * as Exit from "effect/Exit"; |
| ... | ... | @@ -66,8 +66,8 @@ const layerTestFor = (platform: NodeJS.Platform = "win32") => |
| 66 | 66 | Layer.provide( |
| 67 | 67 | Layer.mergeAll( |
| 68 | 68 | NodeServices.layer, |
| 69 | Layer.succeed(HostProcessPlatform, platform), | |
| 70 | Layer.succeed(HostProcessArchitecture, "x64"), | |
| 69 | Layer.succeed(HostProcess.Platform, platform), | |
| 70 | Layer.succeed(HostProcess.Architecture, "x64"), | |
| 71 | 71 | Layer.succeed(NodePtyAdapter.NodePtyModuleLoaderRef, () => Promise.resolve(fakeNodePty)), |
| 72 | 72 | ), |
| 73 | 73 | ), |
| ... | ... | @@ -272,8 +272,8 @@ it.effect("reports native module load failures as structured startup defects", ( |
| 272 | 272 | Effect.provide( |
| 273 | 273 | Layer.mergeAll( |
| 274 | 274 | NodeServices.layer, |
| 275 | Layer.succeed(HostProcessPlatform, "win32"), | |
| 276 | Layer.succeed(HostProcessArchitecture, "x64"), | |
| 275 | Layer.succeed(HostProcess.Platform, "win32"), | |
| 276 | Layer.succeed(HostProcess.Architecture, "x64"), | |
| 277 | 277 | ), |
| 278 | 278 | ), |
| 279 | 279 | ), |
apps/server/src/terminal/NodePtyAdapter.ts+8-8
| ... | ... | @@ -7,7 +7,7 @@ import * as FileSystem from "effect/FileSystem"; |
| 7 | 7 | import * as Layer from "effect/Layer"; |
| 8 | 8 | import * as Path from "effect/Path"; |
| 9 | 9 | import * as Schema from "effect/Schema"; |
| 10 | import { HostProcessArchitecture, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 10 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 11 | 11 | |
| 12 | 12 | import * as PtyAdapter from "@t3tools/shared/PtyAdapter"; |
| 13 | 13 | |
| ... | ... | @@ -46,8 +46,8 @@ let didEnsureSpawnHelperExecutable = false; |
| 46 | 46 | const resolveNodePtySpawnHelperPath = Effect.gen(function* () { |
| 47 | 47 | const path = yield* Path.Path; |
| 48 | 48 | const fs = yield* FileSystem.FileSystem; |
| 49 | const platform = yield* HostProcessPlatform; | |
| 50 | const architecture = yield* HostProcessArchitecture; | |
| 49 | const platform = yield* HostProcess.Platform; | |
| 50 | const architecture = yield* HostProcess.Architecture; | |
| 51 | 51 | |
| 52 | 52 | const packageJsonPath = requireForNodePty.resolve("node-pty/package.json"); |
| 53 | 53 | const packageDir = path.dirname(packageJsonPath); |
| ... | ... | @@ -67,7 +67,7 @@ const resolveNodePtySpawnHelperPath = Effect.gen(function* () { |
| 67 | 67 | |
| 68 | 68 | const ensureNodePtySpawnHelperExecutable = Effect.fn(function* () { |
| 69 | 69 | const fs = yield* FileSystem.FileSystem; |
| 70 | const platform = yield* HostProcessPlatform; | |
| 70 | const platform = yield* HostProcess.Platform; | |
| 71 | 71 | if (platform === "win32") return; |
| 72 | 72 | if (didEnsureSpawnHelperExecutable) return; |
| 73 | 73 | |
| ... | ... | @@ -236,8 +236,8 @@ export const make = Effect.fn("NodePtyAdapter.make")(function* () { |
| 236 | 236 | const loadNodePtyModule = yield* NodePtyModuleLoaderRef; |
| 237 | 237 | const fs = yield* FileSystem.FileSystem; |
| 238 | 238 | const path = yield* Path.Path; |
| 239 | const platform = yield* HostProcessPlatform; | |
| 240 | const architecture = yield* HostProcessArchitecture; | |
| 239 | const platform = yield* HostProcess.Platform; | |
| 240 | const architecture = yield* HostProcess.Architecture; | |
| 241 | 241 | |
| 242 | 242 | const nodePty = yield* Effect.tryPromise({ |
| 243 | 243 | try: loadNodePtyModule, |
| ... | ... | @@ -253,8 +253,8 @@ export const make = Effect.fn("NodePtyAdapter.make")(function* () { |
| 253 | 253 | ensureNodePtySpawnHelperExecutable().pipe( |
| 254 | 254 | Effect.provideService(FileSystem.FileSystem, fs), |
| 255 | 255 | Effect.provideService(Path.Path, path), |
| 256 | Effect.provideService(HostProcessPlatform, platform), | |
| 257 | Effect.provideService(HostProcessArchitecture, architecture), | |
| 256 | Effect.provideService(HostProcess.Platform, platform), | |
| 257 | Effect.provideService(HostProcess.Architecture, architecture), | |
| 258 | 258 | Effect.orElseSucceed(() => undefined), |
| 259 | 259 | ), |
| 260 | 260 | ); |
apps/server/src/textGeneration/ClaudeTextGeneration.test.ts+3-3
| ... | ... | @@ -1,7 +1,7 @@ |
| 1 | 1 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 2 | 2 | import { it } from "@effect/vitest"; |
| 3 | 3 | import { ClaudeSettings, ProviderInstanceId } from "@t3tools/contracts"; |
| 4 | import { HostProcessPlatform, isHostWindows } from "@t3tools/shared/hostProcess"; | |
| 4 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 5 | 5 | import { createModelSelection } from "@t3tools/shared/model"; |
| 6 | 6 | import * as Effect from "effect/Effect"; |
| 7 | 7 | import * as FileSystem from "effect/FileSystem"; |
| ... | ... | @@ -35,7 +35,7 @@ function makeFakeClaudeBinary(dir: string) { |
| 35 | 35 | return Effect.gen(function* () { |
| 36 | 36 | const path = yield* Path.Path; |
| 37 | 37 | const fs = yield* FileSystem.FileSystem; |
| 38 | const platform = yield* HostProcessPlatform; | |
| 38 | const platform = yield* HostProcess.Platform; | |
| 39 | 39 | const binDir = path.join(dir, "bin"); |
| 40 | 40 | const fixturePath = yield* path.fromFileUrl( |
| 41 | 41 | new URL("./testing/ClaudeTextGeneration.fixture.mjs", import.meta.url), |
| ... | ... | @@ -69,7 +69,7 @@ function withFakeClaudeEnv<A, E, R>( |
| 69 | 69 | const fs = yield* FileSystem.FileSystem; |
| 70 | 70 | const tempDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3code-claude-text-" }); |
| 71 | 71 | const binDir = yield* makeFakeClaudeBinary(tempDir); |
| 72 | const pathDelimiter = (yield* isHostWindows) ? ";" : ":"; | |
| 72 | const pathDelimiter = (yield* HostProcess.isWindows) ? ";" : ":"; | |
| 73 | 73 | const previousPath = process.env.PATH; |
| 74 | 74 | const previousOutput = process.env.T3_FAKE_CLAUDE_OUTPUT; |
| 75 | 75 | const previousExitCode = process.env.T3_FAKE_CLAUDE_EXIT_CODE; |
apps/server/src/textGeneration/CodexTextGeneration.ts+2-2
| ... | ... | @@ -26,7 +26,7 @@ import { |
| 26 | 26 | } from "@t3tools/provider-core/server/textGenerationUtils"; |
| 27 | 27 | import { codexModelFamily, getModelSelectionStringOptionValue } from "@t3tools/shared/model"; |
| 28 | 28 | import { getCodexServiceTierOptionValue } from "../codexModelOptions.ts"; |
| 29 | import { HostProcessHomeDirectory } from "@t3tools/shared/hostProcess"; | |
| 29 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 30 | 30 | |
| 31 | 31 | const CODEX_TIMEOUT_MS = 180_000; |
| 32 | 32 | const encodeJsonString = Schema.encodeEffect(Schema.fromJsonString(Schema.Unknown)); |
| ... | ... | @@ -218,7 +218,7 @@ export const makeCodexTextGeneration = Effect.fn("makeCodexTextGeneration")(func |
| 218 | 218 | ? { |
| 219 | 219 | CODEX_HOME: expandHomePath( |
| 220 | 220 | effectiveConfig.homePath, |
| 221 | yield* HostProcessHomeDirectory, | |
| 221 | yield* HostProcess.HomeDirectory, | |
| 222 | 222 | ), |
| 223 | 223 | } |
| 224 | 224 | : {}), |
apps/server/src/usage/UsageService.test.ts+5-5
| ... | ... | @@ -8,7 +8,7 @@ import * as NodeSqlite from "node:sqlite"; |
| 8 | 8 | |
| 9 | 9 | import { assert, describe, it } from "@effect/vitest"; |
| 10 | 10 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 11 | import { HostProcessEnvironment, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 11 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 12 | 12 | import { mergeUsage } from "@t3tools/shared/usageMerge"; |
| 13 | 13 | import { |
| 14 | 14 | EnvironmentId, |
| ... | ... | @@ -134,7 +134,7 @@ const layerService = (input: { |
| 134 | 134 | Layer.provideMerge(Layer.mock(ServerSecretStore.ServerSecretStore)({})), |
| 135 | 135 | Layer.provideMerge(ServerConfig.layerTest(process.cwd(), { prefix: input.prefix })), |
| 136 | 136 | Layer.provideMerge(NodeServices.layer), |
| 137 | Layer.provideMerge(Layer.succeed(HostProcessPlatform, input.platform ?? "linux")), | |
| 137 | Layer.provideMerge(Layer.succeed(HostProcess.Platform, input.platform ?? "linux")), | |
| 138 | 138 | Layer.provideMerge(ServerSettings.layerTest(input.settings)), |
| 139 | 139 | Layer.provideMerge( |
| 140 | 140 | Layer.succeed( |
| ... | ... | @@ -150,7 +150,7 @@ const layerService = (input: { |
| 150 | 150 | ), |
| 151 | 151 | ), |
| 152 | 152 | Layer.provideMerge( |
| 153 | Layer.succeed(HostProcessEnvironment, { | |
| 153 | Layer.succeed(HostProcess.Environment, { | |
| 154 | 154 | HOME: input.home, |
| 155 | 155 | GROK_HOME: NodePath.join(input.home, "grok"), |
| 156 | 156 | OPENCODE_DATA_DIR: NodePath.join(input.home, "opencode"), |
| ... | ... | @@ -1356,7 +1356,7 @@ describe("UsageService", () => { |
| 1356 | 1356 | }).pipe(Effect.scoped), |
| 1357 | 1357 | ); |
| 1358 | 1358 | |
| 1359 | it.live.skipIf(HostProcessPlatform.defaultValue() === "win32")( | |
| 1359 | it.live.skipIf(HostProcess.Platform.defaultValue() === "win32")( | |
| 1360 | 1360 | "keeps a newer cached read when a slower scan of another window finishes later", |
| 1361 | 1361 | () => |
| 1362 | 1362 | Effect.gen(function* () { |
| ... | ... | @@ -1387,7 +1387,7 @@ describe("UsageService", () => { |
| 1387 | 1387 | }).pipe(Effect.scoped), |
| 1388 | 1388 | ); |
| 1389 | 1389 | |
| 1390 | it.live.skipIf(HostProcessPlatform.defaultValue() === "win32")( | |
| 1390 | it.live.skipIf(HostProcess.Platform.defaultValue() === "win32")( | |
| 1391 | 1391 | "keeps the later read when a scan that read earlier finishes first", |
| 1392 | 1392 | () => |
| 1393 | 1393 | Effect.gen(function* () { |
apps/server/src/usage/UsageService.ts+2-2
| ... | ... | @@ -31,7 +31,7 @@ import { |
| 31 | 31 | type UsageSummaryInput, |
| 32 | 32 | UsageReadError, |
| 33 | 33 | } from "@t3tools/contracts"; |
| 34 | import { HostProcessEnvironment } from "@t3tools/shared/hostProcess"; | |
| 34 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 35 | 35 | import * as Cause from "effect/Cause"; |
| 36 | 36 | import * as Clock from "effect/Clock"; |
| 37 | 37 | import * as Context from "effect/Context"; |
| ... | ... | @@ -227,7 +227,7 @@ export const make = Effect.gen(function* () { |
| 227 | 227 | const config = yield* ServerConfig.ServerConfig; |
| 228 | 228 | const settingsService = yield* ServerSettings.ServerSettingsService; |
| 229 | 229 | const httpClient = yield* HttpClient.HttpClient; |
| 230 | const hostEnvironment = yield* HostProcessEnvironment; | |
| 230 | const hostEnvironment = yield* HostProcess.Environment; | |
| 231 | 231 | // The readers yield their own services; scans run them against this context. |
| 232 | 232 | const readerContext = yield* Effect.context<BuiltInUsageReadersEnv>(); |
| 233 | 233 |
apps/server/src/vcs/GitVcsDriverCore.test.ts+5-5
| ... | ... | @@ -1,7 +1,7 @@ |
| 1 | 1 | // @effect-diagnostics nodeBuiltinImport:off - realpathSync.native resolves Windows 8.3 short names, which the Effect realPath does not. |
| 2 | 2 | import * as NodeFS from "node:fs"; |
| 3 | 3 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 4 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 4 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 5 | 5 | import { assert, it, describe } from "@effect/vitest"; |
| 6 | 6 | import * as Deferred from "effect/Deferred"; |
| 7 | 7 | import * as Effect from "effect/Effect"; |
| ... | ... | @@ -1864,7 +1864,7 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => { |
| 1864 | 1864 | yield* writeTextFile(cwd, " leading.txt", "whitespace path\n"); |
| 1865 | 1865 | yield* writeTextFile(cwd, "l.txt", "other\n"); |
| 1866 | 1866 | yield* writeTextFile(cwd, "binary.dat", "binary\0data"); |
| 1867 | if ((yield* HostProcessPlatform) !== "win32") { | |
| 1867 | if ((yield* HostProcess.Platform) !== "win32") { | |
| 1868 | 1868 | yield* writeTextFile(cwd, "tab\tand\nnewline.txt", "unusual path\n"); |
| 1869 | 1869 | } |
| 1870 | 1870 | yield* git(cwd, ["add", "."]); |
| ... | ... | @@ -1906,7 +1906,7 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => { |
| 1906 | 1906 | additions: 0, |
| 1907 | 1907 | deletions: 0, |
| 1908 | 1908 | }); |
| 1909 | if ((yield* HostProcessPlatform) !== "win32") { | |
| 1909 | if ((yield* HostProcess.Platform) !== "win32") { | |
| 1910 | 1910 | assert.deepInclude(branch.files ?? [], { |
| 1911 | 1911 | path: "tab\tand\nnewline.txt", |
| 1912 | 1912 | previousPath: null, |
| ... | ... | @@ -2890,7 +2890,7 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => { |
| 2890 | 2890 | }); |
| 2891 | 2891 | |
| 2892 | 2892 | // NTFS rejects a newline in a file name, so there is nothing to preserve there. |
| 2893 | it.effect.skipIf(HostProcessPlatform.defaultValue() === "win32")( | |
| 2893 | it.effect.skipIf(HostProcess.Platform.defaultValue() === "win32")( | |
| 2894 | 2894 | "preserves newline characters in worktree paths when listing refs", |
| 2895 | 2895 | () => |
| 2896 | 2896 | Effect.gen(function* () { |
| ... | ... | @@ -3965,7 +3965,7 @@ describe("Windows long path configuration", () => { |
| 3965 | 3965 | const layer = GitVcsDriver.layer.pipe( |
| 3966 | 3966 | Layer.provide(layerServerConfig), |
| 3967 | 3967 | Layer.provideMerge(NodeServices.layer), |
| 3968 | Layer.provide(Layer.succeed(HostProcessPlatform, platform)), | |
| 3968 | Layer.provide(Layer.succeed(HostProcess.Platform, platform)), | |
| 3969 | 3969 | ); |
| 3970 | 3970 | return yield* Effect.gen(function* () { |
| 3971 | 3971 | const driver = yield* GitVcsDriver.GitVcsDriver; |
apps/server/src/vcs/GitVcsDriverCore.ts+4-4
| ... | ... | @@ -29,7 +29,7 @@ import { |
| 29 | 29 | type VcsRef, |
| 30 | 30 | } from "@t3tools/contracts"; |
| 31 | 31 | import { dedupeRemoteBranchesWithLocalMatches, normalizeGitRemoteUrl } from "@t3tools/shared/git"; |
| 32 | import { HostProcessHomeDirectory, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 32 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 33 | 33 | import { compactTraceAttributes } from "@t3tools/shared/observability"; |
| 34 | 34 | import { decodeJsonResult } from "@t3tools/shared/schemaJson"; |
| 35 | 35 | import { parseT3ProjectFile } from "@t3tools/shared/t3ProjectFile"; |
| ... | ... | @@ -944,7 +944,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function* |
| 944 | 944 | const commandSpawner = yield* ChildProcessSpawner.ChildProcessSpawner; |
| 945 | 945 | const { worktreesDir } = yield* ServerConfig.ServerConfig; |
| 946 | 946 | const crypto = yield* Crypto.Crypto; |
| 947 | const hostPlatform = yield* HostProcessPlatform; | |
| 947 | const hostPlatform = yield* HostProcess.Platform; | |
| 948 | 948 | |
| 949 | 949 | const executeRaw: GitVcsDriver.GitVcsDriver["Service"]["execute"] = Effect.fnUntraced( |
| 950 | 950 | function* (input) { |
| ... | ... | @@ -2657,7 +2657,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function* |
| 2657 | 2657 | "hash-object", |
| 2658 | 2658 | "-t", |
| 2659 | 2659 | "tree", |
| 2660 | (yield* HostProcessPlatform) === "win32" ? "NUL" : "/dev/null", | |
| 2660 | (yield* HostProcess.Platform) === "win32" ? "NUL" : "/dev/null", | |
| 2661 | 2661 | ]); |
| 2662 | 2662 | return stdout.trim(); |
| 2663 | 2663 | }); |
| ... | ... | @@ -3403,7 +3403,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function* |
| 3403 | 3403 | options?.worktreesDirectory ?? "", |
| 3404 | 3404 | worktreesDir, |
| 3405 | 3405 | path, |
| 3406 | yield* HostProcessHomeDirectory, | |
| 3406 | yield* HostProcess.HomeDirectory, | |
| 3407 | 3407 | ); |
| 3408 | 3408 | if (parentDir === null) { |
| 3409 | 3409 | return yield* new GitCommandError({ |
apps/server/src/vcs/VcsProcess.test.ts+2-2
| ... | ... | @@ -1,6 +1,6 @@ |
| 1 | 1 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 2 | 2 | import { assert, describe, expect, it } from "@effect/vitest"; |
| 3 | import { HostProcessWorkingDirectory } from "@t3tools/shared/hostProcess"; | |
| 3 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 4 | 4 | import * as Duration from "effect/Duration"; |
| 5 | 5 | import * as Deferred from "effect/Deferred"; |
| 6 | 6 | import * as Effect from "effect/Effect"; |
| ... | ... | @@ -535,7 +535,7 @@ describe("VcsProcess.run", () => { |
| 535 | 535 | operation: "test.output-limit", |
| 536 | 536 | command: "node", |
| 537 | 537 | args: ["-e", "process.stdout.write('x'.repeat(2048))"], |
| 538 | cwd: yield* HostProcessWorkingDirectory, | |
| 538 | cwd: yield* HostProcess.WorkingDirectory, | |
| 539 | 539 | maxOutputBytes: 128, |
| 540 | 540 | outputMode: "error", |
| 541 | 541 | }).pipe(Effect.flip); |
apps/server/src/workspace/WorkspaceEntries.test.ts+3-3
| ... | ... | @@ -11,7 +11,7 @@ import * as PlatformError from "effect/PlatformError"; |
| 11 | 11 | import { vi } from "vite-plus/test"; |
| 12 | 12 | |
| 13 | 13 | import * as ServerConfig from "../config.ts"; |
| 14 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 14 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 15 | 15 | import * as VcsProcess from "../vcs/VcsProcess.ts"; |
| 16 | 16 | import * as WorkspaceEntries from "./WorkspaceEntries.ts"; |
| 17 | 17 | import * as WorkspacePaths from "./WorkspacePaths.ts"; |
| ... | ... | @@ -84,7 +84,7 @@ const searchWorkspaceEntries = (input: { |
| 84 | 84 | }); |
| 85 | 85 | |
| 86 | 86 | const appendSeparator = (input: string) => |
| 87 | Effect.map(HostProcessPlatform, (platform) => | |
| 87 | Effect.map(HostProcess.Platform, (platform) => | |
| 88 | 88 | input.endsWith("/") || input.endsWith("\\") |
| 89 | 89 | ? input |
| 90 | 90 | : `${input}${platform === "win32" ? "\\" : "/"}`, |
| ... | ... | @@ -143,7 +143,7 @@ it.layer(layerTest, { excludeTestServices: true })("WorkspaceEntries", (it) => { |
| 143 | 143 | const fileSystem = yield* FileSystem.FileSystem; |
| 144 | 144 | const path = yield* Path.Path; |
| 145 | 145 | yield* writeTextFile(cwd, ".git/HEAD"); |
| 146 | const platform = yield* HostProcessPlatform; | |
| 146 | const platform = yield* HostProcess.Platform; | |
| 147 | 147 | if (platform !== "win32") yield* fileSystem.symlink(outside, path.join(cwd, "external")); |
| 148 | 148 | const workspaceEntries = yield* WorkspaceEntries.WorkspaceEntries; |
| 149 | 149 | for (const directoryPath of [ |
apps/server/src/workspace/WorkspaceEntries.ts+4-4
| ... | ... | @@ -19,7 +19,7 @@ import type { |
| 19 | 19 | ProjectSearchEntriesInput, |
| 20 | 20 | ProjectSearchEntriesResult, |
| 21 | 21 | } from "@t3tools/contracts"; |
| 22 | import { HostProcessHomeDirectory, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 22 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 23 | 23 | import { isExplicitRelativePath, isWindowsAbsolutePath } from "@t3tools/shared/path"; |
| 24 | 24 | import { normalizeSearchQuery } from "@t3tools/shared/searchRanking"; |
| 25 | 25 | |
| ... | ... | @@ -110,7 +110,7 @@ const resolveBrowseTarget = Effect.fn("WorkspaceEntries.resolveBrowseTarget")(fu |
| 110 | 110 | input: FilesystemBrowseInput, |
| 111 | 111 | path: Path.Path, |
| 112 | 112 | ): Effect.fn.Return<string, WorkspaceEntriesBrowseError> { |
| 113 | const platform = yield* HostProcessPlatform; | |
| 113 | const platform = yield* HostProcess.Platform; | |
| 114 | 114 | if (platform !== "win32" && isWindowsAbsolutePath(input.partialPath)) { |
| 115 | 115 | return yield* new WorkspaceEntriesWindowsPathUnsupportedError({ |
| 116 | 116 | cwd: input.cwd, |
| ... | ... | @@ -120,7 +120,7 @@ const resolveBrowseTarget = Effect.fn("WorkspaceEntries.resolveBrowseTarget")(fu |
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | if (!isExplicitRelativePath(input.partialPath)) { |
| 123 | return path.resolve(expandHomePath(input.partialPath, yield* HostProcessHomeDirectory)); | |
| 123 | return path.resolve(expandHomePath(input.partialPath, yield* HostProcess.HomeDirectory)); | |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | if (!input.cwd) { |
| ... | ... | @@ -129,7 +129,7 @@ const resolveBrowseTarget = Effect.fn("WorkspaceEntries.resolveBrowseTarget")(fu |
| 129 | 129 | }); |
| 130 | 130 | } |
| 131 | 131 | return path.resolve( |
| 132 | expandHomePath(input.cwd, yield* HostProcessHomeDirectory), | |
| 132 | expandHomePath(input.cwd, yield* HostProcess.HomeDirectory), | |
| 133 | 133 | input.partialPath, |
| 134 | 134 | ); |
| 135 | 135 | }); |
apps/server/src/workspace/WorkspaceFileSystem.test.ts+2-2
| ... | ... | @@ -14,7 +14,7 @@ import * as VcsProcess from "../vcs/VcsProcess.ts"; |
| 14 | 14 | import * as WorkspaceEntries from "./WorkspaceEntries.ts"; |
| 15 | 15 | import * as WorkspaceFileSystem from "./WorkspaceFileSystem.ts"; |
| 16 | 16 | import * as WorkspacePaths from "./WorkspacePaths.ts"; |
| 17 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 17 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 18 | 18 | import { symlinksSupported } from "@t3tools/shared/testing/symlinks"; |
| 19 | 19 | |
| 20 | 20 | const layerProject = WorkspaceFileSystem.layer.pipe( |
| ... | ... | @@ -102,7 +102,7 @@ it.layer(layerTest, { excludeTestServices: true })("WorkspaceFileSystemLive", (i |
| 102 | 102 | ); |
| 103 | 103 | |
| 104 | 104 | // Needs mkfifo; Windows has no FIFOs to reject. |
| 105 | it.effect.skipIf(HostProcessPlatform.defaultValue() === "win32")( | |
| 105 | it.effect.skipIf(HostProcess.Platform.defaultValue() === "win32")( | |
| 106 | 106 | "rejects a FIFO without blocking on open", |
| 107 | 107 | () => |
| 108 | 108 | Effect.gen(function* () { |
apps/server/src/workspace/WorkspacePaths.ts+2-2
| ... | ... | @@ -15,7 +15,7 @@ import * as Path from "effect/Path"; |
| 15 | 15 | import * as Schema from "effect/Schema"; |
| 16 | 16 | |
| 17 | 17 | import { expandHomePath } from "@t3tools/provider-core/server/pathExpansion"; |
| 18 | import { HostProcessHomeDirectory } from "@t3tools/shared/hostProcess"; | |
| 18 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 19 | 19 | |
| 20 | 20 | export class WorkspaceRootNotExistsError extends Schema.TaggedError<WorkspaceRootNotExistsError>()( |
| 21 | 21 | "WorkspaceRootNotExistsError", |
| ... | ... | @@ -154,7 +154,7 @@ export const make = Effect.gen(function* () { |
| 154 | 154 | "WorkspacePaths.normalizeWorkspaceRoot", |
| 155 | 155 | )(function* (workspaceRoot, options) { |
| 156 | 156 | const normalizedWorkspaceRoot = path.resolve( |
| 157 | expandHomePath(workspaceRoot.trim(), yield* HostProcessHomeDirectory), | |
| 157 | expandHomePath(workspaceRoot.trim(), yield* HostProcess.HomeDirectory), | |
| 158 | 158 | ); |
| 159 | 159 | let workspaceStat = yield* statWorkspaceRoot( |
| 160 | 160 | workspaceRoot, |
apps/server/src/ws.test.ts+2-2
| ... | ... | @@ -4,7 +4,7 @@ import { |
| 4 | 4 | type ServerConfig, |
| 5 | 5 | type ServerConfigStreamEvent, |
| 6 | 6 | } from "@t3tools/contracts"; |
| 7 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 7 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 8 | 8 | import * as ConfigProvider from "effect/ConfigProvider"; |
| 9 | 9 | import * as Deferred from "effect/Deferred"; |
| 10 | 10 | import * as Duration from "effect/Duration"; |
| ... | ... | @@ -164,7 +164,7 @@ const makeParkedWindowsLauncher = Effect.gen(function* () { |
| 164 | 164 | ); |
| 165 | 165 | const onWindows = <A, E, R>(effect: Effect.Effect<A, E, R>) => |
| 166 | 166 | effect.pipe( |
| 167 | Effect.provideService(HostProcessPlatform, "win32"), | |
| 167 | Effect.provideService(HostProcess.Platform, "win32"), | |
| 168 | 168 | Effect.provide( |
| 169 | 169 | ConfigProvider.layer( |
| 170 | 170 | ConfigProvider.fromEnv({ |
oxlint-plugin-t3code/rules/no-global-process-runtime.test.ts+6-6
| ... | ... | @@ -8,10 +8,10 @@ describe("t3code/no-global-process-runtime", () => { |
| 8 | 8 | rule.valid( |
| 9 | 9 | "allows injected host process references", |
| 10 | 10 | ` |
| 11 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 11 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 12 | 12 | import * as Effect from "effect/Effect"; |
| 13 | 13 | |
| 14 | export const isWindows = Effect.map(HostProcessPlatform, (platform) => platform === "win32"); | |
| 14 | export const isWindows = Effect.map(HostProcess.Platform, (platform) => platform === "win32"); | |
| 15 | 15 | `, |
| 16 | 16 | ); |
| 17 | 17 | |
| ... | ... | @@ -38,7 +38,7 @@ describe("t3code/no-global-process-runtime", () => { |
| 38 | 38 | export const isWindows = process.platform === "win32"; |
| 39 | 39 | `, |
| 40 | 40 | (output) => { |
| 41 | assert.match(output, /Use HostProcessPlatform/); | |
| 41 | assert.match(output, /Use HostProcess\.Platform/); | |
| 42 | 42 | }, |
| 43 | 43 | ); |
| 44 | 44 | |
| ... | ... | @@ -48,7 +48,7 @@ describe("t3code/no-global-process-runtime", () => { |
| 48 | 48 | export const isArm = process.arch === "arm64"; |
| 49 | 49 | `, |
| 50 | 50 | (output) => { |
| 51 | assert.match(output, /Use HostProcessArchitecture/); | |
| 51 | assert.match(output, /Use HostProcess\.Architecture/); | |
| 52 | 52 | }, |
| 53 | 53 | ); |
| 54 | 54 | |
| ... | ... | @@ -67,7 +67,7 @@ describe("t3code/no-global-process-runtime", () => { |
| 67 | 67 | export const isWindows = NodeOS.platform() === "win32"; |
| 68 | 68 | `, |
| 69 | 69 | (output) => { |
| 70 | assert.match(output, /Use HostProcessPlatform/); | |
| 70 | assert.match(output, /Use HostProcess\.Platform/); | |
| 71 | 71 | }, |
| 72 | 72 | ); |
| 73 | 73 | |
| ... | ... | @@ -79,7 +79,7 @@ describe("t3code/no-global-process-runtime", () => { |
| 79 | 79 | export const isArm = hostArch() === "arm64"; |
| 80 | 80 | `, |
| 81 | 81 | (output) => { |
| 82 | assert.match(output, /Use HostProcessArchitecture/); | |
| 82 | assert.match(output, /Use HostProcess\.Architecture/); | |
| 83 | 83 | }, |
| 84 | 84 | ); |
| 85 | 85 |
oxlint-plugin-t3code/rules/no-global-process-runtime.ts+1-1
| ... | ... | @@ -19,7 +19,7 @@ const isGlobalProcessObject = (node: unknown): boolean => { |
| 19 | 19 | }; |
| 20 | 20 | |
| 21 | 21 | const message = (property: string) => |
| 22 | `Use HostProcess${property === "arch" ? "Architecture" : "Platform"} instead of process.${property}; inject the runtime reference in Effect code and provide it explicitly in tests.`; | |
| 22 | `Use HostProcess.${property === "arch" ? "Architecture" : "Platform"} instead of process.${property}; inject the runtime reference in Effect code and provide it explicitly in tests.`; | |
| 23 | 23 | |
| 24 | 24 | const getLiteralStringValue = (node: unknown): Option.Option<string> => { |
| 25 | 25 | if (typeof node !== "object" || node === null) return Option.none(); |
packages/provider-acp-registry/src/server/AcpRegistrySupport.test.ts+14-18
| ... | ... | @@ -6,11 +6,7 @@ import { |
| 6 | 6 | ProviderInstanceId, |
| 7 | 7 | } from "@t3tools/contracts"; |
| 8 | 8 | import { AcpRegistrySettings } from "../settings.ts"; |
| 9 | import { | |
| 10 | HostProcessArchitecture, | |
| 11 | HostProcessEnvironment, | |
| 12 | HostProcessPlatform, | |
| 13 | } from "@t3tools/shared/hostProcess"; | |
| 9 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 14 | 10 | import { SpawnExecutableResolution } from "@t3tools/shared/shell"; |
| 15 | 11 | import * as Deferred from "effect/Deferred"; |
| 16 | 12 | import * as Effect from "effect/Effect"; |
| ... | ... | @@ -63,9 +59,9 @@ function layerResolver( |
| 63 | 59 | return Layer.mergeAll( |
| 64 | 60 | NodeServices.layer, |
| 65 | 61 | TestProviderHost.layer().pipe(Layer.provide(NodeServices.layer)), |
| 66 | Layer.succeed(HostProcessPlatform, "linux"), | |
| 67 | Layer.succeed(HostProcessArchitecture, "x64"), | |
| 68 | Layer.succeed(HostProcessEnvironment, environment), | |
| 62 | Layer.succeed(HostProcess.Platform, "linux"), | |
| 63 | Layer.succeed(HostProcess.Architecture, "x64"), | |
| 64 | Layer.succeed(HostProcess.Environment, environment), | |
| 69 | 65 | Layer.succeed(HttpClient.HttpClient, HttpClient.make(execute)), |
| 70 | 66 | ); |
| 71 | 67 | } |
| ... | ... | @@ -229,7 +225,7 @@ describe("AcpRegistrySupport", () => { |
| 229 | 225 | cacheDir, |
| 230 | 226 | toolsDir: `${cacheDir}/tools`, |
| 231 | 227 | registryUrl, |
| 232 | }).pipe(Effect.provideService(HostProcessEnvironment, hostEnvironment)); | |
| 228 | }).pipe(Effect.provideService(HostProcess.Environment, hostEnvironment)); | |
| 233 | 229 | const localSettings = decodeAcpRegistrySettings({ |
| 234 | 230 | source: "local", |
| 235 | 231 | commandPath: "dsh", |
| ... | ... | @@ -279,7 +275,7 @@ describe("AcpRegistrySupport", () => { |
| 279 | 275 | cacheDir, |
| 280 | 276 | toolsDir: `${cacheDir}/tools`, |
| 281 | 277 | registryUrl, |
| 282 | }).pipe(Effect.provideService(HostProcessEnvironment, environment)); | |
| 278 | }).pipe(Effect.provideService(HostProcess.Environment, environment)); | |
| 283 | 279 | const resolved = yield* resolver.resolve( |
| 284 | 280 | decodeAcpRegistrySettings({ source: "local", commandPath }), |
| 285 | 281 | "/workspace", |
| ... | ... | @@ -300,7 +296,7 @@ describe("AcpRegistrySupport", () => { |
| 300 | 296 | toolsDir: `${cacheDir}/tools`, |
| 301 | 297 | registryUrl, |
| 302 | 298 | }).pipe( |
| 303 | Effect.provideService(HostProcessPlatform, "win32"), | |
| 299 | Effect.provideService(HostProcess.Platform, "win32"), | |
| 304 | 300 | Effect.provideService(SpawnExecutableResolution, () => `C:\\bin\\dsh${extension}`), |
| 305 | 301 | ); |
| 306 | 302 | const localSettings = decodeAcpRegistrySettings({ source: "local", commandPath: "dsh" }); |
| ... | ... | @@ -432,7 +428,7 @@ describe("AcpRegistrySupport", () => { |
| 432 | 428 | cacheDir, |
| 433 | 429 | toolsDir: `${cacheDir}/tools`, |
| 434 | 430 | registryUrl, |
| 435 | }).pipe(Effect.provideService(HostProcessEnvironment, toolchain.environment)); | |
| 431 | }).pipe(Effect.provideService(HostProcess.Environment, toolchain.environment)); | |
| 436 | 432 | |
| 437 | 433 | const first = yield* resolver.resolve(settings(), "/workspace", toolchain.environment); |
| 438 | 434 | const second = yield* resolver.resolve(settings(), "/workspace", toolchain.environment); |
| ... | ... | @@ -478,7 +474,7 @@ describe("AcpRegistrySupport", () => { |
| 478 | 474 | cacheDir, |
| 479 | 475 | toolsDir: `${cacheDir}/tools`, |
| 480 | 476 | registryUrl, |
| 481 | }).pipe(Effect.provideService(HostProcessEnvironment, environment)); | |
| 477 | }).pipe(Effect.provideService(HostProcess.Environment, environment)); | |
| 482 | 478 | |
| 483 | 479 | const resolved = yield* resolver.resolve(settings(), "/workspace", environment); |
| 484 | 480 | const userGlobalBin = toolchain.globalBin; |
| ... | ... | @@ -559,7 +555,7 @@ describe("AcpRegistrySupport", () => { |
| 559 | 555 | toolsDir: `${cacheDir}/tools`, |
| 560 | 556 | registryUrl, |
| 561 | 557 | }).pipe( |
| 562 | Effect.provideService(HostProcessPlatform, "win32"), | |
| 558 | Effect.provideService(HostProcess.Platform, "win32"), | |
| 563 | 559 | Effect.provideService(SpawnExecutableResolution, (command) => { |
| 564 | 560 | if (command === "uv") return toolchain.uvPath; |
| 565 | 561 | if (command === "fast-agent") return toolchain.executablePath; |
| ... | ... | @@ -677,7 +673,7 @@ describe("AcpRegistrySupport", () => { |
| 677 | 673 | cacheDir, |
| 678 | 674 | toolsDir: `${cacheDir}/tools`, |
| 679 | 675 | registryUrl, |
| 680 | }).pipe(Effect.provideService(HostProcessEnvironment, environment)); | |
| 676 | }).pipe(Effect.provideService(HostProcess.Environment, environment)); | |
| 681 | 677 | yield* resolver.search({ query: "example" }); |
| 682 | 678 | expect(yield* resolver.inspect(settings(), environment)).toMatchObject({ |
| 683 | 679 | status: "unprepared", |
| ... | ... | @@ -781,8 +777,8 @@ describe("AcpRegistrySupport", () => { |
| 781 | 777 | TestProviderHost.layer().pipe(Layer.provide(NodeServices.layer)), |
| 782 | 778 | ), |
| 783 | 779 | ), |
| 784 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 785 | Effect.provideService(HostProcessArchitecture, "x64"), | |
| 780 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 781 | Effect.provideService(HostProcess.Architecture, "x64"), | |
| 786 | 782 | ); |
| 787 | 783 | }); |
| 788 | 784 | |
| ... | ... | @@ -1097,7 +1093,7 @@ describe("AcpRegistrySupport", () => { |
| 1097 | 1093 | cacheDir, |
| 1098 | 1094 | toolsDir: `${cacheDir}/tools`, |
| 1099 | 1095 | registryUrl, |
| 1100 | }).pipe(Effect.provideService(HostProcessEnvironment, toolchain.environment)); | |
| 1096 | }).pipe(Effect.provideService(HostProcess.Environment, toolchain.environment)); | |
| 1101 | 1097 | const prepared = yield* resolver.prepare({ agentId: agent.id }); |
| 1102 | 1098 | expect(prepared).toEqual({ |
| 1103 | 1099 | agentId: "example-agent", |
packages/provider-acp-registry/src/server/AcpRegistrySupport.ts+4-8
| ... | ... | @@ -12,11 +12,7 @@ import { |
| 12 | 12 | } from "@t3tools/contracts"; |
| 13 | 13 | import type { AcpRegistryDistributionPreference } from "../settings.ts"; |
| 14 | 14 | import type { AcpRegistrySettings } from "../settings.ts"; |
| 15 | import { | |
| 16 | HostProcessArchitecture, | |
| 17 | HostProcessEnvironment, | |
| 18 | HostProcessPlatform, | |
| 19 | } from "@t3tools/shared/hostProcess"; | |
| 15 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 20 | 16 | import { |
| 21 | 17 | mergePathEntries, |
| 22 | 18 | resolveSpawnCommand, |
| ... | ... | @@ -637,9 +633,9 @@ export const makeAcpRegistryCatalog = Effect.fn("AcpRegistryCatalog.make")(funct |
| 637 | 633 | const httpClient = yield* HttpClient.HttpClient; |
| 638 | 634 | const spawner = yield* ChildProcessSpawner.ChildProcessSpawner; |
| 639 | 635 | const { settings: hostSettings } = yield* ProviderHost.ProviderHost; |
| 640 | const platform = yield* HostProcessPlatform; | |
| 641 | const architecture = yield* HostProcessArchitecture; | |
| 642 | const hostEnvironment = yield* HostProcessEnvironment; | |
| 636 | const platform = yield* HostProcess.Platform; | |
| 637 | const architecture = yield* HostProcess.Architecture; | |
| 638 | const hostEnvironment = yield* HostProcess.Environment; | |
| 643 | 639 | const resolveExecutable = yield* SpawnExecutableResolution; |
| 644 | 640 | const platformTarget = resolveAcpRegistryPlatformTarget(platform, architecture); |
| 645 | 641 | const registryUrl = input.registryUrl ?? ACP_REGISTRY_URL; |
packages/provider-acp-registry/src/server/adapter.ts+2-2
| ... | ... | @@ -5,7 +5,7 @@ import { |
| 5 | 5 | } from "./devinAcp.ts"; |
| 6 | 6 | import { defaultInstanceIdForDriver, ProviderDriverKind } from "@t3tools/contracts"; |
| 7 | 7 | import { AcpRegistrySettings } from "../settings.ts"; |
| 8 | import { HostProcessEnvironment } from "@t3tools/shared/hostProcess"; | |
| 8 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 9 | 9 | import { resolveSelfInvocation, type SelfInvocation } from "@t3tools/shared/nodeRuntime"; |
| 10 | 10 | import * as Crypto from "effect/Crypto"; |
| 11 | 11 | import * as Effect from "effect/Effect"; |
| ... | ... | @@ -271,7 +271,7 @@ export const AcpRegistryAdapterV2Driver: ProviderAdapterDriver< |
| 271 | 271 | defaultConfig: (): AcpRegistrySettings => DEFAULT_ACP_REGISTRY_SETTINGS, |
| 272 | 272 | create: Effect.fn("AcpRegistryAdapterV2Driver.create")( |
| 273 | 273 | function* (input: ProviderAdapterDriverCreateInput<AcpRegistrySettings>) { |
| 274 | const hostEnvironment = yield* HostProcessEnvironment; | |
| 274 | const hostEnvironment = yield* HostProcess.Environment; | |
| 275 | 275 | const selfInvocation = yield* resolveSelfInvocation(); |
| 276 | 276 | const providerEventLoggers = yield* ProviderEventLoggers.ProviderEventLoggers; |
| 277 | 277 | const makeNativeLogger = yield* makeAcpNativeLoggerFactory(); |
packages/provider-acp-registry/src/server/driver.ts+2-2
| ... | ... | @@ -8,7 +8,7 @@ import { |
| 8 | 8 | type ServerProviderModel, |
| 9 | 9 | } from "@t3tools/contracts"; |
| 10 | 10 | import { AcpRegistrySettings } from "../settings.ts"; |
| 11 | import { HostProcessEnvironment } from "@t3tools/shared/hostProcess"; | |
| 11 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 12 | 12 | import { createModelCapabilities } from "@t3tools/shared/model"; |
| 13 | 13 | import * as Clock from "effect/Clock"; |
| 14 | 14 | import * as Crypto from "effect/Crypto"; |
| ... | ... | @@ -484,7 +484,7 @@ export const AcpRegistryDriver: ProviderDriver<AcpRegistrySettings, AcpRegistryD |
| 484 | 484 | } |
| 485 | 485 | const crypto = yield* Crypto.Crypto; |
| 486 | 486 | const spawner = yield* ChildProcessSpawner.ChildProcessSpawner; |
| 487 | const hostEnvironment = yield* HostProcessEnvironment; | |
| 487 | const hostEnvironment = yield* HostProcess.Environment; | |
| 488 | 488 | const host = yield* ProviderHost.ProviderHost; |
| 489 | 489 | const continuationIdentity = defaultProviderContinuationIdentity({ |
| 490 | 490 | driverKind: DRIVER_KIND, |
packages/provider-acp/src/server/AcpSessionRuntime.ts+3-3
| ... | ... | @@ -27,7 +27,7 @@ import * as EffectAcpErrors from "effect-acp/errors"; |
| 27 | 27 | import type * as EffectAcpSchema from "effect-acp/compat"; |
| 28 | 28 | import type * as EffectAcpProtocol from "effect-acp/protocol"; |
| 29 | 29 | import { resolveSpawnCommand } from "@t3tools/shared/shell"; |
| 30 | import { HostProcessHomeDirectory, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 30 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 31 | 31 | |
| 32 | 32 | import { signalProcessGroup } from "@t3tools/provider-core/server/processGroup"; |
| 33 | 33 | import { appendAcpStderrTail, sanitizeAcpStderrExcerpt } from "./stderr.ts"; |
| ... | ... | @@ -1408,7 +1408,7 @@ export const make = ( |
| 1408 | 1408 | const stoppingRef = yield* Ref.make(false); |
| 1409 | 1409 | const stderrFailure = yield* Deferred.make<never, EffectAcpErrors.AcpError>(); |
| 1410 | 1410 | const stderrTailRef = yield* Ref.make(""); |
| 1411 | const homeDirectory = yield* HostProcessHomeDirectory; | |
| 1411 | const homeDirectory = yield* HostProcess.HomeDirectory; | |
| 1412 | 1412 | const stderrDrained = yield* Deferred.make<void>(); |
| 1413 | 1413 | const runtimeClosed = yield* Deferred.make<void>(); |
| 1414 | 1414 | const promptSerializationSemaphore = yield* Semaphore.make(1); |
| ... | ... | @@ -1729,7 +1729,7 @@ export const make = ( |
| 1729 | 1729 | Effect.uninterruptible(terminateOwnedProcessGroupImpl), |
| 1730 | 1730 | ); |
| 1731 | 1731 | if (options.ownDetachedProcessGroup === true) { |
| 1732 | const hostPlatform = yield* HostProcessPlatform; | |
| 1732 | const hostPlatform = yield* HostProcess.Platform; | |
| 1733 | 1733 | const forceTerminateOwnedProcessGroup = |
| 1734 | 1734 | hostPlatform === "win32" |
| 1735 | 1735 | ? terminateWindowsProcessTreeWithTaskkill(Number(child.pid)).pipe( |
packages/provider-core/src/server/instanceEnvironment.test.ts+2-2
| ... | ... | @@ -2,7 +2,7 @@ import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 2 | 2 | import { describe, expect, it } from "@effect/vitest"; |
| 3 | 3 | import * as Effect from "effect/Effect"; |
| 4 | 4 | import * as Path from "effect/Path"; |
| 5 | import { HostProcessHomeDirectory } from "@t3tools/shared/hostProcess"; | |
| 5 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 6 | 6 | |
| 7 | 7 | import { mergeProviderInstanceEnvironment } from "./instanceEnvironment.ts"; |
| 8 | 8 | |
| ... | ... | @@ -36,7 +36,7 @@ describe("mergeProviderInstanceEnvironment", () => { |
| 36 | 36 | CLAUDE_CONFIG_DIR: "~/.inherited-claude", |
| 37 | 37 | }); |
| 38 | 38 | }).pipe( |
| 39 | Effect.provideService(HostProcessHomeDirectory, "/home/ada"), | |
| 39 | Effect.provideService(HostProcess.HomeDirectory, "/home/ada"), | |
| 40 | 40 | Effect.provide(NodeServices.layer), |
| 41 | 41 | ), |
| 42 | 42 | ); |
packages/provider-core/src/server/instanceEnvironment.ts+2-2
| ... | ... | @@ -1,5 +1,5 @@ |
| 1 | 1 | import type { ProviderInstanceEnvironment } from "@t3tools/contracts"; |
| 2 | import { HostProcessHomeDirectory } from "@t3tools/shared/hostProcess"; | |
| 2 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 3 | 3 | import * as Effect from "effect/Effect"; |
| 4 | 4 | |
| 5 | 5 | import { expandHomePath } from "./pathExpansion.ts"; |
| ... | ... | @@ -12,7 +12,7 @@ export const mergeProviderInstanceEnvironment = Effect.fn(function* ( |
| 12 | 12 | return baseEnv; |
| 13 | 13 | } |
| 14 | 14 | |
| 15 | const home = yield* HostProcessHomeDirectory; | |
| 15 | const home = yield* HostProcess.HomeDirectory; | |
| 16 | 16 | const next: NodeJS.ProcessEnv = { ...baseEnv }; |
| 17 | 17 | for (const variable of environment) { |
| 18 | 18 | // Child processes do not apply shell expansion to environment values. |
packages/provider-core/src/server/maintenanceResolver.test.ts+10-10
| ... | ... | @@ -6,7 +6,7 @@ import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 6 | 6 | import * as NodeOS from "node:os"; |
| 7 | 7 | import * as NodePath from "node:path"; |
| 8 | 8 | import { ProviderDriverKind, ProviderInstanceId, type ServerProvider } from "@t3tools/contracts"; |
| 9 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 9 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 10 | 10 | import * as Crypto from "effect/Crypto"; |
| 11 | 11 | import * as Deferred from "effect/Deferred"; |
| 12 | 12 | import * as Effect from "effect/Effect"; |
| ... | ... | @@ -37,7 +37,7 @@ import { symlinksSupported } from "@t3tools/shared/testing/symlinks"; |
| 37 | 37 | const driver = (value: string) => ProviderDriverKind.make(value); |
| 38 | 38 | // These write `#!/bin/sh` stubs and evaluate them with darwin/linux path |
| 39 | 39 | // semantics; a Windows temp path cannot be split on `:`. |
| 40 | const windowsHost = HostProcessPlatform.defaultValue() === "win32"; | |
| 40 | const windowsHost = HostProcess.Platform.defaultValue() === "win32"; | |
| 41 | 41 | const makeTempDir = (name: string) => |
| 42 | 42 | Crypto.Crypto.pipe( |
| 43 | 43 | Effect.flatMap((crypto) => crypto.randomUUIDv4), |
| ... | ... | @@ -332,7 +332,7 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => { |
| 332 | 332 | env: {}, |
| 333 | 333 | platform: "win32", |
| 334 | 334 | }, |
| 335 | ).pipe(Effect.provideService(HostProcessPlatform, "win32")); | |
| 335 | ).pipe(Effect.provideService(HostProcess.Platform, "win32")); | |
| 336 | 336 | |
| 337 | 337 | expect(capabilities.update).toMatchObject({ |
| 338 | 338 | executable: visiblePath, |
| ... | ... | @@ -360,7 +360,7 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => { |
| 360 | 360 | binaryPath: shim, |
| 361 | 361 | env: { PATH: "", PATHEXT: ".COM;.EXE;.BAT;.CMD" }, |
| 362 | 362 | }).pipe( |
| 363 | Effect.provideService(HostProcessPlatform, "win32"), | |
| 363 | Effect.provideService(HostProcess.Platform, "win32"), | |
| 364 | 364 | Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, noSpawn), |
| 365 | 365 | ); |
| 366 | 366 | |
| ... | ... | @@ -376,7 +376,7 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => { |
| 376 | 376 | binaryPath: script, |
| 377 | 377 | env: { PATH: "" }, |
| 378 | 378 | }).pipe( |
| 379 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 379 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 380 | 380 | Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, noSpawn), |
| 381 | 381 | ); |
| 382 | 382 | expect(posix.update).toBeNull(); |
| ... | ... | @@ -429,7 +429,7 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => { |
| 429 | 429 | env: { PATH: bunBinDir }, |
| 430 | 430 | }, |
| 431 | 431 | ).pipe( |
| 432 | Effect.provideService(HostProcessPlatform, "darwin"), | |
| 432 | Effect.provideService(HostProcess.Platform, "darwin"), | |
| 433 | 433 | Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, noSpawn), |
| 434 | 434 | ); |
| 435 | 435 | |
| ... | ... | @@ -454,7 +454,7 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => { |
| 454 | 454 | env: { PATH: nativeBinDir }, |
| 455 | 455 | }, |
| 456 | 456 | ).pipe( |
| 457 | Effect.provideService(HostProcessPlatform, "darwin"), | |
| 457 | Effect.provideService(HostProcess.Platform, "darwin"), | |
| 458 | 458 | Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, noSpawn), |
| 459 | 459 | ); |
| 460 | 460 | |
| ... | ... | @@ -659,7 +659,7 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => { |
| 659 | 659 | env: { PATH: brewBinDir }, |
| 660 | 660 | }, |
| 661 | 661 | ).pipe( |
| 662 | Effect.provideService(HostProcessPlatform, "darwin"), | |
| 662 | Effect.provideService(HostProcess.Platform, "darwin"), | |
| 663 | 663 | Effect.provideService( |
| 664 | 664 | ChildProcessSpawner.ChildProcessSpawner, |
| 665 | 665 | stdoutSpawner((command, args) => { |
| ... | ... | @@ -725,7 +725,7 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => { |
| 725 | 725 | env: { PATH: brewBinDir }, |
| 726 | 726 | }, |
| 727 | 727 | ).pipe( |
| 728 | Effect.provideService(HostProcessPlatform, "darwin"), | |
| 728 | Effect.provideService(HostProcess.Platform, "darwin"), | |
| 729 | 729 | Effect.provideService( |
| 730 | 730 | ChildProcessSpawner.ChildProcessSpawner, |
| 731 | 731 | stdoutSpawner(() => "/opt/homebrew\n"), |
| ... | ... | @@ -864,7 +864,7 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => { |
| 864 | 864 | binaryPath: kegBinary, |
| 865 | 865 | env: { PATH: "" }, |
| 866 | 866 | }).pipe( |
| 867 | Effect.provideService(HostProcessPlatform, "darwin"), | |
| 867 | Effect.provideService(HostProcess.Platform, "darwin"), | |
| 868 | 868 | Effect.provideService( |
| 869 | 869 | ChildProcessSpawner.ChildProcessSpawner, |
| 870 | 870 | stdoutSpawner((_command, args) => (args[0] === "--prefix" ? `${tempDir}\n` : "{}")), |
packages/provider-core/src/server/maintenanceResolver.ts+4-4
| ... | ... | @@ -12,7 +12,7 @@ import { |
| 12 | 12 | type ServerProviderVersionAdvisory, |
| 13 | 13 | } from "@t3tools/contracts"; |
| 14 | 14 | import { compareSemverVersions } from "@t3tools/shared/semver"; |
| 15 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 15 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 16 | 16 | import { causeErrorTag } from "@t3tools/shared/observability"; |
| 17 | 17 | import { resolveCommandPath } from "@t3tools/shared/shell"; |
| 18 | 18 | import * as Cache from "effect/Cache"; |
| ... | ... | @@ -141,7 +141,7 @@ export function makeProviderMaintenanceCapabilities(input: { |
| 141 | 141 | readonly env?: NodeJS.ProcessEnv; |
| 142 | 142 | readonly latestVersion?: string | null; |
| 143 | 143 | }): ProviderMaintenanceCapabilities { |
| 144 | const platform = input.platform ?? HostProcessPlatform.defaultValue(); | |
| 144 | const platform = input.platform ?? HostProcess.Platform.defaultValue(); | |
| 145 | 145 | const update = |
| 146 | 146 | input.updateExecutable === null || input.updateLockKey === null |
| 147 | 147 | ? null |
| ... | ... | @@ -587,7 +587,7 @@ const resolveNpmGlobalPrefix = Effect.fn("resolveNpmGlobalPrefix")(function* ( |
| 587 | 587 | if (fromRealPath) { |
| 588 | 588 | return fromRealPath; |
| 589 | 589 | } |
| 590 | if ((yield* HostProcessPlatform) !== "win32") { | |
| 590 | if ((yield* HostProcess.Platform) !== "win32") { | |
| 591 | 591 | return null; |
| 592 | 592 | } |
| 593 | 593 | const fileSystem = yield* FileSystem.FileSystem; |
| ... | ... | @@ -667,7 +667,7 @@ export const resolveProviderMaintenanceCapabilitiesEffect = Effect.fn( |
| 667 | 667 | resolvedCommandPath, |
| 668 | 668 | realCommandPath, |
| 669 | 669 | env, |
| 670 | platform: yield* HostProcessPlatform, | |
| 670 | platform: yield* HostProcess.Platform, | |
| 671 | 671 | }); |
| 672 | 672 | }); |
| 673 | 673 |
packages/provider-core/src/server/pathExpansion.ts+1-1
| ... | ... | @@ -3,7 +3,7 @@ import * as NodePath from "node:path"; |
| 3 | 3 | |
| 4 | 4 | /** |
| 5 | 5 | * Expand a leading `~` (or `~/…`, `~\…`) in a user-supplied path to `home`, |
| 6 | * the current user's home directory (`HostProcessHomeDirectory`). Spawned | |
| 6 | * the current user's home directory (`HostProcess.HomeDirectory`). Spawned | |
| 7 | 7 | * processes don't get shell expansion, so env vars like |
| 8 | 8 | * `CODEX_HOME=~/.codex-work` would be passed verbatim and treated as relative |
| 9 | 9 | * paths by the receiver. |
packages/provider-core/src/server/processGroup.test.ts+2-2
| ... | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | import * as NodeChildProcess from "node:child_process"; |
| 3 | 3 | |
| 4 | 4 | import { describe, expect, it } from "@effect/vitest"; |
| 5 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 5 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 6 | 6 | |
| 7 | 7 | import { signalProcessGroup } from "./processGroup.ts"; |
| 8 | 8 | |
| ... | ... | @@ -15,7 +15,7 @@ const errorCode = (run: () => void) => { |
| 15 | 15 | } |
| 16 | 16 | }; |
| 17 | 17 | |
| 18 | describe.skipIf(HostProcessPlatform.defaultValue() === "win32")("signalProcessGroup", () => { | |
| 18 | describe.skipIf(HostProcess.Platform.defaultValue() === "win32")("signalProcessGroup", () => { | |
| 19 | 19 | // Signal 0 only probes, so this is safe to run unguarded: `kill(-1, 0)` and |
| 20 | 20 | // `kill(0, 0)` succeed, which is how a fake spawner's pid 1 became |
| 21 | 21 | // `kill(-1, SIGKILL)` and took down every process the user owned. |
packages/provider-core/src/server/snapshotProbe.test.ts+2-2
| ... | ... | @@ -1,6 +1,6 @@ |
| 1 | 1 | import { describe, expect, it } from "@effect/vitest"; |
| 2 | 2 | import type { ModelCapabilities } from "@t3tools/contracts"; |
| 3 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 3 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 4 | 4 | import { createModelCapabilities } from "@t3tools/shared/model"; |
| 5 | 5 | import * as Effect from "effect/Effect"; |
| 6 | 6 | import * as Layer from "effect/Layer"; |
| ... | ... | @@ -158,7 +158,7 @@ describe("ProviderCommandNotFoundError", () => { |
| 158 | 158 | ChildProcess.make("codex", ["--version"]), |
| 159 | 159 | ).pipe( |
| 160 | 160 | Effect.provide(Layer.succeed(ChildProcessSpawner.ChildProcessSpawner, spawner)), |
| 161 | Effect.provideService(HostProcessPlatform, "win32"), | |
| 161 | Effect.provideService(HostProcess.Platform, "win32"), | |
| 162 | 162 | Effect.flip, |
| 163 | 163 | ); |
| 164 | 164 |
packages/provider-core/src/server/snapshotProbe.ts+2-2
| ... | ... | @@ -19,7 +19,7 @@ import * as Stream from "effect/Stream"; |
| 19 | 19 | import * as ChildProcess from "effect/process/ChildProcess"; |
| 20 | 20 | import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner"; |
| 21 | 21 | import { readCustomModelEntries } from "@t3tools/shared/model"; |
| 22 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 22 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 23 | 23 | import { createProviderVersionAdvisory } from "./maintenanceResolver.ts"; |
| 24 | 24 | import { collectUint8StreamText } from "./collectStreamText.ts"; |
| 25 | 25 | |
| ... | ... | @@ -38,7 +38,7 @@ export const isWindowsCommandNotFound = Effect.fn("isWindowsCommandNotFound")(fu |
| 38 | 38 | code: number | null, |
| 39 | 39 | stderr: string, |
| 40 | 40 | ) { |
| 41 | const platform = yield* HostProcessPlatform; | |
| 41 | const platform = yield* HostProcess.Platform; | |
| 42 | 42 | if (platform !== "win32") return false; |
| 43 | 43 | if (code === 9009) return true; |
| 44 | 44 | return WINDOWS_COMMAND_NOT_FOUND_PATTERNS.some((pattern) => pattern.test(stderr)); |
packages/provider-cursor/src/server/CursorUsageAccounts.ts+4-8
| ... | ... | @@ -14,11 +14,7 @@ |
| 14 | 14 | import * as ProviderHost from "@t3tools/provider-core/server/ProviderHost"; |
| 15 | 15 | import type { ProviderUsageScan } from "@t3tools/provider-core/server/usage"; |
| 16 | 16 | import { writeFileStringAtomically } from "@t3tools/shared/atomicWrite"; |
| 17 | import { | |
| 18 | HostProcessEnvironment, | |
| 19 | HostProcessHomeDirectory, | |
| 20 | HostProcessPlatform, | |
| 21 | } from "@t3tools/shared/hostProcess"; | |
| 17 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 22 | 18 | import * as Clock from "effect/Clock"; |
| 23 | 19 | import * as Context from "effect/Context"; |
| 24 | 20 | import * as Deferred from "effect/Deferred"; |
| ... | ... | @@ -71,8 +67,8 @@ const make = Effect.gen(function* () { |
| 71 | 67 | const path = yield* Path.Path; |
| 72 | 68 | const host = yield* ProviderHost.ProviderHost; |
| 73 | 69 | const accountReader = yield* CursorAccountReader.CursorAccountReader; |
| 74 | const hostEnvironment = yield* HostProcessEnvironment; | |
| 75 | const platform = yield* HostProcessPlatform; | |
| 70 | const hostEnvironment = yield* HostProcess.Environment; | |
| 71 | const platform = yield* HostProcess.Platform; | |
| 76 | 72 | |
| 77 | 73 | const cachePath = path.join(host.paths.stateDir, CURSOR_ACCOUNT_CACHE_FILE_NAME); |
| 78 | 74 | /** Account caches by credential source. */ |
| ... | ... | @@ -286,7 +282,7 @@ const make = Effect.gen(function* () { |
| 286 | 282 | |
| 287 | 283 | const scan: CursorUsageAccounts["Service"]["scan"] = Effect.fn("CursorUsageAccounts.scan")( |
| 288 | 284 | function* ({ keychainUsageEnabled, windowStartMs, retentionCutoffMs, awaitRefresh }) { |
| 289 | const home = yield* HostProcessHomeDirectory; | |
| 285 | const home = yield* HostProcess.HomeDirectory; | |
| 290 | 286 | const userHome = |
| 291 | 287 | (platform === "win32" ? hostEnvironment["USERPROFILE"] : hostEnvironment["HOME"]) || home; |
| 292 | 288 | const configHome = hostEnvironment["XDG_CONFIG_HOME"]?.trim(); |
packages/provider-cursor/src/server/adapter.ts+2-2
| ... | ... | @@ -9,7 +9,7 @@ import type { |
| 9 | 9 | ToolCall, |
| 10 | 10 | } from "@cursor/sdk"; |
| 11 | 11 | import { formatReadToolLabel, formatSearchToolLabel } from "@t3tools/shared/toolActivity"; |
| 12 | import { HostProcessEnvironment } from "@t3tools/shared/hostProcess"; | |
| 12 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 13 | 13 | import { |
| 14 | 14 | isOrchestrationV2WorkActive, |
| 15 | 15 | defaultInstanceIdForDriver, |
| ... | ... | @@ -2620,7 +2620,7 @@ export const CursorAdapterV2Driver: ProviderAdapterDriver< |
| 2620 | 2620 | defaultConfig: (): CursorSettings => DEFAULT_CURSOR_SETTINGS, |
| 2621 | 2621 | create: Effect.fn("CursorAdapterV2Driver.create")( |
| 2622 | 2622 | function* (input: ProviderAdapterDriverCreateInput<CursorSettings>) { |
| 2623 | const hostEnvironment = yield* HostProcessEnvironment; | |
| 2623 | const hostEnvironment = yield* HostProcess.Environment; | |
| 2624 | 2624 | return yield* makeCursorAdapterV2({ |
| 2625 | 2625 | instanceId: input.instanceId, |
| 2626 | 2626 | settings: { |
packages/provider-cursor/src/server/skills.ts+2-2
| ... | ... | @@ -17,7 +17,7 @@ import * as Path from "effect/Path"; |
| 17 | 17 | import * as PlatformError from "effect/PlatformError"; |
| 18 | 18 | import * as Schema from "effect/Schema"; |
| 19 | 19 | import { parse as parseYamlDocument } from "yaml"; |
| 20 | import { HostProcessHomeDirectory } from "@t3tools/shared/hostProcess"; | |
| 20 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 21 | 21 | |
| 22 | 22 | const FRONTMATTER_PATTERN = /^---\r?\n([\s\S]*?)\r?\n---(?:\r?\n|$)/; |
| 23 | 23 | const SKILL_MENTION_PATTERN = |
| ... | ... | @@ -224,7 +224,7 @@ const inspectCursorSkills = Effect.fn("inspectCursorSkills")(function* ( |
| 224 | 224 | const userHome = |
| 225 | 225 | environment.HOME?.trim() || |
| 226 | 226 | environment.USERPROFILE?.trim() || |
| 227 | (yield* HostProcessHomeDirectory); | |
| 227 | (yield* HostProcess.HomeDirectory); | |
| 228 | 228 | const rootsBelow = (base: string, scope: "user" | "project") => [ |
| 229 | 229 | { directory: path.join(base, ".cursor", "skills"), scope }, |
| 230 | 230 | { directory: path.join(base, ".agents", "skills"), scope }, |
packages/provider-cursor/src/server/textGeneration.ts+2-2
| ... | ... | @@ -12,7 +12,7 @@ import * as TextGenerationOperations from "@t3tools/provider-core/server/textGen |
| 12 | 12 | import { cursorSdkModelSelection } from "./sdkModel.ts"; |
| 13 | 13 | import type { CursorAuth } from "./auth.ts"; |
| 14 | 14 | import * as CursorSdk from "./CursorSdk.ts"; |
| 15 | import { HostProcessHomeDirectory } from "@t3tools/shared/hostProcess"; | |
| 15 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 16 | 16 | |
| 17 | 17 | const CURSOR_TIMEOUT_MS = 180_000; |
| 18 | 18 | |
| ... | ... | @@ -90,7 +90,7 @@ export const makeCursorTextGeneration = Effect.fn("makeCursorTextGeneration")(fu |
| 90 | 90 | const apiKey = yield* resolveCursorApiKey(operation); |
| 91 | 91 | // The SDK loads sandbox.json independently of settingSources and lets it |
| 92 | 92 | // expand the writable paths. Its public API cannot override that policy. |
| 93 | if (yield* fs.exists(`${yield* HostProcessHomeDirectory}/.cursor/sandbox.json`)) { | |
| 93 | if (yield* fs.exists(`${yield* HostProcess.HomeDirectory}/.cursor/sandbox.json`)) { | |
| 94 | 94 | return yield* new TextGenerationError({ |
| 95 | 95 | operation, |
| 96 | 96 | detail: |
packages/provider-cursor/src/server/usageLimits.test.ts+6-6
| ... | ... | @@ -1,6 +1,6 @@ |
| 1 | 1 | import { describe, expect, it } from "@effect/vitest"; |
| 2 | 2 | import { NodeServices } from "@effect/platform-node"; |
| 3 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 3 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 4 | 4 | import * as Effect from "effect/Effect"; |
| 5 | 5 | import * as FileSystem from "effect/FileSystem"; |
| 6 | 6 | import * as Path from "effect/Path"; |
| ... | ... | @@ -106,7 +106,7 @@ describe("Cursor usage limits", () => { |
| 106 | 106 | { apiEndpoint: "https://cursor.example/" }, |
| 107 | 107 | { XDG_CONFIG_HOME: directory, HOME: directory, AGENT_CLI_CREDENTIAL_STORE: "file" }, |
| 108 | 108 | ).pipe( |
| 109 | Effect.provideService(HostProcessPlatform, platform), | |
| 109 | Effect.provideService(HostProcess.Platform, platform), | |
| 110 | 110 | Effect.provideService(HttpClient.HttpClient, client), |
| 111 | 111 | ); |
| 112 | 112 | expect(limits.windows[0]?.usedPercent).toBe(42); |
| ... | ... | @@ -131,7 +131,7 @@ describe("Cursor usage limits", () => { |
| 131 | 131 | }, |
| 132 | 132 | false, |
| 133 | 133 | ).pipe( |
| 134 | Effect.provideService(HostProcessPlatform, platform), | |
| 134 | Effect.provideService(HostProcess.Platform, platform), | |
| 135 | 135 | Effect.provideService( |
| 136 | 136 | FileSystem.FileSystem, |
| 137 | 137 | FileSystem.makeNoop({ |
| ... | ... | @@ -202,7 +202,7 @@ describe("Cursor usage limits", () => { |
| 202 | 202 | Effect.gen(function* () { |
| 203 | 203 | const limits = yield* withNodeServices( |
| 204 | 204 | readCursorUsageLimits({ apiEndpoint: "" }, {}, true).pipe( |
| 205 | Effect.provideService(HostProcessPlatform, "darwin"), | |
| 205 | Effect.provideService(HostProcess.Platform, "darwin"), | |
| 206 | 206 | Effect.provideService( |
| 207 | 207 | FileSystem.FileSystem, |
| 208 | 208 | FileSystem.makeNoop({ |
| ... | ... | @@ -232,7 +232,7 @@ describe("Cursor usage limits", () => { |
| 232 | 232 | Effect.gen(function* () { |
| 233 | 233 | const limits = yield* withNodeServices( |
| 234 | 234 | readCursorUsageLimits({ apiEndpoint: "" }, {}, true).pipe( |
| 235 | Effect.provideService(HostProcessPlatform, "darwin"), | |
| 235 | Effect.provideService(HostProcess.Platform, "darwin"), | |
| 236 | 236 | Effect.provideService( |
| 237 | 237 | HttpClient.HttpClient, |
| 238 | 238 | HttpClient.make(() => Effect.die("must not request limits without a login")), |
| ... | ... | @@ -258,7 +258,7 @@ describe("Cursor usage limits", () => { |
| 258 | 258 | ] as const) { |
| 259 | 259 | const limits = yield* withNodeServices( |
| 260 | 260 | readCursorUsageLimits({ apiEndpoint }, environment, true).pipe( |
| 261 | Effect.provideService(HostProcessPlatform, "darwin"), | |
| 261 | Effect.provideService(HostProcess.Platform, "darwin"), | |
| 262 | 262 | Effect.provideService( |
| 263 | 263 | HttpClient.HttpClient, |
| 264 | 264 | HttpClient.make(() => Effect.die("must not send a Keychain credential to a proxy")), |
packages/provider-cursor/src/server/usageLimits.ts+3-3
| ... | ... | @@ -1,6 +1,6 @@ |
| 1 | 1 | import type { ServerProviderUsageWindow } from "@t3tools/contracts"; |
| 2 | 2 | import type { CursorSettings } from "../settings.ts"; |
| 3 | import { HostProcessHomeDirectory, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 3 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 4 | 4 | import { CURSOR_USAGE_WINDOWS } from "@t3tools/shared/usageLimits"; |
| 5 | 5 | import * as DateTime from "effect/DateTime"; |
| 6 | 6 | import * as Effect from "effect/Effect"; |
| ... | ... | @@ -70,7 +70,7 @@ export const readCursorUsageLimits = Effect.fn("readCursorUsageLimits")(function |
| 70 | 70 | return yield* Effect.gen(function* () { |
| 71 | 71 | const fs = yield* FileSystem.FileSystem; |
| 72 | 72 | const path = yield* Path.Path; |
| 73 | const platform = yield* HostProcessPlatform; | |
| 73 | const platform = yield* HostProcess.Platform; | |
| 74 | 74 | const endpoint = ( |
| 75 | 75 | settings.apiEndpoint?.trim() || |
| 76 | 76 | environment.CURSOR_API_ENDPOINT?.trim() || |
| ... | ... | @@ -109,7 +109,7 @@ export const readCursorUsageLimits = Effect.fn("readCursorUsageLimits")(function |
| 109 | 109 | } else if (!token) { |
| 110 | 110 | const home = |
| 111 | 111 | (platform === "win32" ? environment.USERPROFILE : environment.HOME) || |
| 112 | (yield* HostProcessHomeDirectory); | |
| 112 | (yield* HostProcess.HomeDirectory); | |
| 113 | 113 | const directory = |
| 114 | 114 | platform === "win32" |
| 115 | 115 | ? path.join(environment.APPDATA || path.join(home, "AppData", "Roaming"), "Cursor") |
packages/provider-grok/src/server/acpSupport.ts+2-2
| ... | ... | @@ -12,7 +12,7 @@ import * as Layer from "effect/Layer"; |
| 12 | 12 | import * as Scope from "effect/Scope"; |
| 13 | 13 | import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner"; |
| 14 | 14 | import * as EffectAcpErrors from "effect-acp/errors"; |
| 15 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 15 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 16 | 16 | import { normalizeModelSlug } from "@t3tools/shared/model"; |
| 17 | 17 | |
| 18 | 18 | import * as AcpSessionRuntime from "@t3tools/provider-acp/server/AcpSessionRuntime"; |
| ... | ... | @@ -159,7 +159,7 @@ export const makeGrokAcpRuntime = ( |
| 159 | 159 | ChildProcessSpawner.ChildProcessSpawner | Crypto.Crypto | Scope.Scope |
| 160 | 160 | > => |
| 161 | 161 | Effect.gen(function* () { |
| 162 | const processGroupPlatform = yield* HostProcessPlatform.pipe( | |
| 162 | const processGroupPlatform = yield* HostProcess.Platform.pipe( | |
| 163 | 163 | Effect.provide(NodeServices.layer), |
| 164 | 164 | ); |
| 165 | 165 | const acpContext = yield* Layer.build( |
packages/provider-grok/src/server/adapter.ts+6-10
| ... | ... | @@ -4,11 +4,7 @@ import { |
| 4 | 4 | isXAiTaskCompletedWakeNotification, |
| 5 | 5 | xAiRateLimitedErrorCode, |
| 6 | 6 | } from "./xaiAcpExtension.ts"; |
| 7 | import { | |
| 8 | HostProcessEnvironment, | |
| 9 | HostProcessHomeDirectory, | |
| 10 | HostProcessPlatform, | |
| 11 | } from "@t3tools/shared/hostProcess"; | |
| 7 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 12 | 8 | import { resolveSelfInvocation, type SelfInvocation } from "@t3tools/shared/nodeRuntime"; |
| 13 | 9 | import { |
| 14 | 10 | defaultInstanceIdForDriver, |
| ... | ... | @@ -339,7 +335,7 @@ export const makeGrokAdapterV2 = Effect.fn("makeGrokAdapterV2")(function* ( |
| 339 | 335 | ) { |
| 340 | 336 | return yield* makeAcpAdapterV2({ |
| 341 | 337 | instanceId: options.instanceId, |
| 342 | flavor: makeGrokAcpAdapterFlavor(options, yield* HostProcessHomeDirectory), | |
| 338 | flavor: makeGrokAcpAdapterFlavor(options, yield* HostProcess.HomeDirectory), | |
| 343 | 339 | selfInvocation: options.selfInvocation, |
| 344 | 340 | ...(options.nativeLogging === undefined ? {} : { nativeLogging: options.nativeLogging }), |
| 345 | 341 | ...(options.continuationRequests === undefined |
| ... | ... | @@ -365,8 +361,8 @@ export const GrokAdapterV2Driver: ProviderAdapterDriver<GrokSettings, GrokAdapte |
| 365 | 361 | defaultConfig: (): GrokSettings => DEFAULT_GROK_SETTINGS, |
| 366 | 362 | create: Effect.fn("GrokAdapterV2Driver.create")( |
| 367 | 363 | function* (input: ProviderAdapterDriverCreateInput<GrokSettings>) { |
| 368 | const hostEnvironment = yield* HostProcessEnvironment; | |
| 369 | const hostPlatform = yield* HostProcessPlatform; | |
| 364 | const hostEnvironment = yield* HostProcess.Environment; | |
| 365 | const hostPlatform = yield* HostProcess.Platform; | |
| 370 | 366 | const selfInvocation = yield* resolveSelfInvocation(); |
| 371 | 367 | const providerEventLoggers = yield* ProviderEventLoggers.ProviderEventLoggers; |
| 372 | 368 | const continuationRequests = yield* ProviderContinuationRequests.ProviderContinuationRequests; |
| ... | ... | @@ -415,8 +411,8 @@ const layer: Layer.Layer< |
| 415 | 411 | > = Layer.effect( |
| 416 | 412 | ProviderAdapter.ProviderAdapterV2, |
| 417 | 413 | Effect.gen(function* () { |
| 418 | const hostEnvironment = yield* HostProcessEnvironment; | |
| 419 | const hostPlatform = yield* HostProcessPlatform; | |
| 414 | const hostEnvironment = yield* HostProcess.Environment; | |
| 415 | const hostPlatform = yield* HostProcess.Platform; | |
| 420 | 416 | const selfInvocation = yield* resolveSelfInvocation(); |
| 421 | 417 | const providerEventLoggers = yield* ProviderEventLoggers.ProviderEventLoggers; |
| 422 | 418 | const continuationRequests = yield* ProviderContinuationRequests.ProviderContinuationRequests; |
packages/provider-grok/src/server/driver.test.ts+2-2
| ... | ... | @@ -1,7 +1,7 @@ |
| 1 | 1 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 2 | 2 | import { expect, it } from "@effect/vitest"; |
| 3 | 3 | import { ProviderInstanceId } from "@t3tools/contracts"; |
| 4 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 4 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 5 | 5 | import * as Effect from "effect/Effect"; |
| 6 | 6 | import * as FileSystem from "effect/FileSystem"; |
| 7 | 7 | import * as Layer from "effect/Layer"; |
| ... | ... | @@ -41,7 +41,7 @@ const noSpawner = ChildProcessSpawner.make(() => |
| 41 | 41 | ); |
| 42 | 42 | |
| 43 | 43 | // The `#!/bin/sh` stub below cannot be resolved as an executable on Windows. |
| 44 | const windowsHost = HostProcessPlatform.defaultValue() === "win32"; | |
| 44 | const windowsHost = HostProcess.Platform.defaultValue() === "win32"; | |
| 45 | 45 | |
| 46 | 46 | it.layer(layerTest)("GrokDriver", (it) => { |
| 47 | 47 | it.effect.skipIf(windowsHost)("updates through the configured executable's own updater", () => |
packages/provider-grok/src/server/usage.ts+2-2
| ... | ... | @@ -19,7 +19,7 @@ import { |
| 19 | 19 | } from "@t3tools/provider-core/server/usage"; |
| 20 | 20 | |
| 21 | 21 | import type { GrokSettings } from "../settings.ts"; |
| 22 | import { HostProcessHomeDirectory } from "@t3tools/shared/hostProcess"; | |
| 22 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 23 | 23 | |
| 24 | 24 | /** |
| 25 | 25 | * Grok reports cost in integer ticks where `1 USD = 10^10` ticks. See Grok |
| ... | ... | @@ -229,7 +229,7 @@ export const grokUsageReader: ProviderUsageReader<GrokSettings, Path.Path> = { |
| 229 | 229 | format: grokUsageFormat, |
| 230 | 230 | directories: Effect.fn("grokUsageReader.directories")(function* ({ environment }) { |
| 231 | 231 | const path = yield* Path.Path; |
| 232 | const homeDirectory = yield* HostProcessHomeDirectory; | |
| 232 | const homeDirectory = yield* HostProcess.HomeDirectory; | |
| 233 | 233 | const home = expandHomePath( |
| 234 | 234 | environment.GROK_HOME?.trim() || path.join(homeDirectory, ".grok"), |
| 235 | 235 | homeDirectory, |
packages/provider-grok/src/server/usageLimits.ts+2-2
| ... | ... | @@ -13,7 +13,7 @@ import { |
| 13 | 13 | makeUnavailableUsageLimits, |
| 14 | 14 | makeUsageLimits, |
| 15 | 15 | } from "@t3tools/provider-core/server/usageLimits"; |
| 16 | import { HostProcessHomeDirectory } from "@t3tools/shared/hostProcess"; | |
| 16 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 17 | 17 | |
| 18 | 18 | const GrokCredentials = Schema.Record( |
| 19 | 19 | Schema.String, |
| ... | ... | @@ -101,7 +101,7 @@ const readGrokCredential = Effect.fn("readGrokCredential")(function* ( |
| 101 | 101 | const home = |
| 102 | 102 | environment.GROK_HOME?.trim() || |
| 103 | 103 | path.join( |
| 104 | environment.HOME || environment.USERPROFILE || (yield* HostProcessHomeDirectory), | |
| 104 | environment.HOME || environment.USERPROFILE || (yield* HostProcess.HomeDirectory), | |
| 105 | 105 | ".grok", |
| 106 | 106 | ); |
| 107 | 107 | for (const configPath of [ |
packages/provider-muse/src/server/driver.ts+3-3
| ... | ... | @@ -1,6 +1,6 @@ |
| 1 | 1 | import { ProviderDriverKind } from "@t3tools/contracts"; |
| 2 | 2 | import { MuseSettings } from "../settings.ts"; |
| 3 | import { HostProcessEnvironment, HostProcessHomeDirectory } from "@t3tools/shared/hostProcess"; | |
| 3 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 4 | 4 | import * as Effect from "effect/Effect"; |
| 5 | 5 | import * as FileSystem from "effect/FileSystem"; |
| 6 | 6 | import * as Path from "effect/Path"; |
| ... | ... | @@ -69,7 +69,7 @@ export const MuseDriver: ProviderDriver<MuseSettings, MuseDriverEnv> = { |
| 69 | 69 | const eventLoggers = yield* ProviderEventLoggers.ProviderEventLoggers; |
| 70 | 70 | const { cwd } = host.paths; |
| 71 | 71 | const continuationRequests = yield* ProviderContinuationRequests.ProviderContinuationRequests; |
| 72 | const hostEnvironment = yield* HostProcessEnvironment; | |
| 72 | const hostEnvironment = yield* HostProcess.Environment; | |
| 73 | 73 | // Drop an inherited META_API_KEY so Muse uses its login; an instance value still wins. |
| 74 | 74 | const processEnvironment = yield* mergeProviderInstanceEnvironment( |
| 75 | 75 | environment, |
| ... | ... | @@ -78,7 +78,7 @@ export const MuseDriver: ProviderDriver<MuseSettings, MuseDriverEnv> = { |
| 78 | 78 | const effectiveConfig = { |
| 79 | 79 | ...config, |
| 80 | 80 | enabled, |
| 81 | binaryPath: expandHomePath(config.binaryPath, yield* HostProcessHomeDirectory), | |
| 81 | binaryPath: expandHomePath(config.binaryPath, yield* HostProcess.HomeDirectory), | |
| 82 | 82 | } satisfies MuseSettings; |
| 83 | 83 | const continuationIdentity = defaultProviderContinuationIdentity({ |
| 84 | 84 | driverKind: DRIVER_KIND, |
packages/provider-opencode/src/server/OpenCodeRuntime.environment.test.ts+4-8
| ... | ... | @@ -1,11 +1,7 @@ |
| 1 | 1 | import type { OpencodeClient } from "@opencode-ai/sdk/v2"; |
| 2 | 2 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 3 | 3 | import { it as effectIt } from "@effect/vitest"; |
| 4 | import { | |
| 5 | HostProcessEnvironment, | |
| 6 | HostProcessExecutablePath, | |
| 7 | HostProcessPlatform, | |
| 8 | } from "@t3tools/shared/hostProcess"; | |
| 4 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 9 | 5 | import * as Effect from "effect/Effect"; |
| 10 | 6 | import * as Fiber from "effect/Fiber"; |
| 11 | 7 | import * as FileSystem from "effect/FileSystem"; |
| ... | ... | @@ -168,9 +164,9 @@ describe("OpenCode server output", () => { |
| 168 | 164 | Effect.gen(function* () { |
| 169 | 165 | const fs = yield* FileSystem.FileSystem; |
| 170 | 166 | const path = yield* Path.Path; |
| 171 | const environment = yield* HostProcessEnvironment; | |
| 172 | const executablePath = yield* HostProcessExecutablePath; | |
| 173 | const platform = yield* HostProcessPlatform; | |
| 167 | const environment = yield* HostProcess.Environment; | |
| 168 | const executablePath = yield* HostProcess.ExecutablePath; | |
| 169 | const platform = yield* HostProcess.Platform; | |
| 174 | 170 | const tempDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-opencode-output-" }); |
| 175 | 171 | const isWindows = platform === "win32"; |
| 176 | 172 | const binaryPath = path.join(tempDir, isWindows ? "opencode.cmd" : "opencode"); |
packages/provider-opencode/src/server/OpenCodeRuntime.inventory.test.ts+5-9
| ... | ... | @@ -9,11 +9,7 @@ import * as FileSystem from "effect/FileSystem"; |
| 9 | 9 | import * as Layer from "effect/Layer"; |
| 10 | 10 | import * as Path from "effect/Path"; |
| 11 | 11 | import * as Queue from "effect/Queue"; |
| 12 | import { | |
| 13 | HostProcessEnvironment, | |
| 14 | HostProcessExecutablePath, | |
| 15 | HostProcessPlatform, | |
| 16 | } from "@t3tools/shared/hostProcess"; | |
| 12 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 17 | 13 | |
| 18 | 14 | import * as OpenCodeRuntime from "./OpenCodeRuntime.ts"; |
| 19 | 15 | import * as OpenCodeServerLedger from "./OpenCodeServerLedger.ts"; |
| ... | ... | @@ -217,9 +213,9 @@ it.layer(layerTest)("OpenCodeRuntime inventory", (it) => { |
| 217 | 213 | Effect.gen(function* () { |
| 218 | 214 | const fs = yield* FileSystem.FileSystem; |
| 219 | 215 | const path = yield* Path.Path; |
| 220 | const hostEnvironment = yield* HostProcessEnvironment; | |
| 221 | const executablePath = yield* HostProcessExecutablePath; | |
| 222 | const hostPlatform = yield* HostProcessPlatform; | |
| 216 | const hostEnvironment = yield* HostProcess.Environment; | |
| 217 | const executablePath = yield* HostProcess.ExecutablePath; | |
| 218 | const hostPlatform = yield* HostProcess.Platform; | |
| 223 | 219 | const tempDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-opencode-inventory-" }); |
| 224 | 220 | const isWindows = hostPlatform === "win32"; |
| 225 | 221 | const binaryPath = path.join(tempDir, isWindows ? "opencode.cmd" : "opencode"); |
| ... | ... | @@ -271,7 +267,7 @@ it.layer(layerTest)("OpenCodeRuntime inventory", (it) => { |
| 271 | 267 | it.effect("caps and drains command stdout and stderr when requested", () => |
| 272 | 268 | Effect.gen(function* () { |
| 273 | 269 | const runtime = yield* OpenCodeRuntime.OpenCodeRuntime; |
| 274 | const executablePath = yield* HostProcessExecutablePath; | |
| 270 | const executablePath = yield* HostProcess.ExecutablePath; | |
| 275 | 271 | const outputBytes = 2 * 1024 * 1024; |
| 276 | 272 | const result = yield* runtime.runOpenCodeCommand({ |
| 277 | 273 | binaryPath: executablePath, |
packages/provider-opencode/src/server/OpenCodeRuntime.ts+2-2
| ... | ... | @@ -36,7 +36,7 @@ import { isWindowsCommandNotFound } from "@t3tools/provider-core/server/snapshot |
| 36 | 36 | import * as OpenCodeServerLedger from "./OpenCodeServerLedger.ts"; |
| 37 | 37 | import { collectStreamAsString } from "@t3tools/provider-core/server/snapshotProbe"; |
| 38 | 38 | import * as NetService from "@t3tools/shared/Net"; |
| 39 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 39 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 40 | 40 | import { compareSemverVersions, parseSemver } from "@t3tools/shared/semver"; |
| 41 | 41 | import { resolveSpawnCommand } from "@t3tools/shared/shell"; |
| 42 | 42 | const encodeUnknownJsonStringExit = Schema.encodeUnknownExit(Schema.fromJsonString(Schema.Unknown)); |
| ... | ... | @@ -595,7 +595,7 @@ function ensureRuntimeError( |
| 595 | 595 | const makeOpenCodeRuntime = Effect.gen(function* () { |
| 596 | 596 | const spawner = yield* ChildProcessSpawner.ChildProcessSpawner; |
| 597 | 597 | const netService = yield* NetService.NetService; |
| 598 | const hostPlatform = yield* HostProcessPlatform; | |
| 598 | const hostPlatform = yield* HostProcess.Platform; | |
| 599 | 599 | const serverLedger = yield* OpenCodeServerLedger.OpenCodeServerLedger; |
| 600 | 600 | const resolveCommand = (command: string, args: ReadonlyArray<string>, env?: NodeJS.ProcessEnv) => |
| 601 | 601 | resolveSpawnCommand(command, args, env ? { env } : {}); |
packages/provider-opencode/src/server/OpenCodeServerLedger.test.ts+3-3
| ... | ... | @@ -3,7 +3,7 @@ import * as NodeChildProcess from "node:child_process"; |
| 3 | 3 | |
| 4 | 4 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 5 | 5 | import { describe, expect, it } from "@effect/vitest"; |
| 6 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 6 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 7 | 7 | import * as Deferred from "effect/Deferred"; |
| 8 | 8 | import * as Effect from "effect/Effect"; |
| 9 | 9 | import * as Exit from "effect/Exit"; |
| ... | ... | @@ -67,7 +67,7 @@ const recordFromDeadServer = (stateDir: string, server: { readonly pid: number } |
| 67 | 67 | yield* previousServer.exited; |
| 68 | 68 | }); |
| 69 | 69 | |
| 70 | const hostPlatform = HostProcessPlatform.defaultValue(); | |
| 70 | const hostPlatform = HostProcess.Platform.defaultValue(); | |
| 71 | 71 | // procps accepts the same `ps` flags as macOS, so Linux also covers the macOS path. |
| 72 | 72 | const observedPlatforms: ReadonlyArray<NodeJS.Platform> = |
| 73 | 73 | hostPlatform === "linux" ? ["linux", "darwin"] : hostPlatform === "darwin" ? ["darwin"] : []; |
| ... | ... | @@ -75,7 +75,7 @@ const observedPlatforms: ReadonlyArray<NodeJS.Platform> = |
| 75 | 75 | describe.each(observedPlatforms)("OpenCodeServerLedger observing as %s", (platform) => { |
| 76 | 76 | const provideHost = <A, E, R>(effect: Effect.Effect<A, E, R>) => |
| 77 | 77 | effect.pipe( |
| 78 | Effect.provideService(HostProcessPlatform, platform), | |
| 78 | Effect.provideService(HostProcess.Platform, platform), | |
| 79 | 79 | Effect.provide(NodeServices.layer), |
| 80 | 80 | ); |
| 81 | 81 |
packages/provider-opencode/src/server/OpenCodeServerLedger.ts+2-2
| ... | ... | @@ -1,4 +1,4 @@ |
| 1 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 1 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 2 | 2 | import * as Context from "effect/Context"; |
| 3 | 3 | import * as Effect from "effect/Effect"; |
| 4 | 4 | import * as FileSystem from "effect/FileSystem"; |
| ... | ... | @@ -119,7 +119,7 @@ export const make = Effect.fn("OpenCodeServerLedger.make")(function* (input: { |
| 119 | 119 | const fs = yield* FileSystem.FileSystem; |
| 120 | 120 | const path = yield* Path.Path; |
| 121 | 121 | const spawner = yield* ChildProcessSpawner.ChildProcessSpawner; |
| 122 | const platform = yield* HostProcessPlatform; | |
| 122 | const platform = yield* HostProcess.Platform; | |
| 123 | 123 | const directory = path.join(input.stateDir, ENTRY_DIRECTORY); |
| 124 | 124 | // Windows servers are not detached and are never recorded. |
| 125 | 125 | const recordable = platform === "linux" || platform === "darwin"; |
packages/provider-opencode/src/server/adapter.ts+3-3
| ... | ... | @@ -9,7 +9,7 @@ import type { |
| 9 | 9 | Todo as OpenCodeTodo, |
| 10 | 10 | ToolPart, |
| 11 | 11 | } from "@opencode-ai/sdk/v2"; |
| 12 | import { HostProcessEnvironment } from "@t3tools/shared/hostProcess"; | |
| 12 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 13 | 13 | import { getModelSelectionStringOptionValue } from "@t3tools/shared/model"; |
| 14 | 14 | import { causeErrorTag } from "@t3tools/shared/observability"; |
| 15 | 15 | import { |
| ... | ... | @@ -3739,7 +3739,7 @@ export const OpenCodeAdapterV2Driver: ProviderAdapterDriver< |
| 3739 | 3739 | defaultConfig: (): OpenCodeSettings => DEFAULT_OPENCODE_SETTINGS, |
| 3740 | 3740 | create: Effect.fn("OpenCodeAdapterV2Driver.create")( |
| 3741 | 3741 | function* (input: ProviderAdapterDriverCreateInput<OpenCodeSettings>) { |
| 3742 | const hostEnvironment = yield* HostProcessEnvironment; | |
| 3742 | const hostEnvironment = yield* HostProcess.Environment; | |
| 3743 | 3743 | const providerEventLoggers = yield* ProviderEventLoggers.ProviderEventLoggers; |
| 3744 | 3744 | return yield* makeOpenCodeAdapterV2({ |
| 3745 | 3745 | instanceId: input.instanceId, |
| ... | ... | @@ -3769,7 +3769,7 @@ const layer: Layer.Layer<ProviderAdapter.ProviderAdapterV2, never, OpenCodeAdapt |
| 3769 | 3769 | Layer.effect( |
| 3770 | 3770 | ProviderAdapter.ProviderAdapterV2, |
| 3771 | 3771 | Effect.gen(function* () { |
| 3772 | const hostEnvironment = yield* HostProcessEnvironment; | |
| 3772 | const hostEnvironment = yield* HostProcess.Environment; | |
| 3773 | 3773 | const providerEventLoggers = yield* ProviderEventLoggers.ProviderEventLoggers; |
| 3774 | 3774 | return yield* makeOpenCodeAdapterV2({ |
| 3775 | 3775 | instanceId: OPENCODE_DEFAULT_INSTANCE_ID, |
packages/provider-opencode/src/server/driver.test.ts+3-3
| ... | ... | @@ -7,7 +7,7 @@ import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 7 | 7 | import { assert, it } from "@effect/vitest"; |
| 8 | 8 | import { ProviderInstanceId } from "@t3tools/contracts"; |
| 9 | 9 | import type { OpenCodeSettings } from "../settings.ts"; |
| 10 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 10 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 11 | 11 | import * as Effect from "effect/Effect"; |
| 12 | 12 | import * as Fiber from "effect/Fiber"; |
| 13 | 13 | import * as Layer from "effect/Layer"; |
| ... | ... | @@ -156,7 +156,7 @@ const resolveUpdate = (generation: "v1" | "v2", binaryPath: string) => |
| 156 | 156 | Effect.provide(NodeServices.layer), |
| 157 | 157 | ); |
| 158 | 158 | |
| 159 | it.effect.skipIf(HostProcessPlatform.defaultValue() === "win32")( | |
| 159 | it.effect.skipIf(HostProcess.Platform.defaultValue() === "win32")( | |
| 160 | 160 | "updates an npm-global OpenCode 2 install as @opencode/cli and a 1.x one as opencode-ai", |
| 161 | 161 | () => |
| 162 | 162 | Effect.gen(function* () { |
| ... | ... | @@ -243,7 +243,7 @@ it.layer(layerUpdate)("OpenCodeDriver updates", (it) => { |
| 243 | 243 | }).pipe(Effect.scoped), |
| 244 | 244 | ); |
| 245 | 245 | |
| 246 | it.effect.skipIf(HostProcessPlatform.defaultValue() === "win32")( | |
| 246 | it.effect.skipIf(HostProcess.Platform.defaultValue() === "win32")( | |
| 247 | 247 | "offers no package update for an unknown version and follows a changed one on a fresh read", |
| 248 | 248 | () => |
| 249 | 249 | Effect.gen(function* () { |
packages/provider-opencode/src/server/usage.ts+3-3
| ... | ... | @@ -11,7 +11,7 @@ import { |
| 11 | 11 | type ProviderUsageReader, |
| 12 | 12 | type UsageRecord, |
| 13 | 13 | } from "@t3tools/provider-core/server/usage"; |
| 14 | import { HostProcessEnvironment, HostProcessHomeDirectory } from "@t3tools/shared/hostProcess"; | |
| 14 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 15 | 15 | import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient"; |
| 16 | 16 | import * as Effect from "effect/Effect"; |
| 17 | 17 | import * as Exit from "effect/Exit"; |
| ... | ... | @@ -257,8 +257,8 @@ export const readOpenCodeUsage = Effect.fn("readOpenCodeUsage")(function* ( |
| 257 | 257 | const resolveOpenCodeDataDirs = Effect.fn("resolveOpenCodeDataDirs")(function* () { |
| 258 | 258 | const fileSystem = yield* FileSystem.FileSystem; |
| 259 | 259 | const path = yield* Path.Path; |
| 260 | const environment = yield* HostProcessEnvironment; | |
| 261 | const homeDirectory = yield* HostProcessHomeDirectory; | |
| 260 | const environment = yield* HostProcess.Environment; | |
| 261 | const homeDirectory = yield* HostProcess.HomeDirectory; | |
| 262 | 262 | const roots = environment["OPENCODE_DATA_DIR"] |
| 263 | 263 | ?.split(",") |
| 264 | 264 | .map((value) => value.trim()) |
packages/provider-opencode/src/server/usageLimits.ts+2-2
| ... | ... | @@ -16,7 +16,7 @@ import { |
| 16 | 16 | makeUnavailableUsageLimits, |
| 17 | 17 | makeUsageLimits, |
| 18 | 18 | } from "@t3tools/provider-core/server/usageLimits"; |
| 19 | import { HostProcessHomeDirectory } from "@t3tools/shared/hostProcess"; | |
| 19 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 20 | 20 | |
| 21 | 21 | const AuthFile = Schema.Struct({ "opencode-go": Schema.optionalKey(Schema.Unknown) }); |
| 22 | 22 | const ApiAuth = Schema.Struct({ type: Schema.Literal("api"), key: Schema.String }); |
| ... | ... | @@ -47,7 +47,7 @@ export const readOpenCodeGoUsageLimits = Effect.fn("readOpenCodeGoUsageLimits")( |
| 47 | 47 | const dataHome = |
| 48 | 48 | env.XDG_DATA_HOME || |
| 49 | 49 | path.join( |
| 50 | env.HOME || env.USERPROFILE || (yield* HostProcessHomeDirectory), | |
| 50 | env.HOME || env.USERPROFILE || (yield* HostProcess.HomeDirectory), | |
| 51 | 51 | ".local", |
| 52 | 52 | "share", |
| 53 | 53 | ); |
packages/provider-opencode/src/server/v2/OpenCode2Server.test.ts+5-9
| ... | ... | @@ -1,10 +1,6 @@ |
| 1 | 1 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 2 | 2 | import { assert, it } from "@effect/vitest"; |
| 3 | import { | |
| 4 | HostProcessEnvironment, | |
| 5 | HostProcessExecutablePath, | |
| 6 | HostProcessPlatform, | |
| 7 | } from "@t3tools/shared/hostProcess"; | |
| 3 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 8 | 4 | import * as Effect from "effect/Effect"; |
| 9 | 5 | import * as Fiber from "effect/Fiber"; |
| 10 | 6 | import * as FileSystem from "effect/FileSystem"; |
| ... | ... | @@ -221,7 +217,7 @@ describe("OpenCode2Server spawned server", () => { |
| 221 | 217 | Effect.gen(function* () { |
| 222 | 218 | const fs = yield* FileSystem.FileSystem; |
| 223 | 219 | const path = yield* Path.Path; |
| 224 | const platform = yield* HostProcessPlatform; | |
| 220 | const platform = yield* HostProcess.Platform; | |
| 225 | 221 | const directory = yield* fs.makeTempDirectoryScoped({ prefix: "t3-opencode2-fake-" }); |
| 226 | 222 | const isWindows = platform === "win32"; |
| 227 | 223 | const binaryPath = path.join(directory, isWindows ? "opencode.cmd" : "opencode"); |
| ... | ... | @@ -230,8 +226,8 @@ describe("OpenCode2Server spawned server", () => { |
| 230 | 226 | yield* fs.writeFileString( |
| 231 | 227 | binaryPath, |
| 232 | 228 | isWindows |
| 233 | ? `@echo off\r\n"${yield* HostProcessExecutablePath}" "${scriptPath}" %*\r\n` | |
| 234 | : `#!/bin/sh\nexec "${yield* HostProcessExecutablePath}" "${scriptPath}" "$@"\n`, | |
| 229 | ? `@echo off\r\n"${yield* HostProcess.ExecutablePath}" "${scriptPath}" %*\r\n` | |
| 230 | : `#!/bin/sh\nexec "${yield* HostProcess.ExecutablePath}" "${scriptPath}" "$@"\n`, | |
| 235 | 231 | ); |
| 236 | 232 | if (!isWindows) yield* fs.chmod(binaryPath, 0o755); |
| 237 | 233 | |
| ... | ... | @@ -240,7 +236,7 @@ describe("OpenCode2Server spawned server", () => { |
| 240 | 236 | serverUrl: "", |
| 241 | 237 | serverPassword: "", |
| 242 | 238 | directory, |
| 243 | environment: { ...(yield* HostProcessEnvironment), OPENCODE_SERVER_PASSWORD: "ambient" }, | |
| 239 | environment: { ...(yield* HostProcess.Environment), OPENCODE_SERVER_PASSWORD: "ambient" }, | |
| 244 | 240 | }); |
| 245 | 241 | const first = yield* server.withConnection((connection) => Effect.succeed(connection)); |
| 246 | 242 | const second = yield* server.withConnection((connection) => Effect.succeed(connection)); |
packages/provider-pi/src/server/adapter.test.ts+2-2
| ... | ... | @@ -38,7 +38,7 @@ import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderS |
| 38 | 38 | import * as IdAllocator from "@t3tools/provider-core/server/IdAllocator"; |
| 39 | 39 | import * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter"; |
| 40 | 40 | import { handoffBudget } from "@t3tools/provider-core/server/handoffBudget"; |
| 41 | import { HostProcessEnvironment } from "@t3tools/shared/hostProcess"; | |
| 41 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 42 | 42 | import { |
| 43 | 43 | makePiAdapterV2, |
| 44 | 44 | PiAdapterV2Driver, |
| ... | ... | @@ -336,7 +336,7 @@ const makeAdapter = Effect.fnUntraced(function* ( |
| 336 | 336 | config: { enabled: true, binaryPath: "pi", launchArgs, customModels: [] }, |
| 337 | 337 | }).pipe( |
| 338 | 338 | Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner), |
| 339 | Effect.provideService(HostProcessEnvironment, {}), | |
| 339 | Effect.provideService(HostProcess.Environment, {}), | |
| 340 | 340 | Effect.provideService(ProviderContinuationRequests.ProviderContinuationRequests, { |
| 341 | 341 | ...continuationRequests, |
| 342 | 342 | take: Effect.never, |
packages/provider-pi/src/server/adapter.ts+3-3
| ... | ... | @@ -23,7 +23,7 @@ |
| 23 | 23 | * Terminal-only decoration such as status, widget, title, and editor-text |
| 24 | 24 | * updates has no matching T3 surface and is ignored. |
| 25 | 25 | */ |
| 26 | import { HostProcessEnvironment } from "@t3tools/shared/hostProcess"; | |
| 26 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 27 | 27 | import { getModelSelectionStringOptionValue } from "@t3tools/shared/model"; |
| 28 | 28 | import { |
| 29 | 29 | defaultInstanceIdForDriver, |
| ... | ... | @@ -3271,7 +3271,7 @@ export const PiAdapterV2Driver: ProviderAdapterDriver<PiSettings, PiAdapterV2Dri |
| 3271 | 3271 | defaultConfig: (): PiSettings => DEFAULT_PI_SETTINGS, |
| 3272 | 3272 | create: Effect.fn("PiAdapterV2Driver.create")( |
| 3273 | 3273 | function* (input: ProviderAdapterDriverCreateInput<PiSettings>) { |
| 3274 | const hostEnvironment = yield* HostProcessEnvironment; | |
| 3274 | const hostEnvironment = yield* HostProcess.Environment; | |
| 3275 | 3275 | const continuationRequests = yield* ProviderContinuationRequests.ProviderContinuationRequests; |
| 3276 | 3276 | return yield* makePiAdapterV2({ |
| 3277 | 3277 | instanceId: input.instanceId, |
| ... | ... | @@ -3299,7 +3299,7 @@ const layer: Layer.Layer<ProviderAdapter.ProviderAdapterV2, never, PiAdapterV2Dr |
| 3299 | 3299 | Layer.effect( |
| 3300 | 3300 | ProviderAdapter.ProviderAdapterV2, |
| 3301 | 3301 | Effect.gen(function* () { |
| 3302 | const hostEnvironment = yield* HostProcessEnvironment; | |
| 3302 | const hostEnvironment = yield* HostProcess.Environment; | |
| 3303 | 3303 | const continuationRequests = yield* ProviderContinuationRequests.ProviderContinuationRequests; |
| 3304 | 3304 | return yield* makePiAdapterV2({ |
| 3305 | 3305 | instanceId: PI_DEFAULT_INSTANCE_ID, |
packages/provider-pi/src/server/rpc.ts+2-2
| ... | ... | @@ -28,7 +28,7 @@ import * as Schema from "effect/Schema"; |
| 28 | 28 | import * as Stream from "effect/Stream"; |
| 29 | 29 | import * as ChildProcess from "effect/process/ChildProcess"; |
| 30 | 30 | import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner"; |
| 31 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 31 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 32 | 32 | import { resolveSpawnCommand } from "@t3tools/shared/shell"; |
| 33 | 33 | |
| 34 | 34 | import { signalProcessGroup } from "@t3tools/provider-core/server/processGroup"; |
| ... | ... | @@ -215,7 +215,7 @@ const terminatePiProcess = (kill: (signal: NodeJS.Signals) => boolean, hasExited |
| 215 | 215 | |
| 216 | 216 | export const makePiRpcConnection = Effect.fnUntraced(function* (options: PiRpcSpawnOptions) { |
| 217 | 217 | const spawner = yield* ChildProcessSpawner.ChildProcessSpawner; |
| 218 | const platform = yield* HostProcessPlatform; | |
| 218 | const platform = yield* HostProcess.Platform; | |
| 219 | 219 | const scope = yield* Effect.scope; |
| 220 | 220 | |
| 221 | 221 | const spawnCommand = yield* resolveSpawnCommand(options.command, [...options.args], { |
packages/provider-testing/src/fakeCli.ts+3-3
| ... | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | import * as NodeFS from "node:fs"; |
| 3 | 3 | import * as NodePath from "node:path"; |
| 4 | 4 | |
| 5 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 5 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 6 | 6 | |
| 7 | 7 | export interface FakeCliOptions { |
| 8 | 8 | /** Directory the launcher and its stub are written into. */ |
| ... | ... | @@ -15,7 +15,7 @@ export interface FakeCliOptions { |
| 15 | 15 | readonly env?: Readonly<Record<string, string>>; |
| 16 | 16 | /** |
| 17 | 17 | * Platform the launcher is shaped for. Effect callers should pass the value |
| 18 | * they read from `HostProcessPlatform` so an injected override is honoured; | |
| 18 | * they read from `HostProcess.Platform` so an injected override is honoured; | |
| 19 | 19 | * defaults to the real host for plain tests. |
| 20 | 20 | */ |
| 21 | 21 | readonly platform?: NodeJS.Platform; |
| ... | ... | @@ -45,7 +45,7 @@ export function writeFakeCli(options: FakeCliOptions): string { |
| 45 | 45 | "utf8", |
| 46 | 46 | ); |
| 47 | 47 | |
| 48 | if ((options.platform ?? HostProcessPlatform.defaultValue()) === "win32") { | |
| 48 | if ((options.platform ?? HostProcess.Platform.defaultValue()) === "win32") { | |
| 49 | 49 | const launcherPath = NodePath.join(options.directory, `${options.name}.cmd`); |
| 50 | 50 | NodeFS.writeFileSync( |
| 51 | 51 | launcherPath, |
packages/shared/package.json+3-3
| ... | ... | @@ -311,9 +311,9 @@ |
| 311 | 311 | "types": "./src/nodeRuntime.ts", |
| 312 | 312 | "import": "./src/nodeRuntime.ts" |
| 313 | 313 | }, |
| 314 | "./hostProcess": { | |
| 315 | "types": "./src/hostProcess.ts", | |
| 316 | "import": "./src/hostProcess.ts" | |
| 314 | "./HostProcess": { | |
| 315 | "types": "./src/HostProcess.ts", | |
| 316 | "import": "./src/HostProcess.ts" | |
| 317 | 317 | }, |
| 318 | 318 | "./testing/longTempDir": { |
| 319 | 319 | "types": "./src/testing/longTempDir.ts", |
packages/shared/src/HostProcess.ts created+110
| ... | ... | @@ -0,0 +1,110 @@ |
| 1 | import * as Context from "effect/Context"; | |
| 2 | import * as Effect from "effect/Effect"; | |
| 3 | import * as NodeDns from "node:dns"; | |
| 4 | import * as NodeOS from "node:os"; | |
| 5 | import * as NodeSea from "node:sea"; | |
| 6 | ||
| 7 | export const Platform = Context.Reference<NodeJS.Platform>("@t3tools/shared/HostProcess/Platform", { | |
| 8 | defaultValue: () => process.platform, | |
| 9 | }); | |
| 10 | ||
| 11 | export const Architecture = Context.Reference<NodeJS.Architecture>( | |
| 12 | "@t3tools/shared/HostProcess/Architecture", | |
| 13 | { | |
| 14 | defaultValue: () => process.arch, | |
| 15 | }, | |
| 16 | ); | |
| 17 | ||
| 18 | export const Hostname = Context.Reference<string>("@t3tools/shared/HostProcess/Hostname", { | |
| 19 | defaultValue: () => NodeOS.hostname(), | |
| 20 | }); | |
| 21 | ||
| 22 | export const HomeDirectory = Context.Reference<string>( | |
| 23 | "@t3tools/shared/HostProcess/HomeDirectory", | |
| 24 | { | |
| 25 | defaultValue: () => NodeOS.homedir(), | |
| 26 | }, | |
| 27 | ); | |
| 28 | ||
| 29 | export const Environment = Context.Reference<NodeJS.ProcessEnv>( | |
| 30 | "@t3tools/shared/HostProcess/Environment", | |
| 31 | { | |
| 32 | defaultValue: () => process.env, | |
| 33 | }, | |
| 34 | ); | |
| 35 | ||
| 36 | export const WorkingDirectory = Context.Reference<string>( | |
| 37 | "@t3tools/shared/HostProcess/WorkingDirectory", | |
| 38 | { | |
| 39 | defaultValue: () => process.cwd(), | |
| 40 | }, | |
| 41 | ); | |
| 42 | ||
| 43 | export const ExecutablePath = Context.Reference<string>( | |
| 44 | "@t3tools/shared/HostProcess/ExecutablePath", | |
| 45 | { | |
| 46 | defaultValue: () => process.execPath, | |
| 47 | }, | |
| 48 | ); | |
| 49 | ||
| 50 | export const Arguments = Context.Reference<ReadonlyArray<string>>( | |
| 51 | "@t3tools/shared/HostProcess/Arguments", | |
| 52 | { | |
| 53 | defaultValue: () => process.argv, | |
| 54 | }, | |
| 55 | ); | |
| 56 | ||
| 57 | /** | |
| 58 | * The command the shell was given, before Node resolved it to the binary: | |
| 59 | * `t3` for a PATH lookup, `./t3` or the launcher symlink for an explicit | |
| 60 | * path. `process.argv[0]` and `execPath` are always the resolved binary. | |
| 61 | */ | |
| 62 | export const InvokedAs = Context.Reference<string>("@t3tools/shared/HostProcess/InvokedAs", { | |
| 63 | defaultValue: () => process.argv0, | |
| 64 | }); | |
| 65 | ||
| 66 | /** | |
| 67 | * Whether this process is a Node single-executable rather than a script run | |
| 68 | * by a Node on the machine. Code that needs a sibling file or a Node to run | |
| 69 | * one branches on this: an executable hosts such things as hidden | |
| 70 | * subcommands of itself. | |
| 71 | */ | |
| 72 | export const IsExecutable = Context.Reference<boolean>("@t3tools/shared/HostProcess/IsExecutable", { | |
| 73 | defaultValue: () => NodeSea.isSea(), | |
| 74 | }); | |
| 75 | ||
| 76 | /** | |
| 77 | * Every IP address this machine answers to: the interface addresses, plus | |
| 78 | * whatever the resolver returns for the machine's own hostname. The latter | |
| 79 | * matters because a hostname can map to an address no interface carries — | |
| 80 | * Debian-style hosts put `127.0.1.1` in `/etc/hosts` — and a program that | |
| 81 | * records "its" address by resolving its hostname (Firefox's profile lock | |
| 82 | * does) will write that one. "Is this address ours" has to accept both. | |
| 83 | * | |
| 84 | * Best effort: a failed lookup just leaves the interface set. | |
| 85 | */ | |
| 86 | export const Addresses = Context.Reference<Effect.Effect<ReadonlySet<string>>>( | |
| 87 | "@t3tools/shared/HostProcess/Addresses", | |
| 88 | { | |
| 89 | defaultValue: () => | |
| 90 | Effect.gen(function* () { | |
| 91 | const interfaces = Object.values(NodeOS.networkInterfaces()) | |
| 92 | .flat() | |
| 93 | .flatMap((entry) => (entry ? [entry.address] : [])); | |
| 94 | const resolved = yield* Effect.tryPromise(() => | |
| 95 | NodeDns.promises.lookup(NodeOS.hostname(), { all: true }), | |
| 96 | ).pipe( | |
| 97 | Effect.map((entries) => entries.map((entry) => entry.address)), | |
| 98 | Effect.orElseSucceed(() => [] as ReadonlyArray<string>), | |
| 99 | ); | |
| 100 | return new Set([...interfaces, ...resolved]); | |
| 101 | }), | |
| 102 | }, | |
| 103 | ); | |
| 104 | ||
| 105 | /** Undefined on platforms without POSIX uids (Windows). */ | |
| 106 | export const UserId = Context.Reference<number | undefined>("@t3tools/shared/HostProcess/UserId", { | |
| 107 | defaultValue: () => process.getuid?.(), | |
| 108 | }); | |
| 109 | ||
| 110 | export const isWindows = Effect.map(Platform, (platform) => platform === "win32"); |
packages/shared/src/editor.ts+2-2
| ... | ... | @@ -4,7 +4,7 @@ import * as FileSystem from "effect/FileSystem"; |
| 4 | 4 | import * as Option from "effect/Option"; |
| 5 | 5 | import * as Path from "effect/Path"; |
| 6 | 6 | |
| 7 | import * as HostProcess from "./hostProcess.ts"; | |
| 7 | import * as HostProcess from "./HostProcess.ts"; | |
| 8 | 8 | import { isCommandAvailable } from "./shell.ts"; |
| 9 | 9 | |
| 10 | 10 | type Editor = (typeof EDITORS)[number]; |
| ... | ... | @@ -37,7 +37,7 @@ export const resolveEditorCommand = Effect.fn("editor.resolveEditorCommand")(fun |
| 37 | 37 | if (yield* isCommandAvailable(command, { env })) return Option.some({ command, baseArgs }); |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | const platform = yield* HostProcess.HostProcessPlatform; | |
| 40 | const platform = yield* HostProcess.Platform; | |
| 41 | 41 | const path = yield* Path.Path; |
| 42 | 42 | const fs = yield* FileSystem.FileSystem; |
| 43 | 43 | const home = env.HOME; |
packages/shared/src/hostProcess.ts deleted-125
| ... | ... | @@ -1,125 +0,0 @@ |
| 1 | import * as Context from "effect/Context"; | |
| 2 | import * as Effect from "effect/Effect"; | |
| 3 | import * as NodeDns from "node:dns"; | |
| 4 | import * as NodeOS from "node:os"; | |
| 5 | import * as NodeSea from "node:sea"; | |
| 6 | ||
| 7 | export const HostProcessPlatform = Context.Reference<NodeJS.Platform>( | |
| 8 | "@t3tools/shared/hostProcess/HostProcessPlatform", | |
| 9 | { | |
| 10 | defaultValue: () => process.platform, | |
| 11 | }, | |
| 12 | ); | |
| 13 | ||
| 14 | export const HostProcessArchitecture = Context.Reference<NodeJS.Architecture>( | |
| 15 | "@t3tools/shared/hostProcess/HostProcessArchitecture", | |
| 16 | { | |
| 17 | defaultValue: () => process.arch, | |
| 18 | }, | |
| 19 | ); | |
| 20 | ||
| 21 | export const HostProcessHostname = Context.Reference<string>( | |
| 22 | "@t3tools/shared/hostProcess/HostProcessHostname", | |
| 23 | { | |
| 24 | defaultValue: () => NodeOS.hostname(), | |
| 25 | }, | |
| 26 | ); | |
| 27 | ||
| 28 | export const HostProcessHomeDirectory = Context.Reference<string>( | |
| 29 | "@t3tools/shared/hostProcess/HostProcessHomeDirectory", | |
| 30 | { | |
| 31 | defaultValue: () => NodeOS.homedir(), | |
| 32 | }, | |
| 33 | ); | |
| 34 | ||
| 35 | export const HostProcessEnvironment = Context.Reference<NodeJS.ProcessEnv>( | |
| 36 | "@t3tools/shared/hostProcess/HostProcessEnvironment", | |
| 37 | { | |
| 38 | defaultValue: () => process.env, | |
| 39 | }, | |
| 40 | ); | |
| 41 | ||
| 42 | export const HostProcessWorkingDirectory = Context.Reference<string>( | |
| 43 | "@t3tools/shared/hostProcess/HostProcessWorkingDirectory", | |
| 44 | { | |
| 45 | defaultValue: () => process.cwd(), | |
| 46 | }, | |
| 47 | ); | |
| 48 | ||
| 49 | export const HostProcessExecutablePath = Context.Reference<string>( | |
| 50 | "@t3tools/shared/hostProcess/HostProcessExecutablePath", | |
| 51 | { | |
| 52 | defaultValue: () => process.execPath, | |
| 53 | }, | |
| 54 | ); | |
| 55 | ||
| 56 | export const HostProcessArguments = Context.Reference<ReadonlyArray<string>>( | |
| 57 | "@t3tools/shared/hostProcess/HostProcessArguments", | |
| 58 | { | |
| 59 | defaultValue: () => process.argv, | |
| 60 | }, | |
| 61 | ); | |
| 62 | ||
| 63 | /** | |
| 64 | * The command the shell was given, before Node resolved it to the binary: | |
| 65 | * `t3` for a PATH lookup, `./t3` or the launcher symlink for an explicit | |
| 66 | * path. `process.argv[0]` and `execPath` are always the resolved binary. | |
| 67 | */ | |
| 68 | export const HostProcessInvokedAs = Context.Reference<string>( | |
| 69 | "@t3tools/shared/hostProcess/HostProcessInvokedAs", | |
| 70 | { | |
| 71 | defaultValue: () => process.argv0, | |
| 72 | }, | |
| 73 | ); | |
| 74 | ||
| 75 | /** | |
| 76 | * Whether this process is a Node single-executable rather than a script run | |
| 77 | * by a Node on the machine. Code that needs a sibling file or a Node to run | |
| 78 | * one branches on this: an executable hosts such things as hidden | |
| 79 | * subcommands of itself. | |
| 80 | */ | |
| 81 | export const HostProcessIsExecutable = Context.Reference<boolean>( | |
| 82 | "@t3tools/shared/hostProcess/HostProcessIsExecutable", | |
| 83 | { | |
| 84 | defaultValue: () => NodeSea.isSea(), | |
| 85 | }, | |
| 86 | ); | |
| 87 | ||
| 88 | /** | |
| 89 | * Every IP address this machine answers to: the interface addresses, plus | |
| 90 | * whatever the resolver returns for the machine's own hostname. The latter | |
| 91 | * matters because a hostname can map to an address no interface carries — | |
| 92 | * Debian-style hosts put `127.0.1.1` in `/etc/hosts` — and a program that | |
| 93 | * records "its" address by resolving its hostname (Firefox's profile lock | |
| 94 | * does) will write that one. "Is this address ours" has to accept both. | |
| 95 | * | |
| 96 | * Best effort: a failed lookup just leaves the interface set. | |
| 97 | */ | |
| 98 | export const HostProcessAddresses = Context.Reference<Effect.Effect<ReadonlySet<string>>>( | |
| 99 | "@t3tools/shared/hostProcess/HostProcessAddresses", | |
| 100 | { | |
| 101 | defaultValue: () => | |
| 102 | Effect.gen(function* () { | |
| 103 | const interfaces = Object.values(NodeOS.networkInterfaces()) | |
| 104 | .flat() | |
| 105 | .flatMap((entry) => (entry ? [entry.address] : [])); | |
| 106 | const resolved = yield* Effect.tryPromise(() => | |
| 107 | NodeDns.promises.lookup(NodeOS.hostname(), { all: true }), | |
| 108 | ).pipe( | |
| 109 | Effect.map((entries) => entries.map((entry) => entry.address)), | |
| 110 | Effect.orElseSucceed(() => [] as ReadonlyArray<string>), | |
| 111 | ); | |
| 112 | return new Set([...interfaces, ...resolved]); | |
| 113 | }), | |
| 114 | }, | |
| 115 | ); | |
| 116 | ||
| 117 | /** Undefined on platforms without POSIX uids (Windows). */ | |
| 118 | export const HostProcessUserId = Context.Reference<number | undefined>( | |
| 119 | "@t3tools/shared/hostProcess/HostProcessUserId", | |
| 120 | { | |
| 121 | defaultValue: () => process.getuid?.(), | |
| 122 | }, | |
| 123 | ); | |
| 124 | ||
| 125 | export const isHostWindows = Effect.map(HostProcessPlatform, (platform) => platform === "win32"); |
packages/shared/src/logging.test.ts+2-2
| ... | ... | @@ -3,7 +3,7 @@ import * as NodeFS from "node:fs"; |
| 3 | 3 | import * as NodeOS from "node:os"; |
| 4 | 4 | import * as NodePath from "node:path"; |
| 5 | 5 | import { afterEach, describe, expect, it } from "vite-plus/test"; |
| 6 | import { HostProcessPlatform } from "./hostProcess.ts"; | |
| 6 | import * as HostProcess from "./HostProcess.ts"; | |
| 7 | 7 | |
| 8 | 8 | import { |
| 9 | 9 | RotatingFileSink, |
| ... | ... | @@ -11,7 +11,7 @@ import { |
| 11 | 11 | RotatingFileSinkError, |
| 12 | 12 | } from "./logging.ts"; |
| 13 | 13 | |
| 14 | const windowsHost = HostProcessPlatform.defaultValue() === "win32"; | |
| 14 | const windowsHost = HostProcess.Platform.defaultValue() === "win32"; | |
| 15 | 15 | const tempDirectories: string[] = []; |
| 16 | 16 | |
| 17 | 17 | const makeTempDirectory = (): string => { |
packages/shared/src/nodeRuntime.test.ts+28-33
| ... | ... | @@ -5,12 +5,7 @@ import * as FileSystem from "effect/FileSystem"; |
| 5 | 5 | import * as Path from "effect/Path"; |
| 6 | 6 | import * as Result from "effect/Result"; |
| 7 | 7 | |
| 8 | import { | |
| 9 | HostProcessArguments, | |
| 10 | HostProcessExecutablePath, | |
| 11 | HostProcessIsExecutable, | |
| 12 | HostProcessPlatform, | |
| 13 | } from "./hostProcess.ts"; | |
| 8 | import * as HostProcess from "./HostProcess.ts"; | |
| 14 | 9 | import { resolveNodeExecutable, resolveSelfInvocation, selfInvocationArgs } from "./nodeRuntime.ts"; |
| 15 | 10 | import { symlinksSupported } from "./testing/symlinks.ts"; |
| 16 | 11 | |
| ... | ... | @@ -19,9 +14,9 @@ describe("Self invocation", () => { |
| 19 | 14 | Effect.gen(function* () { |
| 20 | 15 | const path = yield* Path.Path; |
| 21 | 16 | const invocation = yield* resolveSelfInvocation().pipe( |
| 22 | Effect.provideService(HostProcessExecutablePath, "/runtime/node"), | |
| 23 | Effect.provideService(HostProcessIsExecutable, false), | |
| 24 | Effect.provideService(HostProcessArguments, ["/runtime/node", "dist/bin.mjs", "serve"]), | |
| 17 | Effect.provideService(HostProcess.ExecutablePath, "/runtime/node"), | |
| 18 | Effect.provideService(HostProcess.IsExecutable, false), | |
| 19 | Effect.provideService(HostProcess.Arguments, ["/runtime/node", "dist/bin.mjs", "serve"]), | |
| 25 | 20 | ); |
| 26 | 21 | expect(invocation.command).toBe("/runtime/node"); |
| 27 | 22 | expect(invocation.entrypoint).toBe(path.resolve("dist/bin.mjs")); |
| ... | ... | @@ -36,9 +31,9 @@ describe("Self invocation", () => { |
| 36 | 31 | Effect.gen(function* () { |
| 37 | 32 | // Node repeats the binary at argv[1] for a single-executable; it is not a script. |
| 38 | 33 | const invocation = yield* resolveSelfInvocation().pipe( |
| 39 | Effect.provideService(HostProcessExecutablePath, "/packaged/t3"), | |
| 40 | Effect.provideService(HostProcessIsExecutable, true), | |
| 41 | Effect.provideService(HostProcessArguments, ["/packaged/t3", "/packaged/t3", "serve"]), | |
| 34 | Effect.provideService(HostProcess.ExecutablePath, "/packaged/t3"), | |
| 35 | Effect.provideService(HostProcess.IsExecutable, true), | |
| 36 | Effect.provideService(HostProcess.Arguments, ["/packaged/t3", "/packaged/t3", "serve"]), | |
| 42 | 37 | ); |
| 43 | 38 | expect(invocation).toEqual({ command: "/packaged/t3", entrypoint: undefined }); |
| 44 | 39 | expect(selfInvocationArgs(invocation, ["acp-mcp-bridge"])).toEqual(["acp-mcp-bridge"]); |
| ... | ... | @@ -52,8 +47,8 @@ describe("Node runtime selection", () => { |
| 52 | 47 | for (const executable of ["/runtime/node", "/Applications/T3 Code.app/Electron"]) { |
| 53 | 48 | expect( |
| 54 | 49 | yield* resolveNodeExecutable("Local device support", { PATH: "" }).pipe( |
| 55 | Effect.provideService(HostProcessExecutablePath, executable), | |
| 56 | Effect.provideService(HostProcessIsExecutable, false), | |
| 50 | Effect.provideService(HostProcess.ExecutablePath, executable), | |
| 51 | Effect.provideService(HostProcess.IsExecutable, false), | |
| 57 | 52 | ), |
| 58 | 53 | ).toBe(executable); |
| 59 | 54 | } |
| ... | ... | @@ -69,8 +64,8 @@ describe("Node runtime selection", () => { |
| 69 | 64 | }), |
| 70 | 65 | ).toBe(process.execPath); |
| 71 | 66 | }).pipe( |
| 72 | Effect.provideService(HostProcessExecutablePath, "/packaged/t3"), | |
| 73 | Effect.provideService(HostProcessIsExecutable, true), | |
| 67 | Effect.provideService(HostProcess.ExecutablePath, "/packaged/t3"), | |
| 68 | Effect.provideService(HostProcess.IsExecutable, true), | |
| 74 | 69 | Effect.provide(NodeServices.layer), |
| 75 | 70 | ), |
| 76 | 71 | ); |
| ... | ... | @@ -84,7 +79,7 @@ describe("Node runtime selection", () => { |
| 84 | 79 | expect(error.message).toContain("Local device support requires Node.js"); |
| 85 | 80 | expect(error.message).toContain("Install Node.js"); |
| 86 | 81 | }).pipe( |
| 87 | Effect.provideService(HostProcessIsExecutable, true), | |
| 82 | Effect.provideService(HostProcess.IsExecutable, true), | |
| 88 | 83 | Effect.provide(NodeServices.layer), |
| 89 | 84 | ), |
| 90 | 85 | ); |
| ... | ... | @@ -94,7 +89,7 @@ describe("Node runtime selection", () => { |
| 94 | 89 | const fs = yield* FileSystem.FileSystem; |
| 95 | 90 | const path = yield* Path.Path; |
| 96 | 91 | const directory = yield* fs.makeTempDirectoryScoped(); |
| 97 | const platform = yield* HostProcessPlatform; | |
| 92 | const platform = yield* HostProcess.Platform; | |
| 98 | 93 | const node = path.join(directory, platform === "win32" ? "node.exe" : "node"); |
| 99 | 94 | const env = { PATH: directory }; |
| 100 | 95 | expect( |
| ... | ... | @@ -107,8 +102,8 @@ describe("Node runtime selection", () => { |
| 107 | 102 | expect(yield* resolveNodeExecutable("Local device support", env)).toBe(node); |
| 108 | 103 | }).pipe( |
| 109 | 104 | Effect.scoped, |
| 110 | Effect.provideService(HostProcessExecutablePath, "/packaged/t3"), | |
| 111 | Effect.provideService(HostProcessIsExecutable, true), | |
| 105 | Effect.provideService(HostProcess.ExecutablePath, "/packaged/t3"), | |
| 106 | Effect.provideService(HostProcess.IsExecutable, true), | |
| 112 | 107 | Effect.provide(NodeServices.layer), |
| 113 | 108 | ), |
| 114 | 109 | ); |
| ... | ... | @@ -134,9 +129,9 @@ describe("Node runtime selection", () => { |
| 134 | 129 | ).toBe(node); |
| 135 | 130 | }).pipe( |
| 136 | 131 | Effect.scoped, |
| 137 | Effect.provideService(HostProcessExecutablePath, "/packaged/t3"), | |
| 138 | Effect.provideService(HostProcessIsExecutable, true), | |
| 139 | Effect.provideService(HostProcessPlatform, "win32"), | |
| 132 | Effect.provideService(HostProcess.ExecutablePath, "/packaged/t3"), | |
| 133 | Effect.provideService(HostProcess.IsExecutable, true), | |
| 134 | Effect.provideService(HostProcess.Platform, "win32"), | |
| 140 | 135 | Effect.provide(NodeServices.layer), |
| 141 | 136 | ), |
| 142 | 137 | ); |
| ... | ... | @@ -156,8 +151,8 @@ describe("Node runtime selection", () => { |
| 156 | 151 | expect(error.message).toContain("Install Node.js"); |
| 157 | 152 | }).pipe( |
| 158 | 153 | Effect.scoped, |
| 159 | Effect.provideService(HostProcessIsExecutable, true), | |
| 160 | Effect.provideService(HostProcessPlatform, "win32"), | |
| 154 | Effect.provideService(HostProcess.IsExecutable, true), | |
| 155 | Effect.provideService(HostProcess.Platform, "win32"), | |
| 161 | 156 | Effect.provide(NodeServices.layer), |
| 162 | 157 | ), |
| 163 | 158 | ); |
| ... | ... | @@ -167,21 +162,21 @@ describe("Node runtime selection", () => { |
| 167 | 162 | const fs = yield* FileSystem.FileSystem; |
| 168 | 163 | const path = yield* Path.Path; |
| 169 | 164 | const directory = yield* fs.makeTempDirectoryScoped(); |
| 170 | const platform = yield* HostProcessPlatform; | |
| 165 | const platform = yield* HostProcess.Platform; | |
| 171 | 166 | const executable = path.join(directory, platform === "win32" ? "t3.exe" : "t3"); |
| 172 | 167 | const node = path.join(directory, platform === "win32" ? "node.exe" : "node"); |
| 173 | 168 | yield* fs.writeFileString(executable, "standalone executable fixture"); |
| 174 | 169 | yield* fs.chmod(executable, 0o755); |
| 175 | 170 | yield* fs.link(executable, node); |
| 176 | 171 | const error = yield* resolveNodeExecutable("Local device support", { PATH: directory }).pipe( |
| 177 | Effect.provideService(HostProcessExecutablePath, executable), | |
| 172 | Effect.provideService(HostProcess.ExecutablePath, executable), | |
| 178 | 173 | Effect.flip, |
| 179 | 174 | ); |
| 180 | 175 | expect(error._tag).toBe("NodeRuntimeUnavailableError"); |
| 181 | 176 | expect(error.message).toContain("Install Node.js"); |
| 182 | 177 | }).pipe( |
| 183 | 178 | Effect.scoped, |
| 184 | Effect.provideService(HostProcessIsExecutable, true), | |
| 179 | Effect.provideService(HostProcess.IsExecutable, true), | |
| 185 | 180 | Effect.provide(NodeServices.layer), |
| 186 | 181 | ), |
| 187 | 182 | ); |
| ... | ... | @@ -191,14 +186,14 @@ describe("Node runtime selection", () => { |
| 191 | 186 | const fs = yield* FileSystem.FileSystem; |
| 192 | 187 | const path = yield* Path.Path; |
| 193 | 188 | const directory = yield* fs.makeTempDirectoryScoped(); |
| 194 | const platform = yield* HostProcessPlatform; | |
| 189 | const platform = yield* HostProcess.Platform; | |
| 195 | 190 | const node = path.join(directory, platform === "win32" ? "node.exe" : "node"); |
| 196 | 191 | yield* fs.symlink(process.execPath, node); |
| 197 | 192 | expect(yield* resolveNodeExecutable("Local device support", { PATH: directory })).toBe(node); |
| 198 | 193 | }).pipe( |
| 199 | 194 | Effect.scoped, |
| 200 | Effect.provideService(HostProcessExecutablePath, "/packaged/t3"), | |
| 201 | Effect.provideService(HostProcessIsExecutable, true), | |
| 195 | Effect.provideService(HostProcess.ExecutablePath, "/packaged/t3"), | |
| 196 | Effect.provideService(HostProcess.IsExecutable, true), | |
| 202 | 197 | Effect.provide(NodeServices.layer), |
| 203 | 198 | ), |
| 204 | 199 | ); |
| ... | ... | @@ -210,7 +205,7 @@ describe("Node runtime selection", () => { |
| 210 | 205 | const fs = yield* FileSystem.FileSystem; |
| 211 | 206 | const path = yield* Path.Path; |
| 212 | 207 | const directory = yield* fs.makeTempDirectoryScoped(); |
| 213 | const platform = yield* HostProcessPlatform; | |
| 208 | const platform = yield* HostProcess.Platform; | |
| 214 | 209 | const node = path.join(directory, platform === "win32" ? "node.exe" : "node"); |
| 215 | 210 | yield* fs.symlink(process.execPath, node); |
| 216 | 211 | const error = yield* resolveNodeExecutable("Local device support", { |
| ... | ... | @@ -219,7 +214,7 @@ describe("Node runtime selection", () => { |
| 219 | 214 | expect(error.message).toContain("Install Node.js"); |
| 220 | 215 | }).pipe( |
| 221 | 216 | Effect.scoped, |
| 222 | Effect.provideService(HostProcessIsExecutable, true), | |
| 217 | Effect.provideService(HostProcess.IsExecutable, true), | |
| 223 | 218 | Effect.provide(NodeServices.layer), |
| 224 | 219 | ), |
| 225 | 220 | ); |
packages/shared/src/nodeRuntime.ts+8-14
| ... | ... | @@ -4,13 +4,7 @@ import * as Path from "effect/Path"; |
| 4 | 4 | import * as Option from "effect/Option"; |
| 5 | 5 | import * as Schema from "effect/Schema"; |
| 6 | 6 | |
| 7 | import { | |
| 8 | HostProcessArguments, | |
| 9 | HostProcessEnvironment, | |
| 10 | HostProcessExecutablePath, | |
| 11 | HostProcessIsExecutable, | |
| 12 | HostProcessPlatform, | |
| 13 | } from "./hostProcess.ts"; | |
| 7 | import * as HostProcess from "./HostProcess.ts"; | |
| 14 | 8 | import { CommandResolutionCache, resolveCommandPath } from "./shell.ts"; |
| 15 | 9 | |
| 16 | 10 | const NodeRuntimeFeature = Schema.Literals([ |
| ... | ... | @@ -51,11 +45,11 @@ export interface SelfInvocation { |
| 51 | 45 | * assemble the pair themselves. |
| 52 | 46 | */ |
| 53 | 47 | export const resolveSelfInvocation = Effect.fn("nodeRuntime.resolveSelfInvocation")(function* () { |
| 54 | const command = yield* HostProcessExecutablePath; | |
| 55 | if (yield* HostProcessIsExecutable) | |
| 48 | const command = yield* HostProcess.ExecutablePath; | |
| 49 | if (yield* HostProcess.IsExecutable) | |
| 56 | 50 | return { command, entrypoint: undefined } satisfies SelfInvocation; |
| 57 | 51 | const path = yield* Path.Path; |
| 58 | const entry = (yield* HostProcessArguments)[1]; | |
| 52 | const entry = (yield* HostProcess.Arguments)[1]; | |
| 59 | 53 | // Children spawn from their own working directory, so the script path must be absolute. |
| 60 | 54 | return { |
| 61 | 55 | command, |
| ... | ... | @@ -75,13 +69,13 @@ export const resolveNodeExecutable = Effect.fn("nodeRuntime.resolveNodeExecutabl |
| 75 | 69 | feature: typeof NodeRuntimeFeature.Type, |
| 76 | 70 | environment?: NodeJS.ProcessEnv, |
| 77 | 71 | ) { |
| 78 | const executablePath = yield* HostProcessExecutablePath; | |
| 79 | if (!(yield* HostProcessIsExecutable)) return executablePath; | |
| 72 | const executablePath = yield* HostProcess.ExecutablePath; | |
| 73 | if (!(yield* HostProcess.IsExecutable)) return executablePath; | |
| 80 | 74 | |
| 81 | 75 | const fs = yield* FileSystem.FileSystem; |
| 82 | 76 | const path = yield* Path.Path; |
| 83 | const platform = yield* HostProcessPlatform; | |
| 84 | const env = environment ?? (yield* HostProcessEnvironment); | |
| 77 | const platform = yield* HostProcess.Platform; | |
| 78 | const env = environment ?? (yield* HostProcess.Environment); | |
| 85 | 79 | const nodePath = yield* resolveCommandPath(platform === "win32" ? "node.exe" : "node", { |
| 86 | 80 | // Batch wrappers require a shell; helper callers launch the runtime directly. |
| 87 | 81 | env: platform === "win32" ? { ...env, PATHEXT: ".EXE" } : env, |
packages/shared/src/relayClient.test.ts+4-4
| ... | ... | @@ -14,18 +14,18 @@ import * as Stream from "effect/Stream"; |
| 14 | 14 | import * as TestClock from "effect/testing/TestClock"; |
| 15 | 15 | import { HttpClient, HttpClientResponse } from "effect/http"; |
| 16 | 16 | import { ChildProcess, ChildProcessSpawner } from "effect/process"; |
| 17 | import { HostProcessArchitecture, HostProcessPlatform } from "./hostProcess.ts"; | |
| 17 | import * as HostProcess from "./HostProcess.ts"; | |
| 18 | 18 | |
| 19 | 19 | import * as RelayClient from "./relayClient.ts"; |
| 20 | 20 | |
| 21 | 21 | // The suite runs the linux code path against the real filesystem, checking |
| 22 | 22 | // POSIX exec bits that NTFS never reports; the win32 branch skips that check. |
| 23 | const windowsHost = HostProcessPlatform.defaultValue() === "win32"; | |
| 23 | const windowsHost = HostProcess.Platform.defaultValue() === "win32"; | |
| 24 | 24 | |
| 25 | 25 | const layerHostRuntime = (env: Record<string, string> = {}, platform: NodeJS.Platform = "linux") => |
| 26 | 26 | Layer.mergeAll( |
| 27 | Layer.succeed(HostProcessPlatform, platform), | |
| 28 | Layer.succeed(HostProcessArchitecture, "x64"), | |
| 27 | Layer.succeed(HostProcess.Platform, platform), | |
| 28 | Layer.succeed(HostProcess.Architecture, "x64"), | |
| 29 | 29 | ConfigProvider.layer(ConfigProvider.fromEnv({ env })), |
| 30 | 30 | ); |
| 31 | 31 |
packages/shared/src/relayClient.ts+3-3
| ... | ... | @@ -21,7 +21,7 @@ import * as Schedule from "effect/Schedule"; |
| 21 | 21 | import * as Semaphore from "effect/Semaphore"; |
| 22 | 22 | import { HttpClient, HttpClientRequest, HttpClientResponse } from "effect/http"; |
| 23 | 23 | import { ChildProcess, ChildProcessSpawner } from "effect/process"; |
| 24 | import { HostProcessArchitecture, HostProcessPlatform } from "./hostProcess.ts"; | |
| 24 | import * as HostProcess from "./HostProcess.ts"; | |
| 25 | 25 | |
| 26 | 26 | export const CLOUDFLARED_VERSION = "2026.10.0"; |
| 27 | 27 | // The oldest release that accepts every flag the connector is started with |
| ... | ... | @@ -257,8 +257,8 @@ export const makeCloudflaredRelayClient = Effect.fn("cloudflared.make")(function |
| 257 | 257 | const path = yield* Path.Path; |
| 258 | 258 | const spawner = yield* ChildProcessSpawner.ChildProcessSpawner; |
| 259 | 259 | const installSemaphore = yield* Semaphore.make(1); |
| 260 | const platform = yield* HostProcessPlatform; | |
| 261 | const arch = yield* HostProcessArchitecture; | |
| 260 | const platform = yield* HostProcess.Platform; | |
| 261 | const arch = yield* HostProcess.Architecture; | |
| 262 | 262 | const releaseAsset = options.releaseAsset ?? resolveReleaseAsset(platform, arch); |
| 263 | 263 | const loadCloudflaredConfig = Effect.suspend(() => CloudflaredConfig).pipe(Effect.orDie); |
| 264 | 264 | const managedRoot = path.join(options.baseDir, "tools", "cloudflared"); |
packages/shared/src/shell.test.ts+13-13
| ... | ... | @@ -1,6 +1,6 @@ |
| 1 | 1 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 2 | 2 | import { it as effectIt } from "@effect/vitest"; |
| 3 | import { HostProcessEnvironment, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 3 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 4 | 4 | import * as Effect from "effect/Effect"; |
| 5 | 5 | import * as FileSystem from "effect/FileSystem"; |
| 6 | 6 | import * as Path from "effect/Path"; |
| ... | ... | @@ -342,7 +342,7 @@ effectIt.layer(NodeServices.layer)("isCommandAvailable", (it) => { |
| 342 | 342 | expect( |
| 343 | 343 | yield* isCommandAvailable("definitely-not-installed", { |
| 344 | 344 | env: { PATH: "", PATHEXT: ".COM;.EXE;.BAT;.CMD" }, |
| 345 | }).pipe(Effect.provideService(HostProcessPlatform, "win32")), | |
| 345 | }).pipe(Effect.provideService(HostProcess.Platform, "win32")), | |
| 346 | 346 | ).toBe(false); |
| 347 | 347 | }), |
| 348 | 348 | ); |
| ... | ... | @@ -353,7 +353,7 @@ effectIt.layer(NodeServices.layer)("resolveCommandPath", (it) => { |
| 353 | 353 | Effect.gen(function* () { |
| 354 | 354 | const result = yield* resolveCommandPath("definitely-not-installed", { |
| 355 | 355 | env: { PATH: "", PATHEXT: ".COM;.EXE;.BAT;.CMD" }, |
| 356 | }).pipe(Effect.provideService(HostProcessPlatform, "win32"), Effect.result); | |
| 356 | }).pipe(Effect.provideService(HostProcess.Platform, "win32"), Effect.result); | |
| 357 | 357 | |
| 358 | 358 | expect(result._tag).toBe("Failure"); |
| 359 | 359 | }), |
| ... | ... | @@ -367,7 +367,7 @@ effectIt.layer(NodeServices.layer)("resolveCommandPath", (it) => { |
| 367 | 367 | Effect.gen(function* () { |
| 368 | 368 | const probed: Array<string> = []; |
| 369 | 369 | const result = yield* resolveCommandPath("definitely-not-installed", { env }).pipe( |
| 370 | Effect.provideService(HostProcessPlatform, "win32"), | |
| 370 | Effect.provideService(HostProcess.Platform, "win32"), | |
| 371 | 371 | Effect.provideService(CommandResolutionCache, new Map()), |
| 372 | 372 | Effect.provide( |
| 373 | 373 | FileSystem.layerNoop({ |
| ... | ... | @@ -425,7 +425,7 @@ effectIt.layer(NodeServices.layer)("resolveCommandPath", (it) => { |
| 425 | 425 | const resolved = yield* resolveCommandPath(command, { |
| 426 | 426 | env: { PATH: cwd, PATHEXT: ".CMD" }, |
| 427 | 427 | }).pipe( |
| 428 | Effect.provideService(HostProcessPlatform, "win32"), | |
| 428 | Effect.provideService(HostProcess.Platform, "win32"), | |
| 429 | 429 | Effect.provideService(CommandResolutionCache, new Map()), |
| 430 | 430 | Effect.provideService(FileSystem.FileSystem, { |
| 431 | 431 | ...fs, |
| ... | ... | @@ -458,7 +458,7 @@ effectIt.layer(NodeServices.layer)("resolveCommandPath", (it) => { |
| 458 | 458 | yield* TestClock.adjust("30 seconds"); |
| 459 | 459 | expect(yield* resolveCommandPath("appeared", options)).toBe(executable); |
| 460 | 460 | }).pipe( |
| 461 | Effect.provideService(HostProcessPlatform, "win32"), | |
| 461 | Effect.provideService(HostProcess.Platform, "win32"), | |
| 462 | 462 | Effect.provideService(CommandResolutionCache, new Map()), |
| 463 | 463 | ), |
| 464 | 464 | ); |
| ... | ... | @@ -505,7 +505,7 @@ effectIt.layer(NodeServices.layer)("resolveCommandPath", (it) => { |
| 505 | 505 | ); |
| 506 | 506 | expect(probed).toEqual([path.join(first, "cursor.CMD"), path.join(second, "late.EXE")]); |
| 507 | 507 | }).pipe( |
| 508 | Effect.provideService(HostProcessPlatform, "win32"), | |
| 508 | Effect.provideService(HostProcess.Platform, "win32"), | |
| 509 | 509 | Effect.provideService(CommandResolutionCache, new Map()), |
| 510 | 510 | ), |
| 511 | 511 | ); |
| ... | ... | @@ -517,7 +517,7 @@ effectIt.layer(NodeServices.layer)("resolveSpawnCommand", (it) => { |
| 517 | 517 | const command = yield* resolveSpawnCommand("node.exe", ["script.js", "hello & goodbye"], { |
| 518 | 518 | env: { PATH: "", PATHEXT: ".COM;.EXE;.BAT;.CMD" }, |
| 519 | 519 | }).pipe( |
| 520 | Effect.provideService(HostProcessPlatform, "win32"), | |
| 520 | Effect.provideService(HostProcess.Platform, "win32"), | |
| 521 | 521 | Effect.provideService(CommandResolutionCache, new Map()), |
| 522 | 522 | ); |
| 523 | 523 | |
| ... | ... | @@ -536,7 +536,7 @@ effectIt.layer(NodeServices.layer)("resolveSpawnCommand", (it) => { |
| 536 | 536 | ["run", "value & calc", "%PATH%", 'quote"value'], |
| 537 | 537 | { env: { PATH: "", PATHEXT: ".COM;.EXE;.BAT;.CMD" } }, |
| 538 | 538 | ).pipe( |
| 539 | Effect.provideService(HostProcessPlatform, "win32"), | |
| 539 | Effect.provideService(HostProcess.Platform, "win32"), | |
| 540 | 540 | Effect.provideService(CommandResolutionCache, new Map()), |
| 541 | 541 | Effect.provideService( |
| 542 | 542 | SpawnExecutableResolution, |
| ... | ... | @@ -563,9 +563,9 @@ effectIt.layer(NodeServices.layer)("resolveSpawnCommand", (it) => { |
| 563 | 563 | env: { CODEX_HOME: "C:\\Users\\tester\\.codex" }, |
| 564 | 564 | extendEnv: true, |
| 565 | 565 | }).pipe( |
| 566 | Effect.provideService(HostProcessPlatform, "win32"), | |
| 566 | Effect.provideService(HostProcess.Platform, "win32"), | |
| 567 | 567 | Effect.provideService(CommandResolutionCache, new Map()), |
| 568 | Effect.provideService(HostProcessEnvironment, { | |
| 568 | Effect.provideService(HostProcess.Environment, { | |
| 569 | 569 | PATH: "C:\\Users\\tester\\AppData\\Roaming\\npm", |
| 570 | 570 | PATHEXT: ".COM;.EXE;.BAT;.CMD", |
| 571 | 571 | }), |
| ... | ... | @@ -592,7 +592,7 @@ effectIt.layer(NodeServices.layer)("resolveSpawnCommand", (it) => { |
| 592 | 592 | }; |
| 593 | 593 | const resolve = (command: string, path: string, resolver = scan) => |
| 594 | 594 | resolveSpawnCommand(command, [], { env: { PATH: path, PATHEXT: ".EXE" } }).pipe( |
| 595 | Effect.provideService(HostProcessPlatform, "win32"), | |
| 595 | Effect.provideService(HostProcess.Platform, "win32"), | |
| 596 | 596 | Effect.provideService(SpawnExecutableResolution, resolver), |
| 597 | 597 | ); |
| 598 | 598 | |
| ... | ... | @@ -632,7 +632,7 @@ effectIt.layer(NodeServices.layer)("resolveSpawnCommand", (it) => { |
| 632 | 632 | const command = yield* resolveSpawnCommand("missing & calc", ["unsafe & value"], { |
| 633 | 633 | env: { PATH: "", PATHEXT: ".COM;.EXE;.BAT;.CMD" }, |
| 634 | 634 | }).pipe( |
| 635 | Effect.provideService(HostProcessPlatform, "win32"), | |
| 635 | Effect.provideService(HostProcess.Platform, "win32"), | |
| 636 | 636 | Effect.provideService(CommandResolutionCache, new Map()), |
| 637 | 637 | ); |
| 638 | 638 |
packages/shared/src/shell.ts+6-6
| ... | ... | @@ -11,7 +11,7 @@ import * as FileSystem from "effect/FileSystem"; |
| 11 | 11 | import * as Option from "effect/Option"; |
| 12 | 12 | import * as Path from "effect/Path"; |
| 13 | 13 | |
| 14 | import { HostProcessEnvironment, HostProcessPlatform } from "./hostProcess.ts"; | |
| 14 | import * as HostProcess from "./HostProcess.ts"; | |
| 15 | 15 | import * as Context from "effect/Context"; |
| 16 | 16 | const SHELL_ENV_NAME_PATTERN = /^[A-Z0-9_]+$/; |
| 17 | 17 | const WINDOWS_PATH_DELIMITER = ";"; |
| ... | ... | @@ -503,7 +503,7 @@ interface CommandResolutionCacheEntry { |
| 503 | 503 | readonly expiresAtNanos: bigint; |
| 504 | 504 | } |
| 505 | 505 | |
| 506 | // The cache lives in the Effect environment (like HostProcessPlatform above) | |
| 506 | // The cache lives in the Effect environment (like HostProcess.Platform above) | |
| 507 | 507 | // so tests and embedders can provide an isolated instance; the default is a |
| 508 | 508 | // single process-wide map shared by all consumers. |
| 509 | 509 | export const CommandResolutionCache = Context.Reference<Map<string, CommandResolutionCacheEntry>>( |
| ... | ... | @@ -688,8 +688,8 @@ export const resolveCommandPath = Effect.fn("shell.resolveCommandPath")(function |
| 688 | 688 | options: CommandAvailabilityOptions = {}, |
| 689 | 689 | ) { |
| 690 | 690 | return yield* resolveCommandPathForPlatform(command, { |
| 691 | env: options.env ?? (yield* HostProcessEnvironment), | |
| 692 | platform: yield* HostProcessPlatform, | |
| 691 | env: options.env ?? (yield* HostProcess.Environment), | |
| 692 | platform: yield* HostProcess.Platform, | |
| 693 | 693 | }); |
| 694 | 694 | }); |
| 695 | 695 | |
| ... | ... | @@ -699,12 +699,12 @@ export const resolveSpawnCommand = Effect.fnUntraced(function* ( |
| 699 | 699 | args: ReadonlyArray<string>, |
| 700 | 700 | options: CommandAvailabilityOptions = {}, |
| 701 | 701 | ): Effect.fn.Return<ResolvedSpawnCommand> { |
| 702 | const platform = yield* HostProcessPlatform; | |
| 702 | const platform = yield* HostProcess.Platform; | |
| 703 | 703 | if (platform !== "win32") { |
| 704 | 704 | return { command, args: [...args], shell: false }; |
| 705 | 705 | } |
| 706 | 706 | |
| 707 | const hostEnvironment = yield* HostProcessEnvironment; | |
| 707 | const hostEnvironment = yield* HostProcess.Environment; | |
| 708 | 708 | const env = |
| 709 | 709 | options.env === undefined |
| 710 | 710 | ? hostEnvironment |
packages/shared/src/testing/longTempDir.ts+2-2
| ... | ... | @@ -1,14 +1,14 @@ |
| 1 | 1 | // @effect-diagnostics nodeBuiltinImport:off - runs once at test setup, outside any Effect runtime. |
| 2 | 2 | import * as NodeFS from "node:fs"; |
| 3 | 3 | import * as NodeOS from "node:os"; |
| 4 | import { HostProcessPlatform } from "../hostProcess.ts"; | |
| 4 | import * as HostProcess from "../HostProcess.ts"; | |
| 5 | 5 | |
| 6 | 6 | // GitHub's Windows runners hand out the temp directory by its 8.3 short name |
| 7 | 7 | // (C:\Users\RUNNER~1\...). Anything that canonicalises a path, such as git or |
| 8 | 8 | // realpath, reports the long form, so equality checks between a temp path and |
| 9 | 9 | // its canonical form fail. Node reads TEMP/TMP on every os.tmpdir() call, so |
| 10 | 10 | // pointing them at the long form fixes every temp directory the suite makes. |
| 11 | if (HostProcessPlatform.defaultValue() === "win32") { | |
| 11 | if (HostProcess.Platform.defaultValue() === "win32") { | |
| 12 | 12 | try { |
| 13 | 13 | const longForm = NodeFS.realpathSync.native(NodeOS.tmpdir()); |
| 14 | 14 | process.env.TEMP = longForm; |
packages/source-control-forgejo/src/server/ForgejoCli.ts+3-3
| ... | ... | @@ -11,7 +11,7 @@ import * as NodePath from "node:path"; |
| 11 | 11 | import { FetchHttpClient, HttpClient, HttpClientRequest } from "effect/http"; |
| 12 | 12 | import { ChildProcessSpawner } from "effect/process"; |
| 13 | 13 | import { decodeJsonResult } from "@t3tools/shared/schemaJson"; |
| 14 | import { HostProcessHomeDirectory, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 14 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 15 | 15 | import * as SourceControlHost from "@t3tools/source-control-core/server/SourceControlHost"; |
| 16 | 16 | import { collectUint8StreamText } from "@t3tools/provider-core/server/collectStreamText"; |
| 17 | 17 | import type { SourceControlProviderContext } from "@t3tools/source-control-core/server/SourceControlProvider"; |
| ... | ... | @@ -248,8 +248,8 @@ export const make = Effect.gen(function* () { |
| 248 | 248 | |
| 249 | 249 | const readKeys = Effect.fn("ForgejoCli.readKeys")(function* (cwd: string) { |
| 250 | 250 | for (const path of forgejoKeysPaths({ |
| 251 | platform: yield* HostProcessPlatform, | |
| 252 | home: yield* HostProcessHomeDirectory, | |
| 251 | platform: yield* HostProcess.Platform, | |
| 252 | home: yield* HostProcess.HomeDirectory, | |
| 253 | 253 | ...(globalThis.process.env.XDG_DATA_HOME |
| 254 | 254 | ? { dataHome: globalThis.process.env.XDG_DATA_HOME } |
| 255 | 255 | : {}), |
packages/source-control-github/src/server/GitHubCredentials.ts+3-3
| ... | ... | @@ -11,7 +11,7 @@ import * as PlatformError from "effect/PlatformError"; |
| 11 | 11 | import * as Redacted from "effect/Redacted"; |
| 12 | 12 | import * as Schema from "effect/Schema"; |
| 13 | 13 | |
| 14 | import { HostProcessEnvironment, HostProcessWorkingDirectory } from "@t3tools/shared/hostProcess"; | |
| 14 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 15 | 15 | |
| 16 | 16 | import * as SourceControlHost from "@t3tools/source-control-core/server/SourceControlHost"; |
| 17 | 17 | |
| ... | ... | @@ -130,8 +130,8 @@ export const make = Effect.gen(function* () { |
| 130 | 130 | const sourceControlHost = yield* SourceControlHost.SourceControlHost; |
| 131 | 131 | const process = sourceControlHost.process; |
| 132 | 132 | const crypto = yield* Crypto.Crypto; |
| 133 | const environment = yield* HostProcessEnvironment; | |
| 134 | const workingDirectory = yield* HostProcessWorkingDirectory; | |
| 133 | const environment = yield* HostProcess.Environment; | |
| 134 | const workingDirectory = yield* HostProcess.WorkingDirectory; | |
| 135 | 135 | |
| 136 | 136 | /** `host:sha256(token)`, safe for cache keys and rate-limit scopes. */ |
| 137 | 137 | const fingerprintOf = (host: string, token: string) => |
packages/source-control-github/src/server/GitHubSourceControlProvider.test.ts+3-3
| ... | ... | @@ -1,4 +1,4 @@ |
| 1 | import { HostProcessEnvironment } from "@t3tools/shared/hostProcess"; | |
| 1 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 2 | 2 | import { assert, describe, it } from "@effect/vitest"; |
| 3 | 3 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 4 | 4 | import * as Effect from "effect/Effect"; |
| ... | ... | @@ -1075,7 +1075,7 @@ it.live.each([ |
| 1075 | 1075 | remoteName: "enterprise", |
| 1076 | 1076 | remoteBranch: "feature", |
| 1077 | 1077 | }); |
| 1078 | }).pipe(Effect.provide(layer), Effect.provideService(HostProcessEnvironment, {}), Effect.scoped); | |
| 1078 | }).pipe(Effect.provide(layer), Effect.provideService(HostProcess.Environment, {}), Effect.scoped); | |
| 1079 | 1079 | }); |
| 1080 | 1080 | |
| 1081 | 1081 | it.effect.each([ |
| ... | ... | @@ -1162,7 +1162,7 @@ it.effect.each([ |
| 1162 | 1162 | ]); |
| 1163 | 1163 | }).pipe( |
| 1164 | 1164 | Effect.provide(layer), |
| 1165 | Effect.provideService(HostProcessEnvironment, { GH_REPO: envRepository }), | |
| 1165 | Effect.provideService(HostProcess.Environment, { GH_REPO: envRepository }), | |
| 1166 | 1166 | Effect.scoped, |
| 1167 | 1167 | ); |
| 1168 | 1168 | }, |
packages/source-control-github/src/server/GitHubSourceControlProvider.ts+3-3
| ... | ... | @@ -18,7 +18,7 @@ import { |
| 18 | 18 | type SourceControlRepositoryCloneUrls, |
| 19 | 19 | } from "@t3tools/contracts"; |
| 20 | 20 | import { normalizeGitRemoteUrl } from "@t3tools/shared/git"; |
| 21 | import { HostProcessEnvironment } from "@t3tools/shared/hostProcess"; | |
| 21 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 22 | 22 | import { decodeJsonResult } from "@t3tools/shared/schemaJson"; |
| 23 | 23 | import { isSshRemoteUrl } from "@t3tools/shared/sourceControl"; |
| 24 | 24 | |
| ... | ... | @@ -193,7 +193,7 @@ export const makeDiscovery = Effect.gen(function* () { |
| 193 | 193 | const api = yield* GitHubApi.GitHubApi; |
| 194 | 194 | const sourceControlHost = yield* SourceControlHost.SourceControlHost; |
| 195 | 195 | const process = sourceControlHost.process; |
| 196 | const environment = yield* HostProcessEnvironment; | |
| 196 | const environment = yield* HostProcess.Environment; | |
| 197 | 197 | |
| 198 | 198 | return { |
| 199 | 199 | type: "managed-cli", |
| ... | ... | @@ -478,7 +478,7 @@ export const make = Effect.gen(function* () { |
| 478 | 478 | const api = yield* GitHubApi.GitHubApi; |
| 479 | 479 | const sourceControlHost = yield* SourceControlHost.SourceControlHost; |
| 480 | 480 | const process = sourceControlHost.process; |
| 481 | const environment = yield* HostProcessEnvironment; | |
| 481 | const environment = yield* HostProcess.Environment; | |
| 482 | 482 | const git = sourceControlHost.git; |
| 483 | 483 | const fileSystem = yield* FileSystem.FileSystem; |
| 484 | 484 |
packages/ssh/src/auth.test.ts+3-3
| ... | ... | @@ -5,7 +5,7 @@ import * as Effect from "effect/Effect"; |
| 5 | 5 | import * as FileSystem from "effect/FileSystem"; |
| 6 | 6 | import * as Layer from "effect/Layer"; |
| 7 | 7 | import * as Path from "effect/Path"; |
| 8 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 8 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 9 | 9 | |
| 10 | 10 | import { |
| 11 | 11 | buildSshAskpassHelperDescriptor, |
| ... | ... | @@ -50,7 +50,7 @@ describe("ssh auth", () => { |
| 50 | 50 | assert.equal(yield* fs.exists(askpassPath), true); |
| 51 | 51 | assert.include(yield* fs.readFileString(askpassPath), 'printf "%s\\n" "$T3_SSH_AUTH_SECRET"'); |
| 52 | 52 | }).pipe( |
| 53 | Effect.provide(Layer.merge(NodeServices.layer, Layer.succeed(HostProcessPlatform, "linux"))), | |
| 53 | Effect.provide(Layer.merge(NodeServices.layer, Layer.succeed(HostProcess.Platform, "linux"))), | |
| 54 | 54 | Effect.scoped, |
| 55 | 55 | ), |
| 56 | 56 | ); |
| ... | ... | @@ -61,7 +61,7 @@ describe("ssh auth", () => { |
| 61 | 61 | directory: "C:\\temp\\t3code-ssh-askpass", |
| 62 | 62 | }).pipe( |
| 63 | 63 | Effect.provide( |
| 64 | Layer.merge(NodeServices.layer, Layer.succeed(HostProcessPlatform, "win32")), | |
| 64 | Layer.merge(NodeServices.layer, Layer.succeed(HostProcess.Platform, "win32")), | |
| 65 | 65 | ), |
| 66 | 66 | ); |
| 67 | 67 |
packages/ssh/src/auth.ts+4-4
| ... | ... | @@ -1,4 +1,4 @@ |
| 1 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 1 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 2 | 2 | import * as Config from "effect/Config"; |
| 3 | 3 | import * as Context from "effect/Context"; |
| 4 | 4 | import * as Effect from "effect/Effect"; |
| ... | ... | @@ -113,7 +113,7 @@ export const buildSshAskpassHelperDescriptor = Effect.fn( |
| 113 | 113 | )(function* (input: { |
| 114 | 114 | readonly directory: string; |
| 115 | 115 | }): Effect.fn.Return<SshAskpassHelperDescriptor, never, Path.Path> { |
| 116 | const platform = yield* HostProcessPlatform; | |
| 116 | const platform = yield* HostProcess.Platform; | |
| 117 | 117 | const path = yield* Path.Path; |
| 118 | 118 | const directory = input.directory; |
| 119 | 119 | |
| ... | ... | @@ -152,7 +152,7 @@ const ensureSshAskpassHelpers = Effect.fn("ssh/auth.ensureSshAskpassHelpers")(fu |
| 152 | 152 | const fs = yield* FileSystem.FileSystem; |
| 153 | 153 | const path = yield* Path.Path; |
| 154 | 154 | const descriptor = yield* buildSshAskpassHelperDescriptor(input); |
| 155 | const platform = yield* HostProcessPlatform; | |
| 155 | const platform = yield* HostProcess.Platform; | |
| 156 | 156 | |
| 157 | 157 | yield* fs.makeDirectory(path.dirname(descriptor.launcherPath), { recursive: true }); |
| 158 | 158 | |
| ... | ... | @@ -182,7 +182,7 @@ export const buildSshChildEnvironment = Effect.fn("ssh/auth.buildSshChildEnviron |
| 182 | 182 | return baseEnv; |
| 183 | 183 | } |
| 184 | 184 | |
| 185 | const platform = yield* HostProcessPlatform; | |
| 185 | const platform = yield* HostProcess.Platform; | |
| 186 | 186 | const hostDisplay = input.baseEnv |
| 187 | 187 | ? input.baseEnv.DISPLAY |
| 188 | 188 | : yield* Config.String("DISPLAY").pipe( |
packages/ssh/src/command.ts+2-2
| ... | ... | @@ -1,5 +1,5 @@ |
| 1 | 1 | import type { DesktopSshEnvironmentTarget } from "@t3tools/contracts"; |
| 2 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 2 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 3 | 3 | import * as Crypto from "effect/Crypto"; |
| 4 | 4 | import * as Duration from "effect/Duration"; |
| 5 | 5 | import * as Effect from "effect/Effect"; |
| ... | ... | @@ -25,7 +25,7 @@ const MAX_SSH_ERROR_OUTPUT_LENGTH = 4_000; |
| 25 | 25 | const sshCommandForPlatform = (platform: NodeJS.Platform): string => |
| 26 | 26 | platform === "win32" ? "ssh.exe" : "ssh"; |
| 27 | 27 | |
| 28 | export const resolveSshCommand = Effect.map(HostProcessPlatform, sshCommandForPlatform); | |
| 28 | export const resolveSshCommand = Effect.map(HostProcess.Platform, sshCommandForPlatform); | |
| 29 | 29 | |
| 30 | 30 | const encoder = new TextEncoder(); |
| 31 | 31 |
packages/ssh/src/runnerProcess.test.ts+3-3
| ... | ... | @@ -1,6 +1,6 @@ |
| 1 | 1 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 2 | 2 | import { assert, describe, it } from "@effect/vitest"; |
| 3 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 3 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 4 | 4 | import * as Deferred from "effect/Deferred"; |
| 5 | 5 | import * as Effect from "effect/Effect"; |
| 6 | 6 | import * as Fiber from "effect/Fiber"; |
| ... | ... | @@ -21,7 +21,7 @@ const Started = Schema.Struct({ |
| 21 | 21 | }); |
| 22 | 22 | const decodeStarted = Schema.decodeUnknownSync(Schema.fromJsonString(Started)); |
| 23 | 23 | |
| 24 | describe.skipIf(HostProcessPlatform.defaultValue() === "win32")( | |
| 24 | describe.skipIf(HostProcess.Platform.defaultValue() === "win32")( | |
| 25 | 25 | "remote runner process ownership", |
| 26 | 26 | () => { |
| 27 | 27 | it.live("keeps the server PID and graceful shutdown through the node-script runner", () => |
| ... | ... | @@ -130,7 +130,7 @@ server.listen(Number(process.env.T3_TEST_PORT ?? 0), "127.0.0.1", () => { |
| 130 | 130 | }, |
| 131 | 131 | ); |
| 132 | 132 | |
| 133 | describe.skipIf(HostProcessPlatform.defaultValue() === "win32")( | |
| 133 | describe.skipIf(HostProcess.Platform.defaultValue() === "win32")( | |
| 134 | 134 | "remote stop process ownership", |
| 135 | 135 | () => { |
| 136 | 136 | it.live.each(["graceful", "timeout", "external"] as const)( |
packages/ssh/src/tunnel.test.ts+3-3
| ... | ... | @@ -1,7 +1,7 @@ |
| 1 | 1 | import { assert, describe, it } from "@effect/vitest"; |
| 2 | 2 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 3 | 3 | import * as NetService from "@t3tools/shared/Net"; |
| 4 | import { HostProcessArchitecture, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 4 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 5 | 5 | import * as Deferred from "effect/Deferred"; |
| 6 | 6 | import * as Duration from "effect/Duration"; |
| 7 | 7 | import * as Effect from "effect/Effect"; |
| ... | ... | @@ -691,8 +691,8 @@ describe("ssh tunnel scripts", () => { |
| 691 | 691 | // lock excludes concurrent installers. Run the real script against a tiny |
| 692 | 692 | // fake archive served from a file:// mirror. |
| 693 | 693 | describe("archive runner script", () => { |
| 694 | const hostPlatform = HostProcessPlatform.defaultValue(); | |
| 695 | const hostArch = HostProcessArchitecture.defaultValue(); | |
| 694 | const hostPlatform = HostProcess.Platform.defaultValue(); | |
| 695 | const hostArch = HostProcess.Architecture.defaultValue(); | |
| 696 | 696 | const windowsHost = hostPlatform === "win32"; |
| 697 | 697 | const archiveVersion = "1.2.3-preview.20260911.4"; |
| 698 | 698 |
packages/tailscale/src/tailscale.test.ts+2-2
| ... | ... | @@ -8,7 +8,7 @@ import * as Sink from "effect/Sink"; |
| 8 | 8 | import * as Stream from "effect/Stream"; |
| 9 | 9 | import * as TestClock from "effect/testing/TestClock"; |
| 10 | 10 | import { ChildProcessSpawner } from "effect/process"; |
| 11 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 11 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 12 | 12 | |
| 13 | 13 | import { |
| 14 | 14 | buildTailscaleHttpsBaseUrl, |
| ... | ... | @@ -104,7 +104,7 @@ function neverFinishingMockHandle() { |
| 104 | 104 | function layerSpawner(spawner: ChildProcessSpawner.ChildProcessSpawner["Service"]) { |
| 105 | 105 | return Layer.merge( |
| 106 | 106 | Layer.succeed(ChildProcessSpawner.ChildProcessSpawner, spawner), |
| 107 | Layer.succeed(HostProcessPlatform, "linux"), | |
| 107 | Layer.succeed(HostProcess.Platform, "linux"), | |
| 108 | 108 | ); |
| 109 | 109 | } |
| 110 | 110 |
packages/tailscale/src/tailscale.ts+3-3
| ... | ... | @@ -1,4 +1,4 @@ |
| 1 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 1 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 2 | 2 | import * as Duration from "effect/Duration"; |
| 3 | 3 | import * as Effect from "effect/Effect"; |
| 4 | 4 | import * as Option from "effect/Option"; |
| ... | ... | @@ -217,7 +217,7 @@ export const parseTailscaleStatus = ( |
| 217 | 217 | export const readTailscaleStatus = Effect.gen(function* () { |
| 218 | 218 | const args = ["status", "--json"]; |
| 219 | 219 | const spawner = yield* ChildProcessSpawner.ChildProcessSpawner; |
| 220 | const hostPlatform = yield* HostProcessPlatform; | |
| 220 | const hostPlatform = yield* HostProcess.Platform; | |
| 221 | 221 | const executable = tailscaleCommandForPlatform(hostPlatform); |
| 222 | 222 | const commandContext = { |
| 223 | 223 | executable, |
| ... | ... | @@ -291,7 +291,7 @@ const runTailscaleCommand = ( |
| 291 | 291 | ): Effect.Effect<void, TailscaleCommandError, ChildProcessSpawner.ChildProcessSpawner> => |
| 292 | 292 | Effect.gen(function* () { |
| 293 | 293 | const spawner = yield* ChildProcessSpawner.ChildProcessSpawner; |
| 294 | const hostPlatform = yield* HostProcessPlatform; | |
| 294 | const hostPlatform = yield* HostProcess.Platform; | |
| 295 | 295 | const executable = tailscaleCommandForPlatform(hostPlatform); |
| 296 | 296 | const commandContext = { |
| 297 | 297 | executable, |
scripts/build-cli-archive.ts+3-3
| ... | ... | @@ -28,7 +28,7 @@ import * as Schema from "effect/Schema"; |
| 28 | 28 | import { Command, Flag } from "effect/cli"; |
| 29 | 29 | import { ChildProcess, ChildProcessSpawner } from "effect/process"; |
| 30 | 30 | |
| 31 | import { HostProcessArchitecture, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 31 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 32 | 32 | import { fromYaml } from "@t3tools/shared/schemaYaml"; |
| 33 | 33 | import { resolveSpawnCommand } from "@t3tools/shared/shell"; |
| 34 | 34 | import rootPackageJson from "../package.json" with { type: "json" }; |
| ... | ... | @@ -478,8 +478,8 @@ const buildCliArchive = Effect.fn("buildCliArchive")(function* (input: { |
| 478 | 478 | ); |
| 479 | 479 | // The unsuffixed host build is only a valid stand-in when it was built for |
| 480 | 480 | // this platform and architecture; otherwise a missing target must fail. |
| 481 | const hostPlatform = yield* HostProcessPlatform; | |
| 482 | const hostKey = `${hostPlatform === "win32" ? "win" : hostPlatform}-${yield* HostProcessArchitecture}`; | |
| 481 | const hostPlatform = yield* HostProcess.Platform; | |
| 482 | const hostKey = `${hostPlatform === "win32" ? "win" : hostPlatform}-${yield* HostProcess.Architecture}`; | |
| 483 | 483 | const builtExecutable = (yield* fs.exists(targetExecutable)) |
| 484 | 484 | ? targetExecutable |
| 485 | 485 | : targetKey === hostKey |
scripts/build-desktop-artifact.test.ts+17-17
| ... | ... | @@ -93,7 +93,7 @@ import { |
| 93 | 93 | wslRuntimeArchiveStem, |
| 94 | 94 | } from "./build-desktop-artifact.ts"; |
| 95 | 95 | import { BRAND_ASSET_PATHS } from "./lib/brand-assets.ts"; |
| 96 | import { HostProcessArchitecture, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 96 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 97 | 97 | import { symlinksSupported } from "@t3tools/shared/testing/symlinks"; |
| 98 | 98 | |
| 99 | 99 | // Keeps pnpm from auto-installing TypeScript, a types-only peer, into the app. |
| ... | ... | @@ -1263,7 +1263,7 @@ it.layer(NodeServices.layer)("build-desktop-artifact", (it) => { |
| 1263 | 1263 | assert.isBelow(result.fileCount, WINDOWS_PACKAGED_PAYLOAD_FILE_LIMIT); |
| 1264 | 1264 | assert.deepStrictEqual(secondAsar, firstAsar); |
| 1265 | 1265 | }), |
| 1266 | ).pipe(Effect.provideService(HostProcessPlatform, "linux")), | |
| 1266 | ).pipe(Effect.provideService(HostProcess.Platform, "linux")), | |
| 1267 | 1267 | ); |
| 1268 | 1268 | |
| 1269 | 1269 | it.effect("accepts an embedded Linux CLI release archive with a matching digest", () => |
| ... | ... | @@ -1283,7 +1283,7 @@ it.layer(NodeServices.layer)("build-desktop-artifact", (it) => { |
| 1283 | 1283 | |
| 1284 | 1284 | assert.equal(result.packagedAppDir, fixture.packagedAppDir); |
| 1285 | 1285 | }), |
| 1286 | ).pipe(Effect.provideService(HostProcessPlatform, "linux")), | |
| 1286 | ).pipe(Effect.provideService(HostProcess.Platform, "linux")), | |
| 1287 | 1287 | ); |
| 1288 | 1288 | |
| 1289 | 1289 | it.effect.each(["x64", "arm64"] as const)( |
| ... | ... | @@ -1307,7 +1307,7 @@ it.layer(NodeServices.layer)("build-desktop-artifact", (it) => { |
| 1307 | 1307 | |
| 1308 | 1308 | assert.equal(result.packagedAppDir, fixture.packagedAppDir); |
| 1309 | 1309 | }), |
| 1310 | ).pipe(Effect.provideService(HostProcessPlatform, "linux")), | |
| 1310 | ).pipe(Effect.provideService(HostProcess.Platform, "linux")), | |
| 1311 | 1311 | ); |
| 1312 | 1312 | |
| 1313 | 1313 | it.effect.each(["x64", "arm64"] as const)( |
| ... | ... | @@ -1498,8 +1498,8 @@ it.layer(NodeServices.layer)("build-desktop-artifact", (it) => { |
| 1498 | 1498 | Effect.provide( |
| 1499 | 1499 | Layer.mergeAll( |
| 1500 | 1500 | spawnerLayer, |
| 1501 | Layer.succeed(HostProcessPlatform, "win32"), | |
| 1502 | Layer.succeed(HostProcessArchitecture, "x64"), | |
| 1501 | Layer.succeed(HostProcess.Platform, "win32"), | |
| 1502 | Layer.succeed(HostProcess.Architecture, "x64"), | |
| 1503 | 1503 | ), |
| 1504 | 1504 | ), |
| 1505 | 1505 | ); |
| ... | ... | @@ -1541,8 +1541,8 @@ it.layer(NodeServices.layer)("build-desktop-artifact", (it) => { |
| 1541 | 1541 | Effect.provide( |
| 1542 | 1542 | Layer.mergeAll( |
| 1543 | 1543 | spawnerLayer, |
| 1544 | Layer.succeed(HostProcessPlatform, "linux"), | |
| 1545 | Layer.succeed(HostProcessArchitecture, "x64"), | |
| 1544 | Layer.succeed(HostProcess.Platform, "linux"), | |
| 1545 | Layer.succeed(HostProcess.Architecture, "x64"), | |
| 1546 | 1546 | ), |
| 1547 | 1547 | ), |
| 1548 | 1548 | ); |
| ... | ... | @@ -1577,8 +1577,8 @@ it.layer(NodeServices.layer)("build-desktop-artifact", (it) => { |
| 1577 | 1577 | Effect.provide( |
| 1578 | 1578 | Layer.mergeAll( |
| 1579 | 1579 | spawnerLayer, |
| 1580 | Layer.succeed(HostProcessPlatform, "darwin"), | |
| 1581 | Layer.succeed(HostProcessArchitecture, "arm64"), | |
| 1580 | Layer.succeed(HostProcess.Platform, "darwin"), | |
| 1581 | Layer.succeed(HostProcess.Architecture, "arm64"), | |
| 1582 | 1582 | ), |
| 1583 | 1583 | ), |
| 1584 | 1584 | ); |
| ... | ... | @@ -1623,8 +1623,8 @@ it.layer(NodeServices.layer)("build-desktop-artifact", (it) => { |
| 1623 | 1623 | Effect.provide( |
| 1624 | 1624 | Layer.mergeAll( |
| 1625 | 1625 | spawnerLayer, |
| 1626 | Layer.succeed(HostProcessPlatform, "win32"), | |
| 1627 | Layer.succeed(HostProcessArchitecture, "x64"), | |
| 1626 | Layer.succeed(HostProcess.Platform, "win32"), | |
| 1627 | Layer.succeed(HostProcess.Architecture, "x64"), | |
| 1628 | 1628 | ), |
| 1629 | 1629 | ), |
| 1630 | 1630 | ); |
| ... | ... | @@ -1652,8 +1652,8 @@ it.layer(NodeServices.layer)("build-desktop-artifact", (it) => { |
| 1652 | 1652 | ).pipe( |
| 1653 | 1653 | Effect.provide( |
| 1654 | 1654 | Layer.mergeAll( |
| 1655 | Layer.succeed(HostProcessPlatform, "win32"), | |
| 1656 | Layer.succeed(HostProcessArchitecture, "x64"), | |
| 1655 | Layer.succeed(HostProcess.Platform, "win32"), | |
| 1656 | Layer.succeed(HostProcess.Architecture, "x64"), | |
| 1657 | 1657 | ), |
| 1658 | 1658 | ), |
| 1659 | 1659 | ), |
| ... | ... | @@ -1764,7 +1764,7 @@ it.layer(NodeServices.layer)("build-desktop-artifact", (it) => { |
| 1764 | 1764 | assert.instanceOf(error, BundleNotSelfContainedError); |
| 1765 | 1765 | assert.include(error.output, "t3code-deliberately-missing-package"); |
| 1766 | 1766 | }), |
| 1767 | ).pipe(Effect.provideService(HostProcessPlatform, "linux")), | |
| 1767 | ).pipe(Effect.provideService(HostProcess.Platform, "linux")), | |
| 1768 | 1768 | ); |
| 1769 | 1769 | |
| 1770 | 1770 | it.effect("preserves both Linux icon resize failures with structural context", () => { |
| ... | ... | @@ -2333,8 +2333,8 @@ it.layer(NodeServices.layer)("build-desktop-artifact", (it) => { |
| 2333 | 2333 | }).pipe( |
| 2334 | 2334 | Effect.provide( |
| 2335 | 2335 | Layer.mergeAll( |
| 2336 | Layer.succeed(HostProcessPlatform, "win32"), | |
| 2337 | Layer.succeed(HostProcessArchitecture, "x64"), | |
| 2336 | Layer.succeed(HostProcess.Platform, "win32"), | |
| 2337 | Layer.succeed(HostProcess.Architecture, "x64"), | |
| 2338 | 2338 | ConfigProvider.layer( |
| 2339 | 2339 | ConfigProvider.fromEnv({ |
| 2340 | 2340 | env: { |
scripts/build-desktop-artifact.ts+7-7
| ... | ... | @@ -16,7 +16,7 @@ import { |
| 16 | 16 | } from "@electron/asar"; |
| 17 | 17 | |
| 18 | 18 | import { fromYaml } from "@t3tools/shared/schemaYaml"; |
| 19 | import { HostProcessArchitecture, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 19 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 20 | 20 | import { clerkFrontendApiHostnameFromPublishableKey } from "@t3tools/shared/relayAuth"; |
| 21 | 21 | import { resolveSpawnCommand } from "@t3tools/shared/shell"; |
| 22 | 22 | import rootPackageJson from "../package.json" with { type: "json" }; |
| ... | ... | @@ -869,7 +869,7 @@ const resolveGitCommitHash = Effect.fn("resolveGitCommitHash")(function* (repoRo |
| 869 | 869 | const resolvePythonForNodeGyp = Effect.fn("resolvePythonForNodeGyp")(function* () { |
| 870 | 870 | const fs = yield* FileSystem.FileSystem; |
| 871 | 871 | const path = yield* Path.Path; |
| 872 | const hostPlatform = yield* HostProcessPlatform; | |
| 872 | const hostPlatform = yield* HostProcess.Platform; | |
| 873 | 873 | const env = yield* Config.all({ |
| 874 | 874 | configuredPython: Config.String("npm_config_python").pipe( |
| 875 | 875 | Config.orElse(() => Config.String("PYTHON")), |
| ... | ... | @@ -1716,7 +1716,7 @@ export const resolveBuildOptions = Effect.fn("resolveBuildOptions")(function* ( |
| 1716 | 1716 | const path = yield* Path.Path; |
| 1717 | 1717 | const repoRoot = yield* RepoRoot; |
| 1718 | 1718 | const env = yield* BuildEnvConfig; |
| 1719 | const hostPlatform = yield* HostProcessPlatform; | |
| 1719 | const hostPlatform = yield* HostProcess.Platform; | |
| 1720 | 1720 | |
| 1721 | 1721 | const platform = mergeOptions( |
| 1722 | 1722 | input.platform, |
| ... | ... | @@ -2404,7 +2404,7 @@ export const stageBrowserSecret = Effect.fn("stageBrowserSecret")(function* (inp |
| 2404 | 2404 | // silently. `universal` is a mac-only arch the option type still admits; |
| 2405 | 2405 | // the helper script rejects it, so it maps to the concrete x64 the Linux |
| 2406 | 2406 | // resource monitor uses for the same request. |
| 2407 | const hostPlatform = yield* HostProcessPlatform; | |
| 2407 | const hostPlatform = yield* HostProcess.Platform; | |
| 2408 | 2408 | if (hostPlatform !== "linux") { |
| 2409 | 2409 | return yield* new LinuxBrowserSecretHostError({ hostPlatform }); |
| 2410 | 2410 | } |
| ... | ... | @@ -3165,8 +3165,8 @@ export const verifyWindowsPrimaryFffNativeLoad = Effect.fn( |
| 3165 | 3165 | readonly targetArch: typeof BuildArch.Type; |
| 3166 | 3166 | readonly verbose: boolean; |
| 3167 | 3167 | }) { |
| 3168 | const hostPlatform = yield* HostProcessPlatform; | |
| 3169 | const hostArchitecture = yield* HostProcessArchitecture; | |
| 3168 | const hostPlatform = yield* HostProcess.Platform; | |
| 3169 | const hostArchitecture = yield* HostProcess.Architecture; | |
| 3170 | 3170 | const fs = yield* FileSystem.FileSystem; |
| 3171 | 3171 | const path = yield* Path.Path; |
| 3172 | 3172 | const executablePath = path.join(input.packagedAppDir, input.appExecutableName); |
| ... | ... | @@ -3485,7 +3485,7 @@ const buildDesktopArtifact = Effect.fn("buildDesktopArtifact")(function* ( |
| 3485 | 3485 | const repoRoot = yield* RepoRoot; |
| 3486 | 3486 | const path = yield* Path.Path; |
| 3487 | 3487 | const fs = yield* FileSystem.FileSystem; |
| 3488 | const hostPlatform = yield* HostProcessPlatform; | |
| 3488 | const hostPlatform = yield* HostProcess.Platform; | |
| 3489 | 3489 | if (hostPlatform === "linux" && options.platform === "linux") { |
| 3490 | 3490 | yield* preflightLinuxDesktopBuild(options.arch); |
| 3491 | 3491 | } |
scripts/build-npm-platform-packages.test.ts+3-3
| ... | ... | @@ -1,4 +1,4 @@ |
| 1 | import { HostProcessArchitecture, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 1 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 2 | 2 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 3 | 3 | import { assert, it } from "@effect/vitest"; |
| 4 | 4 | import * as Effect from "effect/Effect"; |
| ... | ... | @@ -203,8 +203,8 @@ it.layer(NodeServices.layer)("build-npm-platform-packages", (it) => { |
| 203 | 203 | |
| 204 | 204 | // NODE_PATH stands in for node_modules: require.resolve finds the |
| 205 | 205 | // platform package there exactly as it would after `npm install`. |
| 206 | const hostPlatform = yield* HostProcessPlatform; | |
| 207 | const hostArch = yield* HostProcessArchitecture; | |
| 206 | const hostPlatform = yield* HostProcess.Platform; | |
| 207 | const hostArch = yield* HostProcess.Architecture; | |
| 208 | 208 | const env = { ...process.env, NODE_PATH: fixture.outputDir } as Record<string, string>; |
| 209 | 209 | if (KEYS.some((key) => key === `${hostPlatform}-${hostArch}`)) { |
| 210 | 210 | const passthrough = yield* run(process.execPath, ["bin/t3.js", "serve", "--port", "1234"], { |
scripts/build-npm-platform-packages.ts+3-3
| ... | ... | @@ -36,7 +36,7 @@ import { |
| 36 | 36 | cliArchiveFileName, |
| 37 | 37 | type CliArchivePlatformKey, |
| 38 | 38 | } from "@t3tools/shared/cliRelease"; |
| 39 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 39 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 40 | 40 | import { fromJsonStringPretty } from "@t3tools/shared/schemaJson"; |
| 41 | 41 | import { isCommandAvailable } from "@t3tools/shared/shell"; |
| 42 | 42 | import serverPackageJson from "../apps/server/package.json" with { type: "json" }; |
| ... | ... | @@ -253,7 +253,7 @@ const runCommand = Effect.fn("runCommand")(function* ( |
| 253 | 253 | const extractArchive = Effect.fn("extractArchive")(function* (archive: string, into: string) { |
| 254 | 254 | const fs = yield* FileSystem.FileSystem; |
| 255 | 255 | const path = yield* Path.Path; |
| 256 | const platform = yield* HostProcessPlatform; | |
| 256 | const platform = yield* HostProcess.Platform; | |
| 257 | 257 | if (!archive.endsWith(".zip")) { |
| 258 | 258 | yield* runCommand(ChildProcess.make("tar", ["-xf", archive, "-C", into]), "tar -xf"); |
| 259 | 259 | } else if (platform === "win32") { |
| ... | ... | @@ -282,7 +282,7 @@ const extractArchive = Effect.fn("extractArchive")(function* (archive: string, i |
| 282 | 282 | }); |
| 283 | 283 | |
| 284 | 284 | /** Tar to build npm tarballs with; see build-cli-archive.ts for why Windows names bsdtar by path. */ |
| 285 | const hostTar = Effect.map(HostProcessPlatform, (platform) => | |
| 285 | const hostTar = Effect.map(HostProcess.Platform, (platform) => | |
| 286 | 286 | platform === "win32" ? windowsSystemTar() : "tar", |
| 287 | 287 | ); |
| 288 | 288 |
scripts/dev-runner.test.ts+16-20
| ... | ... | @@ -4,11 +4,7 @@ import * as NodeFS from "node:fs"; |
| 4 | 4 | import * as NodeOS from "node:os"; |
| 5 | 5 | import * as NodePath from "node:path"; |
| 6 | 6 | import * as NetService from "@t3tools/shared/Net"; |
| 7 | import { | |
| 8 | HostProcessEnvironment, | |
| 9 | HostProcessPlatform, | |
| 10 | HostProcessWorkingDirectory, | |
| 11 | } from "@t3tools/shared/hostProcess"; | |
| 7 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 12 | 8 | import { assert, describe, it } from "@effect/vitest"; |
| 13 | 9 | import * as ConfigProvider from "effect/ConfigProvider"; |
| 14 | 10 | import * as Effect from "effect/Effect"; |
| ... | ... | @@ -887,7 +883,7 @@ it.layer(NodeServices.layer)("dev-runner", (it) => { |
| 887 | 883 | return Effect.gen(function* () { |
| 888 | 884 | const error = yield* runDevRunnerWithInput(devServerInput).pipe( |
| 889 | 885 | Effect.provide(Layer.mergeAll(emptyConfigLayer, netServiceLayer, spawnerLayer)), |
| 890 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 886 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 891 | 887 | Effect.flip, |
| 892 | 888 | ); |
| 893 | 889 | |
| ... | ... | @@ -953,7 +949,7 @@ it.layer(NodeServices.layer)("dev-runner", (it) => { |
| 953 | 949 | share: true, |
| 954 | 950 | }).pipe( |
| 955 | 951 | Effect.provide(Layer.mergeAll(emptyConfigLayer, netServiceLayer, spawnerLayer)), |
| 956 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 952 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 957 | 953 | ); |
| 958 | 954 | |
| 959 | 955 | assert.equal(spawnCount, 1); |
| ... | ... | @@ -977,7 +973,7 @@ it.layer(NodeServices.layer)("dev-runner", (it) => { |
| 977 | 973 | host: "192.168.1.10", |
| 978 | 974 | }).pipe( |
| 979 | 975 | Effect.provide(Layer.mergeAll(emptyConfigLayer, netServiceLayer, spawnerLayer)), |
| 980 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 976 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 981 | 977 | Effect.flip, |
| 982 | 978 | ); |
| 983 | 979 | |
| ... | ... | @@ -1012,7 +1008,7 @@ it.layer(NodeServices.layer)("dev-runner", (it) => { |
| 1012 | 1008 | host: "0.0.0.0", |
| 1013 | 1009 | }).pipe( |
| 1014 | 1010 | Effect.provide(Layer.mergeAll(emptyConfigLayer, netServiceLayer, spawnerLayer)), |
| 1015 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 1011 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 1016 | 1012 | ); |
| 1017 | 1013 | |
| 1018 | 1014 | assert.equal(spawnCount, 1); |
| ... | ... | @@ -1037,7 +1033,7 @@ it.layer(NodeServices.layer)("dev-runner", (it) => { |
| 1037 | 1033 | host: "192.168.1.10", |
| 1038 | 1034 | }).pipe( |
| 1039 | 1035 | Effect.provide(Layer.mergeAll(emptyConfigLayer, netServiceLayer, spawnerLayer)), |
| 1040 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 1036 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 1041 | 1037 | ); |
| 1042 | 1038 | |
| 1043 | 1039 | assert.equal(spawnCount, 1); |
| ... | ... | @@ -1097,9 +1093,9 @@ it.layer(NodeServices.layer)("dev-runner", (it) => { |
| 1097 | 1093 | share: true, |
| 1098 | 1094 | }).pipe( |
| 1099 | 1095 | Effect.provide(Layer.mergeAll(emptyConfigLayer, netServiceLayer, spawnerLayer)), |
| 1100 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 1096 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 1101 | 1097 | Effect.provideService( |
| 1102 | HostProcessEnvironment, | |
| 1098 | HostProcess.Environment, | |
| 1103 | 1099 | input.ambientBundledDev === undefined |
| 1104 | 1100 | ? {} |
| 1105 | 1101 | : { T3CODE_BUNDLED_DEV: input.ambientBundledDev }, |
| ... | ... | @@ -1144,8 +1140,8 @@ it.layer(NodeServices.layer)("dev-runner", (it) => { |
| 1144 | 1140 | port: undefined, |
| 1145 | 1141 | }).pipe( |
| 1146 | 1142 | Effect.provide(Layer.mergeAll(emptyConfigLayer, netServiceLayer, spawnerLayer)), |
| 1147 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 1148 | Effect.provideService(HostProcessEnvironment, {}), | |
| 1143 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 1144 | Effect.provideService(HostProcess.Environment, {}), | |
| 1149 | 1145 | ); |
| 1150 | 1146 | |
| 1151 | 1147 | assert.equal(captured?.T3CODE_BUNDLED_DEV, undefined); |
| ... | ... | @@ -1172,7 +1168,7 @@ it.layer(NodeServices.layer)("dev-runner", (it) => { |
| 1172 | 1168 | share: true, |
| 1173 | 1169 | }).pipe( |
| 1174 | 1170 | Effect.provide(Layer.mergeAll(emptyConfigLayer, netServiceLayer, spawnerLayer)), |
| 1175 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 1171 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 1176 | 1172 | ); |
| 1177 | 1173 | |
| 1178 | 1174 | assert.equal(spawnCount, 0); |
| ... | ... | @@ -1188,7 +1184,7 @@ it.layer(NodeServices.layer)("dev-runner", (it) => { |
| 1188 | 1184 | return Effect.gen(function* () { |
| 1189 | 1185 | const error = yield* runDevRunnerWithInput(devServerInput).pipe( |
| 1190 | 1186 | Effect.provide(Layer.mergeAll(emptyConfigLayer, netServiceLayer, spawnerLayer)), |
| 1191 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 1187 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 1192 | 1188 | Effect.flip, |
| 1193 | 1189 | ); |
| 1194 | 1190 | |
| ... | ... | @@ -1221,7 +1217,7 @@ it.layer(NodeServices.layer)("dev-runner", (it) => { |
| 1221 | 1217 | return Effect.gen(function* () { |
| 1222 | 1218 | const error = yield* runDevRunnerWithInput(devServerInput).pipe( |
| 1223 | 1219 | Effect.provide(Layer.mergeAll(emptyConfigLayer, netServiceLayer, spawnerLayer)), |
| 1224 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 1220 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 1225 | 1221 | Effect.flip, |
| 1226 | 1222 | ); |
| 1227 | 1223 | |
| ... | ... | @@ -1274,10 +1270,10 @@ it.layer(NodeServices.layer)("dev-runner", (it) => { |
| 1274 | 1270 | |
| 1275 | 1271 | yield* runDevRunnerWithInput({ ...devServerInput, t3Home: input.t3Home }).pipe( |
| 1276 | 1272 | Effect.provide(Layer.mergeAll(emptyConfigLayer, netServiceLayer, spawnerLayer)), |
| 1277 | Effect.provideService(HostProcessPlatform, "linux"), | |
| 1278 | Effect.provideService(HostProcessWorkingDirectory, input.cwd), | |
| 1273 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 1274 | Effect.provideService(HostProcess.WorkingDirectory, input.cwd), | |
| 1279 | 1275 | Effect.provideService( |
| 1280 | HostProcessEnvironment, | |
| 1276 | HostProcess.Environment, | |
| 1281 | 1277 | input.ambientHome === undefined ? {} : { T3CODE_HOME: input.ambientHome }, |
| 1282 | 1278 | ), |
| 1283 | 1279 | ); |
scripts/dev-runner.ts+4-4
| ... | ... | @@ -6,7 +6,7 @@ import * as NodeRuntime from "@effect/platform-node/NodeRuntime"; |
| 6 | 6 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 7 | 7 | import * as NetService from "@t3tools/shared/Net"; |
| 8 | 8 | import { resolveGitWorktreePath, resolveWorktreeT3Home } from "@t3tools/shared/devHome"; |
| 9 | import { HostProcessEnvironment, HostProcessWorkingDirectory } from "@t3tools/shared/hostProcess"; | |
| 9 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 10 | 10 | import { resolveSpawnCommand } from "@t3tools/shared/shell"; |
| 11 | 11 | import * as Config from "effect/Config"; |
| 12 | 12 | import * as Effect from "effect/Effect"; |
| ... | ... | @@ -645,7 +645,7 @@ export function runDevRunnerWithInput(input: DevRunnerCliInput) { |
| 645 | 645 | return yield* new DevRunnerHostNotProxiableError({ mode: input.mode, host: input.host }); |
| 646 | 646 | } |
| 647 | 647 | |
| 648 | const worktreePath = yield* resolveGitWorktreePath(yield* HostProcessWorkingDirectory); | |
| 648 | const worktreePath = yield* resolveGitWorktreePath(yield* HostProcess.WorkingDirectory); | |
| 649 | 649 | |
| 650 | 650 | const { offset, source } = yield* resolveOffset({ |
| 651 | 651 | portOffset, |
| ... | ... | @@ -663,11 +663,11 @@ export function runDevRunnerWithInput(input: DevRunnerCliInput) { |
| 663 | 663 | checkPortAvailability: makeDefaultCheckPortAvailability(input.host), |
| 664 | 664 | }); |
| 665 | 665 | |
| 666 | const hostEnvironment = yield* HostProcessEnvironment; | |
| 666 | const hostEnvironment = yield* HostProcess.Environment; | |
| 667 | 667 | // A dev server started inside a worktree defaults to that worktree's own |
| 668 | 668 | // (gitignored) `.t3` — see @t3tools/shared/devHome for why this must |
| 669 | 669 | // outrank an ambient T3CODE_HOME. `--home-dir` still wins. |
| 670 | const worktreeHome = yield* resolveWorktreeT3Home(yield* HostProcessWorkingDirectory); | |
| 670 | const worktreeHome = yield* resolveWorktreeT3Home(yield* HostProcess.WorkingDirectory); | |
| 671 | 671 | // Trim before choosing: `--home-dir ""` is not a selection, and treating it |
| 672 | 672 | // as one would skip the worktree default and land on the shared home — |
| 673 | 673 | // exactly the outcome this precedence exists to prevent. |
scripts/export-brand-icons.ts+2-2
| ... | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | |
| 3 | 3 | import * as NodeRuntime from "@effect/platform-node/NodeRuntime"; |
| 4 | 4 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 5 | import { HostProcessEnvironment } from "@t3tools/shared/hostProcess"; | |
| 5 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 6 | 6 | import * as Console from "effect/Console"; |
| 7 | 7 | import * as Effect from "effect/Effect"; |
| 8 | 8 | import * as FileSystem from "effect/FileSystem"; |
| ... | ... | @@ -408,7 +408,7 @@ const probeIconComposerTool = Effect.fn("iconExport.probeIconComposerTool")(func |
| 408 | 408 | |
| 409 | 409 | const resolveIconComposerTool = Effect.fn("iconExport.resolveIconComposerTool")(function* () { |
| 410 | 410 | const path = yield* Path.Path; |
| 411 | const environment = yield* HostProcessEnvironment; | |
| 411 | const environment = yield* HostProcess.Environment; | |
| 412 | 412 | const configuredTool = environment.ICON_COMPOSER_TOOL?.trim(); |
| 413 | 413 | if (configuredTool) { |
| 414 | 414 | const tool = yield* probeIconComposerTool(configuredTool); |
scripts/install.test.ts+3-3
| ... | ... | @@ -1,5 +1,5 @@ |
| 1 | 1 | // @effect-diagnostics nodeBuiltinImport:off - Drives the real shell installer through a PTY and a gated HTTP fixture. |
| 2 | import { HostProcessArchitecture, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 2 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 3 | 3 | import * as NodeChildProcess from "node:child_process"; |
| 4 | 4 | import * as NodeCrypto from "node:crypto"; |
| 5 | 5 | import * as NodeFSP from "node:fs/promises"; |
| ... | ... | @@ -9,13 +9,13 @@ import * as NodePath from "node:path"; |
| 9 | 9 | import { describe, expect, it } from "vite-plus/test"; |
| 10 | 10 | |
| 11 | 11 | // util-linux's script gives the real installer a terminal without a browser or extra packages. |
| 12 | describe.skipIf(HostProcessPlatform.defaultValue() !== "linux")("installer terminal", () => { | |
| 12 | describe.skipIf(HostProcess.Platform.defaultValue() !== "linux")("installer terminal", () => { | |
| 13 | 13 | it.each([false, true])( |
| 14 | 14 | "preserves download and install behavior (HTTP failure: %s)", |
| 15 | 15 | async (fail) => { |
| 16 | 16 | const root = await NodeFSP.mkdtemp(NodePath.join(NodeOS.tmpdir(), "t3-install-progress-")); |
| 17 | 17 | const version = "1.2.3"; |
| 18 | const stem = `t3-${version}-linux-${HostProcessArchitecture.defaultValue()}`; | |
| 18 | const stem = `t3-${version}-linux-${HostProcess.Architecture.defaultValue()}`; | |
| 19 | 19 | const archiveName = `${stem}.tar.gz`; |
| 20 | 20 | let resumeDownload: (() => void) | undefined; |
| 21 | 21 | let sawPartialProgress = false; |
scripts/lib/build-target-arch.test.ts+3-3
| ... | ... | @@ -2,7 +2,7 @@ import { assert, describe, it } from "@effect/vitest"; |
| 2 | 2 | import * as ConfigProvider from "effect/ConfigProvider"; |
| 3 | 3 | import * as Effect from "effect/Effect"; |
| 4 | 4 | import * as Layer from "effect/Layer"; |
| 5 | import { HostProcessArchitecture, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 5 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 6 | 6 | |
| 7 | 7 | import { getDefaultBuildArch } from "./build-target-arch.ts"; |
| 8 | 8 | |
| ... | ... | @@ -18,8 +18,8 @@ const withHostRuntime = ( |
| 18 | 18 | ) => |
| 19 | 19 | Effect.provide( |
| 20 | 20 | Layer.mergeAll( |
| 21 | Layer.succeed(HostProcessPlatform, platform), | |
| 22 | Layer.succeed(HostProcessArchitecture, arch), | |
| 21 | Layer.succeed(HostProcess.Platform, platform), | |
| 22 | Layer.succeed(HostProcess.Architecture, arch), | |
| 23 | 23 | ConfigProvider.layer(ConfigProvider.fromEnv({ env: compactEnv(env) })), |
| 24 | 24 | ), |
| 25 | 25 | ); |
scripts/lib/build-target-arch.ts+3-3
| ... | ... | @@ -1,4 +1,4 @@ |
| 1 | import { HostProcessArchitecture, HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 1 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 2 | 2 | import * as Config from "effect/Config"; |
| 3 | 3 | import * as Effect from "effect/Effect"; |
| 4 | 4 | import * as Option from "effect/Option"; |
| ... | ... | @@ -27,8 +27,8 @@ const optionToUndefined = <A>(value: Option.Option<A>): A | undefined => |
| 27 | 27 | Option.getOrUndefined(value); |
| 28 | 28 | |
| 29 | 29 | const resolveHostProcessArch = Effect.fn("resolveHostProcessArch")(function* () { |
| 30 | const platform = yield* HostProcessPlatform; | |
| 31 | const processArch = yield* HostProcessArchitecture; | |
| 30 | const platform = yield* HostProcess.Platform; | |
| 31 | const processArch = yield* HostProcess.Architecture; | |
| 32 | 32 | if (processArch === "arm64") return "arm64"; |
| 33 | 33 | if (processArch === "x64") { |
| 34 | 34 | if (platform !== "win32") return "x64"; |
scripts/lib/cli-external-packages.test.ts+1-1
| ... | ... | @@ -34,7 +34,7 @@ const decodeManifest = Schema.decodeUnknownSync(Schema.fromJsonString(PackageMan |
| 34 | 34 | |
| 35 | 35 | describe("shouldBundleCliDependency", () => { |
| 36 | 36 | it("bundles ordinary runtime dependencies", () => { |
| 37 | for (const id of ["effect", "@effect/platform", "hono", "@t3tools/shared/hostProcess"]) { | |
| 37 | for (const id of ["effect", "@effect/platform", "hono", "@t3tools/shared/HostProcess"]) { | |
| 38 | 38 | assert.strictEqual(shouldBundleCliDependency(id), true, id); |
| 39 | 39 | } |
| 40 | 40 | }); |
scripts/mobile-native-client.ts+7-11
| ... | ... | @@ -1,10 +1,6 @@ |
| 1 | 1 | import * as NodeRuntime from "@effect/platform-node/NodeRuntime"; |
| 2 | 2 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 3 | import { | |
| 4 | HostProcessEnvironment, | |
| 5 | HostProcessExecutablePath, | |
| 6 | HostProcessPlatform, | |
| 7 | } from "@t3tools/shared/hostProcess"; | |
| 3 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 8 | 4 | import { isCommandAvailable, resolveSpawnCommand } from "@t3tools/shared/shell"; |
| 9 | 5 | import * as Console from "effect/Console"; |
| 10 | 6 | import * as Crypto from "effect/Crypto"; |
| ... | ... | @@ -155,9 +151,9 @@ const collect = <E>(stream: Stream.Stream<Uint8Array, E>) => |
| 155 | 151 | ); |
| 156 | 152 | export const resolveAdb = Effect.gen(function* () { |
| 157 | 153 | if (yield* isCommandAvailable("adb")) return "adb"; |
| 158 | const environment = yield* HostProcessEnvironment; | |
| 154 | const environment = yield* HostProcess.Environment; | |
| 159 | 155 | const path = yield* Path.Path; |
| 160 | const executable = (yield* HostProcessPlatform) === "win32" ? "adb.exe" : "adb"; | |
| 156 | const executable = (yield* HostProcess.Platform) === "win32" ? "adb.exe" : "adb"; | |
| 161 | 157 | for (const sdk of [environment.ANDROID_SDK_ROOT, environment.ANDROID_HOME]) { |
| 162 | 158 | if (!sdk) continue; |
| 163 | 159 | const candidate = path.join(sdk, "platform-tools", executable); |
| ... | ... | @@ -176,7 +172,7 @@ const command = Effect.fn("nativeClient.command")(function* ( |
| 176 | 172 | cwd?: string, |
| 177 | 173 | ) { |
| 178 | 174 | const spawner = yield* ChildProcessSpawner.ChildProcessSpawner; |
| 179 | const environment = yield* HostProcessEnvironment; | |
| 175 | const environment = yield* HostProcess.Environment; | |
| 180 | 176 | const spawn = yield* resolveSpawnCommand(program === "adb" ? yield* resolveAdb : program, args); |
| 181 | 177 | const child = yield* spawner.spawn( |
| 182 | 178 | ChildProcess.make(spawn.command, spawn.args, { |
| ... | ... | @@ -207,7 +203,7 @@ const command = Effect.fn("nativeClient.command")(function* ( |
| 207 | 203 | }, Effect.scoped); |
| 208 | 204 | |
| 209 | 205 | const fingerprint = Effect.fn("nativeClient.fingerprint")(function* (platform: NativePlatform) { |
| 210 | const output = yield* command(yield* HostProcessExecutablePath, [ | |
| 206 | const output = yield* command(yield* HostProcess.ExecutablePath, [ | |
| 211 | 207 | "--eval", |
| 212 | 208 | `require('expo/fingerprint').createFingerprintAsync(process.cwd(), { platforms: [process.argv[1]], silent: true }).then(fp => console.log('T3_NATIVE_FINGERPRINT=' + fp.hash)).catch(e => { console.error(e); process.exitCode = 1; });`, |
| 213 | 209 | platform, |
| ... | ... | @@ -226,7 +222,7 @@ const validateDevice = Effect.fn("nativeClient.validateDevice")(function* ( |
| 226 | 222 | device: string, |
| 227 | 223 | ) { |
| 228 | 224 | if (platform === "ios") { |
| 229 | if ((yield* HostProcessPlatform) !== "darwin") | |
| 225 | if ((yield* HostProcess.Platform) !== "darwin") | |
| 230 | 226 | return yield* new NativeClientError({ |
| 231 | 227 | message: "Run iOS check/ensure on the Mac that hosts the simulator.", |
| 232 | 228 | }); |
| ... | ... | @@ -299,7 +295,7 @@ const main = Command.make( |
| 299 | 295 | yield* validateDevice(platform, device); |
| 300 | 296 | const fs = yield* FileSystem.FileSystem; |
| 301 | 297 | const path = yield* Path.Path; |
| 302 | const environment = yield* HostProcessEnvironment; | |
| 298 | const environment = yield* HostProcess.Environment; | |
| 303 | 299 | const home = environment.HOME ?? environment.USERPROFILE; |
| 304 | 300 | if (!home) |
| 305 | 301 | return yield* new NativeClientError({ |
scripts/mobile-native-static-check.test.ts+2-2
| ... | ... | @@ -1,5 +1,5 @@ |
| 1 | 1 | import * as NodeServices from "@effect/platform-node/NodeServices"; |
| 2 | import * as HostProcess from "@t3tools/shared/hostProcess"; | |
| 2 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 3 | 3 | import { assert, it } from "@effect/vitest"; |
| 4 | 4 | import * as Effect from "effect/Effect"; |
| 5 | 5 | import * as FileSystem from "effect/FileSystem"; |
| ... | ... | @@ -33,7 +33,7 @@ const provideSpawner = (spawn: ChildProcessSpawner.ChildProcessSpawner["Service" |
| 33 | 33 | Layer.succeed(ChildProcessSpawner.ChildProcessSpawner, ChildProcessSpawner.make(spawn)); |
| 34 | 34 | |
| 35 | 35 | const runSwiftLint = runCommand("swiftlint", ["lint", "--strict"], "/repo/apps/mobile").pipe( |
| 36 | Effect.provideService(HostProcess.HostProcessPlatform, "linux"), | |
| 36 | Effect.provideService(HostProcess.Platform, "linux"), | |
| 37 | 37 | ); |
| 38 | 38 | |
| 39 | 39 | it.layer(NodeServices.layer)("mobile native source discovery", (it) => { |
scripts/smoke-cli-archive.ts+2-2
| ... | ... | @@ -22,7 +22,7 @@ import { Command, Flag } from "effect/cli"; |
| 22 | 22 | import { ChildProcess, ChildProcessSpawner } from "effect/process"; |
| 23 | 23 | |
| 24 | 24 | import * as NetService from "@t3tools/shared/Net"; |
| 25 | import { HostProcessPlatform } from "@t3tools/shared/hostProcess"; | |
| 25 | import * as HostProcess from "@t3tools/shared/HostProcess"; | |
| 26 | 26 | import { windowsSystemTar } from "./build-cli-archive.ts"; |
| 27 | 27 | import { FetchHttpClient, HttpClient, HttpClientRequest } from "effect/http"; |
| 28 | 28 | |
| ... | ... | @@ -72,7 +72,7 @@ const smokeCliArchive = Effect.fn("smokeCliArchive")(function* (input: { |
| 72 | 72 | }) { |
| 73 | 73 | const fs = yield* FileSystem.FileSystem; |
| 74 | 74 | const path = yield* Path.Path; |
| 75 | const platform = yield* HostProcessPlatform; | |
| 75 | const platform = yield* HostProcess.Platform; | |
| 76 | 76 | const spawner = yield* ChildProcessSpawner.ChildProcessSpawner; |
| 77 | 77 | const scratch = yield* fs.makeTempDirectory({ prefix: "t3-cli-smoke-" }); |
| 78 | 78 | // Windows can keep t3.exe locked (EBUSY) for a moment after the server |
vite.config.ts+1-1
| ... | ... | @@ -219,7 +219,7 @@ export default defineConfig({ |
| 219 | 219 | }, |
| 220 | 220 | { |
| 221 | 221 | // The one place that reads the host platform to seed the injected references. |
| 222 | files: ["packages/shared/src/hostProcess.ts"], | |
| 222 | files: ["packages/shared/src/HostProcess.ts"], | |
| 223 | 223 | rules: { "t3code/no-global-process-runtime": "off" }, |
| 224 | 224 | }, |
| 225 | 225 | { |