Skip to content

A desktop coding agent with free access to frontier models.

TypeScript

desktop: omit duplicate generic sidecar from packages

Task Builderac5f8a4401e2
diff --git a/apps/desktop/electron-builder.base.yml b/apps/desktop/electron-builder.base.yml
index b54f6861..f57138e8 100644
--- a/apps/desktop/electron-builder.base.yml
+++ b/apps/desktop/electron-builder.base.yml
@@ -60,7 +60,6 @@ mac:
- from: resources/sidecars
to: sidecars
filter:
- - opencode
- opencode-aarch64-apple-darwin
- opencode-x86_64-apple-darwin
- versions.json
@@ -84,7 +83,6 @@ linux:
- from: resources/sidecars
to: sidecars
filter:
- - opencode
- opencode-aarch64-unknown-linux-gnu
- opencode-x86_64-unknown-linux-gnu
- versions.json
@@ -121,7 +119,6 @@ win:
- from: resources/sidecars
to: sidecars
filter:
- - opencode.exe
- opencode-aarch64-pc-windows-msvc.exe
- opencode-x86_64-pc-windows-msvc.exe
- versions.json
diff --git a/apps/desktop/electron/electron-builder-config.test.mjs b/apps/desktop/electron/electron-builder-config.test.mjs
index a2ff19a4..dfebf888 100644
--- a/apps/desktop/electron/electron-builder-config.test.mjs
+++ b/apps/desktop/electron/electron-builder-config.test.mjs
@@ -32,6 +32,22 @@ describe("Electron distribution configs", () => {
});
});
+ it("ships only architecture-specific sidecars for every desktop OS", async () => {
+ const config = await readConfig("electron-builder.base.yml");
+ const cases = [
+ ["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"],
+ ];
+ for (const [platform, genericName, arm64Name, x64Name] of cases) {
+ const sidecars = config[platform].extraResources.find((resource) => resource.to === "sidecars");
+ assert.ok(sidecars, `${platform} sidecar resource is missing`);
+ assert.ok(sidecars.filter.includes(arm64Name), `${platform} arm64 sidecar is missing`);
+ assert.ok(sidecars.filter.includes(x64Name), `${platform} x64 sidecar is missing`);
+ assert.ok(!sidecars.filter.includes(genericName), `${platform} generic sidecar alias is still packaged`);
+ }
+ });
+
it("keeps the public artifact and protocol unchanged", async () => {
const config = await readConfig("electron-builder.yml");
assert.equal(config.extends, "./electron-builder.base.yml");
diff --git a/apps/desktop/scripts/electron-after-pack.cjs b/apps/desktop/scripts/electron-after-pack.cjs
index d4e095e5..00d5c489 100644
--- a/apps/desktop/scripts/electron-after-pack.cjs
+++ b/apps/desktop/scripts/electron-after-pack.cjs
@@ -140,21 +140,6 @@ function signComputerUseHelper(context) {
}
}
-function copyExecutableTargetToAlias(sidecarsDir, targetName, aliasName) {
- const targetPath = path.join(sidecarsDir, targetName);
- if (!fs.existsSync(targetPath)) {
- throw new Error(`Missing packaged sidecar for target: ${targetName}`);
- }
-
- const aliasPath = path.join(sidecarsDir, aliasName);
- fs.copyFileSync(targetPath, aliasPath);
- try {
- fs.chmodSync(aliasPath, 0o755);
- } catch {
- // Windows and some filesystems may ignore chmod.
- }
-}
-
async function afterPack(context) {
verifyRuntimeDependencies(context);
verifyUiControlMcpBundle(context);
@@ -169,10 +154,10 @@ async function afterPack(context) {
const keep = new Set();
for (const base of sidecarBases) {
- const aliasName = `${base}${executableSuffix}`;
const targetName = `${base}-${triple}${executableSuffix}`;
- copyExecutableTargetToAlias(sidecarsDir, targetName, aliasName);
- keep.add(aliasName);
+ if (!fs.existsSync(path.join(sidecarsDir, targetName))) {
+ throw new Error(`Missing packaged sidecar for target: ${targetName}`);
+ }
keep.add(targetName);
}
diff --git a/apps/desktop/scripts/packaged-smoke.mjs b/apps/desktop/scripts/packaged-smoke.mjs
index f8c812c3..6ec06a4f 100644
--- a/apps/desktop/scripts/packaged-smoke.mjs
+++ b/apps/desktop/scripts/packaged-smoke.mjs
@@ -38,8 +38,14 @@ try {
const archive = join(resources, "app.asar");
if (!existsSync(archive)) throw new Error(`Missing packaged archive: ${archive}`);
accessSync(binary, constants.X_OK);
- const sidecar = join(resources, "sidecars/opencode");
+ const targetTriple = process.arch === "arm64"
+ ? "aarch64-unknown-linux-gnu"
+ : "x86_64-unknown-linux-gnu";
+ const sidecar = join(resources, `sidecars/opencode-${targetTriple}`);
accessSync(sidecar, constants.X_OK);
+ if (existsSync(join(resources, "sidecars/opencode"))) {
+ throw new Error("Packaged sidecar unexpectedly contains the generic opencode alias");
+ }
run("sidecar", sidecar, ["--version"], 10_000, {}, output);
const embedded = pathToFileURL(join(archive, "server/dist/embedded.js")).href;
run("server-import", binary, ["--input-type=module", "-e",