From bbe02e90e83411396e0994155ce43b35452d7b68 Mon Sep 17 00:00:00 2001
From: Devansh Jain <31609257+devanshrj@users.noreply.github.com>
Date: Thu, 5 Feb 2026 17:20:38 -0800
Subject: [PATCH] fix: Append memFS system prompt based on CLI flags (#840)

---
 src/headless.ts | 14 ++++++++++++++
 src/index.ts    | 11 +++++++++++
 2 files changed, 25 insertions(+)

diff --git a/src/headless.ts b/src/headless.ts
index d6baf70..143985e 100644
--- a/src/headless.ts
+++ b/src/headless.ts
@@ -669,6 +669,20 @@ export async function handleHeadlessCommand(
     settingsManager.setMemfsEnabled(agent.id, true);
   }
 
+  // Ensure agent's system prompt includes/excludes memfs section to match setting
+  if (
+    memfsFlag ||
+    noMemfsFlag ||
+    (isNewlyCreatedAgent && !isSubagent) ||
+    (specifiedAgentId && !isSubagent)
+  ) {
+    const { updateAgentSystemPromptMemfs } = await import("./agent/modify");
+    await updateAgentSystemPromptMemfs(
+      agent.id,
+      settingsManager.isMemfsEnabled(agent.id),
+    );
+  }
+
   // Sync filesystem-backed memory before creating conversations (only if memfs is enabled)
   if (settingsManager.isMemfsEnabled(agent.id)) {
     try {
diff --git a/src/index.ts b/src/index.ts
index 8f8ae63..b18c372 100755
--- a/src/index.ts
+++ b/src/index.ts
@@ -1649,6 +1649,17 @@ async function main(): Promise<void> {
           settingsManager.setMemfsEnabled(agent.id, true);
         }
 
+        // Ensure agent's system prompt includes/excludes memfs section to match setting
+        if (memfsFlag || noMemfsFlag || (isNewlyCreatedAgent && !isSubagent)) {
+          const { updateAgentSystemPromptMemfs } = await import(
+            "./agent/modify"
+          );
+          await updateAgentSystemPromptMemfs(
+            agent.id,
+            settingsManager.isMemfsEnabled(agent.id),
+          );
+        }
+
         // Fire-and-forget: Initialize loaded skills flag (LET-7101)
         // Don't await - this is just for the skill unload reminder
         initializeLoadedSkillsFlag().catch(() => {