refactor(desktop): make Tauri thin shell running web sidecar (#273)
## What / Why This PR finishes the desktop refactor: the Tauri app is now a thin shell that launches the web server as a sidecar and loads the UI from `http://127.0.0.1:<port>`. All real backend logic lives in `packages/web/server/index.js`; desktop Rust keeps only native integrations (menu/dialog/notifications/updater/deep-link + window chrome). This unblocks: - consistent behavior across web/desktop/vscode (single backend) - simpler desktop maintenance (no duplicated Rust backend) - host switching between Local + remote instances in desktop - reliable cold-start behavior on slow machines (VSCode + desktop) ## Key changes - Desktop sidecar runtime - build pipeline to bundle web dist + `openchamber-server` sidecar (`packages/desktop/scripts/build-sidecar.mjs`) - robust local port selection (prefer saved/default, fallback to random; persisted in `~/.config/openchamber/settings.json`) - improved PATH handling so the sidecar can locate `opencode` CLI (incl `~/.opencode/bin`, overrides, common bins) - disable native right-click context menu in production builds (dev keeps it) - Desktop instance switcher (Tauri-only) - header button + modal to add/edit/delete remote hosts, set default, probe status/ping, switch back to Local escape hatch - auth gate includes host switcher so you can recover when a remote host is broken/auth-required - host list stored desktop-locally (not tied to the currently selected remote server) - Notifications - decision logic moved server-side; desktop notifications emitted via sidecar stdout and shown natively by Tauri - prevent double-notifications on desktop Local origin (UI ignores SSE notification when native path is active) - restore macOS notification sound - Updates - Tauri updater used only when viewing Local instance in desktop shell (avoid “remote web update” triggering desktop restart) - Settings persistence & UX polish - persist model favorites/recents via `/api/config/settings` (works for web + desktop; not origin-dependent) - persist per-project sidebar collapse state in `projects[].sidebarCollapsed` via `/api/config/settings` (with debounce on toggles) - macOS header sizing/traffic-lights offsets fixed (marketing macOS major injected from desktop; MultiRun header aligned) - VSCode cold-start: keep retrying provider/agent loads after connection to avoid empty UI on slow machines - misc lint/type fixes + bun.lock sync - Desktop bootstrap / resiliency - show onboarding screen when OpenCode CLI is missing (desktop Local origin), with retry hook to restart OpenCode after install ## Testing notes - Desktop (macOS): switch Local <-> remote, set default host, verify auth gate recovery, native notifications (with sound), updater gated to Local - Web: favorites/recents + per-project collapsed state persist across reload/restart - VSCode: slow startup no longer results in missing providers/agents/models
This commit is contained in:
committed by
GitHub
parent
b733f26aed
commit
83ffb1af34
@@ -0,0 +1,161 @@
|
||||
import { useSessionStore } from '@/stores/useSessionStore';
|
||||
import { useUIStore } from '@/stores/useUIStore';
|
||||
|
||||
declare const __APP_VERSION__: string | undefined;
|
||||
|
||||
type ProbeResult = {
|
||||
ok: boolean;
|
||||
status: number;
|
||||
elapsedMs: number;
|
||||
summary: string;
|
||||
};
|
||||
|
||||
const getCurrentDirectory = (): string => {
|
||||
const state = useSessionStore.getState();
|
||||
const currentSessionId = state.currentSessionId;
|
||||
if (!currentSessionId) return '';
|
||||
const session = state.sessions.find((s) => s.id === currentSessionId);
|
||||
return typeof session?.directory === 'string' ? session.directory : '';
|
||||
};
|
||||
|
||||
const safeFetch = async (input: string, timeoutMs = 6000): Promise<ProbeResult> => {
|
||||
const controller = new AbortController();
|
||||
const timeout = setTimeout(() => controller.abort(), timeoutMs);
|
||||
const startedAt = Date.now();
|
||||
|
||||
try {
|
||||
const resp = await fetch(input, {
|
||||
method: 'GET',
|
||||
headers: { Accept: 'application/json' },
|
||||
signal: controller.signal,
|
||||
});
|
||||
|
||||
const elapsedMs = Date.now() - startedAt;
|
||||
const contentType = resp.headers.get('content-type') || '';
|
||||
const lower = contentType.toLowerCase();
|
||||
const isJson = lower.includes('json') && !lower.includes('text/html');
|
||||
|
||||
let summary = '';
|
||||
if (isJson) {
|
||||
const json = await resp.json().catch(() => null);
|
||||
if (Array.isArray(json)) {
|
||||
summary = `json[array] len=${json.length}`;
|
||||
} else if (json && typeof json === 'object') {
|
||||
const keys = Object.keys(json).slice(0, 8);
|
||||
summary = `json[object] keys=${keys.join(',')}${Object.keys(json).length > keys.length ? ',…' : ''}`;
|
||||
} else {
|
||||
summary = `json[${typeof json}]`;
|
||||
}
|
||||
} else {
|
||||
summary = contentType ? `content-type=${contentType}` : 'no content-type';
|
||||
}
|
||||
|
||||
return { ok: resp.ok && isJson, status: resp.status, elapsedMs, summary };
|
||||
} catch (error) {
|
||||
const elapsedMs = Date.now() - startedAt;
|
||||
const isAbort =
|
||||
controller.signal.aborted ||
|
||||
(error instanceof Error && (error.name === 'AbortError' || error.message.toLowerCase().includes('aborted')));
|
||||
const message = isAbort
|
||||
? `timeout after ${timeoutMs}ms`
|
||||
: error instanceof Error
|
||||
? error.message
|
||||
: String(error);
|
||||
return { ok: false, status: 0, elapsedMs, summary: `error=${message}` };
|
||||
} finally {
|
||||
clearTimeout(timeout);
|
||||
}
|
||||
};
|
||||
|
||||
const formatIso = (timestamp: number | null | undefined): string => {
|
||||
if (!timestamp || !Number.isFinite(timestamp)) return '(n/a)';
|
||||
try {
|
||||
return new Date(timestamp).toISOString();
|
||||
} catch {
|
||||
return '(invalid)';
|
||||
}
|
||||
};
|
||||
|
||||
export const buildOpenCodeStatusReport = async (): Promise<string> => {
|
||||
const now = new Date();
|
||||
const appVersion = typeof __APP_VERSION__ !== 'undefined' ? __APP_VERSION__ : '(unknown)';
|
||||
const platform = typeof navigator !== 'undefined' ? navigator.userAgent : '(no navigator)';
|
||||
const directory = getCurrentDirectory();
|
||||
const eventStreamStatus = useUIStore.getState().eventStreamStatus;
|
||||
const origin = typeof window !== 'undefined' ? window.location.origin : '';
|
||||
const apiBase = origin ? `${origin.replace(/\/+$/, '')}/api/` : '';
|
||||
|
||||
const buildProbeUrl = (pathname: string, includeDirectory = true): string | null => {
|
||||
if (!apiBase) return null;
|
||||
const url = new URL(pathname.replace(/^\/+/, ''), apiBase);
|
||||
if (includeDirectory && directory) {
|
||||
url.searchParams.set('directory', directory);
|
||||
}
|
||||
return url.toString();
|
||||
};
|
||||
|
||||
const probeTargets: Array<{ label: string; path: string; includeDirectory?: boolean; timeoutMs?: number }> = [
|
||||
{ label: 'health', path: '/global/health', includeDirectory: false },
|
||||
{ label: 'config', path: '/config', includeDirectory: true },
|
||||
{ label: 'providers', path: '/config/providers', includeDirectory: true },
|
||||
{ label: 'agents', path: '/agent', includeDirectory: true, timeoutMs: 12000 },
|
||||
{ label: 'commands', path: '/command', includeDirectory: true, timeoutMs: 10000 },
|
||||
{ label: 'project', path: '/project/current', includeDirectory: true },
|
||||
{ label: 'path', path: '/path', includeDirectory: true },
|
||||
{ label: 'sessions', path: '/session', includeDirectory: true, timeoutMs: 12000 },
|
||||
{ label: 'sessionStatus', path: '/session/status', includeDirectory: true },
|
||||
];
|
||||
|
||||
const probes = apiBase
|
||||
? await Promise.all(
|
||||
probeTargets.map(async (entry) => {
|
||||
const url = buildProbeUrl(entry.path, entry.includeDirectory !== false);
|
||||
if (!url) return { label: entry.label, url: '(none)', result: null as ProbeResult | null };
|
||||
const result = await safeFetch(url, typeof entry.timeoutMs === 'number' ? entry.timeoutMs : undefined);
|
||||
return { label: entry.label, url, result };
|
||||
})
|
||||
)
|
||||
: [];
|
||||
|
||||
const lines: string[] = [];
|
||||
lines.push(`Time: ${now.toISOString()}`);
|
||||
lines.push(`OpenChamber version: ${appVersion}`);
|
||||
lines.push(`Runtime: ${origin || '(unknown)'} (api=${origin ? origin + '/api' : '(unknown)'})`);
|
||||
lines.push(`Event stream: ${eventStreamStatus}`);
|
||||
lines.push(`Directory: ${directory || '(none)'}`);
|
||||
lines.push(`Platform: ${platform}`);
|
||||
|
||||
if (typeof window !== 'undefined') {
|
||||
const injected = (window as unknown as { __OPENCHAMBER_MACOS_MAJOR__?: unknown }).__OPENCHAMBER_MACOS_MAJOR__;
|
||||
if (typeof injected === 'number' && Number.isFinite(injected) && injected > 0) {
|
||||
lines.push(`macOS major: ${injected}`);
|
||||
}
|
||||
}
|
||||
|
||||
lines.push('');
|
||||
if (probes.length) {
|
||||
lines.push('OpenCode API probes:');
|
||||
for (const probe of probes) {
|
||||
if (!probe.result) {
|
||||
lines.push(`- ${probe.label}: (no url)`);
|
||||
continue;
|
||||
}
|
||||
const { ok, status, elapsedMs, summary } = probe.result;
|
||||
const suffix = ok ? '' : ` url=${probe.url}`;
|
||||
lines.push(`- ${probe.label}: ${ok ? 'ok' : 'fail'} status=${status} time=${elapsedMs}ms ${summary}${suffix}`);
|
||||
}
|
||||
} else {
|
||||
lines.push('OpenCode API probes: (skipped)');
|
||||
}
|
||||
|
||||
lines.push('');
|
||||
lines.push(`Generated: ${formatIso(Date.now())}`);
|
||||
return lines.join('\n');
|
||||
};
|
||||
|
||||
export const showOpenCodeStatus = async (): Promise<void> => {
|
||||
const text = await buildOpenCodeStatusReport();
|
||||
const ui = useUIStore.getState();
|
||||
ui.setOpenCodeStatusText(text);
|
||||
ui.setOpenCodeStatusDialogOpen(true);
|
||||
};
|
||||
Reference in New Issue
Block a user