Skip to content

Commit 9be0e66

Browse files
authored
fix: improve sandbox worker startup diagnostics (anomalyco#834)
* fix: improve sandbox docker diagnostics * fix: remove sandbox build warning * chore: bump version to 0.11.139 * chore: update pnpm lockfile
1 parent 53ba8cc commit 9be0e66

15 files changed

Lines changed: 260 additions & 74 deletions

File tree

‎packages/app/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@different-ai/openwork-ui",
33
"private": true,
4-
"version": "0.11.138",
4+
"version": "0.11.139",
55
"type": "module",
66
"scripts": {
77
"dev": "OPENWORK_DEV_MODE=1 vite",

‎packages/app/src/app/app.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6154,6 +6154,7 @@ export default function App() {
61546154
events: events(),
61556155
workspaceDebugEvents: workspaceStore.workspaceDebugEvents(),
61566156
sandboxCreateProgress: workspaceStore.sandboxCreateProgress(),
6157+
sandboxCreateProgressLast: workspaceStore.lastSandboxCreateProgress(),
61576158
clearWorkspaceDebugEvents: workspaceStore.clearWorkspaceDebugEvents,
61586159
safeStringify,
61596160
repairOpencodeMigration: workspaceStore.repairOpencodeMigration,

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,15 @@ export function createWorkspaceStore(options: {
249249
const [sandboxCreatePhase, setSandboxCreatePhase] = createSignal<SandboxCreatePhase>("idle");
250250

251251
const [sandboxCreateProgress, setSandboxCreateProgress] = createSignal<SandboxCreateProgressState | null>(null);
252-
const clearSandboxCreateProgress = () => setSandboxCreateProgress(null);
252+
const [lastSandboxCreateProgress, setLastSandboxCreateProgress] =
253+
createSignal<SandboxCreateProgressState | null>(null);
254+
const clearSandboxCreateProgress = () => {
255+
const snapshot = sandboxCreateProgress();
256+
if (snapshot) {
257+
setLastSandboxCreateProgress(snapshot);
258+
}
259+
setSandboxCreateProgress(null);
260+
};
253261

254262
const pushSandboxCreateLog = (line: string) => {
255263
const value = String(line ?? "").trim();
@@ -1582,6 +1590,10 @@ export function createWorkspaceStore(options: {
15821590
if (selected) {
15831591
pushSandboxCreateLog(`OPENWORK_DOCKER_BIN=${selected}`);
15841592
}
1593+
const resolved = String(payload.payload?.resolvedDockerBin ?? "").trim();
1594+
if (resolved) {
1595+
pushSandboxCreateLog(`Resolved docker: ${resolved}`);
1596+
}
15851597
const candidates = Array.isArray(payload.payload?.candidates)
15861598
? payload.payload.candidates.filter((item: unknown) => String(item ?? "").trim())
15871599
: [];
@@ -3182,6 +3194,7 @@ export function createWorkspaceStore(options: {
31823194
setEngineInstallLogs,
31833195
refreshSandboxDoctor,
31843196
sandboxCreateProgress,
3197+
lastSandboxCreateProgress,
31853198
clearSandboxCreateProgress,
31863199
workspaceDebugEvents,
31873200
clearWorkspaceDebugEvents,

‎packages/app/src/app/pages/dashboard.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@ export type DashboardViewProps = {
294294
events: unknown;
295295
workspaceDebugEvents: unknown;
296296
sandboxCreateProgress: unknown;
297+
sandboxCreateProgressLast: unknown;
297298
clearWorkspaceDebugEvents: () => void;
298299
safeStringify: (value: unknown) => string;
299300
repairOpencodeMigration: () => void;
@@ -1379,6 +1380,7 @@ export default function DashboardView(props: DashboardViewProps) {
13791380
events={props.events}
13801381
workspaceDebugEvents={props.workspaceDebugEvents}
13811382
sandboxCreateProgress={props.sandboxCreateProgress}
1383+
sandboxCreateProgressLast={props.sandboxCreateProgressLast}
13821384
clearWorkspaceDebugEvents={props.clearWorkspaceDebugEvents}
13831385
safeStringify={props.safeStringify}
13841386
repairOpencodeMigration={props.repairOpencodeMigration}

‎packages/app/src/app/pages/settings.tsx‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ export type SettingsViewProps = {
114114
events: unknown;
115115
workspaceDebugEvents: unknown;
116116
sandboxCreateProgress: unknown;
117+
sandboxCreateProgressLast: unknown;
117118
clearWorkspaceDebugEvents: () => void;
118119
safeStringify: (value: unknown) => string;
119120
repairOpencodeMigration: () => void;
@@ -754,17 +755,18 @@ export default function SettingsView(props: SettingsViewProps) {
754755
const opencodeDevModeEnabled = createMemo(() => Boolean(buildInfo()?.openworkDevMode));
755756

756757
const sandboxCreateSummary = createMemo(() => {
757-
const raw = props.sandboxCreateProgress as
758-
| { runId?: string; stage?: string; error?: string | null; logs?: string[] }
758+
const raw = (props.sandboxCreateProgress ?? props.sandboxCreateProgressLast) as
759+
| { runId?: string; stage?: string; error?: string | null; logs?: string[]; startedAt?: number }
759760
| null
760761
| undefined;
761762
if (!raw || typeof raw !== "object") {
762-
return { runId: null, stage: null, error: null, logs: [] as string[] };
763+
return { runId: null, stage: null, error: null, logs: [] as string[], startedAt: null };
763764
}
764765
return {
765766
runId: typeof raw.runId === "string" && raw.runId.trim() ? raw.runId : null,
766767
stage: typeof raw.stage === "string" && raw.stage.trim() ? raw.stage : null,
767768
error: typeof raw.error === "string" && raw.error.trim() ? raw.error : null,
769+
startedAt: typeof raw.startedAt === "number" ? raw.startedAt : null,
768770
logs: Array.isArray(raw.logs)
769771
? raw.logs.filter((line) => typeof line === "string" && line.trim()).slice(-400)
770772
: [],
@@ -828,7 +830,10 @@ export default function SettingsView(props: SettingsViewProps) {
828830
pendingPermissions: props.pendingPermissions,
829831
recentEvents: props.events,
830832
workspaceDebugEvents: props.workspaceDebugEvents,
831-
sandboxCreateProgress: sandboxCreateSummary(),
833+
sandboxCreateProgress: {
834+
...sandboxCreateSummary(),
835+
lastRunAt: sandboxCreateSummary().startedAt ? new Date(sandboxCreateSummary().startedAt!).toISOString() : null,
836+
},
832837
sandboxProbe: sandboxProbeResult(),
833838
}));
834839

‎packages/desktop/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"name": "@different-ai/openwork",
33
"private": true,
4-
"version": "0.11.138",
4+
"version": "0.11.139",
55
"opencodeVersion": "1.2.6",
6-
"opencodeRouterVersion": "0.11.138",
6+
"opencodeRouterVersion": "0.11.139",
77
"type": "module",
88
"scripts": {
99
"dev": "OPENWORK_DEV_MODE=1 OPENWORK_DATA_DIR=\"$HOME/.openwork/openwork-orchestrator-dev\" tauri dev --config src-tauri/tauri.dev.conf.json --config \"{\\\"build\\\":{\\\"devUrl\\\":\\\"http://localhost:${PORT:-5173}\\\"}}\"",

‎packages/desktop/src-tauri/Cargo.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/desktop/src-tauri/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "openwork"
3-
version = "0.11.138"
3+
version = "0.11.139"
44
description = "OpenWork"
55
authors = ["Different AI"]
66
edition = "2021"

‎packages/desktop/src-tauri/src/commands/orchestrator.rs‎

Lines changed: 35 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -775,23 +775,25 @@ pub fn orchestrator_start_detached(
775775
.into_iter()
776776
.map(|p| p.to_string_lossy().to_string())
777777
.collect::<Vec<_>>();
778+
let resolved = candidates.first().cloned();
778779
emit_sandbox_progress(
779780
&app,
780781
&sandbox_run_id,
781782
"docker.config",
782783
"Inspecting Docker configuration...",
783784
json!({
784785
"candidates": candidates,
786+
"resolvedDockerBin": resolved,
785787
"openworkDockerBin": env::var("OPENWORK_DOCKER_BIN").ok(),
786788
"openwrkDockerBin": env::var("OPENWRK_DOCKER_BIN").ok(),
787789
"dockerBin": env::var("DOCKER_BIN").ok(),
788790
}),
789791
);
790792
}
791793

792-
let command = match app.shell().sidecar("openwork-orchestrator") {
793-
Ok(command) => command,
794-
Err(_) => app.shell().command("openwork"),
794+
let (command, command_label) = match app.shell().sidecar("openwork-orchestrator") {
795+
Ok(command) => (command, "sidecar:openwork-orchestrator".to_string()),
796+
Err(_) => (app.shell().command("openwork"), "path:openwork".to_string()),
795797
};
796798

797799
// Start a dedicated host stack for this workspace.
@@ -830,10 +832,36 @@ pub fn orchestrator_start_detached(
830832
str_args.push(arg.as_str());
831833
}
832834

833-
command
834-
.args(str_args)
835-
.spawn()
836-
.map_err(|e| format!("Failed to start openwork orchestrator: {e}"))?;
835+
emit_sandbox_progress(
836+
&app,
837+
&sandbox_run_id,
838+
"spawn.config",
839+
"Launching sandbox host...",
840+
json!({
841+
"command": command_label,
842+
"args": args,
843+
"env": {
844+
"PATH": env::var("PATH").ok(),
845+
"OPENWORK_DOCKER_BIN": env::var("OPENWORK_DOCKER_BIN").ok(),
846+
"OPENWRK_DOCKER_BIN": env::var("OPENWRK_DOCKER_BIN").ok(),
847+
"DOCKER_BIN": env::var("DOCKER_BIN").ok(),
848+
}
849+
}),
850+
);
851+
852+
if let Err(err) = command.args(str_args).spawn() {
853+
emit_sandbox_progress(
854+
&app,
855+
&sandbox_run_id,
856+
"spawn.error",
857+
"Failed to launch sandbox host.",
858+
json!({
859+
"error": err.to_string(),
860+
"command": command_label,
861+
}),
862+
);
863+
return Err(format!("Failed to start openwork orchestrator: {err}"));
864+
}
837865
eprintln!(
838866
"[sandbox-create][at={}][runId={}][stage=spawn] launched openwork sidecar for detached sandbox host",
839867
now_ms(),

‎packages/desktop/src-tauri/tauri.conf.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://schema.tauri.app/config/2",
33
"productName": "OpenWork",
4-
"version": "0.11.138",
4+
"version": "0.11.139",
55
"identifier": "com.differentai.openwork",
66
"build": {
77
"beforeDevCommand": "node ./scripts/tauri-before-dev.mjs",

0 commit comments

Comments
 (0)