From b7e0f780e6689ca4ac54696d3afa99ab4a59e6cc Mon Sep 17 00:00:00 2001
From: Amogh Desai <amoghrajesh1999@gmail.com>
Date: Thu, 11 Jun 2026 21:40:10 +0530
Subject: [PATCH 1/2] UI: Add a column in asset store display table linking to
 the TI that wrote it

---
 .../ui/public/i18n/locales/en/assets.json     |  1 +
 .../src/pages/Asset/AssetStore/AssetStore.tsx | 41 ++++++++++++++++++-
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/airflow-core/src/airflow/ui/public/i18n/locales/en/assets.json b/airflow-core/src/airflow/ui/public/i18n/locales/en/assets.json
index 2e933a2fbcc38..b49e30f5cc6bc 100644
--- a/airflow-core/src/airflow/ui/public/i18n/locales/en/assets.json
+++ b/airflow-core/src/airflow/ui/public/i18n/locales/en/assets.json
@@ -13,6 +13,7 @@
     "deleteWarning": "The asset will lose this persisted store entry.",
     "edit": "Edit Asset Store",
     "emptyState": "Asset store stores values scoped to an asset identity, shared across all Dag runs. Workers can write asset store via the Task SDK.",
+    "lastUpdatedBy": "Last Updated By",
     "title": "Asset Store"
   },
   "consumingDags": "Consuming Dags",
diff --git a/airflow-core/src/airflow/ui/src/pages/Asset/AssetStore/AssetStore.tsx b/airflow-core/src/airflow/ui/src/pages/Asset/AssetStore/AssetStore.tsx
index 418a46b17cdb2..0717191d1f9be 100644
--- a/airflow-core/src/airflow/ui/src/pages/Asset/AssetStore/AssetStore.tsx
+++ b/airflow-core/src/airflow/ui/src/pages/Asset/AssetStore/AssetStore.tsx
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Flex, Text } from "@chakra-ui/react";
+import { Flex, Link, Text } from "@chakra-ui/react";
 import type { ColumnDef } from "@tanstack/react-table";
 import { useTranslation } from "react-i18next";
-import { useParams } from "react-router-dom";
+import { Link as RouterLink, useParams } from "react-router-dom";
 
 import { useAssetStoreServiceListAssetStore } from "openapi/queries";
 import type { AssetStoreResponse } from "openapi/requests";
@@ -56,6 +56,43 @@ const getColumns = ({ assetId, translate }: ColumnsProps): Array<ColumnDef<Asset
     cell: ({ row: { original } }) => <Time datetime={original.updated_at} />,
     header: translate("common:table.updatedAt"),
   },
+  {
+    accessorKey: "last_updated_by",
+    cell: ({ row: { original } }) => {
+      const writer = original.last_updated_by;
+
+      if (!writer) {
+        return <Text color="fg.muted">—</Text>;
+      }
+      if (
+        writer.kind === "task" &&
+        writer.dag_id !== null &&
+        writer.run_id !== null &&
+        writer.task_id !== null
+      ) {
+        const mapSuffix =
+          writer.map_index !== null && writer.map_index !== undefined && writer.map_index >= 0
+            ? `/mapped/${writer.map_index}`
+            : "";
+        const path = `/dags/${writer.dag_id}/runs/${writer.run_id}/tasks/${writer.task_id}${mapSuffix}`;
+
+        return (
+          <Flex direction="column">
+            <Link asChild color="fg.info">
+              <RouterLink to={path}>{writer.task_id}</RouterLink>
+            </Link>
+            <Text color="fg.muted" fontSize="xs">
+              {writer.dag_id}
+            </Text>
+          </Flex>
+        );
+      }
+
+      return <Text>{writer.kind === "api" ? "API" : "Watcher"}</Text>;
+    },
+    enableSorting: false,
+    header: translate("assets:assetStore.lastUpdatedBy"),
+  },
   {
     accessorKey: "actions",
     cell: ({ row: { original } }) => (

From 4d4b2a9712478018954b37eae156ccf07df51553 Mon Sep 17 00:00:00 2001
From: Amogh Desai <amoghrajesh1999@gmail.com>
Date: Thu, 11 Jun 2026 22:05:40 +0530
Subject: [PATCH 2/2] brents review

---
 .../ui/public/i18n/locales/en/assets.json     |  2 +
 .../src/pages/Asset/AssetStore/AssetStore.tsx | 40 +++++++++++++------
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/airflow-core/src/airflow/ui/public/i18n/locales/en/assets.json b/airflow-core/src/airflow/ui/public/i18n/locales/en/assets.json
index b49e30f5cc6bc..95b7fe7c5da28 100644
--- a/airflow-core/src/airflow/ui/public/i18n/locales/en/assets.json
+++ b/airflow-core/src/airflow/ui/public/i18n/locales/en/assets.json
@@ -14,6 +14,8 @@
     "edit": "Edit Asset Store",
     "emptyState": "Asset store stores values scoped to an asset identity, shared across all Dag runs. Workers can write asset store via the Task SDK.",
     "lastUpdatedBy": "Last Updated By",
+    "lastUpdatedByApi": "API",
+    "lastUpdatedByWatcher": "Watcher",
     "title": "Asset Store"
   },
   "consumingDags": "Consuming Dags",
diff --git a/airflow-core/src/airflow/ui/src/pages/Asset/AssetStore/AssetStore.tsx b/airflow-core/src/airflow/ui/src/pages/Asset/AssetStore/AssetStore.tsx
index 0717191d1f9be..99ca52fc5be50 100644
--- a/airflow-core/src/airflow/ui/src/pages/Asset/AssetStore/AssetStore.tsx
+++ b/airflow-core/src/airflow/ui/src/pages/Asset/AssetStore/AssetStore.tsx
@@ -22,18 +22,30 @@ import { useTranslation } from "react-i18next";
 import { Link as RouterLink, useParams } from "react-router-dom";
 
 import { useAssetStoreServiceListAssetStore } from "openapi/queries";
-import type { AssetStoreResponse } from "openapi/requests";
+import type { AssetStoreLastUpdatedBy, AssetStoreResponse } from "openapi/requests";
 import { DataTable } from "src/components/DataTable";
 import { useTableURLState } from "src/components/DataTable/useTableUrlState";
 import { ErrorAlert } from "src/components/ErrorAlert";
 import { StoreValueCell } from "src/components/StoreValueCell";
 import Time from "src/components/Time";
+import { getTaskInstanceLink } from "src/utils/links";
 
 import { AddAssetStoreButton } from "./AddAssetStoreButton";
 import { ClearAllAssetStoreButton } from "./ClearAllAssetStoreButton";
 import { DeleteAssetStoreButton } from "./DeleteAssetStoreButton";
 import { EditAssetStoreButton } from "./EditAssetStoreButton";
 
+type TaskWriter = { dag_id: string; run_id: string; task_id: string } & AssetStoreLastUpdatedBy;
+
+const isTaskWriter = (writer: AssetStoreLastUpdatedBy): writer is TaskWriter =>
+  writer.kind === "task" &&
+  writer.dag_id !== null &&
+  writer.dag_id !== undefined &&
+  writer.run_id !== null &&
+  writer.run_id !== undefined &&
+  writer.task_id !== null &&
+  writer.task_id !== undefined;
+
 type ColumnsProps = {
   readonly assetId: number;
   readonly translate: (key: string) => string;
@@ -64,17 +76,13 @@ const getColumns = ({ assetId, translate }: ColumnsProps): Array<ColumnDef<Asset
       if (!writer) {
         return <Text color="fg.muted">—</Text>;
       }
-      if (
-        writer.kind === "task" &&
-        writer.dag_id !== null &&
-        writer.run_id !== null &&
-        writer.task_id !== null
-      ) {
-        const mapSuffix =
-          writer.map_index !== null && writer.map_index !== undefined && writer.map_index >= 0
-            ? `/mapped/${writer.map_index}`
-            : "";
-        const path = `/dags/${writer.dag_id}/runs/${writer.run_id}/tasks/${writer.task_id}${mapSuffix}`;
+      if (isTaskWriter(writer)) {
+        const path = getTaskInstanceLink({
+          dagId: writer.dag_id,
+          dagRunId: writer.run_id,
+          mapIndex: writer.map_index ?? undefined,
+          taskId: writer.task_id,
+        });
 
         return (
           <Flex direction="column">
@@ -88,7 +96,13 @@ const getColumns = ({ assetId, translate }: ColumnsProps): Array<ColumnDef<Asset
         );
       }
 
-      return <Text>{writer.kind === "api" ? "API" : "Watcher"}</Text>;
+      return (
+        <Text>
+          {writer.kind === "api"
+            ? translate("assets:assetStore.lastUpdatedByApi")
+            : translate("assets:assetStore.lastUpdatedByWatcher")}
+        </Text>
+      );
     },
     enableSorting: false,
     header: translate("assets:assetStore.lastUpdatedBy"),