resolve merge conflict in openclaw config, keep main version

This commit is contained in:
Harivansh Rathi 2026-04-03 17:33:26 +00:00
commit 945fdeda4b

View file

@ -4,48 +4,40 @@
"bind": "loopback", "bind": "loopback",
"port": 2470, "port": 2470,
"trustedProxies": ["127.0.0.1", "::1"], "trustedProxies": ["127.0.0.1", "::1"],
"controlUi": {
"allowedOrigins": ["https://netty.harivan.sh"]
},
"auth": { "auth": {
"mode": "token", "mode": "token",
"token": "${OPENCLAW_GATEWAY_TOKEN}" "token": "${OPENCLAW_GATEWAY_TOKEN}"
},
"controlUi": {
"allowedOrigins": ["https://netty.harivan.sh"]
} }
}, },
"channels": { "channels": {
"telegram": { "telegram": {
"enabled": true,
"botToken": "${TELEGRAM_BOT_TOKEN}", "botToken": "${TELEGRAM_BOT_TOKEN}",
"dmPolicy": "pairing" "dmPolicy": "pairing"
} }
}, },
"session": {
"dmScope": "per-channel-peer",
"reset": { "mode": "idle", "idleMinutes": 120 }
},
"agents": { "agents": {
"defaults": { "defaults": {
"workspace": "~/.openclaw/workspace", "workspace": "~/.openclaw/workspace",
"skipBootstrap": true,
"model": { "model": {
"primary": "anthropic/claude-sonnet-4-6", "primary": "anthropic/claude-sonnet-4-6"
"fallbacks": ["anthropic/claude-haiku-4-5-20251001"]
}, },
"contextTokens": 200000, "sandbox": {
"thinkingDefault": "adaptive", "mode": "non-main"
"sandbox": { "mode": "non-main" }, }
"compaction": { "mode": "default", "notifyUser": true }
} }
}, },
"tools": { "tools": {
"profile": "full", "profile": "coding",
"deny": ["gateway"] "fs": {
}, "workspaceOnly": true
},
"logging": { "loopDetection": {
"redactSensitive": "tools" "enabled": true
},
"deny": ["sessions_send", "sessions_spawn"]
} }
} }