fix(copilot-acp): apply the picker-selected model via session/set_model
Selecting a model on the copilot-acp provider had no effect: the model id
never left Hermes. _create_chat_completion() dropped the model argument
before _run_prompt(), so the selection survived only as prompt text
('Hermes requested model hint: ...') and Copilot answered with its own
session default — a user picking gpt-5.6-terra visibly got Claude Sonnet 5.
Live-probing 'copilot --acp --stdio' shows the CLI validates but IGNORES
its --model spawn flag in ACP mode, while session/new advertises
models.availableModels and the ACP-native session/set_model call actually
switches the session. Wire that in: forward the model into _run_prompt,
and after session/new send session/set_model when the id is advertised
(or the server reports no list). Unknown ids degrade to the session
default with a warning instead of failing the turn; the provider-level
virtual slug 'copilot-acp' is never forwarded.
Verified live against the real CLI: requesting gpt-5.6-terra answers as
GPT-5.6 Terra and claude-sonnet-5 answers as Claude Sonnet 5.
This commit is contained in:
committed by
kshitij
parent
5487222658
commit
426dab7de0
@@ -9,6 +9,7 @@ back into the minimal shape Hermes expects from an OpenAI client.
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
import queue
|
||||
import re
|
||||
@@ -31,6 +32,7 @@ from agent.redact import redact_sensitive_text
|
||||
from tools.environments.local import hermes_subprocess_env
|
||||
|
||||
ACP_MARKER_BASE_URL = "acp://copilot"
|
||||
logger = logging.getLogger(__name__)
|
||||
_DEFAULT_TIMEOUT_SECONDS = 900.0
|
||||
|
||||
# Stderr fingerprint of the deprecated `gh copilot` CLI extension
|
||||
@@ -365,6 +367,7 @@ class CopilotACPClient:
|
||||
response_text, reasoning_text = self._run_prompt(
|
||||
prompt_text,
|
||||
timeout_seconds=_effective_timeout,
|
||||
model=model,
|
||||
)
|
||||
|
||||
tool_calls, cleaned_text = _extract_tool_calls_from_text(response_text)
|
||||
@@ -393,7 +396,13 @@ class CopilotACPClient:
|
||||
return _completion_to_stream_chunks(completion)
|
||||
return completion
|
||||
|
||||
def _run_prompt(self, prompt_text: str, *, timeout_seconds: float) -> tuple[str, str]:
|
||||
def _run_prompt(
|
||||
self,
|
||||
prompt_text: str,
|
||||
*,
|
||||
timeout_seconds: float,
|
||||
model: str | None = None,
|
||||
) -> tuple[str, str]:
|
||||
# Fast-fail when the CLI doesn't support the ACP args we'd pass.
|
||||
# Without this guard, a CLI like Claude Code v2.x exits with
|
||||
# ``error: unknown option '--acp'`` immediately, then the parent
|
||||
@@ -416,6 +425,13 @@ class CopilotACPClient:
|
||||
f"to a working pair."
|
||||
)
|
||||
|
||||
# Note the model Hermes selected; it is applied after session/new via
|
||||
# the ACP-native `session/set_model` call. The CLI's `--model` spawn
|
||||
# flag is deliberately NOT used here: `copilot --acp` validates it
|
||||
# (an unknown id aborts the spawn) but then ignores it for the actual
|
||||
# session, so it adds a failure mode without selecting anything.
|
||||
requested_model = str(model or "").strip()
|
||||
|
||||
try:
|
||||
# Hide the console the CLI child would otherwise flash on Windows
|
||||
# (#56747). Hide-only — stdio pipes stay intact for the ACP wire.
|
||||
@@ -560,6 +576,42 @@ class CopilotACPClient:
|
||||
if not session_id:
|
||||
raise RuntimeError("Copilot ACP did not return a sessionId.")
|
||||
|
||||
# Select the model Hermes asked for. The `--model` spawn flag is
|
||||
# validated but IGNORED by `copilot --acp` (observed: session
|
||||
# still runs the CLI's own default); the ACP-native
|
||||
# `session/set_model` call is what actually switches it. Only
|
||||
# send ids the server advertises in session/new so an unknown
|
||||
# slug degrades to the default instead of erroring the prompt,
|
||||
# and never fail the whole turn over model selection.
|
||||
if requested_model and requested_model != "copilot-acp":
|
||||
try:
|
||||
available = {
|
||||
str(m.get("modelId") or "").strip()
|
||||
for m in (
|
||||
(session.get("models") or {}).get("availableModels") or []
|
||||
)
|
||||
if isinstance(m, dict)
|
||||
}
|
||||
if not available or requested_model in available:
|
||||
_request(
|
||||
"session/set_model",
|
||||
{"sessionId": session_id, "modelId": requested_model},
|
||||
)
|
||||
else:
|
||||
logger.warning(
|
||||
"Copilot ACP does not offer model %r; using the "
|
||||
"session default. Available: %s",
|
||||
requested_model,
|
||||
", ".join(sorted(available)) or "(none reported)",
|
||||
)
|
||||
except Exception as exc:
|
||||
logger.warning(
|
||||
"Copilot ACP session/set_model(%r) failed; continuing "
|
||||
"with the session default: %s",
|
||||
requested_model,
|
||||
exc,
|
||||
)
|
||||
|
||||
text_parts: list[str] = []
|
||||
reasoning_parts: list[str] = []
|
||||
_request(
|
||||
|
||||
@@ -317,3 +317,106 @@ def test_probe_skipped_for_custom_args_without_acp():
|
||||
with _patch("agent.copilot_acp_client.subprocess.run") as run_mock:
|
||||
assert _acp_supported("mycli", ["--custom-transport"]) is True
|
||||
run_mock.assert_not_called()
|
||||
|
||||
|
||||
# --- session/set_model: honor the picker-selected model ----------------------
|
||||
#
|
||||
# `copilot --acp` validates but IGNORES the `--model` spawn flag; the ACP
|
||||
# session runs the CLI's own default unless the client issues the ACP-native
|
||||
# `session/set_model` call. Without it, picking gpt-5.6-terra in Hermes
|
||||
# visibly answers as the CLI's default model.
|
||||
|
||||
|
||||
class _ScriptedACP:
|
||||
"""Minimal scripted ACP wire: records requests, plays canned results."""
|
||||
|
||||
def __init__(self, session_result):
|
||||
self.requests = []
|
||||
self.session_result = session_result
|
||||
|
||||
def request(self, method, params, **_):
|
||||
self.requests.append((method, params))
|
||||
if method == "session/new":
|
||||
return self.session_result
|
||||
return {}
|
||||
|
||||
|
||||
def _run_prompt_with_scripted_wire(model, session_result):
|
||||
"""Drive _run_prompt's request sequence against a scripted wire."""
|
||||
client = CopilotACPClient(acp_cwd="/tmp")
|
||||
wire = _ScriptedACP(session_result)
|
||||
|
||||
def fake_run_prompt(prompt_text, *, timeout_seconds, model=None):
|
||||
# Reproduce the request choreography under test without a subprocess.
|
||||
session = wire.request("session/new", {"cwd": "/tmp", "mcpServers": []}) or {}
|
||||
session_id = str(session.get("sessionId") or "")
|
||||
requested_model = str(model or "").strip()
|
||||
if requested_model and requested_model != "copilot-acp":
|
||||
available = {
|
||||
str(m.get("modelId") or "").strip()
|
||||
for m in ((session.get("models") or {}).get("availableModels") or [])
|
||||
if isinstance(m, dict)
|
||||
}
|
||||
if not available or requested_model in available:
|
||||
wire.request(
|
||||
"session/set_model",
|
||||
{"sessionId": session_id, "modelId": requested_model},
|
||||
)
|
||||
wire.request("session/prompt", {"sessionId": session_id, "prompt": []})
|
||||
return "ok", ""
|
||||
|
||||
with patch.object(CopilotACPClient, "_run_prompt", side_effect=fake_run_prompt):
|
||||
client._create_chat_completion(
|
||||
model=model, messages=[{"role": "user", "content": "hi"}]
|
||||
)
|
||||
return wire.requests
|
||||
|
||||
|
||||
_SESSION_WITH_MODELS = {
|
||||
"sessionId": "s1",
|
||||
"models": {
|
||||
"availableModels": [
|
||||
{"modelId": "auto"},
|
||||
{"modelId": "gpt-5.6-terra"},
|
||||
{"modelId": "claude-sonnet-5"},
|
||||
]
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
def test_set_model_sent_for_advertised_model():
|
||||
reqs = _run_prompt_with_scripted_wire("gpt-5.6-terra", _SESSION_WITH_MODELS)
|
||||
methods = [m for m, _ in reqs]
|
||||
assert "session/set_model" in methods, "picker model must be applied to the session"
|
||||
idx_set = methods.index("session/set_model")
|
||||
idx_prompt = methods.index("session/prompt")
|
||||
assert idx_set < idx_prompt, "model must be set before the prompt runs"
|
||||
assert reqs[idx_set][1] == {"sessionId": "s1", "modelId": "gpt-5.6-terra"}
|
||||
|
||||
|
||||
def test_set_model_skipped_for_unadvertised_model():
|
||||
reqs = _run_prompt_with_scripted_wire("not-served-here", _SESSION_WITH_MODELS)
|
||||
assert all(m != "session/set_model" for m, _ in reqs), \
|
||||
"unknown model must degrade to the session default, not error"
|
||||
|
||||
|
||||
def test_set_model_skipped_for_provider_virtual_slug():
|
||||
reqs = _run_prompt_with_scripted_wire("copilot-acp", _SESSION_WITH_MODELS)
|
||||
assert all(m != "session/set_model" for m, _ in reqs)
|
||||
|
||||
|
||||
def test_run_prompt_receives_picker_model():
|
||||
# _create_chat_completion must forward `model` into _run_prompt — the
|
||||
# original wiring dropped it, reducing the selection to prompt text.
|
||||
client = CopilotACPClient(acp_cwd="/tmp")
|
||||
seen = {}
|
||||
|
||||
def fake_run_prompt(prompt_text, *, timeout_seconds, model=None):
|
||||
seen["model"] = model
|
||||
return "ok", ""
|
||||
|
||||
with patch.object(CopilotACPClient, "_run_prompt", side_effect=fake_run_prompt):
|
||||
client._create_chat_completion(
|
||||
model="gpt-5.6-terra", messages=[{"role": "user", "content": "hi"}]
|
||||
)
|
||||
assert seen["model"] == "gpt-5.6-terra"
|
||||
|
||||
Reference in New Issue
Block a user