xonecas.io
79113
Ma

mini-coding-agent / commit 2a49c2e

chore: refactor types.zig, it's not idiomatic zig

That was a consequence of years writing typescript, sorry zig community

xonecas2026-10-10 2a49c2e1fab95919a1b888e0719fd8fc7a0880dd parent b4124f2

18 files changed

src/agent.zig+11−10
@@ -1,5 +1,6 @@
11 const std = @import("std");
2-const types = @import("types.zig");
2+const message_mod = @import("message.zig");
3+const models = @import("models.zig");
34 const api = @import("api.zig");
45 const platform = @import("platform.zig");
56 const tools = @import("tools.zig");
@@ -18,7 +19,7 @@ pub const Event = union(enum) {
1819 tool_call: struct { name: []const u8, arguments: []const u8 },
1920 tool_output: []const u8,
2021 tool_result: struct { name: []const u8, text: []const u8, is_error: bool, diffs: []const tools.FileDiff, body: ?[]const u8 },
21- message: *types.AssistantMessage,
22+ message: *message_mod.AssistantMessage,
2223 no_model,
2324 err: []const u8,
2425 cancelled,
@@ -53,7 +54,7 @@ pub const Interaction = struct {
5354
5455 pub const Options = struct {
5556 a: std.mem.Allocator,
56- model: ?*const types.Model,
57+ model: ?*const models.Model,
5758 system_prompt: []const u8,
5859 loaded: struct { agent_files: usize = 0, skills: usize = 0 } = .{},
5960 tools_json: []const u8,
@@ -105,15 +106,15 @@ fn onToolOutput(ctx: *anyopaque, chunk: []const u8) void {
105106 listener.emit(.{ .tool_output = chunk });
106107 }
107108
108-fn pushMessage(opts: Options, messages: *std.ArrayList(types.Message), message: types.Message) !void {
109+fn pushMessage(opts: Options, messages: *std.ArrayList(message_mod.Message), message: message_mod.Message) !void {
109110 lockMessages(opts);
110111 defer unlockMessages(opts);
111112 try messages.append(opts.a, message);
112113 }
113114
114-fn steer(opts: Options, messages: *std.ArrayList(types.Message), content: []const u8) !void {
115+fn steer(opts: Options, messages: *std.ArrayList(message_mod.Message), content: []const u8) !void {
115116 if (content.len == 0) return;
116- const message = types.Message{ .user = .{ .content = content, .timestamp = time.nowMs() } };
117+ const message = message_mod.Message{ .user = .{ .content = content, .timestamp = time.nowMs() } };
117118 try pushMessage(opts, messages, message);
118119 try opts.session.appendMessage(opts.a, message);
119120 }
@@ -137,12 +138,12 @@ fn cancelled(opts: Options, listener: Listener) bool {
137138
138139 const Run = struct {
139140 opts: Options,
140- messages: *std.ArrayList(types.Message),
141+ messages: *std.ArrayList(message_mod.Message),
141142 interaction: ?Interaction,
142143 listener: Listener,
143144 };
144145
145-pub fn runTurn(opts: Options, messages: *std.ArrayList(types.Message), interaction: ?Interaction, listener: Listener) void {
146+pub fn runTurn(opts: Options, messages: *std.ArrayList(message_mod.Message), interaction: ?Interaction, listener: Listener) void {
146147 const run = Run{ .opts = opts, .messages = messages, .interaction = interaction, .listener = listener };
147148
148149 const model = opts.model orelse {
@@ -184,7 +185,7 @@ pub fn runTurn(opts: Options, messages: *std.ArrayList(types.Message), interacti
184185 if (cancelled(opts, listener)) return;
185186 listener.emit(.{ .phase = .{ .phase = .waiting_model } });
186187 var stream_ctx = StreamCtx{ .listener = listener };
187- const assistant = opts.a.create(types.AssistantMessage) catch {
188+ const assistant = opts.a.create(message_mod.AssistantMessage) catch {
188189 listener.emit(.{ .err = "out of memory" });
189190 return;
190191 };
@@ -266,7 +267,7 @@ pub fn runTurn(opts: Options, messages: *std.ArrayList(types.Message), interacti
266267 });
267268 }
268269
269- const tool_message = types.Message{ .tool_result = .{
270+ const tool_message = message_mod.Message{ .tool_result = .{
270271 .tool_call_id = call.id,
271272 .tool_name = call.name,
272273 .text = if (result) |r| r.text else "aborted",
src/api.zig+12−13
@@ -1,5 +1,6 @@
11 const std = @import("std");
2-const types = @import("types.zig");
2+const message_mod = @import("message.zig");
3+const models = @import("models.zig");
34 const http = @import("http.zig");
45 const time = @import("time.zig");
56
@@ -8,7 +9,7 @@ pub const Event = union(enum) {
89 reasoning: []const u8,
910 tool_start: []const u8,
1011 tool_args: usize,
11- tool_call: types.ToolCall,
12+ tool_call: message_mod.ToolCall,
1213 };
1314
1415 pub const Sink = struct {
@@ -20,8 +21,6 @@ pub const Sink = struct {
2021 }
2122 };
2223
23-pub const Raw = types.Raw;
24-
2524 pub const ErrField = struct {
2625 message: ?[]const u8 = null,
2726
@@ -57,10 +56,10 @@ pub const Count = struct {
5756 pub const Request = struct {
5857 pers: std.mem.Allocator,
5958 scratch: std.mem.Allocator,
60- model: *const types.Model,
59+ model: *const models.Model,
6160 system_prompt: []const u8,
6261 tools_json: []const u8,
63- messages: []const types.Message,
62+ messages: []const message_mod.Message,
6463 effort: []const u8,
6564 session_id: ?[]const u8,
6665 cancel: *const std.atomic.Value(bool),
@@ -84,7 +83,7 @@ pub fn run(
8483 req: Request,
8584 sink: Sink,
8685 finalize: *const fn (st: *State) std.mem.Allocator.Error!void,
87-) std.mem.Allocator.Error!types.AssistantMessage {
86+) std.mem.Allocator.Error!message_mod.AssistantMessage {
8887 var msg = newAssistant(req);
8988
9089 var arena = std.heap.ArenaAllocator.init(req.scratch);
@@ -142,7 +141,7 @@ pub fn blockAt(comptime T: type, list: *std.ArrayList(T), a: std.mem.Allocator,
142141 return &list.items[idx];
143142 }
144143
145-pub fn stream(req: Request, sink: Sink) std.mem.Allocator.Error!types.AssistantMessage {
144+pub fn stream(req: Request, sink: Sink) std.mem.Allocator.Error!message_mod.AssistantMessage {
146145 if (std.mem.eql(u8, req.model.api, "openai-completions")) {
147146 return @import("api/openai_completions.zig").stream(req, sink);
148147 }
@@ -161,7 +160,7 @@ pub fn stream(req: Request, sink: Sink) std.mem.Allocator.Error!types.AssistantM
161160 return msg;
162161 }
163162
164-fn newAssistant(req: Request) types.AssistantMessage {
163+fn newAssistant(req: Request) message_mod.AssistantMessage {
165164 return .{
166165 .content = .empty,
167166 .api = req.model.api,
@@ -198,7 +197,7 @@ fn wireHeaders(a: std.mem.Allocator, req: Request, wire: Wire) ![]http.Header {
198197 return list.toOwnedSlice(a);
199198 }
200199
201-fn post(req: Request, url: []const u8, hdrs: []const http.Header, body: []const u8, handler: http.SseHandler, msg: *types.AssistantMessage) std.mem.Allocator.Error!bool {
200+fn post(req: Request, url: []const u8, hdrs: []const http.Header, body: []const u8, handler: http.SseHandler, msg: *message_mod.AssistantMessage) std.mem.Allocator.Error!bool {
202201 var err_body: ?[]const u8 = null;
203202 http.postSse(req.scratch, url, hdrs, body, handler, req.cancel, &err_body) catch |e| {
204203 if (e == error.OutOfMemory) return error.OutOfMemory;
@@ -243,7 +242,7 @@ pub const Call = struct {
243242 }
244243 };
245244
246-pub fn appendCalls(msg: *types.AssistantMessage, sink: Sink, a: std.mem.Allocator, calls: []const Call, failed: bool) !bool {
245+pub fn appendCalls(msg: *message_mod.AssistantMessage, sink: Sink, a: std.mem.Allocator, calls: []const Call, failed: bool) !bool {
247246 if (failed) return false;
248247 var any = false;
249248 for (calls) |call| {
@@ -275,12 +274,12 @@ pub fn keepString(slot: *?[]const u8, a: std.mem.Allocator, value: ?[]const u8)
275274 slot.* = try a.dupe(u8, v);
276275 }
277276
278-pub fn appendParts(msg: *types.AssistantMessage, a: std.mem.Allocator, thinking: []const u8, signature: ?[]const u8, text: []const u8) !void {
277+pub fn appendParts(msg: *message_mod.AssistantMessage, a: std.mem.Allocator, thinking: []const u8, signature: ?[]const u8, text: []const u8) !void {
279278 if (thinking.len > 0) try msg.content.append(a, .{ .thinking = .{ .text = thinking, .signature = signature } });
280279 if (text.len > 0) try msg.content.append(a, .{ .text = text });
281280 }
282281
283-pub fn finishUsage(msg: *types.AssistantMessage, model: *const types.Model, usage: types.Usage) void {
282+pub fn finishUsage(msg: *message_mod.AssistantMessage, model: *const models.Model, usage: message_mod.Usage) void {
284283 var u = usage;
285284 if (u.total_tokens == 0) u.total_tokens = u.input + u.output + u.cache_read + u.cache_write;
286285 const per = struct {
src/api/anthropic_messages.zig+8−7
@@ -1,6 +1,7 @@
11 const std = @import("std");
22 const api = @import("../api.zig");
3-const types = @import("../types.zig");
3+const message_mod = @import("../message.zig");
4+const json = @import("../json.zig");
45
56 const anthropic_version = "2023-06-01";
67
@@ -27,7 +28,7 @@ const ToolUseBlock = struct {
2728 type: []const u8 = "tool_use",
2829 id: []const u8,
2930 name: []const u8,
30- input: api.Raw,
31+ input: json.Raw,
3132 };
3233
3334 const ResultContent = union(enum) {
@@ -118,7 +119,7 @@ fn budgetFor(effort: []const u8) u64 {
118119 return 0;
119120 }
120121
121-fn resultContent(a: std.mem.Allocator, t: types.ToolResultMessage) !ToolResultBlock.Content {
122+fn resultContent(a: std.mem.Allocator, t: message_mod.ToolResultMessage) !ToolResultBlock.Content {
122123 if (t.images.len == 0) return .{ .text = t.text };
123124 var parts: std.ArrayList(ResultContent) = .empty;
124125 try parts.append(a, .{ .text = .{ .text = t.text } });
@@ -128,7 +129,7 @@ fn resultContent(a: std.mem.Allocator, t: types.ToolResultMessage) !ToolResultBl
128129 return .{ .parts = parts.items };
129130 }
130131
131-fn assistantBlocks(a: std.mem.Allocator, am: *const types.AssistantMessage) ![]const AssistantBlock {
132+fn assistantBlocks(a: std.mem.Allocator, am: *const message_mod.AssistantMessage) ![]const AssistantBlock {
132133 var blocks: std.ArrayList(AssistantBlock) = .empty;
133134 for (am.content.items) |block| switch (block) {
134135 .text => |t| try blocks.append(a, .{ .text = .{ .text = t } }),
@@ -264,10 +265,10 @@ const State = struct {
264265 req: api.Request,
265266 sink: api.Sink,
266267 arena: *std.heap.ArenaAllocator,
267- msg: *types.AssistantMessage,
268+ msg: *message_mod.AssistantMessage,
268269 blocks: std.ArrayList(Block) = .empty,
269270 calls: std.ArrayList(api.Call) = .empty,
270- usage: types.Usage = .{},
271+ usage: message_mod.Usage = .{},
271272 stop_reason: ?[]const u8 = null,
272273 stream_error: ?[]const u8 = null,
273274 failed: bool = false,
@@ -415,6 +416,6 @@ const wire = api.Wire{
415416 .build_body = buildBody,
416417 };
417418
418-pub fn stream(req: api.Request, sink: api.Sink) std.mem.Allocator.Error!types.AssistantMessage {
419+pub fn stream(req: api.Request, sink: api.Sink) std.mem.Allocator.Error!message_mod.AssistantMessage {
419420 return api.run(State, Chunk, wire, req, sink, finalize);
420421 }
src/api/google_generative_ai.zig+8−7
@@ -1,12 +1,13 @@
11 const std = @import("std");
22 const api = @import("../api.zig");
3-const types = @import("../types.zig");
3+const message_mod = @import("../message.zig");
4+const json = @import("../json.zig");
45
56 const Part = struct {
67 text: ?[]const u8 = null,
78 thought: ?bool = null,
89 inlineData: ?struct { mimeType: []const u8, data: []const u8 } = null,
9- functionCall: ?struct { name: []const u8, args: api.Raw } = null,
10+ functionCall: ?struct { name: []const u8, args: json.Raw } = null,
1011 thoughtSignature: ?[]const u8 = null,
1112 functionResponse: ?struct {
1213 name: []const u8,
@@ -38,7 +39,7 @@ fn textPart(text: []const u8) Part {
3839 return .{ .text = text };
3940 }
4041
41-fn contentParts(a: std.mem.Allocator, msg: types.Message) ![]const Part {
42+fn contentParts(a: std.mem.Allocator, msg: message_mod.Message) ![]const Part {
4243 switch (msg) {
4344 .user => |u| {
4445 const parts = try a.alloc(Part, 1);
@@ -68,7 +69,7 @@ fn contentParts(a: std.mem.Allocator, msg: types.Message) ![]const Part {
6869 }
6970 }
7071
71-fn toolResultContent(a: std.mem.Allocator, run: []const types.Message) !Content {
72+fn toolResultContent(a: std.mem.Allocator, run: []const message_mod.Message) !Content {
7273 const parts = try a.alloc(Part, run.len);
7374 for (run, parts) |msg, *part| {
7475 const t = msg.tool_result;
@@ -184,12 +185,12 @@ const State = struct {
184185 req: api.Request,
185186 sink: api.Sink,
186187 arena: *std.heap.ArenaAllocator,
187- msg: *types.AssistantMessage,
188+ msg: *message_mod.AssistantMessage,
188189 text: std.ArrayList(u8) = .empty,
189190 reasoning: std.ArrayList(u8) = .empty,
190191 signature: ?[]const u8 = null,
191192 calls: std.ArrayList(api.Call) = .empty,
192- usage: types.Usage = .{},
193+ usage: message_mod.Usage = .{},
193194 finish: ?[]const u8 = null,
194195 stream_error: ?[]const u8 = null,
195196 failed: bool = false,
@@ -275,6 +276,6 @@ const wire = api.Wire{
275276 .build_body = buildBody,
276277 };
277278
278-pub fn stream(req: api.Request, sink: api.Sink) std.mem.Allocator.Error!types.AssistantMessage {
279+pub fn stream(req: api.Request, sink: api.Sink) std.mem.Allocator.Error!message_mod.AssistantMessage {
279280 return api.run(State, Chunk, wire, req, sink, finalize);
280281 }
src/api/openai_completions.zig+9−9
@@ -1,6 +1,6 @@
11 const std = @import("std");
22 const api = @import("../api.zig");
3-const types = @import("../types.zig");
3+const message_mod = @import("../message.zig");
44
55 const ToolCall = struct {
66 id: []const u8,
@@ -66,13 +66,13 @@ const Body = struct {
6666 tools: ?api.Tools = null,
6767 };
6868
69-fn toolCall(block: types.ContentBlock) ?ToolCall {
69+fn toolCall(block: message_mod.ContentBlock) ?ToolCall {
7070 if (block != .tool_call) return null;
7171 const c = block.tool_call;
7272 return .{ .id = c.id, .function = .{ .name = c.name, .arguments = api.argumentsOrObject(c.arguments) } };
7373 }
7474
75-fn imageParts(a: std.mem.Allocator, run: []const types.Message) ![]const Part {
75+fn imageParts(a: std.mem.Allocator, run: []const message_mod.Message) ![]const Part {
7676 var parts: std.ArrayList(Part) = .empty;
7777 try parts.append(a, .{ .text = .{ .text = "Attached image(s) from tool result:" } });
7878 for (run) |msg| {
@@ -120,7 +120,7 @@ fn buildMessages(a: std.mem.Allocator, req: api.Request) ![]const Message {
120120 if (block == .thinking) try thinking.appendSlice(a, block.thinking.text);
121121 }
122122 try out.append(a, .{ .assistant = .{
123- .content = try types.assistantText(a, am),
123+ .content = try am.text(a),
124124 .reasoning_content = if (thinking.items.len > 0 or reasoning_on) thinking.items else null,
125125 .tool_calls = if (calls.items.len > 0) calls.items else null,
126126 } });
@@ -198,12 +198,12 @@ const State = struct {
198198 req: api.Request,
199199 sink: api.Sink,
200200 arena: *std.heap.ArenaAllocator,
201- msg: *types.AssistantMessage,
201+ msg: *message_mod.AssistantMessage,
202202 text: std.ArrayList(u8) = .empty,
203203 thinking: std.ArrayList(u8) = .empty,
204204 signature: ?[]const u8 = null,
205205 calls: std.ArrayList(api.Call) = .empty,
206- usage: types.Usage = .{},
206+ usage: message_mod.Usage = .{},
207207 finish_reason: ?[]const u8 = null,
208208 stream_error: ?[]const u8 = null,
209209 failed: bool = false,
@@ -269,11 +269,11 @@ fn handleDelta(st: *State, delta: Chunk.Delta) !void {
269269 }
270270 }
271271
272-fn usageOf(u: Chunk.Usage) types.Usage {
272+fn usageOf(u: Chunk.Usage) message_mod.Usage {
273273 var cache_read = if (u.prompt_tokens_details) |d| d.cached_tokens.value else 0;
274274 if (cache_read == 0) cache_read = u.cached_tokens.value;
275275 const cache_write = if (u.prompt_tokens_details) |d| d.cache_write_tokens.value else 0;
276- var usage = types.Usage{
276+ var usage = message_mod.Usage{
277277 .input = u.prompt_tokens.value -| cache_read -| cache_write,
278278 .output = u.completion_tokens.value,
279279 .cache_read = cache_read,
@@ -322,6 +322,6 @@ const wire = api.Wire{
322322 .build_body = buildBody,
323323 };
324324
325-pub fn stream(req: api.Request, sink: api.Sink) std.mem.Allocator.Error!types.AssistantMessage {
325+pub fn stream(req: api.Request, sink: api.Sink) std.mem.Allocator.Error!message_mod.AssistantMessage {
326326 return api.run(State, Chunk, wire, req, sink, finalize);
327327 }
src/api/openai_responses.zig+4−4
@@ -1,6 +1,6 @@
11 const std = @import("std");
22 const api = @import("../api.zig");
3-const types = @import("../types.zig");
3+const message_mod = @import("../message.zig");
44
55 const InputItem = struct {
66 type: []const u8,
@@ -139,12 +139,12 @@ const State = struct {
139139 req: api.Request,
140140 sink: api.Sink,
141141 arena: *std.heap.ArenaAllocator,
142- msg: *types.AssistantMessage,
142+ msg: *message_mod.AssistantMessage,
143143 text: std.ArrayList(u8) = .empty,
144144 reasoning: std.ArrayList(u8) = .empty,
145145 encrypted: ?[]const u8 = null,
146146 calls: std.ArrayList(api.Call) = .empty,
147- usage: types.Usage = .{},
147+ usage: message_mod.Usage = .{},
148148 status: ?[]const u8 = null,
149149 incomplete: ?[]const u8 = null,
150150 stream_error: ?[]const u8 = null,
@@ -312,6 +312,6 @@ const wire = api.Wire{
312312 .build_body = buildBody,
313313 };
314314
315-pub fn stream(req: api.Request, sink: api.Sink) std.mem.Allocator.Error!types.AssistantMessage {
315+pub fn stream(req: api.Request, sink: api.Sink) std.mem.Allocator.Error!message_mod.AssistantMessage {
316316 return api.run(State, Chunk, wire, req, sink, finalize);
317317 }
src/config.zig+1−2
@@ -1,7 +1,6 @@
11 const std = @import("std");
22 const platform = @import("platform.zig");
33 const filesystem = @import("filesystem.zig");
4-const theme = @import("tui/theme.zig");
54
65 pub const ToolName = enum { edit, read, bash };
76
@@ -183,7 +182,7 @@ fn defaults(a: std.mem.Allocator) !Config {
183182 .provider = null,
184183 .model = null,
185184 .thinking_effort = null,
186- .theme = theme.default_id,
185+ .theme = "tokyonight",
187186 .program_status = true,
188187 .custom_providers = &.{},
189188 .snapshot_ignore_dirs = &.{},
src/headless.zig+4−4
@@ -2,7 +2,7 @@ const std = @import("std");
22 const platform = @import("platform.zig");
33 const time = @import("time.zig");
44 const config = @import("config.zig");
5-const types = @import("types.zig");
5+const message_mod = @import("message.zig");
66 const agent = @import("agent.zig");
77
88 var cancel = std.atomic.Value(bool).init(false);
@@ -35,8 +35,8 @@ fn printEvent(ctx: *anyopaque, event: agent.Event) void {
3535 }
3636
3737 pub fn run(a: std.mem.Allocator, prompt_text: []const u8, opts: agent.Options) u8 {
38- var messages: std.ArrayList(types.Message) = .empty;
39- const user = types.Message{ .user = .{ .content = prompt_text, .timestamp = time.nowMs() } };
38+ var messages: std.ArrayList(message_mod.Message) = .empty;
39+ const user = message_mod.Message{ .user = .{ .content = prompt_text, .timestamp = time.nowMs() } };
4040 messages.append(a, user) catch {
4141 platform.printErr("[error] out of memory\n", .{});
4242 return 1;
@@ -66,7 +66,7 @@ pub fn run(a: std.mem.Allocator, prompt_text: []const u8, opts: agent.Options) u
6666 i -= 1;
6767 if (messages.items[i] == .assistant) break messages.items[i].assistant;
6868 } else return 0;
69- const text = types.assistantText(a, last) catch {
69+ const text = last.text(a) catch {
7070 platform.printErr("[error] out of memory\n", .{});
7171 return 1;
7272 };
src/json.zig+11−0
@@ -0,0 +1,11 @@
1+const std = @import("std");
2+
3+pub const Raw = struct {
4+ bytes: []const u8 = "",
5+
6+ pub fn jsonStringify(self: Raw, jws: anytype) !void {
7+ try jws.beginWriteRaw();
8+ try jws.writer.writeAll(self.bytes);
9+ jws.endWriteRaw();
10+ }
11+};
src/main.zig+2−3
@@ -4,7 +4,6 @@ const config = @import("config.zig");
44 const prompt = @import("prompt.zig");
55 const models = @import("models.zig");
66 const session = @import("session.zig");
7-const types = @import("types.zig");
87 const agent = @import("agent.zig");
98 const tools = @import("tools.zig");
109 const tui = @import("tui/tui.zig");
@@ -87,8 +86,8 @@ fn run() !u8 {
8786 const cwd = std.process.currentPathAlloc(platform.io, a) catch ".";
8887 var sess = session.Session.init(a, cfg.sessions_dir, cwd);
8988
90- const model_ptr: ?*const types.Model = if (model) |m| blk: {
91- const ptr = try a.create(types.Model);
89+ const model_ptr: ?*const models.Model = if (model) |m| blk: {
90+ const ptr = try a.create(models.Model);
9291 ptr.* = m;
9392 break :blk ptr;
9493 } else null;
src/message.zig+9−40
@@ -1,15 +1,5 @@
11 const std = @import("std");
22
3-pub const Raw = struct {
4- bytes: []const u8 = "",
5-
6- pub fn jsonStringify(self: Raw, jws: anytype) !void {
7- try jws.beginWriteRaw();
8- try jws.writer.writeAll(self.bytes);
9- jws.endWriteRaw();
10- }
11-};
12-
133 pub const Usage = struct {
144 input: u64 = 0,
155 output: u64 = 0,
@@ -80,6 +70,15 @@ pub const AssistantMessage = struct {
8070 stop_reason: StopReason = .pending,
8171 error_message: ?[]const u8 = null,
8272 timestamp: i64 = 0,
73+
74+ pub fn text(self: *const AssistantMessage, a: std.mem.Allocator) ![]const u8 {
75+ var out: std.ArrayList(u8) = .empty;
76+ for (self.content.items) |block| switch (block) {
77+ .text => |t| try out.appendSlice(a, t),
78+ else => {},
79+ };
80+ return out.items;
81+ }
8382 };
8483
8584 pub const ToolResultMessage = struct {
@@ -96,33 +95,3 @@ pub const Message = union(enum) {
9695 assistant: *AssistantMessage,
9796 tool_result: ToolResultMessage,
9897 };
99-
100-pub fn assistantText(a: std.mem.Allocator, msg: *const AssistantMessage) ![]const u8 {
101- var out: std.ArrayList(u8) = .empty;
102- for (msg.content.items) |block| switch (block) {
103- .text => |t| try out.appendSlice(a, t),
104- else => {},
105- };
106- return out.items;
107-}
108-
109-pub const Thinking = enum { off, budget, effort };
110-
111-pub const Model = struct {
112- id: []const u8,
113- name: []const u8,
114- api: []const u8,
115- provider: []const u8,
116- base_url: []const u8,
117- api_key: ?[]const u8,
118- effort: []const u8,
119- supports_images: bool,
120- context_window: u64,
121- max_tokens: u64,
122- cost_input: f64,
123- cost_output: f64,
124- cost_cache_read: f64,
125- session_header: ?[]const u8,
126- headers: []const [2][]const u8 = &.{},
127- thinking: Thinking = .budget,
128-};
src/models.zig+26−6
@@ -3,7 +3,27 @@ const platform = @import("platform.zig");
33 const modelsdev = @import("models_dev.zig");
44 const http = @import("http.zig");
55 const config = @import("config.zig");
6-const types = @import("types.zig");
6+
7+pub const Thinking = enum { off, budget, effort };
8+
9+pub const Model = struct {
10+ id: []const u8,
11+ name: []const u8,
12+ api: []const u8,
13+ provider: []const u8,
14+ base_url: []const u8,
15+ api_key: ?[]const u8,
16+ effort: []const u8,
17+ supports_images: bool,
18+ context_window: u64,
19+ max_tokens: u64,
20+ cost_input: f64,
21+ cost_output: f64,
22+ cost_cache_read: f64,
23+ session_header: ?[]const u8,
24+ headers: []const [2][]const u8 = &.{},
25+ thinking: Thinking = .budget,
26+};
727
828 const Builtin = struct {
929 id: []const u8,
@@ -62,7 +82,7 @@ fn clampEffort(reasoning: bool, effort: []const []const u8, desired: ?[]const u8
6282 return normalizeEffort(pick);
6383 }
6484
65-fn thinkingStyle(info: modelsdev.Info) types.Thinking {
85+fn thinkingStyle(info: modelsdev.Info) Thinking {
6686 if (!info.reasoning) return .off;
6787 if (info.budget_tokens) return .budget;
6888 if (info.effort.len > 0) return .effort;
@@ -92,13 +112,13 @@ fn firstEnv(keys: []const []const u8) ?[]const u8 {
92112 return null;
93113 }
94114
95-pub fn resolve(a: std.mem.Allocator, cfg: *const config.Config, err: *?[]const u8) ?types.Model {
115+pub fn resolve(a: std.mem.Allocator, cfg: *const config.Config, err: *?[]const u8) ?Model {
96116 const provider_id = cfg.provider orelse return null;
97117 const model_id = cfg.model orelse return null;
98118 return resolveNamed(a, cfg, provider_id, model_id, err);
99119 }
100120
101-pub fn resolveNamed(a: std.mem.Allocator, cfg: *const config.Config, provider_id: []const u8, model_id: []const u8, err: *?[]const u8) ?types.Model {
121+pub fn resolveNamed(a: std.mem.Allocator, cfg: *const config.Config, provider_id: []const u8, model_id: []const u8, err: *?[]const u8) ?Model {
102122 if (builtin(provider_id)) |b| {
103123 var db = modelsdev.Db.open(a) catch {
104124 err.* = "model metadata unavailable";
@@ -108,7 +128,7 @@ pub fn resolveNamed(a: std.mem.Allocator, cfg: *const config.Config, provider_id
108128 err.* = unknownModel(a, model_id, provider_id);
109129 return null;
110130 };
111- return types.Model{
131+ return Model{
112132 .id = model_id,
113133 .name = info.name,
114134 .api = info.api,
@@ -130,7 +150,7 @@ pub fn resolveNamed(a: std.mem.Allocator, cfg: *const config.Config, provider_id
130150 if (custom(cfg, provider_id)) |p| {
131151 for (p.models) |m| {
132152 if (!std.mem.eql(u8, m.id, model_id)) continue;
133- return types.Model{
153+ return Model{
134154 .id = m.id,
135155 .name = m.name orelse m.id,
136156 .api = @tagName(m.api),
src/session.zig+6−5
@@ -3,12 +3,13 @@ const platform = @import("platform.zig");
33 const time = @import("time.zig");
44 const filesystem = @import("filesystem.zig");
55 const text = @import("text.zig");
6-const types = @import("types.zig");
6+const message_mod = @import("message.zig");
7+const json = @import("json.zig");
78
89 const alphabet = "0123456789abcdefghijklmnopqrstuvwxyz";
910
10-const Raw = types.Raw;
11-const StopReason = types.StopReason;
11+const Raw = json.Raw;
12+const StopReason = message_mod.StopReason;
1213
1314 const ThinkingBlock = struct {
1415 type: []const u8 = "thinking",
@@ -168,7 +169,7 @@ pub const Session = struct {
168169 return .{ .a = a, .sessions_dir = sessions_dir, .cwd = cwd };
169170 }
170171
171- pub fn appendMessage(self: *Session, scratch: std.mem.Allocator, message: types.Message) !void {
172+ pub fn appendMessage(self: *Session, scratch: std.mem.Allocator, message: message_mod.Message) !void {
172173 if (self.closed) return;
173174 try self.ensure(if (message == .user) text.slugify(self.a, message.user.content) else "session");
174175
@@ -271,7 +272,7 @@ fn randomBytes(buf: []u8) void {
271272 std.Io.random(platform.io, buf);
272273 }
273274
274-fn messageRecord(a: std.mem.Allocator, message: types.Message) !MessageRecord {
275+fn messageRecord(a: std.mem.Allocator, message: message_mod.Message) !MessageRecord {
275276 switch (message) {
276277 .user => |u| return .{ .user = .{ .content = u.content, .timestamp = u.timestamp } },
277278 .tool_result => |t| {
src/tools.zig+2−2
@@ -1,6 +1,6 @@
11 const std = @import("std");
22 const config = @import("config.zig");
3-const types = @import("types.zig");
3+const message_mod = @import("message.zig");
44 const read_tool = @import("tools/read.zig");
55 const edit_tool = @import("tools/edit.zig");
66 const bash_tool = @import("tools/bash.zig");
@@ -44,7 +44,7 @@ pub const FileDiff = struct {
4444 pub const Result = struct {
4545 text: []const u8,
4646 is_error: bool,
47- images: []const types.ImageContent = &.{},
47+ images: []const message_mod.ImageContent = &.{},
4848 diffs: []const FileDiff = &.{},
4949 body: ?[]const u8 = null,
5050 };
src/tools/read.zig+2−2
@@ -1,7 +1,7 @@
11 const std = @import("std");
22 const filesystem = @import("../filesystem.zig");
33 const text = @import("../text.zig");
4-const types = @import("../types.zig");
4+const message_mod = @import("../message.zig");
55 const tools = @import("../tools.zig");
66
77 const Args = struct {
@@ -124,7 +124,7 @@ pub fn run(a: std.mem.Allocator, scratch: std.mem.Allocator, args_json: []const
124124 const b64 = a.alloc(u8, encoded) catch return fail(a, "read failed: out of memory", .{});
125125 _ = std.base64.standard.Encoder.encode(b64, data);
126126 const summary = std.fmt.allocPrint(a, "read {s} ({s}, {d} bytes)", .{ path, mime, data.len }) catch "read";
127- const images = a.alloc(types.ImageContent, 1) catch return .{ .text = summary, .is_error = false };
127+ const images = a.alloc(message_mod.ImageContent, 1) catch return .{ .text = summary, .is_error = false };
128128 images[0] = .{ .data = b64, .mime_type = mime };
129129 return .{
130130 .text = summary,
src/tui/theme.zig+0−2
@@ -194,8 +194,6 @@ const KANAGAWA_CAPTURES = [_]Capture{
194194 .{ .name = "text.reference", .style = .{ .fg = "#c4b28a" } },
195195 };
196196
197-pub const default_id = "tokyonight";
198-
199197 pub fn find(id: []const u8) ?*const Theme {
200198 if (std.mem.eql(u8, id, "tokyonight")) return &TOKYONIGHT;
201199 if (std.mem.eql(u8, id, "oxocarbon")) return &OXOCARBON;
src/tui/tui.zig+8−8
@@ -3,7 +3,7 @@ const platform = @import("../platform.zig");
33 const time = @import("../time.zig");
44 const config = @import("../config.zig");
55 const session_mod = @import("../session.zig");
6-const types = @import("../types.zig");
6+const message_mod = @import("../message.zig");
77 const agent = @import("../agent.zig");
88 const models_mod = @import("../models.zig");
99 const tools_index = @import("../tools.zig");
@@ -61,7 +61,7 @@ const Tui = struct {
6161 term: term.Terminal = .{},
6262 editor: editor_mod.Editor,
6363 live: screen.LiveRegion = .{},
64- messages: std.ArrayList(types.Message) = .empty,
64+ messages: std.ArrayList(message_mod.Message) = .empty,
6565 backing: std.mem.Allocator = undefined,
6666 arena: std.heap.ArenaAllocator,
6767 a: std.mem.Allocator,
@@ -449,10 +449,10 @@ const Tui = struct {
449449 self.note(line);
450450 }
451451
452- fn commitMessage(self: *Tui, am: *types.AssistantMessage) void {
452+ fn commitMessage(self: *Tui, am: *message_mod.AssistantMessage) void {
453453 self.commitLines(self.reply.flush(self.s));
454454 defer self.streamed.clearRetainingCapacity();
455- const text = types.assistantText(self.s, am) catch return;
455+ const text = am.text(self.s) catch return;
456456 const trimmed = std.mem.trim(u8, text, " \t\r\n");
457457 if (trimmed.len > 0 and std.mem.indexOf(u8, self.streamed.items, trimmed) == null) {
458458 self.commitLines(self.reply.feed(self.s, trimmed));
@@ -629,7 +629,7 @@ const Tui = struct {
629629 return;
630630 }
631631 self.editor.clear();
632- const message = types.Message{ .user = .{ .content = self.a.dupe(u8, text) catch text, .timestamp = time.nowMs() } };
632+ const message = message_mod.Message{ .user = .{ .content = self.a.dupe(u8, text) catch text, .timestamp = time.nowMs() } };
633633 self.messages_mutex.lockUncancelable(platform.io);
634634 self.messages.append(platform.gpa, message) catch {
635635 self.messages_mutex.unlock(platform.io);
@@ -809,14 +809,14 @@ const Tui = struct {
809809 const provider_id = self.pending_provider orelse return;
810810 var err: ?[]const u8 = null;
811811 const m = models_mod.resolveNamed(self.a, self.cfg, provider_id, id, &err) orelse return;
812- const ptr = self.a.create(types.Model) catch return;
812+ const ptr = self.a.create(models_mod.Model) catch return;
813813 ptr.* = m;
814814 self.select(ptr);
815815 config.save(self.a, self.cfg, .{ .provider = provider_id, .model = id }) catch {};
816816 },
817817 .thinking => {
818818 const m = self.opts.model orelse return;
819- const updated = self.a.create(types.Model) catch return;
819+ const updated = self.a.create(models_mod.Model) catch return;
820820 updated.* = m.*;
821821 updated.effort = models_mod.clampNamed(self.a, self.cfg, m.provider, m.id, id);
822822 self.select(updated);
@@ -826,7 +826,7 @@ const Tui = struct {
826826 }
827827 }
828828
829- fn select(self: *Tui, m: *const types.Model) void {
829+ fn select(self: *Tui, m: *const models_mod.Model) void {
830830 self.opts.model = m;
831831 self.opts.supports_images = m.supports_images;
832832 self.opts.tools_json = tools_index.json(self.a, self.tool_names, self.opts.supports_images, self.opts.session.cwd);
src/tui/usage.zig+8−7
@@ -1,8 +1,9 @@
11 const std = @import("std");
2-const types = @import("../types.zig");
2+const message_mod = @import("../message.zig");
3+const models = @import("../models.zig");
34 const styles = @import("styles.zig");
45
5-pub fn estimateContextTokens(messages: []const types.Message, system_prompt: []const u8, tools_json: []const u8) u64 {
6+pub fn estimateContextTokens(messages: []const message_mod.Message, system_prompt: []const u8, tools_json: []const u8) u64 {
67 var last_idx: ?usize = null;
78 var usage: u64 = 0;
89 for (messages, 0..) |m, i| {
@@ -27,7 +28,7 @@ fn estimateTextTokens(text: []const u8) u64 {
2728 return (text.len + 3) / 4;
2829 }
2930
30-fn estimateMessageTokens(m: types.Message) u64 {
31+fn estimateMessageTokens(m: message_mod.Message) u64 {
3132 return switch (m) {
3233 .user => |u| estimateTextTokens(u.content),
3334 .tool_result => |t| estimateTextTokens(t.text),
@@ -55,7 +56,7 @@ pub fn formatTokens(a: std.mem.Allocator, n: u64) []const u8 {
5556 return std.fmt.allocPrint(a, "{s}{s}", .{ num, unit }) catch unit;
5657 }
5758
58-pub fn contextUsageLine(a: std.mem.Allocator, used: u64, model: *const types.Model) []const u8 {
59+pub fn contextUsageLine(a: std.mem.Allocator, used: u64, model: *const models.Model) []const u8 {
5960 const cw = @max(model.context_window, 1);
6061 const percent = @as(f64, @floatFromInt(used)) / @as(f64, @floatFromInt(cw)) * 100.0;
6162 const sizes = std.fmt.allocPrint(a, "{s}/{s}", .{ formatTokens(a, used), formatTokens(a, cw) }) catch "";
@@ -64,8 +65,8 @@ pub fn contextUsageLine(a: std.mem.Allocator, used: u64, model: *const types.Mod
6465 return if (percent >= 85) styles.yellow(a, text) else styles.dim(a, text);
6566 }
6667
67-pub fn lastUsage(messages: []const types.Message) types.Usage {
68- var out: types.Usage = .{};
68+pub fn lastUsage(messages: []const message_mod.Message) message_mod.Usage {
69+ var out: message_mod.Usage = .{};
6970 for (messages) |m| {
7071 if (m != .assistant) continue;
7172 const am = m.assistant;
@@ -76,7 +77,7 @@ pub fn lastUsage(messages: []const types.Message) types.Usage {
7677 return out;
7778 }
7879
79-pub fn cacheLine(a: std.mem.Allocator, usage: types.Usage) []const u8 {
80+pub fn cacheLine(a: std.mem.Allocator, usage: message_mod.Usage) []const u8 {
8081 const prompt = usage.input + usage.cache_read + usage.cache_write;
8182 const pct: u64 = if (prompt == 0)
8283 0