From ae86b83fd9363cd09b796beb87e3dd30569f9ce5 Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Wed, 24 Sep 2025 04:22:22 -0400
Subject: [PATCH] sync

---
 packages/opencode/src/cli/cmd/tui/session.tsx |  9 ++----
 .../src/cli/cmd/tui/ui/dialog-select.tsx      | 31 ++++++++++++++-----
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/session.tsx b/packages/opencode/src/cli/cmd/tui/session.tsx
index 8605e11dc..690b728f0 100644
--- a/packages/opencode/src/cli/cmd/tui/session.tsx
+++ b/packages/opencode/src/cli/cmd/tui/session.tsx
@@ -57,6 +57,7 @@ export function Session() {
     {
       title: "Compact session",
       value: "session.compact",
+      keybind: "session_compact",
       category: "Session",
       onSelect: (dialog) => {
         sdk.session.summarize({
@@ -74,6 +75,7 @@ export function Session() {
     {
       title: "Share session",
       value: "session.share",
+      keybind: "session_share",
       disabled: !session()?.share?.url,
       category: "Session",
       onSelect: (dialog) => {
@@ -88,6 +90,7 @@ export function Session() {
     {
       title: "Unshare session",
       value: "session.unshare",
+      keybind: "session_unshare",
       disabled: !!session()?.share?.url,
       category: "Session",
       onSelect: (dialog) => {
@@ -99,12 +102,6 @@ export function Session() {
         dialog.clear()
       },
     },
-    {
-      title: "Rename session",
-      value: "session.rename",
-      category: "Session",
-      onSelect: () => {},
-    },
   ])
 
   return (
diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx
index 86f661102..24e110010 100644
--- a/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx
@@ -8,6 +8,7 @@ import * as fuzzysort from "fuzzysort"
 import { isDeepEqual } from "remeda"
 import { useDialog, type DialogContext } from "./dialog"
 import type { KeybindsConfig } from "@opencode-ai/sdk"
+import { useKeybind } from "../context/keybind"
 
 export interface DialogSelectProps<T> {
   title: string
@@ -146,6 +147,7 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
                     <Option
                       id={JSON.stringify(option.value)}
                       title={option.title}
+                      keybind={option.keybind}
                       description={option.description !== category ? option.description : undefined}
                       active={isDeepEqual(option.value, selected()?.value)}
                       current={isDeepEqual(option.value, props.current)}
@@ -173,7 +175,15 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
   )
 }
 
-function Option(props: { id: string; title: string; description?: string; active?: boolean; current?: boolean }) {
+function Option(props: {
+  id: string
+  title: string
+  description?: string
+  active?: boolean
+  current?: boolean
+  keybind?: string
+}) {
+  const keybind = useKeybind()
   return (
     <box
       id={props.id}
@@ -182,13 +192,18 @@ function Option(props: { id: string; title: string; description?: string; active
       paddingLeft={1}
       paddingRight={1}
     >
-      <text
-        fg={props.active ? Theme.background : props.current ? Theme.primary : Theme.text}
-        attributes={props.active ? TextAttributes.BOLD : undefined}
-      >
-        {props.title}
-      </text>
-      <text fg={props.active ? Theme.background : Theme.textMuted}> {props.description}</text>
+      <box flexGrow={1} flexShrink={0} flexDirection="row">
+        <text
+          fg={props.active ? Theme.background : props.current ? Theme.primary : Theme.text}
+          attributes={props.active ? TextAttributes.BOLD : undefined}
+        >
+          {props.title}
+        </text>
+        <text fg={props.active ? Theme.background : Theme.textMuted}> {props.description}</text>
+      </box>
+      <Show when={props.keybind}>
+        <text fg={Theme.textMuted}>{keybind.print(props.keybind as any)}</text>
+      </Show>
     </box>
   )
 }