Update setup-hf-config.mjs

setup-hf-config.mjs

@@ -5,47 +5,50 @@ import https from "node:https";
 var HOME = process.env.OPENCLAW_HOME || process.env.HOME || "/home/user";
 var STATE_DIR = path.join(HOME, ".openclaw");
 var CONFIG_PATH = path.join(STATE_DIR, "openclaw.json");
-var AUTH_PROFILES_PATH = path.join(STATE_DIR, "auth-profiles.json");
+var AGENT_ID = "main";
+var AGENT_DIR = path.join(STATE_DIR, "agents", AGENT_ID, "agent");
+var AUTH_PROFILES_PATH = path.join(AGENT_DIR, "auth-profiles.json");
 var SPACE_HOST = (process.env.SPACE_HOST || "").trim();
 
 console.log("[setup] Starting… HOME=" + HOME);
+console.log("[setup] AGENT_DIR=" + AGENT_DIR);
 
-// – helpers –
+// helpers
 function parseList(val) {
-if (!val || !val.trim()) return [];
-return val.split(",").map(function(s){ return s.trim(); }).filter(Boolean);
+  if (!val || !val.trim()) return [];
+  return val.split(",").map(function(s){ return s.trim(); }).filter(Boolean);
 }
 function envStr(key) { return (process.env[key] || "").trim(); }
 
-// – auth –
+// auth
 var gatewayToken = envStr("OPENCLAW_GATEWAY_TOKEN");
 var gatewayPassword = envStr("OPENCLAW_GATEWAY_PASSWORD");
 if (!gatewayToken && !gatewayPassword) {
-console.error("[setup] FATAL: set OPENCLAW_GATEWAY_TOKEN or OPENCLAW_GATEWAY_PASSWORD in Secrets");
-process.exit(0);
+  console.error("[setup] FATAL: set OPENCLAW_GATEWAY_TOKEN or OPENCLAW_GATEWAY_PASSWORD in Secrets");
+  process.exit(0);
 }
 
-// – default model –
+// default model
 var defaultModel = envStr("OPENCLAW_HF_DEFAULT_MODEL") || "google/gemini-2.0-flash";
 
-// – dynamic provider key detection –
+// dynamic provider key detection
 var EXCLUDE_PREFIXES = [
-"OPENCLAW_", "SPACE_", "SYSTEM_", "HF_",
-"NODE_", "PATH", "HOME", "USER", "PWD", "LANG", "LC_",
-"npm_", "HOSTNAME", "SHELL", "TERM", "SHLVL"
+  "OPENCLAW_", "SPACE_", "SYSTEM_", "HF_",
+  "NODE_", "PATH", "HOME", "USER", "PWD", "LANG", "LC_",
+  "npm_", "HOSTNAME", "SHELL", "TERM", "SHLVL"
 ];
 var INCLUDE_SUFFIXES = [
-"_API_KEY", "_SECRET_KEY", "_ACCESS_TOKEN",
-"_BOT_TOKEN", "_AUTH_TOKEN", "_APP_KEY",
-"_SESSION_KEY", "_COOKIE", "_TOKEN"
+  "_API_KEY", "_SECRET_KEY", "_ACCESS_TOKEN",
+  "_BOT_TOKEN", "_AUTH_TOKEN", "_APP_KEY",
+  "_SESSION_KEY", "_COOKIE", "_TOKEN"
 ];
 function isProviderKey(k){
-for (let i=0;i<EXCLUDE_PREFIXES.length;i++){ if(k.indexOf(EXCLUDE_PREFIXES[i])===0) return false; }
-for (let i=0;i<INCLUDE_SUFFIXES.length;i++){
-let s=INCLUDE_SUFFIXES[i];
-if(k.length>s.length && k.indexOf(s)===k.length-s.length) return true;
-}
-return false;
+  for (let i=0;i<EXCLUDE_PREFIXES.length;i++){ if(k.indexOf(EXCLUDE_PREFIXES[i])===0) return false; }
+  for (let i=0;i<INCLUDE_SUFFIXES.length;i++){
+    let s=INCLUDE_SUFFIXES[i];
+    if(k.length>s.length && k.indexOf(s)===k.length-s.length) return true;
+  }
+  return false;
 }
 
 var allKeys = Object.keys(process.env);
@@ -54,163 +57,238 @@ providerKeys.sort();
 console.log("[setup] Detected provider keys ("+providerKeys.length+"):");
 providerKeys.forEach(k=>console.log("  + "+k));
 
-// – trusted proxies –
+// trusted proxies
 var envProxies = parseList(envStr("OPENCLAW_GATEWAY_TRUSTED_PROXIES"));
 var trustedProxies = envProxies.length>0 ? envProxies : [
-"10.16.0.0/12","10.20.0.0/12",
-"10.16.4.123","10.16.7.92","10.16.18.232",
-"10.16.34.155","10.16.43.133","10.16.1.206",
-"10.16.37.110","10.16.43.246",
-"10.20.1.9","10.20.1.222",
-"10.20.26.157","10.20.31.87",
-"10.20.0.1","172.17.0.1"
+  "10.16.0.0/12","10.20.0.0/12",
+  "10.16.4.123","10.16.7.92","10.16.18.232",
+  "10.16.34.155","10.16.43.133","10.16.1.206",
+  "10.16.37.110","10.16.43.246",
+  "10.20.1.9","10.20.1.222",
+  "10.20.26.157","10.20.31.87",
+  "10.20.0.1","172.17.0.1"
 ];
 
-// – build config –
+// build config
 var config = {
-gateway: {
-auth: gatewayToken ? { mode:"token", token:gatewayToken } : { mode:"password", password:gatewayPassword },
-controlUi: { allowInsecureAuth:true, allowedOrigins:["*"], dangerouslyDisableDeviceAuth:true, dangerouslyAllowHostHeaderOriginFallback:true },
-trustedProxies: trustedProxies
-},
-agents: { defaults:{ model:defaultModel } },
-env: { vars:{} }
+  gateway: {
+    auth: gatewayToken ? { mode:"token", token:gatewayToken } : { mode:"password", password:gatewayPassword },
+    controlUi: { allowInsecureAuth:true, allowedOrigins:["*"], dangerouslyDisableDeviceAuth:true, dangerouslyAllowHostHeaderOriginFallback:true },
+    trustedProxies: trustedProxies
+  },
+  agents: { defaults:{ model:defaultModel } },
+  env: { vars:{} }
 };
 
 // 添加所有检测到的 provider keys 到环境变量
 providerKeys.forEach(pk=>{ config.env.vars[pk] = envStr(pk); });
 
-// – Telegram webhook setup –
+// Telegram webhook setup
 async function setupTelegram(){
-var token = envStr("TELEGRAM_BOT_TOKEN");
-if(!token){ console.log("[setup] Telegram: disabled (no TELEGRAM_BOT_TOKEN)"); return; }
-
-if(SPACE_HOST){
-var webhookUrl = "https://" + SPACE_HOST + "/tg-webhook";
-var r = await new Promise(resolve=>{
-var data = JSON.stringify({ url:webhookUrl, drop_pending_updates:true, max_connections:10 });
-var req = https.request({
-hostname: "api.telegram.org",
-path: "/bot"+token+"/setWebhook",
-method: "POST",
-headers: { "Content-Type":"application/json", "Content-Length": Buffer.byteLength(data) }
-}, res=>{
-let buf="";
-res.on("data",c=>buf+=c);
-res.on("end", ()=>{ try{ resolve(JSON.parse(buf)) } catch(e){ resolve(null) } });
-});
-req.on("error", ()=>resolve(null));
-req.setTimeout(8000, ()=>{ req.destroy(); resolve(null); });
-req.write(data);
-req.end();
-});
-if(r && r.ok) console.log("[setup] Telegram: webhook registered -> "+webhookUrl);
-else {
-console.log("[setup] Telegram: auto-registration failed (HF outbound blocked)");
-console.log("[setup] Telegram: open this URL in your browser once:");
-console.log("  https://api.telegram.org/bot"+token+"/setWebhook?url="+webhookUrl+"&drop_pending_updates=true");
-}
-} else {
-console.log("[setup] Telegram: set SPACE_HOST in Variables for auto webhook registration");
-}
+  var token = envStr("TELEGRAM_BOT_TOKEN");
+  if(!token){ console.log("[setup] Telegram: disabled (no TELEGRAM_BOT_TOKEN)"); return; }
+
+  if(SPACE_HOST){
+    var webhookUrl = "https://" + SPACE_HOST + "/tg-webhook";
+    var r = await new Promise(resolve=>{
+      var data = JSON.stringify({ url:webhookUrl, drop_pending_updates:true, max_connections:10 });
+      var req = https.request({
+        hostname: "api.telegram.org",
+        path: "/bot"+token+"/setWebhook",
+        method: "POST",
+        headers: { "Content-Type":"application/json", "Content-Length": Buffer.byteLength(data) }
+      }, res=>{
+        let buf="";
+        res.on("data",c=>buf+=c);
+        res.on("end", ()=>{ try{ resolve(JSON.parse(buf)) } catch(e){ resolve(null) } });
+      });
+      req.on("error", ()=>resolve(null));
+      req.setTimeout(8000, ()=>{ req.destroy(); resolve(null); });
+      req.write(data);
+      req.end();
+    });
+    if(r && r.ok) console.log("[setup] Telegram: webhook registered -> "+webhookUrl);
+    else {
+      console.log("[setup] Telegram: auto-registration failed (HF outbound blocked)");
+      console.log("[setup] Telegram: open this URL in your browser once:");
+      console.log("  https://api.telegram.org/bot"+token+"/setWebhook?url="+webhookUrl+"&drop_pending_updates=true");
+    }
+  } else {
+    console.log("[setup] Telegram: set SPACE_HOST in Variables for auto webhook registration");
+  }
 
-config.channels = { telegram:{ enabled:true, accounts:{ main:{ botToken:token, apiRoot:"https://api.telegram.org" } } } };
-console.log("[setup] Telegram: configured");
+  config.channels = { telegram:{ enabled:true, accounts:{ main:{ botToken:token, apiRoot:"https://api.telegram.org" } } } };
+  console.log("[setup] Telegram: configured");
 }
 
-// ⭐ 核心修复：创建 auth-profiles.json
+// 根据官方文档修复：auth-profiles.json 必须在 agent 目录中
 async function setupAuthProfiles(){
-var authProfiles = {};
-
-// OpenAI
-if (envStr("OPENAI_ACCESS_TOKEN")) {
-var openaiToken = envStr("OPENAI_ACCESS_TOKEN");
-authProfiles["openai"] = {
-name: "OpenAI",
-auth: { mode: "token", token: openaiToken },
-models: ["gpt-4o", "gpt-4-turbo", "gpt-4-mini", "gpt-3.5-turbo"]
-};
-authProfiles["openai-codex"] = {
-name: "OpenAI Codex",
-auth: { mode: "token", token: openaiToken },
-models: ["gpt-4o", "gpt-4-turbo", "gpt-4-mini", "gpt-3.5-turbo"]
-};
-console.log("[setup] ✓ OpenAI token bound to auth-profiles");
-}
+  var authProfiles = { profiles: {} };
+  var profileCount = 0;
 
-// Anthropic Claude
-if (envStr("ANTHROPIC_SESSION_KEY")) {
-var claudeToken = envStr("ANTHROPIC_SESSION_KEY");
-authProfiles["anthropic"] = {
-name: "Anthropic Claude",
-auth: { mode: "token", token: claudeToken },
-models: ["claude-3-opus", "claude-3-sonnet", "claude-3-haiku"]
-};
-console.log("[setup] ✓ Anthropic token bound to auth-profiles");
-}
+  // OpenAI - 格式：type + provider + token
+  if (envStr("OPENAI_ACCESS_TOKEN")) {
+    authProfiles.profiles["openai:default"] = {
+      type: "token",
+      provider: "openai",
+      token: envStr("OPENAI_ACCESS_TOKEN")
+    };
+    authProfiles.profiles["openai-codex:default"] = {
+      type: "token",
+      provider: "openai-codex",
+      token: envStr("OPENAI_ACCESS_TOKEN")
+    };
+    profileCount += 2;
+    console.log("[setup] ✓ OpenAI token bound to auth-profiles (openai:default, openai-codex:default)");
+  }
 
-// Moonshot Kimi
-if (envStr("MOONSHOT_ACCESS_TOKEN")) {
-var kimiToken = envStr("MOONSHOT_ACCESS_TOKEN");
-authProfiles["moonshot"] = {
-name: "Moonshot Kimi",
-auth: { mode: "token", token: kimiToken },
-models: ["moonshot-v1-128k", "moonshot-v1-32k"]
-};
-console.log("[setup] ✓ Moonshot token bound to auth-profiles");
-}
+  // Anthropic Claude
+  if (envStr("ANTHROPIC_SESSION_KEY")) {
+    authProfiles.profiles["anthropic:default"] = {
+      type: "token",
+      provider: "anthropic",
+      token: envStr("ANTHROPIC_SESSION_KEY")
+    };
+    profileCount += 1;
+    console.log("[setup] ✓ Anthropic token bound to auth-profiles (anthropic:default)");
+  }
 
-// Google Gemini (作为 API Key)
-if (envStr("GOOGLE_GEMINI_COOKIE")) {
-var geminiCookie = envStr("GOOGLE_GEMINI_COOKIE");
-// 尝试作为 API Key 存储（如果是通过 Cookie）
-authProfiles["google"] = {
-name: "Google Gemini",
-auth: { mode: "token", token: geminiCookie },
-models: ["gemini-2.0-flash", "gemini-1.5-pro", "gemini-1.5-flash"]
-};
-authProfiles["google-gemini-cli"] = {
-name: "Google Gemini CLI",
-auth: { mode: "token", token: geminiCookie },
-models: ["gemini-2.0-flash", "gemini-1.5-pro", "gemini-1.5-flash"]
-};
-console.log("[setup] ✓ Google Gemini cookie bound to auth-profiles");
-}
+  // Moonshot Kimi
+  if (envStr("MOONSHOT_ACCESS_TOKEN")) {
+    authProfiles.profiles["moonshot:default"] = {
+      type: "token",
+      provider: "moonshot",
+      token: envStr("MOONSHOT_ACCESS_TOKEN")
+    };
+    profileCount += 1;
+    console.log("[setup] ✓ Moonshot token bound to auth-profiles (moonshot:default)");
+  }
 
-// 通义千问
-if (envStr("QWEN_COOKIE")) {
-var qwenCookie = envStr("QWEN_COOKIE");
-authProfiles["qianwen"] = {
-name: "Alibaba Qwen",
-auth: { mode: "token", token: qwenCookie },
-models: ["qwen-max", "qwen-plus", "qwen-turbo"]
-};
-console.log("[setup] ✓ Qwen cookie bound to auth-profiles");
-}
+  // Google Gemini
+  if (envStr("GOOGLE_GEMINI_COOKIE")) {
+    authProfiles.profiles["google:default"] = {
+      type: "token",
+      provider: "google",
+      token: envStr("GOOGLE_GEMINI_COOKIE")
+    };
+    authProfiles.profiles["google-gemini-cli:default"] = {
+      type: "token",
+      provider: "google-gemini-cli",
+      token: envStr("GOOGLE_GEMINI_COOKIE")
+    };
+    profileCount += 2;
+    console.log("[setup] ✓ Google Gemini cookie bound to auth-profiles (google:default, google-gemini-cli:default)");
+  }
 
-// 如果有认证信息，保存到 auth-profiles.json
-if (Object.keys(authProfiles).length > 0) {
-try {
-fs.writeFileSync(AUTH_PROFILES_PATH, JSON.stringify(authProfiles, null, 2), "utf-8");
-console.log("[setup] auth-profiles.json created with " + Object.keys(authProfiles).length + " profiles");
-} catch(e) {
-console.error("[setup] Failed to write auth-profiles.json: " + e.message);
-}
-}
+  // 通义千问
+  if (envStr("QWEN_COOKIE")) {
+    authProfiles.profiles["qianwen:default"] = {
+      type: "token",
+      provider: "qianwen",
+      token: envStr("QWEN_COOKIE")
+    };
+    profileCount += 1;
+    console.log("[setup] ✓ Qwen cookie bound to auth-profiles (qianwen:default)");
+  }
+
+  // 其他 API Key
+  if (envStr("DEEPSEEK_API_KEY")) {
+    authProfiles.profiles["deepseek:default"] = {
+      type: "token",
+      provider: "deepseek",
+      token: envStr("DEEPSEEK_API_KEY")
+    };
+    profileCount += 1;
+    console.log("[setup] ✓ DeepSeek API key bound to auth-profiles (deepseek:default)");
+  }
+
+  if (envStr("GROQ_API_KEY")) {
+    authProfiles.profiles["groq:default"] = {
+      type: "token",
+      provider: "groq",
+      token: envStr("GROQ_API_KEY")
+    };
+    profileCount += 1;
+    console.log("[setup] ✓ Groq API key bound to auth-profiles (groq:default)");
+  }
+
+  if (envStr("GEMINI_API_KEY")) {
+    authProfiles.profiles["gemini:default"] = {
+      type: "token",
+      provider: "gemini",
+      token: envStr("GEMINI_API_KEY")
+    };
+    profileCount += 1;
+    console.log("[setup] ✓ Gemini API key bound to auth-profiles (gemini:default)");
+  }
+
+  if (envStr("OPENROUTER_API_KEY")) {
+    authProfiles.profiles["openrouter:default"] = {
+      type: "token",
+      provider: "openrouter",
+      token: envStr("OPENROUTER_API_KEY")
+    };
+    profileCount += 1;
+    console.log("[setup] ✓ OpenRouter API key bound to auth-profiles (openrouter:default)");
+  }
+
+  if (envStr("ZAI_API_KEY")) {
+    authProfiles.profiles["zai:default"] = {
+      type: "token",
+      provider: "zai",
+      token: envStr("ZAI_API_KEY")
+    };
+    profileCount += 1;
+    console.log("[setup] ✓ Zai API key bound to auth-profiles (zai:default)");
+  }
+
+  if (envStr("SILICONFLOW_API_KEY")) {
+    authProfiles.profiles["siliconflow:default"] = {
+      type: "token",
+      provider: "siliconflow",
+      token: envStr("SILICONFLOW_API_KEY")
+    };
+    profileCount += 1;
+    console.log("[setup] ✓ SiliconFlow API key bound to auth-profiles (siliconflow:default)");
+  }
+
+  if (envStr("MINIMAX_API_KEY")) {
+    authProfiles.profiles["minimax:default"] = {
+      type: "token",
+      provider: "minimax",
+      token: envStr("MINIMAX_API_KEY")
+    };
+    profileCount += 1;
+    console.log("[setup] ✓ MiniMax API key bound to auth-profiles (minimax:default)");
+  }
+
+  // 如果有认证信息，保存到 auth-profiles.json
+  if (profileCount > 0) {
+    try {
+      // 创建 agent 目录
+      fs.mkdirSync(AGENT_DIR, {recursive:true});
+      // 写入 auth-profiles.json
+      fs.writeFileSync(AUTH_PROFILES_PATH, JSON.stringify(authProfiles, null, 2), "utf-8");
+      console.log("[setup] auth-profiles.json created at " + AUTH_PROFILES_PATH);
+      console.log("[setup] Total auth profiles: " + profileCount);
+    } catch(e) {
+      console.error("[setup] Failed to write auth-profiles.json: " + e.message);
+    }
+  }
 }
 
 (async function main(){
-await setupTelegram();
-await setupAuthProfiles();
-
-try{
-fs.mkdirSync(STATE_DIR,{recursive:true});
-if(fs.existsSync(CONFIG_PATH)) fs.copyFileSync(CONFIG_PATH, CONFIG_PATH+".bak");
-fs.writeFileSync(CONFIG_PATH, JSON.stringify(config,null,2),"utf-8");
-}catch(e){ console.error("[setup] Write failed: "+e.message); process.exit(0); }
-
-console.log("[setup] Done! All tokens configured.");
-console.log("[setup]   auth         = "+(gatewayToken?"token":"password"));
-console.log("[setup]   default model= "+defaultModel);
-console.log("[setup]   config       = "+CONFIG_PATH);
+  await setupTelegram();
+  await setupAuthProfiles();
+
+  try{
+    fs.mkdirSync(STATE_DIR,{recursive:true});
+    if(fs.existsSync(CONFIG_PATH)) fs.copyFileSync(CONFIG_PATH, CONFIG_PATH+".bak");
+    fs.writeFileSync(CONFIG_PATH, JSON.stringify(config,null,2),"utf-8");
+  }catch(e){ console.error("[setup] Write failed: "+e.message); process.exit(0); }
+
+  console.log("[setup] Done! All tokens configured.");
+  console.log("[setup]   auth         = "+(gatewayToken?"token":"password"));
+  console.log("[setup]   default model= "+defaultModel);
+  console.log("[setup]   config       = "+CONFIG_PATH);
 })().catch(e=>{ console.error("[setup] Fatal: "+e.message); process.exit(0); });