feat: classic layout by default + upstream dev sync (228e9095ba)

README.md

@@ -14,7 +14,7 @@
 </p>
 
 > [!IMPORTANT]
-> OpenCode Classic is an unofficial Linux-focused fork that tracks upstream while preserving the classic desktop layout. Its releases and updater are maintained independently at [`LogicLyra/opencode-classic`](https://github.com/LogicLyra/opencode-classic). Translated READMEs are inherited from upstream and may contain upstream installation links.
+> OpenCode Classic is an unofficial Linux-focused fork that tracks upstream, defaults to the classic desktop layout, and keeps the redesigned layout available in Settings. Its releases and updater are maintained independently at [`LogicLyra/opencode-classic`](https://github.com/LogicLyra/opencode-classic). Translated READMEs are inherited from upstream and may contain upstream installation links.
 
 <p align="center">
   <a href="README.md">English</a> |

packages/app/src/context/settings.test.ts

@@ -29,8 +29,8 @@ describe("agent visibility", () => {
 })
 
 describe("layout transition", () => {
-  test("blank profiles default to the new layout", () => {
-    expect(newLayoutDesignsDefault).toBe(true)
+  test("blank profiles default to the classic layout (fork)", () => {
+    expect(newLayoutDesignsDefault).toBe(false)
   })
 
   test("hides the transition until a sunset is scheduled", () => {
@@ -70,8 +70,8 @@ describe("layout transition", () => {
     expect(shouldEnableNewLayout("1.16.9", "2.0.0")).toBe(true)
   })
 
-  test("enables the new layout when no previous version was recorded", () => {
-    expect(shouldEnableNewLayout(undefined, "1.17.20")).toBe(true)
+  test("does not auto-migrate first launches to the new layout (fork)", () => {
+    expect(shouldEnableNewLayout(undefined, "1.17.20")).toBe(false)
   })
 
   test("detects upgrades only when a previous version is older", () => {

packages/app/src/context/settings.tsx

@@ -57,8 +57,10 @@ export interface Settings {
 export const monoDefault = "System Mono"
 export const sansDefault = "System Sans"
 export const terminalDefault = "JetBrainsMono Nerd Font Mono"
-const legacyNewLayoutDesignsDefault = import.meta.env.VITE_OPENCODE_CHANNEL !== "prod"
-export const newLayoutDesignsDefault = true
+// fork: classic layout is the default on every channel, including before the store loads
+const legacyNewLayoutDesignsDefault = false
+// fork: fresh profiles start on the classic layout; the new layout stays one toggle away
+export const newLayoutDesignsDefault = false
 // Existing users can switch layouts until local midnight on this date. Set new Date(YYYY, M-1, D) to show.
 // fork: the classic interface is preserved indefinitely; no sunset, no forced retirement
 export let oldInterfaceSunset: Date | null = null
@@ -103,7 +105,9 @@ export function initialAgentVisibility(initialized: boolean | undefined, existin
 export function shouldEnableNewLayout(previous: string | undefined, current: string | undefined) {
   if (!current) return false
   const currentComparison = compareVersions(current, newLayoutDesignsUpgradeCutoff)
-  if (!previous) return currentComparison !== undefined && currentComparison > 0
+  // fork: first launches never auto-migrate to the new layout; only genuine
+  // upgrades from before the cutoff do
+  if (!previous) return false
   if (!isAppUpgrade(previous, current)) return false
   const previousComparison = compareVersions(previous, newLayoutDesignsUpgradeCutoff)
   return (

packages/app/src/i18n/en.ts

@@ -954,7 +954,7 @@ export const dict = {
   "settings.general.row.newInterface.title": "New layout",
   "settings.general.row.newInterface.badge": "New",
   "settings.general.row.newInterface.description":
-    "Use the new tabs and home layout. Switch between layouts for a limited time.",
+    "Use the new tabs and home layout. Switch between layouts anytime.",
   "settings.general.row.newInterfaceNotice.title": "You're now using new layout",
   "settings.general.row.newInterfaceNotice.description": "The previous layout is no longer available",
   "settings.general.row.newInterfaceNotice.dismiss": "Dismiss",

packages/desktop/scripts/copy-metainfo.ts

@@ -5,7 +5,7 @@ const arg = process.argv[2]
 const channel = arg === "dev" || arg === "beta" || arg === "prod" ? arg : resolveChannel()
 
 const identity = DESKTOP_IDENTITIES[channel]
-const summary = `Open source AI coding agent${channel !== "prod" ? ` (${channel})` : ""}`
+const summary = `Open source AI coding agent with the classic desktop layout${channel !== "prod" ? ` (${channel})` : ""}`
 const repository = `https://github.com/${DESKTOP_RELEASE_REPOSITORY.owner}/${DESKTOP_RELEASE_REPOSITORY.repo}`
 
 const xml = `<?xml version="1.0" encoding="UTF-8"?>
@@ -26,6 +26,11 @@ const xml = `<?xml version="1.0" encoding="UTF-8"?>
     <p>
       OpenCode is an open source agent that helps you write and run code with any AI model.
     </p>
+    <p>
+      OpenCode Classic is an unofficial Linux-focused build that defaults to the classic desktop
+      layout; the redesigned layout stays available under Settings, and releases are maintained
+      independently from upstream.
+    </p>
   </description>
 
   <launchable type="desktop-id">${identity.appId}.desktop</launchable>

packages/ui/src/components/provider-icons/types.ts

@@ -52,6 +52,7 @@ export const iconNames = [
   "minimax-coding-plan",
   "minimax-cn",
   "minimax-cn-coding-plan",
+  "merge-gateway",
   "meganova",
   "lucidquery",
   "lmstudio",