Skip to content

graff — a fast agentic coding harness in Zig: multi-provider, MCP, workflows, DGM evolution loop, TS/Python SDKs

Python

acp: session/load names the real failure instead of blaming the save

justrach38416e9a3bb3
diff --git a/src/acp_session_load.zig b/src/acp_session_load.zig
index 05c54225..991f51c3 100644
--- a/src/acp_session_load.zig
+++ b/src/acp_session_load.zig
@@ -91,7 +91,7 @@ pub fn load(ctx: *anyopaque, arena: Allocator, w: *Io.Writer, req: proto.Request
return proto.writeError(w, req.id, engine.err_internal, @errorName(err));
};
session.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");
+ return proto.writeError(w, req.id, invalid_params, loadErrorText(arena, err, if (provider == .string) provider.string else ""));
};
// 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);
@@ -106,6 +106,28 @@ pub fn load(ctx: *anyopaque, arena: Allocator, w: *Io.Writer, req: proto.Request
try proto.writeAvailableCommands(w, live.session_id, proto.slashCommands());
}
+/// #1557: the save parsed and its fields are present, so a failure here is
+/// rarely an unreadable file. Name the real cause — a missing credential most
+/// of all, which the host would otherwise present as lost context.
+fn loadErrorText(arena: Allocator, err: anyerror, provider_id: []const u8) []const u8 {
+ if (err == error.FileNotFound) return "Unknown session ID in the selected workspace";
+ if (err == error.MissingKey and provider_id.len > 0)
+ return std.fmt.allocPrint(arena, "Saved session is intact, but its provider \"{s}\" has no credential in this process; run `graff login {s}` or `graff key set {s} <key>`, then load it again", .{ provider_id, provider_id, provider_id }) catch "Saved session is intact, but its provider has no credential in this process";
+ return std.fmt.allocPrint(arena, "Saved session could not be loaded ({s})", .{@errorName(err)}) catch "Saved session could not be loaded";
+}
+
+test "loadErrorText names a missing credential instead of blaming the save (#1557)" {
+ var arena_state = std.heap.ArenaAllocator.init(std.testing.allocator);
+ defer arena_state.deinit();
+ const a = arena_state.allocator();
+ const missing = loadErrorText(a, error.MissingKey, "deepseek");
+ try std.testing.expect(std.mem.indexOf(u8, missing, "is intact") != null);
+ try std.testing.expect(std.mem.indexOf(u8, missing, "graff login deepseek") != null);
+ try std.testing.expect(std.mem.indexOf(u8, missing, "could not be loaded") == null);
+ try std.testing.expectEqualStrings("Unknown session ID in the selected workspace", loadErrorText(a, error.FileNotFound, "x"));
+ try std.testing.expectEqualStrings("Saved session could not be loaded (BadSession)", loadErrorText(a, error.BadSession, "x"));
+}
+
fn replayFromStart(params: std.json.Value) bool {
const from = params.object.get("replayFrom") orelse return false;
if (from != .object) return false;
diff --git a/src/main.zig b/src/main.zig
index 53551369..0215143c 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -579,7 +579,7 @@ test { // ── Unit tests (`zig build test`): pull in tests from imported modu
_ = .{ @import("agent_ws_prewarm.zig"), @import("agent_ws_headers.zig") };
_ = .{ @import("http2_pool.zig"), @import("agent_stream_h2.zig"), @import("agent_stream_h2_transport_test.zig") }; // h2 stream path, and graff's request/response contract over the pinned http-zig
_ = @import("acp_preauth.zig"); // credential-free ACP loop must stay in the test root
- _ = .{ @import("acp_protocol.zig"), @import("acp_v2.zig"), @import("acp_v2_prompt.zig"), @import("acp_elicit.zig"), @import("hot_context.zig"), @import("history_translate.zig"), @import("mcp_notify.zig"), @import("mcp_wait.zig"), @import("mcp_pages.zig"), @import("mcp_mrtr.zig"), @import("ask_user_args.zig"), @import("mcp_add.zig"), @import("mcp_lazy.zig"), @import("mcp_share.zig"), @import("acp_room.zig"), @import("mcp_catalog.zig"), @import("mcp_watch.zig"), @import("acp_engine_test.zig"), @import("subagent_mimo_tests.zig"), @import("mimo_effort_tests.zig"), @import("gateway_picker_catalog.zig"), @import("ask_user_answers.zig"), @import("job_class.zig"), @import("startup_claim.zig") };
+ _ = .{ @import("acp_protocol.zig"), @import("acp_v2.zig"), @import("acp_v2_prompt.zig"), @import("acp_session_load.zig"), @import("acp_elicit.zig"), @import("hot_context.zig"), @import("history_translate.zig"), @import("mcp_notify.zig"), @import("mcp_wait.zig"), @import("mcp_pages.zig"), @import("mcp_mrtr.zig"), @import("ask_user_args.zig"), @import("mcp_add.zig"), @import("mcp_lazy.zig"), @import("mcp_share.zig"), @import("acp_room.zig"), @import("mcp_catalog.zig"), @import("mcp_watch.zig"), @import("acp_engine_test.zig"), @import("subagent_mimo_tests.zig"), @import("mimo_effort_tests.zig"), @import("gateway_picker_catalog.zig"), @import("ask_user_answers.zig"), @import("job_class.zig"), @import("startup_claim.zig") };
_ = @import("task_outcome.zig"); // goal-outcome telemetry events
_ = @import("learn_delete.zig"); // #303: its tests were dead until listed here
_ = .{ @import("additional_tests.zig"), @import("req_stats.zig"), @import("exact_reply.zig"), @import("rlm_order_tests.zig"), @import("async_tool_policy.zig"), @import("agent_async_tools.zig"), @import("request_usage_attempts.zig"), @import("learn_formal.zig") };