yymaxapi 1.0.111 → 1.0.112
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/yymaxapi.js +10 -17
- package/package.json +1 -1
package/bin/yymaxapi.js
CHANGED
|
@@ -1046,12 +1046,12 @@ function writeClaudeCodeSettings(baseUrl, apiKey, modelId = getDefaultClaudeMode
|
|
|
1046
1046
|
settings.apiBaseUrl = normalizedBaseUrl;
|
|
1047
1047
|
settings.model = normalizedModelId;
|
|
1048
1048
|
if (!settings.env) settings.env = {};
|
|
1049
|
-
settings.env.
|
|
1049
|
+
settings.env.ANTHROPIC_AUTH_TOKEN = apiKey;
|
|
1050
1050
|
settings.env.ANTHROPIC_BASE_URL = normalizedBaseUrl;
|
|
1051
1051
|
settings.env.ANTHROPIC_DEFAULT_OPUS_MODEL = pinnedOpusModel;
|
|
1052
1052
|
settings.env.ANTHROPIC_DEFAULT_SONNET_MODEL = pinnedSonnetModel;
|
|
1053
1053
|
settings.env.ANTHROPIC_DEFAULT_HAIKU_MODEL = pinnedHaikuModel;
|
|
1054
|
-
delete settings.env.
|
|
1054
|
+
delete settings.env.ANTHROPIC_API_KEY;
|
|
1055
1055
|
delete settings.availableModels;
|
|
1056
1056
|
delete settings.env.ANTHROPIC_MODEL;
|
|
1057
1057
|
if (!fs.existsSync(claudeDir)) fs.mkdirSync(claudeDir, { recursive: true });
|
|
@@ -3931,18 +3931,17 @@ function readClaudeCodeCliConfig() {
|
|
|
3931
3931
|
const settings = readJsonIfExists(settingsPath) || {};
|
|
3932
3932
|
const settingsEnv = settings.env && typeof settings.env === 'object' ? settings.env : {};
|
|
3933
3933
|
const settingsApiKey = String(settingsEnv.ANTHROPIC_API_KEY || '').trim();
|
|
3934
|
-
const
|
|
3934
|
+
const settingsAuthToken = String(settingsEnv.ANTHROPIC_AUTH_TOKEN || '').trim();
|
|
3935
3935
|
const settingsBaseUrl = String(settingsEnv.ANTHROPIC_BASE_URL || settings.apiBaseUrl || '').trim();
|
|
3936
3936
|
return {
|
|
3937
3937
|
settingsPath,
|
|
3938
3938
|
modelId: settings.model || settingsEnv.ANTHROPIC_MODEL || process.env.ANTHROPIC_MODEL || getDefaultClaudeModel().id,
|
|
3939
3939
|
baseUrl: settingsBaseUrl || process.env.ANTHROPIC_BASE_URL || '',
|
|
3940
|
-
apiKey:
|
|
3940
|
+
apiKey: settingsAuthToken || settingsApiKey || process.env.ANTHROPIC_AUTH_TOKEN || process.env.ANTHROPIC_API_KEY || process.env.CLAUDE_API_KEY || '',
|
|
3941
3941
|
settingsBaseUrl,
|
|
3942
3942
|
settingsApiKey,
|
|
3943
|
-
|
|
3944
|
-
|
|
3945
|
-
usesLegacyAuthTokenOnly: !settingsApiKey && !!settingsLegacyAuthToken,
|
|
3943
|
+
settingsAuthToken,
|
|
3944
|
+
settingsAuthMode: settingsAuthToken ? 'auth_token' : (settingsApiKey ? 'api_key' : ''),
|
|
3946
3945
|
configured: fs.existsSync(settingsPath)
|
|
3947
3946
|
};
|
|
3948
3947
|
}
|
|
@@ -4061,15 +4060,8 @@ function testClaudeCodeCliConnection() {
|
|
|
4061
4060
|
|
|
4062
4061
|
const config = readClaudeCodeCliConfig();
|
|
4063
4062
|
if (!config.configured) return { name: 'Claude Code CLI', status: 'skipped', detail: '未检测到 ~/.claude/settings.json' };
|
|
4064
|
-
if (config.
|
|
4065
|
-
return {
|
|
4066
|
-
name: 'Claude Code CLI',
|
|
4067
|
-
status: 'failed',
|
|
4068
|
-
detail: '检测到旧版 Claude Code 配置字段 ANTHROPIC_AUTH_TOKEN,请重新运行 yymaxapi 以改写为 ANTHROPIC_API_KEY'
|
|
4069
|
-
};
|
|
4070
|
-
}
|
|
4071
|
-
if (!config.settingsBaseUrl || !config.settingsApiKey) {
|
|
4072
|
-
return { name: 'Claude Code CLI', status: 'failed', detail: 'Claude Code 配置缺少 settings.json 中的 Base URL 或 API Key' };
|
|
4063
|
+
if (!config.settingsBaseUrl || !config.apiKey) {
|
|
4064
|
+
return { name: 'Claude Code CLI', status: 'failed', detail: 'Claude Code 配置缺少 settings.json 中的 Base URL 或鉴权字段' };
|
|
4073
4065
|
}
|
|
4074
4066
|
|
|
4075
4067
|
const env = {
|
|
@@ -5443,7 +5435,8 @@ async function activateClaudeCode(paths, args = {}) {
|
|
|
5443
5435
|
console.log(chalk.gray(' API Key: 已设置'));
|
|
5444
5436
|
console.log(chalk.gray('\n 已写入:'));
|
|
5445
5437
|
console.log(chalk.gray(' • ~/.claude/settings.json'));
|
|
5446
|
-
console.log(chalk.gray(' • 关键字段: apiBaseUrl + model + env.
|
|
5438
|
+
console.log(chalk.gray(' • 关键字段: apiBaseUrl + model + env.ANTHROPIC_AUTH_TOKEN + env.ANTHROPIC_BASE_URL'));
|
|
5439
|
+
console.log(chalk.gray(' • Claude Code 走 Bearer Token 网关鉴权,避免落入官方登录 / 批准自定义 API Key 流程'));
|
|
5447
5440
|
console.log(chalk.gray(' • 已钉住 Claude alias 默认版本,避免第三方中转回落到官方旧别名'));
|
|
5448
5441
|
console.log(chalk.yellow('\n 提示: 如果 Claude Code 已在运行,重新打开一个会话即可读取新配置'));
|
|
5449
5442
|
|