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.
Python agentagent-osaiai-agentsai-partnerchatopsclaudeclaude-codecodexdevtoolsdiscord-botlark-botllmlocal-firstlong-term-memoryopencodeslack-botvibe-codingvibeywechat
fix(model-hub): avoid route-removal prompts on inventory gains (#1934)
Call Whitebea564dcaddd
diff --git a/core/handlers/model_hub/service.py b/core/handlers/model_hub/service.pyindex ef26f2b9c..852197d35 100644--- a/core/handlers/model_hub/service.py+++ b/core/handlers/model_hub/service.py@@ -3424,7 +3424,19 @@ class ModelHubService:) -> tuple[list[dict], list[dict]]:invalidated = self._invalidated_route_hops(updated, source_id)self._prune_invalidated_route_hops(updated, invalidated)- would_remove_hops = self._removed_effective_hops(previous, updated)+ # Inventory evidence narrows speculative candidates without deleting routes.+ # Keep explicit invalidations and newly introduced supply gaps guarded below.+ would_remove_hops = [+ item for item in self._removed_effective_hops(previous, updated)+ if not (+ effective_model_route(+ previous, cast(BackendName, item["backend"]), item["menu_model"],+ ).route_origin == "passthrough"+ and effective_model_route(+ updated, cast(BackendName, item["backend"]), item["menu_model"],+ ).route_origin == "automatic"+ )+ ]would_remove_hops.extend(item for item in invalidated if item not in would_remove_hops)would_interrupt = self._introduced_interruptions(previous, updated)self._require_guard_plan(diff --git a/docs/plans/model-hub-contracts/api.md b/docs/plans/model-hub-contracts/api.mdindex bb1d01cb3..927de5e16 100644--- a/docs/plans/model-hub-contracts/api.md+++ b/docs/plans/model-hub-contracts/api.md@@ -602,6 +602,13 @@ state. It counts only runnable exact hops in that model's effective Route chain,eligible inventory or the backend Source order by itself. A pair with no runnable hopappears once in `would_interrupt` or `interrupted`.+Inventory updates that refine an inherited `passthrough` plan into `automatic`+matching do not report displaced speculative candidates as `would_remove_hops` or+`removed_hops`, in either Hub or Direct mode. They leave saved route intent unchanged.+Explicit manual-hop invalidations, lost inventory matches, and newly introduced+protected-supply gaps still use the exact-plan guard. This exception does not apply+to Source deletion, default-membership changes, or Restore.+Every guarded Source/inventory mutation uses the §4.5 envelope matrix and the complete`guard-refusal.schema.json` shape. The first refusal is:diff --git a/docs/plans/model-hub.md b/docs/plans/model-hub.mdindex a33c2ef77..ceeba778c 100644--- a/docs/plans/model-hub.md+++ b/docs/plans/model-hub.md@@ -1176,8 +1176,16 @@ under one commit lock. Inventory disappearance can change an automatic matchingit never invalidates an explicit API-key manual invocation by itself. Subscriptionmodel-membership admission remains unchanged. Explicit retirementexcludes the exact pair, while manual inventory deletion removes matching evidence-without deleting explicit API-key hops; subscription admission remains unchanged. Refusals report complete effective removals and protected-supply loss in the existing arrays. Forced success must match both echoed arrays and+without deleting explicit API-key hops; subscription admission remains unchanged.+When inventory evidence changes an inherited plan from `passthrough` to `automatic`,+displaced speculative candidates are not destructive removals and are excluded from+`would_remove_hops` / `removed_hops`. This applies equally to active Hub plans and+dormant Direct plans: learning a model list does not delete saved route intent.+Explicit manual-hop invalidations, disappearance of existing inventory matches, and+new protected-supply loss remain guarded. Other mutation guards, including Source+deletion, default membership and Restore, continue to compare all effective removals.+Refusals report complete destructive removals and protected supply loss in the+existing arrays. Forced success must match both echoed arrays andpreserves surviving nonempty manual intent; Source deletion removes its actual references.Every final-hop removal, including catalog reconciliation, uses the same normalizedplanner. Normal saves persist the canonical sparse map; pure reads/preview never write.diff --git a/tests/scenarios/model_hub/catalog.yaml b/tests/scenarios/model_hub/catalog.yamlindex 0455f0a85..b9455e40e 100644--- a/tests/scenarios/model_hub/catalog.yaml+++ b/tests/scenarios/model_hub/catalog.yaml@@ -167,6 +167,9 @@ scenarios:kind: persistencelayer: scenariotest: tests/scenarios/model_hub/test_model_hub_configured_route_scenarios.py::test_mh_routing_003_manual_intent_survives_refresh_default_reorder_and_reload+ partial_evidence:+ covers: Inventory gains refine inherited candidates without destructive confirmations or saved-intent changes in Hub and Direct modes+ test: tests/scenarios/model_hub/test_model_hub_configured_route_scenarios.py::test_mh_routing_003_refresh_refines_inherited_candidates_without_removing_saved_routes- id: MH-ROUTING-004name: Restore and undo previews are inert and committed restore deletes the override idempotentlystatus: covereddiff --git a/tests/scenarios/model_hub/test_model_hub_configured_route_scenarios.py b/tests/scenarios/model_hub/test_model_hub_configured_route_scenarios.pyindex 73adf407d..058cdf6ed 100644--- a/tests/scenarios/model_hub/test_model_hub_configured_route_scenarios.py+++ b/tests/scenarios/model_hub/test_model_hub_configured_route_scenarios.py@@ -136,6 +136,48 @@ def test_mh_routing_003_manual_intent_survives_refresh_default_reorder_and_reloaassert [item.id for item in store.load().sources[0].models] == ["new-discovered-model"][email protected]("backend", ["claude", "codex", "opencode"])[email protected]("mode", ["hub", "direct"])[email protected]("inventory", [[], ["unrelated-inventory-model"]], ids=["empty", "incomplete"])[email protected]("intent", ["manual", "absent", "legacy-empty"])+def test_mh_routing_003_refresh_refines_inherited_candidates_without_removing_saved_routes(+ tmp_path, backend, mode, inventory, intent,+):+ """MH-ROUTING-003: gaining inventory evidence is not a destructive route mutation."""+ first = source("src_refreshfirst", ["other-provider-model"])+ second = source("src_refreshsecond", inventory, vendor="openai", protocol="openai_responses")+ manual = {"manual": [(first.id, "vendor/unlisted-original")], "absent": None, "legacy-empty": []}[intent]+ config, model = _routing_config(backend, [first, second], manual=manual)+ config.agents[backend].mode = mode+ config = round_trip(config)+ before = config.to_payload()+ store = MemoryModelHubStore(config)+ adapter = ModelHubScenarioAdapter(refresh_models=(*inventory, model))+ service = service_for(tmp_path, store, adapter)++ result = asyncio.run(service.refresh_source(second.id))++ assert result["removed_hops"] == result["interrupted"] == []+ persisted = round_trip(store.load()).to_payload()+ assert persisted["agents"] == before["agents"]+ assert persisted["sources"][0] == before["sources"][0]+ assert [item["id"] for item in persisted["sources"][1]["models"]] == [*inventory, model]+ assert len(store.saved_payloads) == 1+ reloaded = service_for(tmp_path / "reload", MemoryModelHubStore(round_trip(store.load())), adapter)+ resolution = resolve_model_hub_turn(reloaded.store.load(), backend, model, now=reloaded.now())+ if mode == "direct":+ assert resolution.channel == "direct"+ assert resolution.route_origin is None+ assert resolution.source_model_ids == ()+ else:+ assert resolution.route_origin == ("manual" if intent == "manual" else "automatic")+ assert list(resolution.source_model_ids) == (+ manual if intent == "manual" else [(second.id, model)]+ )+ assert adapter.observation_calls == adapter.invocations == []+ assert adapter.discovery_calls == [(second.vendor, second.protocol, second.base_url, second.credential_ref)]++@pytest.mark.parametrize("backend", ["claude", "codex", "opencode"])@pytest.mark.parametrize("operation", ["delete", "empty-put"])def test_mh_routing_004_preview_cancel_undo_are_inert_and_restore_deletes_only_override(tmp_path, backend, monkeypatch, operation):diff --git a/tests/test_model_hub_api.py b/tests/test_model_hub_api.pyindex 2409294e4..31f200155 100644--- a/tests/test_model_hub_api.py+++ b/tests/test_model_hub_api.py@@ -5646,6 +5646,45 @@ def test_model_hub_routes_reject_non_object_json_with_error_envelope(assert body["error"] == error[email protected]("mode", ["hub", "direct"])+def test_refresh_empty_inventory_returns_success_without_route_removal_confirmation(monkeypatch, tmp_path, mode):+ service, store, adapter = _service(tmp_path)+ for vendor, protocol in (("anthropic", "anthropic"), ("openai", "openai_responses")):+ store.config.sources.append(ModelHubSourceConfig(+ id=f"src_{vendor}01", kind="api_key", vendor=vendor, display_name=vendor,+ protocol=protocol, supply_channel="hub", billing="metered",+ state=ModelHubSourceStateConfig(status="standby"),+ models=[ModelHubModelConfig(id="claude-opus-4-6", provenance="discovered")] if vendor == "anthropic" else [],+ credential_ref=f"cred_{vendor}01",+ ))+ for agent in store.config.agents.values():+ agent.sources.order = [source.id for source in store.config.sources]+ agent.routes = {}+ store.config.agents["codex"].mode = mode+ models = [model.id for model in store.config.agents["codex"].models]++ async def discover(*_args):+ return tuple(DiscoveredModel(id=model) for model in models)++ adapter.discover_models = discover+ before = store.config.to_payload()+ monkeypatch.setattr(ui_server, "_model_hub_service", lambda: service)+ client = app.test_client()+ base_url = "http://127.0.0.1:15131"+ response = client.post(+ "/api/models/sources/src_openai01/refresh", json={},+ headers=csrf_headers(client, base_url), base_url=base_url,+ )+ assert response.status_code == 200+ body = response.get_json()+ _assert_envelope(body, ok=True)+ assert body["removed_hops"] == body["interrupted"] == []+ assert [model["id"] for model in body["source"]["models"]] == models+ after = store.config.to_payload()+ assert after["agents"] == before["agents"]+ assert after["sources"][0] == before["sources"][0]++def test_discovered_source_model_delete_persists_retirement_tombstone(monkeypatch,tmp_path,diff --git a/tests/test_model_hub_routing_modes.py b/tests/test_model_hub_routing_modes.pyindex 29253fa60..9a02cc6ae 100644--- a/tests/test_model_hub_routing_modes.py+++ b/tests/test_model_hub_routing_modes.py@@ -471,13 +471,15 @@ def test_legacy_empty_key_keeps_derived_catalog_but_invalid_nonmenu_key_is_not_r@pytest.mark.parametrize("backend", ["claude", "codex", "opencode"])[email protected]("mode", ["hub", "direct"])@pytest.mark.parametrize("operation", ["retire_discovered", "remove_subscription_manual", "refresh_subscription"])-def test_final_inventory_hop_removal_uses_inherited_guard_plan(tmp_path, backend, operation):+def test_final_inventory_hop_removal_uses_inherited_guard_plan(tmp_path, backend, mode, operation):default = _source("src_default01", (MODEL,))manual = _source("src_manual001", ("mapped",), kind="api_key" if operation == "retire_discovered" else "subscription")if operation == "remove_subscription_manual":manual.models[0].provenance = "manual"config = _loaded_catalog_config(backend, MODEL, default)+ config.agents[backend].mode = modeconfig.sources.append(manual)config.agents[backend].routes[MODEL] = ModelHubRouteConfig(hops=(ModelHubRouteHopConfig(manual.id, "mapped"),))service, store, adapter = _service(tmp_path, config)@@ -502,8 +504,10 @@ def test_final_inventory_hop_removal_uses_inherited_guard_plan(tmp_path, backend))assert result["interrupted"] == []assert store.config.agents[backend].routes == {}- assert service.agent_chain(backend, MODEL)["current"] == {"source_id": default.id, "model_id": MODEL}- assert service._bindings(store.config)[0].route_model_ids == (MODEL,)+ assert _pairs(effective_model_route(store.config, backend, MODEL)) == [(default.id, MODEL)]+ if mode == "hub":+ assert service.agent_chain(backend, MODEL)["current"] == {"source_id": default.id, "model_id": MODEL}+ assert service._bindings(store.config)[0].route_model_ids == (MODEL,)@pytest.mark.parametrize("backend", ["claude", "codex", "opencode"])@@ -598,12 +602,8 @@ def test_empty_intent_follows_refresh_defaults_and_health_without_reseeding(tmp_service, store, adapter = _service(tmp_path, config)assert service.agent_chain(backend, MODEL)["route_origin"] == "passthrough"adapter.discovered = (MODEL,)- with pytest.raises(ModelHubError) as refusal:- asyncio.run(service.refresh_source(second.id))- asyncio.run(service.refresh_source(second.id, force=True,- confirmed_remove_hops=refusal.value.data["would_remove_hops"],- confirmed_interruptions=refusal.value.data["would_interrupt"],- ))+ refreshed = asyncio.run(service.refresh_source(second.id))+ assert refreshed["removed_hops"] == refreshed["interrupted"] == []assert service.agent_chain(backend, MODEL)["route_origin"] == "automatic"bindings = service._bindings(store.config)store.config.sources[1].state = ModelHubSourceStateConfig(status="error", detail_key="models.source.error.unclassified")@@ -617,6 +617,60 @@ def test_empty_intent_follows_refresh_defaults_and_health_without_reseeding(tmp_assert store.config.agents[backend].routes == {}[email protected]("backend", ["claude", "codex", "opencode"])+def test_inventory_refinement_still_guards_new_supply_loss(tmp_path, backend):+ fallback = _source("src_fallback1", ())+ known = _source("src_known0001", (), status="error")+ known.state.detail_key = "models.source.error.unclassified"+ config = _loaded_catalog_config(backend, MODEL, fallback, known)+ service, store, adapter = _service(tmp_path, config)+ updated = copy.deepcopy(config)+ updated.sources[1].models = [ModelHubModelConfig(id=MODEL, provenance="discovered")]+ before = config.to_payload()+ with pytest.raises(ModelHubError) as refusal:+ service._guard_inventory_mutation(+ config, updated, known.id, force=False,+ confirmed_remove_hops=None, confirmed_interruptions=None,+ )+ assert refusal.value.code == "source_last_supplier"+ assert refusal.value.data == {+ "would_remove_hops": [],+ "would_interrupt": [{"backend": backend, "model_id": MODEL, "agents": []}],+ }+ assert store.config.to_payload() == before+ assert adapter.synced == []++[email protected]("backend", ["claude", "codex", "opencode"])[email protected]("mode", ["hub", "direct"])+def test_refresh_preserves_guard_for_disappearing_inventory_matches(tmp_path, backend, mode):+ first = _source("src_refresh01", (MODEL,))+ second = _source("src_refresh02", (MODEL,))+ config = _loaded_catalog_config(backend, MODEL, first, second)+ config.agents[backend].mode = mode+ service, store, adapter = _service(tmp_path, config)+ adapter.discovered = ()+ before = config.to_payload()+ with pytest.raises(ModelHubError) as refusal:+ asyncio.run(service.refresh_source(second.id))+ assert refusal.value.code == "source_model_in_route_chain"+ assert refusal.value.data == {+ "would_remove_hops": [{+ "backend": backend, "menu_model": MODEL, "source_id": second.id,+ "model_id": MODEL, "position": 2,+ }],+ "would_interrupt": [],+ }+ assert store.config.to_payload() == before+ assert adapter.synced == []+ result = asyncio.run(service.refresh_source(second.id, force=True,+ confirmed_remove_hops=refusal.value.data["would_remove_hops"],+ confirmed_interruptions=refusal.value.data["would_interrupt"],+ ))+ assert result["removed_hops"] == refusal.value.data["would_remove_hops"]+ assert result["interrupted"] == []++@pytest.mark.parametrize("backend", ["claude", "codex"])@pytest.mark.parametrize("state", ["automatic", "manual", "empty"])@pytest.mark.parametrize("operation", ["put", "preview", "restore_preview", "restore_save"])