Skip to content

Commit 97880ce

Browse files
fix: prefer bundled OpenCode CLI and improve diagnostics (anomalyco#123)
1 parent fb091e2 commit 97880ce

7 files changed

Lines changed: 233 additions & 34 deletions

File tree

‎src-tauri/src/commands/engine.rs‎

Lines changed: 62 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
use tauri::State;
1+
use tauri::{AppHandle, Manager, State};
22

33
use crate::engine::doctor::{opencode_serve_help, opencode_version, resolve_engine_path};
44
use crate::engine::manager::EngineManager;
55
use crate::engine::spawn::{build_engine_command, find_free_port, spawn_engine};
66
use crate::types::{EngineDoctorResult, EngineInfo, ExecResult};
7+
use crate::utils::truncate_output;
78

89
#[tauri::command]
910
pub 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]
9294
pub 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() {

‎src-tauri/src/commands/misc.rs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ use crate::engine::doctor::resolve_engine_path;
77
use crate::paths::home_dir;
88
use crate::platform::command_for_program;
99
use crate::types::ExecResult;
10+
use tauri::{AppHandle, Manager};
1011

1112
#[derive(serde::Serialize)]
1213
pub struct CacheResetResult {
@@ -118,7 +119,11 @@ pub fn reset_openwork_state(app: tauri::AppHandle, mode: String) -> Result<(), S
118119
/// Run `opencode mcp auth <server_name>` in the given project directory.
119120
/// This spawns the process detached so the OAuth flow can open a browser.
120121
#[tauri::command]
121-
pub fn opencode_mcp_auth(project_dir: String, server_name: String) -> Result<ExecResult, String> {
122+
pub fn opencode_mcp_auth(
123+
app: AppHandle,
124+
project_dir: String,
125+
server_name: String,
126+
) -> Result<ExecResult, String> {
122127
let project_dir = project_dir.trim();
123128
let server_name = server_name.trim();
124129

@@ -129,7 +134,8 @@ pub fn opencode_mcp_auth(project_dir: String, server_name: String) -> Result<Exe
129134
return Err("server_name is required".to_string());
130135
}
131136

132-
let (program, _in_path, notes) = resolve_engine_path(false);
137+
let resource_dir = app.path().resource_dir().ok();
138+
let (program, _in_path, notes) = resolve_engine_path(true, resource_dir.as_deref());
133139
let Some(program) = program else {
134140
let notes_text = notes.join("\n");
135141
return Err(format!(

‎src-tauri/src/engine/doctor.rs‎

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,10 @@ pub fn opencode_serve_help(program: &OsStr) -> (bool, Option<i32>, Option<String
4545
}
4646
}
4747

48-
pub fn resolve_sidecar_candidate(prefer_sidecar: bool) -> (Option<std::path::PathBuf>, Vec<String>) {
48+
pub fn resolve_sidecar_candidate(
49+
prefer_sidecar: bool,
50+
resource_dir: Option<&Path>,
51+
) -> (Option<std::path::PathBuf>, Vec<String>) {
4952
if !prefer_sidecar {
5053
return (None, Vec::new());
5154
}
@@ -54,14 +57,31 @@ pub fn resolve_sidecar_candidate(prefer_sidecar: bool) -> (Option<std::path::Pat
5457

5558
#[cfg(not(windows))]
5659
{
57-
let candidate = std::path::PathBuf::from("src-tauri/sidecars")
58-
.join(crate::engine::paths::opencode_executable_name());
59-
if candidate.is_file() {
60-
notes.push(format!("Using bundled sidecar: {}", candidate.display()));
61-
return (Some(candidate), notes);
60+
let mut candidates = Vec::new();
61+
62+
if let Some(resource_dir) = resource_dir {
63+
candidates.push(
64+
resource_dir
65+
.join("sidecars")
66+
.join(crate::engine::paths::opencode_executable_name()),
67+
);
68+
candidates.push(resource_dir.join(crate::engine::paths::opencode_executable_name()));
69+
}
70+
71+
candidates.push(
72+
std::path::PathBuf::from("src-tauri/sidecars")
73+
.join(crate::engine::paths::opencode_executable_name()),
74+
);
75+
76+
for candidate in candidates {
77+
if candidate.is_file() {
78+
notes.push(format!("Using bundled sidecar: {}", candidate.display()));
79+
return (Some(candidate), notes);
80+
}
81+
82+
notes.push(format!("Sidecar missing: {}", candidate.display()));
6283
}
6384

64-
notes.push(format!("Sidecar requested but missing: {}", candidate.display()));
6585
return (None, notes);
6686
}
6787

@@ -72,8 +92,11 @@ pub fn resolve_sidecar_candidate(prefer_sidecar: bool) -> (Option<std::path::Pat
7292
}
7393
}
7494

75-
pub fn resolve_engine_path(prefer_sidecar: bool) -> (Option<std::path::PathBuf>, bool, Vec<String>) {
76-
let (sidecar, mut notes) = resolve_sidecar_candidate(prefer_sidecar);
95+
pub fn resolve_engine_path(
96+
prefer_sidecar: bool,
97+
resource_dir: Option<&Path>,
98+
) -> (Option<std::path::PathBuf>, bool, Vec<String>) {
99+
let (sidecar, mut notes) = resolve_sidecar_candidate(prefer_sidecar, resource_dir);
77100
let (resolved, in_path, more_notes) = match sidecar {
78101
Some(path) => (Some(path), false, Vec::new()),
79102
None => resolve_opencode_executable(),

‎src-tauri/tauri.conf.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030
3131
"icons/icon.icns",
3232
"icons/icon.ico"
33+
],
34+
"externalBin": [
35+
"sidecars/opencode"
3336
]
3437
},
3538
"plugins": {

‎src/App.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ export default function App() {
109109
const [tab, setTab] = createSignal<DashboardTab>("home");
110110

111111
const [engineSource, setEngineSource] = createSignal<"path" | "sidecar">(
112-
"path"
112+
isTauriRuntime() ? "sidecar" : "path"
113113
);
114114

115115
const [baseUrl, setBaseUrl] = createSignal("http://127.0.0.1:4096");
@@ -1570,9 +1570,12 @@ export default function App() {
15701570
engineDoctorVersion: engineDoctorResult()?.version ?? null,
15711571
engineDoctorResolvedPath: engineDoctorResult()?.resolvedPath ?? null,
15721572
engineDoctorNotes: engineDoctorResult()?.notes ?? [],
1573+
engineDoctorServeHelpStdout: engineDoctorResult()?.serveHelpStdout ?? null,
1574+
engineDoctorServeHelpStderr: engineDoctorResult()?.serveHelpStderr ?? null,
15731575
engineDoctorCheckedAt: engineDoctorCheckedAt(),
15741576
engineInstallLogs: engineInstallLogs(),
15751577
error: error(),
1578+
isWindows: isWindowsPlatform(),
15761579
onBaseUrlChange: setBaseUrl,
15771580
onClientDirectoryChange: setClientDirectory,
15781581
onModeSelect: (nextMode: Mode) => {

‎src/app/workspace.ts‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ export function createWorkspaceStore(options: {
142142
if (!isTauriRuntime()) return;
143143

144144
try {
145-
const result = await engineDoctor();
145+
const result = await engineDoctor({ preferSidecar: options.engineSource() === "sidecar" });
146146
setEngineDoctorResult(result);
147147
setEngineDoctorCheckedAt(Date.now());
148148
} catch (e) {
@@ -341,7 +341,7 @@ export function createWorkspaceStore(options: {
341341
}
342342

343343
try {
344-
const result = await engineDoctor();
344+
const result = await engineDoctor({ preferSidecar: options.engineSource() === "sidecar" });
345345
setEngineDoctorResult(result);
346346
setEngineDoctorCheckedAt(Date.now());
347347

@@ -355,7 +355,13 @@ export function createWorkspaceStore(options: {
355355
}
356356

357357
if (!result.supportsServe) {
358-
options.setError("OpenCode CLI is installed, but `opencode serve` is unavailable. Update OpenCode and retry.");
358+
const serveDetails = [result.serveHelpStdout, result.serveHelpStderr]
359+
.filter((value) => value && value.trim())
360+
.join("\n\n");
361+
const suffix = serveDetails ? `\n\nServe output:\n${serveDetails}` : "";
362+
options.setError(
363+
`OpenCode CLI is installed, but \`opencode serve\` is unavailable. Update OpenCode and retry.${suffix}`
364+
);
359365
return false;
360366
}
361367
} catch (e) {

0 commit comments

Comments
 (0)