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:
Bohdan Triapitsyn
committed by
GitHub
GitHub
parent
b733f26aed
commit
83ffb1af34
@@ -0,0 +1,112 @@
|
||||
import fs from 'node:fs/promises';
|
||||
import path from 'node:path';
|
||||
import { spawnSync } from 'node:child_process';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
|
||||
const __filename = fileURLToPath(import.meta.url);
|
||||
const __dirname = path.dirname(__filename);
|
||||
|
||||
const repoRoot = path.resolve(__dirname, '..', '..', '..');
|
||||
const webDir = path.join(repoRoot, 'packages', 'web');
|
||||
const desktopTauriDir = path.join(repoRoot, 'packages', 'desktop', 'src-tauri');
|
||||
|
||||
const resourcesDir = path.join(desktopTauriDir, 'resources');
|
||||
const resourcesWebDistDir = path.join(resourcesDir, 'web-dist');
|
||||
const webDistDir = path.join(webDir, 'dist');
|
||||
|
||||
const sidecarsDir = path.join(desktopTauriDir, 'sidecars');
|
||||
|
||||
const inferTargetTriple = () => {
|
||||
if (typeof process.env.TAURI_ENV_TARGET_TRIPLE === 'string' && process.env.TAURI_ENV_TARGET_TRIPLE.trim()) {
|
||||
return process.env.TAURI_ENV_TARGET_TRIPLE.trim();
|
||||
}
|
||||
|
||||
if (process.platform === 'darwin') {
|
||||
return process.arch === 'arm64' ? 'aarch64-apple-darwin' : 'x86_64-apple-darwin';
|
||||
}
|
||||
|
||||
if (process.platform === 'win32') {
|
||||
return 'x86_64-pc-windows-msvc';
|
||||
}
|
||||
|
||||
if (process.platform === 'linux') {
|
||||
return process.arch === 'arm64' ? 'aarch64-unknown-linux-gnu' : 'x86_64-unknown-linux-gnu';
|
||||
}
|
||||
|
||||
return `${process.arch}-${process.platform}`;
|
||||
};
|
||||
|
||||
const targetTriple = inferTargetTriple();
|
||||
const sidecarBaseName = process.platform === 'win32'
|
||||
? `openchamber-server-${targetTriple}.exe`
|
||||
: `openchamber-server-${targetTriple}`;
|
||||
const sidecarOutPath = path.join(sidecarsDir, sidecarBaseName);
|
||||
|
||||
|
||||
const run = (cmd, args, cwd) => {
|
||||
const result = spawnSync(cmd, args, { cwd, stdio: 'inherit' });
|
||||
if (result.error) throw result.error;
|
||||
if (result.status !== 0) {
|
||||
throw new Error(`Command failed: ${cmd} ${args.join(' ')}`);
|
||||
}
|
||||
};
|
||||
|
||||
const resolveBun = () => {
|
||||
if (typeof process.env.BUN === 'string' && process.env.BUN.trim()) {
|
||||
return process.env.BUN.trim();
|
||||
}
|
||||
|
||||
const result = spawnSync('/bin/bash', ['-lc', 'command -v bun'], { encoding: 'utf8' });
|
||||
const resolved = (result.stdout || '').trim();
|
||||
if (resolved) {
|
||||
return resolved;
|
||||
}
|
||||
|
||||
return 'bun';
|
||||
};
|
||||
|
||||
const bunExe = resolveBun();
|
||||
|
||||
|
||||
const copyDir = async (src, dst) => {
|
||||
await fs.mkdir(dst, { recursive: true });
|
||||
const entries = await fs.readdir(src, { withFileTypes: true });
|
||||
for (const entry of entries) {
|
||||
const from = path.join(src, entry.name);
|
||||
const to = path.join(dst, entry.name);
|
||||
if (entry.isDirectory()) {
|
||||
await copyDir(from, to);
|
||||
} else if (entry.isSymbolicLink()) {
|
||||
const link = await fs.readlink(from);
|
||||
await fs.symlink(link, to);
|
||||
} else {
|
||||
await fs.copyFile(from, to);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
console.log('[desktop] building web UI dist...');
|
||||
run(bunExe, ['run', 'build'], webDir);
|
||||
|
||||
console.log('[desktop] preparing tauri resources...');
|
||||
await fs.mkdir(resourcesDir, { recursive: true });
|
||||
await fs.rm(resourcesWebDistDir, { recursive: true, force: true });
|
||||
await copyDir(webDistDir, resourcesWebDistDir);
|
||||
|
||||
console.log('[desktop] building openchamber-server sidecar...');
|
||||
await fs.mkdir(sidecarsDir, { recursive: true });
|
||||
|
||||
run(bunExe, [
|
||||
'build',
|
||||
'--compile',
|
||||
path.join(webDir, 'server', 'index.js'),
|
||||
'--outfile',
|
||||
sidecarOutPath,
|
||||
], repoRoot);
|
||||
|
||||
if (process.platform !== 'win32') {
|
||||
await fs.chmod(sidecarOutPath, 0o755);
|
||||
}
|
||||
|
||||
console.log(`[desktop] sidecar ready: ${sidecarOutPath}`);
|
||||
console.log(`[desktop] web assets ready: ${resourcesWebDistDir}`);
|
||||
@@ -2,7 +2,6 @@
|
||||
import { spawn } from 'node:child_process';
|
||||
import path from 'node:path';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
import { startCli, stopCli } from './opencode-cli.mjs';
|
||||
|
||||
const __filename = fileURLToPath(import.meta.url);
|
||||
const __dirname = path.dirname(__filename);
|
||||
@@ -19,8 +18,6 @@ function spawnProcess(command, args, opts = {}) {
|
||||
}
|
||||
|
||||
async function main() {
|
||||
await startCli();
|
||||
|
||||
const tauriProcess = spawnProcess('bun', ['--cwd', desktopDir, 'tauri', 'dev', '--features', 'devtools']);
|
||||
|
||||
let cleaning = false;
|
||||
@@ -44,10 +41,6 @@ async function main() {
|
||||
|
||||
stopChild(tauriProcess, 'Tauri dev process');
|
||||
|
||||
await stopCli({ silent: true }).catch((error) => {
|
||||
console.warn('[desktop:dev] Failed to stop OpenCode CLI:', error);
|
||||
});
|
||||
|
||||
process.exit(typeof code === 'number' ? code : 0);
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
import path from 'node:path';
|
||||
import { spawn, spawnSync } from 'node:child_process';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
|
||||
const __filename = fileURLToPath(import.meta.url);
|
||||
const __dirname = path.dirname(__filename);
|
||||
|
||||
const repoRoot = path.resolve(__dirname, '..', '..', '..');
|
||||
const desktopDir = path.join(repoRoot, 'packages', 'desktop');
|
||||
const tauriDir = path.join(desktopDir, 'src-tauri');
|
||||
|
||||
const inferTargetTriple = () => {
|
||||
const fromEnv = typeof process.env.TAURI_ENV_TARGET_TRIPLE === 'string' ? process.env.TAURI_ENV_TARGET_TRIPLE.trim() : '';
|
||||
if (fromEnv) return fromEnv;
|
||||
|
||||
if (process.platform === 'darwin') {
|
||||
return process.arch === 'arm64' ? 'aarch64-apple-darwin' : 'x86_64-apple-darwin';
|
||||
}
|
||||
|
||||
if (process.platform === 'win32') {
|
||||
return 'x86_64-pc-windows-msvc';
|
||||
}
|
||||
|
||||
if (process.platform === 'linux') {
|
||||
return process.arch === 'arm64' ? 'aarch64-unknown-linux-gnu' : 'x86_64-unknown-linux-gnu';
|
||||
}
|
||||
|
||||
return `${process.arch}-${process.platform}`;
|
||||
};
|
||||
|
||||
const targetTriple = inferTargetTriple();
|
||||
const sidecarName = process.platform === 'win32'
|
||||
? `openchamber-server-${targetTriple}.exe`
|
||||
: `openchamber-server-${targetTriple}`;
|
||||
|
||||
const sidecarPath = path.join(tauriDir, 'sidecars', sidecarName);
|
||||
const distDir = path.join(tauriDir, 'resources', 'web-dist');
|
||||
|
||||
const run = (cmd, args, cwd) => {
|
||||
const result = spawnSync(cmd, args, { cwd, stdio: 'inherit' });
|
||||
if (result.error) throw result.error;
|
||||
if (result.status !== 0) {
|
||||
throw new Error(`Command failed: ${cmd} ${args.join(' ')}`);
|
||||
}
|
||||
};
|
||||
|
||||
console.log('[desktop] ensuring sidecar + web-dist...');
|
||||
run('node', ['./scripts/build-sidecar.mjs'], desktopDir);
|
||||
|
||||
console.log('[desktop] starting dev server on http://127.0.0.1:3001 ...');
|
||||
|
||||
const child = spawn(sidecarPath, ['--port', '3001'], {
|
||||
cwd: repoRoot,
|
||||
stdio: 'inherit',
|
||||
env: {
|
||||
...process.env,
|
||||
OPENCHAMBER_HOST: '127.0.0.1',
|
||||
OPENCHAMBER_DIST_DIR: distDir,
|
||||
NO_PROXY: process.env.NO_PROXY || 'localhost,127.0.0.1',
|
||||
no_proxy: process.env.no_proxy || 'localhost,127.0.0.1',
|
||||
},
|
||||
});
|
||||
|
||||
const shutdown = () => {
|
||||
try {
|
||||
child.kill('SIGTERM');
|
||||
} catch {
|
||||
// ignore
|
||||
}
|
||||
};
|
||||
|
||||
process.on('SIGINT', shutdown);
|
||||
process.on('SIGTERM', shutdown);
|
||||
process.on('exit', shutdown);
|
||||
Reference in New Issue
Block a user