github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-08 09:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(infra): dedupe openclaw root candidate scan

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-15 21:48:46 +00:00
parent 012b674f31
commit 50abdaf33b
1 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/infra/openclaw-root.ts
View File

@@ -87,19 +87,7 @@ export async function resolveOpenClawPackageRoot(opts: {
argv1?: string; argv1?: string;
moduleUrl?: string; moduleUrl?: string;
}): Promise<string | null> { }): Promise<string | null> {
const candidates: string[] = []; for (const candidate of buildCandidates(opts)) {
if (opts.moduleUrl) {
candidates.push(path.dirname(fileURLToPath(opts.moduleUrl)));
}
if (opts.argv1) {
candidates.push(...candidateDirsFromArgv1(opts.argv1));
}
if (opts.cwd) {
candidates.push(opts.cwd);
}
for (const candidate of candidates) {
const found = await findPackageRoot(candidate); const found = await findPackageRoot(candidate);
if (found) { if (found) {
return found; return found;
@@ -114,6 +102,17 @@ export function resolveOpenClawPackageRootSync(opts: {
argv1?: string; argv1?: string;
moduleUrl?: string; moduleUrl?: string;
}): string | null { }): string | null {
for (const candidate of buildCandidates(opts)) {
const found = findPackageRootSync(candidate);
if (found) {
return found;
}
}
return null;
}
function buildCandidates(opts: { cwd?: string; argv1?: string; moduleUrl?: string }): string[] {
const candidates: string[] = []; const candidates: string[] = [];
if (opts.moduleUrl) { if (opts.moduleUrl) {
@@ -126,12 +125,5 @@ export function resolveOpenClawPackageRootSync(opts: {
candidates.push(opts.cwd); candidates.push(opts.cwd);
} }
for (const candidate of candidates) { return candidates;
const found = findPackageRootSync(candidate);
if (found) {
return found;
}
}
return null;
} }