Skip to content

armgit / Orkas

Public Imported from GitHub
0

Orkas is an open-source (MIT), local-first AI team for your desktop: a Commander turns your goal into to-dos and coordinates 16 built-in specialist agents plus Claude Code, Codex, OpenCode, OpenClaw and Hermes, with projects, scheduled automations and connectors. Free app for macOS & Windows; built-in models or your own keys.

Fix OrkasOpen source startup Electron repair

wyt03f254be684e
diff --git a/run.cmd b/run.cmd
index 1d3909c6..6af7f5cd 100644
--- a/run.cmd
+++ b/run.cmd
@@ -10,7 +10,7 @@ if not exist "%APP_DIR%\package.json" (
exit /b 1
)
-echo [Orkas] 启动 Orkas (global prod)
+echo [Orkas] 启动 Orkas (global prod)
call node "%APP_DIR%\scripts\ensure-deps.cjs"
if errorlevel 1 exit /b 1
@@ -18,7 +18,6 @@ call node "%APP_DIR%\bin\ensure-runtime.cjs" --root "%APP_DIR%\resources\runtime
if errorlevel 1 exit /b 1
call node "%APP_DIR%\scripts\fetch-officecli.cjs"
if errorlevel 1 exit /b 1
-call node "%APP_DIR%\scripts\patch-dev-protocol.cjs"
pushd "%APP_DIR%"
taskkill /F /IM electron.exe >nul 2>nul
diff --git a/run.sh b/run.sh
index cedfa67b..5d0eb947 100755
--- a/run.sh
+++ b/run.sh
@@ -42,24 +42,16 @@ echo "[Orkas] Starting Orkas (global prod)"
node "$APP_DIR/scripts/ensure-deps.cjs"
node "$APP_DIR/bin/ensure-runtime.cjs" --root "$APP_DIR/resources/runtime"
node "$APP_DIR/scripts/fetch-officecli.cjs"
-# macOS dev only: declare the orkas-dev:// scheme + a unique bundle id on the bundled Electron .app so
-# OAuth login deep-link callbacks route back to this running instance (no-op elsewhere; never fails).
-node "$APP_DIR/scripts/patch-dev-protocol.cjs" || true
cd "$APP_DIR"
pkill -9 -f "$APP_DIR/node_modules/electron/dist" >/dev/null 2>&1 || true
sleep 0.3
if [ "$(uname -s)" = "Darwin" ]; then
- APP_BUNDLE="$APP_DIR/node_modules/electron/dist/Orkas Dev.app"
- if [ ! -d "$APP_BUNDLE" ]; then
- APP_BUNDLE="$APP_DIR/node_modules/electron/dist/Orkas.app"
- fi
+ APP_BUNDLE="$APP_DIR/node_modules/electron/dist/Orkas.app"
if [ -d "$APP_BUNDLE" ]; then
ARGS=("$APP_DIR")
- # Launch through LaunchServices so macOS routes orkas-dev:// open-url events to this dev app
- # instance. Directly executing `Electron .` leaves the app running, but protocol callbacks
- # may be delivered to the .app bundle instead of the command-line process.
+ # Launch through LaunchServices so the patched app name/icon are used in source runs.
exec open -W -n "$APP_BUNDLE" --args "${ARGS[@]}"
fi
fi
diff --git a/scripts/ensure-deps.cjs b/scripts/ensure-deps.cjs
index 81d94be2..55267357 100644
--- a/scripts/ensure-deps.cjs
+++ b/scripts/ensure-deps.cjs
@@ -175,22 +175,64 @@ function electronBinaryPath() {
}
}
-function electronReady() {
- const bin = electronBinaryPath();
+function electronPlatformPath() {
+ switch (process.platform) {
+ case 'darwin':
+ return 'Electron.app/Contents/MacOS/Electron';
+ case 'win32':
+ return 'electron.exe';
+ default:
+ return 'electron';
+ }
+}
+
+function electronDarwinAppRoot(bin) {
+ const marker = `${path.sep}Contents${path.sep}MacOS${path.sep}Electron`;
+ if (!bin.endsWith(marker)) return '';
+ return bin.slice(0, -marker.length);
+}
+
+function electronDistReady(distDir, relPath, expected) {
+ const bin = path.join(distDir, relPath);
if (!bin || !fs.existsSync(bin)) return false;
- const expected = electronExpectedVersion();
- if (!expected) return false;
try {
- const actual = fs.readFileSync(path.join(ELECTRON_DIR, 'dist', 'version'), 'utf8').trim().replace(/^v/, '');
+ const actual = fs.readFileSync(path.join(distDir, 'version'), 'utf8').trim().replace(/^v/, '');
if (actual !== expected) return false;
} catch {
return false;
}
+ if (process.platform === 'darwin') {
+ const appRoot = electronDarwinAppRoot(bin);
+ if (!appRoot) return false;
+ const framework = path.join(
+ appRoot,
+ 'Contents',
+ 'Frameworks',
+ 'Electron Framework.framework',
+ 'Versions',
+ 'A',
+ 'Electron Framework',
+ );
+ if (!fs.existsSync(framework)) return false;
+ }
+
return true;
}
+function electronReady() {
+ const expected = electronExpectedVersion();
+ if (!expected) return false;
+ try {
+ const rel = fs.readFileSync(ELECTRON_PATH_TXT, 'utf8').trim();
+ if (!rel) return false;
+ return electronDistReady(path.join(ELECTRON_DIR, 'dist'), rel, expected);
+ } catch {
+ return false;
+ }
+}
+
function runElectronInstall(reason) {
if (!fs.existsSync(ELECTRON_INSTALL)) {
console.error('[Orkas] Electron package is incomplete: node_modules/electron/install.js is missing.');
@@ -213,11 +255,97 @@ function runElectronInstall(reason) {
}
}
+function electronDownloadArch() {
+ const envArch = process.env.npm_config_arch || '';
+ if (envArch) return envArch;
+ return process.arch;
+}
+
+function electronDownloadPlatform() {
+ return process.env.npm_config_platform || process.platform;
+}
+
+function downloadElectronZip(expected) {
+ const script = `
+const { downloadArtifact } = require('@electron/get');
+const path = require('node:path');
+downloadArtifact({
+ version: ${JSON.stringify(expected)},
+ artifactName: 'electron',
+ platform: ${JSON.stringify(electronDownloadPlatform())},
+ arch: ${JSON.stringify(electronDownloadArch())},
+ checksums: require(${JSON.stringify(path.join(ELECTRON_DIR, 'checksums.json'))}),
+}).then((p) => process.stdout.write(String(p))).catch((err) => {
+ console.error(err && err.stack || err);
+ process.exit(1);
+});
+`;
+ const res = spawnSync(process.execPath, ['-e', script], {
+ cwd: PC_DIR,
+ encoding: 'utf8',
+ stdio: ['ignore', 'pipe', 'pipe'],
+ shell: false,
+ });
+ if (res.error) {
+ console.warn('[Orkas] Electron zip lookup failed to start:', res.error.message);
+ return '';
+ }
+ if (res.status !== 0) {
+ const err = String(res.stderr || '').trim();
+ console.warn('[Orkas] Electron zip lookup failed:', err || `exit ${res.status}`);
+ return '';
+ }
+ return String(res.stdout || '').trim();
+}
+
+function repairElectronByUnzip(reason) {
+ if (process.platform === 'win32') return false;
+ const expected = electronExpectedVersion();
+ if (!expected) return false;
+
+ const zip = downloadElectronZip(expected);
+ if (!zip || !fs.existsSync(zip)) return false;
+
+ const relPath = electronPlatformPath();
+ const distDir = path.join(ELECTRON_DIR, 'dist');
+ const tmpDir = path.join(ELECTRON_DIR, `.dist-extract-${process.pid}`);
+ fs.rmSync(tmpDir, { recursive: true, force: true });
+ fs.mkdirSync(tmpDir, { recursive: true });
+
+ console.log(`[Orkas] Electron install script did not complete (${reason}); extracting cached Electron archive...`);
+ const unzip = spawnSync('unzip', ['-q', '-o', zip, '-d', tmpDir], {
+ cwd: PC_DIR,
+ stdio: 'inherit',
+ shell: false,
+ });
+ if (unzip.error) {
+ console.warn('[Orkas] unzip failed to start:', unzip.error.message);
+ fs.rmSync(tmpDir, { recursive: true, force: true });
+ return false;
+ }
+ if (unzip.status !== 0) {
+ fs.rmSync(tmpDir, { recursive: true, force: true });
+ return false;
+ }
+
+ if (!electronDistReady(tmpDir, relPath, expected)) {
+ console.warn('[Orkas] Extracted Electron archive is incomplete.');
+ fs.rmSync(tmpDir, { recursive: true, force: true });
+ return false;
+ }
+
+ fs.rmSync(distDir, { recursive: true, force: true });
+ fs.renameSync(tmpDir, distDir);
+ fs.writeFileSync(ELECTRON_PATH_TXT, relPath, 'utf8');
+ return true;
+}
+
function ensureElectronReady(reason = 'missing binary') {
if (electronReady()) return;
runElectronInstall(reason);
if (electronReady()) return;
+ if (repairElectronByUnzip(reason) && electronReady()) return;
const bin = electronBinaryPath() || '<missing path.txt>';
console.error('[Orkas] Electron is still incomplete after repair.');