graff — a fast agentic coding harness in Zig: multi-provider, MCP, workflows, DGM evolution loop, TS/Python SDKs
Python
Retain consent-gated fallback for unavailable selections
Rach Pradhan39897a1df516
diff --git a/scripts/test-model-preference.py b/scripts/test-model-preference.pyindex 8cc6b4e4..9807ceba 100644--- a/scripts/test-model-preference.py+++ b/scripts/test-model-preference.py@@ -147,8 +147,8 @@ def main() -> None:session.wait_for_prompt()clean_exit(session)- # A removed rollout stays on the selected provider when that login is- # healthy and the live catalog advertises a replacement model.+ # A temporary catalog omission keeps the exact saved selection when+ # that provider's credential remains available.cache.write_text(json.dumps({@@ -160,8 +160,7 @@ def main() -> None:encoding="utf-8",)with launch(str(cwd), env, codex_home=str(codex_home)) as session:- session.wait_for_literal("saved preference kept")- session.wait_for_literal("gpt-5.6-luna · Medium · ~/repo · Fallback")+ session.wait_for_literal("gpt-5.6-sol · Medium")session.wait_for_prompt()clean_exit(session)assert preference.read_text(encoding="utf-8") == "codex\ngpt-5.6-sol\n"diff --git a/src/startup_keys.zig b/src/startup_keys.zigindex a0ed7379..e34cf356 100644--- a/src/startup_keys.zig+++ b/src/startup_keys.zig@@ -58,7 +58,7 @@ test "saved startup pair survives a transient catalog omission and reaches the rtry std.testing.expect(std.mem.indexOf(u8, body, "\"model\":\"gpt-6-astra\"") == null);}-test "saved startup pair fails closed when its provider credential disappears" {+test "saved startup pair does not borrow another provider credential" {var keys: provider_mod.Keys = .{ .values = @splat(null) };try std.testing.expect(keys.set("codegraff", "unrelated-key", .session));try std.testing.expectError(error.MissingKey, savedProvider(keys, .{ .pid = "codex", .model = "gpt-6-luna" }));@@ -290,7 +290,7 @@ pub fn resolveKeysOptional(io: Io, gpa: Allocator, arena: Allocator, environ_mapmodels_cache.loadOverlay(io, arena, home);}var default_provider = keys.defaultProvider() catch return null;- const stale_saved_model: ?[]const u8 = null;+ var stale_saved_model: ?[]const u8 = null;var preferred_provider: ?[]const u8 = null;// `--model <name|provider>` pins the startup model (same resolution as /model).if (model_flag) |mname| pick: {@@ -328,12 +328,14 @@ pub fn resolveKeysOptional(io: Io, gpa: Allocator, arena: Allocator, environ_map};} else if (saved_model) |saved| {preferred_provider = saved.pid;- // The saved pair remains the user's route even when a dynamic catalog- // briefly omits it. If its credential disappeared, stop before a paid- // request instead of using another provider or a different model.+ // A catalog omission alone must not change the selected model. When+ // its credential is gone, retain the preference and let the existing+ // cross-provider consent gate control the fallback session.default_provider = savedProvider(keys, saved) catch |err| switch (err) {- error.UnknownProvider => std.process.fatal("saved provider '{s}' is unavailable — choose `--model <provider/model>` or see /models", .{saved.pid}),- error.MissingKey => std.process.fatal("no key/login for saved model '{s}/{s}' — sign in to {s} or choose `--model <provider/model>`", .{ saved.pid, saved.model, saved.pid }),+ error.UnknownProvider, error.MissingKey => fallback: {+ stale_saved_model = std.fmt.allocPrint(arena, "{s}/{s}", .{ saved.pid, saved.model }) catch saved.model;+ break :fallback default_provider;+ },};}return .{ .keys = @import("bench_priors.zig").noteKeysAtStartup(keys, io, arena, keys_cli.homeEnv(environ_map)), .default_provider = default_provider, .stale_saved_model = stale_saved_model, .preferred_provider = preferred_provider, .codex_account = codex_account, .model_catalog = model_catalog, .stored_keys_loaded = stored_keys_loaded };