1- use tauri:: State ;
1+ use tauri:: { AppHandle , Manager , State } ;
22
33use crate :: engine:: doctor:: { opencode_serve_help, opencode_version, resolve_engine_path} ;
44use crate :: engine:: manager:: EngineManager ;
55use crate :: engine:: spawn:: { build_engine_command, find_free_port, spawn_engine} ;
66use crate :: types:: { EngineDoctorResult , EngineInfo , ExecResult } ;
7+ use crate :: utils:: truncate_output;
78
89#[ tauri:: command]
910pub fn engine_info ( manager : State < EngineManager > ) -> EngineInfo {
@@ -19,10 +20,11 @@ pub fn engine_stop(manager: State<EngineManager>) -> EngineInfo {
1920}
2021
2122#[ tauri:: command]
22- pub fn engine_doctor ( prefer_sidecar : Option < bool > ) -> EngineDoctorResult {
23+ pub fn engine_doctor ( app : AppHandle , prefer_sidecar : Option < bool > ) -> EngineDoctorResult {
2324 let prefer_sidecar = prefer_sidecar. unwrap_or ( false ) ;
25+ let resource_dir = app. path ( ) . resource_dir ( ) . ok ( ) ;
2426
25- let ( resolved, in_path, notes) = resolve_engine_path ( prefer_sidecar) ;
27+ let ( resolved, in_path, notes) = resolve_engine_path ( prefer_sidecar, resource_dir . as_deref ( ) ) ;
2628
2729 let ( version, supports_serve, serve_help_status, serve_help_stdout, serve_help_stderr) =
2830 match resolved. as_ref ( ) {
@@ -90,6 +92,7 @@ pub fn engine_install() -> Result<ExecResult, String> {
9092
9193#[ tauri:: command]
9294pub fn engine_start (
95+ app : AppHandle ,
9396 manager : State < EngineManager > ,
9497 project_dir : String ,
9598 prefer_sidecar : Option < bool > ,
@@ -105,7 +108,9 @@ pub fn engine_start(
105108 let mut state = manager. inner . lock ( ) . expect ( "engine mutex poisoned" ) ;
106109 EngineManager :: stop_locked ( & mut state) ;
107110
108- let ( program, _in_path, notes) = resolve_engine_path ( prefer_sidecar. unwrap_or ( false ) ) ;
111+ let resource_dir = app. path ( ) . resource_dir ( ) . ok ( ) ;
112+ let ( program, _in_path, notes) =
113+ resolve_engine_path ( prefer_sidecar. unwrap_or ( false ) , resource_dir. as_deref ( ) ) ;
109114 let Some ( program) = program else {
110115 let notes_text = notes. join ( "\n " ) ;
111116 return Err ( format ! (
@@ -119,23 +124,62 @@ pub fn engine_start(
119124 state. last_stdout = None ;
120125 state. last_stderr = None ;
121126
122- std:: thread:: sleep ( std:: time:: Duration :: from_millis ( 200 ) ) ;
123- if let Ok ( Some ( status) ) = child. try_wait ( ) {
124- let mut stderr = String :: new ( ) ;
125- if let Some ( mut stream) = child. stderr . take ( ) {
126- use std:: io:: Read ;
127- let mut buffer = Vec :: new ( ) ;
128- let _ = stream. read_to_end ( & mut buffer) ;
129- stderr = String :: from_utf8_lossy ( & buffer) . trim ( ) . to_string ( ) ;
127+ let warmup_deadline = std:: time:: Instant :: now ( ) + std:: time:: Duration :: from_secs ( 2 ) ;
128+ loop {
129+ if let Ok ( Some ( status) ) = child. try_wait ( ) {
130+ let mut stdout = String :: new ( ) ;
131+ if let Some ( mut stream) = child. stdout . take ( ) {
132+ use std:: io:: Read ;
133+ let mut buffer = Vec :: new ( ) ;
134+ let _ = stream. read_to_end ( & mut buffer) ;
135+ stdout = String :: from_utf8_lossy ( & buffer) . trim ( ) . to_string ( ) ;
136+ }
137+
138+ let mut stderr = String :: new ( ) ;
139+ if let Some ( mut stream) = child. stderr . take ( ) {
140+ use std:: io:: Read ;
141+ let mut buffer = Vec :: new ( ) ;
142+ let _ = stream. read_to_end ( & mut buffer) ;
143+ stderr = String :: from_utf8_lossy ( & buffer) . trim ( ) . to_string ( ) ;
144+ }
145+
146+ let stdout = if stdout. is_empty ( ) {
147+ None
148+ } else {
149+ Some ( truncate_output ( & stdout, 8000 ) )
150+ } ;
151+ let stderr = if stderr. is_empty ( ) {
152+ None
153+ } else {
154+ Some ( truncate_output ( & stderr, 8000 ) )
155+ } ;
156+
157+ let mut parts = Vec :: new ( ) ;
158+ if let Some ( stdout) = stdout {
159+ parts. push ( format ! ( "stdout:\n {stdout}" ) ) ;
160+ }
161+ if let Some ( stderr) = stderr {
162+ parts. push ( format ! ( "stderr:\n {stderr}" ) ) ;
163+ }
164+
165+ let suffix = if parts. is_empty ( ) {
166+ String :: new ( )
167+ } else {
168+ format ! ( "\n \n {}" , parts. join( "\n \n " ) )
169+ } ;
170+
171+ return Err ( format ! (
172+ "OpenCode exited immediately with status {}.{}" ,
173+ status. code( ) . unwrap_or( -1 ) ,
174+ suffix
175+ ) ) ;
130176 }
131177
132- let suffix = if stderr. is_empty ( ) { String :: new ( ) } else { format ! ( "\n {}" , stderr) } ;
178+ if std:: time:: Instant :: now ( ) >= warmup_deadline {
179+ break ;
180+ }
133181
134- return Err ( format ! (
135- "OpenCode exited immediately with status {}.{}" ,
136- status. code( ) . unwrap_or( -1 ) ,
137- suffix
138- ) ) ;
182+ std:: thread:: sleep ( std:: time:: Duration :: from_millis ( 150 ) ) ;
139183 }
140184
141185 if let Some ( stream) = child. stderr . take ( ) {
0 commit comments