Skip to content

Commit ea226be

Browse files
authored
fix starter bootstrap server initialization (anomalyco#1168)
1 parent 8c143ab commit ea226be

5 files changed

Lines changed: 88 additions & 7 deletions

File tree

31.6 KB
Loading
28.1 KB
Loading

‎apps/app/src/app/app.tsx‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ import {
190190
updaterEnvironment,
191191
readOpencodeConfig,
192192
writeOpencodeConfig,
193+
openworkServerRestart,
193194
schedulerDeleteJob,
194195
schedulerListJobs,
195196
openworkServerInfo,
@@ -3286,6 +3287,7 @@ export default function App() {
32863287
updateOpenworkServerSettings,
32873288
openworkServerClient,
32883289
openworkServerStatus,
3290+
ensureLocalOpenworkServerClient,
32893291
runtimeWorkspaceId,
32903292
onEngineStable: () => {},
32913293
engineRuntime,
@@ -5047,6 +5049,56 @@ export default function App() {
50475049
}
50485050
};
50495051

5052+
async function ensureLocalOpenworkServerClient(): Promise<OpenworkServerClient | null> {
5053+
let hostInfo = openworkServerHostInfo();
5054+
if (hostInfo?.baseUrl?.trim() && hostInfo.clientToken?.trim()) {
5055+
const existing = createOpenworkServerClient({
5056+
baseUrl: hostInfo.baseUrl.trim(),
5057+
token: hostInfo.clientToken.trim(),
5058+
hostToken: hostInfo.hostToken?.trim() || undefined,
5059+
});
5060+
try {
5061+
await existing.health();
5062+
if (startupPreference() !== "server") {
5063+
await reconnectOpenworkServer();
5064+
}
5065+
return existing;
5066+
} catch {
5067+
// restart below
5068+
}
5069+
}
5070+
5071+
if (!isTauriRuntime()) {
5072+
return null;
5073+
}
5074+
5075+
try {
5076+
hostInfo = await openworkServerRestart({
5077+
remoteAccessEnabled: openworkServerSettings().remoteAccessEnabled === true,
5078+
});
5079+
setOpenworkServerHostInfo(hostInfo);
5080+
} catch {
5081+
return null;
5082+
}
5083+
5084+
const baseUrl = hostInfo?.baseUrl?.trim() ?? "";
5085+
const token = hostInfo?.clientToken?.trim() ?? "";
5086+
const hostToken = hostInfo?.hostToken?.trim() ?? "";
5087+
if (!baseUrl || !token) {
5088+
return null;
5089+
}
5090+
5091+
if (startupPreference() !== "server") {
5092+
await reconnectOpenworkServer();
5093+
}
5094+
5095+
return createOpenworkServerClient({
5096+
baseUrl,
5097+
token,
5098+
hostToken: hostToken || undefined,
5099+
});
5100+
}
5101+
50505102
const restartLocalServer = async () => {
50515103
const activeWorkspace = workspaceStore.selectedWorkspaceDisplay();
50525104
const activeLocalPath =

‎apps/app/src/app/context/workspace.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ export function createWorkspaceStore(options: {
150150
updateOpenworkServerSettings: (next: OpenworkServerSettings) => void;
151151
openworkServerClient?: () => OpenworkServerClient | null;
152152
openworkServerStatus?: () => OpenworkServerStatus;
153+
ensureLocalOpenworkServerClient?: () => Promise<OpenworkServerClient | null>;
153154
runtimeWorkspaceId?: () => string | null;
154155
setOpencodeConnectStatus?: (status: OpencodeConnectStatus | null) => void;
155156
onEngineStable?: () => void;
@@ -2742,6 +2743,10 @@ export function createWorkspaceStore(options: {
27422743
}
27432744

27442745
try {
2746+
const server = await options.ensureLocalOpenworkServerClient?.();
2747+
if (!server) {
2748+
throw new Error("OpenWork server is unavailable. Restart the app and try again.");
2749+
}
27452750
return await createWorkspaceFlow("starter", await resolveStarterBootstrapFolder());
27462751
} catch (e) {
27472752
const message = e instanceof Error ? e.message : safeStringify(e);
@@ -2759,6 +2764,10 @@ export function createWorkspaceStore(options: {
27592764
options.setError(null);
27602765

27612766
try {
2767+
const server = await options.ensureLocalOpenworkServerClient?.();
2768+
if (!server) {
2769+
throw new Error("OpenWork server is unavailable. Restart the app and try again.");
2770+
}
27622771
const ok = await createWorkspaceFlow("starter", await resolveStarterBootstrapFolder());
27632772
if (!ok) {
27642773
setPersistedStarterBootstrapState("failed");

‎apps/desktop/src-tauri/src/commands/openwork_server.rs‎

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ use crate::engine::manager::EngineManager;
44
use crate::opencode_router::manager::OpenCodeRouterManager;
55
use crate::openwork_server::manager::OpenworkServerManager;
66
use crate::openwork_server::start_openwork_server;
7-
use crate::types::OpenworkServerInfo;
7+
use crate::types::{OpenworkServerInfo, WorkspaceType};
8+
use crate::workspace::state::load_workspace_state;
89

910
#[tauri::command]
1011
pub fn openwork_server_info(manager: State<OpenworkServerManager>) -> OpenworkServerInfo {
@@ -23,22 +24,41 @@ pub fn openwork_server_restart(
2324
opencode_router_manager: State<OpenCodeRouterManager>,
2425
remote_access_enabled: Option<bool>,
2526
) -> Result<OpenworkServerInfo, String> {
26-
let (workspace_path, opencode_url, opencode_username, opencode_password) = {
27+
let (workspace_paths, opencode_url, opencode_username, opencode_password) = {
2728
let engine = engine_manager
2829
.inner
2930
.lock()
3031
.map_err(|_| "engine mutex poisoned".to_string())?;
32+
let mut workspace_paths = Vec::new();
33+
if let Some(project_dir) = engine.project_dir.clone() {
34+
let trimmed = project_dir.trim().to_string();
35+
if !trimmed.is_empty() {
36+
workspace_paths.push(trimmed);
37+
}
38+
}
3139
(
32-
engine
33-
.project_dir
34-
.clone()
35-
.ok_or_else(|| "No active local workspace available".to_string())?,
40+
workspace_paths,
3641
engine.base_url.clone(),
3742
engine.opencode_username.clone(),
3843
engine.opencode_password.clone(),
3944
)
4045
};
4146

47+
let mut workspace_paths = workspace_paths;
48+
if workspace_paths.is_empty() {
49+
let state = load_workspace_state(&app)?;
50+
for workspace in state.workspaces {
51+
if workspace.workspace_type != WorkspaceType::Local {
52+
continue;
53+
}
54+
let trimmed = workspace.path.trim().to_string();
55+
if trimmed.is_empty() || workspace_paths.iter().any(|path| path == &trimmed) {
56+
continue;
57+
}
58+
workspace_paths.push(trimmed);
59+
}
60+
}
61+
4262
let opencode_router_health_port = opencode_router_manager
4363
.inner
4464
.lock()
@@ -48,7 +68,7 @@ pub fn openwork_server_restart(
4868
start_openwork_server(
4969
&app,
5070
&manager,
51-
&[workspace_path],
71+
&workspace_paths,
5272
opencode_url.as_deref(),
5373
opencode_username.as_deref(),
5474
opencode_password.as_deref(),

0 commit comments

Comments
 (0)