graff — a fast agentic coding harness in Zig: multi-provider, MCP, workflows, DGM evolution loop, TS/Python SDKs
Python
login: chatgpt is the codex login on the command line too
justracha3f6a4216628
diff --git a/README.md b/README.mdindex 20d461c2..3cd18d53 100644--- a/README.md+++ b/README.md@@ -55,7 +55,7 @@ the newest beta. Both check the download against the release's `SHA256SUMS`.<summary>Other sign-ins, installing from a checkout, and editors</summary>```sh-graff login codex # ChatGPT account+graff login chatgpt # ChatGPT account (same as: graff login codex)graff login kimigraff login zaigraff login xai@@ -161,7 +161,7 @@ sandbox MCP.```graff [flags] interactive sessiongraff -p "prompt" one question (answer on stdout)-graff login [codegraff|codex|kimi|xai|zai]+graff login [codegraff|chatgpt|kimi|xai|zai] (codex = chatgpt)graff key set <provider> <key>graff mcp add <name | url | @scope/pkg | uvx:pkg | json>graff mcp add <name> -- <cmd>diff --git a/src/args.zig b/src/args.zigindex 11e02ed6..4742551e 100644--- a/src/args.zig+++ b/src/args.zig@@ -261,10 +261,15 @@ pub fn parse(init: std.process.Init) !Flags {}}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.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});+ 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");+ }}// One-shot print mode: `harness -p "prompt"` or a bare positional prompt@@ -311,6 +316,31 @@ pub fn parse(init: std.process.Init) !Flags {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";+ 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.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 --git a/src/commands_model.zig b/src/commands_model.zigindex 8c310217..ec203ff1 100644--- a/src/commands_model.zig+++ b/src/commands_model.zig@@ -352,7 +352,7 @@ pub fn tryHandle(root: *Agent, keys: *Keys, arena: Allocator, line: []const u8,} else false;const login_targets = [_]PickItem{.{ .name = "codegraff", .desc = "free codegraff key (device-code OAuth)" },- .{ .name = "codex", .desc = "ChatGPT / OpenAI sign-in (alias: oai)" },+ .{ .name = "codex", .desc = "ChatGPT account sign-in (also: chatgpt, openai)" },.{ .name = "kimi", .desc = "Kimi Code sign-in (device-code OAuth)" },.{ .name = "xai", .desc = "Grok / SuperGrok sign-in (device-code OAuth)" },.{ .name = "zai", .desc = "Z.AI Coding Plan sign-in (CLI OAuth)" },@@ -370,13 +370,8 @@ pub fn tryHandle(root: *Agent, keys: *Keys, arena: Allocator, line: []const u8,return true;}}- // codex is the OpenAI/ChatGPT login; accept the natural aliases.- 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 (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.+ target = @import("args.zig").loginTarget(target) orelse target;const home = root.home;try out.flush(); // hand stdout to the login flow's own writer@@ -417,7 +412,7 @@ pub fn tryHandle(root: *Agent, keys: *Keys, arena: Allocator, line: []const u8,try out.flush();return true;}- try out.print("can't log into '{s}' \xe2\x80\x94 try /login codegraff | codex | kimi | xai | zai (others: /key <provider> <key>)\n", .{target});+ 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.flush();return true;}diff --git a/src/startup.zig b/src/startup.zigindex ecff8cc5..4f92682a 100644--- a/src/startup.zig+++ b/src/startup.zig@@ -312,9 +312,10 @@ pub fn runSubcommand(io: Io, gpa: Allocator, arena: Allocator, init: std.processreturn 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);