feat: 更新 Codex 配置格式
配置变更: - model: gpt-5.1-codex -> gpt-5-codex - base_url: https://www.xcodecli.com/openai (固定) - 新增 disable_response_storage, preferred_auth_method, requires_openai_auth - env_key: OPENAI_API_KEY -> XCODECLI_OAI_KEY - auth.json 中 OPENAI_API_KEY 设为 null 环境变量: - 使用 XCODECLI_OAI_KEY 替代 OPENAI_API_KEY 清理: - 移除不再需要的多端点测试逻辑 - 移除 DEFAULT_BASE_URL 变量 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
@@ -23,8 +23,6 @@ print_error() {
|
||||
}
|
||||
|
||||
# Default values
|
||||
DEFAULT_BASE_URL="https://api2.xcodecli.com"
|
||||
BASE_URL=""
|
||||
TEST_ONLY=false
|
||||
SHOW_SETTINGS=false
|
||||
|
||||
@@ -181,61 +179,9 @@ backup_config() {
|
||||
fi
|
||||
}
|
||||
|
||||
# Function to test API connection and return working base URL
|
||||
test_api_connection() {
|
||||
local api_key="$1"
|
||||
|
||||
local test_urls=(
|
||||
"https://api2.xcodecli.com"
|
||||
"https://api.xcodecli.com"
|
||||
)
|
||||
|
||||
print_info "Testing API connections..." >&2
|
||||
|
||||
for base_url in "${test_urls[@]}"; do
|
||||
print_info "Testing $base_url..." >&2
|
||||
|
||||
local test_endpoint="$base_url/v1/models"
|
||||
|
||||
# Test with Authorization Bearer header (OpenAI API style)
|
||||
local response
|
||||
response=$(curl -s -w "%{http_code}" -o /tmp/codex_test_response \
|
||||
-X GET "$test_endpoint" \
|
||||
-H "Content-Type: application/json" \
|
||||
-H "Authorization: Bearer $api_key" \
|
||||
2>/dev/null || echo "000")
|
||||
|
||||
if [ "$response" = "200" ]; then
|
||||
# Check if response contains models data
|
||||
if grep -qE '"data".*\[|"object"' /tmp/codex_test_response 2>/dev/null; then
|
||||
local model_count
|
||||
model_count=$(grep -oE '"id"[[:space:]]*:' /tmp/codex_test_response | wc -l | tr -d ' ')
|
||||
print_success "API connection successful! Found $model_count models at $base_url" >&2
|
||||
rm -f /tmp/codex_test_response
|
||||
echo "$base_url"
|
||||
return 0
|
||||
else
|
||||
print_warning "API responded but no models found at $base_url" >&2
|
||||
fi
|
||||
elif [ "$response" = "401" ]; then
|
||||
print_warning "API key authentication failed for $base_url" >&2
|
||||
elif [ "$response" = "000" ]; then
|
||||
print_warning "Cannot connect to $base_url" >&2
|
||||
else
|
||||
print_warning "API test failed for $base_url with HTTP status: $response" >&2
|
||||
fi
|
||||
|
||||
rm -f /tmp/codex_test_response
|
||||
done
|
||||
|
||||
print_error "All API connections failed. Please check your API key and internet connection." >&2
|
||||
return 1
|
||||
}
|
||||
|
||||
# Function to create Codex configuration
|
||||
create_codex_config() {
|
||||
local base_url="$1"
|
||||
local api_key="$2"
|
||||
local api_key="$1"
|
||||
|
||||
# Create config directory if it doesn't exist
|
||||
mkdir -p "$HOME/.codex"
|
||||
@@ -243,31 +189,34 @@ create_codex_config() {
|
||||
# Create config.toml
|
||||
cat >"$HOME/.codex/config.toml" <<EOF
|
||||
model_provider = "xcodecli"
|
||||
model = "gpt-5.1-codex"
|
||||
model = "gpt-5-codex"
|
||||
model_reasoning_effort = "high"
|
||||
disable_response_storage = true
|
||||
preferred_auth_method = "apikey"
|
||||
|
||||
[model_providers.xcodecli]
|
||||
name = "xcodecli"
|
||||
base_url = "${base_url}/v1"
|
||||
base_url = "https://www.xcodecli.com/openai"
|
||||
wire_api = "responses"
|
||||
env_key = "OPENAI_API_KEY"
|
||||
requires_openai_auth = true
|
||||
env_key = "XCODECLI_OAI_KEY"
|
||||
EOF
|
||||
|
||||
# Create auth.json with OPENAI_API_KEY set to null
|
||||
cat >"$HOME/.codex/auth.json" <<EOF
|
||||
{
|
||||
"OPENAI_API_KEY": "$api_key"
|
||||
"OPENAI_API_KEY": null
|
||||
}
|
||||
EOF
|
||||
|
||||
print_success "Codex configuration written to: $HOME/.codex/config.toml"
|
||||
print_success "Codex auth file written to: $HOME/.codex/auth.json"
|
||||
|
||||
# Write environment variables to shell config
|
||||
# Write environment variable XCODECLI_OAI_KEY to shell config
|
||||
local rc_file
|
||||
rc_file=$(get_shell_rc)
|
||||
print_info "Writing environment variables to: $rc_file"
|
||||
write_env_to_shell "OPENAI_API_KEY" "$api_key"
|
||||
write_env_to_shell "OPENAI_BASE_URL" "${base_url}/v1"
|
||||
write_env_to_shell "XCODECLI_OAI_KEY" "$api_key"
|
||||
print_success "Environment variables written to shell config"
|
||||
|
||||
return 0
|
||||
@@ -291,14 +240,16 @@ show_current_settings() {
|
||||
|
||||
if [ -f "$HOME/.codex/auth.json" ]; then
|
||||
print_info "Auth file: $HOME/.codex/auth.json"
|
||||
cat "$HOME/.codex/auth.json"
|
||||
echo "----------------------------------------"
|
||||
local api_key
|
||||
api_key=$(grep -o '"OPENAI_API_KEY"[[:space:]]*:[[:space:]]*"[^"]*"' "$HOME/.codex/auth.json" | sed 's/.*: *"//' | sed 's/"$//')
|
||||
if [ -n "$api_key" ]; then
|
||||
local masked_key="${api_key:0:8}...${api_key: -4}"
|
||||
print_info "OPENAI_API_KEY: $masked_key"
|
||||
fi
|
||||
echo "----------------------------------------"
|
||||
fi
|
||||
|
||||
# Show XCODECLI_OAI_KEY from environment
|
||||
if [ -n "$XCODECLI_OAI_KEY" ]; then
|
||||
local masked_key="${XCODECLI_OAI_KEY:0:8}...${XCODECLI_OAI_KEY: -4}"
|
||||
print_info "XCODECLI_OAI_KEY (env): $masked_key"
|
||||
else
|
||||
print_warning "XCODECLI_OAI_KEY environment variable not set"
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -351,27 +302,42 @@ main() {
|
||||
print_info "API Key: $masked_key"
|
||||
echo ""
|
||||
|
||||
# Test API connection and get working base URL
|
||||
BASE_URL=$(test_api_connection "$API_KEY")
|
||||
# Test API connection with fixed URL
|
||||
local test_url="https://www.xcodecli.com/openai"
|
||||
print_info "Testing API connection to $test_url..."
|
||||
|
||||
if [ $? -ne 0 ] || [ -z "$BASE_URL" ]; then
|
||||
local response
|
||||
response=$(curl -s -w "%{http_code}" -o /tmp/codex_test_response \
|
||||
-X GET "$test_url/models" \
|
||||
-H "Content-Type: application/json" \
|
||||
-H "Authorization: Bearer $API_KEY" \
|
||||
2>/dev/null || echo "000")
|
||||
|
||||
if [ "$response" = "200" ]; then
|
||||
print_success "API connection successful!"
|
||||
elif [ "$response" = "401" ]; then
|
||||
print_warning "API key authentication failed"
|
||||
if [ "$TEST_ONLY" = true ]; then
|
||||
rm -f /tmp/codex_test_response
|
||||
exit 1
|
||||
fi
|
||||
|
||||
read -p "All API tests failed. Continue anyway? (y/N): " -n 1 -r
|
||||
read -p "Continue anyway? (y/N): " -n 1 -r
|
||||
echo
|
||||
if [[ ! $REPLY =~ ^[Yy]$ ]]; then
|
||||
print_info "Setup cancelled"
|
||||
rm -f /tmp/codex_test_response
|
||||
exit 1
|
||||
fi
|
||||
elif [ "$response" = "000" ]; then
|
||||
print_warning "Cannot connect to API endpoint"
|
||||
if [ "$TEST_ONLY" = true ]; then
|
||||
rm -f /tmp/codex_test_response
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# If user chooses to continue anyway, use default URL
|
||||
BASE_URL="$DEFAULT_BASE_URL"
|
||||
print_warning "Using default URL: $BASE_URL"
|
||||
else
|
||||
print_info "Selected working base URL: $BASE_URL"
|
||||
print_warning "API test returned HTTP status: $response"
|
||||
fi
|
||||
rm -f /tmp/codex_test_response
|
||||
|
||||
# Exit if test only
|
||||
if [ "$TEST_ONLY" = true ]; then
|
||||
@@ -383,7 +349,7 @@ main() {
|
||||
backup_config
|
||||
|
||||
# Create Codex configuration
|
||||
if ! create_codex_config "$BASE_URL" "$API_KEY"; then
|
||||
if ! create_codex_config "$API_KEY"; then
|
||||
print_error "Failed to create Codex configuration"
|
||||
exit 1
|
||||
fi
|
||||
@@ -394,6 +360,7 @@ main() {
|
||||
print_info ""
|
||||
print_info "Configuration file: $HOME/.codex/config.toml"
|
||||
print_info "Auth file: $HOME/.codex/auth.json"
|
||||
print_info "Environment variable: XCODECLI_OAI_KEY"
|
||||
|
||||
# Show current settings
|
||||
echo ""
|
||||
|
||||
Reference in New Issue
Block a user