A desktop coding agent with free access to frontier models.
TypeScript
fix: the new engine ships in every installer and loads its plugins
ogsamrat85fccba8754b
diff --git a/apps/desktop/electron-builder.base.yml b/apps/desktop/electron-builder.base.ymlindex 7cc50b4c..3b850504 100644--- a/apps/desktop/electron-builder.base.yml+++ b/apps/desktop/electron-builder.base.yml@@ -75,7 +75,9 @@ mac:to: sidecarsfilter:- opencode-aarch64-apple-darwin+ - opencode2-aarch64-apple-darwin- opencode-x86_64-apple-darwin+ - opencode2-x86_64-apple-darwin- versions.json- versions.json-aarch64-apple-darwin- versions.json-x86_64-apple-darwin@@ -105,7 +107,9 @@ linux:to: sidecarsfilter:- opencode-aarch64-unknown-linux-gnu+ - opencode2-aarch64-unknown-linux-gnu- opencode-x86_64-unknown-linux-gnu+ - opencode2-x86_64-unknown-linux-gnu- versions.json- versions.json-aarch64-unknown-linux-gnu- versions.json-x86_64-unknown-linux-gnu@@ -148,7 +152,9 @@ win:to: sidecarsfilter:- opencode-aarch64-pc-windows-msvc.exe+ - opencode2-aarch64-pc-windows-msvc.exe- opencode-x86_64-pc-windows-msvc.exe+ - opencode2-x86_64-pc-windows-msvc.exe- versions.json- versions.json-aarch64-pc-windows-msvc.exe- versions.json-x86_64-pc-windows-msvc.exediff --git a/apps/desktop/electron/electron-builder-config.test.mjs b/apps/desktop/electron/electron-builder-config.test.mjsindex 43c3ca46..fa0a52c2 100644--- a/apps/desktop/electron/electron-builder-config.test.mjs+++ b/apps/desktop/electron/electron-builder-config.test.mjs@@ -59,6 +59,9 @@ describe("Electron distribution configs", () => {["mac", "opencode", "opencode-aarch64-apple-darwin", "opencode-x86_64-apple-darwin"],["linux", "opencode", "opencode-aarch64-unknown-linux-gnu", "opencode-x86_64-unknown-linux-gnu"],["win", "opencode.exe", "opencode-aarch64-pc-windows-msvc.exe", "opencode-x86_64-pc-windows-msvc.exe"],+ ["mac", "opencode2", "opencode2-aarch64-apple-darwin", "opencode2-x86_64-apple-darwin"],+ ["linux", "opencode2", "opencode2-aarch64-unknown-linux-gnu", "opencode2-x86_64-unknown-linux-gnu"],+ ["win", "opencode2.exe", "opencode2-aarch64-pc-windows-msvc.exe", "opencode2-x86_64-pc-windows-msvc.exe"],];for (const [platform, genericName, arm64Name, x64Name] of cases) {const sidecars = config[platform].extraResources.find((resource) => resource.to === "sidecars");diff --git a/apps/server/bunfig.toml b/apps/server/bunfig.tomlnew file mode 100644index 00000000..4cd14beb--- /dev/null+++ b/apps/server/bunfig.toml@@ -0,0 +1,3 @@+[test]+# The server's 1.x suites send chats through the 1.x engine (engine-v2-preview.ts: a release build ignores this).+preload = ["./src/test-preload.ts"]diff --git a/apps/server/src/engine-v2-next.test.ts b/apps/server/src/engine-v2-next.test.tsindex 9be196f3..84a66c97 100644--- a/apps/server/src/engine-v2-next.test.ts+++ b/apps/server/src/engine-v2-next.test.ts@@ -5,7 +5,7 @@ import { mkdtemp, readdir, readFile, rm } from "node:fs/promises";import { tmpdir } from "node:os";import { join } from "node:path";-import { assertSessionPluginActive } from "./engine-v2-preview.js";+import { assertSessionPluginActive, OMNIRUSH_SESSION_PLUGIN_ID } from "./engine-v2-preview.js";import { readMigratedSessions, seedV2StoreFromV1 } from "./engine-v2-migration.js";import { pluginDirectories } from "./managed-opencode-v2.js";import sessionPlugin from "./opencode-plugins/omnirush-session-next.js";@@ -71,6 +71,7 @@ test("the session plugin names the chat on gateway requests and blanks secrets i});test("chats do not start unless the session plugin is active", async () => {+ expect(sessionPlugin.id).toBe(OMNIRUSH_SESSION_PLUGIN_ID);const engine = (data: unknown, status = 200) => ({ fetchJson: async () => ({ status, json: { data } }) });await assertSessionPluginActive(engine([{ id: "omnirush.session", state: { status: "active" } }]), "/p");await expect(assertSessionPluginActive(engine([{ id: "opencode.agent", state: { status: "active" } }]), "/p")).rejects.toThrow(/not active/);diff --git a/apps/server/src/engine-v2-preview.test.ts b/apps/server/src/engine-v2-preview.test.tsindex 28421d94..3c838e7d 100644--- a/apps/server/src/engine-v2-preview.test.ts+++ b/apps/server/src/engine-v2-preview.test.ts@@ -16,7 +16,7 @@ import type { ServerConfig } from "./types.js";import { buildOmniRushV2Instructions, waitForOmniRushV2Skills } from "./opencode-v2-instructions.js";const realV2Binary = process.env.OMNIRUSH_OPENCODE2_BIN?.trim()- || join(resolve(import.meta.dir, "../../.."), "apps/desktop/resources/sidecars/opencode-x86_64-unknown-linux-gnu");+ || join(resolve(import.meta.dir, "../../.."), "apps/desktop/resources/sidecars/opencode2-x86_64-unknown-linux-gnu");const realV2Test = existsSync(realV2Binary) ? test : test.skip;test("v2 app guidance fits the native entry limit and uses the current native tools", () => {@@ -78,9 +78,10 @@ function testConfig(root: string): ServerConfig {}test("the 2.x engine runs every chat, whatever an earlier preview setting said", () => {- expect(resolveInitialEngineV2PreviewState({}, { enabled: false, chatRouting: false })).toEqual({ enabled: true, chatRouting: true });- expect(resolveInitialEngineV2PreviewState({ OMNIRUSH_ENGINE_V2_PREVIEW: "0" })).toEqual({ enabled: true, chatRouting: true });- expect(resolveInitialEngineV2PreviewState({ OMNIRUSH_ENGINE_V2_PREVIEW: "sidecar" })).toEqual({ enabled: true, chatRouting: false });+ expect(resolveInitialEngineV2PreviewState({}, { enabled: false, chatRouting: false }, false)).toEqual({ enabled: true, chatRouting: true });+ expect(resolveInitialEngineV2PreviewState({ OMNIRUSH_ENGINE_V2_PREVIEW: "0" }, undefined, false)).toEqual({ enabled: true, chatRouting: true });+ expect(resolveInitialEngineV2PreviewState({ OMNIRUSH_ENGINE_V2_PREVIEW: "sidecar" }, undefined, false)).toEqual({ enabled: true, chatRouting: false });+ expect(resolveInitialEngineV2PreviewState({ OMNIRUSH_ENGINE_V2_PREVIEW: "sidecar" }, undefined, true)).toEqual({ enabled: true, chatRouting: true });});test("round trips enabled and chat routing state and defaults corrupt state", async () => {@@ -101,7 +102,7 @@ test("the 2.x engine cannot be turned off", async () => {const root = await mkdtemp(join(tmpdir(), "omnirush-engine-v2-preview-"));const preview = createEngineV2Preview({ config: testConfig(root), deferStart: true });try {- expect(preview.status()).toMatchObject({ enabled: true, chatRouting: true });+ expect(preview.status().enabled).toBe(true);await expect(preview.setEnabled(false)).rejects.toThrow(/cannot be turned off/);await expect(preview.setChatRouting(false)).rejects.toThrow(/cannot be turned off/);} finally {@@ -140,7 +141,7 @@ realV2Test("removes a configured MCP from the real v2 engine before admission",},},);- const configured = await request("/api/mcp/fixture", {+ const configured = await request("/api/experimental/mcp/fixture", {method: "PUT",body: JSON.stringify({ config: { type: "remote", url: "https://example.invalid/mcp" } }),});diff --git a/apps/server/src/engine-v2-preview.ts b/apps/server/src/engine-v2-preview.tsindex d78330dc..d2608e44 100644--- a/apps/server/src/engine-v2-preview.ts+++ b/apps/server/src/engine-v2-preview.ts@@ -19,13 +19,15 @@ import {} from "./runtime-opencode-config-store.js";import type { EnvService } from "./env-file.js";import { selectPrimaryCredentialEnvName } from "./managed-provider-auth.js";-import { OMNIRUSH_SESSION_PLUGIN_ID } from "./opencode-plugins/omnirush-session-next.js";+import { isReleaseBuild } from "./release-guard.js";import { engineDataDir } from "./engine-data-home.js";import { readMigratedSessions, seedV2StoreFromV1 } from "./engine-v2-migration.js";import type { ServerConfig } from "./types.js";const PREVIEW_STATE_FILE = "engine-v2-preview.json";const UNSET_API_KEY = "omnirush-engine-v2-preview-unset";+/** opencode-plugins/omnirush-session-next.ts's id (server modules never import plugin files). */+export const OMNIRUSH_SESSION_PLUGIN_ID = "omnirush.session";// A cold sidecar can return HTTP 503 while its model catalog initializes for 17–20 seconds.const CATALOG_MIRROR_TIMEOUT_MS = 60_000;@@ -73,13 +75,15 @@ export interface EngineV2PreviewState {/*** The 2.x engine runs every new chat: on, with chats routed to it, whatever an- * earlier preview setting or switch said. `sidecar` (tests only) leaves chats off it.+ * earlier preview setting or switch said. `sidecar` leaves chats on the 1.x engine for the+ * server's 1.x test suites; a release build ignores it.*/export function resolveInitialEngineV2PreviewState(env: NodeJS.ProcessEnv,_persisted?: EngineV2PreviewState,+ release = isReleaseBuild(),): EngineV2PreviewState {- return { enabled: true, chatRouting: env.OMNIRUSH_ENGINE_V2_PREVIEW !== "sidecar" };+ return { enabled: true, chatRouting: release || env.OMNIRUSH_ENGINE_V2_PREVIEW !== "sidecar" };}interface ResolvedBinary {diff --git a/apps/server/src/managed-opencode.test.ts b/apps/server/src/managed-opencode.test.tsindex c25ad612..5cff12ca 100644--- a/apps/server/src/managed-opencode.test.ts+++ b/apps/server/src/managed-opencode.test.ts@@ -51,11 +51,11 @@ describe("managed OpenCode startup", () => {} finally { await managed.close(); }});- test("the next engine reads no project config (it would start a project's MCP servers unfiltered)", async () => {+ test("the next engine reads a project's descriptive config; its gates are on", async () => {const root = await createRoot();const bin = await writeExecutable(root, "project-config-env.mjs", ["const server = Bun.serve({ hostname: '127.0.0.1', port: 0, fetch(request) {",- " if (new URL(request.url).pathname === '/env') return Response.json({ a: process.env.OPENCODE_DISABLE_PROJECT_CONFIG ?? null, b: process.env.OPENCODE_CONFIG_PROJECT_DISABLE ?? null });",+ " if (new URL(request.url).pathname === '/env') return Response.json({ a: process.env.OPENCODE_DISABLE_PROJECT_CONFIG ?? null, b: process.env.OPENCODE_CONFIG_PROJECT_DISABLE ?? null, gate: process.env.OMNIRUSH_GATE_PROVIDERS ?? null });"," return Response.json({ healthy: true, version: 'test', pid: process.pid });","} });","console.log(`opencode server listening on http://127.0.0.1:${server.port}`);",@@ -63,7 +63,7 @@ describe("managed OpenCode startup", () => {]);const managed = await createManagedOpencodeV2Server({ bin, rootDir: root, env: {} });try {- expect(await managed.fetchJson("/env")).toEqual({ status: 200, json: { a: "1", b: "1" } });+ expect(await managed.fetchJson("/env")).toEqual({ status: 200, json: { a: null, b: null, gate: "omnirush" } });} finally { await managed.close(); }});diff --git a/apps/server/src/session-uploader.server.e2e.test.ts b/apps/server/src/session-uploader.server.e2e.test.tsindex 56a35ed9..6786b886 100644--- a/apps/server/src/session-uploader.server.e2e.test.ts+++ b/apps/server/src/session-uploader.server.e2e.test.ts@@ -271,7 +271,7 @@ function startMockV2Engine(input: { provider: string; model: string }) {}if (pathname === "/api/session/active") return Response.json({ data: busy ? { ses_v2root: { type: "running" } } : {} });if (pathname === "/api/mcp" || pathname === "/api/skill") return Response.json({ data: [] });- if (pathname === "/api/session/ses_v2root/instructions/entries/omnirush.context" && request.method === "PUT") return Response.json({ data: {} });+ if (pathname === "/api/experimental/session/ses_v2root/instructions/entries/omnirush.context" && request.method === "PUT") return Response.json({ data: {} });if (pathname === "/api/session/ses_v2root/prompt" && request.method === "POST") {prompts.push(await request.json().catch(() => null));turn += 1;@@ -875,7 +875,7 @@ describe("collection gaps: the v2 mount and local workflow steps", () => {const bypassed = await promptV2(config, v2.connection);expect(bypassed.status).toBe(200);expect(v2.prompts).toEqual([{ text: "Do the task" }]);- expect(v2.received).toContain("PUT /api/session/ses_v2root/instructions/entries/omnirush.context");+ expect(v2.received).toContain("PUT /api/experimental/session/ses_v2root/instructions/entries/omnirush.context");// Even bypassed, a session identifier the daemon cannot decode is refused before the request is forwarded.const malformed = await promptV2(config, v2.connection, "api/session/ses%E0/prompt");expect(malformed.status).toBe(400);diff --git a/apps/server/src/test-preload.ts b/apps/server/src/test-preload.tsnew file mode 100644index 00000000..b2ccd376--- /dev/null+++ b/apps/server/src/test-preload.ts@@ -0,0 +1 @@+process.env.OMNIRUSH_ENGINE_V2_PREVIEW ??= "sidecar";diff --git a/apps/server/src/workspace-run-mode.test.ts b/apps/server/src/workspace-run-mode.test.tsindex defab8f8..8e05c462 100644--- a/apps/server/src/workspace-run-mode.test.ts+++ b/apps/server/src/workspace-run-mode.test.ts@@ -114,7 +114,7 @@ async function startModeServer(options: { readOnly?: boolean; approval?: ServerCconst root = await workspaceRoot('{"permission":{"edit":"deny"},"model":"local/model"}');process.env.OMNIRUSH_DATA_DIR = join(root, "data");process.env.OMNIRUSH_TOKEN_STORE = join(root, "tokens.json");- delete process.env.OMNIRUSH_ENGINE_V2_PREVIEW;+ process.env.OMNIRUSH_ENGINE_V2_PREVIEW = "sidecar";const engineState: { statuses: unknown; permissions: unknown[]; questions: unknown[]; statusCode: number; disposeCode: number; agentCode: number; disposals: number; probes: string[] } = {statuses: {}, permissions: [], questions: [], statusCode: 200, disposeCode: 200, agentCode: 200, disposals: 0, probes: [],};