wangxuming/NianToB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fall back when external OpenClaw lacks app deps

Browse Source
This commit is contained in:
inman
2026-04-29 11:04:02 +08:00
parent 47b83b79fc
commit 0a211b8d8f
1 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
electron/utils/paths.ts
View File

@@ -23,6 +23,15 @@ type OpenClawRuntimeResolution = {
let cachedOpenClawRuntime: OpenClawRuntimeResolution | null = null;
// Packages that Zhinian loads from the OpenClaw package context at main-process
// module initialization time. Some user-installed OpenClaw packages are valid
// CLIs but do not include these app-side integration dependencies; selecting
// them would crash before the UI opens.
const REQUIRED_OPENCLAW_CONTEXT_PACKAGES = [
'@whiskeysockets/baileys',
'qrcode-terminal',
] as const;
export {
quoteForCmd,
needsWinShell,
@@ -139,6 +148,28 @@ function isValidOpenClawPackageDir(dir: string): boolean {
&& existsSync(fsPath(join(dir, 'openclaw.mjs')));
}
function hasRequiredOpenClawContextPackages(dir: string): boolean {
if (!isValidOpenClawPackageDir(dir)) return false;
try {
const runtimeRequire = createRequire(join(realpathSync(fsPath(dir)), 'package.json'));
for (const packageName of REQUIRED_OPENCLAW_CONTEXT_PACKAGES) {
runtimeRequire.resolve(`${packageName}/package.json`);
}
return true;
} catch {
try {
const runtimeRequire = createRequire(join(dir, 'package.json'));
for (const packageName of REQUIRED_OPENCLAW_CONTEXT_PACKAGES) {
runtimeRequire.resolve(`${packageName}/package.json`);
}
return true;
} catch {
return false;
}
}
}
function samePath(left: string, right: string): boolean {
try {
return realpathSync(fsPath(left)) === realpathSync(fsPath(right));
@@ -219,7 +250,12 @@ function findExternalOpenClawDir(excludedDirs: string[]): string | null {
if (seen.has(candidate)) continue;
seen.add(candidate);
if (excludedDirs.some((excluded) => samePath(candidate, excluded))) continue;
if (isValidOpenClawPackageDir(candidate)) return candidate;
if (!isValidOpenClawPackageDir(candidate)) continue;
if (hasRequiredOpenClawContextPackages(candidate)) return candidate;
logOpenClawRuntime('[openclaw-runtime] Ignoring external OpenClaw installation because required app dependencies are missing', {
candidate,
requiredPackages: REQUIRED_OPENCLAW_CONTEXT_PACKAGES,
});
}
return null;