diff --git a/apps/app/src/react-app/domains/session/surface/composer/composer.tsx b/apps/app/src/react-app/domains/session/surface/composer/composer.tsx
index 1463b28c3..887399c0d 100644
--- a/apps/app/src/react-app/domains/session/surface/composer/composer.tsx
+++ b/apps/app/src/react-app/domains/session/surface/composer/composer.tsx
@@ -110,6 +110,11 @@ const IMAGE_COMPRESS_QUALITY = 0.82;
 const IMAGE_COMPRESS_TARGET_BYTES = 1_500_000;
 const FILE_URL_RE = /^file:\/\//i;
 const HTTP_URL_RE = /^https?:\/\//i;
+const DEFAULT_AGENT_NAME = "openwork";
+
+function isNonDefaultAgent(agent: Agent) {
+  return agent.name !== DEFAULT_AGENT_NAME;
+}
 
 /**
  * Extract external file/URL drops from a clipboard. Only used when the user
@@ -383,6 +388,8 @@ export function ReactSessionComposer(props: ComposerProps) {
   const mentionMatch = props.draft.match(/@([^\s@]*)$/);
   const mentionOpenNext = Boolean(mentionMatch);
   const mentionQuery = mentionMatch?.[1] ?? "";
+  const nonDefaultAgents = useMemo(() => agents.filter(isNonDefaultAgent), [agents]);
+  const showAgentPicker = props.selectedAgent !== null || nonDefaultAgents.length > 0;
 
   useEffect(() => {
     setSlashOpen(slashOpenNext);
@@ -399,6 +406,22 @@ export function ReactSessionComposer(props: ComposerProps) {
     void props.listAgents().then(setAgents).catch(() => setAgents([]));
   }, [agentMenuOpen, toolMenuOpen, toolMenuSection, props.listAgents]);
 
+  useEffect(() => {
+    if (!showAgentPicker) setAgentMenuOpen(false);
+  }, [showAgentPicker]);
+
+  useEffect(() => {
+    let cancelled = false;
+    void props.listAgents().then((next) => {
+      if (!cancelled) setAgents(next);
+    }).catch(() => {
+      if (!cancelled) setAgents([]);
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [props.listAgents]);
+
   useEffect(() => {
     setSkills(props.skills ?? []);
   }, [props.skills]);
@@ -852,7 +875,7 @@ export function ReactSessionComposer(props: ComposerProps) {
       return;
     }
     if (agentMenuOpen) {
-      const total = agents.length + 1;
+      const total = nonDefaultAgents.length + 1;
       if (event.key === "ArrowDown") {
         event.preventDefault();
         setAgentMenuIndex((current) => (current + 1) % total);
@@ -865,7 +888,7 @@ export function ReactSessionComposer(props: ComposerProps) {
       }
       if (event.key === "Enter" || event.key === "Tab") {
         event.preventDefault();
-        const selected = agentMenuIndex === 0 ? null : agents[agentMenuIndex - 1]?.name ?? null;
+        const selected = agentMenuIndex === 0 ? null : nonDefaultAgents[agentMenuIndex - 1]?.name ?? null;
         props.onSelectAgent(selected);
         setAgentMenuOpen(false);
         return;
@@ -1358,7 +1381,7 @@ export function ReactSessionComposer(props: ComposerProps) {
                                 <div className="min-w-0 flex-1 truncate text-xs font-semibold">{t("composer.default_agent")}</div>
                                 {props.selectedAgent === null ? <Check size={14} className="mt-0.5 shrink-0 text-gray-10" /> : null}
                               </button>
-                              {agents.map((agent) => {
+                              {nonDefaultAgents.map((agent) => {
                                 const active = props.selectedAgent === agent.name;
                                 return (
                                   <button
@@ -1519,7 +1542,7 @@ export function ReactSessionComposer(props: ComposerProps) {
                     the user switch without leaving the composer. The same
                     selection is reachable from the plug menu, the command
                     palette ("Switch agent"), and @agent mentions. */}
-                <div ref={agentMenuRef} className="relative">
+                <div ref={agentMenuRef} className={showAgentPicker ? "relative" : "hidden"}>
                   <button
                     type="button"
                     className="flex h-9 max-h-9 items-center gap-1 rounded-md px-1.5 text-[12px] font-medium text-gray-10 transition-colors hover:bg-gray-3 hover:text-gray-12"
@@ -1556,7 +1579,7 @@ export function ReactSessionComposer(props: ComposerProps) {
                           <span>{t("composer.default_agent")}</span>
                           {!props.selectedAgent ? <Check size={14} className="text-gray-10" /> : null}
                         </button>
-                        {agents.map((agent, index) => {
+                        {nonDefaultAgents.map((agent, index) => {
                           const active = props.selectedAgent === agent.name;
                           return (
                             <button
diff --git a/apps/app/src/react-app/shell/session-route.tsx b/apps/app/src/react-app/shell/session-route.tsx
index a4674c2a5..ac9e2b650 100644
--- a/apps/app/src/react-app/shell/session-route.tsx
+++ b/apps/app/src/react-app/shell/session-route.tsx
@@ -706,10 +706,13 @@ export function SessionRoute() {
   // Hidden and subagent-only entries are excluded — those are task-tool
   // delegation targets, not agents the user can run a session as.
   const listAgents = useCallback(async () => {
+    // Include engineReloadVersion so the composer refetches after newly added
+    // agent files become available, even when the inline picker is hidden.
+    void engineReloadVersion;
     if (!opencodeClient) return [];
     const list = unwrap(await opencodeClient.app.agents());
     return list.filter((agent) => !agent.hidden && agent.mode !== "subagent");
-  }, [opencodeClient]);
+  }, [engineReloadVersion, opencodeClient]);
 
   const handleOpenSettings = useCallback((route = "/settings/general", workspaceId = sidebarActiveWorkspaceId) => {
     const sessionId = workspaceId === sidebarActiveWorkspaceId ? selectedSessionId : null;