Merge branch 'refactor/upgrade-antigravity-cli'

# Conflicts:
#	roles/vhosts/acp_server_gemini/defaults/main.yml
#	roles/vhosts/acp_server_gemini/templates/gemini.plist.j2
This commit is contained in:
Haitao Pan 2026-06-22 13:26:30 +08:00
commit 1b2aea005a
3 changed files with 7 additions and 6 deletions

View File

@ -8,7 +8,7 @@ acp_gemini_xdg_config_home: "{{ acp_gemini_home }}/.config"
acp_gemini_xdg_state_home: "{{ acp_gemini_home }}/.local/state"
acp_gemini_config_dir: "{{ acp_gemini_home }}/.gemini"
acp_gemini_npm_global_bin: "{{ acp_gemini_home + '/.local/bin' if ansible_os_family == 'Darwin' else '/usr/bin' }}"
acp_gemini_binary_path: "{{ acp_gemini_npm_global_bin }}/gemini"
acp_gemini_binary_path: "{{ acp_gemini_npm_global_bin }}/antigravity-cli"
acp_gemini_path: "{{ acp_gemini_npm_global_bin }}:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/bin"
acp_gemini_args: --experimental-acp
acp_gemini_bridge_local_source_dir: "{{ playbook_dir }}/../xworkmate-bridge"

View File

@ -19,7 +19,7 @@ Environment=GEMINI_ADAPTER_ALLOWED_ORIGINS={{ acp_gemini_allowed_origins | join(
Environment={{ key }}={{ value }}
{% endif %}
{% endfor %}
ExecStart={{ acp_gemini_bridge_binary_path }} adapter gemini --listen {{ acp_gemini_listen_host }}:{{ acp_gemini_listen_port }} --gemini-bin {{ acp_gemini_binary_path }} --gemini-args "{{ acp_gemini_args }}"
ExecStart={{ acp_gemini_bridge_binary_path }} adapter antigravity-cli --listen {{ acp_gemini_listen_host }}:{{ acp_gemini_listen_port }} --antigravity-cli-bin {{ acp_gemini_binary_path }} --antigravity-cli-args "{{ acp_gemini_args }}"
Restart=always
RestartSec=2

View File

@ -15,10 +15,11 @@
export {{ key }}="{{ value }}"
{% endfor %}
exec "{{ acp_gemini_bridge_binary_path }}" adapter gemini \
-listen {{ acp_gemini_listen_host }}:{{ acp_gemini_listen_port }} \
-gemini-bin "{{ acp_gemini_binary_path }}" \
-gemini-args "{{ acp_gemini_args }}"
exec "{{ acp_gemini_bridge_binary_path }}" acp-server \
--port {{ acp_gemini_listen_port }} \
--host {{ acp_gemini_listen_host }} \
--sub-command antigravity-cli \
--sub-command mcp-app-server
</string>
</array>
<key>RunAtLoad</key>