@@ -92,7 +92,6 @@ fn steer(opts: Options, messages: *std.ArrayList(types.Message), content: []cons
9292 }
9393
9494 fn pauseStep(run: Run) ?[]const u8 {
95- if (run.opts.cancel.load(.acquire)) return null;
9695 const interaction = run.interaction orelse return "";
9796 if (!interaction.pauseRequested()) return "";
9897 interaction.clearPause();
@@ -103,6 +102,12 @@ fn pauseStep(run: Run) ?[]const u8 {
103102 return steering;
104103 }
105104
105+fn cancelled(opts: Options, listener: Listener) bool {
106+ if (!opts.cancel.load(.acquire)) return false;
107+ listener.emit(.cancelled);
108+ return true;
109+}
110+
106111 const Run = struct {
107112 opts: Options,
108113 messages: *std.ArrayList(types.Message),
@@ -125,6 +130,7 @@ pub fn runTurn(opts: Options, messages: *std.ArrayList(types.Message), interacti
125130 _ = arena.reset(.retain_capacity);
126131 const scratch = arena.allocator();
127132
133+ if (cancelled(opts, listener)) return;
128134 const steering = pauseStep(run) orelse {
129135 listener.emit(.cancelled);
130136 return;
@@ -134,6 +140,7 @@ pub fn runTurn(opts: Options, messages: *std.ArrayList(types.Message), interacti
134140 return;
135141 };
136142
143+ if (cancelled(opts, listener)) return;
137144 listener.emit(.{ .phase = .{ .phase = .preparing } });
138145 opts.session.appendRequest(scratch, .{
139146 .provider = model.provider,
@@ -147,6 +154,7 @@ pub fn runTurn(opts: Options, messages: *std.ArrayList(types.Message), interacti
147154 return;
148155 };
149156
157+ if (cancelled(opts, listener)) return;
150158 listener.emit(.{ .phase = .{ .phase = .waiting_model } });
151159 var stream_ctx = StreamCtx{ .listener = listener };
152160 const assistant = opts.a.create(types.AssistantMessage) catch {
@@ -168,6 +176,7 @@ pub fn runTurn(opts: Options, messages: *std.ArrayList(types.Message), interacti
168176 return;
169177 };
170178
179+ if (cancelled(opts, listener)) return;
171180 messages.append(opts.a, .{ .assistant = assistant }) catch {
172181 listener.emit(.{ .err = "out of memory" });
173182 return;
@@ -197,35 +206,43 @@ pub fn runTurn(opts: Options, messages: *std.ArrayList(types.Message), interacti
197206
198207 var held: std.ArrayList([]const u8) = .empty;
199208 defer held.deinit(opts.a);
209+ var run_tools = true;
200210 for (assistant.content.items) |block| {
201211 if (block != .tool_call) continue;
202212 const call = block.tool_call;
203213
204- const step = pauseStep(run) orelse {
205- listener.emit(.cancelled);
206- return;
207- };
208- if (step.len > 0) held.append(opts.a, step) catch {
209- listener.emit(.{ .err = "out of memory" });
210- return;
211- };
212-
213- listener.emit(.{ .phase = .{ .phase = .running_tool, .detail = call.name } });
214+ if (run_tools) {
215+ if (opts.cancel.load(.acquire)) {
216+ run_tools = false;
217+ } else if (pauseStep(run)) |step| {
218+ if (step.len > 0) held.append(opts.a, step) catch {
219+ listener.emit(.{ .err = "out of memory" });
220+ return;
221+ };
222+ } else {
223+ run_tools = false;
224+ }
225+ }
226+ if (run_tools and opts.cancel.load(.acquire)) run_tools = false;
214227
215- const result = tools.execute(opts.a, scratch, call.name, call.arguments, .{
216- .cancel = opts.cancel,
217- .supports_images = opts.supports_images,
218- .on_output = .{ .ctx = &stream_ctx.listener, .on_chunk = onToolOutput },
219- .snapshot_ignore_dirs = opts.config.snapshot_ignore_dirs,
220- .snapshot_uses_gitignore = opts.config.snapshot_uses_gitignore,
221- });
228+ var result: ?common.Result = null;
229+ if (run_tools) {
230+ listener.emit(.{ .phase = .{ .phase = .running_tool, .detail = call.name } });
231+ result = tools.execute(opts.a, scratch, call.name, call.arguments, .{
232+ .cancel = opts.cancel,
233+ .supports_images = opts.supports_images,
234+ .on_output = .{ .ctx = &stream_ctx.listener, .on_chunk = onToolOutput },
235+ .snapshot_ignore_dirs = opts.config.snapshot_ignore_dirs,
236+ .snapshot_uses_gitignore = opts.config.snapshot_uses_gitignore,
237+ });
238+ }
222239
223240 const tool_message = types.Message{ .tool_result = .{
224241 .tool_call_id = call.id,
225242 .tool_name = call.name,
226- .text = result.text,
227- .images = result.images,
228- .is_error = result.is_error,
243+ .text = if (result) |r| r.text else "aborted",
244+ .images = if (result) |r| r.images else &.{},
245+ .is_error = if (result) |r| r.is_error else true,
229246 .timestamp = util.nowMs(),
230247 } };
231248 messages.append(opts.a, tool_message) catch {
@@ -238,12 +255,17 @@ pub fn runTurn(opts: Options, messages: *std.ArrayList(types.Message), interacti
238255 };
239256 listener.emit(.{ .tool_result = .{
240257 .name = call.name,
241- .text = result.text,
242- .is_error = result.is_error,
243- .diffs = result.diffs,
244- .body = result.body,
258+ .text = tool_message.tool_result.text,
259+ .is_error = tool_message.tool_result.is_error,
260+ .diffs = if (result) |r| r.diffs else &.{},
261+ .body = if (result) |r| r.body else null,
245262 } });
246263 }
264+ if (!run_tools) {
265+ listener.emit(.cancelled);
266+ return;
267+ }
268+ if (cancelled(opts, listener)) return;
247269 const joined = tryJoin(opts.a, held.items) catch {
248270 listener.emit(.{ .err = "out of memory" });
249271 return;