@@ -7,7 +7,7 @@ import { Service, type Endpoint } from "@opencode/client/effect/service"
77import { OpenCode , type SessionInfo } from "@opencode/client"
88import { Global } from "@opencode/util/global"
99import { noTimeoutFetch } from "@opencode/util/no-timeout-fetch"
10- import { ClipboardProvider , useClipboard , type ClipboardService } from "./context/clipboard"
10+ import { ClipboardProvider , useClipboard } from "./context/clipboard"
1111import { LogProvider , type LogSink } from "./context/log"
1212import { ExitProvider , useExit } from "./context/exit"
1313import { EpilogueProvider } from "./context/epilogue"
@@ -32,7 +32,6 @@ import {
3232 onCleanup ,
3333 batch ,
3434 Show ,
35- type JSX ,
3635} from "solid-js"
3736import {
3837 TuiLifecycleProvider ,
@@ -110,7 +109,7 @@ import { StorageProvider, useStorage } from "./context/storage"
110109import { SessionTerminalsProvider } from "./context/session-terminals"
111110import { PanelProvider , usePanel } from "./context/panel"
112111import { SessionFrame } from "./component/session-frame"
113- import { createTuiClipboard , type OwnedClipboardService } from "./clipboard"
112+ import { createTuiClipboard } from "./clipboard"
114113
115114const appGlobalBindingCommands = [ "session.list" , "session.new" , "open.menu" ] as const
116115
@@ -369,13 +368,13 @@ export const run = Effect.fn("Tui.run")(function* (input: TuiInput) {
369368 skipInitialLoading : Boolean ( process . env . OPENCODE_FAST_BOOT ) ,
370369 } }
371370 >
372- < ArgsProvider { ... input . args } >
373- < ConfigProvider
374- config = { config }
375- service = { input . config }
376- options = { { terminalSuspend : process . platform !== "win32" } }
377- >
378- < ConfigClipboardProvider clipboard = { clipboard } >
371+ < ClipboardProvider value = { clipboard } >
372+ < ArgsProvider { ... input . args } >
373+ < ConfigProvider
374+ config = { config }
375+ service = { input . config }
376+ options = { { terminalSuspend : process . platform !== "win32" } }
377+ >
379378 < Keymap . Provider >
380379 < ToastProvider >
381380 < RouteProvider
@@ -437,9 +436,9 @@ export const run = Effect.fn("Tui.run")(function* (input: TuiInput) {
437436 </ RouteProvider >
438437 </ ToastProvider >
439438 </ Keymap . Provider >
440- </ ConfigClipboardProvider >
441- </ ConfigProvider >
442- </ ArgsProvider >
439+ </ ConfigProvider >
440+ </ ArgsProvider >
441+ </ ClipboardProvider >
443442 </ TuiStartupProvider >
444443 </ TuiTerminalEnvironmentProvider >
445444 </ TuiLifecycleProvider >
@@ -468,15 +467,6 @@ export const run = Effect.fn("Tui.run")(function* (input: TuiInput) {
468467 } )
469468} )
470469
471- function ConfigClipboardProvider ( props : { clipboard : OwnedClipboardService ; children : JSX . Element } ) {
472- const config = useConfig ( )
473- const clipboard : ClipboardService = {
474- read : ( ) => props . clipboard . read ( ) ,
475- write : ( text ) => props . clipboard . write ( text , { primary : config . data . terminal ?. primary_selection === true } ) ,
476- }
477- return < ClipboardProvider value = { clipboard } > { props . children } </ ClipboardProvider >
478- }
479-
480470function App ( ) {
481471 const app = useTuiApp ( )
482472 const startup = useTuiStartup ( )
@@ -570,8 +560,7 @@ function App() {
570560 }
571561 } )
572562
573- const copyOnSelectEnabled = ( ) =>
574- ( config . data . terminal ?. copy ?? ( process . platform === "win32" ? "manual" : "select" ) ) === "select"
563+ const copyOnSelectEnabled = ( ) => [ "select" , "both" ] . includes ( Config . copyMode ( config . data ) )
575564
576565 // Selection copy/dismiss must precede both app bindings and the terminal pane's raw key forwarding.
577566 const offSelectionKeys = keymap . intercept (
@@ -1396,7 +1385,7 @@ function App() {
13961385 onMouseUp = { ( event ) => {
13971386 const url = clickedLink ( renderer , event )
13981387 if ( url ) return void openUrl ( url ) . catch ( toast . error )
1399- if ( copyOnSelectEnabled ( ) ) Selection . copyOnSelectRelease ( event , renderer , toast , clipboard )
1388+ Selection . copyOnSelectRelease ( event , renderer , toast , clipboard , Config . copyMode ( config . data ) )
14001389 } }
14011390 >
14021391 < box
0 commit comments