Skip to content

Commit 9771c5f

Browse files
fix(server): Kiro, fx and Antigravity find a ~/ Binary path (#35171)
1 parent 3e03072 commit 9771c5f

9 files changed

Lines changed: 206 additions & 5 deletions

File tree

‎apps/server/src/provider/AntigravityInstallation.test.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -810,6 +810,11 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("Antigravity inst
810810
expect(yield* installation.resolve(executableName)).toMatchObject({
811811
source: "override",
812812
});
813+
expect(
814+
yield* installation
815+
.resolve(`~/external/${executableName}`)
816+
.pipe(Effect.provideService(HostProcess.HomeDirectory, baseDir)),
817+
).toMatchObject({ source: "override", executablePath: externalExecutable });
813818
yield* fs.remove(externalHarness);
814819
expect(yield* installation.resolve(externalExecutable).pipe(Effect.flip)).toMatchObject({
815820
operation: "resolve",

‎apps/server/src/provider/AntigravityInstallation.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// @effect-diagnostics nodeBuiltinImport:off - Effect has no incremental digest or free-space query.
22
import * as EffectNodeStream from "@effect/platform-node/NodeStream";
33
import { ProviderDriverKind, type ProviderInstallState } from "@t3tools/contracts";
4+
import { expandHomePath } from "@t3tools/provider-core/server/pathExpansion";
45
import * as HostProcess from "@t3tools/shared/HostProcess";
56
import { resolveNodeExecutable, nodeRuntimeUnavailableMessage } from "@t3tools/shared/nodeRuntime";
67
import { resolveCommandPath } from "@t3tools/shared/shell";
@@ -329,7 +330,7 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma
329330
"AntigravityInstallation.resolve",
330331
)(
331332
function* (binaryPath?: string, processEnvironment?: NodeJS.ProcessEnv) {
332-
const override = binaryPath?.trim();
333+
const override = expandHomePath(binaryPath?.trim() ?? "", yield* HostProcess.HomeDirectory);
333334
if (override) {
334335
for (const candidate of yield* commandCandidates(override, processEnvironment)) {
335336
const selected = yield* fromExternal(candidate, "override");

‎packages/provider-fx/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"devDependencies": {
3535
"@effect/platform-node": "catalog:",
3636
"@effect/vitest": "catalog:",
37+
"@t3tools/provider-testing": "workspace:*",
3738
"@types/node": "catalog:",
3839
"effect-acp": "workspace:*",
3940
"vite-plus": "catalog:"
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import {
2424
} from "@t3tools/provider-core/server/driver";
2525
import { withInstanceIdentity } from "@t3tools/provider-core/server/instanceIdentity";
2626
import { mergeProviderInstanceEnvironment } from "@t3tools/provider-core/server/instanceEnvironment";
27+
import { expandHomePath } from "@t3tools/provider-core/server/pathExpansion";
2728
import { discoverFxSkills } from "./skills.ts";
2829
import { makeManualOnlyProviderMaintenanceCapabilities } from "@t3tools/provider-core/server/maintenanceResolver";
2930
import {
@@ -103,7 +104,11 @@ export const FxDriver: ProviderDriver<FxSettings, FxDriverEnv> = {
103104
accentColor,
104105
continuationGroupKey: continuationIdentity.continuationKey,
105106
});
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;
107112
const snapshotSettings = yield* makeProviderSnapshotSettingsSource(effectiveConfig);
108113
const snapshot = yield* makeManagedServerProvider<ProviderSnapshotSettings<FxSettings>>({
109114
resolveMaintenance: () => Effect.succeed(MAINTENANCE),
@@ -132,7 +137,14 @@ export const FxDriver: ProviderDriver<FxSettings, FxDriverEnv> = {
132137
const orchestrationAdapter = yield* makeFxAdapterV2Driver(
133138
snapshot.getSnapshot.pipe(Effect.map((current) => fxDefaultModelId(current.models))),
134139
)
135-
.create({ instanceId, displayName, accentColor, environment, enabled, config })
140+
.create({
141+
instanceId,
142+
displayName,
143+
accentColor,
144+
environment,
145+
enabled,
146+
config: effectiveConfig,
147+
})
136148
.pipe(
137149
Effect.mapError(
138150
(cause) =>

‎packages/provider-kiro/package.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@
3232
"effect": "catalog:"
3333
},
3434
"devDependencies": {
35+
"@effect/platform-node": "catalog:",
3536
"@effect/vitest": "catalog:",
37+
"@t3tools/provider-testing": "workspace:*",
3638
"@types/node": "catalog:",
3739
"effect-acp": "workspace:*",
3840
"vite-plus": "catalog:"

‎packages/provider-kiro/src/server/driver.test.ts‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,24 @@
1+
import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2+
import * as NodeServices from "@effect/platform-node/NodeServices";
13
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";
213
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";
318

419
import { KiroSettings } from "../settings.ts";
520
import { buildKiroAcpSpawnInput } from "./acpSupport.ts";
21+
import { KiroDriver } from "./driver.ts";
622
import { kiroAuthFromWhoami } from "./status.ts";
723

824
const decodeSettings = Schema.decodeUnknownSync(KiroSettings);
@@ -64,3 +80,65 @@ describe("KiroDriver", () => {
6480
});
6581
});
6682
});
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‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import {
1414
} from "@t3tools/provider-core/server/driver";
1515
import { ProviderDriverError } from "@t3tools/provider-core/server/errors";
1616
import { mergeProviderInstanceEnvironment } from "@t3tools/provider-core/server/instanceEnvironment";
17+
import { expandHomePath } from "@t3tools/provider-core/server/pathExpansion";
1718
import { withInstanceIdentity } from "@t3tools/provider-core/server/instanceIdentity";
1819
import { makeManualOnlyProviderMaintenanceCapabilities } from "@t3tools/provider-core/server/maintenanceResolver";
1920
import { makeManagedServerProvider } from "@t3tools/provider-core/server/managedProvider";
@@ -96,7 +97,11 @@ export const KiroDriver: ProviderDriver<KiroSettings, KiroDriverEnv> = {
9697
accentColor,
9798
continuationGroupKey: continuationIdentity.continuationKey,
9899
});
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;
100105
const snapshotSettings = yield* makeProviderSnapshotSettingsSource(effectiveConfig);
101106
const snapshot = yield* makeManagedServerProvider<ProviderSnapshotSettings<KiroSettings>>({
102107
resolveMaintenance: () => Effect.succeed(MAINTENANCE),
@@ -127,7 +132,14 @@ export const KiroDriver: ProviderDriver<KiroSettings, KiroDriverEnv> = {
127132
const orchestrationAdapter = yield* makeKiroAdapterV2Driver(
128133
snapshot.getSnapshot.pipe(Effect.map((current) => kiroDefaultModelId(current.models))),
129134
)
130-
.create({ instanceId, displayName, accentColor, environment, enabled, config })
135+
.create({
136+
instanceId,
137+
displayName,
138+
accentColor,
139+
environment,
140+
enabled,
141+
config: effectiveConfig,
142+
})
131143
.pipe(
132144
Effect.mapError(
133145
(cause) =>

‎pnpm-lock.yaml‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)