@devries-cameron20 / t3code-1 / commits / 9771c5fd2d
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

fix(server): Kiro, fx and Antigravity find a ~/ Binary path (#35171)

Julius Marminge committed Nov 12, 2026 at 03:31 UTC 9771c5fd2df6568c7a4ac8a2263ed1e58535f9b5
9 files changed +206 -5
apps/server/src/provider/AntigravityInstallation.test.ts
+5
@@ -810,6 +810,11 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("Antigravity inst
810 expect(yield* installation.resolve(executableName)).toMatchObject({
811 source: "override",
812 });
813 + expect(
814 + yield* installation
815 + .resolve(`~/external/${executableName}`)
816 + .pipe(Effect.provideService(HostProcess.HomeDirectory, baseDir)),
817 + ).toMatchObject({ source: "override", executablePath: externalExecutable });
818 yield* fs.remove(externalHarness);
819 expect(yield* installation.resolve(externalExecutable).pipe(Effect.flip)).toMatchObject({
820 operation: "resolve",
apps/server/src/provider/AntigravityInstallation.ts
+2 -1
@@ -1,6 +1,7 @@
1 // @effect-diagnostics nodeBuiltinImport:off - Effect has no incremental digest or free-space query.
2 import * as EffectNodeStream from "@effect/platform-node/NodeStream";
3 import { ProviderDriverKind, type ProviderInstallState } from "@t3tools/contracts";
4 +import { expandHomePath } from "@t3tools/provider-core/server/pathExpansion";
5 import * as HostProcess from "@t3tools/shared/HostProcess";
6 import { resolveNodeExecutable, nodeRuntimeUnavailableMessage } from "@t3tools/shared/nodeRuntime";
7 import { resolveCommandPath } from "@t3tools/shared/shell";
@@ -329,7 +330,7 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma
330 "AntigravityInstallation.resolve",
331 )(
332 function* (binaryPath?: string, processEnvironment?: NodeJS.ProcessEnv) {
332 - const override = binaryPath?.trim();
333 + const override = expandHomePath(binaryPath?.trim() ?? "", yield* HostProcess.HomeDirectory);
334 if (override) {
335 for (const candidate of yield* commandCandidates(override, processEnvironment)) {
336 const selected = yield* fromExternal(candidate, "override");
packages/provider-fx/package.json
+1
@@ -34,6 +34,7 @@
34 "devDependencies": {
35 "@effect/platform-node": "catalog:",
36 "@effect/vitest": "catalog:",
37 + "@t3tools/provider-testing": "workspace:*",
38 "@types/node": "catalog:",
39 "effect-acp": "workspace:*",
40 "vite-plus": "catalog:"
packages/provider-fx/src/server/driver.test.ts new
+81
@@ -0,0 +1,81 @@
1 +import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2 +import * as NodeServices from "@effect/platform-node/NodeServices";
3 +import { assert, it } from "@effect/vitest";
4 +import { ProviderInstanceId } from "@t3tools/contracts";
5 +import * as IdAllocator from "@t3tools/provider-core/server/IdAllocator";
6 +import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSessions";
7 +import * as ProviderEventLoggers from "@t3tools/provider-core/server/ProviderEventLoggers";
8 +import * as TestProviderHost from "@t3tools/provider-testing/TestProviderHost";
9 +import * as HostProcess from "@t3tools/shared/HostProcess";
10 +import * as Effect from "effect/Effect";
11 +import * as Layer from "effect/Layer";
12 +import * as Path from "effect/Path";
13 +import * as Schema from "effect/Schema";
14 +import * as Sink from "effect/Sink";
15 +import * as Stream from "effect/Stream";
16 +import * as ChildProcess from "effect/process/ChildProcess";
17 +import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner";
18 +
19 +import { FxSettings } from "../settings.ts";
20 +import { FxDriver } from "./driver.ts";
21 +
22 +const homeRelativeSettings = Schema.decodeSync(FxSettings)({ binaryPath: "~/.local/bin/fx" });
23 +
24 +const layerTest = TestProviderHost.layer({ runBackgroundWork: false }).pipe(
25 + Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
26 + Layer.provideMerge(IdAllocator.layer),
27 + Layer.provideMerge(McpProviderSessions.layer),
28 + Layer.provideMerge(
29 + Layer.succeed(
30 + ProviderEventLoggers.ProviderEventLoggers,
31 + ProviderEventLoggers.NoOpProviderEventLoggers,
32 + ),
33 + ),
34 +);
35 +
36 +/** Records each spawned command and answers only `--version`. */
37 +function recordingSpawner(launches: Array<string>) {
38 + return ChildProcessSpawner.make((command) => {
39 + const standard = ChildProcess.isStandardCommand(command);
40 + if (standard) launches.push(command.command);
41 + const version = standard && command.args.join(" ") === "--version";
42 + return Effect.succeed(
43 + ChildProcessSpawner.makeHandle({
44 + pid: ChildProcessSpawner.ProcessId(1),
45 + exitCode: Effect.succeed(ChildProcessSpawner.ExitCode(version ? 0 : 2)),
46 + isRunning: Effect.succeed(false),
47 + kill: () => Effect.void,
48 + unref: Effect.succeed(Effect.void),
49 + stdin: Sink.drain,
50 + stdout: version ? Stream.encodeText(Stream.make("fx 0.0.13\n")) : Stream.empty,
51 + stderr: Stream.empty,
52 + all: Stream.empty,
53 + getInputFd: () => Sink.drain,
54 + getOutputFd: () => Stream.empty,
55 + }),
56 + );
57 + });
58 +}
59 +
60 +it.layer(layerTest)("FxDriver binary path", (it) => {
61 + it.effect("probes a ~/ binary path from the home directory", () =>
62 + Effect.gen(function* () {
63 + const path = yield* Path.Path;
64 + const launches: Array<string> = [];
65 + const instance = yield* FxDriver.create({
66 + instanceId: ProviderInstanceId.make("fx-home"),
67 + displayName: undefined,
68 + enabled: true,
69 + environment: [],
70 + config: homeRelativeSettings,
71 + }).pipe(
72 + Effect.provideService(HostProcess.HomeDirectory, "/test-home"),
73 + Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, recordingSpawner(launches)),
74 + );
75 + const snapshot = yield* instance.snapshot.refresh;
76 + assert.isNotEmpty(launches);
77 + assert.deepEqual([...new Set(launches)], [path.join("/test-home", ".local", "bin", "fx")]);
78 + assert.isTrue(snapshot.installed);
79 + }).pipe(Effect.scoped),
80 + );
81 +});
packages/provider-fx/src/server/driver.ts
+14 -2
@@ -24,6 +24,7 @@ import {
24 } from "@t3tools/provider-core/server/driver";
25 import { withInstanceIdentity } from "@t3tools/provider-core/server/instanceIdentity";
26 import { mergeProviderInstanceEnvironment } from "@t3tools/provider-core/server/instanceEnvironment";
27 +import { expandHomePath } from "@t3tools/provider-core/server/pathExpansion";
28 import { discoverFxSkills } from "./skills.ts";
29 import { makeManualOnlyProviderMaintenanceCapabilities } from "@t3tools/provider-core/server/maintenanceResolver";
30 import {
@@ -103,7 +104,11 @@ export const FxDriver: ProviderDriver<FxSettings, FxDriverEnv> = {
104 accentColor,
105 continuationGroupKey: continuationIdentity.continuationKey,
106 });
106 - const effectiveConfig = { ...config, enabled } satisfies FxSettings;
107 + const effectiveConfig = {
108 + ...config,
109 + enabled,
110 + binaryPath: expandHomePath(config.binaryPath, yield* HostProcess.HomeDirectory),
111 + } satisfies FxSettings;
112 const snapshotSettings = yield* makeProviderSnapshotSettingsSource(effectiveConfig);
113 const snapshot = yield* makeManagedServerProvider<ProviderSnapshotSettings<FxSettings>>({
114 resolveMaintenance: () => Effect.succeed(MAINTENANCE),
@@ -132,7 +137,14 @@ export const FxDriver: ProviderDriver<FxSettings, FxDriverEnv> = {
137 const orchestrationAdapter = yield* makeFxAdapterV2Driver(
138 snapshot.getSnapshot.pipe(Effect.map((current) => fxDefaultModelId(current.models))),
139 )
135 - .create({ instanceId, displayName, accentColor, environment, enabled, config })
140 + .create({
141 + instanceId,
142 + displayName,
143 + accentColor,
144 + environment,
145 + enabled,
146 + config: effectiveConfig,
147 + })
148 .pipe(
149 Effect.mapError(
150 (cause) =>
packages/provider-kiro/package.json
+2
@@ -32,7 +32,9 @@
32 "effect": "catalog:"
33 },
34 "devDependencies": {
35 + "@effect/platform-node": "catalog:",
36 "@effect/vitest": "catalog:",
37 + "@t3tools/provider-testing": "workspace:*",
38 "@types/node": "catalog:",
39 "effect-acp": "workspace:*",
40 "vite-plus": "catalog:"
packages/provider-kiro/src/server/driver.test.ts
+78
@@ -1,8 +1,24 @@
1 +import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2 +import * as NodeServices from "@effect/platform-node/NodeServices";
3 import { assert, describe, it } from "@effect/vitest";
4 +import { ProviderInstanceId } from "@t3tools/contracts";
5 +import * as IdAllocator from "@t3tools/provider-core/server/IdAllocator";
6 +import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSessions";
7 +import * as ProviderEventLoggers from "@t3tools/provider-core/server/ProviderEventLoggers";
8 +import * as TestProviderHost from "@t3tools/provider-testing/TestProviderHost";
9 +import * as HostProcess from "@t3tools/shared/HostProcess";
10 +import * as Effect from "effect/Effect";
11 +import * as Layer from "effect/Layer";
12 +import * as Path from "effect/Path";
13 import * as Schema from "effect/Schema";
14 +import * as Sink from "effect/Sink";
15 +import * as Stream from "effect/Stream";
16 +import * as ChildProcess from "effect/process/ChildProcess";
17 +import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner";
18
19 import { KiroSettings } from "../settings.ts";
20 import { buildKiroAcpSpawnInput } from "./acpSupport.ts";
21 +import { KiroDriver } from "./driver.ts";
22 import { kiroAuthFromWhoami } from "./status.ts";
23
24 const decodeSettings = Schema.decodeUnknownSync(KiroSettings);
@@ -64,3 +80,65 @@ describe("KiroDriver", () => {
80 });
81 });
82 });
83 +
84 +const layerTest = TestProviderHost.layer({ runBackgroundWork: false }).pipe(
85 + Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
86 + Layer.provideMerge(IdAllocator.layer),
87 + Layer.provideMerge(McpProviderSessions.layer),
88 + Layer.provideMerge(
89 + Layer.succeed(
90 + ProviderEventLoggers.ProviderEventLoggers,
91 + ProviderEventLoggers.NoOpProviderEventLoggers,
92 + ),
93 + ),
94 +);
95 +
96 +/** Records each spawned command and answers only `--version`. */
97 +function recordingSpawner(launches: Array<string>) {
98 + return ChildProcessSpawner.make((command) => {
99 + const standard = ChildProcess.isStandardCommand(command);
100 + if (standard) launches.push(command.command);
101 + const version = standard && command.args.join(" ") === "--version";
102 + return Effect.succeed(
103 + ChildProcessSpawner.makeHandle({
104 + pid: ChildProcessSpawner.ProcessId(1),
105 + exitCode: Effect.succeed(ChildProcessSpawner.ExitCode(version ? 0 : 2)),
106 + isRunning: Effect.succeed(false),
107 + kill: () => Effect.void,
108 + unref: Effect.succeed(Effect.void),
109 + stdin: Sink.drain,
110 + stdout: version ? Stream.encodeText(Stream.make("2.32.0\n")) : Stream.empty,
111 + stderr: Stream.empty,
112 + all: Stream.empty,
113 + getInputFd: () => Sink.drain,
114 + getOutputFd: () => Stream.empty,
115 + }),
116 + );
117 + });
118 +}
119 +
120 +it.layer(layerTest)("KiroDriver binary path", (it) => {
121 + it.effect("probes a ~/ binary path from the home directory", () =>
122 + Effect.gen(function* () {
123 + const path = yield* Path.Path;
124 + const launches: Array<string> = [];
125 + const instance = yield* KiroDriver.create({
126 + instanceId: ProviderInstanceId.make("kiro-home"),
127 + displayName: undefined,
128 + enabled: true,
129 + environment: [],
130 + config: decodeSettings({ binaryPath: "~/.local/bin/kiro-cli" }),
131 + }).pipe(
132 + Effect.provideService(HostProcess.HomeDirectory, "/test-home"),
133 + Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, recordingSpawner(launches)),
134 + );
135 + const snapshot = yield* instance.snapshot.refresh;
136 + assert.isNotEmpty(launches);
137 + assert.deepEqual(
138 + [...new Set(launches)],
139 + [path.join("/test-home", ".local", "bin", "kiro-cli")],
140 + );
141 + assert.isTrue(snapshot.installed);
142 + }).pipe(Effect.scoped),
143 + );
144 +});
packages/provider-kiro/src/server/driver.ts
+14 -2
@@ -14,6 +14,7 @@ import {
14 } from "@t3tools/provider-core/server/driver";
15 import { ProviderDriverError } from "@t3tools/provider-core/server/errors";
16 import { mergeProviderInstanceEnvironment } from "@t3tools/provider-core/server/instanceEnvironment";
17 +import { expandHomePath } from "@t3tools/provider-core/server/pathExpansion";
18 import { withInstanceIdentity } from "@t3tools/provider-core/server/instanceIdentity";
19 import { makeManualOnlyProviderMaintenanceCapabilities } from "@t3tools/provider-core/server/maintenanceResolver";
20 import { makeManagedServerProvider } from "@t3tools/provider-core/server/managedProvider";
@@ -96,7 +97,11 @@ export const KiroDriver: ProviderDriver<KiroSettings, KiroDriverEnv> = {
97 accentColor,
98 continuationGroupKey: continuationIdentity.continuationKey,
99 });
99 - const effectiveConfig = { ...config, enabled } satisfies KiroSettings;
100 + const effectiveConfig = {
101 + ...config,
102 + enabled,
103 + binaryPath: expandHomePath(config.binaryPath, yield* HostProcess.HomeDirectory),
104 + } satisfies KiroSettings;
105 const snapshotSettings = yield* makeProviderSnapshotSettingsSource(effectiveConfig);
106 const snapshot = yield* makeManagedServerProvider<ProviderSnapshotSettings<KiroSettings>>({
107 resolveMaintenance: () => Effect.succeed(MAINTENANCE),
@@ -127,7 +132,14 @@ export const KiroDriver: ProviderDriver<KiroSettings, KiroDriverEnv> = {
132 const orchestrationAdapter = yield* makeKiroAdapterV2Driver(
133 snapshot.getSnapshot.pipe(Effect.map((current) => kiroDefaultModelId(current.models))),
134 )
130 - .create({ instanceId, displayName, accentColor, environment, enabled, config })
135 + .create({
136 + instanceId,
137 + displayName,
138 + accentColor,
139 + environment,
140 + enabled,
141 + config: effectiveConfig,
142 + })
143 .pipe(
144 Effect.mapError(
145 (cause) =>
pnpm-lock.yaml
+9
@@ -1787,6 +1787,9 @@ importers:
1787 '@effect/vitest':
1788 specifier: 4.1.2
1789 version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1790 + '@t3tools/provider-testing':
1791 + specifier: workspace:*
1792 + version: link:../provider-testing
1793 '@types/node':
1794 specifier: 24.12.4
1795 version: 24.12.4
@@ -1852,9 +1855,15 @@ importers:
1855 specifier: 4.1.2
1856 version: 4.1.2
1857 devDependencies:
1858 + '@effect/platform-node':
1859 + specifier: 4.1.2
1860 + version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
1861 '@effect/vitest':
1862 specifier: 4.1.2
1863 version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1864 + '@t3tools/provider-testing':
1865 + specifier: workspace:*
1866 + version: link:../provider-testing
1867 '@types/node':
1868 specifier: 24.12.4
1869 version: 24.12.4