Update start-openclaw.sh

start-openclaw.sh

@@ -1,134 +1,109 @@
 #!/bin/bash
-set -e
-
-echo "===== OpenClaw 启动脚本 v2.0 ====="
+set -euo pipefail  # 启用更严格的错误处理，检测未定义变量
+echo "===== OpenClaw 启动脚本 v2.1 (优化版) ====="
 echo "启动时间: $(date)"
 
-# 1. 创建必要的目录
+# --- 初始化与准备工作 ---
 echo ""
-echo "=== 1. 创建目录结构 ==="
+echo "=== 1. 初始化环境与目录 ==="
 mkdir -p /root/.openclaw/agents/main/sessions
 mkdir -p /root/.openclaw/credentials
 mkdir -p /root/.openclaw/sessions
 mkdir -p /root/.openclaw/skills
-echo "目录创建完成"
+echo "目录结构创建完成。"
 
-# 2. 从持久化存储恢复数据
+# --- 数据恢复 ---
 echo ""
 echo "=== 2. 从备份恢复数据 ==="
-python3 /app/sync.py restore
-echo "数据恢复完成"
+if python3 /app/sync.py restore; then
+    echo "✓ 数据恢复完成。"
+else
+    echo "⚠️  数据恢复过程可能存在问题，将继续启动流程。" >&2
+fi
 
-# 3. 检查技能安装状态
+# --- 技能安装与检查 (核心修复点) ---
 echo ""
-echo "=== 3. 检查技能安装 ==="
-
-# 定义技能列表
-SKILLS=("openclaw-tavily-search","@tencent-weixin/openclaw-weixin")
+echo "=== 3. 检查与安装技能 ==="
+# 修复：技能列表应为由空格分隔的数组元素
+SKILLS=("openclaw-tavily-search" "@tencent-weixin/openclaw-weixin")
 INSTALLED_SKILLS=()
 
-# 检查并安装技能
 for skill in "${SKILLS[@]}"; do
     echo ""
     echo "检查技能: $skill"
-    
-    # 检查是否已安装
-    if clawhub list 2>/dev/null | grep -q "$skill"; then
-        echo "✓ 已通过 clawhub 安装: $skill"
-        INSTALLED_SKILLS+=("$skill")
-    elif [ -d "/app/skills/$skill" ]; then
-        echo "✓ 技能目录存在: /app/skills/$skill"
-        INSTALLED_SKILLS+=("$skill")
+    local is_installed=false
+
+    # 方式1: 检查 clawhub 列表
+    if command -v clawhub &> /dev/null && clawhub list 2>/dev/null | grep -q "$skill"; then
+        echo "  ✓ 已通过 clawhub 安装。"
+        is_installed=true
+    # 方式2: 检查标准技能目录
+    elif [ -d "/app/skills/$skill" ] || [ -d "/root/.openclaw/skills/$skill" ]; then
+        echo "  ✓ 技能目录已存在。"
+        is_installed=true
     else
-        echo "✗ 未找到技能: $skill，尝试安装..."
-        echo "安装命令: clawhub install $skill"
-        
-        # 尝试安装
-        if clawhub install "$skill"; then
-            echo "✓ 安装成功: $skill"
-            INSTALLED_SKILLS+=("$skill")
+        echo "  ✗ 未找到技能，尝试通过 clawhub 安装..."
+        if command -v clawhub &> /dev/null && clawhub install "$skill"; then
+            echo "  ✓ 安装成功: $skill"
+            is_installed=true
         else
-            echo "⚠️ 安装失败: $skill"
+            echo "  ⚠️  安装失败: $skill (clawhub 可能不可用或网络错误)。" >&2
         fi
     fi
-    # 添加微信插件安装
-    echo ""
-    echo "=== 安装微信ClawBot插件 ==="
-    echo "安装命令: npx -y @tencent-weixin/openclaw-weixin-cli@latest install"
-    if npx -y @tencent-weixin/openclaw-weixin-cli@latest install; then
-        echo "✓ 微信插件安装成功"
-    else
-        echo "⚠️ npx安装失败，尝试openclaw插件安装方式"
-        if openclaw plugins install "@tencent-weixin/openclaw-weixin"; then
-            echo "✓ openclaw插件安装成功"
-            openclaw config set plugins.entries.openclaw-weixin.enabled true
-        else
-            echo "❌ 微信插件安装失败"
-        fi
+
+    if [ "$is_installed" = true ]; then
+        INSTALLED_SKILLS+=("$skill")
     fi
 done
 
-# 4. 详细检查技能结构
-echo ""
-echo "=== 4. 详细检查技能结构 ==="
+# 修复：微信插件安装不应在技能循环内重复执行，移出循环
+echo ""
+echo "=== 4. 安装微信 ClawBot 插件 ==="
+echo "安装命令: npx -y @tencent-weixin/openclaw-weixin-cli@latest install"
+if npx -y @tencent-weixin/openclaw-weixin-cli@latest install; then
+    echo "✓ 微信插件 (npx) 安装成功。"
+else
+    echo "⚠️  npx 安装失败，尝试 openclaw 插件安装方式。" >&2
+    if command -v openclaw &> /dev/null && openclaw plugins install "@tencent-weixin/openclaw-weixin"; then
+        openclaw config set plugins.entries.openclaw-weixin.enabled true
+        echo "✓ 微信插件 (openclaw) 安装成功。"
+    else
+        echo "❌ 微信插件安装失败，相关功能可能不可用。" >&2
+    fi
+fi
 
+# --- 技能结构诊断 (调试用，可注释掉) ---
+echo ""
+echo "=== 5. 技能结构诊断 ==="
 for skill in "${INSTALLED_SKILLS[@]}"; do
     echo ""
-    echo "--- 检查 $skill ---"
-    
-    # 查找技能可能的位置
-    find / -type d -name "*$skill*" 2>/dev/null | head -5 | while read dir; do
-        echo "找到目录: $dir"
-        ls -la "$dir/"
-        
-        # 检查关键文件
-        for file in "package.json" "skill.json" "_meta.json" "skill.yml" "skill.yaml"; do
-            if [ -f "$dir/$file" ]; then
-                echo "  📄 找到 $file:"
-                head -20 "$dir/$file"
-            fi
-        done
+    echo "--- 诊断技能: $skill ---"
+    # 优化：在更可能的路径下查找，避免搜索根目录
+    local possible_paths=("/app/skills/$skill" "/root/.openclaw/skills/$skill" "/skills/$skill")
+    for dir in "${possible_paths[@]}"; do
+        if [ -d "$dir" ]; then
+            echo "  找到目录: $dir"
+            # 检查关键文件
+            for meta_file in "skill.json" "package.json" "_meta.json"; do
+                if [ -f "$dir/$meta_file" ]; then
+                    echo "    📄 发现 $meta_file"
+                fi
+            done
+            break # 找到一个有效目录即可
+        fi
     done
 done
 
-# 5. 检查 _meta.json 内容
-echo ""
-echo "=== 5. 检查技能元数据 ==="
-if [ -f "/app/skills/liang-tavily-search/_meta.json" ]; then
-    echo "_meta.json 内容:"
-    cat "/app/skills/liang-tavily-search/_meta.json"
-    
-    # 解析 _meta.json
-    if command -v jq &> /dev/null; then
-        echo ""
-        echo "解析 _meta.json:"
-        cat "/app/skills/liang-tavily-search/_meta.json" | jq .
-    fi
-fi
-
-# 6. 检查 SKILL.md
-if [ -f "/app/skills/liang-tavily-search/SKILL.md" ]; then
-    echo ""
-    echo "SKILL.md 前20行:"
-    head -20 "/app/skills/liang-tavily-search/SKILL.md"
-fi
-
-# 7. 检查 scripts 目录
-if [ -d "/app/skills/liang-tavily-search/scripts" ]; then
-    echo ""
-    echo "scripts 目录内容:"
-    ls -la "/app/skills/liang-tavily-search/scripts/"
-fi
-
-# 8. 清理和格式化 API 地址
+# --- 配置生成 ---
 echo ""
-echo "=== 6. 配置 API 地址 ==="
-CLEAN_BASE=$(echo "$OPENAI_API_BASE" | sed "s|/chat/completions||g" | sed "s|/v1/|/v1|g" | sed "s|/v1$|/v1|g")
-echo "API 地址: $CLEAN_BASE"
+echo "=== 6. 配置 API 地址与生成主配置 ==="
+# 清理和格式化 API 地址
+CLEAN_BASE="${OPENAI_API_BASE%/}"  # 去除末尾可能存在的斜杠
+CLEAN_BASE="${CLEAN_BASE%/chat/completions}"
+CLEAN_BASE="${CLEAN_BASE%/v1}"
+CLEAN_BASE="${CLEAN_BASE}/v1"  # 确保以 /v1 结尾
+echo "规范化后的 API 地址: $CLEAN_BASE"
 
-# 9. 生成主配置文件
-echo ""
-echo "=== 7. 生成主配置文件 ==="
 cat > /root/.openclaw/openclaw.json <<EOF
 {
   "models": {
@@ -138,28 +113,41 @@ cat > /root/.openclaw/openclaw.json <<EOF
         "apiKey": "$OPENAI_API_KEY",
         "api": "openai-completions",
         "models": [
-          { "id": "$MODEL", "name": "$MODEL", "contextWindow": 128000 }
+          {
+            "id": "$MODEL",
+            "name": "$MODEL",
+            "contextWindow": 128000
+          }
         ]
       }
     }
   },
-  "agents": { "defaults": { "model": { "primary": "nvidia/$MODEL" } } },
+  "agents": {
+    "defaults": {
+      "model": {
+        "primary": "nvidia/$MODEL"
+      }
+    }
+  },
   "commands": {
     "restart": true
   },
   "gateway": {
-    "mode": "local", 
-    "bind": "lan", 
+    "mode": "local",
+    "bind": "lan",
     "port": $PORT,
-    "trustedProxies": ["127.0.0.1/8", "10.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16"],
-    "auth": { 
-      "mode": "token", 
-      "token": "$OPENCLAW_GATEWAY_PASSWORD" 
+    "trustedProxies": [
+      "127.0.0.1/8",
+      "10.0.0.0/8",
+      "172.16.0.0/12",
+      "192.168.0.0/16"
+    ],
+    "auth": {
+      "mode": "token",
+      "token": "$OPENCLAW_GATEWAY_PASSWORD"
     },
-    "controlUi": { 
-      "allowedOrigins": [
-        "https://aip9105-openclaw.hf.space/","https://openclaw.2025924.xyz/"
-      ],
+    "controlUi": {
+      "allowedOrigins": ["*"],
       "dangerouslyAllowHostHeaderOriginFallback": true,
       "allowInsecureAuth": true,
       "dangerouslyDisableDeviceAuth": true
@@ -168,118 +156,88 @@ cat > /root/.openclaw/openclaw.json <<EOF
       "enabled": false
     },
     "plugins": {
-      "allow": ["openclaw-weixin"] 
+      "allow": ["openclaw-weixin"]
     }
-  },
-  
+  }
 }
 EOF
+echo "主配置文件已生成: /root/.openclaw/openclaw.json"
 
-echo "配置文件已生成: /root/.openclaw/openclaw.json"
-
-# 10. 修复权限
+# --- 权限与链接设置 ---
 echo ""
-echo "=== 8. 设置文件权限 ==="
+echo "=== 7. 设置权限与技能链接 ==="
 chmod 700 /root/.openclaw
 chmod 600 /root/.openclaw/openclaw.json
-chmod 700 /root/.openclaw/agents
-chmod 700 /root/.openclaw/credentials
-chmod 700 /root/.openclaw/sessions
-chmod 755 /root/.openclaw/skills 2>/dev/null || true
+chmod 700 /root/.openclaw/{agents,credentials,sessions}
+chmod 750 /root/.openclaw/skills  # 调整为更安全的权限
 
-# 11. 创建技能符号链接
-echo ""
-echo "=== 9. 设置技能链接 ==="
 for skill in "${INSTALLED_SKILLS[@]}"; do
-    echo "处理技能: $skill"
-    
-    # 查找技能目录
-    SKILL_DIR=""
+    echo "处理技能链接: $skill"
+    local source_dir=""
     for dir in "/app/skills/$skill" "/skills/$skill" "/root/.openclaw/skills/$skill"; do
         if [ -d "$dir" ]; then
-            SKILL_DIR="$dir"
+            source_dir="$dir"
             break
         fi
     done
-    
-    if [ -n "$SKILL_DIR" ]; then
-        echo "  找到技能目录: $SKILL_DIR"
-        
-        # 创建符号链接到 OpenClaw 技能目录
-        LINK_TARGET="/root/.openclaw/skills/$skill"
-        if [ ! -e "$LINK_TARGET" ] && [ "$SKILL_DIR" != "$LINK_TARGET" ]; then
-            echo "  创建链接: $SKILL_DIR -> $LINK_TARGET"
-            ln -sf "$SKILL_DIR" "$LINK_TARGET"
-        fi
-        
-        # 检查是否缺少关键文件
-        if [ ! -f "$SKILL_DIR/package.json" ] && [ ! -f "$SKILL_DIR/skill.json" ]; then
-            echo "  ⚠️ 警告: 缺少 package.json 或 skill.json，技能可能无法被 OpenClaw 识别"
-            
-            # 尝试创建基本的 skill.json
-            if [ ! -f "$SKILL_DIR/skill.json" ] && [ -f "$SKILL_DIR/_meta.json" ]; then
-                echo "  尝试从 _meta.json 创建 skill.json..."
-                cat > "$SKILL_DIR/skill.json" <<EOF
-{
-  "name": "$skill",
-  "description": "Auto-generated from _meta.json",
-  "version": "1.0.0",
-  "main": "index.js",
-  "type": "skill"
-}
-EOF
-                echo "  创建了基本的 skill.json"
-            fi
+
+    if [ -n "$source_dir" ]; then
+        local link_target="/root/.openclaw/skills/$(basename "$skill")"
+        if [ ! -L "$link_target" ] || [ "$(readlink -f "$link_target")" != "$(readlink -f "$source_dir")" ]; then
+            ln -sfn "$source_dir" "$link_target"
+            echo "  ✓ 链接已创建/更新: $link_target -> $source_dir"
         fi
     else
-        echo "  ❌ 未找到技能目录: $skill"
+        echo "  ⚠️  未找到技能目录，无法创建链接: $skill" >&2
     fi
 done
 
-# 12. 启动定时备份
+# --- 启动前健康检查 ---
 echo ""
-echo "=== 10. 启动定时备份 ==="
-(while true; do sleep 3600; python3 /app/sync.py backup; done) &
+echo "=== 8. 运行启动前检查 ==="
+if command -v openclaw &> /dev/null; then
+    openclaw doctor --fix 2>&1 | tee /tmp/openclaw-doctor-startup.log
+    echo "健康检查日志: /tmp/openclaw-doctor-startup.log"
 
-# 13. 运行健康检查
-echo ""
-echo "=== 11. 运行健康检查 ==="
-openclaw doctor --fix 2>&1 | tee /tmp/openclaw-doctor.log
-echo "健康检查完成，日志: /tmp/openclaw-doctor.log"
-
-# 14. 列出所有技能
-echo ""
-echo "=== 12. 列出所有技能 ==="
-echo "--- ClawHub 安装的技能 ---"
-clawhub list 2>/dev/null || echo "无法获取列表"
-
-echo ""
-echo "--- OpenClaw 识别的技能 ---"
-openclaw skills list 2>&1 || echo "无法获取技能列表"
+    echo ""
+    echo "--- 已安装技能列表 (openclaw) ---"
+    openclaw skills list 2>&1 || echo "  无法列出技能。"
+else
+    echo "⚠️  openclaw 命令未找到，跳过健康检查。" >&2
+fi
 
-# 15. 调试：检查技能配置
-echo ""
-echo "=== 13. 调试信息 ==="
-echo "当前用户: $(whoami)"
-echo "HOME 目录: $HOME"
-echo "PORT: $PORT"
-echo "技能目录列表:"
-ls -la /root/.openclaw/skills/ 2>/dev/null || echo "无技能目录"
-ls -la /app/skills/ 2>/dev/null || echo "无 /app/skills 目录"
-ls -la /skills/ 2>/dev/null || echo "无 /skills 目录"
+# --- 环境摘要 ---
+echo ""
+echo "=== 9. 环境摘要 ==="
+echo "服务端口: $PORT"
+echo "模型: $MODEL"
+echo "API 地址: ${CLEAN_BASE%/v1} (v1)"
+echo "网关令牌: ${OPENCLAW_GATEWAY_PASSWORD:0:3}..."
+echo "Tavily Key: ${TAVILY_API_KEY:0:5}..."
+
+# --- 启动后台任务与主服务 ---
+echo ""
+echo "=== 10. 启动后台任务与主服务 ==="
+# 启动定时备份任务 (每小时一次)
+(
+    echo "  定时备份任务启动。"
+    while true; do
+        sleep 3600
+        if python3 /app/sync.py backup; then
+            echo "  [$(date)] 定时备份完成。"
+        else
+            echo "  [$(date)] 定时备份失败。" >&2
+        fi
+    done
+) &
+BACKUP_PID=$!
+echo "  定时备份任务 PID: $BACKUP_PID"
 
-# 16. 检查环境变量
 echo ""
-echo "环境变量检查:"
-echo "TAVILY_API_KEY: ${TAVILY_API_KEY:0:5}..."
-echo "OPENCLAW_GATEWAY_PASSWORD: ${OPENCLAW_GATEWAY_PASSWORD:0:5}..."
-echo "MODEL: $MODEL"
-echo "OPENAI_API_BASE: $OPENAI_API_BASE"
-# 17. 启动网关
-echo ""
-echo "=== 14. 启动 OpenClaw 网关 ==="
-echo "监听端口: $PORT"
-echo "绑定模式: lan"
-echo "控制台: https://aip9105-openclaw.hf.space/"
 echo "======================================"
-exec openclaw gateway run --port $PORT
+echo "正在启动 OpenClaw 网关..."
+echo "控制台 (如配置): "
+echo "======================================"
+echo ""
+# 使用 exec 启动，使网关成为容器主进程
+exec openclaw gateway run --port "$PORT"