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(turns): report restart interruption instead of gateway-down during shutdown (#2221)

Call White22b4126d1b6b
diff --git a/core/backend_failure.py b/core/backend_failure.py
index 750002076..b682b3869 100644
--- a/core/backend_failure.py
+++ b/core/backend_failure.py
@@ -14,6 +14,7 @@ from core.delivery_evidence import (
)
from core.delivery_target import routed_delivery_context
from core.message_output import MessageOutput, terminal_output_for, terminal_turn_output
+from vibe.i18n import t as i18n_t
from vibe.message_types import spec_for
BACKEND_FAILURE_EVENT = "backend_failure"
@@ -129,6 +130,10 @@ def _failure_texts(backend_name: str, diagnostic: Any, display_text: Any) -> tup
return error, visible
+def _controller_language(controller: Any) -> str:
+ return str(getattr(getattr(controller, "config", None), "language", "en") or "en")
+
+
def _model_hub_failure_text(
controller: Any, context: Any, request: Any, backend: str
) -> str | None:
@@ -157,8 +162,7 @@ def _model_hub_failure_text(
projection = project(turn_id.strip(), backend=backend)
if not isinstance(projection, TurnOutcomeProjectionInput):
continue
- language = str(getattr(getattr(controller, "config", None), "language", "en") or "en")
- return render_turn_outcome_copy(projection, language)
+ return render_turn_outcome_copy(projection, _controller_language(controller))
return None
@@ -435,6 +439,12 @@ async def emit_backend_failure(
if handled_auth:
return True
+ # Shutdown stops the Model Hub engine and backend processes before in-flight
+ # Turns end, so a failure reported after it began names a symptom (gateway
+ # down, process exited) instead of the cause. Say the restart interrupted it.
+ if getattr(controller, "shutdown_requested", False) is True:
+ visible = i18n_t("turn.interrupted.serviceRestart", _controller_language(controller))
+
# ``delivery`` is passed only when the emitter supports it. Durable Turn and
# Harness contexts create the object automatically, but controller-like test
# and integration doubles with the legacy signature must keep working.
diff --git a/core/controller.py b/core/controller.py
index 1df1761e9..35c7c1095 100644
--- a/core/controller.py
+++ b/core/controller.py
@@ -1763,6 +1763,10 @@ class Controller:
def service_lock_safe_to_release(self) -> bool:
return bool(getattr(self, "_service_lock_safe_to_release", False))
+ @property
+ def shutdown_requested(self) -> bool:
+ return bool(getattr(self, "_shutdown_requested", False))
+
def request_shutdown(self, reason: str = "requested") -> None:
"""Schedule shutdown on the controller loop without blocking its owner."""
diff --git a/tests/test_model_hub_failure_presentation.py b/tests/test_model_hub_failure_presentation.py
index 2ea76b0be..da9a834f5 100644
--- a/tests/test_model_hub_failure_presentation.py
+++ b/tests/test_model_hub_failure_presentation.py
@@ -9,8 +9,10 @@ import pytest
from config.v2_config import ModelHubBackendModelConfig, ModelHubSourceStateConfig
from core.backend_failure import emit_backend_failure, emit_replayed_backend_failure
+from core.controller import Controller
from core.handlers.model_hub.adapter import RawOutcomeKind
from core.handlers.model_hub.provenance import (
+ ENGINE_DOWN_TURN_OUTCOME,
render_turn_outcome_copy,
)
from core.handlers.model_hub.turn_gateway import ModelHubTurnGateway
@@ -78,6 +80,34 @@ async def test_shared_failure_uses_exact_hub_copy_and_preserves_terminal_evidenc
assert terminal.kwargs["level"] == "silent"
[email protected]("projection", [ENGINE_DOWN_TURN_OUTCOME, None])
[email protected]("language", ["en", "zh"])
+async def test_failure_after_shutdown_request_reports_the_restart(projection, language):
+ """Shutdown stops the Hub engine first; the in-flight Turn's notice names the restart."""
+ controller = Controller.__new__(Controller)
+ controller.config = SimpleNamespace(language=language)
+ controller.model_hub_turn_gateway = SimpleNamespace(
+ correlation=SimpleNamespace(terminal_projection=Mock(return_value=projection)),
+ )
+ controller.emit_agent_message = AsyncMock(return_value="msg-failed")
+ controller.request_shutdown("signal")
+ context = MessageContext(
+ user_id="user", channel_id="channel", platform="avibe",
+ platform_specific={"turn_token": "turn-restart"},
+ )
+ diagnostic = "Claude turn failed: 502 engine_down"
+ symptom = (
+ render_turn_outcome_copy(projection, language)
+ if projection is not None else "Claude process exited unexpectedly"
+ )
+
+ await emit_backend_failure(controller, context, "claude", diagnostic, display_text=symptom)
+
+ notify, terminal = controller.emit_agent_message.await_args_list
+ assert notify.args[2] == t("turn.interrupted.serviceRestart", language) != symptom
+ assert terminal.kwargs["terminal_error"] == diagnostic
+
+
@pytest.mark.parametrize("identity", [None, "", 123, "different-turn"])
async def test_no_exact_projection_keeps_unrelated_native_failure(identity):
project = Mock(return_value=None)