lingyao-ai 0.2.0 → 0.2.2

package/README.md

@@ -5,7 +5,9 @@ A customizable setup CLI that behaves like `npx leishen-ai`, with your own confi
 ## Features
 
 - Configure Codex and/or Claude Code in one interactive flow.
+- Prompt for gateway URL first, then API key, with a config default.
 - Optional auto-install checks for `@openai/codex` and `@anthropic-ai/claude-code`.
+- API key validation supports `sk-` and `cr_` formats.
 - Writes and backs up:
   - `~/.claude/config.json`
   - `~/.codex/config.toml`
@@ -51,3 +53,7 @@ Then users can run:
 ```bash
 npx lingyao-ai
 ```
+
+During setup, the CLI will ask for a gateway URL first. Press Enter to use
+`project.config.json`'s default `endpoints.baseOrigin`, or enter a different
+`http://` / `https://` URL before providing the API key.

package/cli.js

@@ -257,6 +257,32 @@ async function promptApiKey(apiKeyRegex, example) {
   }
 }
 
+function isValidHttpUrl(value) {
+  try {
+    const parsed = new URL(String(value || '').trim())
+    return parsed.protocol === 'http:' || parsed.protocol === 'https:'
+  } catch (_) {
+    return false
+  }
+}
+
+function normalizeBaseOrigin(value) {
+  return String(value || '').trim().replace(/\/+$/, '')
+}
+
+async function promptBaseOrigin(defaultBaseOrigin) {
+  const fallback = normalizeBaseOrigin(defaultBaseOrigin)
+
+  while (true) {
+    const answer = await askLine(
+      fallback ? `Input gateway URL [${fallback}]: ` : 'Input gateway URL: '
+    )
+    const baseOrigin = normalizeBaseOrigin(answer || fallback)
+    if (isValidHttpUrl(baseOrigin)) return baseOrigin
+    console.log('Invalid URL. Use http:// or https://')
+  }
+}
+
 async function promptTargets() {
   while (true) {
     console.log('\nSelect target:')
@@ -684,8 +710,8 @@ function tomlString(value) {
   return String(value).replace(/\\/g, '\\\\').replace(/"/g, '\\"')
 }
 
-function renderCodexToml(cfg) {
-  const codexBaseUrl = joinUrl(cfg.endpoints.baseOrigin, cfg.endpoints.codexPath)
+function renderCodexToml(cfg, baseOrigin) {
+  const codexBaseUrl = joinUrl(baseOrigin, cfg.endpoints.codexPath)
   const provider = cfg.codex.providerName
   const migrations = Object.entries(cfg.codex.modelMigrations || {})
   const migrationSection =
@@ -713,11 +739,11 @@ requires_openai_auth = ${cfg.codex.requiresOpenAIAuth ? 'true' : 'false'}
 env_key = "${tomlString(cfg.apiKey.envKey)}"${envInstructionLine}${migrationSection}`
 }
 
-function configureClaude(cfg, apiKey) {
+function configureClaude(cfg, apiKey, baseOrigin) {
   const home = os.homedir()
   const claudeConfigPath = path.join(home, cfg.claude.configPath)
   const info = writeJson(claudeConfigPath, { primaryApiKey: cfg.claude.primaryApiKey })
-  const claudeBaseUrl = joinUrl(cfg.endpoints.baseOrigin, cfg.endpoints.claudePath)
+  const claudeBaseUrl = joinUrl(baseOrigin, cfg.endpoints.claudePath)
 
   return {
     env: {
@@ -734,14 +760,14 @@ function configureClaude(cfg, apiKey) {
   }
 }
 
-function configureCodex(cfg, apiKey) {
+function configureCodex(cfg, apiKey, baseOrigin) {
   const home = os.homedir()
   const codexDir = path.join(home, cfg.codex.configDir)
   const tomlPath = path.join(codexDir, 'config.toml')
   const authPath = path.join(codexDir, 'auth.json')
   const envPath = path.join(codexDir, '.env')
 
-  const tomlInfo = writeText(tomlPath, renderCodexToml(cfg))
+  const tomlInfo = writeText(tomlPath, renderCodexToml(cfg, baseOrigin))
   const authInfo = writeJson(authPath, cfg.codex.authJson || { OPENAI_API_KEY: null })
   const envInfo = upsertDotenvFile(envPath, { [cfg.apiKey.envKey]: apiKey })
 
@@ -775,8 +801,9 @@ async function main() {
 
   console.log(`\n${cfg.brand.name}`)
   console.log(`Config file: ${configPath}`)
-  console.log(`Base origin: ${cfg.endpoints.baseOrigin}`)
 
+  const baseOrigin = await promptBaseOrigin(cfg.endpoints.baseOrigin)
+  console.log(`Using gateway URL: ${baseOrigin}`)
   const apiKeyRegex = new RegExp(cfg.apiKey.regex)
   const apiKey = await promptApiKey(apiKeyRegex, cfg.apiKey.example)
   const targets = await promptTargets()
@@ -811,13 +838,13 @@ async function main() {
   const fileSummaries = []
 
   if (targets.includes('claude')) {
-    const result = configureClaude(cfg, apiKey)
+    const result = configureClaude(cfg, apiKey, baseOrigin)
     envVars = { ...envVars, ...result.env }
     fileSummaries.push(...result.files)
   }
 
   if (targets.includes('codex')) {
-    const result = configureCodex(cfg, apiKey)
+    const result = configureCodex(cfg, apiKey, baseOrigin)
     envVars = { ...envVars, ...result.env }
     fileSummaries.push(...result.files)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lingyao-ai",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Lingyao setup CLI for Codex and Claude Code.",
   "type": "commonjs",
   "bin": {

package/project.config.json

@@ -4,8 +4,8 @@
     "shellMarker": "lingyao-ai"
   },
   "apiKey": {
-    "regex": "^cr_[0-9a-f]{64}$",
-    "example": "cr_<64_hex>",
+    "regex": "^(?:sk-[A-Za-z0-9]{48}|cr_[0-9a-fA-F]{64})$",
+    "example": "sk-<48_alnum> or cr_<64_hex>",
     "envKey": "CRS_OAI_KEY"
   },
   "endpoints": {