fix: resolve post-merge type errors and missing imports for v1.2.7 sync

Author: shuv1337

bun.lock

@@ -107,7 +107,6 @@
   },
   "patchedDependencies": {
     "ghostty-opentui@1.3.7": "patches/ghostty-opentui@1.3.7.patch",
-    "ghostty-web@0.3.0": "patches/ghostty-web@0.3.0.patch",
     "@standard-community/standard-openapi@0.2.9": "patches/@standard-community%2Fstandard-openapi@0.2.9.patch",
     "@openrouter/ai-sdk-provider@1.5.4": "patches/@openrouter%2Fai-sdk-provider@1.5.4.patch"
   }

package.json

@@ -68,29 +68,6 @@ declare global {
   }
 }
 
-const defaultServerUrl = iife(() => {
-  // NOTE: The ?url= query parameter was intentionally removed due to CVE-2026-22813 (GHSA-c83v-7274-4vgp)
-  // Allowing arbitrary server URLs via query params enables XSS attacks on localhost:4096
-
-  // 1. Configured server URL (from desktop settings)
-  if (window.__OPENCODE__?.serverUrl) return window.__OPENCODE__.serverUrl
-
-  // 2. Known production hosts -> localhost (same as upstream + shuv.ai)
-  if (location.hostname.includes("opencode.ai") || location.hostname.includes("shuv.ai")) return "http://localhost:4096"
-
-  // 3. Desktop app (Tauri) with injected port
-  if (window.__SHUVCODE__?.port) return `http://127.0.0.1:${window.__SHUVCODE__.port}`
-  if (window.__OPENCODE__?.port) return `http://127.0.0.1:${window.__OPENCODE__.port}`
-
-  // 4. Dev mode -> same-origin so Vite proxy handles LAN access + CORS
-  if (import.meta.env.DEV) {
-    return `http://${import.meta.env.VITE_OPENCODE_SERVER_HOST ?? "localhost"}:${import.meta.env.VITE_OPENCODE_SERVER_PORT ?? "4096"}`
-  }
-
-  // 5. Default -> same origin (production web command)
-  return window.location.origin
-})
-
 function MarkedProviderWithNativeParser(props: ParentProps) {
   const platform = usePlatform()
   return <MarkedProvider nativeParser={platform.parseMarkdown}>{props.children}</MarkedProvider>

packages/app/src/app.tsx

@@ -4,7 +4,7 @@ import { AsciiLogo } from "@opencode-ai/ui/logo"
 import { Button } from "@opencode-ai/ui/button"
 import { TextField } from "@opencode-ai/ui/text-field"
 import { Icon } from "@opencode-ai/ui/icon"
-import { normalizeServerUrl, serverDisplayName, useServer } from "@/context/server"
+import { normalizeServerUrl, ServerConnection, serverDisplayName, useServer } from "@/context/server"
 import { usePlatform } from "@/context/platform"
 import { createOpencodeClient } from "@opencode-ai/sdk/v2/client"
 import { isHostedEnvironment, hasUrlQueryParam, getUrlQueryParam } from "@/utils/hosted"
@@ -46,14 +46,15 @@ export function WelcomeScreen(props: WelcomeScreenProps) {
 
   const items = createMemo(() => {
     const list = server.list
-    return list.filter((x) => x !== props.attemptedUrl)
+    return list.filter((x) => ServerConnection.key(x) !== props.attemptedUrl)
   })
 
   async function refreshHealth() {
     const results: Record<string, ServerStatus> = {}
     await Promise.all(
-      items().map(async (url) => {
-        results[url] = await checkHealth(url, platform.fetch)
+      items().map(async (conn) => {
+        const key = ServerConnection.key(conn)
+        results[key] = await checkHealth(conn.http.url, platform.fetch)
       }),
     )
     setStore("status", reconcile(results))
@@ -84,7 +85,7 @@ export function WelcomeScreen(props: WelcomeScreenProps) {
     if (persist) {
       server.add(normalized)
     } else {
-      server.setActive(normalized)
+      server.setActive(ServerConnection.Key.make(normalized))
     }
     props.onRetry?.()
   }
@@ -177,32 +178,35 @@ export function WelcomeScreen(props: WelcomeScreenProps) {
             <h2 class="text-sm font-medium text-text-strong">Saved Servers</h2>
             <div class="flex flex-col gap-2">
               <For each={items()}>
-                {(url) => (
-                  <button
-                    type="button"
-                    class="flex items-center gap-3 p-2 rounded hover:bg-background-base transition-colors text-left"
-                    onClick={() => handleConnect(url)}
-                    disabled={store.status[url]?.healthy === false}
-                  >
-                    <div
-                      classList={{
-                        "size-2 rounded-full shrink-0": true,
-                        "bg-icon-success-base": store.status[url]?.healthy === true,
-                        "bg-icon-critical-base": store.status[url]?.healthy === false,
-                        "bg-border-weak-base": store.status[url] === undefined,
-                      }}
-                    />
-                    <span
-                      class="truncate text-sm"
-                      classList={{ "text-text-weak": store.status[url]?.healthy === false }}
+                {(conn) => {
+                  const key = ServerConnection.key(conn)
+                  return (
+                    <button
+                      type="button"
+                      class="flex items-center gap-3 p-2 rounded hover:bg-background-base transition-colors text-left"
+                      onClick={() => handleConnect(conn.http.url)}
+                      disabled={store.status[key]?.healthy === false}
                     >
-                      {serverDisplayName(url)}
-                    </span>
-                    <Show when={store.status[url]?.version}>
-                      <span class="text-xs text-text-weak ml-auto">{store.status[url]?.version}</span>
-                    </Show>
-                  </button>
-                )}
+                      <div
+                        classList={{
+                          "size-2 rounded-full shrink-0": true,
+                          "bg-icon-success-base": store.status[key]?.healthy === true,
+                          "bg-icon-critical-base": store.status[key]?.healthy === false,
+                          "bg-border-weak-base": store.status[key] === undefined,
+                        }}
+                      />
+                      <span
+                        class="truncate text-sm"
+                        classList={{ "text-text-weak": store.status[key]?.healthy === false }}
+                      >
+                        {serverDisplayName(conn)}
+                      </span>
+                      <Show when={store.status[key]?.version}>
+                        <span class="text-xs text-text-weak ml-auto">{store.status[key]?.version}</span>
+                      </Show>
+                    </button>
+                  )
+                }}
               </For>
             </div>
           </div>

packages/app/src/components/welcome-screen.tsx

@@ -354,54 +354,6 @@ function createGlobalSync() {
       return
     }
 
-    return Promise.all([
-      retry(() =>
-        globalSDK.client.path.get().then((x) => {
-          setGlobalStore("path", x.data!)
-        }),
-      ),
-      retry(() =>
-        globalSDK.client.global.config.get().then((x) => {
-          setGlobalStore("config", x.data!)
-        }),
-      ),
-      retry(() =>
-        globalSDK.client.project.list().then(async (x) => {
-          const data = Array.isArray(x.data) ? x.data : []
-          const projects = data
-            .filter((p) => !!p?.id)
-            .filter((p) => !!p.worktree && !p.worktree.includes("opencode-test"))
-            .slice()
-            .sort((a, b) => cmp(a.id, b.id))
-          setGlobalStore("project", projects)
-        }),
-      ),
-      retry(() =>
-        globalSDK.client.provider.list().then((x) => {
-          setGlobalStore("provider", normalizeProviderList(x.data!))
-        }),
-      ),
-      retry(() =>
-        globalSDK.client.provider.auth().then((x) => {
-          setGlobalStore("provider_auth", x.data ?? {})
-        }),
-      ),
-    ])
-      .then(() => {
-        setGlobalStore("ready", true)
-        setGlobalStore("connectionState", "ready")
-      })
-      .catch((e) => {
-        setGlobalStore("error", e)
-        setGlobalStore("connectionState", "error")
-      })
-  }
-      // For non-hosted environments, show the error page
-      setGlobalStore("error", new Error(language.t("error.globalSync.connectFailed", { url: globalSDK.url })))
-      setGlobalStore("connectionState", "error")
-      return
-    }
-
     return Promise.all([
       retry(() =>
         globalSDK.client.path.get().then((x) => {

packages/app/src/context/global-sync.tsx

@@ -113,7 +113,9 @@ const platform: Platform = {
 const defaultUrl = iife(() => {
   const lsDefault = readDefaultServerUrl()
   if (lsDefault) return lsDefault
-  if (location.hostname.includes("opencode.ai")) return "http://localhost:4096"
+  if (location.hostname.includes("opencode.ai") || location.hostname.includes("shuv.ai")) return "http://localhost:4096"
+  // Desktop app (Tauri) with injected port
+  if (window.__SHUVCODE__?.port) return `http://127.0.0.1:${window.__SHUVCODE__.port}`
   if (import.meta.env.DEV)
     return `http://${import.meta.env.VITE_OPENCODE_SERVER_HOST ?? "localhost"}:${import.meta.env.VITE_OPENCODE_SERVER_PORT ?? "4096"}`
   return location.origin

packages/app/src/entry.tsx

@@ -7,9 +7,7 @@ import { createStore } from "solid-js/store"
 import { ResizeHandle } from "@opencode-ai/ui/resize-handle"
 import { Select } from "@opencode-ai/ui/select"
 import { createAutoScroll } from "@opencode-ai/ui/hooks"
-import { SessionReview } from "@opencode-ai/ui/session-review"
 import { AsciiMark } from "@opencode-ai/ui/logo"
-import { QuestionDock } from "@/components/question-dock"
 import { LineComment as LineCommentView, LineCommentEditor } from "@opencode-ai/ui/line-comment"
 import { decode64 } from "@/utils/base64"
 

packages/app/src/pages/session.tsx

@@ -160,7 +160,7 @@ export function Session() {
   const [showAssistantMetadata, setShowAssistantMetadata] = kv.signal("assistant_metadata_visibility", true)
   const [showScrollbar, setShowScrollbar] = kv.signal("scrollbar_visible", false)
   const [showHeader, setShowHeader] = kv.signal("header_visible", true)
-  const [diffWrapMode] = kv.signal<"word" | "none">("diff_wrap_mode", "word")
+  const [diffWrapMode, setDiffWrapMode] = kv.signal<"word" | "none">("diff_wrap_mode", "word")
   const [animationsEnabled, setAnimationsEnabled] = kv.signal("animations_enabled", true)
   const [headerVisible, setHeaderVisible] = kv.signal("header_visible", true)
   const [draggingSidebar, setDraggingSidebar] = createSignal(false)

packages/opencode/src/cli/cmd/tui/routes/session/index.tsx

@@ -43,7 +43,7 @@ export namespace File {
 
   export const Content = z
     .object({
-      type: z.literal("text"),
+      type: z.enum(["text", "binary"]),
       content: z.string(),
       diff: z.string().optional(),
       patch: z

packages/opencode/src/file/index.ts

@@ -13,6 +13,8 @@ import { BusEvent } from "@/bus/bus-event"
 import { iife } from "@/util/iife"
 import { GlobalBus } from "@/bus/global"
 import { existsSync } from "fs"
+import fs from "fs/promises"
+import { $ } from "bun"
 import { git } from "../util/git"
 import { Glob } from "../util/glob"