From 87c9a18f610487ac755689269e29dbf356fe6d1c Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Fri, 19 Jun 2026 03:00:27 +0000 Subject: [PATCH] fix(macos): litellm brew install via command (clone-path patch) + TC-MAC-019 --- docs/case/macos_compatibility_tests.md | 10 +++++++ scripts/setup-ai-workspace-all-in-one.sh | 38 ++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/docs/case/macos_compatibility_tests.md b/docs/case/macos_compatibility_tests.md index c108936..e0c1123 100644 --- a/docs/case/macos_compatibility_tests.md +++ b/docs/case/macos_compatibility_tests.md @@ -167,6 +167,16 @@ | **修复方案** | 与 vault/openclaw 对齐：改用 `ansible.builtin.command: brew install postgresql@16`，并在 `environment.PATH` 前置 `/opt/homebrew/bin:/usr/local/bin`（优先选可用的 brew），加 `HOMEBREW_NO_AUTO_UPDATE=1`；`register`+`changed_when`/`failed_when` 维持幂等。真实仓库 `macos.yml` 已改；clone 路径由 `patch_playbook_postgres_macos()` 同步补丁 | | **备注** | 若该机仅有一个且过期的 brew（纯 Intel），根因为环境，需 `brew update`/重装 Homebrew；本修复在“存在可用 brew”时即可绕过（vault 步骤已证明存在可用 brew） | +## TC-MAC-019: litellm 同样误用 Homebrew 模块崩溃 + +| 项目 | 内容 | +|------|------| +| **触发文件** | `roles/vhosts/litellm/tasks/main.yml` | +| **触发报错** | `Install LiteLLM prerequisites (macOS)` → `/usr/local/Homebrew/.../macos_version.rb: unknown or unsupported macOS version: "27.0"` | +| **根因** | 与 TC-MAC-018 同源：`community.general.homebrew` 模块命中过期 Intel Homebrew 崩溃 | +| **修复方案** | 改 `ansible.builtin.command: brew install python@3.13` + `environment.PATH` 前置 `/opt/homebrew/bin:/usr/local/bin` + `HOMEBREW_NO_AUTO_UPDATE=1`。真实仓库已改；clone 路径由 `patch_playbook_litellm_macos()` 同步补丁 | +| **备注** | litellm 后续仍有 macOS 缺口待逐个处理：`/root` 派生的 salt/db 密钥 assert、`/etc/litellm` 配置目录、`become: true` + `become_user` 的 pip/prisma 任务（服务用户在 macOS 未创建）、DB provisioning 等 | + --- ## 修复维度总结 diff --git a/scripts/setup-ai-workspace-all-in-one.sh b/scripts/setup-ai-workspace-all-in-one.sh index 0c8696f..f6cd519 100755 --- a/scripts/setup-ai-workspace-all-in-one.sh +++ b/scripts/setup-ai-workspace-all-in-one.sh @@ -1383,6 +1383,43 @@ if old in text: PY } +# litellm installs python@3.13 via the community.general.homebrew module on +# macOS, which has the same stale-Intel-Homebrew crash risk. Replace it with a +# brew command using the PATH brew (Apple Silicon prefix first). +patch_playbook_litellm_macos() { + local main_file="roles/vhosts/litellm/tasks/main.yml" + [ -f "$main_file" ] || return 0 + python3 - <<'PY' +from pathlib import Path + +path = Path("roles/vhosts/litellm/tasks/main.yml") +text = path.read_text() +old = ( + "- name: Install LiteLLM prerequisites (macOS)\n" + " community.general.homebrew:\n" + " name: python@3.13\n" + " state: present\n" + " when: ansible_os_family == 'Darwin'\n" +) +new = ( + "- name: Install LiteLLM prerequisites (macOS)\n" + " ansible.builtin.command: brew install python@3.13\n" + " environment:\n" + " PATH: \"/opt/homebrew/bin:/usr/local/bin:{{ ansible_env.PATH }}\"\n" + " HOMEBREW_NO_AUTO_UPDATE: \"1\"\n" + " register: litellm_brew_python\n" + " changed_when: >-\n" + " 'already installed' not in (litellm_brew_python.stderr | default(''))\n" + " and 'already installed' not in (litellm_brew_python.stdout | default(''))\n" + " failed_when: litellm_brew_python.rc != 0\n" + " when: ansible_os_family == 'Darwin'\n" +) +if old in text: + text = text.replace(old, new, 1) + path.write_text(text) +PY +} + ensure_core_skills_source() { if [ "${AI_WORKSPACE_PREFETCH_COMPLETED:-false}" = "true" ] && [ -d "$XWORKSPACE_CORE_SKILLS_DIR/skills" ]; then @@ -2166,6 +2203,7 @@ if [ "$(detect_os)" = "darwin" ]; then patch_playbook_vault_macos patch_playbook_common_macos patch_playbook_postgres_macos + patch_playbook_litellm_macos fi prefetch_independent_sources ensure_core_skills_source