Skip to content

armgit / avibe

Public Imported from GitHub
0

Make your computer a home for your AI partner. Avibe is the local-first Agent OS: Vibey, its built-in AI partner, works out of the box, and Claude Code, Codex & OpenCode run unchanged beside it — reach them from your browser, phone, or any chat app.

fix(agents): port master's new backend callers onto the Avibe Agent seams

cyh7cb3b021bb01
diff --git a/core/session_turns.py b/core/session_turns.py
index 3da94e552..ccc15af5e 100644
--- a/core/session_turns.py
+++ b/core/session_turns.py
@@ -88,6 +88,7 @@ from core.runtime_activation import (
RuntimeActivationRegistry,
RuntimeActivationResolution,
)
+from modules.agents.catalog import display_name_for_backend
from vibe.i18n import t as i18n_t
if TYPE_CHECKING:
@@ -6550,7 +6551,7 @@ class SessionTurnManager:
text = i18n_t(
message_key,
language,
- agent=i18n_t(f"backend.{backend}", language) if backend else "",
+ agent=display_name_for_backend(backend) if backend else "",
)
metadata: dict[str, Any] = {"turn_id": turn_id or None, "replayed": True}
watch_ids = self._recovered_watch_ids(session_id, turn_id)
diff --git a/modules/agents/avibe/agent.py b/modules/agents/avibe/agent.py
index f60409e41..3ef67b962 100644
--- a/modules/agents/avibe/agent.py
+++ b/modules/agents/avibe/agent.py
@@ -432,8 +432,12 @@ class AvibeAgent(BaseAgent):
).scalars()
return any((moment := instant(value)) is not None and moment >= created for value in committed)
- async def shutdown_runtime(self) -> None:
- """Disabling the backend ends its runs; the rolling refresh drains Turns before this."""
+ async def shutdown_runtime(self, settle_reason: Optional[str] = None) -> None:
+ """Disabling the backend ends its runs now.
+
+ The core settles their Turns and Activities with ``settle_reason``. The
+ runs live in this process, so ending them is all this adapter stops.
+ """
for runtime in list(self._runtimes.values()):
if runtime.run is not None:
runtime.run.stop_requested = True
diff --git a/modules/agents/claude_agent.py b/modules/agents/claude_agent.py
index 249b263ac..c31ae07b0 100644
--- a/modules/agents/claude_agent.py
+++ b/modules/agents/claude_agent.py
@@ -45,6 +45,7 @@ from modules.agents.claude_process_reaper import (
get_claude_client_returncode,
register_claude_owned_process,
)
+from modules.agents.catalog import display_name_for_backend
from vibe.i18n import t as i18n_t
from modules.agents.base import (
@@ -566,7 +567,7 @@ class ClaudeAgent(BaseAgent):
self.name,
"claude backend disabled",
display_text=(
- f"❌ {i18n_t('error.agentRuntimeRetired', language, agent=i18n_t('backend.claude', language))}"
+ f"❌ {i18n_t('error.agentRuntimeRetired', language, agent=display_name_for_backend(self.name))}"
),
request=request,
)
diff --git a/modules/agents/codex/agent.py b/modules/agents/codex/agent.py
index 69e9b246a..acaad6cdb 100644
--- a/modules/agents/codex/agent.py
+++ b/modules/agents/codex/agent.py
@@ -84,6 +84,7 @@ from vibe.codex_config import (
codex_credential_identity,
)
from vibe.desktop_backends import desktop_backend_subprocess_environment
+from modules.agents.catalog import display_name_for_backend
from vibe.i18n import t as i18n_t
from vibe.message_identity import is_input_turn
@@ -711,7 +712,7 @@ class CodexAgent(BaseAgent):
elif isinstance(e, RuntimeUnitStopping):
# Not a source failure: no Hub cooldown.
display_text = (
- f"❌ {i18n_t('error.agentRuntimeRetired', language, agent=i18n_t('backend.codex', language))}"
+ f"❌ {i18n_t('error.agentRuntimeRetired', language, agent=display_name_for_backend(self.name))}"
)
elif isinstance(e, CodexModelHubCatalogUnavailableError):
await self._record_model_hub_native_failure(request.context, str(e))
@@ -1757,7 +1758,7 @@ class CodexAgent(BaseAgent):
getattr(getattr(self.controller, "config", None), "language", "en")
or "en"
)
- message = i18n_t("error.agentRuntimeRetired", language, agent=i18n_t("backend.codex", language))
+ message = i18n_t("error.agentRuntimeRetired", language, agent=display_name_for_backend(self.name))
elif isinstance(error, CodexForkBoundaryUnavailableError):
language = str(
getattr(getattr(self.controller, "config", None), "language", "en")
diff --git a/modules/agents/opencode/agent.py b/modules/agents/opencode/agent.py
index db062ab13..36624bb56 100644
--- a/modules/agents/opencode/agent.py
+++ b/modules/agents/opencode/agent.py
@@ -81,6 +81,7 @@ from modules.agents.model_hub import (
persisted_launch_identity,
resolve_opencode_overlay_launch,
)
+from modules.agents.catalog import display_name_for_backend
from vibe.i18n import t as i18n_t
from .caller_context import (
@@ -1227,7 +1228,7 @@ class OpenCodeAgent(OpenCodeMessageProcessorMixin, BaseAgent):
message = i18n_t(
"error.agentRuntimeRetired",
language,
- agent=i18n_t("backend.opencode", language),
+ agent=display_name_for_backend(self.name),
)
else:
message = f"Failed to start OpenCode server: {error}"
diff --git a/tests/test_avibe_agent.py b/tests/test_avibe_agent.py
index add575497..c1fcd48dc 100644
--- a/tests/test_avibe_agent.py
+++ b/tests/test_avibe_agent.py
@@ -2309,28 +2309,43 @@ async def test_two_recovery_passes_racing_on_one_open_call_settle_it_once(engine
async def test_enabling_the_backend_hands_recovery_to_the_registered_adapter(
engine, session, tmp_path, published, monkeypatch
) -> None:
+ import modules.agents.avibe as avibe_module
import modules.agents.avibe.recovery as recovery_module
+ from config.v2_config import AvibeAgentConfig
from core.agent_auth_service import AgentAuthService
from core.controller import Controller
from core.watches import ManagedWatchStore
+ from modules.agents.service import AgentService
calls = _hand_over_failing_once(monkeypatch)
# The detached retry would wait long; live registration must not leave it beside the new owner.
monkeypatch.setattr(recovery_module, "RETRY_DELAYS_S", (60.0,))
harness, running, _exited = await _two_sessions_with_open_calls(engine, tmp_path, local_tool_suite())
controller = _disabled_controller()
+ controller.agent_service = AgentService(controller)
+ auth = AgentAuthService(controller)
+ auth._sync_builtin_default_agents = lambda: None
+ monkeypatch.setattr(avibe_module, "AvibeAgent", lambda _controller: harness.new_agent())
try:
# Startup with agents.avibe disabled: SESSION's hand-over fails and a retry is pending.
await Controller._recover_avibe_agent_runtime_state(controller)
- # agents.avibe is enabled: the config refresh registers an adapter and recovers on it.
- controller.agent_service.agents["avibe"] = harness.new_agent()
- await AgentAuthService._recover_after_live_registration(SimpleNamespace(controller=controller), "avibe")
+ # agents.avibe is saved enabled: applying it registers an adapter and recovers on it.
+ auth._load_backend_runtime_config = lambda _backend: AvibeAgentConfig(enabled=True)
+ await auth.renew_backend_runtime("avibe", config_save=True)
# One owner: the registered adapter settled everything, and no detached retry remains.
+ assert "avibe" in controller.agent_service.agents
pending = [task for task in asyncio.all_tasks() if task.get_name().startswith("avibe-agent-recovery")]
assert [task for task in pending if not task.done()] == []
assert ManagedWatchStore().find_job_watch(running) is not None
assert len(await _results(engine, SESSION)) == 1 and calls.count(running) == 2
+
+ # Saved disabled again: the adapter leaves routing and its stop completes, leaving
+ # no teardown for the idle sweep to retry.
+ auth._load_backend_runtime_config = lambda _backend: None
+ await auth.renew_backend_runtime("avibe", config_save=True)
+ assert "avibe" not in controller.agent_service.agents and controller.config.avibe is None
+ assert controller.agent_service._pending_operations == {}
finally:
await controller.avibe_recovery.stop()
for task in asyncio.all_tasks():
diff --git a/tests/test_claude_agent_sessions.py b/tests/test_claude_agent_sessions.py
index 1a74a36e3..80a432e7f 100644
--- a/tests/test_claude_agent_sessions.py
+++ b/tests/test_claude_agent_sessions.py
@@ -104,7 +104,7 @@ async def test_runtime_gen_006_a_turn_reaching_a_disabled_claude_starts_nothing(
assert controller.session_handler.get_or_create_claude_session.await_count == (1 if disabled_while_connecting else 0)
assert len(failures) == 1 and failures[0][0] == "claude"
- assert "ClaudeCode was turned off" in failures[0][1]
+ assert "Claude Code was turned off" in failures[0][1]
class _StubSessions: