Skip to content

fix(server): drive local OpenCode 2 over ACP #12284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nicolaeser wants to merge 11 commits into from
Closed

fix(server): drive local OpenCode 2 over ACP #12284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
14aaf9a
fix(server): drive local OpenCode 2 over ACP
Sep 17, 2026
6264698
fix(server): address OpenCode 2 ACP review findings
Sep 17, 2026
82f76a8
fix(server): tighten OpenCode 2 version, auth, and serve ready
Sep 17, 2026
ed10340
fix(server): do not send OpenCode passwords over cleartext HTTP
Sep 17, 2026
3fa604c
fix(server): load OpenCode 2 catalogs over REST and handle ACP elicit…
Sep 17, 2026
5a1addc
fix(server): type OpenCode elicitation content and multi-select arrays
Sep 17, 2026
3b4b951
fix(server): reject incomplete OpenCode elicitation forms
Sep 17, 2026
ffe18b0
fix(server): decode OpenCode 2 provider all/connected/default
Sep 17, 2026
7f60bbd
docs(server): document OpenCode 2 ACP helpers
Sep 17, 2026
abf2eaa
fix(server): complete OpenCode 2 serve when a password is already set
Sep 17, 2026
d8d2a58
fix(server): bound OpenCode 2 HTTP body reads
Sep 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
127 changes: 90 additions & 37 deletions apps/server/src/provider/Drivers/OpenCodeDriver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { OpenCodeSettings, ProviderDriverKind } from "@t3tools/contracts";
import * as Crypto from "effect/Crypto";
import * as Effect from "effect/Effect";
import * as FileSystem from "effect/FileSystem";
import * as Option from "effect/Option";
import * as Path from "effect/Path";
import * as Schema from "effect/Schema";
import { HttpClient } from "effect/unstable/http";
Expand All @@ -26,6 +27,8 @@ import * as BackgroundPolicy from "../../background/BackgroundPolicy.ts";
import { ServerConfig } from "../../config.ts";
import { ServerSettingsService } from "../../serverSettings.ts";
import { ProviderDriverError } from "../Errors.ts";
import { shouldUseOpenCodeAcp } from "../acp/OpenCodeAcpSupport.ts";
import { makeOpenCodeAcpAdapter } from "../Layers/OpenCodeAcpAdapter.ts";
import { makeOpenCodeAdapter } from "../Layers/OpenCodeAdapter.ts";
import { readOpenCodeGoUsageLimits } from "../Layers/openCodeUsageLimits.ts";
import {
Expand All @@ -36,7 +39,13 @@ import {
} from "../Layers/OpenCodeProvider.ts";
import { ProviderEventLoggers } from "../Layers/ProviderEventLoggers.ts";
import { makeManagedServerProvider } from "../makeManagedServerProvider.ts";
import { OpenCodeRuntime, loadOpenCodeCommands } from "../opencodeRuntime.ts";
import {
OpenCodeRuntime,
isOpenCodeV2CliVersion,
loadOpenCodeCommands,
loadOpenCodeV2Inventory,
} from "../opencodeRuntime.ts";
import { parseGenericCliVersion } from "../providerSnapshot.ts";
import * as OpenCodeServerOwner from "../OpenCodeServerOwner.ts";
import {
defaultProviderContinuationIdentity,
Expand Down Expand Up @@ -132,11 +141,33 @@ export const OpenCodeDriver: ProviderDriver<OpenCodeSettings, OpenCodeDriverEnv>
),
);

const adapter = yield* makeOpenCodeAdapter(effectiveConfig, {
instanceId,
environment: processEnv,
...(eventLoggers.native ? { nativeEventLogger: eventLoggers.native } : {}),
const versionProbe = yield* openCodeRuntime
.runOpenCodeCommand({
binaryPath: effectiveConfig.binaryPath,
args: ["--version"],
environment: processEnv,
})
.pipe(Effect.timeout("4 seconds"), Effect.option);
const cliVersion = Option.isSome(versionProbe)
? parseGenericCliVersion(versionProbe.value.stdout)
: null;
// OpenCode 2's HTTP API is not the v1 SDK surface. Local 2.x CLIs speak
// ACP (`opencode acp`). An explicit server URL stays on the HTTP adapter.
const useOpenCodeAcp = shouldUseOpenCodeAcp({
serverUrl: effectiveConfig.serverUrl,
cliVersion,
});
const adapter = useOpenCodeAcp
? yield* makeOpenCodeAcpAdapter(effectiveConfig, {
instanceId,
environment: processEnv,
...(eventLoggers.native ? { nativeEventLogger: eventLoggers.native } : {}),
})
: yield* makeOpenCodeAdapter(effectiveConfig, {
instanceId,
environment: processEnv,
...(eventLoggers.native ? { nativeEventLogger: eventLoggers.native } : {}),
});
const serverOwner = yield* OpenCodeServerOwner.make({
binaryPath: effectiveConfig.binaryPath,
directory: serverConfig.cwd,
Expand Down Expand Up @@ -187,40 +218,62 @@ export const OpenCodeDriver: ProviderDriver<OpenCodeSettings, OpenCodeDriverEnv>
},
{ concurrency: "unbounded" },
);
const loadWorkspaceFromV2Rest = (
server: { readonly url: string; readonly serverPassword?: string },
cwd: string,
) =>
loadOpenCodeV2Inventory({
baseUrl: server.url,
directory: cwd,
...(server.serverPassword !== undefined ? { serverPassword: server.serverPassword } : {}),
}).pipe(
Effect.map((inventory) => ({
skills: inventory.skills,
commands: inventory.commands ?? [],
})),
Effect.provideService(HttpClient.HttpClient, httpClient),
);
const loadWorkspaceForCwd = (cwd: string) =>
effectiveConfig.serverUrl.trim().length > 0
? Effect.scoped(
Effect.gen(function* () {
const server = yield* openCodeRuntime.connectToOpenCodeServer({
binaryPath: effectiveConfig.binaryPath,
directory: cwd,
serverUrl: effectiveConfig.serverUrl,
...(effectiveConfig.serverPassword
? { serverPassword: effectiveConfig.serverPassword }
: {}),
environment: processEnv,
});
const client = openCodeRuntime.createOpenCodeSdkClient({
baseUrl: server.url,
directory: cwd,
...(effectiveConfig.serverPassword
? { serverPassword: effectiveConfig.serverPassword }
: {}),
});
return yield* loadWorkspaceInventory(client);
}),
)
: serverOwner.withServer((server) =>
loadWorkspaceInventory(
openCodeRuntime.createOpenCodeSdkClient({
baseUrl: server.url,
directory: cwd,
...(server.serverPassword !== undefined
? { serverPassword: server.serverPassword }
: {}),
useOpenCodeAcp
? serverOwner.withServer((server) => loadWorkspaceFromV2Rest(server, cwd))
: effectiveConfig.serverUrl.trim().length > 0
? Effect.scoped(
Effect.gen(function* () {
const server = yield* openCodeRuntime.connectToOpenCodeServer({
binaryPath: effectiveConfig.binaryPath,
directory: cwd,
serverUrl: effectiveConfig.serverUrl,
...(effectiveConfig.serverPassword
? { serverPassword: effectiveConfig.serverPassword }
: {}),
environment: processEnv,
});
if (isOpenCodeV2CliVersion(server.version)) {
return yield* loadWorkspaceFromV2Rest(server, cwd);
}
const client = openCodeRuntime.createOpenCodeSdkClient({
baseUrl: server.url,
directory: cwd,
...(effectiveConfig.serverPassword
? { serverPassword: effectiveConfig.serverPassword }
: {}),
});
return yield* loadWorkspaceInventory(client);
}),
),
);
)
: serverOwner.withServer((server) =>
isOpenCodeV2CliVersion(server.version)
? loadWorkspaceFromV2Rest(server, cwd)
: loadWorkspaceInventory(
openCodeRuntime.createOpenCodeSdkClient({
baseUrl: server.url,
directory: cwd,
...(server.serverPassword !== undefined
? { serverPassword: server.serverPassword }
: {}),
}),
),
);

const snapshotSettings = makeProviderSnapshotSettingsSource(effectiveConfig, serverSettings);
const snapshot = yield* makeManagedServerProvider<ProviderSnapshotSettings<OpenCodeSettings>>(
Expand Down
Loading
Loading