Update files

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

@@ -553,7 +553,10 @@ function AgentScreenContent({
     if (!isConnected) {
       return;
     }
-    if (!needsAuthoritativeSync) {
+    // On native clients, daemon stream forwarding is focused-agent only, so switching
+    // agents can leave timeline gaps unless we explicitly request a snapshot.
+    const shouldSyncOnEntry = needsAuthoritativeSync || Platform.OS !== "web";
+    if (!shouldSyncOnEntry) {
       return;
     }
 
@@ -563,7 +566,12 @@ function AgentScreenContent({
         error,
       });
     });
-  }, [resolvedAgentId, ensureAgentIsInitialized, isConnected, needsAuthoritativeSync]);
+  }, [
+    resolvedAgentId,
+    ensureAgentIsInitialized,
+    isConnected,
+    needsAuthoritativeSync,
+  ]);
 
   useEffect(() => {
     // Clear stale resolution state when route target changes.

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

@@ -400,6 +400,7 @@ export function DraftAgentScreen({
   const checkoutQueryError =
     checkoutStatusQuery.error instanceof Error ? checkoutStatusQuery.error.message : null;
   const checkoutPayloadError = checkout?.error ? checkout.error.message : null;
+  const isGitDirectory = checkoutStatusQuery.isSuccess && checkout?.isGit === true;
 
   const isNonGitDirectory =
     Boolean(trimmedWorkingDir) &&
@@ -430,7 +431,7 @@ export function DraftAgentScreen({
   const isCreateWorktree = worktreeMode === "create";
   const isAttachWorktree = worktreeMode === "attach";
 
-  const worktreeListRoot = checkout?.repoRoot ?? trimmedWorkingDir;
+  const worktreeListRoot = checkout?.isGit ? checkout.repoRoot : "";
   const worktreeListQuery = useQuery({
     queryKey: ["paseoWorktreeList", selectedServerId, worktreeListRoot],
     queryFn: async () => {
@@ -448,7 +449,8 @@ export function DraftAgentScreen({
       return payload.worktrees ?? [];
     },
     enabled:
-      Boolean(worktreeListRoot || trimmedWorkingDir) &&
+      isGitDirectory &&
+      Boolean(worktreeListRoot) &&
       !repoAvailabilityError &&
       Boolean(sessionClient) &&
       isConnected &&
@@ -551,6 +553,7 @@ export function DraftAgentScreen({
     },
     enabled:
       isCreateWorktree &&
+      isGitDirectory &&
       !isNonGitDirectory &&
       Boolean(baseBranch) &&
       Boolean(trimmedWorkingDir) &&