d5ceff958d
`/model <x>` onto copilot-acp validates through `models_validate._static_catalog`, which reads `provider_model_ids` with no disk cache. After the session probe landed, every such switch spawned `copilot --acp`, ran the handshake, and killed it (1-3 s; up to the 15 s probe timeout when the CLI is installed but the session stalls). The GitHub-API tier that path used before sat behind a 5-minute in-memory memo; the ACP tier now has the same memo, and it remembers failures too so a broken CLI is not re-spawned per switch. The probe itself moves to `CopilotACPProfile.fetch_models` — the slot that already said "model listing is handled by the ACP subprocess" and returned None — so hermes_cli/models.py no longer hand-builds `CopilotACPClient` kwargs that `profile.create_client` owns. Discovery failures are logged at debug instead of swallowed. Tests: the two picker wiring tests collapse into one parametrized contract; a new test proves three consecutive switch validations pay one probe and a failed probe is not retried (fails when the memo read is removed).
60 lines
2.6 KiB
Python
60 lines
2.6 KiB
Python
"""GitHub Copilot ACP provider profile.
|
|
|
|
copilot-acp does not speak OpenAI-over-HTTP: it drives an external ACP subprocess over
|
|
stdio, so the profile supplies its own client via :meth:`ProviderProfile.create_client`.
|
|
An out-of-tree ACP provider (``~/.hermes/plugins/model-providers/`` or a pip entry point)
|
|
uses the same three lines without touching core.
|
|
"""
|
|
|
|
from typing import Any
|
|
|
|
from providers import register_provider
|
|
from providers.base import ProviderProfile
|
|
|
|
|
|
class CopilotACPProfile(ProviderProfile):
|
|
"""GitHub Copilot ACP — external process, no REST models endpoint."""
|
|
|
|
def create_client(self, **client_kwargs: Any) -> Any:
|
|
"""Build the ACP stdio shim rather than an HTTP client."""
|
|
from agent.copilot_acp_client import CopilotACPClient
|
|
|
|
return CopilotACPClient(**client_kwargs)
|
|
|
|
def fetch_models(
|
|
self, *, api_key: str | None = None, base_url: str | None = None, timeout: float = 15.0
|
|
) -> list[str] | None:
|
|
"""Enabled models advertised by a short-lived signed-in ACP session (``session/new``).
|
|
|
|
The CLI may keep its login in an OS credential store with no token Hermes can reuse, so
|
|
the session is the only source that reflects the account's enablement. ``api_key`` /
|
|
``base_url`` are ignored: the subprocess owns auth. None when the CLI is missing, refuses
|
|
``--acp``, or the probe fails/times out — callers fall back to their next source.
|
|
"""
|
|
from hermes_cli.auth import resolve_external_process_provider_credentials
|
|
|
|
creds = resolve_external_process_provider_credentials(self.name)
|
|
if not str(creds.get("base_url") or "").startswith("acp://"):
|
|
return None
|
|
client = self.create_client(
|
|
api_key=creds.get("api_key"), base_url=creds.get("base_url"),
|
|
command=creds.get("command"), args=creds.get("args"))
|
|
return client.list_models(timeout_seconds=timeout) or None
|
|
|
|
|
|
copilot_acp = CopilotACPProfile(
|
|
name="copilot-acp", aliases=("github-copilot-acp", "copilot-acp-agent"),
|
|
api_mode="chat_completions", # ACP subprocess uses chat_completions routing
|
|
env_vars=(), # Managed by ACP subprocess
|
|
base_url="acp://copilot", # ACP internal scheme
|
|
auth_type="external_process",
|
|
# How to launch the CLI; env var names predate this profile (formerly hardcoded in
|
|
# hermes_cli/auth.py), so existing setups keep working.
|
|
process_command="copilot",
|
|
process_args=("--acp", "--stdio"),
|
|
process_command_env_vars=("HERMES_COPILOT_ACP_COMMAND", "COPILOT_CLI_PATH"),
|
|
process_args_env_var="HERMES_COPILOT_ACP_ARGS",
|
|
)
|
|
|
|
register_provider(copilot_acp)
|