From 35ebe8887093bc706b6f36ce2033f5f1c3ca4f0c Mon Sep 17 00:00:00 2001
From: scutifer <manukumar.sk@gmail.com>
Date: Tue, 23 Dec 2025 17:36:40 +0530
Subject: [PATCH] feat: Call resolvePromptInput on the `--system-prompt`
 received on the CLI argument. This is needed to support file paths on the
 prompt (#287)

---
 packages/coding-agent/src/core/system-prompt.ts |  2 +-
 packages/coding-agent/src/main.ts               | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/coding-agent/src/core/system-prompt.ts b/packages/coding-agent/src/core/system-prompt.ts
index 0bd0992f..7df751e5 100644
--- a/packages/coding-agent/src/core/system-prompt.ts
+++ b/packages/coding-agent/src/core/system-prompt.ts
@@ -22,7 +22,7 @@ const toolDescriptions: Record<ToolName, string> = {
 };
 
 /** Resolve input as file path or literal string */
-function resolvePromptInput(input: string | undefined, description: string): string | undefined {
+export function resolvePromptInput(input: string | undefined, description: string): string | undefined {
 	if (!input) {
 		return undefined;
 	}
diff --git a/packages/coding-agent/src/main.ts b/packages/coding-agent/src/main.ts
index 121e4b3b..75349db3 100644
--- a/packages/coding-agent/src/main.ts
+++ b/packages/coding-agent/src/main.ts
@@ -23,6 +23,7 @@ import { resolveModelScope, type ScopedModel } from "./core/model-resolver.js";
 import { type CreateAgentSessionOptions, configureOAuthStorage, createAgentSession } from "./core/sdk.js";
 import { SessionManager } from "./core/session-manager.js";
 import { SettingsManager } from "./core/settings-manager.js";
+import { resolvePromptInput } from "./core/system-prompt.js";
 import { printTimings, time } from "./core/timings.js";
 import { allTools } from "./core/tools/index.js";
 import { InteractiveMode, runPrintMode, runRpcMode } from "./modes/index.js";
@@ -177,6 +178,9 @@ function buildSessionOptions(
 ): CreateAgentSessionOptions {
 	const options: CreateAgentSessionOptions = {};
 
+	const resolvedSystemPrompt = resolvePromptInput(parsed.systemPrompt, "system prompt");
+	const resolvedAppendPrompt = resolvePromptInput(parsed.appendSystemPrompt, "append system prompt");
+
 	if (sessionManager) {
 		options.sessionManager = sessionManager;
 	}
@@ -215,12 +219,12 @@ function buildSessionOptions(
 	}
 
 	// System prompt
-	if (parsed.systemPrompt && parsed.appendSystemPrompt) {
-		options.systemPrompt = `${parsed.systemPrompt}\n\n${parsed.appendSystemPrompt}`;
-	} else if (parsed.systemPrompt) {
-		options.systemPrompt = parsed.systemPrompt;
-	} else if (parsed.appendSystemPrompt) {
-		options.systemPrompt = (defaultPrompt) => `${defaultPrompt}\n\n${parsed.appendSystemPrompt}`;
+	if (resolvedSystemPrompt && resolvedAppendPrompt) {
+		options.systemPrompt = `${resolvedSystemPrompt}\n\n${resolvedAppendPrompt}`;
+	} else if (resolvedSystemPrompt) {
+		options.systemPrompt = resolvedSystemPrompt;
+	} else if (resolvedAppendPrompt) {
+		options.systemPrompt = (defaultPrompt) => `${defaultPrompt}\n\n${resolvedAppendPrompt}`;
 	}
 
 	// Tools