chore: Enable "curly" rule to avoid single-statement if confusion/errors.

This commit is contained in:
cpojer
2026-01-31 16:19:20 +09:00
parent 009b16fab8
commit 5ceff756e1
1266 changed files with 27871 additions and 9393 deletions

View File

@@ -20,7 +20,9 @@ export type ProviderAuth = {
};
function parseGoogleToken(apiKey: string): { token: string } | null {
if (!apiKey) return null;
if (!apiKey) {
return null;
}
try {
const parsed = JSON.parse(apiKey) as { token?: unknown };
if (parsed && typeof parsed.token === "string") {
@@ -34,14 +36,20 @@ function parseGoogleToken(apiKey: string): { token: string } | null {
function resolveZaiApiKey(): string | undefined {
const envDirect = process.env.ZAI_API_KEY?.trim() || process.env.Z_AI_API_KEY?.trim();
if (envDirect) return envDirect;
if (envDirect) {
return envDirect;
}
const envResolved = resolveEnvApiKey("zai");
if (envResolved?.apiKey) return envResolved.apiKey;
if (envResolved?.apiKey) {
return envResolved.apiKey;
}
const cfg = loadConfig();
const key = getCustomProviderApiKey(cfg, "zai") || getCustomProviderApiKey(cfg, "z-ai");
if (key) return key;
if (key) {
return key;
}
const store = ensureAuthProfileStore();
const apiProfile = [
@@ -57,7 +65,9 @@ function resolveZaiApiKey(): string | undefined {
try {
const authPath = path.join(os.homedir(), ".pi", "agent", "auth.json");
if (!fs.existsSync(authPath)) return undefined;
if (!fs.existsSync(authPath)) {
return undefined;
}
const data = JSON.parse(fs.readFileSync(authPath, "utf-8")) as Record<
string,
{ access?: string }
@@ -71,21 +81,29 @@ function resolveZaiApiKey(): string | undefined {
function resolveMinimaxApiKey(): string | undefined {
const envDirect =
process.env.MINIMAX_CODE_PLAN_KEY?.trim() || process.env.MINIMAX_API_KEY?.trim();
if (envDirect) return envDirect;
if (envDirect) {
return envDirect;
}
const envResolved = resolveEnvApiKey("minimax");
if (envResolved?.apiKey) return envResolved.apiKey;
if (envResolved?.apiKey) {
return envResolved.apiKey;
}
const cfg = loadConfig();
const key = getCustomProviderApiKey(cfg, "minimax");
if (key) return key;
if (key) {
return key;
}
const store = ensureAuthProfileStore();
const apiProfile = listProfilesForProvider(store, "minimax").find((id) => {
const cred = store.profiles[id];
return cred?.type === "api_key" || cred?.type === "token";
});
if (!apiProfile) return undefined;
if (!apiProfile) {
return undefined;
}
const cred = store.profiles[apiProfile];
if (cred?.type === "api_key" && cred.key?.trim()) {
return cred.key.trim();
@@ -98,21 +116,29 @@ function resolveMinimaxApiKey(): string | undefined {
function resolveXiaomiApiKey(): string | undefined {
const envDirect = process.env.XIAOMI_API_KEY?.trim();
if (envDirect) return envDirect;
if (envDirect) {
return envDirect;
}
const envResolved = resolveEnvApiKey("xiaomi");
if (envResolved?.apiKey) return envResolved.apiKey;
if (envResolved?.apiKey) {
return envResolved.apiKey;
}
const cfg = loadConfig();
const key = getCustomProviderApiKey(cfg, "xiaomi");
if (key) return key;
if (key) {
return key;
}
const store = ensureAuthProfileStore();
const apiProfile = listProfilesForProvider(store, "xiaomi").find((id) => {
const cred = store.profiles[id];
return cred?.type === "api_key" || cred?.type === "token";
});
if (!apiProfile) return undefined;
if (!apiProfile) {
return undefined;
}
const cred = store.profiles[apiProfile];
if (cred?.type === "api_key" && cred.key?.trim()) {
return cred.key.trim();
@@ -140,12 +166,16 @@ async function resolveOAuthToken(params: {
const candidates = order;
const deduped: string[] = [];
for (const entry of candidates) {
if (!deduped.includes(entry)) deduped.push(entry);
if (!deduped.includes(entry)) {
deduped.push(entry);
}
}
for (const profileId of deduped) {
const cred = store.profiles[profileId];
if (!cred || (cred.type !== "oauth" && cred.type !== "token")) continue;
if (!cred || (cred.type !== "oauth" && cred.type !== "token")) {
continue;
}
try {
const resolved = await resolveApiKeyForProfile({
// Usage snapshots should work even if config profile metadata is stale.
@@ -155,7 +185,9 @@ async function resolveOAuthToken(params: {
profileId,
agentDir: params.agentDir,
});
if (!resolved?.apiKey) continue;
if (!resolved?.apiKey) {
continue;
}
let token = resolved.apiKey;
if (params.provider === "google-gemini-cli" || params.provider === "google-antigravity") {
const parsed = parseGoogleToken(resolved.apiKey);
@@ -195,7 +227,9 @@ function resolveOAuthProviders(agentDir?: string): UsageProviderId[] {
};
return providers.filter((provider) => {
const profiles = listProfilesForProvider(store, provider).filter(isOAuthLikeCredential);
if (profiles.length > 0) return true;
if (profiles.length > 0) {
return true;
}
const normalized = normalizeProviderId(provider);
const configuredProfiles = Object.entries(cfg.auth?.profiles ?? {})
.filter(([, profile]) => normalizeProviderId(profile.provider) === normalized)
@@ -210,7 +244,9 @@ export async function resolveProviderAuths(params: {
auth?: ProviderAuth[];
agentDir?: string;
}): Promise<ProviderAuth[]> {
if (params.auth) return params.auth;
if (params.auth) {
return params.auth;
}
const oauthProviders = resolveOAuthProviders(params.agentDir);
const auths: ProviderAuth[] = [];
@@ -218,26 +254,36 @@ export async function resolveProviderAuths(params: {
for (const provider of params.providers) {
if (provider === "zai") {
const apiKey = resolveZaiApiKey();
if (apiKey) auths.push({ provider, token: apiKey });
if (apiKey) {
auths.push({ provider, token: apiKey });
}
continue;
}
if (provider === "minimax") {
const apiKey = resolveMinimaxApiKey();
if (apiKey) auths.push({ provider, token: apiKey });
if (apiKey) {
auths.push({ provider, token: apiKey });
}
continue;
}
if (provider === "xiaomi") {
const apiKey = resolveXiaomiApiKey();
if (apiKey) auths.push({ provider, token: apiKey });
if (apiKey) {
auths.push({ provider, token: apiKey });
}
continue;
}
if (!oauthProviders.includes(provider)) continue;
if (!oauthProviders.includes(provider)) {
continue;
}
const auth = await resolveOAuthToken({
provider,
agentDir: params.agentDir,
});
if (auth) auths.push(auth);
if (auth) {
auths.push(auth);
}
}
return auths;