Skip to content

Commit 70dd0a5

Browse files
fix(server): Kiro, fx and Antigravity find a ~/ Binary path
AI-assisted; verified with the tests and tools listed above.
1 parent a26b468 commit 70dd0a5

3 files changed

Lines changed: 30 additions & 5 deletions

File tree

‎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/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/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) =>

0 commit comments

Comments
 (0)