@@ -52,6 +52,41 @@ initModelInfoCache();
5252 pruneOldData();
5353 void refreshModelInfoInBackground().catch(() => {});
5454
55+type AgentInitOptions = Parameters<typeof initAgent>[0];
56+
57+function buildAgentOptions(opts: {
58+ model: string;
59+ cwd: string;
60+ reporter: AgentInitOptions["reporter"];
61+ sessionId?: string | undefined;
62+ headless?: boolean;
63+ agentSystemPrompt?: string | undefined;
64+}): AgentInitOptions {
65+ return {
66+ model: opts.model,
67+ cwd: opts.cwd,
68+ initialThinkingEffort: getPreferredThinkingEffort(),
69+ initialShowReasoning: getPreferredShowReasoning(),
70+ initialPruningMode: getPreferredContextPruningMode(),
71+ initialToolResultPayloadCapBytes: getPreferredToolResultPayloadCapBytes(),
72+ initialPromptCachingEnabled: getPreferredPromptCachingEnabled(),
73+ initialOpenAIPromptCacheRetention: getPreferredOpenAIPromptCacheRetention(),
74+ initialGoogleCachedContent: getPreferredGoogleCachedContent(),
75+ reporter: opts.reporter,
76+ ...(opts.sessionId ? { sessionId: opts.sessionId } : {}),
77+ ...(opts.headless ? { headless: true } : {}),
78+ ...(opts.agentSystemPrompt
79+ ? { agentSystemPrompt: opts.agentSystemPrompt }
80+ : {}),
81+ };
82+}
83+
84+function writeStructuredResult(outputFd: number, payload: unknown): void {
85+ writeJsonLine((text) => {
86+ writeSync(outputFd, Buffer.from(text));
87+ }, payload);
88+}
89+
5590 // ─── Main ─────────────────────────────────────────────────────────────────────
5691
5792 async function main(): Promise<void> {
@@ -117,22 +152,15 @@ async function main(): Promise<void> {
117152 }
118153
119154 try {
120- const { runner } = await initAgent({
121- model: modelOverride,
122- cwd: parentCwd,
123- initialThinkingEffort: getPreferredThinkingEffort(),
124- initialShowReasoning: getPreferredShowReasoning(),
125- initialPruningMode: getPreferredContextPruningMode(),
126- initialToolResultPayloadCapBytes:
127- getPreferredToolResultPayloadCapBytes(),
128- initialPromptCachingEnabled: getPreferredPromptCachingEnabled(),
129- initialOpenAIPromptCacheRetention:
130- getPreferredOpenAIPromptCacheRetention(),
131- initialGoogleCachedContent: getPreferredGoogleCachedContent(),
132- reporter: new HeadlessReporter(),
133- headless: true,
134- ...(agentSystemPrompt ? { agentSystemPrompt } : {}),
135- });
155+ const { runner } = await initAgent(
156+ buildAgentOptions({
157+ model: modelOverride,
158+ cwd: parentCwd,
159+ reporter: new HeadlessReporter(),
160+ headless: true,
161+ agentSystemPrompt,
162+ }),
163+ );
136164
137165 const { text: resolvedText, images: refImages } = await resolveFileRefs(
138166 prompt ?? "",
@@ -146,21 +174,12 @@ async function main(): Promise<void> {
146174 outputTokens: status.totalOut,
147175 };
148176
149- if (args.outputFd !== null && summary) {
150- const outputFd = args.outputFd;
151- writeJsonLine((text) => {
152- writeSync(outputFd, Buffer.from(text));
153- }, summary);
177+ if (args.outputFd !== null) {
178+ writeStructuredResult(args.outputFd, summary);
154179 }
155180 } catch (err) {
156181 if (args.outputFd !== null) {
157- const outputFd = args.outputFd;
158- writeJsonLine(
159- (text) => {
160- writeSync(outputFd, Buffer.from(text));
161- },
162- { error: String(err) },
163- );
182+ writeStructuredResult(args.outputFd, { error: String(err) });
164183 }
165184 process.exit(1);
166185 }
@@ -173,20 +192,12 @@ async function main(): Promise<void> {
173192 }
174193
175194 try {
176- const agentOpts: Parameters<typeof initAgent>[0] = {
195+ const agentOpts = buildAgentOptions({
177196 model,
178197 cwd: args.cwd,
179- initialThinkingEffort: getPreferredThinkingEffort(),
180- initialShowReasoning: getPreferredShowReasoning(),
181- initialPruningMode: getPreferredContextPruningMode(),
182- initialToolResultPayloadCapBytes: getPreferredToolResultPayloadCapBytes(),
183- initialPromptCachingEnabled: getPreferredPromptCachingEnabled(),
184- initialOpenAIPromptCacheRetention:
185- getPreferredOpenAIPromptCacheRetention(),
186- initialGoogleCachedContent: getPreferredGoogleCachedContent(),
187198 reporter: new CliReporter(),
188- };
189- if (sessionId) agentOpts.sessionId = sessionId;
199+ sessionId,
200+ });
190201
191202 const { runner, cmdCtx } = await initAgent(agentOpts);