graff — a fast agentic coding harness in Zig: multi-provider, MCP, workflows, DGM evolution loop, TS/Python SDKs
Python
Merge branch 'feat/chat-gpt-new' into release/v0.0.302.11
justrache6de2df719a4
diff --cc src/args.zigindex 4742551e,1fe15a42..61eb28d3--- a/src/args.zig+++ b/src/args.zig@@@ -261,15 -262,11 +262,16 @@@ pub fn parse(init: std.process.Init) !F}}if (flags.positionals.items.len > 0 and std.mem.eql(u8, flags.positionals.items[0], "login")) flags.login_flag = true;- if (flags.positionals.items.len > 1 and std.mem.eql(u8, flags.positionals.items[1], "codex")) flags.codex_login = true;- if (flags.positionals.items.len > 1 and std.mem.eql(u8, flags.positionals.items[1], "kimi")) flags.kimi_login = true;- if (flags.positionals.items.len > 1 and std.mem.eql(u8, flags.positionals.items[1], "xai")) flags.xai_login = true;- if (flags.positionals.items.len > 1 and @import("oauth_zai.zig").isLoginName(flags.positionals.items[1])) flags.zai_login = true;- if (flags.positionals.items.len > 1 and @import("oauth_chatgpt.zig").isLoginName(flags.positionals.items[1])) flags.chatgpt_login = true;+ if (flags.login_flag and flags.positionals.items.len > 1) {+ const name = flags.positionals.items[1];+ const target = loginTarget(name) orelse- std.process.fatal("unknown login '{s}' — graff login [codegraff|chatgpt|kimi|xai|zai]", .{name});++ std.process.fatal("unknown login '{s}' — graff login [codegraff|chatgpt|chatgpt-new|kimi|xai|zai]", .{name});+ flags.codex_login = std.mem.eql(u8, target, "codex");+ flags.kimi_login = std.mem.eql(u8, target, "kimi");+ flags.xai_login = std.mem.eql(u8, target, "xai");+ flags.zai_login = std.mem.eql(u8, target, "zai");++ flags.chatgpt_login = std.mem.eql(u8, target, "chatgpt-new");+ }}// One-shot print mode: `harness -p "prompt"` or a bare positional prompt@@@ -316,31 -313,6 +318,33 @@@return flags;}+/// The provider a login name means, for `graff login <name>` and `/login+/// <name>` alike. codex is the ChatGPT account login, so the names people+/// reach for (chatgpt, openai, gpt, oai) land there too. Null: not a login.+pub fn loginTarget(name: []const u8) ?[]const u8 {+ const aliases = [_][2][]const u8{+ .{ "codex", "codex" }, .{ "chatgpt", "codex" }, .{ "openai", "codex" }, .{ "gpt", "codex" },+ .{ "oai", "codex" }, .{ "codegraff", "codegraff" }, .{ "graff", "codegraff" }, .{ "kimi", "kimi" },+ .{ "xai", "xai" }, .{ "grok", "xai" },+ };+ for (aliases) |pair| if (std.ascii.eqlIgnoreCase(name, pair[0])) return pair[1];+ if (@import("oauth_zai.zig").isLoginName(name)) return "zai";++ if (@import("oauth_chatgpt.zig").isLoginName(name)) return "chatgpt-new"; // opt-in (ADR 0221)+ return null;+}++test "loginTarget: chatgpt and codex are one login; unknown names are not logins" {+ for ([_][]const u8{ "codex", "chatgpt", "ChatGPT", "openai", "gpt", "oai" }) |name|+ try std.testing.expectEqualStrings("codex", loginTarget(name).?);+ try std.testing.expectEqualStrings("codegraff", loginTarget("graff").?);+ try std.testing.expectEqualStrings("xai", loginTarget("grok").?);+ try std.testing.expectEqualStrings("kimi", loginTarget("kimi").?);+ try std.testing.expectEqualStrings("zai", loginTarget("zai").?);++ try std.testing.expectEqualStrings("chatgpt-new", loginTarget("chatgpt-new").?);+ try std.testing.expect(loginTarget("chatgptt") == null);+ try std.testing.expect(loginTarget("") == null);+}+test "tui and repl are pager subcommands, not one-shot prompts" {var tui_pos = std.ArrayList([]const u8).empty;defer tui_pos.deinit(std.testing.allocator);diff --cc src/commands_model.zigindex ec203ff1,dded546e..7dced15d--- a/src/commands_model.zig+++ b/src/commands_model.zig@@@ -370,8 -370,15 +370,9 @@@ pub fn tryHandle(root: *Agent, keys: *Kreturn true;}}- // Same names as `graff login`: chatgpt, openai, gpt and oai are the codex login.- // codex is the OpenAI/ChatGPT login; accept the natural aliases. The- // plan's new sign-in for open-source apps is opt-in (ADR 0221).- if (std.mem.eql(u8, target, "oai") or std.mem.eql(u8, target, "openai") or- std.mem.eql(u8, target, "chatgpt") or std.mem.eql(u8, target, "gpt"))- target = "codex";- if (@import("oauth_chatgpt.zig").isLoginName(target)) target = "chatgpt-new";- if (std.mem.eql(u8, target, "graff")) target = "codegraff";- if (std.mem.eql(u8, target, "grok")) target = "xai";- if (@import("oauth_zai.zig").isLoginName(target)) target = "zai";++ // Same names as `graff login`: chatgpt, openai, gpt and oai are the codex login;++ // chatgpt-new is the opt-in plan sign-in (ADR 0221).+ target = @import("args.zig").loginTarget(target) orelse target;const home = root.home;try out.flush(); // hand stdout to the login flow's own writer@@@ -412,7 -425,7 +419,7 @@@try out.flush();return true;}- try out.print("can't log into '{s}' \xe2\x80\x94 try /login codegraff | chatgpt | kimi | xai | zai (others: /key <provider> <key>)\n", .{target});- try out.print("can't log into '{s}' \xe2\x80\x94 try /login codegraff | codex | chatgpt-new | kimi | xai | zai (others: /key <provider> <key>)\n", .{target});++ try out.print("can't log into '{s}' \xe2\x80\x94 try /login codegraff | chatgpt | chatgpt-new | kimi | xai | zai (others: /key <provider> <key>)\n", .{target});try out.flush();return true;}diff --cc src/startup.zigindex 4f92682a,dddc7fb2..4cafa2eb--- a/src/startup.zig+++ b/src/startup.zig@@@ -312,13 -312,21 +312,22 @@@ pub fn runSubcommand(io: Io, gpa: Allocreturn true;}- // `harness login [codex] [--refresh]`: OAuth login. Default target is+ // `harness login [name] [--refresh]`: OAuth login. Default target is// codegraff (device-code flow, writes ~/.simple-harness-codegraff.json);- // `codex` (or --refresh) runs the ChatGPT PKCE/refresh flow → ~/.codex/auth.json.+ // `chatgpt` or `codex` (or --refresh) runs the ChatGPT PKCE/refresh flow →+ // ~/.codex/auth.json. args.loginTarget owns the names.if (flags.login_flag) {const home = keys_cli.homeEnv(init.environ_map) orelse std.process.fatal("no HOME/USERPROFILE", .{});- if (flags.xai_login) try oauth.xaiLogin(io, gpa, arena, home) else if (flags.kimi_login) try oauth.kimiLogin(io, gpa, arena, home) else if (flags.zai_login) try oauth.zaiLogin(io, gpa, arena, home) else if (flags.codex_login or flags.refresh_flag) try oauth.codexLogin(io, gpa, arena, home, flags.refresh_flag) else try oauth.codegraffLogin(io, gpa, arena, home);+ if (flags.chatgpt_login) try @import("oauth_chatgpt.zig").login(io, gpa, arena, home) else if (flags.xai_login) try oauth.xaiLogin(io, gpa, arena, home) else if (flags.kimi_login) try oauth.kimiLogin(io, gpa, arena, home) else if (flags.zai_login) try oauth.zaiLogin(io, gpa, arena, home) else if (flags.codex_login or flags.refresh_flag) try oauth.codexLogin(io, gpa, arena, home, flags.refresh_flag) else try oauth.codegraffLogin(io, gpa, arena, home);+ return true;+ }++ // `graff logout chatgpt-new`: revoke the plan's refresh token, clear the tokens.+ if (flags.positionals.items.len > 0 and std.mem.eql(u8, flags.positionals.items[0], "logout")) {+ const home = keys_cli.homeEnv(init.environ_map) orelse std.process.fatal("no HOME/USERPROFILE", .{});+ const target = if (flags.positionals.items.len > 1) flags.positionals.items[1] else "";+ if (!@import("oauth_chatgpt.zig").isLoginName(target)) std.process.fatal("graff logout supports: chatgpt-new", .{});+ try @import("oauth_chatgpt.zig").logout(io, gpa, arena, home);return true;}