romtuck/openclaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 2988796c3c into fa9ec6e854

Browse Source
This commit is contained in:
Seb Slight 2026-01-30 14:09:07 +03:00 committed by GitHub
commit bf52f85c0b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
extensions/google-gemini-cli-auth/oauth.ts
View File

@ -55,22 +55,61 @@ export function clearCredentialsCache(): void {
cachedGeminiCliCredentials = null;
}
/** Resolves the actual gemini binary path, handling mise/asdf shims. */
function resolveGeminiBinaryPath(): string | null {
const geminiPath = findInPath("gemini");
if (!geminiPath) return null;
// Check if this is a mise shim by looking at realpath
const resolvedPath = realpathSync(geminiPath);
if (resolvedPath.endsWith("/mise") || resolvedPath.includes("/mise/")) {
// It's a mise shim - use `mise which` to get the real path
try {
const { execSync } = require("node:child_process");
const miseResult = execSync("mise which gemini", { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] }).trim();
if (miseResult && existsSync(miseResult)) {
return miseResult;
}
} catch {
// mise which failed, continue with fallbacks
}
}
return resolvedPath;
}
/** Extracts OAuth credentials from the installed Gemini CLI's bundled oauth2.js. */
export function extractGeminiCliCredentials(): { clientId: string; clientSecret: string } | null {
if (cachedGeminiCliCredentials) return cachedGeminiCliCredentials;
try {
const geminiPath = findInPath("gemini");
const geminiPath = resolveGeminiBinaryPath();
if (!geminiPath) return null;
const resolvedPath = realpathSync(geminiPath);
const geminiCliDir = dirname(dirname(resolvedPath));
const geminiCliDir = dirname(dirname(geminiPath));
// Build search paths - try resolved path first, then common npm global locations
const searchPaths = [
join(geminiCliDir, "node_modules", "@google", "gemini-cli-core", "dist", "src", "code_assist", "oauth2.js"),
join(geminiCliDir, "node_modules", "@google", "gemini-cli-core", "dist", "code_assist", "oauth2.js"),
// For mise/nvm/fnm: the structure is lib/node_modules/@google/gemini-cli/...
join(dirname(geminiCliDir), "lib", "node_modules", "@google", "gemini-cli", "node_modules", "@google", "gemini-cli-core", "dist", "src", "code_assist", "oauth2.js"),
];
// Also try npm root -g as a fallback
try {
const { execSync } = require("node:child_process");
const npmRoot = execSync("npm root -g", { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] }).trim();
if (npmRoot) {
searchPaths.push(
join(npmRoot, "@google", "gemini-cli", "node_modules", "@google", "gemini-cli-core", "dist", "src", "code_assist", "oauth2.js"),
join(npmRoot, "@google", "gemini-cli-core", "dist", "src", "code_assist", "oauth2.js"),
);
}
} catch {
// npm root -g failed, continue with existing paths
}
let content: string | null = null;
for (const p of searchPaths) {
if (existsSync(p)) {