fix agent create: keep draft view until agent ready

packages/app/src/screens/agent/agent-ready-screen.tsx

@@ -118,7 +118,7 @@ export function AgentReadyScreen({
         targetMs: 300,
       });
     }
-    router.replace("/agent");
+    router.replace({ pathname: "/agent/[[...route]]" });
   }, [resolvedAgentId, resolvedServerId, router]);
 
   const focusServerId = resolvedServerId;

packages/app/src/screens/agent/draft-agent-screen.tsx

@@ -103,7 +103,15 @@ type DraftAgentParams = {
   workingDir?: string;
 };
 
-export function DraftAgentScreen() {
+type DraftAgentScreenProps = {
+  isVisible?: boolean;
+  onCreateFlowActiveChange?: (active: boolean) => void;
+};
+
+export function DraftAgentScreen({
+  isVisible = true,
+  onCreateFlowActiveChange,
+}: DraftAgentScreenProps = {}) {
   const { theme } = useUnistyles();
   const router = useRouter();
   const insets = useSafeAreaInsets();
@@ -171,7 +179,7 @@ export function DraftAgentScreen() {
   } = useAgentFormState({
     initialServerId: resolvedServerId ?? null,
     initialValues,
-    isVisible: true,
+    isVisible,
     isCreateFlow: true,
   });
   const hostEntry = selectedServerId
@@ -695,6 +703,7 @@ export function DraftAgentScreen() {
       }
       Keyboard.dismiss();
       dispatch({ type: "SUBMIT", attempt });
+      onCreateFlowActiveChange?.(true);
 
       try {
         const result = await createAgent({
@@ -707,7 +716,7 @@ export function DraftAgentScreen() {
         const agentId = (result as { id?: string })?.id;
         if (agentId && selectedServerId) {
           router.replace({
-            pathname: "/agent/[...route]",
+            pathname: "/agent/[[...route]]",
             params: { route: [selectedServerId, agentId] },
           });
           return;
@@ -717,10 +726,12 @@ export function DraftAgentScreen() {
           type: "CREATE_FAILED",
           message: "Failed to create agent",
         });
+        onCreateFlowActiveChange?.(false);
         throw new Error("Failed to create agent");
       } catch (error) {
         const message = error instanceof Error ? error.message : "Failed to create agent";
         dispatch({ type: "CREATE_FAILED", message });
+        onCreateFlowActiveChange?.(false);
         throw error; // Re-throw so AgentInputArea knows it failed
       }
     },
@@ -745,6 +756,7 @@ export function DraftAgentScreen() {
       workingDir,
       isAttachWorktree,
       isSubmitting,
+      onCreateFlowActiveChange,
     ]
   );
 

packages/app/src/screens/agent/legacy-agent-id-screen.tsx

@@ -51,19 +51,19 @@ export function LegacyAgentIdScreen({ agentId }: { agentId: string }) {
     }
     const match = matches[0];
     router.replace({
-      pathname: "/agent/[...route]",
+      pathname: "/agent/[[...route]]",
       params: { route: [match.serverId, match.agent.id] },
     });
   }, [isRedirecting, matches, router]);
 
   const handleGoDraft = useCallback(() => {
-    router.replace("/agent");
+    router.replace({ pathname: "/agent/[[...route]]" });
   }, [router]);
 
   const handleSelectMatch = useCallback(
     (match: AgentMatch) => {
       router.replace({
-        pathname: "/agent/[...route]",
+        pathname: "/agent/[[...route]]",
         params: { route: [match.serverId, match.agent.id] },
       });
     },