Skip to content

Composio powers 1000+ toolkits, tool search, context management, authentication, and a sandboxed workbench to help you build AI agents that turn intent into action.

refactor(cli): import @effect/platform modules by subpath (#4360)

Alberto Schiabel230f81a737ae
diff --git a/.agents/skills/cli-command/references/implementation.md b/.agents/skills/cli-command/references/implementation.md
index 786498ccd..0bb98d9b1 100644
--- a/.agents/skills/cli-command/references/implementation.md
+++ b/.agents/skills/cli-command/references/implementation.md
@@ -29,9 +29,9 @@ Follow existing local patterns before introducing new service abstractions.
`node:path`, `node:fs`, `node:os`, `node:child_process`, `process.env`, and `try`/`catch` are lint-banned (oxlint) in `src/`:
-- Path arithmetic → `Path` service from `@effect/platform` (`const path = yield* Path.Path`).
-- Filesystem I/O → `FileSystem` service from `@effect/platform`.
-- homedir/tmpdir/platform/arch → the `NodeOs` service; subprocesses → platform `Command` or `services/detached-process.ts`.
+- Path arithmetic → `Path` service from `@effect/platform/Path` (`const path = yield* Path.Path`).
+- Filesystem I/O → `FileSystem` service from `@effect/platform/FileSystem`.
+- homedir/tmpdir/platform/arch → the `NodeOs` service; subprocesses → `Command` from `@effect/platform/Command` or `services/detached-process.ts`.
- Environment reads → `effect/Config`; sync fallible ops (`JSON.parse`, `new URL`) → `Either.try` with a `Data.TaggedError` (JSON records via `parseJsonRecord` in `src/utils/parse-json.ts`).
- Helpers that cannot become Effects (sync callbacks, promise pipelines) take the resolved service instance as a plain parameter instead of importing Node builtins.
diff --git a/.oxlintrc.json b/.oxlintrc.json
index a7f3e3379..c2216964f 100644
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -129,13 +129,22 @@
{ "name": "node:crypto", "message": "Use Web Crypto API instead." },
{ "name": "buffer", "message": "Use Uint8Array instead." },
{ "name": "node:buffer", "message": "Use Uint8Array instead." },
- { "name": "child_process", "message": "Use Command from @effect/platform instead." },
+ {
+ "name": "child_process",
+ "message": "Use Command from @effect/platform/Command instead."
+ },
{
"name": "node:child_process",
- "message": "Use Command from @effect/platform instead."
+ "message": "Use Command from @effect/platform/Command instead."
+ },
+ {
+ "name": "fs",
+ "message": "Use FileSystem from @effect/platform/FileSystem instead."
+ },
+ {
+ "name": "node:fs",
+ "message": "Use FileSystem from @effect/platform/FileSystem instead."
},
- { "name": "fs", "message": "Use FileSystem from @effect/platform instead." },
- { "name": "node:fs", "message": "Use FileSystem from @effect/platform instead." },
{
"name": "os",
"message": "Use an Effect service instead of importing node:os directly."
@@ -144,8 +153,16 @@
"name": "node:os",
"message": "Use an Effect service instead of importing node:os directly."
},
- { "name": "path", "message": "Use Path from @effect/platform instead." },
- { "name": "node:path", "message": "Use Path from @effect/platform instead." },
+ { "name": "path", "message": "Use Path from @effect/platform/Path instead." },
+ { "name": "node:path", "message": "Use Path from @effect/platform/Path instead." },
+ {
+ "name": "@effect/platform",
+ "message": "Import the module by subpath, e.g. @effect/platform/FileSystem; the package barrel is not part of the Effect v4 layout."
+ },
+ {
+ "name": "@effect/platform-bun",
+ "message": "Import the module by subpath, e.g. @effect/platform-bun/BunFileSystem; the package barrel is not part of the Effect v4 layout."
+ },
{
"name": "@effect/cli",
"importNames": ["CommandDescriptor", "Usage"],
@@ -155,7 +172,7 @@
"patterns": [
{
"group": ["fs/*", "node:fs/*"],
- "message": "Use FileSystem from @effect/platform instead."
+ "message": "Use FileSystem from @effect/platform/FileSystem instead."
},
{
"group": ["@effect/cli/CommandDescriptor", "@effect/cli/Usage"],
@@ -249,13 +266,22 @@
{ "name": "node:crypto", "message": "Use Web Crypto API instead." },
{ "name": "buffer", "message": "Use Uint8Array instead." },
{ "name": "node:buffer", "message": "Use Uint8Array instead." },
- { "name": "child_process", "message": "Use Command from @effect/platform instead." },
+ {
+ "name": "child_process",
+ "message": "Use Command from @effect/platform/Command instead."
+ },
{
"name": "node:child_process",
- "message": "Use Command from @effect/platform instead."
+ "message": "Use Command from @effect/platform/Command instead."
+ },
+ {
+ "name": "fs",
+ "message": "Use FileSystem from @effect/platform/FileSystem instead."
+ },
+ {
+ "name": "node:fs",
+ "message": "Use FileSystem from @effect/platform/FileSystem instead."
},
- { "name": "fs", "message": "Use FileSystem from @effect/platform instead." },
- { "name": "node:fs", "message": "Use FileSystem from @effect/platform instead." },
{
"name": "os",
"message": "Use an Effect service instead of importing node:os directly."
@@ -264,13 +290,21 @@
"name": "node:os",
"message": "Use an Effect service instead of importing node:os directly."
},
- { "name": "path", "message": "Use Path from @effect/platform instead." },
- { "name": "node:path", "message": "Use Path from @effect/platform instead." }
+ { "name": "path", "message": "Use Path from @effect/platform/Path instead." },
+ { "name": "node:path", "message": "Use Path from @effect/platform/Path instead." },
+ {
+ "name": "@effect/platform",
+ "message": "Import the module by subpath, e.g. @effect/platform/FileSystem; the package barrel is not part of the Effect v4 layout."
+ },
+ {
+ "name": "@effect/platform-bun",
+ "message": "Import the module by subpath, e.g. @effect/platform-bun/BunFileSystem; the package barrel is not part of the Effect v4 layout."
+ }
],
"patterns": [
{
"group": ["fs/*", "node:fs/*"],
- "message": "Use FileSystem from @effect/platform instead."
+ "message": "Use FileSystem from @effect/platform/FileSystem instead."
}
]
}
@@ -288,13 +322,22 @@
{ "name": "node:crypto", "message": "Use Web Crypto API instead." },
{ "name": "buffer", "message": "Use Uint8Array instead." },
{ "name": "node:buffer", "message": "Use Uint8Array instead." },
- { "name": "child_process", "message": "Use Command from @effect/platform instead." },
+ {
+ "name": "child_process",
+ "message": "Use Command from @effect/platform/Command instead."
+ },
{
"name": "node:child_process",
- "message": "Use Command from @effect/platform instead."
+ "message": "Use Command from @effect/platform/Command instead."
+ },
+ {
+ "name": "fs",
+ "message": "Use FileSystem from @effect/platform/FileSystem instead."
+ },
+ {
+ "name": "node:fs",
+ "message": "Use FileSystem from @effect/platform/FileSystem instead."
},
- { "name": "fs", "message": "Use FileSystem from @effect/platform instead." },
- { "name": "node:fs", "message": "Use FileSystem from @effect/platform instead." },
{
"name": "os",
"message": "Use an Effect service instead of importing node:os directly."
@@ -303,14 +346,22 @@
"name": "node:os",
"message": "Use an Effect service instead of importing node:os directly."
},
- { "name": "path", "message": "Use Path from @effect/platform instead." },
- { "name": "node:path", "message": "Use Path from @effect/platform instead." },
+ { "name": "path", "message": "Use Path from @effect/platform/Path instead." },
+ { "name": "node:path", "message": "Use Path from @effect/platform/Path instead." },
+ {
+ "name": "@effect/platform",
+ "message": "Import the module by subpath, e.g. @effect/platform/FileSystem; the package barrel is not part of the Effect v4 layout."
+ },
+ {
+ "name": "@effect/platform-bun",
+ "message": "Import the module by subpath, e.g. @effect/platform-bun/BunFileSystem; the package barrel is not part of the Effect v4 layout."
+ },
{ "name": "zod", "message": "Use Schema from effect for tool input validation." }
],
"patterns": [
{
"group": ["fs/*", "node:fs/*"],
- "message": "Use FileSystem from @effect/platform instead."
+ "message": "Use FileSystem from @effect/platform/FileSystem instead."
},
{ "group": ["zod/*"], "message": "Use Schema from effect for tool input validation." }
]
diff --git a/ts/packages/cli/AGENTS.md b/ts/packages/cli/AGENTS.md
index 25f09a0c6..3cb3d2d3a 100644
--- a/ts/packages/cli/AGENTS.md
+++ b/ts/packages/cli/AGENTS.md
@@ -171,14 +171,16 @@ Each `Arr.bind` adds one independent axis to the generated cases.
All platform access goes through Effect services. `node:path`, `node:fs`, `node:os`, `node:child_process`, `process.env`, and `try`/`catch` are lint-banned (oxlint) in `src/`. Use the sanctioned equivalents:
-| Need | Use |
-| ------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- |
-| Path arithmetic (join/resolve/dirname/…) | `Path` service from `@effect/platform` (`const path = yield* Path.Path`) |
-| Filesystem I/O | `FileSystem` service from `@effect/platform` |
-| homedir / tmpdir / platform / arch | `NodeOs` service (`src/services/node-os.ts`, the sole `node:os` boundary) |
-| Subprocesses | `Command` from `@effect/platform`; children that outlive the CLI via `src/services/detached-process.ts` (sole detached-spawn boundary) |
-| Environment reads | `effect/Config` |
-| Sync fallible ops (`JSON.parse`, `new URL`, `JSON.stringify`) | `Either.try` with a `Data.TaggedError`; JSON records via `parseJsonRecord` (`src/utils/parse-json.ts`) |
+| Need | Use |
+| ------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------- |
+| Path arithmetic (join/resolve/dirname/…) | `Path` service from `@effect/platform/Path` (`const path = yield* Path.Path`) |
+| Filesystem I/O | `FileSystem` service from `@effect/platform/FileSystem` |
+| homedir / tmpdir / platform / arch | `NodeOs` service (`src/services/node-os.ts`, the sole `node:os` boundary) |
+| Subprocesses | `Command` from `@effect/platform/Command`; children that outlive the CLI via `src/services/detached-process.ts` (sole detached-spawn boundary) |
+| Environment reads | `effect/Config` |
+| Sync fallible ops (`JSON.parse`, `new URL`, `JSON.stringify`) | `Either.try` with a `Data.TaggedError`; JSON records via `parseJsonRecord` (`src/utils/parse-json.ts`) |
+
+Import `@effect/platform` and `@effect/platform-bun` modules by subpath (`import * as FileSystem from '@effect/platform/FileSystem'`), never from the package barrel; oxlint rejects the barrel in `src/`. Effect v4 relocates each of these modules separately, so per-module imports keep that move a path rewrite.
Conversion patterns, in order of preference:
diff --git a/ts/packages/cli/scripts/build-all-binaries.ts b/ts/packages/cli/scripts/build-all-binaries.ts
index dd18cb925..81d3477a5 100644
--- a/ts/packages/cli/scripts/build-all-binaries.ts
+++ b/ts/packages/cli/scripts/build-all-binaries.ts
@@ -13,8 +13,9 @@
*/
import { Config, ConfigProvider, Console, Effect, Stream, Logger, Layer, LogLevel } from 'effect';
-import { Command } from '@effect/platform';
-import { BunContext, BunRuntime } from '@effect/platform-bun';
+import * as Command from '@effect/platform/Command';
+import * as BunContext from '@effect/platform-bun/BunContext';
+import * as BunRuntime from '@effect/platform-bun/BunRuntime';
import {
buildCompanionModules,
copyLocalToolBinaryAssets,
diff --git a/ts/packages/cli/scripts/build-binary-cross.ts b/ts/packages/cli/scripts/build-binary-cross.ts
index f7afb060d..4caf4842c 100644
--- a/ts/packages/cli/scripts/build-binary-cross.ts
+++ b/ts/packages/cli/scripts/build-binary-cross.ts
@@ -16,8 +16,9 @@
import process from 'node:process';
import { Config, ConfigProvider, Console, Effect, Stream, Logger, Layer, LogLevel } from 'effect';
-import { Command } from '@effect/platform';
-import { BunContext, BunRuntime } from '@effect/platform-bun';
+import * as Command from '@effect/platform/Command';
+import * as BunContext from '@effect/platform-bun/BunContext';
+import * as BunRuntime from '@effect/platform-bun/BunRuntime';
import {
buildCompanionModules,
copyLocalToolBinaryAssets,
diff --git a/ts/packages/cli/scripts/build-binary.ts b/ts/packages/cli/scripts/build-binary.ts
index cd30cb823..99bbc1403 100644
--- a/ts/packages/cli/scripts/build-binary.ts
+++ b/ts/packages/cli/scripts/build-binary.ts
@@ -1,7 +1,8 @@
import process from 'node:process';
import { Config, ConfigProvider, Console, Effect, Stream, Logger, Layer, LogLevel } from 'effect';
-import { Command } from '@effect/platform';
-import { BunContext, BunRuntime } from '@effect/platform-bun';
+import * as Command from '@effect/platform/Command';
+import * as BunContext from '@effect/platform-bun/BunContext';
+import * as BunRuntime from '@effect/platform-bun/BunRuntime';
import {
buildCompanionModules,
copyLocalToolBinaryAssets,
diff --git a/ts/packages/cli/scripts/build-companion-modules.ts b/ts/packages/cli/scripts/build-companion-modules.ts
index 3549e3815..e25eb782e 100644
--- a/ts/packages/cli/scripts/build-companion-modules.ts
+++ b/ts/packages/cli/scripts/build-companion-modules.ts
@@ -14,7 +14,8 @@
import process from 'node:process';
import { Config, ConfigProvider, Console, Effect, Logger, Layer, LogLevel } from 'effect';
-import { BunContext, BunRuntime } from '@effect/platform-bun';
+import * as BunContext from '@effect/platform-bun/BunContext';
+import * as BunRuntime from '@effect/platform-bun/BunRuntime';
import { buildCompanionModules, hostCodexAcpBinaryTargets, teardown } from './_shared';
import { BinaryBuildError } from './build-error';
diff --git a/ts/packages/cli/scripts/copy-local-tools-assets.ts b/ts/packages/cli/scripts/copy-local-tools-assets.ts
index 1f0c54a4c..6e8f0d448 100644
--- a/ts/packages/cli/scripts/copy-local-tools-assets.ts
+++ b/ts/packages/cli/scripts/copy-local-tools-assets.ts
@@ -2,7 +2,8 @@
import process from 'node:process';
import { Effect } from 'effect';
-import { BunContext, BunRuntime } from '@effect/platform-bun';
+import * as BunContext from '@effect/platform-bun/BunContext';
+import * as BunRuntime from '@effect/platform-bun/BunRuntime';
import { copyLocalToolBinaryAssets, teardown } from './_shared';
const outputDir = process.argv[2] ?? './dist';
diff --git a/ts/packages/cli/scripts/copy-mocks-from-cache.ts b/ts/packages/cli/scripts/copy-mocks-from-cache.ts
index bf2926915..dd70f3ca1 100644
--- a/ts/packages/cli/scripts/copy-mocks-from-cache.ts
+++ b/ts/packages/cli/scripts/copy-mocks-from-cache.ts
@@ -1,7 +1,9 @@
import process from 'node:process';
import { Config, ConfigProvider, Console, Effect, Logger, Layer, LogLevel } from 'effect';
-import { BunContext, BunFileSystem, BunRuntime } from '@effect/platform-bun';
-import { FileSystem } from '@effect/platform';
+import * as BunContext from '@effect/platform-bun/BunContext';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
+import * as BunRuntime from '@effect/platform-bun/BunRuntime';
+import * as FileSystem from '@effect/platform/FileSystem';
import { teardown } from './_shared';
import path from 'node:path';
import { $ } from 'bun';
diff --git a/ts/packages/cli/scripts/generate-checksums.ts b/ts/packages/cli/scripts/generate-checksums.ts
index 65c5a8591..8addbb3f1 100644
--- a/ts/packages/cli/scripts/generate-checksums.ts
+++ b/ts/packages/cli/scripts/generate-checksums.ts
@@ -16,7 +16,8 @@
import process from 'node:process';
import { Config, ConfigProvider, Console, Effect, Logger, Layer, LogLevel } from 'effect';
-import { BunContext, BunRuntime } from '@effect/platform-bun';
+import * as BunContext from '@effect/platform-bun/BunContext';
+import * as BunRuntime from '@effect/platform-bun/BunRuntime';
import { teardown } from './_teardown';
import { readdir, readFile, writeFile } from 'node:fs/promises';
import path from 'node:path';
diff --git a/ts/packages/cli/scripts/generate-toolkit-slugs.ts b/ts/packages/cli/scripts/generate-toolkit-slugs.ts
index 468174702..b42ee15c7 100644
--- a/ts/packages/cli/scripts/generate-toolkit-slugs.ts
+++ b/ts/packages/cli/scripts/generate-toolkit-slugs.ts
@@ -13,8 +13,10 @@ import {
Option,
Schema,
} from 'effect';
-import { FileSystem } from '@effect/platform';
-import { BunContext, BunFileSystem, BunRuntime } from '@effect/platform-bun';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as BunContext from '@effect/platform-bun/BunContext';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
+import * as BunRuntime from '@effect/platform-bun/BunRuntime';
import { TOOLKIT_SLUG_PATTERN } from 'src/models/toolkits';
import { teardown } from './_teardown';
diff --git a/ts/packages/cli/scripts/install-binary.ts b/ts/packages/cli/scripts/install-binary.ts
index 7fd887063..17f8ab2ea 100644
--- a/ts/packages/cli/scripts/install-binary.ts
+++ b/ts/packages/cli/scripts/install-binary.ts
@@ -1,6 +1,7 @@
import process from 'node:process';
import { Config, ConfigProvider, Console, Effect, Logger, Layer, LogLevel } from 'effect';
-import { BunContext, BunRuntime } from '@effect/platform-bun';
+import * as BunContext from '@effect/platform-bun/BunContext';
+import * as BunRuntime from '@effect/platform-bun/BunRuntime';
import { teardown } from './_shared';
import path from 'node:path';
import os from 'node:os';
diff --git a/ts/packages/cli/scripts/package-binaries.ts b/ts/packages/cli/scripts/package-binaries.ts
index f47a10914..386ca116f 100644
--- a/ts/packages/cli/scripts/package-binaries.ts
+++ b/ts/packages/cli/scripts/package-binaries.ts
@@ -16,7 +16,8 @@
import process from 'node:process';
import { Config, ConfigProvider, Console, Effect, Logger, Layer, LogLevel } from 'effect';
-import { BunContext, BunRuntime } from '@effect/platform-bun';
+import * as BunContext from '@effect/platform-bun/BunContext';
+import * as BunRuntime from '@effect/platform-bun/BunRuntime';
import { LOCAL_TOOLS_BINARY_ASSET_DIRNAME, teardown } from './_shared';
import { $ } from 'bun';
import { readdir, stat, writeFile } from 'node:fs/promises';
diff --git a/ts/packages/cli/scripts/record.ts b/ts/packages/cli/scripts/record.ts
index 2d86effcd..2c496dbff 100644
--- a/ts/packages/cli/scripts/record.ts
+++ b/ts/packages/cli/scripts/record.ts
@@ -18,8 +18,10 @@ import process from 'node:process';
import path from 'node:path';
import os from 'node:os';
import { Config, ConfigProvider, Effect, Logger, Layer, LogLevel, Ref } from 'effect';
-import { BunContext, BunFileSystem, BunRuntime } from '@effect/platform-bun';
-import { FileSystem } from '@effect/platform';
+import * as BunContext from '@effect/platform-bun/BunContext';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
+import * as BunRuntime from '@effect/platform-bun/BunRuntime';
+import * as FileSystem from '@effect/platform/FileSystem';
import { teardown } from './_shared';
import { $ } from 'bun';
import * as p from '@clack/prompts';
diff --git a/ts/packages/cli/src/analytics/dispatch.ts b/ts/packages/cli/src/analytics/dispatch.ts
index 2273ccb06..50a8bff06 100644
--- a/ts/packages/cli/src/analytics/dispatch.ts
+++ b/ts/packages/cli/src/analytics/dispatch.ts
@@ -1,5 +1,8 @@
import process from 'node:process';
-import { FileSystem, HttpClient, HttpClientRequest, Path } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as HttpClient from '@effect/platform/HttpClient';
+import * as HttpClientRequest from '@effect/platform/HttpClientRequest';
+import * as Path from '@effect/platform/Path';
import type { PlatformError } from '@effect/platform/Error';
import {
Cause,
diff --git a/ts/packages/cli/src/bin.ts b/ts/packages/cli/src/bin.ts
index e17a38cab..f152522da 100644
--- a/ts/packages/cli/src/bin.ts
+++ b/ts/packages/cli/src/bin.ts
@@ -1,7 +1,9 @@
import process from 'node:process';
import { Effect, Layer } from 'effect';
-import { FetchHttpClient } from '@effect/platform';
-import { BunFileSystem, BunPath, BunRuntime } from '@effect/platform-bun';
+import * as FetchHttpClient from '@effect/platform/FetchHttpClient';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
+import * as BunPath from '@effect/platform-bun/BunPath';
+import * as BunRuntime from '@effect/platform-bun/BunRuntime';
import { isBackgroundWorkerInvocation, runBackgroundWorkerFromArgv } from 'src/analytics/dispatch';
import { NodeOs } from 'src/services/node-os';
import { TerminalUILive } from 'src/services/terminal-ui';
diff --git a/ts/packages/cli/src/cli-main.ts b/ts/packages/cli/src/cli-main.ts
index 90aab8cf5..aff4a2e19 100644
--- a/ts/packages/cli/src/cli-main.ts
+++ b/ts/packages/cli/src/cli-main.ts
@@ -2,8 +2,11 @@ import process from 'node:process';
import { Cause, Effect, Exit, Layer, Logger } from 'effect';
import { captureErrors, prettyPrintFromCapturedErrors } from 'effect-errors/index';
import { CliConfig, HelpDoc, ValidationError } from '@effect/cli';
-import { FetchHttpClient } from '@effect/platform';
-import { BunContext, BunRuntime, BunFileSystem, BunPath } from '@effect/platform-bun';
+import * as FetchHttpClient from '@effect/platform/FetchHttpClient';
+import * as BunContext from '@effect/platform-bun/BunContext';
+import * as BunRuntime from '@effect/platform-bun/BunRuntime';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
+import * as BunPath from '@effect/platform-bun/BunPath';
import type { Teardown } from '@effect/platform/Runtime';
import { buildRootCommand, runWithConfig, type RootCommandBootstrap } from 'src/commands';
import { collectValueOptionNames } from 'src/commands/command-introspection';
diff --git a/ts/packages/cli/src/commands/init.cmd.ts b/ts/packages/cli/src/commands/init.cmd.ts
index 0febc7d9a..3758e5fc3 100644
--- a/ts/packages/cli/src/commands/init.cmd.ts
+++ b/ts/packages/cli/src/commands/init.cmd.ts
@@ -1,6 +1,7 @@
import { Command as CliCommand, Options } from '@effect/cli';
import { Effect, Option } from 'effect';
-import { FileSystem, Path } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
import { ComposioUserContext } from 'src/services/user-context';
import { NodeProcess } from 'src/services/node-process';
import { projectKeysToJSON, type ProjectKeys } from 'src/models/project-keys';
diff --git a/ts/packages/cli/src/commands/install.cmd.ts b/ts/packages/cli/src/commands/install.cmd.ts
index d3f84c392..fa4efb8dc 100644
--- a/ts/packages/cli/src/commands/install.cmd.ts
+++ b/ts/packages/cli/src/commands/install.cmd.ts
@@ -1,5 +1,6 @@
import { Command, Options } from '@effect/cli';
-import { FileSystem, Path } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
import type { PlatformError } from '@effect/platform/Error';
import { Array as Arr, Config, ConfigProvider, Data, Effect, Option } from 'effect';
import { APP_CONFIG } from 'src/effects/app-config';
diff --git a/ts/packages/cli/src/commands/listen.cmd.ts b/ts/packages/cli/src/commands/listen.cmd.ts
index dac859472..15a54e7fa 100644
--- a/ts/packages/cli/src/commands/listen.cmd.ts
+++ b/ts/packages/cli/src/commands/listen.cmd.ts
@@ -1,5 +1,6 @@
import { Args, Command, HelpDoc, Options, ValidationError } from '@effect/cli';
-import { FileSystem, Path } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
import type { Composio as RawComposioClient } from '@composio/client';
import { Data, Deferred, Effect, Either, Option, Predicate, Runtime } from 'effect';
import { requireAuth } from 'src/effects/require-auth';
diff --git a/ts/packages/cli/src/commands/login.cmd.ts b/ts/packages/cli/src/commands/login.cmd.ts
index d78bbb83c..70e72d248 100644
--- a/ts/packages/cli/src/commands/login.cmd.ts
+++ b/ts/packages/cli/src/commands/login.cmd.ts
@@ -1,5 +1,6 @@
import { Command, HelpDoc, Options, ValidationError } from '@effect/cli';
-import { FileSystem, Path } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
import { Data, DateTime, Effect, Option, Schedule, Schema } from 'effect';
import open from 'open';
import {
diff --git a/ts/packages/cli/src/commands/py/commands/py.generate.cmd.ts b/ts/packages/cli/src/commands/py/commands/py.generate.cmd.ts
index ba5aed075..480b557de 100644
--- a/ts/packages/cli/src/commands/py/commands/py.generate.cmd.ts
+++ b/ts/packages/cli/src/commands/py/commands/py.generate.cmd.ts
@@ -1,6 +1,7 @@
import { Command, HelpDoc, Options, ValidationError } from '@effect/cli';
import { Array, Data, Effect, Option, pipe, String } from 'effect';
-import { FileSystem, Path } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
import { ComposioToolkitsRepository } from 'src/services/composio-clients';
import { logMetrics } from 'src/effects/log-metrics';
import type { GetCmdParams } from 'src/type-utils';
diff --git a/ts/packages/cli/src/commands/run.cmd.ts b/ts/packages/cli/src/commands/run.cmd.ts
index 7b17f5e02..e366fcde3 100644
--- a/ts/packages/cli/src/commands/run.cmd.ts
+++ b/ts/packages/cli/src/commands/run.cmd.ts
@@ -1,6 +1,9 @@
import process from 'node:process';
import { Args, Command, Options } from '@effect/cli';
-import { Command as PlatformCommand, CommandExecutor, FileSystem, Path } from '@effect/platform';
+import * as PlatformCommand from '@effect/platform/Command';
+import * as CommandExecutor from '@effect/platform/CommandExecutor';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
import { Data, Deferred, Duration, Effect, Either, MutableRef, Option } from 'effect';
import { ts } from 'ts-morph';
import { APP_VERSION } from 'src/constants';
diff --git a/ts/packages/cli/src/commands/triggers/commands/triggers.listen.cmd.ts b/ts/packages/cli/src/commands/triggers/commands/triggers.listen.cmd.ts
index 276136e56..e7309d893 100644
--- a/ts/packages/cli/src/commands/triggers/commands/triggers.listen.cmd.ts
+++ b/ts/packages/cli/src/commands/triggers/commands/triggers.listen.cmd.ts
@@ -1,5 +1,6 @@
import { Command, Options } from '@effect/cli';
-import { FileSystem, Path } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
import { Deferred, Effect, Option, Runtime } from 'effect';
import { APP_CONFIG } from 'src/effects/app-config';
import { requireAuth } from 'src/effects/require-auth';
diff --git a/ts/packages/cli/src/commands/ts/commands/ts.generate.cmd.ts b/ts/packages/cli/src/commands/ts/commands/ts.generate.cmd.ts
index c8bbd4534..6ff75e3fb 100644
--- a/ts/packages/cli/src/commands/ts/commands/ts.generate.cmd.ts
+++ b/ts/packages/cli/src/commands/ts/commands/ts.generate.cmd.ts
@@ -18,7 +18,8 @@
import { Command, HelpDoc, Options, ValidationError } from '@effect/cli';
import { Array, Data, Effect, Option, pipe } from 'effect';
import { Match } from 'effect';
-import { FileSystem, Path } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
import {
ComposioToolkitsRepository,
type ComposioToolkitsRepositoryShape,
diff --git a/ts/packages/cli/src/effects/core-dependency.ts b/ts/packages/cli/src/effects/core-dependency.ts
index da1e265f7..41b9aa89e 100644
--- a/ts/packages/cli/src/effects/core-dependency.ts
+++ b/ts/packages/cli/src/effects/core-dependency.ts
@@ -1,4 +1,6 @@
-import { Command, FileSystem, Path } from '@effect/platform';
+import * as Command from '@effect/platform/Command';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
import { Effect, Match } from 'effect';
import {
ProjectEnvironmentDetector,
diff --git a/ts/packages/cli/src/effects/discover-skill-roots.ts b/ts/packages/cli/src/effects/discover-skill-roots.ts
index 64048ae43..f4cde2974 100644
--- a/ts/packages/cli/src/effects/discover-skill-roots.ts
+++ b/ts/packages/cli/src/effects/discover-skill-roots.ts
@@ -1,4 +1,5 @@
-import { FileSystem, Path } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
import { Effect, Option } from 'effect';
const SKILL_NAME = 'composio-cli';
diff --git a/ts/packages/cli/src/effects/find-composio-core-generated.ts b/ts/packages/cli/src/effects/find-composio-core-generated.ts
index aa6addb4e..f9af59674 100644
--- a/ts/packages/cli/src/effects/find-composio-core-generated.ts
+++ b/ts/packages/cli/src/effects/find-composio-core-generated.ts
@@ -1,4 +1,6 @@
-import { Command, FileSystem, Path } from '@effect/platform';
+import * as Command from '@effect/platform/Command';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
import { Data, Effect, Match } from 'effect';
import {
JsPackageManagerDetector,
diff --git a/ts/packages/cli/src/effects/from-lazy-json.ts b/ts/packages/cli/src/effects/from-lazy-json.ts
index d95e2c0ed..c620b0782 100644
--- a/ts/packages/cli/src/effects/from-lazy-json.ts
+++ b/ts/packages/cli/src/effects/from-lazy-json.ts
@@ -1,4 +1,5 @@
-import { FileSystem, Error as PlatformError } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as PlatformError from '@effect/platform/Error';
import {
pipe,
Array,
diff --git a/ts/packages/cli/src/effects/install-skill.ts b/ts/packages/cli/src/effects/install-skill.ts
index c46ea8d6e..e3e21023f 100644
--- a/ts/packages/cli/src/effects/install-skill.ts
+++ b/ts/packages/cli/src/effects/install-skill.ts
@@ -1,5 +1,7 @@
import { Config, Data, Effect, Option } from 'effect';
-import { FileSystem, HttpClient, Path } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as HttpClient from '@effect/platform/HttpClient';
+import * as Path from '@effect/platform/Path';
import { NodeOs } from 'src/services/node-os';
import { TerminalUI } from 'src/services/terminal-ui';
import { GITHUB_CONFIG } from 'src/effects/github-config';
diff --git a/ts/packages/cli/src/effects/resolve-cli-release.ts b/ts/packages/cli/src/effects/resolve-cli-release.ts
index a53e757b3..7cd29fb4b 100644
--- a/ts/packages/cli/src/effects/resolve-cli-release.ts
+++ b/ts/packages/cli/src/effects/resolve-cli-release.ts
@@ -1,5 +1,6 @@
import { Data, Effect, Option, Schema } from 'effect';
-import { HttpClient, HttpClientResponse } from '@effect/platform';
+import * as HttpClient from '@effect/platform/HttpClient';
+import * as HttpClientResponse from '@effect/platform/HttpClientResponse';
import { semverComparator } from 'src/effects/compare-semver';
import type { CliReleaseChannel } from 'src/constants';
diff --git a/ts/packages/cli/src/effects/resolve-optional-text-input.ts b/ts/packages/cli/src/effects/resolve-optional-text-input.ts
index 7ed017ae9..b0b9db3e2 100644
--- a/ts/packages/cli/src/effects/resolve-optional-text-input.ts
+++ b/ts/packages/cli/src/effects/resolve-optional-text-input.ts
@@ -1,5 +1,5 @@
import { HelpDoc, ValidationError } from '@effect/cli';
-import { FileSystem } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
import { Effect, Option } from 'effect';
import { readStdin, readStdinIfPiped } from 'src/effects/read-stdin';
diff --git a/ts/packages/cli/src/effects/setup-cache-dir.ts b/ts/packages/cli/src/effects/setup-cache-dir.ts
index 4e622f52f..92c44d753 100644
--- a/ts/packages/cli/src/effects/setup-cache-dir.ts
+++ b/ts/packages/cli/src/effects/setup-cache-dir.ts
@@ -1,5 +1,6 @@
import { Effect } from 'effect';
-import { FileSystem, Path } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
import * as constants from 'src/constants';
import { APP_CONFIG } from 'src/effects/app-config';
import { NodeOs } from 'src/services/node-os';
diff --git a/ts/packages/cli/src/effects/write-file-atomic.ts b/ts/packages/cli/src/effects/write-file-atomic.ts
index 7f44cbb09..a6d18c1c6 100644
--- a/ts/packages/cli/src/effects/write-file-atomic.ts
+++ b/ts/packages/cli/src/effects/write-file-atomic.ts
@@ -1,4 +1,4 @@
-import { FileSystem } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
import { Effect, Random } from 'effect';
/**
diff --git a/ts/packages/cli/src/generation/python/generate.ts b/ts/packages/cli/src/generation/python/generate.ts
index 1ee3b896b..d148e88c5 100644
--- a/ts/packages/cli/src/generation/python/generate.ts
+++ b/ts/packages/cli/src/generation/python/generate.ts
@@ -1,4 +1,4 @@
-import type { Path } from '@effect/platform';
+import type * as Path from '@effect/platform/Path';
import type { ToolkitIndex } from 'src/generation/create-toolkit-index';
import type { SourceFile } from 'src/generation/types';
import { Effect } from 'effect';
diff --git a/ts/packages/cli/src/generation/safe-output-path.ts b/ts/packages/cli/src/generation/safe-output-path.ts
index 3f6d188f5..96dbd2ab3 100644
--- a/ts/packages/cli/src/generation/safe-output-path.ts
+++ b/ts/packages/cli/src/generation/safe-output-path.ts
@@ -1,4 +1,4 @@
-import { Path } from '@effect/platform';
+import * as Path from '@effect/platform/Path';
import { Data, Effect } from 'effect';
export class SafeOutputPathError extends Data.TaggedError('generation/SafeOutputPathError')<{
diff --git a/ts/packages/cli/src/generation/typescript/generate.ts b/ts/packages/cli/src/generation/typescript/generate.ts
index dc66d42ac..ddb06efc9 100644
--- a/ts/packages/cli/src/generation/typescript/generate.ts
+++ b/ts/packages/cli/src/generation/typescript/generate.ts
@@ -1,5 +1,5 @@
import * as ts from '@composio/ts-builders';
-import { Path } from '@effect/platform';
+import * as Path from '@effect/platform/Path';
import { safeOutputPath, type SafeOutputPathError } from 'src/generation/safe-output-path';
import type { ToolkitIndex } from 'src/generation/create-toolkit-index';
import type { SourceFile } from 'src/generation/types';
diff --git a/ts/packages/cli/src/generation/typescript/transpile.ts b/ts/packages/cli/src/generation/typescript/transpile.ts
index bb775de65..0813df034 100644
--- a/ts/packages/cli/src/generation/typescript/transpile.ts
+++ b/ts/packages/cli/src/generation/typescript/transpile.ts
@@ -1,5 +1,5 @@
import ts from 'typescript';
-import { Path } from '@effect/platform';
+import * as Path from '@effect/platform/Path';
import { Effect, Data } from 'effect';
import {
buildVirtualFileMap,
diff --git a/ts/packages/cli/src/generation/typescript/virtual-compiler-host.ts b/ts/packages/cli/src/generation/typescript/virtual-compiler-host.ts
index 2c01fab1e..1d013ed66 100644
--- a/ts/packages/cli/src/generation/typescript/virtual-compiler-host.ts
+++ b/ts/packages/cli/src/generation/typescript/virtual-compiler-host.ts
@@ -1,4 +1,4 @@
-import type { Path } from '@effect/platform';
+import type * as Path from '@effect/platform/Path';
import ts from 'typescript';
/**
diff --git a/ts/packages/cli/src/services/agents.ts b/ts/packages/cli/src/services/agents.ts
index 39e58dfa1..58432ea0f 100644
--- a/ts/packages/cli/src/services/agents.ts
+++ b/ts/packages/cli/src/services/agents.ts
@@ -1,4 +1,5 @@
-import { FileSystem, Path } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
import { Data, Effect, Either, Option, Predicate, Schema } from 'effect';
import { APP_CONFIG } from 'src/effects/app-config';
import { JsonRecordSchema } from 'src/effects/json';
diff --git a/ts/packages/cli/src/services/cli-session-artifacts.ts b/ts/packages/cli/src/services/cli-session-artifacts.ts
index 519236b89..b5524f401 100644
--- a/ts/packages/cli/src/services/cli-session-artifacts.ts
+++ b/ts/packages/cli/src/services/cli-session-artifacts.ts
@@ -1,4 +1,5 @@
-import { FileSystem, Path } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
import { Effect, Option } from 'effect';
import { APP_CONFIG } from 'src/effects/app-config';
import { getOrCreateProbablyMyCliSessionIdForCurrentCwd } from 'src/services/consumer-short-term-cache';
diff --git a/ts/packages/cli/src/services/cli-user-config.ts b/ts/packages/cli/src/services/cli-user-config.ts
index f8c24dbcf..ce7337251 100644
--- a/ts/packages/cli/src/services/cli-user-config.ts
+++ b/ts/packages/cli/src/services/cli-user-config.ts
@@ -1,4 +1,5 @@
-import { FileSystem, Path } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
import type { PlatformError } from '@effect/platform/Error';
import { Context, Effect, Layer, Option, Predicate, Schema } from 'effect';
import type { ParseError } from 'effect/ParseResult';
diff --git a/ts/packages/cli/src/services/command-runner.ts b/ts/packages/cli/src/services/command-runner.ts
index 1a66e09e7..83d98257d 100644
--- a/ts/packages/cli/src/services/command-runner.ts
+++ b/ts/packages/cli/src/services/command-runner.ts
@@ -1,4 +1,4 @@
-import { Command } from '@effect/platform';
+import * as Command from '@effect/platform/Command';
import { Effect, Stream, String, Context, Layer } from 'effect';
export interface CommandResult {
diff --git a/ts/packages/cli/src/services/composio-clients-cached.ts b/ts/packages/cli/src/services/composio-clients-cached.ts
index 92a5555c8..5afc63ab4 100644
--- a/ts/packages/cli/src/services/composio-clients-cached.ts
+++ b/ts/packages/cli/src/services/composio-clients-cached.ts
@@ -1,6 +1,7 @@
import { Effect, Option, ParseResult, Layer, Array as Arr } from 'effect';
-import { FileSystem, Path } from '@effect/platform';
-import { BunFileSystem } from '@effect/platform-bun';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
import { setupCacheDir } from 'src/effects/setup-cache-dir';
import { FORCE_CONFIG } from 'src/effects/force-config';
import { writeFileAtomic } from 'src/effects/write-file-atomic';
diff --git a/ts/packages/cli/src/services/composio-clients.ts b/ts/packages/cli/src/services/composio-clients.ts
index 658d8aba9..8241e71b4 100644
--- a/ts/packages/cli/src/services/composio-clients.ts
+++ b/ts/packages/cli/src/services/composio-clients.ts
@@ -15,7 +15,8 @@ import {
Layer,
} from 'effect';
import { Composio as _RawComposioClient, APIPromise } from '@composio/client';
-import { FileSystem, Path } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
import type { AuthConfigCreateParams } from '@composio/client/resources/auth-configs';
import type { ConnectedAccountListParams } from '@composio/client/resources/connected-accounts';
import {
diff --git a/ts/packages/cli/src/services/consumer-short-term-cache.ts b/ts/packages/cli/src/services/consumer-short-term-cache.ts
index eea8c5b8e..7a80286da 100644
--- a/ts/packages/cli/src/services/consumer-short-term-cache.ts
+++ b/ts/packages/cli/src/services/consumer-short-term-cache.ts
@@ -1,4 +1,5 @@
-import { FileSystem, Path } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
import { Effect, Option, Record as EffectRecord, Schema } from 'effect';
import { APP_CONFIG } from 'src/effects/app-config';
import { JsonRecordSchema } from 'src/effects/json';
diff --git a/ts/packages/cli/src/services/detached-process.ts b/ts/packages/cli/src/services/detached-process.ts
index 82854e984..808fb5bae 100644
--- a/ts/packages/cli/src/services/detached-process.ts
+++ b/ts/packages/cli/src/services/detached-process.ts
@@ -1,7 +1,7 @@
// eslint-disable-next-line no-restricted-imports -- This Effect helper is the sole detached-spawn boundary for CLI source: @effect/platform Command processes are scope-bound and are killed when their scope closes, while these children must outlive the CLI process.
import { spawn } from 'node:child_process';
import process from 'node:process';
-import { FileSystem } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
import { Data, Effect } from 'effect';
export class DetachedProcessSpawnError extends Data.TaggedError(
diff --git a/ts/packages/cli/src/services/js-package-manager-detector.ts b/ts/packages/cli/src/services/js-package-manager-detector.ts
index cfa5d937a..03d749a94 100644
--- a/ts/packages/cli/src/services/js-package-manager-detector.ts
+++ b/ts/packages/cli/src/services/js-package-manager-detector.ts
@@ -1,6 +1,7 @@
-import { BunFileSystem } from '@effect/platform-bun';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
import { Data, Effect, Option, Schema, pipe, Context, Layer } from 'effect';
-import { FileSystem, Path } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
const toError = (e: unknown): Error => (e instanceof Error ? e : new Error(String(e)));
diff --git a/ts/packages/cli/src/services/known-toolkit-slugs.ts b/ts/packages/cli/src/services/known-toolkit-slugs.ts
index 3db5ee11e..d3ba709c7 100644
--- a/ts/packages/cli/src/services/known-toolkit-slugs.ts
+++ b/ts/packages/cli/src/services/known-toolkit-slugs.ts
@@ -1,5 +1,6 @@
-import { FileSystem, Path } from '@effect/platform';
-import { BunFileSystem } from '@effect/platform-bun';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
import { DateTime, Effect, Layer, Option, Schema } from 'effect';
import { setupCacheDir } from 'src/effects/setup-cache-dir';
import { writeFileAtomic } from 'src/effects/write-file-atomic';
diff --git a/ts/packages/cli/src/services/native-ui-sidecar.ts b/ts/packages/cli/src/services/native-ui-sidecar.ts
index 489977940..4a339ea69 100644
--- a/ts/packages/cli/src/services/native-ui-sidecar.ts
+++ b/ts/packages/cli/src/services/native-ui-sidecar.ts
@@ -1,5 +1,8 @@
-import { Command, CommandExecutor, FileSystem, Path } from '@effect/platform';
-import { BunContext } from '@effect/platform-bun';
+import * as Command from '@effect/platform/Command';
+import * as CommandExecutor from '@effect/platform/CommandExecutor';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
+import * as BunContext from '@effect/platform-bun/BunContext';
import {
Cause,
Config,
diff --git a/ts/packages/cli/src/services/plugin-hint.ts b/ts/packages/cli/src/services/plugin-hint.ts
index e491e7057..c8961fec6 100644
--- a/ts/packages/cli/src/services/plugin-hint.ts
+++ b/ts/packages/cli/src/services/plugin-hint.ts
@@ -1,5 +1,6 @@
-import { FileSystem, Path } from '@effect/platform';
-import { BunFileSystem } from '@effect/platform-bun';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
import { Config, ConfigProvider, Effect, Layer, Option, Schema } from 'effect';
import { APP_CONFIG } from 'src/effects/app-config';
import { setupCacheDir } from 'src/effects/setup-cache-dir';
diff --git a/ts/packages/cli/src/services/project-context.ts b/ts/packages/cli/src/services/project-context.ts
index a4f041a18..3563cf6a8 100644
--- a/ts/packages/cli/src/services/project-context.ts
+++ b/ts/packages/cli/src/services/project-context.ts
@@ -1,5 +1,6 @@
import { Effect, Option, Context, Layer } from 'effect';
-import { FileSystem, Path } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
import { NodeOs } from 'src/services/node-os';
import { NodeProcess } from 'src/services/node-process';
import { APP_CONFIG } from 'src/effects/app-config';
diff --git a/ts/packages/cli/src/services/project-environment-detector.ts b/ts/packages/cli/src/services/project-environment-detector.ts
index 4855e0e01..043677c7b 100644
--- a/ts/packages/cli/src/services/project-environment-detector.ts
+++ b/ts/packages/cli/src/services/project-environment-detector.ts
@@ -1,5 +1,6 @@
-import { BunFileSystem } from '@effect/platform-bun';
-import { FileSystem, Path } from '@effect/platform';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
import { Data, Effect, Match, Context, Layer } from 'effect';
import { getAncestors } from 'src/utils/get-ancestors';
import { UNPREFIXED_CONFIG } from 'src/effects/app-config';
diff --git a/ts/packages/cli/src/services/run-companion-modules.ts b/ts/packages/cli/src/services/run-companion-modules.ts
index 7519a3f0f..514a434ee 100644
--- a/ts/packages/cli/src/services/run-companion-modules.ts
+++ b/ts/packages/cli/src/services/run-companion-modules.ts
@@ -2,7 +2,8 @@
// the bundled `composio run` companion modules, and the binary build scripts. Every
// helper is an Effect over the @effect/platform FileSystem/Path services; consumers
// outside the CLI runtime (companion runtimes, scripts) provide their own platform layers.
-import { FileSystem, Path } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
import type { PlatformError } from '@effect/platform/Error';
import { Config, ConfigProvider, Data, Effect, Option, Schema } from 'effect';
import { extractZipSafely } from 'src/utils/extract-zip-safely';
diff --git a/ts/packages/cli/src/services/run-helpers-runtime.ts b/ts/packages/cli/src/services/run-helpers-runtime.ts
index 2d668c486..0279a638b 100644
--- a/ts/packages/cli/src/services/run-helpers-runtime.ts
+++ b/ts/packages/cli/src/services/run-helpers-runtime.ts
@@ -2,8 +2,9 @@
// runtime or @effect/platform layers are provided, so it uses sync Node builtins.
// eslint-disable-next-line no-restricted-imports -- sync fs for run-log appends, run-file writes, and CLI config reads in the child process, outside the Effect runtime
import * as fs from 'node:fs';
-import { Command, Path } from '@effect/platform';
-import { BunContext } from '@effect/platform-bun';
+import * as Command from '@effect/platform/Command';
+import * as Path from '@effect/platform/Path';
+import * as BunContext from '@effect/platform-bun/BunContext';
import { Effect, Either, ManagedRuntime, Predicate, Schema } from 'effect';
import { z } from 'zod';
import { JsonRecordSchema } from 'src/effects/json';
diff --git a/ts/packages/cli/src/services/run-subagent-acp.ts b/ts/packages/cli/src/services/run-subagent-acp.ts
index dcd01a7e3..ccdef93f1 100644
--- a/ts/packages/cli/src/services/run-subagent-acp.ts
+++ b/ts/packages/cli/src/services/run-subagent-acp.ts
@@ -1,8 +1,10 @@
import { createRequire } from 'node:module';
import type { Readable } from 'node:stream';
import * as acp from '@agentclientprotocol/sdk';
-import { Command, FileSystem, Path } from '@effect/platform';
-import { BunContext } from '@effect/platform-bun';
+import * as Command from '@effect/platform/Command';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
+import * as BunContext from '@effect/platform-bun/BunContext';
import { Cause, Config, Data, Effect, Exit, Layer, Option, Predicate, Queue, Stream } from 'effect';
import type { MasterKind } from 'src/services/master-detector';
import { NodeOs } from 'src/services/node-os';
diff --git a/ts/packages/cli/src/services/run-subagent-legacy.ts b/ts/packages/cli/src/services/run-subagent-legacy.ts
index 7b0670592..4a7f72677 100644
--- a/ts/packages/cli/src/services/run-subagent-legacy.ts
+++ b/ts/packages/cli/src/services/run-subagent-legacy.ts
@@ -1,5 +1,7 @@
-import { Command, FileSystem, Path } from '@effect/platform';
-import { BunContext } from '@effect/platform-bun';
+import * as Command from '@effect/platform/Command';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
+import * as BunContext from '@effect/platform-bun/BunContext';
import { Cause, Data, Effect, Exit, Predicate, Stream } from 'effect';
import type { MasterKind } from 'src/services/master-detector';
import {
diff --git a/ts/packages/cli/src/services/run-subagent-output-mcp.ts b/ts/packages/cli/src/services/run-subagent-output-mcp.ts
index 79076f32b..0dec00ffb 100644
--- a/ts/packages/cli/src/services/run-subagent-output-mcp.ts
+++ b/ts/packages/cli/src/services/run-subagent-output-mcp.ts
@@ -1,7 +1,7 @@
import process from 'node:process';
import { jsonSchemaToZod } from '@composio/json-schema-to-zod';
-import { FileSystem } from '@effect/platform';
-import { BunFileSystem } from '@effect/platform-bun';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
import { Effect } from 'effect';
diff --git a/ts/packages/cli/src/services/setup-skill-installer.ts b/ts/packages/cli/src/services/setup-skill-installer.ts
index 22b85e5a7..feb636459 100644
--- a/ts/packages/cli/src/services/setup-skill-installer.ts
+++ b/ts/packages/cli/src/services/setup-skill-installer.ts
@@ -1,4 +1,6 @@
-import { FileSystem, HttpClient, Path } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as HttpClient from '@effect/platform/HttpClient';
+import * as Path from '@effect/platform/Path';
import { Config, Effect, Context, Layer } from 'effect';
import {
inferSkillReleaseChannel,
diff --git a/ts/packages/cli/src/services/setup.ts b/ts/packages/cli/src/services/setup.ts
index 10d457343..9aba5fd4b 100644
--- a/ts/packages/cli/src/services/setup.ts
+++ b/ts/packages/cli/src/services/setup.ts
@@ -1,4 +1,5 @@
-import { Command, Error as PlatformError } from '@effect/platform';
+import * as Command from '@effect/platform/Command';
+import * as PlatformError from '@effect/platform/Error';
import { Data, Effect, Either, Option, Predicate, Schema } from 'effect';
import semver from 'semver';
import { trackCliEventEffect } from 'src/analytics/dispatch';
diff --git a/ts/packages/cli/src/services/tool-file-uploads.ts b/ts/packages/cli/src/services/tool-file-uploads.ts
index b13b7e135..a33102354 100644
--- a/ts/packages/cli/src/services/tool-file-uploads.ts
+++ b/ts/packages/cli/src/services/tool-file-uploads.ts
@@ -3,7 +3,8 @@
// FileSystem and Path services and passes the instances in as parameters;
// `readLocalFileBytes` below is the single point where a FileSystem effect
// is run to completion inside this promise pipeline.
-import type { FileSystem, Path } from '@effect/platform';
+import type * as FileSystem from '@effect/platform/FileSystem';
+import type * as Path from '@effect/platform/Path';
import type { Composio as RawComposioClient } from '@composio/client';
import { assertSafeFileUploadPath } from '@composio/core';
import { ssrfSafeFetch } from '@composio/core/utils/ssrf-guard';
diff --git a/ts/packages/cli/src/services/tool-input-validation.ts b/ts/packages/cli/src/services/tool-input-validation.ts
index 90ef84342..56b6cb5d5 100644
--- a/ts/packages/cli/src/services/tool-input-validation.ts
+++ b/ts/packages/cli/src/services/tool-input-validation.ts
@@ -1,5 +1,6 @@
import { AutoCorrect, CliConfig } from '@effect/cli';
-import { FileSystem, Path } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
import { Data, Effect, Option, ParseResult, Schema } from 'effect';
import { getLocalToolInputDefinition } from '@composio/cli-local-tools';
import {
diff --git a/ts/packages/cli/src/services/tool-permissions.ts b/ts/packages/cli/src/services/tool-permissions.ts
index 88adddf03..97a672a0d 100644
--- a/ts/packages/cli/src/services/tool-permissions.ts
+++ b/ts/packages/cli/src/services/tool-permissions.ts
@@ -1,5 +1,6 @@
import http from 'node:http';
-import { FileSystem, Path } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
import open from 'open';
import { detectCliPlatform } from '@composio/cli-local-tools';
import { Data, Effect, Option, Record as EffectRecord, Schema } from 'effect';
diff --git a/ts/packages/cli/src/services/tools-executor.ts b/ts/packages/cli/src/services/tools-executor.ts
index 56464a479..bd55a2603 100644
--- a/ts/packages/cli/src/services/tools-executor.ts
+++ b/ts/packages/cli/src/services/tools-executor.ts
@@ -1,4 +1,5 @@
-import { FileSystem, Path } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
import { Context, Data, Effect, Layer } from 'effect';
import type { Composio } from '@composio/client';
import { executeLocalToolBySlug, resolveLocalTool } from '@composio/cli-local-tools';
diff --git a/ts/packages/cli/src/services/update-check.ts b/ts/packages/cli/src/services/update-check.ts
index 1e7b8ea2f..19a62f228 100644
--- a/ts/packages/cli/src/services/update-check.ts
+++ b/ts/packages/cli/src/services/update-check.ts
@@ -1,5 +1,6 @@
-import { FileSystem, Path } from '@effect/platform';
-import { BunFileSystem } from '@effect/platform-bun';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
import { Config, Data, Effect, Layer, Option, Predicate, Schema } from 'effect';
import semver from 'semver';
import { bold, cyanBright, dim } from 'src/ui/colors';
diff --git a/ts/packages/cli/src/services/upgrade-binary.ts b/ts/packages/cli/src/services/upgrade-binary.ts
index f3bbe6dd1..6fe322605 100644
--- a/ts/packages/cli/src/services/upgrade-binary.ts
+++ b/ts/packages/cli/src/services/upgrade-binary.ts
@@ -11,7 +11,10 @@ import {
Context,
Layer,
} from 'effect';
-import { HttpClient, HttpClientResponse, FileSystem, Path } from '@effect/platform';
+import * as HttpClient from '@effect/platform/HttpClient';
+import * as HttpClientResponse from '@effect/platform/HttpClientResponse';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
import { APP_VERSION } from '../constants';
import { DEBUG_OVERRIDE_CONFIG } from 'src/effects/debug-config';
import { GITHUB_CONFIG } from 'src/effects/github-config';
diff --git a/ts/packages/cli/src/services/user-context.ts b/ts/packages/cli/src/services/user-context.ts
index 971a0b214..4cab149b6 100644
--- a/ts/packages/cli/src/services/user-context.ts
+++ b/ts/packages/cli/src/services/user-context.ts
@@ -1,4 +1,5 @@
-import { FileSystem, Path } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
import { Effect, Context, Layer, Option, Predicate, Schema } from 'effect';
import {
type UserDataWithDefaults,
diff --git a/ts/packages/cli/src/utils/atomic-replace.ts b/ts/packages/cli/src/utils/atomic-replace.ts
index 82a26b501..e35a61c7c 100644
--- a/ts/packages/cli/src/utils/atomic-replace.ts
+++ b/ts/packages/cli/src/utils/atomic-replace.ts
@@ -1,4 +1,5 @@
-import { FileSystem, Path } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
import { Data, Effect, Scope } from 'effect';
export class AtomicReplaceError extends Data.TaggedError('utils/AtomicReplaceError')<{
diff --git a/ts/packages/cli/src/utils/atomic-write.ts b/ts/packages/cli/src/utils/atomic-write.ts
index 0ada3d1a5..bd7ba6154 100644
--- a/ts/packages/cli/src/utils/atomic-write.ts
+++ b/ts/packages/cli/src/utils/atomic-write.ts
@@ -11,7 +11,7 @@
* original error propagates, so no tmp litter is left next to the target.
*/
-import type { FileSystem } from '@effect/platform';
+import type * as FileSystem from '@effect/platform/FileSystem';
import type { PlatformError } from '@effect/platform/Error';
import { Effect, Either, Option, Predicate } from 'effect';
diff --git a/ts/packages/cli/src/utils/get-ancestors.ts b/ts/packages/cli/src/utils/get-ancestors.ts
index e7cc52bc3..970abfaa8 100644
--- a/ts/packages/cli/src/utils/get-ancestors.ts
+++ b/ts/packages/cli/src/utils/get-ancestors.ts
@@ -1,4 +1,4 @@
-import { Path } from '@effect/platform';
+import * as Path from '@effect/platform/Path';
import { Effect } from 'effect';
/**
diff --git a/ts/packages/cli/test/__utils__/services/test-layer.ts b/ts/packages/cli/test/__utils__/services/test-layer.ts
index b75417e4d..49568e523 100644
--- a/ts/packages/cli/test/__utils__/services/test-layer.ts
+++ b/ts/packages/cli/test/__utils__/services/test-layer.ts
@@ -3,8 +3,13 @@ import * as tempy from 'tempy';
import { Composio as RawComposioClient } from '@composio/client';
import type { AuthConfigCreateParams } from '@composio/client/resources/auth-configs';
import { CliApp, CliConfig } from '@effect/cli';
-import { Command, FetchHttpClient, FileSystem, Path } from '@effect/platform';
-import { BunFileSystem, BunContext, BunPath } from '@effect/platform-bun';
+import * as Command from '@effect/platform/Command';
+import * as FetchHttpClient from '@effect/platform/FetchHttpClient';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
+import * as BunContext from '@effect/platform-bun/BunContext';
+import * as BunPath from '@effect/platform-bun/BunPath';
import {
ConfigProvider,
Console,
@@ -72,7 +77,7 @@ import { ProjectContext } from 'src/services/project-context';
import { ProjectEnvironmentDetector } from 'src/services/project-environment-detector';
import { CommandRunner, type CommandRunnerShape } from 'src/services/command-runner';
import { TerminalUI } from 'src/services/terminal-ui';
-import { CommandExecutor } from '@effect/platform';
+import * as CommandExecutor from '@effect/platform/CommandExecutor';
import {
SetupSkillInstaller,
type SetupSkillInstallerShape,
diff --git a/ts/packages/cli/test/__utils__/typescript-compiler.ts b/ts/packages/cli/test/__utils__/typescript-compiler.ts
index b16317882..6d48d6d83 100644
--- a/ts/packages/cli/test/__utils__/typescript-compiler.ts
+++ b/ts/packages/cli/test/__utils__/typescript-compiler.ts
@@ -1,7 +1,8 @@
import { describe, it, expect, vi } from 'vitest';
import { Effect, Stream, String } from 'effect';
-import { Command, Path } from '@effect/platform';
-import { BunPath } from '@effect/platform-bun';
+import * as Command from '@effect/platform/Command';
+import * as Path from '@effect/platform/Path';
+import * as BunPath from '@effect/platform-bun/BunPath';
import ts from 'typescript';
import {
buildVirtualFileMap,
diff --git a/ts/packages/cli/test/__utils__/vitest.global-setup.ts b/ts/packages/cli/test/__utils__/vitest.global-setup.ts
index 246cddfb2..d5f5d2b9a 100644
--- a/ts/packages/cli/test/__utils__/vitest.global-setup.ts
+++ b/ts/packages/cli/test/__utils__/vitest.global-setup.ts
@@ -1,5 +1,7 @@
-import { BunFileSystem, BunContext } from '@effect/platform-bun';
-import { Command, FileSystem } from '@effect/platform';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
+import * as BunContext from '@effect/platform-bun/BunContext';
+import * as Command from '@effect/platform/Command';
+import * as FileSystem from '@effect/platform/FileSystem';
import { Effect, Option, Logger, LogLevel } from 'effect';
import path from 'node:path';
diff --git a/ts/packages/cli/test/__utils__/vitest.setup.ts b/ts/packages/cli/test/__utils__/vitest.setup.ts
index 5f269218c..d1b78e652 100644
--- a/ts/packages/cli/test/__utils__/vitest.setup.ts
+++ b/ts/packages/cli/test/__utils__/vitest.setup.ts
@@ -1,5 +1,5 @@
-import { FileSystem } from '@effect/platform';
-import { BunFileSystem } from '@effect/platform-bun';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
import { Effect } from 'effect';
import { afterEach, beforeEach, vi } from 'vitest';
diff --git a/ts/packages/cli/test/src/analytics.dispatch.test.ts b/ts/packages/cli/test/src/analytics.dispatch.test.ts
index abc986cc9..ff8e56b00 100644
--- a/ts/packages/cli/test/src/analytics.dispatch.test.ts
+++ b/ts/packages/cli/test/src/analytics.dispatch.test.ts
@@ -1,7 +1,10 @@
import { describe, expect, it } from '@effect/vitest';
import { afterEach, beforeEach, vi } from 'vitest';
-import { FetchHttpClient, FileSystem, Path } from '@effect/platform';
-import { BunFileSystem, BunPath } from '@effect/platform-bun';
+import * as FetchHttpClient from '@effect/platform/FetchHttpClient';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
+import * as BunPath from '@effect/platform-bun/BunPath';
import { Effect, Layer } from 'effect';
import { mkdirSync, rmSync, writeFileSync } from 'node:fs';
import path from 'node:path';
diff --git a/ts/packages/cli/test/src/analytics.events.test.ts b/ts/packages/cli/test/src/analytics.events.test.ts
index 814c22222..c402663ae 100644
--- a/ts/packages/cli/test/src/analytics.events.test.ts
+++ b/ts/packages/cli/test/src/analytics.events.test.ts
@@ -3,7 +3,8 @@ import path from 'node:path';
import * as tempy from 'tempy';
import { it } from '@effect/vitest';
import { afterEach, describe, expect, vi } from 'vitest';
-import { BunFileSystem, BunPath } from '@effect/platform-bun';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
+import * as BunPath from '@effect/platform-bun/BunPath';
import { Effect, Layer } from 'effect';
import { createCliCodactFailureBody } from 'src/analytics/dispatch';
import {
diff --git a/ts/packages/cli/test/src/commands/agent.cmd.test.ts b/ts/packages/cli/test/src/commands/agent.cmd.test.ts
index e50fcdd80..177529592 100644
--- a/ts/packages/cli/test/src/commands/agent.cmd.test.ts
+++ b/ts/packages/cli/test/src/commands/agent.cmd.test.ts
@@ -1,5 +1,5 @@
import { describe, expect, layer } from '@effect/vitest';
-import { FileSystem } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
import { Effect, Option } from 'effect';
import path from 'node:path';
import { afterEach, vi } from 'vitest';
diff --git a/ts/packages/cli/test/src/commands/config/config.experimental.cmd.test.ts b/ts/packages/cli/test/src/commands/config/config.experimental.cmd.test.ts
index 33fa03c51..5d81c88a9 100644
--- a/ts/packages/cli/test/src/commands/config/config.experimental.cmd.test.ts
+++ b/ts/packages/cli/test/src/commands/config/config.experimental.cmd.test.ts
@@ -1,5 +1,7 @@
-import { FileSystem, Path } from '@effect/platform';
-import { BunFileSystem, BunPath } from '@effect/platform-bun';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
+import * as BunPath from '@effect/platform-bun/BunPath';
import { ValidationError } from '@effect/cli';
import { describe, expect, it, layer } from '@effect/vitest';
import { Cause, Effect, Exit, Layer } from 'effect';
diff --git a/ts/packages/cli/test/src/commands/generate.cmd.test.ts b/ts/packages/cli/test/src/commands/generate.cmd.test.ts
index 0a0d2f03a..ec590499a 100644
--- a/ts/packages/cli/test/src/commands/generate.cmd.test.ts
+++ b/ts/packages/cli/test/src/commands/generate.cmd.test.ts
@@ -1,7 +1,7 @@
import path from 'node:path';
import { describe, expect, layer } from '@effect/vitest';
import { Effect } from 'effect';
-import { FileSystem } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
import { NodeProcess } from 'src/services/node-process';
import { cli, TestLive, MockConsole } from 'test/__utils__';
import { makeTestToolkits } from 'test/__utils__/models/toolkits';
diff --git a/ts/packages/cli/test/src/commands/install.cmd.test.ts b/ts/packages/cli/test/src/commands/install.cmd.test.ts
index 6b4552fd9..8965dd590 100644
--- a/ts/packages/cli/test/src/commands/install.cmd.test.ts
+++ b/ts/packages/cli/test/src/commands/install.cmd.test.ts
@@ -3,7 +3,7 @@ import { Writable } from 'node:stream';
import { beforeEach, vi } from 'vitest';
import { describe, expect, layer } from '@effect/vitest';
import { ConfigProvider, Effect, Exit } from 'effect';
-import { FileSystem } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
import { NodeOs } from 'src/services/node-os';
import {
installShellIntegration,
diff --git a/ts/packages/cli/test/src/commands/login.cmd.test.ts b/ts/packages/cli/test/src/commands/login.cmd.test.ts
index 3ad0fade5..fb2c61870 100644
--- a/ts/packages/cli/test/src/commands/login.cmd.test.ts
+++ b/ts/packages/cli/test/src/commands/login.cmd.test.ts
@@ -3,7 +3,7 @@ import { vi, afterEach } from 'vitest';
import { Console, DateTime, Effect, Exit, Option } from 'effect';
import { HelpDoc, ValidationError } from '@effect/cli';
import path from 'node:path';
-import { FileSystem } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
import { cli, MockConsole, TestLive } from 'test/__utils__';
import { terminalUITestImpl } from 'test/__utils__/services/terminal-ui-test';
import * as constants from 'src/constants';
diff --git a/ts/packages/cli/test/src/commands/logout.cmd.test.ts b/ts/packages/cli/test/src/commands/logout.cmd.test.ts
index e7a4e7cc8..ec711d434 100644
--- a/ts/packages/cli/test/src/commands/logout.cmd.test.ts
+++ b/ts/packages/cli/test/src/commands/logout.cmd.test.ts
@@ -1,5 +1,5 @@
import { describe, expect, layer } from '@effect/vitest';
-import { FileSystem } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
import { ConfigProvider, Console, Effect, Option } from 'effect';
import path from 'node:path';
import * as constants from 'src/constants';
diff --git a/ts/packages/cli/test/src/commands/py/py.generate.cmd.test.ts b/ts/packages/cli/test/src/commands/py/py.generate.cmd.test.ts
index fc74d6d5b..17159141a 100644
--- a/ts/packages/cli/test/src/commands/py/py.generate.cmd.test.ts
+++ b/ts/packages/cli/test/src/commands/py/py.generate.cmd.test.ts
@@ -3,7 +3,7 @@ import path from 'node:path';
import { HelpDoc, ValidationError } from '@effect/cli';
import { describe, expect, layer } from '@effect/vitest';
import { Effect } from 'effect';
-import { FileSystem } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
import { cli, TestLive } from 'test/__utils__';
import { makeTestToolkits } from 'test/__utils__/models/toolkits';
import { NodeProcess } from 'src/services/node-process';
diff --git a/ts/packages/cli/test/src/commands/run.cmd.test.ts b/ts/packages/cli/test/src/commands/run.cmd.test.ts
index fcbd76198..bb7e66413 100644
--- a/ts/packages/cli/test/src/commands/run.cmd.test.ts
+++ b/ts/packages/cli/test/src/commands/run.cmd.test.ts
@@ -3,8 +3,10 @@ import * as os from 'node:os';
import * as path from 'node:path';
import { pathToFileURL } from 'node:url';
import { describe, expect, layer } from '@effect/vitest';
-import { Command as PlatformCommand, CommandExecutor, Path } from '@effect/platform';
-import { BunContext } from '@effect/platform-bun';
+import * as PlatformCommand from '@effect/platform/Command';
+import * as CommandExecutor from '@effect/platform/CommandExecutor';
+import * as Path from '@effect/platform/Path';
+import * as BunContext from '@effect/platform-bun/BunContext';
import {
Cause,
ConfigProvider,
diff --git a/ts/packages/cli/test/src/commands/setup.cmd.test.ts b/ts/packages/cli/test/src/commands/setup.cmd.test.ts
index cea385e1f..7cd2a219e 100644
--- a/ts/packages/cli/test/src/commands/setup.cmd.test.ts
+++ b/ts/packages/cli/test/src/commands/setup.cmd.test.ts
@@ -1,4 +1,5 @@
-import { Command, CommandExecutor } from '@effect/platform';
+import * as Command from '@effect/platform/Command';
+import * as CommandExecutor from '@effect/platform/CommandExecutor';
import { describe, expect, layer } from '@effect/vitest';
import { Cause, Effect, Exit, Fiber, TestClock } from 'effect';
import { afterEach, vi } from 'vitest';
diff --git a/ts/packages/cli/test/src/commands/setup.telemetry.cmd.test.ts b/ts/packages/cli/test/src/commands/setup.telemetry.cmd.test.ts
index d62af142b..65f78189f 100644
--- a/ts/packages/cli/test/src/commands/setup.telemetry.cmd.test.ts
+++ b/ts/packages/cli/test/src/commands/setup.telemetry.cmd.test.ts
@@ -1,4 +1,5 @@
-import { Command, CommandExecutor } from '@effect/platform';
+import * as Command from '@effect/platform/Command';
+import * as CommandExecutor from '@effect/platform/CommandExecutor';
import { describe, expect, layer } from '@effect/vitest';
import { Effect, Exit } from 'effect';
import { afterEach, beforeEach, vi } from 'vitest';
diff --git a/ts/packages/cli/test/src/commands/ts/ts.generate.cmd.test.ts b/ts/packages/cli/test/src/commands/ts/ts.generate.cmd.test.ts
index 587dabafc..c772c98f6 100644
--- a/ts/packages/cli/test/src/commands/ts/ts.generate.cmd.test.ts
+++ b/ts/packages/cli/test/src/commands/ts/ts.generate.cmd.test.ts
@@ -3,7 +3,7 @@ import path from 'node:path';
import { HelpDoc, ValidationError } from '@effect/cli';
import { describe, expect, layer } from '@effect/vitest';
import { Effect } from 'effect';
-import { FileSystem } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
import { cli, TestLive } from 'test/__utils__';
import { makeTestToolkits } from 'test/__utils__/models/toolkits';
import { NodeProcess } from 'src/services/node-process';
diff --git a/ts/packages/cli/test/src/effect-errors/cause-characterization.test.ts b/ts/packages/cli/test/src/effect-errors/cause-characterization.test.ts
index cb95e20ec..eda22ae3e 100644
--- a/ts/packages/cli/test/src/effect-errors/cause-characterization.test.ts
+++ b/ts/packages/cli/test/src/effect-errors/cause-characterization.test.ts
@@ -1,5 +1,6 @@
import { describe, expect, it } from '@effect/vitest';
-import { BunFileSystem, BunPath } from '@effect/platform-bun';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
+import * as BunPath from '@effect/platform-bun/BunPath';
import { Cause, Data, Effect, FiberId } from 'effect';
import { captureErrors } from 'src/effect-errors/capture-errors';
diff --git a/ts/packages/cli/test/src/effect-errors/get-sources-from-map-file.test.ts b/ts/packages/cli/test/src/effect-errors/get-sources-from-map-file.test.ts
index 0136f4533..c66e54a50 100644
--- a/ts/packages/cli/test/src/effect-errors/get-sources-from-map-file.test.ts
+++ b/ts/packages/cli/test/src/effect-errors/get-sources-from-map-file.test.ts
@@ -1,5 +1,7 @@
-import { FileSystem, Path } from '@effect/platform';
-import { BunFileSystem, BunPath } from '@effect/platform-bun';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
+import * as BunPath from '@effect/platform-bun/BunPath';
import { describe, expect, it } from '@effect/vitest';
import { Cause, Effect, Layer, Scope } from 'effect';
import { type RawSourceMap, SourceMapConsumer } from 'source-map-js';
diff --git a/ts/packages/cli/test/src/effects/install-skill.test.ts b/ts/packages/cli/test/src/effects/install-skill.test.ts
index a8c5c48a7..0a46b4090 100644
--- a/ts/packages/cli/test/src/effects/install-skill.test.ts
+++ b/ts/packages/cli/test/src/effects/install-skill.test.ts
@@ -1,8 +1,12 @@
import { describe, expect, it, vi } from '@effect/vitest';
import { Config, ConfigProvider, Effect, Exit, Layer } from 'effect';
-import { FetchHttpClient, FileSystem, HttpClient, Path } from '@effect/platform';
+import * as FetchHttpClient from '@effect/platform/FetchHttpClient';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as HttpClient from '@effect/platform/HttpClient';
+import * as Path from '@effect/platform/Path';
import type * as PlatformError from '@effect/platform/Error';
-import { BunFileSystem, BunPath } from '@effect/platform-bun';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
+import * as BunPath from '@effect/platform-bun/BunPath';
import * as tempy from 'tempy';
import { TerminalUITest } from 'test/__utils__/services/terminal-ui-test';
import { startTestHttpServer } from 'test/__utils__/http-server';
diff --git a/ts/packages/cli/test/src/effects/resolve-cli-release.test.ts b/ts/packages/cli/test/src/effects/resolve-cli-release.test.ts
index 46a3c170f..fcde5d171 100644
--- a/ts/packages/cli/test/src/effects/resolve-cli-release.test.ts
+++ b/ts/packages/cli/test/src/effects/resolve-cli-release.test.ts
@@ -1,6 +1,7 @@
import { describe, expect, it } from '@effect/vitest';
import { Effect } from 'effect';
-import { HttpClient, HttpClientResponse } from '@effect/platform';
+import * as HttpClient from '@effect/platform/HttpClient';
+import * as HttpClientResponse from '@effect/platform/HttpClientResponse';
import { fetchLatestCliRelease, type GitHubRelease } from 'src/effects/resolve-cli-release';
const githubConfig = {
diff --git a/ts/packages/cli/test/src/effects/toolkit-from-tool-slug.test.ts b/ts/packages/cli/test/src/effects/toolkit-from-tool-slug.test.ts
index 54e7817d2..0b8a52471 100644
--- a/ts/packages/cli/test/src/effects/toolkit-from-tool-slug.test.ts
+++ b/ts/packages/cli/test/src/effects/toolkit-from-tool-slug.test.ts
@@ -1,6 +1,6 @@
import { describe, expect, it } from '@effect/vitest';
-import { FileSystem } from '@effect/platform';
-import { BunFileSystem } from '@effect/platform-bun';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
import { ConfigProvider, DateTime, Effect, Layer, Schedule } from 'effect';
import * as tempy from 'tempy';
import { toolkitFromToolSlug } from 'src/effects/toolkit-from-tool-slug';
diff --git a/ts/packages/cli/test/src/generation/safe-output-path.test.ts b/ts/packages/cli/test/src/generation/safe-output-path.test.ts
index 1219b98d1..618904d83 100644
--- a/ts/packages/cli/test/src/generation/safe-output-path.test.ts
+++ b/ts/packages/cli/test/src/generation/safe-output-path.test.ts
@@ -1,6 +1,6 @@
import path from 'node:path';
import { describe, expect, it, assert } from '@effect/vitest';
-import { BunPath } from '@effect/platform-bun';
+import * as BunPath from '@effect/platform-bun/BunPath';
import { Effect, Either } from 'effect';
import { safeOutputPath, SafeOutputPathError } from 'src/generation/safe-output-path';
diff --git a/ts/packages/cli/test/src/generation/typescript/generate.test.ts b/ts/packages/cli/test/src/generation/typescript/generate.test.ts
index 230407a61..39d471531 100644
--- a/ts/packages/cli/test/src/generation/typescript/generate.test.ts
+++ b/ts/packages/cli/test/src/generation/typescript/generate.test.ts
@@ -1,5 +1,5 @@
import { describe, expect, it } from '@effect/vitest';
-import { BunPath } from '@effect/platform-bun';
+import * as BunPath from '@effect/platform-bun/BunPath';
import { createToolkitIndex } from 'src/generation/create-toolkit-index';
import { generateTypeScriptSources } from 'src/generation/typescript/generate';
import { makeTestToolkits } from 'test/__utils__/models/toolkits';
diff --git a/ts/packages/cli/test/src/services/cli-session-artifacts.test.ts b/ts/packages/cli/test/src/services/cli-session-artifacts.test.ts
index 4c86ca008..3d86a432d 100644
--- a/ts/packages/cli/test/src/services/cli-session-artifacts.test.ts
+++ b/ts/packages/cli/test/src/services/cli-session-artifacts.test.ts
@@ -1,4 +1,5 @@
-import { FileSystem, Path } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
import { describe, expect, layer } from '@effect/vitest';
import { afterEach, beforeEach, vi } from 'vitest';
import { ConfigProvider, Effect, Option } from 'effect';
diff --git a/ts/packages/cli/test/src/services/cli-user-config.test.ts b/ts/packages/cli/test/src/services/cli-user-config.test.ts
index e1abd448b..81e63739c 100644
--- a/ts/packages/cli/test/src/services/cli-user-config.test.ts
+++ b/ts/packages/cli/test/src/services/cli-user-config.test.ts
@@ -3,8 +3,9 @@ import * as tempy from 'tempy';
import fs from 'node:fs';
import { describe, it, vi } from '@effect/vitest';
import { assertEquals } from '@effect/vitest/utils';
-import { FileSystem } from '@effect/platform';
-import { BunFileSystem, BunPath } from '@effect/platform-bun';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
+import * as BunPath from '@effect/platform-bun/BunPath';
import { ConfigProvider, Effect, Layer } from 'effect';
import { extendConfigProvider } from 'src/services/config';
import { defaultNodeOs, NodeOs } from 'src/services/node-os';
diff --git a/ts/packages/cli/test/src/services/composio-client-singleton.test.ts b/ts/packages/cli/test/src/services/composio-client-singleton.test.ts
index a51400ea5..a38e97ad7 100644
--- a/ts/packages/cli/test/src/services/composio-client-singleton.test.ts
+++ b/ts/packages/cli/test/src/services/composio-client-singleton.test.ts
@@ -1,6 +1,8 @@
import { afterEach, beforeAll, describe, expect, it, vi } from '@effect/vitest';
-import { FileSystem, Path } from '@effect/platform';
-import { BunFileSystem, BunPath } from '@effect/platform-bun';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
+import * as BunPath from '@effect/platform-bun/BunPath';
import { ConfigProvider, Effect, Layer } from 'effect';
import { execSync } from 'node:child_process';
import * as tempy from 'tempy';
diff --git a/ts/packages/cli/test/src/services/composio-clients-cached.test.ts b/ts/packages/cli/test/src/services/composio-clients-cached.test.ts
index 6bf99d00e..272410b87 100644
--- a/ts/packages/cli/test/src/services/composio-clients-cached.test.ts
+++ b/ts/packages/cli/test/src/services/composio-clients-cached.test.ts
@@ -2,8 +2,8 @@ import { describe, expect, it } from '@effect/vitest';
import { ConfigProvider, DateTime, Effect, Layer } from 'effect';
import * as tempy from 'tempy';
import { ComposioToolkitsRepository, HttpServerError } from 'src/services/composio-clients';
-import { FileSystem } from '@effect/platform';
-import { BunFileSystem } from '@effect/platform-bun';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
import {
CACHE_FILES,
ComposioToolkitsRepositoryCached,
diff --git a/ts/packages/cli/test/src/services/consumer-short-term-cache.test.ts b/ts/packages/cli/test/src/services/consumer-short-term-cache.test.ts
index 01381d53a..5fb1b43cb 100644
--- a/ts/packages/cli/test/src/services/consumer-short-term-cache.test.ts
+++ b/ts/packages/cli/test/src/services/consumer-short-term-cache.test.ts
@@ -1,6 +1,6 @@
import { describe, expect, layer } from '@effect/vitest';
import { vi, beforeEach, afterEach } from 'vitest';
-import { FileSystem } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
import { ConfigProvider, DateTime, Effect, Option } from 'effect';
import path from 'node:path';
import { setupCacheDir } from 'src/effects/setup-cache-dir';
diff --git a/ts/packages/cli/test/src/services/js-package-manager-detector.test.ts b/ts/packages/cli/test/src/services/js-package-manager-detector.test.ts
index 58f7358b3..6bc0753ba 100644
--- a/ts/packages/cli/test/src/services/js-package-manager-detector.test.ts
+++ b/ts/packages/cli/test/src/services/js-package-manager-detector.test.ts
@@ -1,6 +1,6 @@
import { describe, expect, layer } from '@effect/vitest';
-import { BunFileSystem } from '@effect/platform-bun';
-import { FileSystem } from '@effect/platform';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
+import * as FileSystem from '@effect/platform/FileSystem';
import { Effect, Layer } from 'effect';
import * as tempy from 'tempy';
import { JsPackageManagerDetector } from 'src/services/js-package-manager-detector';
diff --git a/ts/packages/cli/test/src/services/native-ui-sidecar.test.ts b/ts/packages/cli/test/src/services/native-ui-sidecar.test.ts
index 2312509d1..f6f6b0404 100644
--- a/ts/packages/cli/test/src/services/native-ui-sidecar.test.ts
+++ b/ts/packages/cli/test/src/services/native-ui-sidecar.test.ts
@@ -1,5 +1,6 @@
import { describe, expect, it } from '@effect/vitest';
-import { CommandExecutor, Error as PlatformError } from '@effect/platform';
+import * as CommandExecutor from '@effect/platform/CommandExecutor';
+import * as PlatformError from '@effect/platform/Error';
import { ConfigProvider, Effect, Layer } from 'effect';
import {
detectNativeUiCallerAgentEffect,
diff --git a/ts/packages/cli/test/src/services/plugin-hint.test.ts b/ts/packages/cli/test/src/services/plugin-hint.test.ts
index 0f41b6e47..877de084c 100644
--- a/ts/packages/cli/test/src/services/plugin-hint.test.ts
+++ b/ts/packages/cli/test/src/services/plugin-hint.test.ts
@@ -1,5 +1,6 @@
import { afterEach, beforeEach, describe, expect, it, vi } from '@effect/vitest';
-import { BunFileSystem, BunPath } from '@effect/platform-bun';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
+import * as BunPath from '@effect/platform-bun/BunPath';
import { ConfigProvider, Effect, Layer } from 'effect';
import { existsSync, mkdirSync, mkdtempSync, rmSync, utimesSync, writeFileSync } from 'node:fs';
import { tmpdir } from 'node:os';
diff --git a/ts/packages/cli/test/src/services/project-environment-detector.test.ts b/ts/packages/cli/test/src/services/project-environment-detector.test.ts
index a9cf5ad30..70c3d677c 100644
--- a/ts/packages/cli/test/src/services/project-environment-detector.test.ts
+++ b/ts/packages/cli/test/src/services/project-environment-detector.test.ts
@@ -3,8 +3,8 @@ import * as tempy from 'tempy';
import { describe, expect, layer, assert } from '@effect/vitest';
import { beforeAll, afterAll } from 'vitest';
import { Effect, Layer, Either } from 'effect';
-import { FileSystem } from '@effect/platform';
-import { BunFileSystem } from '@effect/platform-bun';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
import {
ProjectEnvironmentDetector,
ProjectEnvironmentDetectorError,
diff --git a/ts/packages/cli/test/src/services/run-companion-modules.test.ts b/ts/packages/cli/test/src/services/run-companion-modules.test.ts
index cef0d8335..111d590d0 100644
--- a/ts/packages/cli/test/src/services/run-companion-modules.test.ts
+++ b/ts/packages/cli/test/src/services/run-companion-modules.test.ts
@@ -1,7 +1,7 @@
import * as fs from 'node:fs';
import * as os from 'node:os';
import * as path from 'node:path';
-import { BunContext } from '@effect/platform-bun';
+import * as BunContext from '@effect/platform-bun/BunContext';
import { afterEach, describe, expect, it, layer } from '@effect/vitest';
import { Effect } from 'effect';
import { vi } from 'vitest';
diff --git a/ts/packages/cli/test/src/services/run-subagent-acp.test.ts b/ts/packages/cli/test/src/services/run-subagent-acp.test.ts
index b92e86d67..198f13fd7 100644
--- a/ts/packages/cli/test/src/services/run-subagent-acp.test.ts
+++ b/ts/packages/cli/test/src/services/run-subagent-acp.test.ts
@@ -2,7 +2,7 @@ import * as fs from 'node:fs';
import * as os from 'node:os';
import * as path from 'node:path';
import { Readable } from 'node:stream';
-import { BunContext } from '@effect/platform-bun';
+import * as BunContext from '@effect/platform-bun/BunContext';
import { Effect } from 'effect';
import { afterEach, describe, expect, it, vi } from '@effect/vitest';
import {
diff --git a/ts/packages/cli/test/src/services/running-cli-version.test.ts b/ts/packages/cli/test/src/services/running-cli-version.test.ts
index bb512b991..0d94ae4ef 100644
--- a/ts/packages/cli/test/src/services/running-cli-version.test.ts
+++ b/ts/packages/cli/test/src/services/running-cli-version.test.ts
@@ -1,5 +1,7 @@
-import { FileSystem, Path } from '@effect/platform';
-import { BunFileSystem, BunPath } from '@effect/platform-bun';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
+import * as BunPath from '@effect/platform-bun/BunPath';
import { describe, expect, layer } from '@effect/vitest';
import { Effect, Layer } from 'effect';
import {
diff --git a/ts/packages/cli/test/src/services/setup-skill-installer.test.ts b/ts/packages/cli/test/src/services/setup-skill-installer.test.ts
index 89aa011a3..910bb24c2 100644
--- a/ts/packages/cli/test/src/services/setup-skill-installer.test.ts
+++ b/ts/packages/cli/test/src/services/setup-skill-installer.test.ts
@@ -1,5 +1,9 @@
-import { FileSystem, HttpClient, HttpClientResponse, Path } from '@effect/platform';
-import { BunFileSystem, BunPath } from '@effect/platform-bun';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as HttpClient from '@effect/platform/HttpClient';
+import * as HttpClientResponse from '@effect/platform/HttpClientResponse';
+import * as Path from '@effect/platform/Path';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
+import * as BunPath from '@effect/platform-bun/BunPath';
import { describe, expect, layer } from '@effect/vitest';
import { Effect, Layer } from 'effect';
import * as tempy from 'tempy';
diff --git a/ts/packages/cli/test/src/services/tool-file-uploads.test.ts b/ts/packages/cli/test/src/services/tool-file-uploads.test.ts
index 21666f261..e7913fc52 100644
--- a/ts/packages/cli/test/src/services/tool-file-uploads.test.ts
+++ b/ts/packages/cli/test/src/services/tool-file-uploads.test.ts
@@ -2,8 +2,10 @@ import { afterEach, describe, expect, it, vi } from '@effect/vitest';
import * as os from 'node:os';
import * as path from 'node:path';
import { mkdtempSync, rmSync, writeFileSync } from 'node:fs';
-import { FileSystem, Path } from '@effect/platform';
-import { BunFileSystem, BunPath } from '@effect/platform-bun';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
+import * as BunPath from '@effect/platform-bun/BunPath';
import { Effect, Layer } from 'effect';
import { Composio as RawComposioClient } from '@composio/client';
import {
diff --git a/ts/packages/cli/test/src/services/tool-input-validation.test.ts b/ts/packages/cli/test/src/services/tool-input-validation.test.ts
index 8c7a5f0ff..c239d22ae 100644
--- a/ts/packages/cli/test/src/services/tool-input-validation.test.ts
+++ b/ts/packages/cli/test/src/services/tool-input-validation.test.ts
@@ -1,7 +1,8 @@
import fs from 'node:fs';
import path from 'node:path';
import { describe, expect, it } from '@effect/vitest';
-import { BunFileSystem, BunPath } from '@effect/platform-bun';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
+import * as BunPath from '@effect/platform-bun/BunPath';
import { ConfigProvider, Effect, Layer } from 'effect';
import * as tempy from 'tempy';
import {
diff --git a/ts/packages/cli/test/src/services/tool-permissions.test.ts b/ts/packages/cli/test/src/services/tool-permissions.test.ts
index 904309dca..b48535bb5 100644
--- a/ts/packages/cli/test/src/services/tool-permissions.test.ts
+++ b/ts/packages/cli/test/src/services/tool-permissions.test.ts
@@ -1,5 +1,7 @@
-import { FileSystem, Path } from '@effect/platform';
-import { BunFileSystem, BunPath } from '@effect/platform-bun';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
+import * as BunPath from '@effect/platform-bun/BunPath';
import { afterEach, beforeEach, describe, expect, it, vi } from '@effect/vitest';
import { Config, ConfigProvider, Effect, Layer, Option } from 'effect';
import {
diff --git a/ts/packages/cli/test/src/services/update-check.test.ts b/ts/packages/cli/test/src/services/update-check.test.ts
index 96b1e6583..058957f08 100644
--- a/ts/packages/cli/test/src/services/update-check.test.ts
+++ b/ts/packages/cli/test/src/services/update-check.test.ts
@@ -2,7 +2,8 @@ import { describe, it, expect, vi, beforeEach, afterEach } from '@effect/vitest'
import { mkdtempSync, mkdirSync, writeFileSync, readFileSync, existsSync, rmSync } from 'node:fs';
import { dirname, join } from 'node:path';
import { tmpdir } from 'node:os';
-import { BunFileSystem, BunPath } from '@effect/platform-bun';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
+import * as BunPath from '@effect/platform-bun/BunPath';
import { Effect, Fiber, Layer } from 'effect';
import { withHttpServerEffect } from 'test/__utils__/http-server';
import { getTerminalCapabilities, type TerminalUI } from 'src/services/terminal-ui';
diff --git a/ts/packages/cli/test/src/services/upgrade-binary.test.ts b/ts/packages/cli/test/src/services/upgrade-binary.test.ts
index b6bec8937..449faa218 100644
--- a/ts/packages/cli/test/src/services/upgrade-binary.test.ts
+++ b/ts/packages/cli/test/src/services/upgrade-binary.test.ts
@@ -1,8 +1,11 @@
import { describe, expect, it, vi } from '@effect/vitest';
import { ConfigProvider, Effect, Layer, Option } from 'effect';
-import { FetchHttpClient, FileSystem, Path } from '@effect/platform';
+import * as FetchHttpClient from '@effect/platform/FetchHttpClient';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
import * as PlatformError from '@effect/platform/Error';
-import { BunFileSystem, BunPath } from '@effect/platform-bun';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
+import * as BunPath from '@effect/platform-bun/BunPath';
import { withHttpServer } from 'test/__utils__/http-server';
import { getTerminalCapabilities, TerminalUI } from 'src/services/terminal-ui';
import {
diff --git a/ts/packages/cli/test/src/services/user-context.test.ts b/ts/packages/cli/test/src/services/user-context.test.ts
index 97eb14fa5..f131be32c 100644
--- a/ts/packages/cli/test/src/services/user-context.test.ts
+++ b/ts/packages/cli/test/src/services/user-context.test.ts
@@ -1,7 +1,8 @@
import { describe, it } from '@effect/vitest';
import { assertEquals } from '@effect/vitest/utils';
-import { FileSystem } from '@effect/platform';
-import { BunFileSystem, BunPath } from '@effect/platform-bun';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
+import * as BunPath from '@effect/platform-bun/BunPath';
import { ConfigProvider, Effect, Layer, Option, Data } from 'effect';
import * as tempy from 'tempy';
import { ComposioUserContext, rawComposioUserContextLive } from 'src/services/user-context';
diff --git a/ts/packages/cli/test/src/utils/atomic-replace.test.ts b/ts/packages/cli/test/src/utils/atomic-replace.test.ts
index 570b0e5ad..f12a4423b 100644
--- a/ts/packages/cli/test/src/utils/atomic-replace.test.ts
+++ b/ts/packages/cli/test/src/utils/atomic-replace.test.ts
@@ -1,6 +1,8 @@
-import { FileSystem, Path } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
import * as PlatformError from '@effect/platform/Error';
-import { BunFileSystem, BunPath } from '@effect/platform-bun';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
+import * as BunPath from '@effect/platform-bun/BunPath';
import { describe, expect, layer } from '@effect/vitest';
import { Effect, Layer, Option } from 'effect';
import {
diff --git a/ts/packages/cli/test/src/utils/atomic-write.test.ts b/ts/packages/cli/test/src/utils/atomic-write.test.ts
index 150c3d420..3cbc4802c 100644
--- a/ts/packages/cli/test/src/utils/atomic-write.test.ts
+++ b/ts/packages/cli/test/src/utils/atomic-write.test.ts
@@ -1,6 +1,8 @@
-import { FileSystem, Path } from '@effect/platform';
+import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
import * as PlatformError from '@effect/platform/Error';
-import { BunFileSystem, BunPath } from '@effect/platform-bun';
+import * as BunFileSystem from '@effect/platform-bun/BunFileSystem';
+import * as BunPath from '@effect/platform-bun/BunPath';
import { describe, expect, layer } from '@effect/vitest';
import { Deferred, Effect, Fiber, Layer } from 'effect';
import { atomicWritePrivateFileString, ensurePrivateFileMode } from 'src/utils/atomic-write';