Skip to content

grok support -> Primary #1044

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

Merged
arul28 merged 4 commits into from
Aug 6, 2026
Merged

grok support -> Primary #1044

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f31cadb
feat: streamline OpenCode provider connections
arul28 Aug 6, 2026
e4a9e3d
ship: iteration 1 - fix OpenCode and OAuth review findings
arul28 Aug 6, 2026
6933021
ship: iteration 2 - tighten OAuth and bundle fallbacks
arul28 Aug 6, 2026
78fc7dc
ship: iteration 3 - fix OAuth copy status
arul28 Aug 6, 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
229 changes: 119 additions & 110 deletions apps/ade-cli/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions apps/ade-cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@linear/sdk": "^84.0.0",
"@modelcontextprotocol/sdk": "^1.29.0",
"@openai/codex": "0.144.5",
"@opencode-ai/sdk": "1.15.5",
"@opencode-ai/sdk": "1.18.14",
"@xterm/addon-fit": "^0.11.0",
"@xterm/addon-serialize": "^0.14.0",
"@xterm/headless": "^6.0.0",
Expand All @@ -46,7 +46,7 @@
"marked": "^18.0.3",
"node-cron": "^3.0.3",
"node-pty": "^1.1.0",
"opencode-ai": "1.15.5",
"opencode-ai": "1.18.14",
"react": "^19.2.7",
"string-width": "^4.2.3",
"ws": "^8.20.0",
Expand Down
30 changes: 15 additions & 15 deletions apps/ade-cli/src/services/tools/toolsManifest.generated.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,33 +95,33 @@
"targets": {
"darwin-arm64": {
"package": "opencode-darwin-arm64",
"version": "1.15.5",
"tarball": "https://registry.npmjs.org/opencode-darwin-arm64/-/opencode-darwin-arm64-1.15.5.tgz",
"integrity": "sha512-gv8o3WbbW33SbmJvx/enDuZewlIoWfduSFo8M/WqlRwwO//33Rs3bgSnY21a6DYtXFL7NFzXO7QOmbPY5y02Jg=="
"version": "1.18.14",
"tarball": "https://registry.npmjs.org/opencode-darwin-arm64/-/opencode-darwin-arm64-1.18.14.tgz",
"integrity": "sha512-xlzzkkvIE5mnB/s9xYbrY+N7d4K4iFclNp6hT9YIWEOgfJSESkPhCrmfy3qMrAGV+Ufof+QaZPSCMyngt/741Q=="
},
"darwin-x64": {
"package": "opencode-darwin-x64",
"version": "1.15.5",
"tarball": "https://registry.npmjs.org/opencode-darwin-x64/-/opencode-darwin-x64-1.15.5.tgz",
"integrity": "sha512-yuglSeJbTF4jRHmFgqteQUMCRLjVOQ1aqMaeevDNyJXOUZPWCdFG1h8Fq8dZBgBfPfBEpQNFEWv8D9DU3ycytg=="
"version": "1.18.14",
"tarball": "https://registry.npmjs.org/opencode-darwin-x64/-/opencode-darwin-x64-1.18.14.tgz",
"integrity": "sha512-HHPgOBWT3/1axMLU45z9p4g6STErwzSKJmH8w4h2RiFCii8F8cGCljZbFyLeWWQ1y3YHWl62r3ZFq1T69DasVg=="
},
"linux-arm64": {
"package": "opencode-linux-arm64",
"version": "1.15.5",
"tarball": "https://registry.npmjs.org/opencode-linux-arm64/-/opencode-linux-arm64-1.15.5.tgz",
"integrity": "sha512-y2K5gT0IPWXx5DSy9hw+h0vSTahbdEV8spK/oZ4iwCY/Px/wdVpk5IphgkHcEes/9fIR1oLmu0/HF/SHhWRMxw=="
"version": "1.18.14",
"tarball": "https://registry.npmjs.org/opencode-linux-arm64/-/opencode-linux-arm64-1.18.14.tgz",
"integrity": "sha512-LSILNOuBO5Lotcky2XcvpAVxj/abRcWynKdTcX1QX0+bVOCEsY/fb0tGUuJFafVzWsmjFS7QF3vyD9mnrMC7Qg=="
},
"linux-x64": {
"package": "opencode-linux-x64",
"version": "1.15.5",
"tarball": "https://registry.npmjs.org/opencode-linux-x64/-/opencode-linux-x64-1.15.5.tgz",
"integrity": "sha512-Y3arLZezt8a6Ed2fdwrD21+JSQeNCZmfqHqYCv5iMzcpkE8/a8TLkDQVre74zjA7Gxelyk2sjk4b6ZKMuWHIkw=="
"version": "1.18.14",
"tarball": "https://registry.npmjs.org/opencode-linux-x64/-/opencode-linux-x64-1.18.14.tgz",
"integrity": "sha512-SMZj5jyOoOsZ6Cp2jD8hZbxRpw71OkyMDq02ZIfEFj/MxzX5xulIeC3XedFaATvAjKMlnfq5A9MFssExcrwegg=="
},
"win32-x64": {
"package": "opencode-windows-x64-baseline",
"version": "1.15.5",
"tarball": "https://registry.npmjs.org/opencode-windows-x64-baseline/-/opencode-windows-x64-baseline-1.15.5.tgz",
"integrity": "sha512-6oIoyY+ZSwsTsG2tekTZ67DKLsdRrywLECZWrJW/5Lj5aaibAc0uaQxIvNXKHbpznUU/Iaz+tgQ9D6o0OISIXg=="
"version": "1.18.14",
"tarball": "https://registry.npmjs.org/opencode-windows-x64-baseline/-/opencode-windows-x64-baseline-1.18.14.tgz",
"integrity": "sha512-39Y0oLPpzVBdyILqWnWHl15ruQpsMH7muI6IA/LIbJRwMaSimsMKt2v/ItefFXz3tRHqdxVTPf2RsYClyWBLng=="
}
}
}
Expand Down
121 changes: 65 additions & 56 deletions apps/desktop/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions apps/desktop/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"@linear/sdk": "^84.0.0",
"@modelcontextprotocol/sdk": "^1.29.0",
"@openai/codex": "0.144.5",
"@opencode-ai/sdk": "1.15.5",
"@opencode-ai/sdk": "1.18.14",
"@xterm/addon-serialize": "^0.14.0",
"@xterm/headless": "^6.0.0",
"bonjour-service": "^1.3.0",
Expand All @@ -87,7 +87,7 @@
"graceful-fs": "^4.2.11",
"node-cron": "^3.0.3",
"node-pty": "^1.1.0",
"opencode-ai": "1.15.5",
"opencode-ai": "1.18.14",
"ssh2": "^1.17.0",
"ws": "^8.19.0",
"yaml": "^2.8.2",
Expand Down
13 changes: 12 additions & 1 deletion apps/desktop/src/main/services/opencode/openCodeBinaryManager.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import fs from "node:fs";
import os from "node:os";
import path from "node:path";
import type * as ChildProcess from "node:child_process";
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";

const childProcessMockState = vi.hoisted(() => ({
execFileSync: vi.fn(),
}));

vi.mock("node:child_process", async () => {
const actual = await vi.importActual<typeof import("node:child_process")>("node:child_process");
const actual = await vi.importActual<typeof ChildProcess>("node:child_process");
return {
...actual,
execFileSync: (...args: unknown[]) => childProcessMockState.execFileSync(...args),
Expand All @@ -30,6 +31,7 @@ const originalEnv = {
SHELL: process.env.SHELL,
};
const originalProcessPlatform = process.platform;
const originalProcessArch = process.arch;

function setProcessPlatform(platform: NodeJS.Platform): void {
Object.defineProperty(process, "platform", {
Expand All @@ -38,6 +40,13 @@ function setProcessPlatform(platform: NodeJS.Platform): void {
});
}

function setProcessArch(arch: NodeJS.Architecture): void {
Object.defineProperty(process, "arch", {
value: arch,
configurable: true,
});
}

function makeExecutable(filePath: string): void {
fs.mkdirSync(path.dirname(filePath), { recursive: true });
fs.writeFileSync(filePath, "#!/bin/sh\nexit 0\n", "utf8");
Expand Down Expand Up @@ -89,6 +98,7 @@ describe("openCodeBinaryManager", () => {

afterEach(() => {
setProcessPlatform(originalProcessPlatform);
setProcessArch(originalProcessArch);
clearOpenCodeBinaryCache();
vi.restoreAllMocks();
restoreEnv("ADE_DISABLE_BUNDLED_OPENCODE");
Expand Down Expand Up @@ -146,6 +156,7 @@ describe("openCodeBinaryManager", () => {
// package plus an `opencode-ai` shell whose bin/ has been pruned. The AVX2
// `opencode-windows-x64` package is deliberately absent from the installer.
setProcessPlatform("win32");
setProcessArch("x64");
process.env.ADE_OPENCODE_BUNDLE_ROOT = tempRoot;
const baselinePath = path.join(
tempRoot, "node_modules", "opencode-windows-x64-baseline", "bin", "opencode.exe",
Expand Down
Loading
Loading