localhost (same as upstream + shuv.ai)
+ // 2. Configured server URL (from desktop settings)
+ if (window.__OPENCODE__?.serverUrl) return window.__OPENCODE__.serverUrl
+
+ // 3. 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
+ // 4. 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 window.location.origin
+ // 5. 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)
+ // 6. Default -> same origin (production web command)
return window.location.origin
})
diff --git a/packages/app/src/components/dialog-fork.tsx b/packages/app/src/components/dialog-fork.tsx
new file mode 100644
index 00000000000..472a1994f13
--- /dev/null
+++ b/packages/app/src/components/dialog-fork.tsx
@@ -0,0 +1,99 @@
+import { Component, createMemo } from "solid-js"
+import { useNavigate, useParams } from "@solidjs/router"
+import { useSync } from "@/context/sync"
+import { useSDK } from "@/context/sdk"
+import { usePrompt } from "@/context/prompt"
+import { useDialog } from "@opencode-ai/ui/context/dialog"
+import { Dialog } from "@opencode-ai/ui/dialog"
+import { List } from "@opencode-ai/ui/list"
+import { extractPromptFromParts } from "@/utils/prompt"
+import type { TextPart as SDKTextPart } from "@opencode-ai/sdk/v2/client"
+import { base64Encode } from "@opencode-ai/util/encode"
+
+interface ForkableMessage {
+ id: string
+ text: string
+ time: string
+}
+
+function formatTime(date: Date): string {
+ return date.toLocaleTimeString(undefined, { timeStyle: "short" })
+}
+
+export const DialogFork: Component = () => {
+ const params = useParams()
+ const navigate = useNavigate()
+ const sync = useSync()
+ const sdk = useSDK()
+ const prompt = usePrompt()
+ const dialog = useDialog()
+
+ const messages = createMemo((): ForkableMessage[] => {
+ const sessionID = params.id
+ if (!sessionID) return []
+
+ const msgs = sync.data.message[sessionID] ?? []
+ const result: ForkableMessage[] = []
+
+ for (const message of msgs) {
+ if (message.role !== "user") continue
+
+ const parts = sync.data.part[message.id] ?? []
+ const textPart = parts.find((x): x is SDKTextPart => x.type === "text" && !x.synthetic && !x.ignored)
+ if (!textPart) continue
+
+ result.push({
+ id: message.id,
+ text: textPart.text.replace(/\n/g, " ").slice(0, 200),
+ time: formatTime(new Date(message.time.created)),
+ })
+ }
+
+ return result.reverse()
+ })
+
+ const handleSelect = (item: ForkableMessage | undefined) => {
+ if (!item) return
+
+ const sessionID = params.id
+ if (!sessionID) return
+
+ const parts = sync.data.part[item.id] ?? []
+ const restored = extractPromptFromParts(parts, { directory: sdk.directory })
+
+ dialog.close()
+
+ sdk.client.session.fork({ sessionID, messageID: item.id }).then((forked) => {
+ if (!forked.data) return
+ navigate(`/${base64Encode(sdk.directory)}/session/${forked.data.id}`)
+ requestAnimationFrame(() => {
+ prompt.set(restored)
+ })
+ })
+ }
+
+ return (
+
+ )
+}
diff --git a/packages/app/src/components/dialog-select-server.tsx b/packages/app/src/components/dialog-select-server.tsx
index 6d224c6c3f3..7e2bcc181ad 100644
--- a/packages/app/src/components/dialog-select-server.tsx
+++ b/packages/app/src/components/dialog-select-server.tsx
@@ -1,4 +1,4 @@
-import { createEffect, createMemo, onCleanup } from "solid-js"
+import { createResource, createEffect, createMemo, onCleanup, Show } from "solid-js"
import { createStore, reconcile } from "solid-js/store"
import { useDialog } from "@opencode-ai/ui/context/dialog"
import { Dialog } from "@opencode-ai/ui/dialog"
@@ -35,6 +35,8 @@ export function DialogSelectServer() {
error: "",
status: {} as Record
,
})
+ const [defaultUrl, defaultUrlActions] = createResource(() => platform.getDefaultServerUrl?.())
+ const isDesktop = platform.platform === "desktop"
const items = createMemo(() => {
const current = server.url
@@ -173,6 +175,53 @@ export function DialogSelectServer() {