TypeScript
fix(opencode): expand home-relative executable paths (#29326)
Lakshmi Tanmay10cd1a5341b6
diff --git a/packages/provider-opencode/src/server/driver.test.ts b/packages/provider-opencode/src/server/driver.test.tsindex 2281365ea23..665f4785459 100644--- a/packages/provider-opencode/src/server/driver.test.ts+++ b/packages/provider-opencode/src/server/driver.test.ts@@ -18,6 +18,7 @@ import * as Deferred from "effect/Deferred";import * as Effect from "effect/Effect";import * as Duration from "effect/Duration";import * as Fiber from "effect/Fiber";+import * as FileSystem from "effect/FileSystem";import * as Layer from "effect/Layer";import * as Logger from "effect/Logger";import * as References from "effect/References";@@ -25,6 +26,7 @@ import * as Stream from "effect/Stream";import * as TestClock from "effect/testing/TestClock";import * as HttpClient from "effect/http/HttpClient";import * as HttpClientResponse from "effect/http/HttpClientResponse";+import * as FetchHttpClient from "effect/http/FetchHttpClient";import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner";import * as ProviderLatestVersions from "@t3tools/provider-core/server/ProviderLatestVersions";@@ -33,6 +35,7 @@ import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSimport * as ProviderEventLoggers from "@t3tools/provider-core/server/ProviderEventLoggers";import * as ProviderMaintenance from "@t3tools/provider-core/server/maintenanceResolver";import * as OpenCodeRuntime from "./OpenCodeRuntime.ts";+import * as OpenCodeServerLedger from "./OpenCodeServerLedger.ts";import { OPENCODE_2_RESPONSES, replayOpenCodeServer } from "./probeResponses.fixture.ts";import { OpenCodeDriver, openCodeUpdateFor } from "./driver.ts";import * as TestProviderHost from "@t3tools/provider-testing/TestProviderHost";@@ -78,6 +81,82 @@ const create = (config: Partial<OpenCodeSettings>, http: HttpClient.HttpClient)const noHttp = HttpClient.make(() => Effect.die("A local binary must not be probed over HTTP"));+it.live("discovers models through a home-relative OpenCode wrapper", () =>+ Effect.gen(function* () {+ const fs = yield* FileSystem.FileSystem;+ const home = yield* fs.makeTempDirectoryScoped({ prefix: "t3-opencode-home with spaces-" });+ const binaryPath = NodePath.join(home, "opencode");+ const scriptPath = NodePath.join(home, "opencode.cjs");+ yield* fs.writeFileString(+ scriptPath,+ `if (process.argv.includes('--version')) {+ console.log('1.18.32');+ } else {+ const server = require('node:http').createServer((req, res) => {+ const route = new URL(req.url, 'http://localhost').pathname;+ res.setHeader('content-type', 'application/json');+ res.end(JSON.stringify(route === '/global/health'+ ? { healthy: true, version: '1.18.32' }+ : route === '/provider'+ ? { connected: ['opencode'], default: {}, all: [{+ id: 'opencode', name: 'OpenCode', models: {+ 'big-pickle': { id: 'big-pickle', name: 'Big Pickle' }+ }+ }] }+ : []));+ });+ server.listen(0, '127.0.0.1', () => {+ console.log('opencode server listening on http://127.0.0.1:' + server.address().port);+ });+ }`,+ );+ const windows = (yield* HostProcess.Platform) === "win32";+ const wrapperPath = windows ? `${binaryPath}.cmd` : binaryPath;+ const node = yield* HostProcess.ExecutablePath;+ yield* fs.writeFileString(+ wrapperPath,+ windows+ ? `@echo off\r\n"${node}" "${scriptPath}" %*\r\n`+ : `#!/bin/sh\nexec "${node}" "${scriptPath}" "$@"\n`,+ );+ if (!windows) yield* fs.chmod(wrapperPath, 0o755);++ const instance = yield* OpenCodeDriver.create({+ instanceId: ProviderInstanceId.make("opencode-home"),+ displayName: undefined,+ environment: [],+ enabled: true,+ config: {+ ...OpenCodeDriver.defaultConfig(),+ binaryPath: windows ? "~/opencode.cmd" : "~/opencode",+ },+ }).pipe(Effect.provideService(HostProcess.HomeDirectory, home));+ const snapshot = yield* instance.snapshot.refresh;+ assert.strictEqual(snapshot.status, "ready");+ assert.strictEqual(snapshot.version, "1.18.32");+ assert.isTrue(snapshot.models.some((model) => model.slug === "opencode/big-pickle"));+ }).pipe(+ Effect.scoped,+ Effect.provide(+ Layer.mergeAll(+ IdAllocator.layer,+ McpProviderSessions.layer,+ ProviderLatestVersions.layer,+ TestProviderHost.layer({ runBackgroundWork: false }),+ Layer.succeed(+ ProviderEventLoggers.ProviderEventLoggers,+ ProviderEventLoggers.NoOpProviderEventLoggers,+ ),+ OpenCodeRuntime.layer.pipe(Layer.provide(OpenCodeServerLedger.layerTest)),+ ).pipe(+ Layer.provideMerge(+ Layer.mergeAll(NodeServices.layer, NodeCrypto.layer, FetchHttpClient.layer),+ ),+ ),+ ),+ ),+);+it.layer(layer)("OpenCodeDriver runtime selection", (it) => {it.effect("never starts a 1.x server for an OpenCode 2 instance", () =>Effect.gen(function* () {diff --git a/packages/provider-opencode/src/server/driver.ts b/packages/provider-opencode/src/server/driver.tsindex 4f5f0f8d5b3..eb62d44b9aa 100644--- a/packages/provider-opencode/src/server/driver.ts+++ b/packages/provider-opencode/src/server/driver.ts@@ -16,6 +16,8 @@ import * as OpenCode2TextGeneration from "./v2/textGeneration.ts";import { makeOpenCodeTextGeneration } from "./textGeneration.ts";import * as ProviderLatestVersions from "@t3tools/provider-core/server/ProviderLatestVersions";import * as ProviderHost from "@t3tools/provider-core/server/ProviderHost";+import { expandHomePath } from "@t3tools/provider-core/server/pathExpansion";+import * as HostProcess from "@t3tools/shared/HostProcess";import * as OpenCodeAdapterV2 from "./adapter.ts";import * as OpenCode2AdapterV2 from "./v2/adapter.ts";import type * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter";@@ -209,7 +211,11 @@ export const OpenCodeDriver: ProviderDriver<accentColor,continuationGroupKey: continuationIdentity.continuationKey,});- const effectiveConfig = { ...config, enabled } satisfies OpenCodeSettings;+ const effectiveConfig = {+ ...config,+ enabled,+ binaryPath: expandHomePath(config.binaryPath, yield* HostProcess.HomeDirectory),+ } satisfies OpenCodeSettings;const runtimeProbe = yield* makeOpenCodeRuntimeProbe(probeOpenCodeRuntime(effectiveConfig, processEnv).pipe(Effect.provideService(HttpClient.HttpClient, httpClient),@@ -254,7 +260,7 @@ export const OpenCodeDriver: ProviderDriver<accentColor,environment,enabled,- config,+ config: effectiveConfig,}).pipe(Effect.mapError((cause) =>