Skip to content

Fix: LLM API key configuration and Windows path compatibility (Issues #322, #320) #412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hobostay wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −2
Open

Fix: LLM API key configuration and Windows path compatibility (Issues #322, #320) #412

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions manager/scripts/init/start-manager-agent.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,18 @@ if [ "${HICLAW_RUNTIME}" != "aliyun" ]; then
# Create symlink for host directory access
if [ -d "/host-share" ]; then
ORIGINAL_HOST_HOME="${HOST_ORIGINAL_HOME:-$HOME}"

# Detect Windows path format (e.g., "C:\Users\xxx" or "D:\Users\xxx")
# Windows paths cannot be used directly in Linux containers for symlinks
if echo "${ORIGINAL_HOST_HOME}" | grep -qE '^[A-Za-z]:\\'; then
# Windows path detected - convert to Linux-compatible path or skip
# Extract drive letter and path, convert to /d/Users/xxx format
DRIVE=$(echo "${ORIGINAL_HOST_HOME}" | cut -c1 | tr 'A-Z' 'a-z')
WIN_PATH=$(echo "${ORIGINAL_HOST_HOME}" | cut -c3- | tr '\\' '/')
ORIGINAL_HOST_HOME="/${DRIVE}${WIN_PATH}"
log "Windows path detected, converted to: ${ORIGINAL_HOST_HOME}"
fi

if [ ! -e "${ORIGINAL_HOST_HOME}" ] && [ "${ORIGINAL_HOST_HOME}" != "/" ] && [ "${ORIGINAL_HOST_HOME}" != "/root" ] && [ "${ORIGINAL_HOST_HOME}" != "/data" ] && [ "${ORIGINAL_HOST_HOME}" != "/host-share" ]; then
mkdir -p "$(dirname "${ORIGINAL_HOST_HOME}")"
ln -sfn /host-share "${ORIGINAL_HOST_HOME}"
Expand Down Expand Up @@ -459,8 +471,12 @@ if [ -f /root/manager-workspace/openclaw.json ]; then
# Merge known models into existing config (add missing, preserve user-added)
# Use known-models.json (valid JSON) instead of template (contains ${VAR} placeholders)
KNOWN_MODELS=$(cat /opt/hiclaw/configs/known-models.json 2>/dev/null || echo '[]')
# Use HICLAW_LLM_API_KEY for LLM provider API key, fallback to HICLAW_MANAGER_GATEWAY_KEY
# HICLAW_LLM_API_KEY is the actual LLM provider key (e.g., Zhipu, OpenAI), while HICLAW_MANAGER_GATEWAY_KEY
# is for authenticating with the HiClaw Gateway service itself
Copy link
Copy Markdown
Collaborator

@johnlanni johnlanni Mar 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

HICLAW_MANAGER_GATEWAY_KEY is also the consumer key configured for the manager on Higress, and it does not need to be changed to the LLM API key

LLM_API_KEY="${HICLAW_LLM_API_KEY:-${HICLAW_MANAGER_GATEWAY_KEY}}"
jq --arg token "${MANAGER_TOKEN}" \
--arg key "${HICLAW_MANAGER_GATEWAY_KEY}" \
--arg key "${LLM_API_KEY}" \
--arg model "${MODEL_NAME}" \
--argjson e2ee "${MATRIX_E2EE_ENABLED}" \
--argjson known_models "${KNOWN_MODELS}" \
Expand Down Expand Up @@ -521,9 +537,11 @@ fi
# Cloud mode: overlay cloud-specific settings onto generated config
if [ "${HICLAW_RUNTIME}" = "aliyun" ]; then
log "Applying cloud overlay to openclaw.json..."
# Use HICLAW_LLM_API_KEY for LLM provider API key, fallback to HICLAW_MANAGER_GATEWAY_KEY
LLM_API_KEY="${HICLAW_LLM_API_KEY:-${HICLAW_MANAGER_GATEWAY_KEY}}"
jq --arg homeserver "${HICLAW_MATRIX_SERVER}" \
--arg gateway "${HICLAW_AI_GATEWAY_URL}/v1" \
--arg key "${HICLAW_MANAGER_GATEWAY_KEY}" \
--arg key "${LLM_API_KEY}" \
'.channels.matrix.homeserver = $homeserver
| .models.providers["hiclaw-gateway"].baseUrl = $gateway
| .models.providers["hiclaw-gateway"].apiKey = $key
Expand Down
Loading