From ff0be38cffebc32f38d1774734547853df6a6ce1 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Thu, 19 Feb 2026 12:59:48 +0700
Subject: [PATCH] Simplify working directory placeholder and empty state
 messaging

---
 .../app/src/components/agent-form/agent-form-dropdowns.tsx  | 6 ++----
 packages/app/src/screens/agent/draft-agent-screen.tsx       | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/app/src/components/agent-form/agent-form-dropdowns.tsx b/packages/app/src/components/agent-form/agent-form-dropdowns.tsx
index f43c9aa58..e3e8099fe 100644
--- a/packages/app/src/components/agent-form/agent-form-dropdowns.tsx
+++ b/packages/app/src/components/agent-form/agent-form-dropdowns.tsx
@@ -862,16 +862,14 @@ export function WorkingDirectoryDropdown({
   const handleOpen = useCallback(() => setIsOpen(true), []);
   const handleOpenChange = useCallback((open: boolean) => setIsOpen(open), []);
 
-  const emptyText = suggestedPaths.length > 0
-    ? "No agent directories match your search."
-    : "We'll suggest directories from agents on this host once they exist.";
+  const emptyText = "No agent directories match your search.";
 
   return (
     <>
       <SelectField
         label="WORKING DIRECTORY"
         value={workingDir}
-        placeholder="/path/to/project"
+        placeholder="Choose a working directory"
         onPress={handleOpen}
         disabled={disabled}
         errorMessage={errorMessage || undefined}
diff --git a/packages/app/src/screens/agent/draft-agent-screen.tsx b/packages/app/src/screens/agent/draft-agent-screen.tsx
index e5d0a8a64..0dbcba192 100644
--- a/packages/app/src/screens/agent/draft-agent-screen.tsx
+++ b/packages/app/src/screens/agent/draft-agent-screen.tsx
@@ -758,7 +758,7 @@ function DraftAgentScreenContent({
 
     return agentWorkingDirSuggestions.length > 0
       ? 'No agent directories match your search.'
-      : "We'll suggest directories from agents on this host once they exist."
+      : 'No agent directories match your search.'
   }, [agentWorkingDirSuggestions.length, hasWorkingDirectorySearch, workingDirSearchError])
   const displayWorkingDir = shortenPath(workingDir)
   const worktreeTriggerValue =
@@ -1167,7 +1167,7 @@ function DraftAgentScreenContent({
                       containerStyle={styles.fullSelector}
                       label="Working directory"
                       value={displayWorkingDir}
-                      placeholder="/path/to/project"
+                      placeholder="Choose a working directory"
                       onPress={() => setIsWorkingDirOpen(true)}
                       icon={<Folder size={theme.iconSize.md} color={theme.colors.foregroundMuted} />}
                       showLabel={false}