A desktop coding agent with free access to frontier models.
TypeScript
feat: uploads name the new engine's message shape
ogsamrat70f400df9f1d
diff --git a/apps/server/src/engine-identity.test.ts b/apps/server/src/engine-identity.test.tsindex 49048632..9bf02fc4 100644--- a/apps/server/src/engine-identity.test.ts+++ b/apps/server/src/engine-identity.test.ts@@ -40,6 +40,7 @@ function expectHarness(value: unknown): void {engine: "omnirush-opencode",version: BUNDLED_HARNESS.version,build_tag: BUNDLED_HARNESS.build_tag,+ engine_schema: "opencode-v2",});const harness = value as Record<string, unknown>;for (const key of ["name", "engine", "version", "build_tag"]) {@@ -65,6 +66,7 @@ describe("engine identity", () => {expect(engineBuildVersion("", "v1.18.32")).toBe("1.18.32");const harness = opencodeHarness("engine-1.18.32-r2", "v1.18.32");expect(harness).toEqual({ name: "opencode", engine: "omnirush-opencode", version: "1.18.32-r2", build_tag: "engine-1.18.32-r2" });+ expect(opencodeHarness("engine-2.0.32-r2", "2.0.32")).toEqual({ name: "opencode", engine: "omnirush-opencode", version: "2.0.32-r2", build_tag: "engine-2.0.32-r2", engine_schema: "opencode-v2" });expect(engineVersionOf(harness)).toBe("opencode/1.18.32-r2");// Never empty, even without a tag or version.const bare = opencodeHarness("", "");@@ -78,6 +80,8 @@ describe("engine identity", () => {expect(data.engine).toBe("opencode");expect(data.engine_version).toBe(BUNDLED_ENGINE_VERSION);expectHarness(data.harness);+ expect("engine_migrated_from" in data).toBe(false);+ expect(clientLaunchData("1.18.32").engine_migrated_from).toBe("1.18.32");});});diff --git a/apps/server/src/engine-identity.ts b/apps/server/src/engine-identity.tsindex cfe50d6b..6ee5188f 100644--- a/apps/server/src/engine-identity.ts+++ b/apps/server/src/engine-identity.ts@@ -16,6 +16,8 @@ export type Harness = {version: string;/** The engine release it came from ("engine-1.18.32-r2"). */build_tag: string;+ /** A 2.x engine: its uploads hold its own message shape, unrenamed (the CLI sends the same). */+ engine_schema?: "opencode-v2";};const RELEASE_TAG_PREFIX = "engine-";@@ -35,6 +37,7 @@ export function opencodeHarness(buildTag: string, fallbackVersion: string): Harnengine: "omnirush-opencode",version,build_tag: buildTag.trim() || `${RELEASE_TAG_PREFIX}${version}`,+ ...(Number(version.split(".")[0]) >= 2 ? { engine_schema: "opencode-v2" as const } : {}),};}diff --git a/apps/server/src/engine-v2-migration.ts b/apps/server/src/engine-v2-migration.tsindex b195b864..8505975f 100644--- a/apps/server/src/engine-v2-migration.ts+++ b/apps/server/src/engine-v2-migration.ts@@ -15,7 +15,13 @@ import { dirname, join } from "node:path";import { importNodeSqlite } from "./runtime-db.js";export const MIGRATED_SESSIONS_FILE = "v1-migrated-sessions.json";-export const MIGRATED_FROM = "opencode/1.18.32";+/** The 1.x engine a migrated chat came from (the CLI sends the same value). */+export const MIGRATED_FROM = "1.18.32";++/** The 2.x engine's own folder under the server's runtime storage dir (engine-v2-preview.ts). */+export function engineV2Root(runtimeStorageDir: string): string {+ return join(runtimeStorageDir, "opencode-v2", "state");+}type Sqlite = { exec(sql: string): void; all(sql: string): unknown[]; close(): void };diff --git a/apps/server/src/engine-v2-preview.ts b/apps/server/src/engine-v2-preview.tsindex d94df6fa..07a9e7b1 100644--- a/apps/server/src/engine-v2-preview.ts+++ b/apps/server/src/engine-v2-preview.ts@@ -22,7 +22,7 @@ import { selectPrimaryCredentialEnvName } from "./managed-provider-auth.js";import { isReleaseBuild } from "./release-guard.js";import { webSearchSetting } from "./web-search.js";import { engineDataDir } from "./engine-data-home.js";-import { readMigratedSessions, seedV2StoreFromV1 } from "./engine-v2-migration.js";+import { engineV2Root, readMigratedSessions, seedV2StoreFromV1 } from "./engine-v2-migration.js";import type { ServerConfig } from "./types.js";const PREVIEW_STATE_FILE = "engine-v2-preview.json";@@ -298,7 +298,7 @@ export async function assertSessionPluginActive(export function createEngineV2Preview(options: { config: ServerConfig; env?: Pick<EnvService, "list" | "onChange">; deferStart?: boolean }): EngineV2Preview {const { config } = options;- const rootDir = join(runtimeStorageDir(config), "opencode-v2", "state");+ const rootDir = engineV2Root(runtimeStorageDir(config));const workspaceDir = join(rootDir, "workspace");const initialState = resolveInitialEngineV2PreviewState(process.env, readEngineV2PreviewState(config));let enabled = initialState.enabled;diff --git a/apps/server/src/managed-opencode-v2.env.test.ts b/apps/server/src/managed-opencode-v2.env.test.tsindex c2c7ebdf..09f222c3 100644--- a/apps/server/src/managed-opencode-v2.env.test.ts+++ b/apps/server/src/managed-opencode-v2.env.test.ts@@ -28,6 +28,7 @@ posix("the v2 engine gets its own empty config home, not the user's global opencexpect(env).toMatch(/^OMNIRUSH_GATE_PROVIDERS=omnirush$/m);expect(env).toMatch(/^OMNIRUSH_GATE_MCP=$/m);expect(env).toMatch(/^OMNIRUSH_NO_SYSTEM_CONFIG=1$/m);+ expect(env).toMatch(/^OPENCODE_DISABLE_AUTOUPDATE=1$/m);expect(/^XDG_DATA_HOME=(.*)$/m.exec(env)?.[1]).toBe(join(dir, "state", "data"));} finally {await rm(dir, { recursive: true, force: true });diff --git a/apps/server/src/managed-opencode-v2.ts b/apps/server/src/managed-opencode-v2.tsindex ef9a3bda..125fd9c7 100644--- a/apps/server/src/managed-opencode-v2.ts+++ b/apps/server/src/managed-opencode-v2.ts@@ -171,6 +171,8 @@ export async function createManagedOpencodeV2Server(OMNIRUSH_USER_XDG_CONFIG_HOME: inherited.XDG_CONFIG_HOME ?? "",// Claude Code's global files (~/.claude) are not read either.OPENCODE_DISABLE_CLAUDE_CODE: "1",+ // The engine's update check reads only the user's own global config, not ours: never replace the bundled engine.+ OPENCODE_DISABLE_AUTOUPDATE: "1",// A project's own config stays on (its AGENTS.md is stock behaviour); the engine keeps only its// descriptive keys there and loads none of its plugins, MCP servers or providers....(opencodeModelsUrl === undefined ? {} : { OPENCODE_MODELS_URL: opencodeModelsUrl }),diff --git a/apps/server/src/session-uploader.ts b/apps/server/src/session-uploader.tsindex e0707dc2..67173404 100644--- a/apps/server/src/session-uploader.ts+++ b/apps/server/src/session-uploader.ts@@ -1,4 +1,5 @@import { permissionSetupSettings, type ApprovalMode } from "./approval-mode.js";+import { engineV2Root, MIGRATED_FROM, readMigratedSessions } from "./engine-v2-migration.js";import { gitChildEnv } from "./git-env.js";import { createHash, randomBytes } from "node:crypto";import { execFile, spawn } from "node:child_process";@@ -295,6 +296,8 @@ export type UploadEnvironment = {engine_version: string;/** Which engine and harness produced the upload; the same shape the CLI sends. */harness: Harness;+ /** "opencode-v2": the engine's own 2.x message shape (absent for a 1.x engine). */+ engine_schema?: "opencode-v2";node_version: string;shell: string | null;locale: string | null;@@ -4502,8 +4505,12 @@ async function gitSkippedField(): Promise<{ git_skipped?: string }> {const SERVER_PACKAGE_VERSION: string = serverPackage.version;/** The desktop's `client.launch` trace data: the CLI's keys, plus the harness. */-export function clientLaunchData(): { mode: "app"; engine: "opencode"; engine_version: string; harness: Harness } {- return { mode: "app", engine: "opencode", engine_version: BUNDLED_ENGINE_VERSION, harness: { ...BUNDLED_HARNESS } };+export function clientLaunchData(migratedFrom: string | null = null): { mode: "app"; engine: "opencode"; engine_version: string; harness: Harness; engine_migrated_from?: string } {+ return {+ mode: "app", engine: "opencode", engine_version: BUNDLED_ENGINE_VERSION, harness: { ...BUNDLED_HARNESS },+ // A chat continued from the 1.x engine's store (engine-v2-migration.ts): left out of deliveries.+ ...(migratedFrom ? { engine_migrated_from: migratedFrom } : {}),+ };}function uploadEnvironment(appVersion: string | undefined, engineVersion: string | undefined, gitVersion: string | null): UploadEnvironment {@@ -4526,6 +4533,7 @@ function uploadEnvironment(appVersion: string | undefined, engineVersion: stringapp_version: field(appVersion) ?? field(SERVER_PACKAGE_VERSION) ?? "unknown",engine_version: field(engineVersion) ?? BUNDLED_ENGINE_VERSION,harness: { ...BUNDLED_HARNESS },+ ...(BUNDLED_HARNESS.engine_schema ? { engine_schema: BUNDLED_HARNESS.engine_schema } : {}),node_version: field(process.versions.node ?? process.version.replace(/^v/, "")) ?? "",shell: shellPath?.trim() ? field(basename(shellPath.trim())) : null,locale: field(locale),@@ -5885,7 +5893,8 @@ export class SessionUploader {// type, kept as sent); it shares the trace's event cap.if (!state.launchRecorded) {state.launchRecorded = true;- this.appendTrace(state, "client.launch", clientLaunchData());+ const migrated = this.stateDir !== null && readMigratedSessions(engineV2Root(this.stateDir)).has(sessionId);+ this.appendTrace(state, "client.launch", clientLaunchData(migrated ? MIGRATED_FROM : null));}this.appendTrace(state, type, data);if (type === "computer.session" && isRecord(data)) this.markComputerUse(sessionId, data);