diff --git a/docs/changelog.md b/docs/changelog.md
index 23b57b2f..85849d94 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -1,5 +1,6 @@
 ## Unreleased
 
+- Show datasource configuration status in the tree
 - Add Data Sources to the Packages tree
   - Hover (tree item) action in root element to Setup all Data Sources
   - Hover (tree item) action in root element to Drop all Data Sources
diff --git a/sema4ai/vscode-client/src/robo/dataSourceHandling.ts b/sema4ai/vscode-client/src/robo/dataSourceHandling.ts
index 77829bef..c72cc390 100644
--- a/sema4ai/vscode-client/src/robo/dataSourceHandling.ts
+++ b/sema4ai/vscode-client/src/robo/dataSourceHandling.ts
@@ -1,6 +1,6 @@
 import { Uri, window, commands, ProgressLocation, Progress, CancellationToken } from "vscode";
 import { logError, OUTPUT_CHANNEL } from "../channel";
-import { RobotEntry } from "../viewsCommon";
+import { RobotEntry, treeViewIdToTreeDataProvider } from "../viewsCommon";
 import { DatasourceInfo, DataSourceState } from "../protocols";
 import { langServer } from "../extension";
 import {
@@ -13,6 +13,8 @@ import { sleep } from "../time";
 import { findActionPackagePath } from "../actionServer";
 import { SEMA4AI_LIST_ACTIONS_INTERNAL } from "../robocorpCommands";
 import { QuickPickItemWithAction, showSelectOneQuickPick } from "../ask";
+import { TREE_VIEW_SEMA4AI_TASK_PACKAGES_TREE } from "../robocorpViews";
+import { RobotsTreeDataProvider } from "../viewsRobots";
 
 function isExternalDatasource(datasource: DatasourceInfo): boolean {
     const externalEngines = ["custom", "files", "models"];
@@ -253,6 +255,11 @@ export const setupDataSource = async (entry?: RobotEntry) => {
     }
 
     await setupSingleDataSource(datasource, dataServerInfo, Uri.file(entry.robot.directory).toString());
+
+    const dataProvider = treeViewIdToTreeDataProvider.get(
+        TREE_VIEW_SEMA4AI_TASK_PACKAGES_TREE
+    ) as RobotsTreeDataProvider;
+    dataProvider.updateDatasourceStatuses();
 };
 
 export async function dropDataSource(entry?: RobotEntry) {
@@ -333,6 +340,11 @@ export async function dropDataSource(entry?: RobotEntry) {
         return;
     }
 
+    const dataProvider = treeViewIdToTreeDataProvider.get(
+        TREE_VIEW_SEMA4AI_TASK_PACKAGES_TREE
+    ) as RobotsTreeDataProvider;
+    dataProvider.updateDatasourceStatuses();
+
     window.showInformationMessage(result["message"]);
 }
 
@@ -420,6 +432,11 @@ export async function dropAllDataSources(entry?: RobotEntry) {
             window.showInformationMessage("Data Sources dropped succesfully.");
         }
     );
+
+    const dataProvider = treeViewIdToTreeDataProvider.get(
+        TREE_VIEW_SEMA4AI_TASK_PACKAGES_TREE
+    ) as RobotsTreeDataProvider;
+    dataProvider.updateDatasourceStatuses();
 }
 
 export async function setupAllDataSources(entry?: RobotEntry) {
@@ -512,4 +529,9 @@ export async function setupAllDataSources(entry?: RobotEntry) {
             }
         }
     );
+
+    const dataProvider = treeViewIdToTreeDataProvider.get(
+        TREE_VIEW_SEMA4AI_TASK_PACKAGES_TREE
+    ) as RobotsTreeDataProvider;
+    dataProvider.updateDatasourceStatuses();
 }
diff --git a/sema4ai/vscode-client/src/viewsRobots.ts b/sema4ai/vscode-client/src/viewsRobots.ts
index 9467c0b7..8b13fbd1 100644
--- a/sema4ai/vscode-client/src/viewsRobots.ts
+++ b/sema4ai/vscode-client/src/viewsRobots.ts
@@ -1,13 +1,14 @@
 import * as vscode from "vscode";
 import { OUTPUT_CHANNEL, logError } from "./channel";
 import { uriExists } from "./files";
-import { LocalPackageMetadataInfo, ActionResult, IActionInfo } from "./protocols";
+import { LocalPackageMetadataInfo, ActionResult, IActionInfo, DatasourceInfo, DataSourceState } from "./protocols";
 import * as roboCommands from "./robocorpCommands";
 import { basename, RobotEntry, RobotEntryType } from "./viewsCommon";
 import { getSelectedRobot } from "./viewsSelection";
 import { isActionPackage, isAgentPackage } from "./common";
 import path = require("path");
-import { getDataSourceCaption, getDataSourceTooltip } from "./robo/actionPackage";
+import { getDataSourceCaption, getDataSourceTooltip, listAllActionPackages } from "./robo/actionPackage";
+import { langServer } from "./extension";
 
 let _globalSentMetric: boolean = false;
 
@@ -15,6 +16,37 @@ function empty<T>(array: T[]) {
     return array === undefined || array.length === 0;
 }
 
+function dataSourcesAreDifferent(
+    globalDataSourceState: Map<string, Map<string, DatasourceInfo>>,
+    currentDatasources: Map<string, Map<string, DatasourceInfo>>
+): boolean {
+    if (globalDataSourceState.size !== currentDatasources.size) {
+        return true;
+    }
+
+    for (const [actionPath, currentInnerMap] of currentDatasources) {
+        const globalInnerMap = globalDataSourceState.get(actionPath);
+
+        if (!globalInnerMap) {
+            return true;
+        }
+
+        if (globalInnerMap.size !== currentInnerMap.size) {
+            return true;
+        }
+
+        for (const [sourceName, currentInfo] of currentInnerMap) {
+            const globalInfo = globalInnerMap.get(sourceName);
+
+            if (!globalInfo || JSON.stringify(currentInfo) !== JSON.stringify(globalInfo)) {
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
 function getRobotLabel(robotInfo: LocalPackageMetadataInfo): string {
     let label: string = undefined;
     if (robotInfo.yamlContents) {
@@ -43,6 +75,7 @@ export class RobotsTreeDataProvider implements vscode.TreeDataProvider<RobotEntr
     readonly onForceSelectionFromTreeData: vscode.Event<RobotEntry[]> = this._onForceSelectionFromTreeData.event;
 
     private lastRoot: RobotEntry[] | undefined = undefined;
+    globalDataSourceState: Map<string, Map<string, DatasourceInfo>> = new Map();
 
     fireRootChange() {
         this._onDidChangeTreeData.fire(null);
@@ -52,6 +85,46 @@ export class RobotsTreeDataProvider implements vscode.TreeDataProvider<RobotEntr
         this.fireRootChange();
     }
 
+    async updateDatasourceStatuses(): Promise<void> {
+        let actionResult: ActionResult<LocalPackageMetadataInfo[]> = await listAllActionPackages();
+        if (!actionResult.success) {
+            return;
+        }
+        let localActionPackages: LocalPackageMetadataInfo[] = actionResult.result;
+        if (localActionPackages.length == 0) {
+            return;
+        }
+
+        const dataServerStatus = await vscode.commands.executeCommand("sema4ai-data.dataserver.status");
+        if (!dataServerStatus["success"]) {
+            return;
+        }
+
+        const currentDatasources: Map<string, Map<string, DatasourceInfo>> = new Map();
+
+        for (const actionPackage of localActionPackages) {
+            const dataSourceStateResult = (await langServer.sendRequest("computeDataSourceState", {
+                "action_package_yaml_directory_uri": actionPackage.directory,
+                "data_server_info": dataServerStatus["data"],
+            })) as ActionResult<DataSourceState>;
+
+            if (dataSourceStateResult.success) {
+                const dataSourcesState: DatasourceInfo[] = dataSourceStateResult.result.required_data_sources;
+                for (const item of dataSourcesState) {
+                    const innerMap = currentDatasources.get(actionPackage.filePath) ?? new Map();
+                    innerMap.set(getDataSourceCaption(item), item);
+
+                    currentDatasources.set(actionPackage.filePath, innerMap);
+                }
+            }
+        }
+
+        if (currentDatasources.size > 0 && dataSourcesAreDifferent(this.globalDataSourceState, currentDatasources)) {
+            this.globalDataSourceState = currentDatasources;
+            this.fireRootChange();
+        }
+    }
+
     /**
      * Note that we make sure to only return valid entries here (i.e.: no entries
      * where RobotEntry.type === RobotEntryType.Error).
@@ -93,6 +166,7 @@ export class RobotsTreeDataProvider implements vscode.TreeDataProvider<RobotEntr
         if (element === undefined) {
             // i.e.: this is the root entry, so, we've
             // collected the actual robots here.
+            this.updateDatasourceStatuses();
 
             let notifySelection = false;
             if (empty(this.lastRoot) && empty(ret)) {
@@ -521,7 +595,22 @@ export class RobotsTreeDataProvider implements vscode.TreeDataProvider<RobotEntr
                 const children: RobotEntry[] = [];
 
                 for (const datasource of element.extraData.datasources) {
-                    let name = getDataSourceCaption(datasource);
+                    let dbName = getDataSourceCaption(datasource);
+                    let dataSourcesFromActionPackage = this.globalDataSourceState.get(element.robot.filePath);
+                    let isConfigured = dataSourcesFromActionPackage?.get(dbName)?.configured;
+
+                    let name = `${dbName} ?`;
+                    if (isConfigured !== undefined) {
+                        if (
+                            datasource.model_state &&
+                            ["generating", "training", "creating"].includes(datasource.model_state)
+                        ) {
+                            name = `${dbName} ◌`;
+                        } else {
+                            name = `${dbName} ${isConfigured ? "✓" : "✗"}`;
+                        }
+                    }
+
                     children.push({
                         "label": name,
                         "actionName": datasource.name,