graff — a fast agentic coding harness in Zig: multi-provider, MCP, workflows, DGM evolution loop, TS/Python SDKs
Python
Honor selected model when loading an ACP session
Rach Pradhan5fcf151fda34
diff --git a/src/acp.zig b/src/acp.zigindex fca357e0..471b2eb7 100644--- a/src/acp.zig+++ b/src/acp.zig@@ -224,7 +224,7 @@ pub fn runAcpCommand(gpa: Allocator, io: Io, environ_map: anytype, root: *agent_}@import("acp_ask.zig").attach(io, gpa);defer @import("acp_ask.zig").detach();- var live: LiveTurn = .{ .root = root, .keys = keys, .out = out, .inbox = &inbox };+ var live: LiveTurn = .{ .root = root, .keys = keys, .out = out, .inbox = &inbox, .model_override = if (flags.model_flag != null) root.provider else null };var d: Dispatch = .{.turn = LiveTurn.run,.error_message = LiveTurn.errorMessage,diff --git a/src/acp_live_turn.zig b/src/acp_live_turn.zigindex c22c117c..0dfc2dad 100644--- a/src/acp_live_turn.zig+++ b/src/acp_live_turn.zig@@ -26,6 +26,8 @@ pub const LiveTurn = struct {prev_prompt_fp: [16]u8 = @splat(0),inbox: ?*@import("acp_inbox.zig").Inbox = null,dispatch: ?*@import("acp_engine.zig").Dispatch = null,+ /// Launch `--model`: outranks a loaded session's saved model, as on CLI resume.+ model_override: ?provider_mod.Provider = null,pub fn errorMessage(ctx: *anyopaque, err: anyerror) []const u8 {const self: *LiveTurn = @ptrCast(@alignCast(ctx));diff --git a/src/acp_session_load.zig b/src/acp_session_load.zigindex 5624a40f..8358f41b 100644--- a/src/acp_session_load.zig+++ b/src/acp_session_load.zig@@ -87,6 +87,8 @@ pub fn load(ctx: *anyopaque, arena: Allocator, w: *Io.Writer, req: proto.Requestsession.loadSession(live.root, live.keys, arena, sid) catch |err| {return proto.writeError(w, req.id, invalid_params, if (err == error.FileNotFound) "Unknown session ID in the selected workspace" else "Saved session could not be loaded");};+ // Same precedence as CLI resume: the host respawns with --model to switch.+ if (live.model_override) |p| @import("session_branch.zig").applyModelOverride(live.root, arena, p);live.root.session_name = try arena.dupe(u8, sid);live.session_id = live.root.session_name;d.session_id = live.session_id;diff --git a/src/session_branch.zig b/src/session_branch.zigindex 9457bddd..fe18a7c7 100644--- a/src/session_branch.zig+++ b/src/session_branch.zig@@ -76,10 +76,7 @@ pub fn restore(root: *agent_mod.Agent, keys: *provider_mod.Keys, arena: Allocato// --goal flag gets below. `keep_context` still decides whether the restored// conversation is translated or dropped across a wire-format change,// exactly as a mid-session /model does.- if (model_override) |p| {- _ = providers.applyProviderInner(root, arena, p, false) catch {};- root.fallback_active = false; // an explicit choice, never a repaired credential- }+ if (model_override) |p| applyModelOverride(root, arena, p);root.session_name = branch orelse source;if (branch) |dest| {root.session_parent = source;@@ -102,6 +99,13 @@ pub fn restore(root: *agent_mod.Agent, keys: *provider_mod.Keys, arena: Allocato};}+/// Shared by CLI resume and ACP session/load so a host's --model respawn lands+/// on the same model through either path.+pub fn applyModelOverride(root: *agent_mod.Agent, arena: Allocator, p: provider_mod.Provider) void {+ _ = providers.applyProviderInner(root, arena, p, false) catch {};+ root.fallback_active = false; // an explicit choice, never a repaired credential+}+test "--model outranks the model a resumed session saved" {const gpa = std.testing.allocator;var arena_state = std.heap.ArenaAllocator.init(gpa);