simler commited on
Commit
eadd45d
·
verified ·
1 Parent(s): 019d647

Update start.sh

Browse files
Files changed (1) hide show
  1. start.sh +13 -17
start.sh CHANGED
@@ -20,28 +20,26 @@ APP_CONFIG_DIR="$HOME/.clawdbot"
20
  if [ -d "$APP_CONFIG_DIR" ] && [ ! -L "$APP_CONFIG_DIR" ]; then rm -rf "$APP_CONFIG_DIR"; fi
21
  if [ ! -L "$APP_CONFIG_DIR" ]; then ln -s "$(pwd)/moltbot-memory" "$APP_CONFIG_DIR"; fi
22
 
23
- # --- 4. 🧠 核心修复:强制注入 Secrets 配置 ---
24
- # Moltbot 可能忽略了无前缀的变量,我们手动用 config set 命令强制写入配置
25
- echo "⚙️ Forcing configuration from Secrets..."
26
 
27
- # (A) 强制设置模型 (如果 Secrets 里配了 GATEWAY_AGENT_MODEL)
28
- if [ -n "$GATEWAY_AGENT_MODEL" ]; then
29
- echo "Updating Agent Model to: $GATEWAY_AGENT_MODEL"
30
- npm exec -- moltbot config set gateway.agent_model "$GATEWAY_AGENT_MODEL"
31
- fi
32
-
33
- # (B) 强制设置 API Key 和 Base URL (OpenAI 兼容)
34
- # 为了确保生效,我们同时导出带 CLAWDBOT_ 前缀的变量和标准变量
35
  if [ -n "$OPENAI_API_KEY" ]; then
36
- export OPENAI_API_KEY="$OPENAI_API_KEY"
37
  export CLAWDBOT_OPENAI_API_KEY="$OPENAI_API_KEY"
38
  fi
39
-
40
  if [ -n "$OPENAI_BASE_URL" ]; then
41
- export OPENAI_BASE_URL="$OPENAI_BASE_URL"
42
  export CLAWDBOT_OPENAI_BASE_URL="$OPENAI_BASE_URL"
43
  fi
44
 
 
 
 
 
 
 
 
 
 
45
  # --- 5. 后台自动保存 ---
46
  sync_memory() {
47
  while true; do
@@ -59,8 +57,7 @@ sync_memory() {
59
  }
60
  sync_memory &
61
 
62
- # --- 6. 启动服务 (端口转发模式) ---
63
- # 设置认证密码
64
  if [ -z "$GATEWAY_TOKEN" ]; then
65
  export CLAWDBOT_GATEWAY_TOKEN=$(cat /proc/sys/kernel/random/uuid)
66
  echo "⚠️ Random Token: $CLAWDBOT_GATEWAY_TOKEN"
@@ -73,5 +70,4 @@ echo "🚀 Starting Moltbot on internal port 3000..."
73
  npm exec -- moltbot gateway --port 3000 --allow-unconfigured &
74
 
75
  echo "🌉 Starting Socat Bridge (0.0.0.0:7860 -> 127.0.0.1:3000)..."
76
- # 启动端口转发
77
  exec socat TCP-LISTEN:7860,fork,bind=0.0.0.0 TCP:127.0.0.1:3000
 
20
  if [ -d "$APP_CONFIG_DIR" ] && [ ! -L "$APP_CONFIG_DIR" ]; then rm -rf "$APP_CONFIG_DIR"; fi
21
  if [ ! -L "$APP_CONFIG_DIR" ]; then ln -s "$(pwd)/moltbot-memory" "$APP_CONFIG_DIR"; fi
22
 
23
+ # --- 4. 🧠 修正配置注入 ---
24
+ echo "⚙️ Configuring Moltbot..."
 
25
 
26
+ # 尝试强制写入 OpenAI 兼容配置 (如果 Secrets 存在)
 
 
 
 
 
 
 
27
  if [ -n "$OPENAI_API_KEY" ]; then
 
28
  export CLAWDBOT_OPENAI_API_KEY="$OPENAI_API_KEY"
29
  fi
 
30
  if [ -n "$OPENAI_BASE_URL" ]; then
 
31
  export CLAWDBOT_OPENAI_BASE_URL="$OPENAI_BASE_URL"
32
  fi
33
 
34
+ # 尝试修正模型配置 Key
35
+ if [ -n "$GATEWAY_AGENT_MODEL" ]; then
36
+ echo "Updating Model to: $GATEWAY_AGENT_MODEL"
37
+ # 方案 A: 尝试设置全局 agent.model
38
+ npm exec -- moltbot config set agent.model "$GATEWAY_AGENT_MODEL" || true
39
+ # 方案 B: 尝试设置全局 model (以防万一)
40
+ npm exec -- moltbot config set model "$GATEWAY_AGENT_MODEL" || true
41
+ fi
42
+
43
  # --- 5. 后台自动保存 ---
44
  sync_memory() {
45
  while true; do
 
57
  }
58
  sync_memory &
59
 
60
+ # --- 6. 启动服务 ---
 
61
  if [ -z "$GATEWAY_TOKEN" ]; then
62
  export CLAWDBOT_GATEWAY_TOKEN=$(cat /proc/sys/kernel/random/uuid)
63
  echo "⚠️ Random Token: $CLAWDBOT_GATEWAY_TOKEN"
 
70
  npm exec -- moltbot gateway --port 3000 --allow-unconfigured &
71
 
72
  echo "🌉 Starting Socat Bridge (0.0.0.0:7860 -> 127.0.0.1:3000)..."
 
73
  exec socat TCP-LISTEN:7860,fork,bind=0.0.0.0 TCP:127.0.0.1:3000