@devries-cameron20 / t3code Mirror · read-only / commits / 10cd1a5341
Fork 0

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

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 22, 05:45 UTC

fix(opencode): expand home-relative executable paths (#29326)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>

Lakshmi Tanmay committed Nov 4, 2026 at 04:37 UTC 10cd1a5341b6d5c38a6d58a7e191e462c0da1260
2 files changed +87 -2
packages/provider-opencode/src/server/driver.test.ts
+79
@@ -18,6 +18,7 @@ import * as Deferred from "effect/Deferred";
18 import * as Effect from "effect/Effect";
19 import * as Duration from "effect/Duration";
20 import * as Fiber from "effect/Fiber";
21 +import * as FileSystem from "effect/FileSystem";
22 import * as Layer from "effect/Layer";
23 import * as Logger from "effect/Logger";
24 import * as References from "effect/References";
@@ -25,6 +26,7 @@ import * as Stream from "effect/Stream";
26 import * as TestClock from "effect/testing/TestClock";
27 import * as HttpClient from "effect/http/HttpClient";
28 import * as HttpClientResponse from "effect/http/HttpClientResponse";
29 +import * as FetchHttpClient from "effect/http/FetchHttpClient";
30 import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner";
31
32 import * as ProviderLatestVersions from "@t3tools/provider-core/server/ProviderLatestVersions";
@@ -33,6 +35,7 @@ import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderS
35 import * as ProviderEventLoggers from "@t3tools/provider-core/server/ProviderEventLoggers";
36 import * as ProviderMaintenance from "@t3tools/provider-core/server/maintenanceResolver";
37 import * as OpenCodeRuntime from "./OpenCodeRuntime.ts";
38 +import * as OpenCodeServerLedger from "./OpenCodeServerLedger.ts";
39 import { OPENCODE_2_RESPONSES, replayOpenCodeServer } from "./probeResponses.fixture.ts";
40 import { OpenCodeDriver, openCodeUpdateFor } from "./driver.ts";
41 import * as TestProviderHost from "@t3tools/provider-testing/TestProviderHost";
@@ -78,6 +81,82 @@ const create = (config: Partial<OpenCodeSettings>, http: HttpClient.HttpClient)
81
82 const noHttp = HttpClient.make(() => Effect.die("A local binary must not be probed over HTTP"));
83
84 +it.live("discovers models through a home-relative OpenCode wrapper", () =>
85 + Effect.gen(function* () {
86 + const fs = yield* FileSystem.FileSystem;
87 + const home = yield* fs.makeTempDirectoryScoped({ prefix: "t3-opencode-home with spaces-" });
88 + const binaryPath = NodePath.join(home, "opencode");
89 + const scriptPath = NodePath.join(home, "opencode.cjs");
90 + yield* fs.writeFileString(
91 + scriptPath,
92 + `if (process.argv.includes('--version')) {
93 + console.log('1.18.32');
94 + } else {
95 + const server = require('node:http').createServer((req, res) => {
96 + const route = new URL(req.url, 'http://localhost').pathname;
97 + res.setHeader('content-type', 'application/json');
98 + res.end(JSON.stringify(route === '/global/health'
99 + ? { healthy: true, version: '1.18.32' }
100 + : route === '/provider'
101 + ? { connected: ['opencode'], default: {}, all: [{
102 + id: 'opencode', name: 'OpenCode', models: {
103 + 'big-pickle': { id: 'big-pickle', name: 'Big Pickle' }
104 + }
105 + }] }
106 + : []));
107 + });
108 + server.listen(0, '127.0.0.1', () => {
109 + console.log('opencode server listening on http://127.0.0.1:' + server.address().port);
110 + });
111 + }`,
112 + );
113 + const windows = (yield* HostProcess.Platform) === "win32";
114 + const wrapperPath = windows ? `${binaryPath}.cmd` : binaryPath;
115 + const node = yield* HostProcess.ExecutablePath;
116 + yield* fs.writeFileString(
117 + wrapperPath,
118 + windows
119 + ? `@echo off\r\n"${node}" "${scriptPath}" %*\r\n`
120 + : `#!/bin/sh\nexec "${node}" "${scriptPath}" "$@"\n`,
121 + );
122 + if (!windows) yield* fs.chmod(wrapperPath, 0o755);
123 +
124 + const instance = yield* OpenCodeDriver.create({
125 + instanceId: ProviderInstanceId.make("opencode-home"),
126 + displayName: undefined,
127 + environment: [],
128 + enabled: true,
129 + config: {
130 + ...OpenCodeDriver.defaultConfig(),
131 + binaryPath: windows ? "~/opencode.cmd" : "~/opencode",
132 + },
133 + }).pipe(Effect.provideService(HostProcess.HomeDirectory, home));
134 + const snapshot = yield* instance.snapshot.refresh;
135 + assert.strictEqual(snapshot.status, "ready");
136 + assert.strictEqual(snapshot.version, "1.18.32");
137 + assert.isTrue(snapshot.models.some((model) => model.slug === "opencode/big-pickle"));
138 + }).pipe(
139 + Effect.scoped,
140 + Effect.provide(
141 + Layer.mergeAll(
142 + IdAllocator.layer,
143 + McpProviderSessions.layer,
144 + ProviderLatestVersions.layer,
145 + TestProviderHost.layer({ runBackgroundWork: false }),
146 + Layer.succeed(
147 + ProviderEventLoggers.ProviderEventLoggers,
148 + ProviderEventLoggers.NoOpProviderEventLoggers,
149 + ),
150 + OpenCodeRuntime.layer.pipe(Layer.provide(OpenCodeServerLedger.layerTest)),
151 + ).pipe(
152 + Layer.provideMerge(
153 + Layer.mergeAll(NodeServices.layer, NodeCrypto.layer, FetchHttpClient.layer),
154 + ),
155 + ),
156 + ),
157 + ),
158 +);
159 +
160 it.layer(layer)("OpenCodeDriver runtime selection", (it) => {
161 it.effect("never starts a 1.x server for an OpenCode 2 instance", () =>
162 Effect.gen(function* () {
packages/provider-opencode/src/server/driver.ts
+8 -2
@@ -16,6 +16,8 @@ import * as OpenCode2TextGeneration from "./v2/textGeneration.ts";
16 import { makeOpenCodeTextGeneration } from "./textGeneration.ts";
17 import * as ProviderLatestVersions from "@t3tools/provider-core/server/ProviderLatestVersions";
18 import * as ProviderHost from "@t3tools/provider-core/server/ProviderHost";
19 +import { expandHomePath } from "@t3tools/provider-core/server/pathExpansion";
20 +import * as HostProcess from "@t3tools/shared/HostProcess";
21 import * as OpenCodeAdapterV2 from "./adapter.ts";
22 import * as OpenCode2AdapterV2 from "./v2/adapter.ts";
23 import type * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter";
@@ -209,7 +211,11 @@ export const OpenCodeDriver: ProviderDriver<
211 accentColor,
212 continuationGroupKey: continuationIdentity.continuationKey,
213 });
212 - const effectiveConfig = { ...config, enabled } satisfies OpenCodeSettings;
214 + const effectiveConfig = {
215 + ...config,
216 + enabled,
217 + binaryPath: expandHomePath(config.binaryPath, yield* HostProcess.HomeDirectory),
218 + } satisfies OpenCodeSettings;
219 const runtimeProbe = yield* makeOpenCodeRuntimeProbe(
220 probeOpenCodeRuntime(effectiveConfig, processEnv).pipe(
221 Effect.provideService(HttpClient.HttpClient, httpClient),
@@ -254,7 +260,7 @@ export const OpenCodeDriver: ProviderDriver<
260 accentColor,
261 environment,
262 enabled,
257 - config,
263 + config: effectiveConfig,
264 }).pipe(
265 Effect.mapError(
266 (cause) =>