@@ -497,6 +497,34 @@ export async function runAgent(opts: AgentOptions): Promise<void> {
497497 cwd,
498498 0, // depth 0: processUserInput is always top-level
499499 runSubagent,
500+ async (prompt, model, systemPromptOverride) => {
501+ // Run custom agent with full visual output (spinner + renderTurn)
502+ const agentLlm = resolveModel(model ?? currentModel);
503+ const agentSystem = systemPromptOverride ?? buildSystemPrompt(cwd);
504+ const agentTools = buildToolSet({
505+ cwd,
506+ depth: 0,
507+ runSubagent,
508+ onHook: renderHook,
509+ });
510+ const agentMessages: CoreMessage[] = [
511+ { role: "user", content: prompt },
512+ ];
513+ const events = runTurn({
514+ model: agentLlm,
515+ messages: agentMessages,
516+ tools: agentTools,
517+ systemPrompt: agentSystem,
518+ });
519+ spinner.start("thinking");
520+ const { newMessages, inputTokens, outputTokens } = await renderTurn(
521+ events,
522+ spinner,
523+ );
524+ const result = extractAssistantText(newMessages);
525+ const activity: import("../tools/subagent.ts").SubagentToolEntry[] = [];
526+ return { result, inputTokens, outputTokens, activity };
527+ },
500528 );
501529
502530 // Merge pasted images with @-ref images
@@ -693,6 +721,11 @@ async function resolveFileRefs(
693721 model?: string,
694722 systemPromptOverride?: string,
695723 ) => Promise<import("../tools/subagent.ts").SubagentOutput>,
724+ runAgentFn: (
725+ prompt: string,
726+ model?: string,
727+ systemPromptOverride?: string,
728+ ) => Promise<import("../tools/subagent.ts").SubagentOutput>,
696729 ): Promise<{ text: string; images: ImageAttachment[] }> {
697730 const atPattern = /@([\w./\-_]+)/g;
698731 let result = text;
@@ -779,9 +812,8 @@ async function resolveFileRefs(
779812 result.slice(0, agentMatch.index) +
780813 result.slice((agentMatch.index ?? 0) + agentMatch[0].length)
781814 ).trim();
782- const output = await runSubagentFn(
815+ const output = await runAgentFn(
783816 promptText || "(no prompt)",
784- depth,
785817 agent.model,
786818 agent.systemPrompt,
787819 );