From d7e1cde37f6b2af48fd6274d99f9085f32080b55 Mon Sep 17 00:00:00 2001
From: dbpolito <danielbpolito@gmail.com>
Date: Sun, 11 Jan 2026 16:08:00 -0300
Subject: [PATCH 1/2] feat(desktop): Fork Message from Message Nav

---
 packages/app/src/pages/session.tsx            | 17 ++++++
 packages/ui/src/components/message-nav.css    | 52 +++++++++++++++++++
 packages/ui/src/components/message-nav.tsx    | 34 ++++++++----
 .../src/components/session-message-rail.tsx   | 13 ++++-
 4 files changed, 106 insertions(+), 10 deletions(-)

diff --git a/packages/app/src/pages/session.tsx b/packages/app/src/pages/session.tsx
index 69065a8fa7a0..c5fde864b1d1 100644
--- a/packages/app/src/pages/session.tsx
+++ b/packages/app/src/pages/session.tsx
@@ -908,6 +908,22 @@ export default function Page() {
     updateHash(message.id)
   }
 
+  const forkFromMessage = (message: UserMessage) => {
+    const sessionID = params.id
+    if (!sessionID) return
+
+    const parts = sync.data.part[message.id] ?? []
+    const restored = extractPromptFromParts(parts, { directory: sdk.directory })
+
+    sdk.client.session.fork({ sessionID, messageID: message.id }).then((forked) => {
+      if (!forked.data) return
+      navigate(`/${base64Encode(sdk.directory)}/session/${forked.data.id}`)
+      requestAnimationFrame(() => {
+        prompt.set(restored)
+      })
+    })
+  }
+
   const getActiveMessageId = (container: HTMLDivElement) => {
     const cutoff = container.scrollTop + 100
     const nodes = container.querySelectorAll<HTMLElement>("[data-message-id]")
@@ -1095,6 +1111,7 @@ export default function Page() {
                             messages={visibleUserMessages()}
                             current={activeMessage()}
                             onMessageSelect={scrollToMessage}
+                            onFork={forkFromMessage}
                             wide={!showTabs()}
                             class="pointer-events-auto"
                           />
diff --git a/packages/ui/src/components/message-nav.css b/packages/ui/src/components/message-nav.css
index 465bd66fe5b1..3ef07179bb0a 100644
--- a/packages/ui/src/components/message-nav.css
+++ b/packages/ui/src/components/message-nav.css
@@ -13,6 +13,7 @@
 }
 
 [data-slot="message-nav-item"] {
+  position: relative;
   display: flex;
   align-items: center;
   align-self: stretch;
@@ -91,6 +92,57 @@
   color: var(--text-base);
 }
 
+[data-slot="message-nav-item"] > [data-component="tooltip-trigger"] {
+  position: absolute;
+  top: 50%;
+  right: 4px;
+  transform: translateY(-50%);
+  opacity: 0;
+  transition: opacity 0.15s;
+}
+
+[data-slot="message-nav-item"]:hover > [data-component="tooltip-trigger"] {
+  opacity: 1;
+}
+
+[data-slot="message-nav-fork-button"] {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 24px;
+  height: 24px;
+  border: none;
+  background-color: var(--smoke-dark-5);
+  padding: 0;
+  cursor: pointer;
+  color: var(--icon-base);
+  border-radius: var(--radius-sm);
+  transition:
+    background-color 0.15s,
+    color 0.15s;
+}
+
+[data-slot="message-nav-fork-button"]:hover {
+  background-color: var(--smoke-dark-6);
+  color: var(--icon-strong-base);
+}
+
+[data-slot="message-nav-fork-button"]:active {
+  background-color: var(--smoke-dark-7);
+}
+
+[data-slot="message-nav-tooltip-content"] [data-slot="message-nav-fork-button"] {
+  background-color: var(--smoke-dark-6);
+}
+
+[data-slot="message-nav-tooltip-content"] [data-slot="message-nav-fork-button"]:hover {
+  background-color: var(--smoke-dark-7);
+}
+
+[data-slot="message-nav-tooltip-content"] [data-slot="message-nav-fork-button"]:active {
+  background-color: var(--smoke-dark-8);
+}
+
 [data-slot="message-nav-tooltip"] {
   z-index: 1000;
 }
diff --git a/packages/ui/src/components/message-nav.tsx b/packages/ui/src/components/message-nav.tsx
index 7416cfd9398a..463e1e58901f 100644
--- a/packages/ui/src/components/message-nav.tsx
+++ b/packages/ui/src/components/message-nav.tsx
@@ -1,7 +1,9 @@
 import { UserMessage } from "@opencode-ai/sdk/v2"
 import { ComponentProps, For, Match, Show, splitProps, Switch } from "solid-js"
 import { DiffChanges } from "./diff-changes"
-import { Tooltip } from "@kobalte/core/tooltip"
+import { Tooltip as KobalteTooltip } from "@kobalte/core/tooltip"
+import { Tooltip } from "./tooltip"
+import { Icon } from "./icon"
 
 export function MessageNav(
   props: ComponentProps<"ul"> & {
@@ -9,9 +11,10 @@ export function MessageNav(
     current?: UserMessage
     size: "normal" | "compact"
     onMessageSelect: (message: UserMessage) => void
+    onFork?: (message: UserMessage) => void
   },
 ) {
-  const [local, others] = splitProps(props, ["messages", "current", "size", "onMessageSelect"])
+  const [local, others] = splitProps(props, ["messages", "current", "size", "onMessageSelect", "onFork"])
 
   const content = () => (
     <ul role="list" data-component="message-nav" data-size={local.size} {...others}>
@@ -39,6 +42,19 @@ export function MessageNav(
                       </Show>
                     </div>
                   </button>
+                  <Show when={local.onFork}>
+                    <Tooltip value="Fork from here" placement="top">
+                      <button
+                        data-slot="message-nav-fork-button"
+                        onClick={(e) => {
+                          e.stopPropagation()
+                          local.onFork?.(message)
+                        }}
+                      >
+                        <Icon name="branch" size="small" />
+                      </button>
+                    </Tooltip>
+                  </Show>
                 </Match>
               </Switch>
             </li>
@@ -51,16 +67,16 @@ export function MessageNav(
   return (
     <Switch>
       <Match when={local.size === "compact"}>
-        <Tooltip openDelay={0} closeDelay={300} placement="right-start" gutter={-40} shift={-10} overlap>
-          <Tooltip.Trigger as="div">{content()}</Tooltip.Trigger>
-          <Tooltip.Portal>
-            <Tooltip.Content data-slot="message-nav-tooltip">
+        <KobalteTooltip openDelay={0} closeDelay={300} placement="right-start" gutter={-40} shift={-10} overlap>
+          <KobalteTooltip.Trigger as="div">{content()}</KobalteTooltip.Trigger>
+          <KobalteTooltip.Portal>
+            <KobalteTooltip.Content data-slot="message-nav-tooltip">
               <div data-slot="message-nav-tooltip-content">
                 <MessageNav {...props} size="normal" class="" />
               </div>
-            </Tooltip.Content>
-          </Tooltip.Portal>
-        </Tooltip>
+            </KobalteTooltip.Content>
+          </KobalteTooltip.Portal>
+        </KobalteTooltip>
       </Match>
       <Match when={local.size === "normal"}>{content()}</Match>
     </Switch>
diff --git a/packages/ui/src/components/session-message-rail.tsx b/packages/ui/src/components/session-message-rail.tsx
index 1935a4f930ed..7a50844f7eeb 100644
--- a/packages/ui/src/components/session-message-rail.tsx
+++ b/packages/ui/src/components/session-message-rail.tsx
@@ -8,10 +8,19 @@ export interface SessionMessageRailProps extends ComponentProps<"div"> {
   current?: UserMessage
   wide?: boolean
   onMessageSelect: (message: UserMessage) => void
+  onFork?: (message: UserMessage) => void
 }
 
 export function SessionMessageRail(props: SessionMessageRailProps) {
-  const [local, others] = splitProps(props, ["messages", "current", "wide", "onMessageSelect", "class", "classList"])
+  const [local, others] = splitProps(props, [
+    "messages",
+    "current",
+    "wide",
+    "onMessageSelect",
+    "onFork",
+    "class",
+    "classList",
+  ])
 
   return (
     <Show when={(local.messages?.length ?? 0) > 1}>
@@ -29,6 +38,7 @@ export function SessionMessageRail(props: SessionMessageRailProps) {
             messages={local.messages}
             current={local.current}
             onMessageSelect={local.onMessageSelect}
+            onFork={local.onFork}
             size="compact"
           />
         </div>
@@ -37,6 +47,7 @@ export function SessionMessageRail(props: SessionMessageRailProps) {
             messages={local.messages}
             current={local.current}
             onMessageSelect={local.onMessageSelect}
+            onFork={local.onFork}
             size={local.wide ? "normal" : "compact"}
           />
         </div>

From 4c989c9269f1d54f09471f5deed528b79282de83 Mon Sep 17 00:00:00 2001
From: dbpolito <danielbpolito@gmail.com>
Date: Sun, 11 Jan 2026 16:15:24 -0300
Subject: [PATCH 2/2] Remove dupe logic

---
 packages/app/src/components/dialog-fork.tsx | 27 +++----------------
 packages/app/src/hooks/use-fork-session.ts  | 30 +++++++++++++++++++++
 packages/app/src/pages/session.tsx          | 20 +++-----------
 3 files changed, 37 insertions(+), 40 deletions(-)
 create mode 100644 packages/app/src/hooks/use-fork-session.ts

diff --git a/packages/app/src/components/dialog-fork.tsx b/packages/app/src/components/dialog-fork.tsx
index 472a1994f13f..da8561ae2f42 100644
--- a/packages/app/src/components/dialog-fork.tsx
+++ b/packages/app/src/components/dialog-fork.tsx
@@ -1,14 +1,11 @@
 import { Component, createMemo } from "solid-js"
-import { useNavigate, useParams } from "@solidjs/router"
+import { 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 { useForkSession } from "@/hooks/use-fork-session"
 import type { TextPart as SDKTextPart } from "@opencode-ai/sdk/v2/client"
-import { base64Encode } from "@opencode-ai/util/encode"
 
 interface ForkableMessage {
   id: string
@@ -22,11 +19,9 @@ function formatTime(date: Date): string {
 
 export const DialogFork: Component = () => {
   const params = useParams()
-  const navigate = useNavigate()
   const sync = useSync()
-  const sdk = useSDK()
-  const prompt = usePrompt()
   const dialog = useDialog()
+  const forkSession = useForkSession()
 
   const messages = createMemo((): ForkableMessage[] => {
     const sessionID = params.id
@@ -54,22 +49,8 @@ export const DialogFork: Component = () => {
 
   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)
-      })
-    })
+    forkSession(item.id)
   }
 
   return (
diff --git a/packages/app/src/hooks/use-fork-session.ts b/packages/app/src/hooks/use-fork-session.ts
new file mode 100644
index 000000000000..0964994f6e3c
--- /dev/null
+++ b/packages/app/src/hooks/use-fork-session.ts
@@ -0,0 +1,30 @@
+import { useNavigate, useParams } from "@solidjs/router"
+import { useSync } from "@/context/sync"
+import { useSDK } from "@/context/sdk"
+import { usePrompt } from "@/context/prompt"
+import { extractPromptFromParts } from "@/utils/prompt"
+import { base64Encode } from "@opencode-ai/util/encode"
+
+export function useForkSession() {
+  const params = useParams()
+  const navigate = useNavigate()
+  const sync = useSync()
+  const sdk = useSDK()
+  const prompt = usePrompt()
+
+  return (messageID: string) => {
+    const sessionID = params.id
+    if (!sessionID) return
+
+    const parts = sync.data.part[messageID] ?? []
+    const restored = extractPromptFromParts(parts, { directory: sdk.directory })
+
+    sdk.client.session.fork({ sessionID, messageID }).then((forked) => {
+      if (!forked.data) return
+      navigate(`/${base64Encode(sdk.directory)}/session/${forked.data.id}`)
+      requestAnimationFrame(() => {
+        prompt.set(restored)
+      })
+    })
+  }
+}
diff --git a/packages/app/src/pages/session.tsx b/packages/app/src/pages/session.tsx
index c5fde864b1d1..b92edd97877f 100644
--- a/packages/app/src/pages/session.tsx
+++ b/packages/app/src/pages/session.tsx
@@ -53,6 +53,7 @@ import {
 import { usePlatform } from "@/context/platform"
 import { navMark, navParams } from "@/utils/perf"
 import { same } from "@/utils/same"
+import { useForkSession } from "@/hooks/use-fork-session"
 
 type DiffStyle = "unified" | "split"
 
@@ -167,6 +168,7 @@ export default function Page() {
   const sdk = useSDK()
   const prompt = usePrompt()
   const permission = usePermission()
+  const forkSession = useForkSession()
   const sessionKey = createMemo(() => `${params.dir}${params.id ? "/" + params.id : ""}`)
   const tabs = createMemo(() => layout.tabs(sessionKey()))
   const view = createMemo(() => layout.view(sessionKey()))
@@ -908,22 +910,6 @@ export default function Page() {
     updateHash(message.id)
   }
 
-  const forkFromMessage = (message: UserMessage) => {
-    const sessionID = params.id
-    if (!sessionID) return
-
-    const parts = sync.data.part[message.id] ?? []
-    const restored = extractPromptFromParts(parts, { directory: sdk.directory })
-
-    sdk.client.session.fork({ sessionID, messageID: message.id }).then((forked) => {
-      if (!forked.data) return
-      navigate(`/${base64Encode(sdk.directory)}/session/${forked.data.id}`)
-      requestAnimationFrame(() => {
-        prompt.set(restored)
-      })
-    })
-  }
-
   const getActiveMessageId = (container: HTMLDivElement) => {
     const cutoff = container.scrollTop + 100
     const nodes = container.querySelectorAll<HTMLElement>("[data-message-id]")
@@ -1111,7 +1097,7 @@ export default function Page() {
                             messages={visibleUserMessages()}
                             current={activeMessage()}
                             onMessageSelect={scrollToMessage}
-                            onFork={forkFromMessage}
+                            onFork={(msg) => forkSession(msg.id)}
                             wide={!showTabs()}
                             class="pointer-events-auto"
                           />