diff --git a/apps/hash-api/src/ai/infer-entities-websocket.ts b/apps/hash-api/src/ai/infer-entities-websocket.ts
index ca503872017..1cd21d0a21d 100644
--- a/apps/hash-api/src/ai/infer-entities-websocket.ts
+++ b/apps/hash-api/src/ai/infer-entities-websocket.ts
@@ -14,7 +14,6 @@ import { handleInferEntitiesRequest } from "./infer-entities-websocket/handle-in
 
 import type { GraphApi, ImpureGraphContext } from "../graph/context-types";
 import type { User } from "../graph/knowledge/system-types/user";
-import type { EntityUuid } from "@blockprotocol/type-system";
 import type { FileStorageProvider } from "@local/hash-backend-utils/file-storage";
 import type { Logger } from "@local/hash-backend-utils/logger";
 import type {
@@ -89,7 +88,7 @@ const inferEntitiesMessageHandler = async ({
         for (const inputRequest of flowRun.inputRequests) {
           if (!inputRequest.resolvedAt) {
             const requestMessage: ExternalInputWebsocketRequestMessage = {
-              workflowId: flowRun.flowRunId,
+              flowRunEntityId: flowRun.flowRunEntityId,
               payload: inputRequest,
               type: "external-input-request",
             };
@@ -100,11 +99,11 @@ const inferEntitiesMessageHandler = async ({
       return;
     }
     case "external-input-response": {
-      const { workflowId, payload } = message;
+      const { flowRunEntityId, payload } = message;
 
       const flow = await getFlowRunEntityById({
         userAuthentication: { actorId: user.accountId },
-        flowRunId: workflowId as EntityUuid,
+        flowRunEntityId,
         graphApiClient,
       });
 
@@ -112,7 +111,9 @@ const inferEntitiesMessageHandler = async ({
         return;
       }
 
-      const handle = temporalClient.workflow.getHandle(workflowId);
+      const handle = temporalClient.workflow.getHandle(
+        flow.properties["https://hash.ai/@h/types/property-type/workflow-id/"],
+      );
       await handle.signal<[ExternalInputResponseSignal]>(
         externalInputResponseSignal,
         { ...payload, resolvedBy: user.accountId },
@@ -152,7 +153,7 @@ const isInferenceWebsocketClientMessage = (
       );
     case "cancel-inference-request":
       return (
-        typeof message.flowRunId === "string" &&
+        typeof message.flowRunEntityId === "string" &&
         typeof message.requestUuid === "string" &&
         hasValidOptionalCookie(message)
       );
@@ -160,7 +161,7 @@ const isInferenceWebsocketClientMessage = (
       return hasValidOptionalCookie(message);
     case "external-input-response":
       return (
-        typeof message.workflowId === "string" &&
+        typeof message.flowRunEntityId === "string" &&
         typeof message.payload === "object" &&
         message.payload !== null &&
         hasValidOptionalCookie(message)
diff --git a/apps/hash-api/src/ai/infer-entities-websocket/handle-cancel-infer-entities-request.ts b/apps/hash-api/src/ai/infer-entities-websocket/handle-cancel-infer-entities-request.ts
index 45737e15632..6b389e84a64 100644
--- a/apps/hash-api/src/ai/infer-entities-websocket/handle-cancel-infer-entities-request.ts
+++ b/apps/hash-api/src/ai/infer-entities-websocket/handle-cancel-infer-entities-request.ts
@@ -2,7 +2,6 @@ import { getFlowRunEntityById } from "@local/hash-backend-utils/flows";
 
 import type { GraphApi } from "../../graph/context-types";
 import type { User } from "../../graph/knowledge/system-types/user";
-import type { EntityUuid } from "@blockprotocol/type-system";
 import type { CancelInferEntitiesWebsocketRequestMessage } from "@local/hash-isomorphic-utils/ai-inference-types";
 import type { Client } from "@temporalio/client";
 
@@ -17,11 +16,11 @@ export const handleCancelInferEntitiesRequest = async ({
   message: Omit<CancelInferEntitiesWebsocketRequestMessage, "cookie">;
   user: User;
 }) => {
-  const { flowRunId } = message;
+  const { flowRunEntityId } = message;
 
   const flow = await getFlowRunEntityById({
     userAuthentication: { actorId: user.accountId },
-    flowRunId: flowRunId as EntityUuid,
+    flowRunEntityId,
     graphApiClient,
   });
 
@@ -29,7 +28,9 @@ export const handleCancelInferEntitiesRequest = async ({
     return;
   }
 
-  const workflowHandle = temporalClient.workflow.getHandle(flowRunId);
+  const workflowHandle = temporalClient.workflow.getHandle(
+    flow.properties["https://hash.ai/@h/types/property-type/workflow-id/"],
+  );
 
   void workflowHandle.cancel();
 };
diff --git a/apps/hash-api/src/ai/infer-entities-websocket/handle-infer-entities-request.ts b/apps/hash-api/src/ai/infer-entities-websocket/handle-infer-entities-request.ts
index 26fc0bbd5bc..3f8b6c2e0b5 100644
--- a/apps/hash-api/src/ai/infer-entities-websocket/handle-infer-entities-request.ts
+++ b/apps/hash-api/src/ai/infer-entities-websocket/handle-infer-entities-request.ts
@@ -7,6 +7,7 @@ import {
 import { FlowRunStatus } from "../../graphql/api-types.gen";
 
 import type { User } from "../../graph/knowledge/system-types/user";
+import type { EntityUuid } from "@blockprotocol/type-system";
 import type { DistributiveOmit } from "@local/advanced-types/distribute";
 import type { FileStorageProvider } from "@local/hash-backend-utils/file-storage";
 import type { GraphApi } from "@local/hash-graph-client";
@@ -95,6 +96,8 @@ export const handleInferEntitiesRequest = async ({
         },
         flowDefinitionId,
         flowInputs,
+        /* So that the run's entity id can be worked out from the request, as the browser plugin does. */
+        flowRunEntityUuid: requestUuid as EntityUuid,
         userAuthentication: { actorId: user.accountId },
         webId,
       },
diff --git a/apps/hash-api/src/graphql/resolvers/flows/cancel-flow.ts b/apps/hash-api/src/graphql/resolvers/flows/cancel-flow.ts
index c1792600628..e76e02d96e7 100644
--- a/apps/hash-api/src/graphql/resolvers/flows/cancel-flow.ts
+++ b/apps/hash-api/src/graphql/resolvers/flows/cancel-flow.ts
@@ -7,7 +7,6 @@ import * as Error from "../../error";
 
 import type { MutationResetFlowArgs, ResolverFn } from "../../api-types.gen";
 import type { LoggedInGraphQLContext } from "../../context";
-import type { EntityUuid } from "@blockprotocol/type-system";
 
 export const cancelFlow: ResolverFn<
   Promise<boolean>,
@@ -16,19 +15,22 @@ export const cancelFlow: ResolverFn<
   MutationResetFlowArgs
 > = async (
   _,
-  { flowUuid },
+  { flowRunEntityId },
   { authentication, dataSources, provenance, temporal, user },
 ) => {
   const flow = await getFlowRunEntityById({
-    flowRunId: flowUuid as EntityUuid,
+    flowRunEntityId,
     graphApiClient: dataSources.graphApi,
     userAuthentication: authentication,
   });
 
   if (!flow) {
-    throw Error.notFound(`Flow with id ${flowUuid} not found`);
+    throw Error.notFound(`Flow with id ${flowRunEntityId} not found`);
   }
 
+  const workflowId =
+    flow.properties["https://hash.ai/@h/types/property-type/workflow-id/"];
+
   const userCanModify = await checkEntityPermission(
     { graphApi: dataSources.graphApi, provenance },
     authentication,
@@ -45,7 +47,7 @@ export const cancelFlow: ResolverFn<
   await temporal.workflowService.requestCancelWorkflowExecution({
     namespace: temporalNamespace,
     workflowExecution: {
-      workflowId: flowUuid,
+      workflowId,
     },
     reason: `Cancelled via GraphQL API by @${user.shortname}`,
     requestId: generateUuid(),
diff --git a/apps/hash-api/src/graphql/resolvers/flows/get-flow-run-by-id.ts b/apps/hash-api/src/graphql/resolvers/flows/get-flow-run-by-id.ts
index 0e647e13cbd..ff209e131b0 100644
--- a/apps/hash-api/src/graphql/resolvers/flows/get-flow-run-by-id.ts
+++ b/apps/hash-api/src/graphql/resolvers/flows/get-flow-run-by-id.ts
@@ -9,7 +9,6 @@ import type {
   ResolverFn,
 } from "../../api-types.gen";
 import type { GraphQLContext } from "../../context";
-import type { EntityUuid } from "@blockprotocol/type-system";
 import type { SparseFlowRun } from "@local/hash-isomorphic-utils/flows/types";
 
 export const getFlowRunByIdResolver: ResolverFn<
@@ -18,12 +17,12 @@ export const getFlowRunByIdResolver: ResolverFn<
   Pick<GraphQLContext, "authentication" | "dataSources" | "temporal">,
   QueryGetFlowRunByIdArgs
 > = async (_parent, args, context, info) => {
-  const { flowRunId } = args;
+  const { flowRunEntityId } = args;
 
   const includeDetails = wereDetailedFieldsRequested(info);
 
   const flowRun = await getFlowRunById({
-    flowRunId: flowRunId as EntityUuid,
+    flowRunEntityId,
     graphApiClient: context.dataSources.graphApi,
     includeDetails,
     storageProvider: context.dataSources.uploadProvider,
@@ -32,7 +31,7 @@ export const getFlowRunByIdResolver: ResolverFn<
   });
 
   if (!flowRun) {
-    throw Error.notFound(`Flow run with id ${flowRunId} not found`);
+    throw Error.notFound(`Flow run with id ${flowRunEntityId} not found`);
   }
 
   return flowRun;
diff --git a/apps/hash-api/src/graphql/resolvers/flows/reset-flow.ts b/apps/hash-api/src/graphql/resolvers/flows/reset-flow.ts
index f5811ba8003..02b4495bf19 100644
--- a/apps/hash-api/src/graphql/resolvers/flows/reset-flow.ts
+++ b/apps/hash-api/src/graphql/resolvers/flows/reset-flow.ts
@@ -10,7 +10,6 @@ import * as Error from "../../error";
 
 import type { MutationResetFlowArgs, ResolverFn } from "../../api-types.gen";
 import type { LoggedInGraphQLContext } from "../../context";
-import type { EntityUuid } from "@blockprotocol/type-system";
 
 export const resetFlow: ResolverFn<
   Promise<boolean>,
@@ -19,19 +18,22 @@ export const resetFlow: ResolverFn<
   MutationResetFlowArgs
 > = async (
   _,
-  { flowUuid, checkpointId, eventId },
+  { flowRunEntityId, checkpointId, eventId },
   { authentication, dataSources, provenance, temporal },
 ) => {
   const flow = await getFlowRunEntityById({
-    flowRunId: flowUuid as EntityUuid,
+    flowRunEntityId,
     graphApiClient: dataSources.graphApi,
     userAuthentication: authentication,
   });
 
   if (!flow) {
-    throw Error.notFound(`Flow with id ${flowUuid} not found`);
+    throw Error.notFound(`Flow with id ${flowRunEntityId} not found`);
   }
 
+  const workflowId =
+    flow.properties["https://hash.ai/@h/types/property-type/workflow-id/"];
+
   const userCanModify = await checkEntityPermission(
     { graphApi: dataSources.graphApi, provenance },
     authentication,
@@ -48,7 +50,7 @@ export const resetFlow: ResolverFn<
   await temporal.workflowService.resetWorkflowExecution({
     namespace: temporalNamespace,
     workflowExecution: {
-      workflowId: flowUuid,
+      workflowId,
     },
     /**
      * If we don't set this, Temporal will replay signals sent after the cancellation point to the new workflow execution.
diff --git a/apps/hash-api/src/graphql/resolvers/flows/start-flow.ts b/apps/hash-api/src/graphql/resolvers/flows/start-flow.ts
index 220226c836b..0e5580ac104 100644
--- a/apps/hash-api/src/graphql/resolvers/flows/start-flow.ts
+++ b/apps/hash-api/src/graphql/resolvers/flows/start-flow.ts
@@ -1,3 +1,4 @@
+import { entityIdFromComponents } from "@blockprotocol/type-system";
 import { generateUuid } from "@local/hash-isomorphic-utils/generate-uuid";
 
 import {
@@ -9,14 +10,14 @@ import { assertClientFlowInputs } from "./shared/assert-client-flow-inputs";
 import { getRunnableFlowDefinition } from "./shared/get-runnable-flow-definition";
 
 import type { LoggedInGraphQLContext } from "../../context";
-import type { EntityUuid } from "@blockprotocol/type-system";
+import type { EntityId, EntityUuid } from "@blockprotocol/type-system";
 import type {
   RunFlowWorkflowParams,
   RunFlowWorkflowResponse,
 } from "@local/hash-isomorphic-utils/flows/temporal-types";
 
 export const startFlow: ResolverFn<
-  Promise<EntityUuid>,
+  Promise<EntityId>,
   Record<string, never>,
   LoggedInGraphQLContext,
   MutationStartFlowArgs
@@ -45,7 +46,7 @@ export const startFlow: ResolverFn<
 
   const params: RunFlowWorkflowParams = {
     ...(flowType === "ai" ? { dataSources } : {}),
-    flowRunId: workflowId,
+    flowRunEntityUuid: workflowId,
     flowInputs,
     flowDefinitionId,
     userAuthentication: { actorId: user.accountId },
@@ -68,5 +69,5 @@ export const startFlow: ResolverFn<
     },
   });
 
-  return workflowId;
+  return entityIdFromComponents(webId, workflowId);
 };
diff --git a/apps/hash-api/src/graphql/resolvers/flows/submit-external-input-response.ts b/apps/hash-api/src/graphql/resolvers/flows/submit-external-input-response.ts
index 91ddb0ed5f6..d2ecbfe5afd 100644
--- a/apps/hash-api/src/graphql/resolvers/flows/submit-external-input-response.ts
+++ b/apps/hash-api/src/graphql/resolvers/flows/submit-external-input-response.ts
@@ -8,7 +8,6 @@ import type {
   ResolverFn,
 } from "../../api-types.gen";
 import type { LoggedInGraphQLContext } from "../../context";
-import type { EntityUuid } from "@blockprotocol/type-system";
 
 export const submitExternalInputResponse: ResolverFn<
   Promise<boolean>,
@@ -17,20 +16,23 @@ export const submitExternalInputResponse: ResolverFn<
   MutationSubmitExternalInputResponseArgs
 > = async (
   _,
-  { response, flowUuid },
+  { response, flowRunEntityId },
   { authentication, dataSources, temporal },
 ) => {
   const flow = await getFlowRunEntityById({
-    flowRunId: flowUuid as EntityUuid,
+    flowRunEntityId,
     graphApiClient: dataSources.graphApi,
     userAuthentication: authentication,
   });
 
   if (!flow) {
-    throw Error.notFound(`Flow with id ${flowUuid} not found`);
+    throw Error.notFound(`Flow with id ${flowRunEntityId} not found`);
   }
 
-  const handle = temporal.workflow.getHandle(flowUuid);
+  const workflowId =
+    flow.properties["https://hash.ai/@h/types/property-type/workflow-id/"];
+
+  const handle = temporal.workflow.getHandle(workflowId);
 
   await handle.signal(externalInputResponseSignal, response);
 
diff --git a/apps/hash-frontend/src/graphql/queries/knowledge/flow.queries.ts b/apps/hash-frontend/src/graphql/queries/knowledge/flow.queries.ts
index 772aa942acb..ed1c80643b9 100644
--- a/apps/hash-frontend/src/graphql/queries/knowledge/flow.queries.ts
+++ b/apps/hash-frontend/src/graphql/queries/knowledge/flow.queries.ts
@@ -17,18 +17,22 @@ export const startFlowMutation = gql`
 `;
 
 export const resetFlowMutation = gql`
-  mutation resetFlow($flowUuid: ID!, $checkpointId: ID!, $eventId: Int!) {
+  mutation resetFlow(
+    $flowRunEntityId: EntityId!
+    $checkpointId: ID!
+    $eventId: Int!
+  ) {
     resetFlow(
       checkpointId: $checkpointId
       eventId: $eventId
-      flowUuid: $flowUuid
+      flowRunEntityId: $flowRunEntityId
     )
   }
 `;
 
 export const cancelFlowMutation = gql`
-  mutation cancelFlow($flowUuid: ID!) {
-    cancelFlow(flowUuid: $flowUuid)
+  mutation cancelFlow($flowRunEntityId: EntityId!) {
+    cancelFlow(flowRunEntityId: $flowRunEntityId)
   }
 `;
 
diff --git a/apps/hash-frontend/src/pages/@/[shortname]/flows/[flow-def-id].page.tsx b/apps/hash-frontend/src/pages/@/[shortname]/flows/[flow-def-id].page.tsx
index 51cd401c862..ecafb83d3f8 100644
--- a/apps/hash-frontend/src/pages/@/[shortname]/flows/[flow-def-id].page.tsx
+++ b/apps/hash-frontend/src/pages/@/[shortname]/flows/[flow-def-id].page.tsx
@@ -18,7 +18,7 @@ const FlowDefinitionPage: NextPageWithLayout = () => {
     <FlowDefinitionsContextProvider
       selectedFlowDefinitionId={routeFlowDefinitionId}
     >
-      <FlowRunsContextProvider selectedFlowRunId={null}>
+      <FlowRunsContextProvider selectedFlowRunEntityId={null}>
         <FlowVisualizer />
       </FlowRunsContextProvider>
     </FlowDefinitionsContextProvider>
diff --git a/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer.tsx b/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer.tsx
index e7558c3831b..7e313a1d427 100644
--- a/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer.tsx
+++ b/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer.tsx
@@ -603,8 +603,8 @@ export const FlowVisualizer = () => {
       try {
         const { data } = await startFlow({ variables });
 
-        const flowRunId = data?.startFlow;
-        if (!flowRunId) {
+        const flowRunEntityId = data?.startFlow;
+        if (!flowRunEntityId) {
           throw new Error("Failed to start flow");
         }
 
@@ -616,7 +616,7 @@ export const FlowVisualizer = () => {
 
         const { shortname } = getOwner({ webId: variables.webId });
 
-        void push(generateWorkerRunPath({ shortname, flowRunId }));
+        void push(generateWorkerRunPath({ shortname, flowRunEntityId }));
       } finally {
         setStartFlowPending(false);
       }
@@ -646,7 +646,7 @@ export const FlowVisualizer = () => {
 
   const flowDefinitionStateKey = `${selectedFlowDefinition.name} ?? "loading`;
   const flowRunStateKey = `${flowDefinitionStateKey}-${
-    selectedFlowRun?.flowRunId ?? "definition"
+    selectedFlowRun?.flowRunEntityId ?? "definition"
   }`;
 
   const isRunnableFromHere = !unrunnableDefinitionIds.includes(
@@ -707,7 +707,7 @@ export const FlowVisualizer = () => {
           {selectedFlowRun ? (
             <FlowRunSidebar
               flowDefinitionId={selectedFlow.flowDefinitionId}
-              flowRunId={selectedFlowRun.flowRunId}
+              flowRunEntityId={selectedFlowRun.flowRunEntityId}
               flowScheduleId={selectedFlowRun.flowScheduleId ?? null}
               graph={graph}
               name={selectedFlowRun.name}
diff --git a/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/activity-log.tsx b/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/activity-log.tsx
index 796230b1921..9db6df1ac84 100644
--- a/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/activity-log.tsx
+++ b/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/activity-log.tsx
@@ -251,7 +251,7 @@ const Checkpoint = ({ log }: { log: CheckpointLog }) => {
 
     void resetFlow({
       variables: {
-        flowUuid: selectedFlowRun.flowRunId,
+        flowRunEntityId: selectedFlowRun.flowRunEntityId,
         checkpointId: log.checkpointId,
         eventId: log.eventId,
       },
diff --git a/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/flow-run-sidebar.tsx b/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/flow-run-sidebar.tsx
index 45c8d74aefc..ef523fbe993 100644
--- a/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/flow-run-sidebar.tsx
+++ b/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/flow-run-sidebar.tsx
@@ -22,7 +22,7 @@ import { flowSectionBorderRadius } from "./shared/styles";
 
 import type { FlowRun } from "../../../../../graphql/api-types.gen";
 import type { EdgesAndNodes } from "./shared/types";
-import type { EntityUuid } from "@blockprotocol/type-system";
+import type { EntityId, EntityUuid } from "@blockprotocol/type-system";
 import type { PropsWithChildren } from "react";
 
 const SidebarSection = ({ children }: PropsWithChildren) => (
@@ -41,7 +41,7 @@ const SidebarSection = ({ children }: PropsWithChildren) => (
 
 type FlowRunSidebarProps = {
   flowDefinitionId: EntityUuid;
-  flowRunId: EntityUuid;
+  flowRunEntityId: EntityId;
   flowScheduleId: EntityUuid | null;
   graph: EdgesAndNodes;
   name: FlowRun["name"];
@@ -50,7 +50,7 @@ type FlowRunSidebarProps = {
 
 export const FlowRunSidebar = ({
   flowDefinitionId,
-  flowRunId,
+  flowRunEntityId,
   flowScheduleId,
   graph,
   name,
@@ -59,14 +59,14 @@ export const FlowRunSidebar = ({
   const { selectedFlowRun } = useFlowRunsContext();
 
   const { isUsageAvailable, usageByFlowRun } = useFlowRunsUsage({
-    flowRunIds: [flowRunId],
+    flowRunEntityIds: [flowRunEntityId],
     pollInterval: selectedFlowRun?.closedAt ? 0 : 5_000,
   });
 
   const [showUsageBreakdown, setShowUsageBreakdown] = useState(false);
   const [showResearchPrompt, setShowResearchPrompt] = useState(false);
 
-  const usage = usageByFlowRun[flowRunId];
+  const usage = usageByFlowRun[flowRunEntityId];
 
   const nameParts = useMemo<{ text: string; url?: boolean }[]>(() => {
     const parts = name.split(/( )/g);
diff --git a/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/outputs/claims-output.tsx b/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/outputs/claims-output.tsx
index 11faa671a0a..5d087c1d419 100644
--- a/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/outputs/claims-output.tsx
+++ b/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/outputs/claims-output.tsx
@@ -2,7 +2,6 @@ import { useQuery } from "@apollo/client";
 import { memo, useLayoutEffect, useMemo, useRef, useState } from "react";
 
 import { getRoots } from "@blockprotocol/graph/stdlib";
-import { entityIdFromComponents } from "@blockprotocol/type-system";
 import { deserializeQueryEntitySubgraphResponse } from "@local/hash-graph-sdk/entity";
 import { currentTimeInstantTemporalAxes } from "@local/hash-isomorphic-utils/graph-queries";
 import { systemEntityTypes } from "@local/hash-isomorphic-utils/ontology-type-ids";
@@ -51,12 +50,7 @@ export const ClaimsOutput = memo(({ proposedEntities }: ClaimsTableProps) => {
                   path: ["editionProvenance", "origin", "id"],
                 },
                 {
-                  parameter: selectedFlowRun
-                    ? entityIdFromComponents(
-                        selectedFlowRun.webId,
-                        selectedFlowRun.flowRunId,
-                      )
-                    : "never",
+                  parameter: selectedFlowRun?.flowRunEntityId ?? "never",
                 },
               ],
             },
diff --git a/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/shared/question-modal.tsx b/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/shared/question-modal.tsx
index bc82f4c67b3..92b77ddfefb 100644
--- a/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/shared/question-modal.tsx
+++ b/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/shared/question-modal.tsx
@@ -69,7 +69,7 @@ export const QuestionModal = ({
     );
   }
 
-  const { selectedFlowRunId } = useFlowRunsContext();
+  const { selectedFlowRunEntityId } = useFlowRunsContext();
 
   const [submitExternalInputResponse] = useMutation<
     SubmitExternalInputResponseMutation,
@@ -87,13 +87,13 @@ export const QuestionModal = ({
   );
 
   const submitAnswers = async () => {
-    if (!allQuestionsAnswered || !selectedFlowRunId) {
+    if (!allQuestionsAnswered || !selectedFlowRunEntityId) {
       return;
     }
 
     await submitExternalInputResponse({
       variables: {
-        flowUuid: selectedFlowRunId,
+        flowRunEntityId: selectedFlowRunEntityId,
         response: {
           requestId: inputRequest.requestId,
           type: "human-input",
diff --git a/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/topbar.tsx b/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/topbar.tsx
index bf1ad6bf4da..8f2dff42218 100644
--- a/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/topbar.tsx
+++ b/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/topbar.tsx
@@ -35,7 +35,6 @@ import type {
   CancelFlowMutationVariables,
   FlowRun,
 } from "../../../../../graphql/api-types.gen";
-import type { EntityUuid } from "@blockprotocol/type-system";
 import type { SvgIconProps, SxProps, Theme } from "@mui/material";
 import type { FunctionComponent } from "react";
 
@@ -170,7 +169,8 @@ export const Topbar = ({
   const { flowDefinitions, selectedFlowDefinitionId } =
     useFlowDefinitionsContext();
 
-  const { flowRuns, selectedFlowRunId, selectedFlowRun } = useFlowRunsContext();
+  const { flowRuns, selectedFlowRunEntityId, selectedFlowRun } =
+    useFlowRunsContext();
 
   const [cancelFlow] = useMutation<
     CancelFlowMutation,
@@ -178,11 +178,13 @@ export const Topbar = ({
   >(cancelFlowMutation);
 
   const onCancelFlowClicked = useCallback(async () => {
-    if (selectedFlowRunId) {
+    if (selectedFlowRunEntityId) {
       setCancelling(true);
 
       try {
-        await cancelFlow({ variables: { flowUuid: selectedFlowRunId } });
+        await cancelFlow({
+          variables: { flowRunEntityId: selectedFlowRunEntityId },
+        });
       } catch {
         /**
          * We don't nee to worry about the success case because the cancel flow button will disappear
@@ -190,7 +192,7 @@ export const Topbar = ({
         setCancelling(false);
       }
     }
-  }, [cancelFlow, selectedFlowRunId]);
+  }, [cancelFlow, selectedFlowRunEntityId]);
 
   const onRunFlowClicked = useCallback(() => {
     handleRunFlowClicked();
@@ -290,7 +292,7 @@ export const Topbar = ({
             ) : (
               <Select
                 selectSx={{ ...selectSx, minWidth: 100 }}
-                value={selectedFlowRunId ?? "none"}
+                value={selectedFlowRunEntityId ?? "none"}
                 onChange={(event) => {
                   const value = event.target.value;
 
@@ -305,7 +307,7 @@ export const Topbar = ({
                   }
 
                   const flowRun = flowRuns.find(
-                    (run) => run.flowRunId === value,
+                    (run) => run.flowRunEntityId === value,
                   );
                   if (!flowRun) {
                     throw new Error(`Flow run with id ${value} not found`);
@@ -316,7 +318,7 @@ export const Topbar = ({
                   void push(
                     generateWorkerRunPath({
                       shortname,
-                      flowRunId: value as EntityUuid,
+                      flowRunEntityId: flowRun.flowRunEntityId,
                     }),
                   );
                 }}
@@ -326,8 +328,8 @@ export const Topbar = ({
                 </MenuItem>
                 {runOptions.map((run) => (
                   <MenuItem
-                    key={run.flowRunId}
-                    value={run.flowRunId}
+                    key={run.flowRunEntityId}
+                    value={run.flowRunEntityId}
                     sx={{ fontFamily: "monospace" }}
                   >
                     {generateRunLabel(run)}
diff --git a/apps/hash-frontend/src/pages/@/[shortname]/workers/[run-id].page.tsx b/apps/hash-frontend/src/pages/@/[shortname]/workers/[run-id].page.tsx
index 05bd3e95870..755f8b38a51 100644
--- a/apps/hash-frontend/src/pages/@/[shortname]/workers/[run-id].page.tsx
+++ b/apps/hash-frontend/src/pages/@/[shortname]/workers/[run-id].page.tsx
@@ -1,5 +1,7 @@
 import { useRouter } from "next/router";
 
+import { entityIdFromComponents } from "@blockprotocol/type-system";
+
 import { getLayoutWithSidebar } from "../../../../shared/layout";
 import { FlowDefinitionsContextProvider } from "../../../shared/flow-definitions-context-provider";
 import { useFlowRunsContext } from "../../../shared/flow-runs-context";
@@ -8,6 +10,7 @@ import {
   FlowRunVisualizerSkeleton,
   FlowVisualizer,
 } from "../shared/flow-visualizer";
+import { useRouteNamespace } from "../shared/use-route-namespace";
 
 import type { NextPageWithLayout } from "../../../../shared/layout";
 import type { EntityUuid } from "@blockprotocol/type-system";
@@ -31,10 +34,17 @@ const WorkerFlowDefinitionResolver = () => {
 const WorkerRunPage: NextPageWithLayout = () => {
   const { query } = useRouter();
 
-  const routeFlowRunId = query["run-id"] as string;
+  const routeFlowRunUuid = query["run-id"] as EntityUuid;
+
+  /* The path has the uuid of the run's entity, and its shortname names the web the run is in. */
+  const { routeNamespace } = useRouteNamespace();
+
+  const flowRunEntityId = routeNamespace
+    ? entityIdFromComponents(routeNamespace.webId, routeFlowRunUuid)
+    : null;
 
   return (
-    <FlowRunsContextProvider selectedFlowRunId={routeFlowRunId}>
+    <FlowRunsContextProvider selectedFlowRunEntityId={flowRunEntityId}>
       <WorkerFlowDefinitionResolver />
     </FlowRunsContextProvider>
   );
diff --git a/apps/hash-frontend/src/pages/dashboard/[dashboard-id].page.tsx b/apps/hash-frontend/src/pages/dashboard/[dashboard-id].page.tsx
index f6414546e25..73e2842622d 100644
--- a/apps/hash-frontend/src/pages/dashboard/[dashboard-id].page.tsx
+++ b/apps/hash-frontend/src/pages/dashboard/[dashboard-id].page.tsx
@@ -525,7 +525,7 @@ const DashboardPage: NextPageWithLayout = () => {
   }, [refetch]);
 
   const handleItemGenerationStarted = useCallback(
-    (generation: { itemEntityId: EntityId; flowRunId: string }) => {
+    (generation: { itemEntityId: EntityId; flowRunEntityId: EntityId }) => {
       setConfigModalItemEntityId(generation.itemEntityId);
       registerGeneration(generation);
       void refetch();
diff --git a/apps/hash-frontend/src/pages/dashboard/[dashboard-id].page/item-config-modal.tsx b/apps/hash-frontend/src/pages/dashboard/[dashboard-id].page/item-config-modal.tsx
index 2fc33460a83..596ce515cc9 100644
--- a/apps/hash-frontend/src/pages/dashboard/[dashboard-id].page/item-config-modal.tsx
+++ b/apps/hash-frontend/src/pages/dashboard/[dashboard-id].page/item-config-modal.tsx
@@ -33,7 +33,7 @@ type ItemConfigModalProps = {
   onClose: () => void;
   onGenerationStarted?: (generation: {
     itemEntityId: EntityId;
-    flowRunId: string;
+    flowRunEntityId: EntityId;
   }) => void;
   generation?: DashboardItemGeneration;
   /** `null` when configuring a new item whose entity is created lazily */
diff --git a/apps/hash-frontend/src/pages/dashboard/hooks/use-dashboard-item-config.ts b/apps/hash-frontend/src/pages/dashboard/hooks/use-dashboard-item-config.ts
index 50f8c16fb3c..eb4cb2a326d 100644
--- a/apps/hash-frontend/src/pages/dashboard/hooks/use-dashboard-item-config.ts
+++ b/apps/hash-frontend/src/pages/dashboard/hooks/use-dashboard-item-config.ts
@@ -52,7 +52,7 @@ export type ConfigState = {
   chartConfig: ChartConfig | null;
   isLoading: boolean;
   error: string | null;
-  flowRunId: string | null;
+  flowRunEntityId: EntityId | null;
 };
 
 const initialState: ConfigState = {
@@ -67,7 +67,7 @@ const initialState: ConfigState = {
   chartConfig: null,
   isLoading: false,
   error: null,
-  flowRunId: null,
+  flowRunEntityId: null,
 };
 
 const configurationReadyPatch: PropertyPatchOperation = {
@@ -114,7 +114,7 @@ type UseDashboardItemConfigParams = {
   /** Called once the flow is running so the dashboard can show its card. */
   onGenerationStarted?: (generation: {
     itemEntityId: EntityId;
-    flowRunId: string;
+    flowRunEntityId: EntityId;
   }) => void;
   onComplete?: () => void;
 };
@@ -398,14 +398,14 @@ export const useDashboardItemConfig = ({
    * before the state update containing the flow run id has been applied.
    */
   const pollFlowForCompletion = useCallback(
-    async (flowRunId: string) => {
+    async (flowRunEntityId: EntityId) => {
       try {
         const { data } = await apolloClient.query<
           GetFlowRunByIdQuery,
           GetFlowRunByIdQueryVariables
         >({
           query: getFlowRunById,
-          variables: { flowRunId },
+          variables: { flowRunEntityId },
           fetchPolicy: "network-only",
         });
 
@@ -510,15 +510,15 @@ export const useDashboardItemConfig = ({
   );
 
   const startPolling = useCallback(
-    (flowRunId: string) => {
+    (flowRunEntityId: EntityId) => {
       if (pollIntervalRef.current) {
         return; // Already polling
       }
 
       // Poll immediately, then every 2 seconds
-      void pollFlowForCompletion(flowRunId);
+      void pollFlowForCompletion(flowRunEntityId);
       pollIntervalRef.current = setInterval(() => {
-        void pollFlowForCompletion(flowRunId);
+        void pollFlowForCompletion(flowRunEntityId);
       }, 2000);
     },
     [pollFlowForCompletion],
@@ -628,13 +628,13 @@ export const useDashboardItemConfig = ({
         const resolvedItemEntityId = await ensureEntityId();
         setState((prev) => ({
           ...prev,
-          flowRunId: data.startFlow,
+          flowRunEntityId: data.startFlow,
           step: "query",
         }));
 
         onGenerationStarted?.({
           itemEntityId: resolvedItemEntityId,
-          flowRunId: data.startFlow,
+          flowRunEntityId: data.startFlow,
         });
 
         /**
@@ -766,12 +766,12 @@ export const useDashboardItemConfig = ({
         const resolvedItemEntityId = await ensureEntityId();
         setState((previousState) => ({
           ...previousState,
-          flowRunId: data.startFlow,
+          flowRunEntityId: data.startFlow,
           step: "query",
         }));
         onGenerationStarted?.({
           itemEntityId: resolvedItemEntityId,
-          flowRunId: data.startFlow,
+          flowRunEntityId: data.startFlow,
         });
         if (!onGenerationStarted) {
           startPolling(data.startFlow);
diff --git a/apps/hash-frontend/src/pages/dashboard/hooks/use-dashboard-item-generations.ts b/apps/hash-frontend/src/pages/dashboard/hooks/use-dashboard-item-generations.ts
index 029aeaa0835..154fc9ba0e3 100644
--- a/apps/hash-frontend/src/pages/dashboard/hooks/use-dashboard-item-generations.ts
+++ b/apps/hash-frontend/src/pages/dashboard/hooks/use-dashboard-item-generations.ts
@@ -50,7 +50,7 @@ export const dashboardItemGenerationPhaseLabel = (
 
 export type DashboardItemGeneration = {
   itemEntityId: EntityId;
-  flowRunId: string;
+  flowRunEntityId: EntityId;
   phase: DashboardItemGenerationPhase;
   structuralQuery?: StructuralQueryDefinition;
   pythonScript?: string;
@@ -335,7 +335,7 @@ export const useDashboardItemGenerations = ({
           GetFlowRunByIdQueryVariables
         >({
           query: getFlowRunById,
-          variables: { flowRunId: generation.flowRunId },
+          variables: { flowRunEntityId: generation.flowRunEntityId },
           fetchPolicy: "network-only",
         });
         const flowRun = data.getFlowRunById;
diff --git a/apps/hash-frontend/src/pages/flows.page.tsx b/apps/hash-frontend/src/pages/flows.page.tsx
index a4aca0dc8c1..db2c725ccf8 100644
--- a/apps/hash-frontend/src/pages/flows.page.tsx
+++ b/apps/hash-frontend/src/pages/flows.page.tsx
@@ -217,7 +217,7 @@ const FlowsPageContent = () => {
 const FlowsPage: NextPageWithLayout = () => {
   return (
     <FlowDefinitionsContextProvider selectedFlowDefinitionId={null}>
-      <FlowRunsContextProvider selectedFlowRunId={null}>
+      <FlowRunsContextProvider selectedFlowRunEntityId={null}>
         <FlowsPageContent />
       </FlowRunsContextProvider>
     </FlowDefinitionsContextProvider>
diff --git a/apps/hash-frontend/src/pages/goals.page.tsx b/apps/hash-frontend/src/pages/goals.page.tsx
index 127c0def6fb..faecd4f410e 100644
--- a/apps/hash-frontend/src/pages/goals.page.tsx
+++ b/apps/hash-frontend/src/pages/goals.page.tsx
@@ -44,7 +44,7 @@ const GoalsPageContent = () => {
 
 const GoalsPage: NextPageWithLayout = () => {
   return (
-    <FlowRunsContextProvider selectedFlowRunId={null}>
+    <FlowRunsContextProvider selectedFlowRunEntityId={null}>
       <GoalsPageContent />
     </FlowRunsContextProvider>
   );
diff --git a/apps/hash-frontend/src/pages/goals.page/goals-list.tsx b/apps/hash-frontend/src/pages/goals.page/goals-list.tsx
index 114a4a263ba..9ea6ca7c1a3 100644
--- a/apps/hash-frontend/src/pages/goals.page/goals-list.tsx
+++ b/apps/hash-frontend/src/pages/goals.page/goals-list.tsx
@@ -30,7 +30,7 @@ export const GoalsList = () => {
         continue;
       }
 
-      const { webId, flowRunId, executedAt, closedAt } = run;
+      const { webId, flowRunEntityId, executedAt, closedAt } = run;
 
       let web: GoalSummary["web"] | undefined = webByWebId[webId];
 
@@ -89,7 +89,7 @@ export const GoalsList = () => {
       }
 
       const goalRun = {
-        flowRunId,
+        flowRunEntityId,
         lastEventTimestamp,
         openInputRequests,
         /**
diff --git a/apps/hash-frontend/src/pages/goals.page/goals-list/goal-list-section.tsx b/apps/hash-frontend/src/pages/goals.page/goals-list/goal-list-section.tsx
index 028921d264c..bb5f8c84a7c 100644
--- a/apps/hash-frontend/src/pages/goals.page/goals-list/goal-list-section.tsx
+++ b/apps/hash-frontend/src/pages/goals.page/goals-list/goal-list-section.tsx
@@ -77,7 +77,7 @@ export const GoalListSection = ({
           </Typography>
         </Box>
         {rows.map((row) => (
-          <GoalRow key={row.flowRunId} goalSummary={row} />
+          <GoalRow key={row.flowRunEntityId} goalSummary={row} />
         ))}
       </Box>
     </Stack>
diff --git a/apps/hash-frontend/src/pages/goals.page/goals-list/goal-list-section/goal-row.tsx b/apps/hash-frontend/src/pages/goals.page/goals-list/goal-list-section/goal-row.tsx
index 2f48999dcdc..38de53cbe47 100644
--- a/apps/hash-frontend/src/pages/goals.page/goals-list/goal-list-section/goal-row.tsx
+++ b/apps/hash-frontend/src/pages/goals.page/goals-list/goal-list-section/goal-row.tsx
@@ -13,10 +13,10 @@ import { FlowStatusChip, FlowTableChip } from "../../../shared/flow-tables";
 import { goalRowSx } from "./goal-row-sx";
 
 import type { SimpleFlowRunStatus } from "../../../shared/flow-tables";
-import type { EntityUuid } from "@blockprotocol/type-system";
+import type { EntityId } from "@blockprotocol/type-system";
 
 export type GoalSummary = {
-  flowRunId: EntityUuid;
+  flowRunEntityId: EntityId;
   openInputRequests: number;
   lastEventTimestamp: string;
   name: string;
@@ -34,7 +34,7 @@ export const GoalRow = memo(({ goalSummary }: { goalSummary: GoalSummary }) => {
     lastEventTimestamp,
     openInputRequests,
     web,
-    flowRunId,
+    flowRunEntityId,
     status,
   } = goalSummary;
 
@@ -64,7 +64,10 @@ export const GoalRow = memo(({ goalSummary }: { goalSummary: GoalSummary }) => {
       </FlowTableChip>
 
       <Link
-        href={generateWorkerRunPath({ shortname: web.shortname, flowRunId })}
+        href={generateWorkerRunPath({
+          shortname: web.shortname,
+          flowRunEntityId,
+        })}
         sx={{
           display: "block",
           fontSize: 14,
diff --git a/apps/hash-frontend/src/pages/goals/new.page.tsx b/apps/hash-frontend/src/pages/goals/new.page.tsx
index f9fbfac6086..cc0c6dcb345 100644
--- a/apps/hash-frontend/src/pages/goals/new.page.tsx
+++ b/apps/hash-frontend/src/pages/goals/new.page.tsx
@@ -292,8 +292,8 @@ const NewGoalPageContent = () => {
       },
     });
 
-    const flowRunId = data?.startFlow;
-    if (!flowRunId) {
+    const flowRunEntityId = data?.startFlow;
+    if (!flowRunEntityId) {
       throw new Error("Failed to start flow");
     }
 
@@ -303,7 +303,7 @@ const NewGoalPageContent = () => {
 
     const { shortname } = getOwner({ webId });
 
-    void push(generateWorkerRunPath({ shortname, flowRunId }));
+    void push(generateWorkerRunPath({ shortname, flowRunEntityId }));
   };
 
   return (
diff --git a/apps/hash-frontend/src/pages/shared/entity/entity-editor/history-section.tsx b/apps/hash-frontend/src/pages/shared/entity/entity-editor/history-section.tsx
index fb6958bdb13..4ead9746423 100644
--- a/apps/hash-frontend/src/pages/shared/entity/entity-editor/history-section.tsx
+++ b/apps/hash-frontend/src/pages/shared/entity/entity-editor/history-section.tsx
@@ -9,7 +9,6 @@ import {
   fullDecisionTimeAxis,
 } from "@local/hash-isomorphic-utils/graph-queries";
 
-import { useUserOrOrgShortnameByWebId } from "../../../../components/hooks/use-user-or-org-shortname-by-owned-by-id";
 import {
   getEntityDiffsQuery,
   queryEntitySubgraphQuery,
@@ -31,10 +30,6 @@ import type { DiffEntityInput } from "@local/hash-graph-sdk/entity";
 export const HistorySection = ({ entityId }: { entityId: EntityId }) => {
   const [webId, entityUuid, _draftUuid] = splitEntityId(entityId);
 
-  const { shortname } = useUserOrOrgShortnameByWebId({
-    webId,
-  });
-
   const { data: editionsData, loading: editionsLoading } = useQuery<
     QueryEntitySubgraphQuery,
     QueryEntitySubgraphQueryVariables
@@ -152,11 +147,7 @@ export const HistorySection = ({ entityId }: { entityId: EntityId }) => {
         {loading || !subgraph ? (
           <Skeleton height={600} />
         ) : (
-          <HistoryTable
-            events={historyEvents}
-            subgraph={subgraph}
-            shortname={shortname ?? ""}
-          />
+          <HistoryTable events={historyEvents} subgraph={subgraph} />
         )}
       </WhiteCard>
     </SectionWrapper>
diff --git a/apps/hash-frontend/src/pages/shared/entity/entity-editor/history-section/history-table.tsx b/apps/hash-frontend/src/pages/shared/entity/entity-editor/history-section/history-table.tsx
index 2aa4262d73e..3d88aa26958 100644
--- a/apps/hash-frontend/src/pages/shared/entity/entity-editor/history-section/history-table.tsx
+++ b/apps/hash-frontend/src/pages/shared/entity/entity-editor/history-section/history-table.tsx
@@ -96,7 +96,6 @@ const TableRow = memo(
     isLastRow,
     numberColumnWidth,
     scrollContainerRef,
-    shortname,
     subgraph,
   }: HistoryRowData) => {
     const { number, timestamp } = event;
@@ -243,11 +242,7 @@ const TableRow = memo(
             </Stack>
           </Stack>
           <Collapse in={showProvenance} ref={provenanceRef} timeout={200}>
-            <Provenance
-              event={event}
-              shortname={shortname}
-              subgraph={subgraph}
-            />
+            <Provenance event={event} subgraph={subgraph} />
           </Collapse>
         </Box>
       </TableCell>
@@ -261,7 +256,6 @@ type HistoryRowData = {
   isLastRow: boolean;
   numberColumnWidth: number;
   scrollContainerRef: React.RefObject<HTMLDivElement | null>;
-  shortname: string;
   subgraph: Subgraph;
 };
 
@@ -275,18 +269,15 @@ const createRowContent: CreateVirtualizedRowContentFn<HistoryRowData> = (
     isFirstRow={row.data.isFirstRow}
     isLastRow={row.data.isLastRow}
     scrollContainerRef={row.data.scrollContainerRef}
-    shortname={row.data.shortname}
     subgraph={row.data.subgraph}
   />
 );
 
 export const HistoryTable = ({
   events,
-  shortname,
   subgraph,
 }: {
   events: HistoryEvent[];
-  shortname: string;
   subgraph: Subgraph;
 }) => {
   const [sort, setSort] = useState<VirtualizedTableSort<FieldId>>({
@@ -325,11 +316,10 @@ export const HistoryTable = ({
           isLastRow: index === events.length - 1,
           numberColumnWidth,
           scrollContainerRef,
-          shortname,
           subgraph,
         },
       }));
-  }, [events, sort, subgraph, scrollContainerRef, shortname]);
+  }, [events, sort, subgraph, scrollContainerRef]);
 
   const columns = useMemo(() => createColumns(rows.length), [rows]);
 
diff --git a/apps/hash-frontend/src/pages/shared/entity/entity-editor/history-section/history-table/provenance.tsx b/apps/hash-frontend/src/pages/shared/entity/entity-editor/history-section/history-table/provenance.tsx
index 2639127b9f7..93ac906b380 100644
--- a/apps/hash-frontend/src/pages/shared/entity/entity-editor/history-section/history-table/provenance.tsx
+++ b/apps/hash-frontend/src/pages/shared/entity/entity-editor/history-section/history-table/provenance.tsx
@@ -1,7 +1,10 @@
 import { Box, Stack, Typography } from "@mui/material";
 import { useState } from "react";
 
-import { extractEntityUuidFromEntityId } from "@blockprotocol/type-system";
+import {
+  extractWebIdFromEntityId,
+  isEntityId,
+} from "@blockprotocol/type-system";
 import {
   ArrowUpRightRegularIcon,
   CodeIcon,
@@ -11,6 +14,7 @@ import {
 } from "@hashintel/design-system";
 import { generateWorkerRunPath } from "@local/hash-isomorphic-utils/flows/frontend-paths";
 
+import { useUserOrOrgShortnameByWebId } from "../../../../../../components/hooks/use-user-or-org-shortname-by-owned-by-id";
 import { SearchIcon } from "../../../../../../shared/icons/search-icon";
 import { UserIcon } from "../../../../../../shared/icons/user-icon";
 import { Link } from "../../../../../../shared/ui/link";
@@ -19,7 +23,7 @@ import { SourcesSlideover } from "./provenance/sources-slideover";
 
 import type { HistoryEvent } from "../shared/types";
 import type { Subgraph } from "@blockprotocol/graph";
-import type { EntityId, OriginProvenance } from "@blockprotocol/type-system";
+import type { OriginProvenance } from "@blockprotocol/type-system";
 import type { SvgIconProps, SxProps, Theme } from "@mui/material";
 import type { FunctionComponent, PropsWithChildren } from "react";
 
@@ -59,17 +63,28 @@ const ProvenanceRow = ({ children }: PropsWithChildren) => (
 
 export const Provenance = ({
   event,
-  shortname,
   subgraph,
 }: {
   event: HistoryEvent;
-  shortname: string;
   subgraph: Subgraph;
 }) => {
   const {
     provenance: { edition },
   } = event;
 
+  /* A flow's origin id is the entity id of the run that made the edition. Other origins give ids of their own. */
+  const flowRunEntityId =
+    edition.origin.type === "flow" &&
+    edition.origin.id !== undefined &&
+    isEntityId(edition.origin.id)
+      ? edition.origin.id
+      : undefined;
+
+  /* The run page is under the shortname of the run's web, which may not be the entity's. */
+  const { shortname: flowRunShortname } = useUserOrOrgShortnameByWebId({
+    webId: flowRunEntityId ? extractWebIdFromEntityId(flowRunEntityId) : null,
+  });
+
   const { actors, loading } = useActors({
     accountIds: [edition.createdById],
   });
@@ -104,8 +119,6 @@ export const Provenance = ({
 
   const OriginIcon = provenanceIconMap[originType];
 
-  const flowRunEntityId = edition.origin.id as EntityId | undefined;
-
   const sources =
     event.type === "property-update"
       ? event.provenance.property?.sources
@@ -141,11 +154,11 @@ export const Provenance = ({
                   {originType.split("-").join(" ")}
                 </Box>
               </Typography>
-              {flowRunEntityId && (
+              {flowRunEntityId && flowRunShortname && (
                 <Link
                   href={generateWorkerRunPath({
-                    flowRunId: extractEntityUuidFromEntityId(flowRunEntityId),
-                    shortname,
+                    flowRunEntityId,
+                    shortname: flowRunShortname,
                   })}
                   sx={{
                     ...typographySx,
diff --git a/apps/hash-frontend/src/pages/shared/flow-runs-context-provider.tsx b/apps/hash-frontend/src/pages/shared/flow-runs-context-provider.tsx
index 7ebc0972ac1..552e026dbdd 100644
--- a/apps/hash-frontend/src/pages/shared/flow-runs-context-provider.tsx
+++ b/apps/hash-frontend/src/pages/shared/flow-runs-context-provider.tsx
@@ -19,15 +19,16 @@ import type {
   FlowRunsContextType,
   FlowRunsPaginationState,
 } from "./flow-runs-context";
+import type { EntityId } from "@blockprotocol/type-system";
 import type { PropsWithChildren } from "react";
 
 export const FlowRunsContextProvider = ({
   children,
   pagination,
-  selectedFlowRunId,
+  selectedFlowRunEntityId,
 }: PropsWithChildren<{
   pagination?: FlowRunsPaginationState;
-  selectedFlowRunId: string | null;
+  selectedFlowRunEntityId: EntityId | null;
 }>) => {
   const variables: GetFlowRunsQueryVariables = pagination
     ? {
@@ -49,10 +50,10 @@ export const FlowRunsContextProvider = ({
       getFlowRunById,
       {
         pollInterval: 2_000,
-        skip: !selectedFlowRunId,
-        variables: {
-          flowRunId: selectedFlowRunId ?? "",
-        },
+        skip: !selectedFlowRunEntityId,
+        variables: selectedFlowRunEntityId
+          ? { flowRunEntityId: selectedFlowRunEntityId }
+          : undefined,
       },
     );
 
@@ -81,7 +82,7 @@ export const FlowRunsContextProvider = ({
       loading: selectedFlowRunLoading || flowRunsLoading,
       pagination: pagination ?? null,
       selectedFlowRun,
-      selectedFlowRunId,
+      selectedFlowRunEntityId,
     }),
     [
       flowRuns,
@@ -91,7 +92,7 @@ export const FlowRunsContextProvider = ({
       pagination,
       selectedFlowRunLoading,
       selectedFlowRun,
-      selectedFlowRunId,
+      selectedFlowRunEntityId,
     ],
   );
 
diff --git a/apps/hash-frontend/src/pages/shared/flow-runs-context.ts b/apps/hash-frontend/src/pages/shared/flow-runs-context.ts
index 787fcbb0e6e..dba4b9634ab 100644
--- a/apps/hash-frontend/src/pages/shared/flow-runs-context.ts
+++ b/apps/hash-frontend/src/pages/shared/flow-runs-context.ts
@@ -8,6 +8,7 @@ import type {
   GetFlowRunsQuery,
   StepRun,
 } from "../../graphql/api-types.gen";
+import type { EntityId } from "@blockprotocol/type-system";
 
 export type FlowRunsPaginationState = {
   currentCursor: string | null;
@@ -24,7 +25,7 @@ export type FlowRunsContextType = {
   loading: boolean;
   pagination: FlowRunsPaginationState | null;
   selectedFlowRun: FlowRun | null;
-  selectedFlowRunId: string | null;
+  selectedFlowRunEntityId: EntityId | null;
 };
 
 export const FlowRunsContext = createContext<FlowRunsContextType | null>(null);
diff --git a/apps/hash-frontend/src/pages/shared/use-flow-runs-usage.ts b/apps/hash-frontend/src/pages/shared/use-flow-runs-usage.ts
index 8e7c4ee0672..ab3673b5da9 100644
--- a/apps/hash-frontend/src/pages/shared/use-flow-runs-usage.ts
+++ b/apps/hash-frontend/src/pages/shared/use-flow-runs-usage.ts
@@ -24,31 +24,32 @@ import type {
   QueryEntitySubgraphQuery,
   QueryEntitySubgraphQueryVariables,
 } from "../../graphql/api-types.gen";
-import type { EntityUuid } from "@blockprotocol/type-system";
+import type { EntityId } from "@blockprotocol/type-system";
 import type {
   AggregatedUsageByTask,
   AggregatedUsageRecord,
 } from "@local/hash-isomorphic-utils/service-usage";
 import type { UsageRecord } from "@local/hash-isomorphic-utils/system-types/usagerecord";
 
-type UsageByFlowRunId = {
-  [flowRunId: EntityUuid]: {
+type UsageByFlowRunEntityId = Record<
+  EntityId,
+  {
     recordsByTask: AggregatedUsageByTask[];
     recordsByServiceFeature: AggregatedUsageRecord[];
     total: number;
-  };
-};
+  }
+>;
 
 export const useFlowRunsUsage = ({
-  flowRunIds,
+  flowRunEntityIds,
   pollInterval = 5_000,
 }: {
-  flowRunIds: EntityUuid[];
+  flowRunEntityIds: EntityId[];
   pollInterval?: number;
 }): {
   isUsageAvailable: boolean;
   loading: boolean;
-  usageByFlowRun: UsageByFlowRunId;
+  usageByFlowRun: UsageByFlowRunEntityId;
 } => {
   const { isUserAdmin } = useHashInstance();
 
@@ -72,10 +73,10 @@ export const useFlowRunsUsage = ({
               ],
             },
             {
-              any: flowRunIds.map((flowRunId) => ({
+              any: flowRunEntityIds.map((flowRunEntityId) => ({
                 equal: [
                   { path: ["outgoingLinks", "rightEntity", "uuid"] },
-                  { parameter: flowRunId },
+                  { parameter: extractEntityUuidFromEntityId(flowRunEntityId) },
                 ],
               })),
             },
@@ -97,14 +98,14 @@ export const useFlowRunsUsage = ({
     },
   });
 
-  const usageByFlowRun = useMemo<UsageByFlowRunId>(() => {
+  const usageByFlowRun = useMemo<UsageByFlowRunEntityId>(() => {
     if (!data) {
       return {};
     }
 
-    const usageByFlowRunId: UsageByFlowRunId = {};
+    const usageByFlowRunEntityId: UsageByFlowRunEntityId = {};
 
-    for (const flowRunId of flowRunIds) {
+    for (const flowRunEntityId of flowRunEntityIds) {
       const serviceUsageRecordSubgraph =
         deserializeQueryEntitySubgraphResponse<UsageRecord>(
           data.queryEntitySubgraph,
@@ -142,11 +143,7 @@ export const useFlowRunsUsage = ({
           return false;
         }
 
-        return (
-          extractEntityUuidFromEntityId(
-            incurredInEntity.metadata.recordId.entityId,
-          ) === flowRunId
-        );
+        return incurredInEntity.metadata.recordId.entityId === flowRunEntityId;
       });
 
       const aggregatedUsageRecordsForFlowRun =
@@ -165,15 +162,15 @@ export const useFlowRunsUsage = ({
         total += aggregatedUsageRecordForFlowRun.totalCostInUsd;
       }
 
-      usageByFlowRunId[flowRunId] = {
+      usageByFlowRunEntityId[flowRunEntityId] = {
         recordsByTask: aggregatedUsageRecordsByTask,
         recordsByServiceFeature: aggregatedUsageRecordsForFlowRun,
         total,
       };
     }
 
-    return usageByFlowRunId;
-  }, [data, flowRunIds]);
+    return usageByFlowRunEntityId;
+  }, [data, flowRunEntityIds]);
 
   return useMemo(
     () => ({
diff --git a/apps/hash-frontend/src/pages/workers.page.tsx b/apps/hash-frontend/src/pages/workers.page.tsx
index 81cdd394540..1a605ab189a 100644
--- a/apps/hash-frontend/src/pages/workers.page.tsx
+++ b/apps/hash-frontend/src/pages/workers.page.tsx
@@ -96,7 +96,10 @@ const WorkersPage: NextPageWithLayout = () => {
   );
 
   return (
-    <FlowRunsContextProvider pagination={pagination} selectedFlowRunId={null}>
+    <FlowRunsContextProvider
+      pagination={pagination}
+      selectedFlowRunEntityId={null}
+    >
       <WorkersPageContent />
     </FlowRunsContextProvider>
   );
diff --git a/apps/hash-frontend/src/pages/workers.page/flow-run-table.tsx b/apps/hash-frontend/src/pages/workers.page/flow-run-table.tsx
index d99f2451b66..00902cba969 100644
--- a/apps/hash-frontend/src/pages/workers.page/flow-run-table.tsx
+++ b/apps/hash-frontend/src/pages/workers.page/flow-run-table.tsx
@@ -43,7 +43,7 @@ import type {
   VirtualizedTableRow,
 } from "../shared/virtualized-table";
 import type { VirtualizedTableSort } from "../shared/virtualized-table/header/sort";
-import type { EntityUuid } from "@blockprotocol/type-system";
+import type { EntityId, EntityUuid } from "@blockprotocol/type-system";
 import type { Subtype } from "@local/advanced-types/subtype";
 import type { FlowRun } from "@local/hash-isomorphic-utils/graphql/api-types.gen";
 
@@ -110,7 +110,7 @@ const createColumns: (
 type WorkerSummary = Subtype<
   Record<FieldId, unknown>,
   {
-    flowRunId: EntityUuid;
+    flowRunEntityId: EntityId;
     flowScheduleId: EntityUuid | null;
     executedAt: string | null;
     closedAt: string | null;
@@ -131,7 +131,7 @@ type WorkerSummary = Subtype<
 const TableRow = memo(({ workerSummary }: { workerSummary: WorkerSummary }) => {
   const {
     web,
-    flowRunId,
+    flowRunEntityId,
     flowScheduleId,
     type,
     name,
@@ -173,7 +173,7 @@ const TableRow = memo(({ workerSummary }: { workerSummary: WorkerSummary }) => {
           <Link
             href={generateWorkerRunPath({
               shortname: web.shortname,
-              flowRunId,
+              flowRunEntityId,
             })}
             sx={{
               display: "block",
@@ -301,7 +301,7 @@ export const FlowRunTable = ({ flowDefinitionIdFilter }: FlowRunTableProps) => {
 
   const { isUsageAvailable: usageAvailable, usageByFlowRun } = useFlowRunsUsage(
     {
-      flowRunIds: filteredFlowRuns.map((run) => run.flowRunId),
+      flowRunEntityIds: filteredFlowRuns.map((run) => run.flowRunEntityId),
     },
   );
 
@@ -316,7 +316,8 @@ export const FlowRunTable = ({ flowDefinitionIdFilter }: FlowRunTableProps) => {
           ? "goal"
           : "flow";
 
-        const { webId, flowRunId, executedAt, closedAt, status } = flowRun;
+        const { webId, flowRunEntityId, executedAt, closedAt, status } =
+          flowRun;
 
         let web: WorkerSummary["web"] | undefined = webByWebId[webId];
 
@@ -351,15 +352,15 @@ export const FlowRunTable = ({ flowDefinitionIdFilter }: FlowRunTableProps) => {
           webByWebId[webId] = web;
         }
 
-        const cost = usageByFlowRun[flowRunId]?.total ?? null;
+        const cost = usageByFlowRun[flowRunEntityId]?.total ?? null;
 
         // Extract flowScheduleId if present (for scheduled runs)
         const flowScheduleId = (flowRun as FlowRun).flowScheduleId ?? null;
 
         return {
-          id: flowRunId,
+          id: flowRunEntityId,
           data: {
-            flowRunId,
+            flowRunEntityId,
             flowScheduleId,
             web,
             type,
diff --git a/apps/plugin-browser/src/graphql/queries/flow.queries.ts b/apps/plugin-browser/src/graphql/queries/flow.queries.ts
index 5429ee173d8..24de8766b42 100644
--- a/apps/plugin-browser/src/graphql/queries/flow.queries.ts
+++ b/apps/plugin-browser/src/graphql/queries/flow.queries.ts
@@ -5,7 +5,7 @@ export const getMinimalFlowRunsQuery = /* GraphQL */ `
       flowRuns {
         name
         flowDefinitionId
-        flowRunId
+        flowRunEntityId
         webId
         status
         executedAt
diff --git a/apps/plugin-browser/src/pages/popup/popup-contents/action-center/history/automatically-triggered.tsx b/apps/plugin-browser/src/pages/popup/popup-contents/action-center/history/automatically-triggered.tsx
index d8512a7d57a..42e30c4334b 100644
--- a/apps/plugin-browser/src/pages/popup/popup-contents/action-center/history/automatically-triggered.tsx
+++ b/apps/plugin-browser/src/pages/popup/popup-contents/action-center/history/automatically-triggered.tsx
@@ -38,12 +38,12 @@ export const AutomaticallyTriggered = ({
           </TableRow>
         ) : (
           automaticallyTriggeredFlows.map((flow) => {
-            const flowRunId = flow.flowRunId;
+            const flowRunEntityId = flow.flowRunEntityId;
 
             return (
               <HistoryRow
                 flowRun={flow}
-                key={flowRunId}
+                key={flowRunEntityId}
                 type={
                   flow.requestedPageUrl ? "external-page-request" : "automatic"
                 }
diff --git a/apps/plugin-browser/src/pages/popup/popup-contents/action-center/history/manually-triggered.tsx b/apps/plugin-browser/src/pages/popup/popup-contents/action-center/history/manually-triggered.tsx
index 762374b91cf..e20594f0789 100644
--- a/apps/plugin-browser/src/pages/popup/popup-contents/action-center/history/manually-triggered.tsx
+++ b/apps/plugin-browser/src/pages/popup/popup-contents/action-center/history/manually-triggered.tsx
@@ -36,9 +36,11 @@ export const ManuallyTriggered = ({
           </TableRow>
         ) : (
           manuallyTriggeredFlows.map((flow) => {
-            const flowRunId = flow.flowRunId;
+            const flowRunEntityId = flow.flowRunEntityId;
 
-            return <HistoryRow flowRun={flow} key={flowRunId} type="manual" />;
+            return (
+              <HistoryRow flowRun={flow} key={flowRunEntityId} type="manual" />
+            );
           })
         )}
       </EventTable>
diff --git a/apps/plugin-browser/src/pages/popup/popup-contents/action-center/history/shared/history-row.tsx b/apps/plugin-browser/src/pages/popup/popup-contents/action-center/history/shared/history-row.tsx
index db7b23afd9d..1c51e5a5f2f 100644
--- a/apps/plugin-browser/src/pages/popup/popup-contents/action-center/history/shared/history-row.tsx
+++ b/apps/plugin-browser/src/pages/popup/popup-contents/action-center/history/shared/history-row.tsx
@@ -84,7 +84,7 @@ export const HistoryRow = ({
     <Link
       href={`${FRONTEND_ORIGIN}${generateWorkerRunPath({
         shortname: owner.properties.shortname,
-        flowRunId: flowRun.flowRunId,
+        flowRunEntityId: flowRun.flowRunEntityId,
       })}`}
       target="_blank"
     >
diff --git a/apps/plugin-browser/src/pages/popup/popup-contents/action-center/history/shared/history-row/flow-metadata-cell-contents.tsx b/apps/plugin-browser/src/pages/popup/popup-contents/action-center/history/shared/history-row/flow-metadata-cell-contents.tsx
index b20d9af2a7f..813160374b9 100644
--- a/apps/plugin-browser/src/pages/popup/popup-contents/action-center/history/shared/history-row/flow-metadata-cell-contents.tsx
+++ b/apps/plugin-browser/src/pages/popup/popup-contents/action-center/history/shared/history-row/flow-metadata-cell-contents.tsx
@@ -2,6 +2,10 @@ import { Stack } from "@mui/material";
 import { formatDuration, intervalToDuration } from "date-fns";
 import { useEffect, useState } from "react";
 
+import {
+  extractEntityUuidFromEntityId,
+  type EntityId,
+} from "@blockprotocol/type-system";
 import {
   ArrowDownRegularIcon,
   ArrowRightRegularIcon,
@@ -46,7 +50,7 @@ type TotalUsage = {
   outputTokens: number;
 };
 
-const getTotalUsage = ({ flowRunId }: { flowRunId: string }) =>
+const getTotalUsage = ({ flowRunEntityId }: { flowRunEntityId: EntityId }) =>
   queryGraphQlApi<QueryEntitiesQuery, QueryEntitiesQueryVariables>(
     queryEntitiesQuery,
     {
@@ -65,7 +69,7 @@ const getTotalUsage = ({ flowRunId }: { flowRunId: string }) =>
               equal: [
                 { path: ["outgoingLinks", "rightEntity", "uuid"] },
                 {
-                  parameter: flowRunId,
+                  parameter: extractEntityUuidFromEntityId(flowRunEntityId),
                 },
               ],
             },
@@ -159,18 +163,22 @@ export const FlowMetadataCellContents = ({
        * are accounted for.
        */
       const interval = setInterval(() => {
-        void getTotalUsage({ flowRunId: flowRun.flowRunId }).then(setUsage);
+        void getTotalUsage({ flowRunEntityId: flowRun.flowRunEntityId }).then(
+          setUsage,
+        );
       }, 10_000);
 
       return () => clearInterval(interval);
     }
-  }, [flowRun.flowRunId, visible]);
+  }, [flowRun.flowRunEntityId, visible]);
 
   useEffect(() => {
     if (visible) {
-      void getTotalUsage({ flowRunId: flowRun.flowRunId }).then(setUsage);
+      void getTotalUsage({ flowRunEntityId: flowRun.flowRunEntityId }).then(
+        setUsage,
+      );
     }
-  }, [flowRun.flowRunId, visible]);
+  }, [flowRun.flowRunEntityId, visible]);
 
   return (
     <Stack
diff --git a/apps/plugin-browser/src/pages/popup/popup-contents/action-center/history/shared/history-row/flow-status-cell.tsx b/apps/plugin-browser/src/pages/popup/popup-contents/action-center/history/shared/history-row/flow-status-cell.tsx
index 3495ee4cfef..a5cd72e2482 100644
--- a/apps/plugin-browser/src/pages/popup/popup-contents/action-center/history/shared/history-row/flow-status-cell.tsx
+++ b/apps/plugin-browser/src/pages/popup/popup-contents/action-center/history/shared/history-row/flow-status-cell.tsx
@@ -84,7 +84,7 @@ export const FlowStatusCell = ({ flowRun }: { flowRun: MinimalFlowRun }) => {
   const cancelRequest = (event: MouseEvent) => {
     event.stopPropagation();
     void sendMessageToBackground({
-      flowRunId: flowRun.flowRunId,
+      flowRunEntityId: flowRun.flowRunEntityId,
       type: "cancel-infer-entities",
     });
     setCancellationRequested(true);
diff --git a/apps/plugin-browser/src/pages/popup/popup-contents/action-center/shared/use-flow-runs.ts b/apps/plugin-browser/src/pages/popup/popup-contents/action-center/shared/use-flow-runs.ts
index 2cf158143a8..a7fce63eeb2 100644
--- a/apps/plugin-browser/src/pages/popup/popup-contents/action-center/shared/use-flow-runs.ts
+++ b/apps/plugin-browser/src/pages/popup/popup-contents/action-center/shared/use-flow-runs.ts
@@ -177,11 +177,11 @@ export const useFlowRuns = (): {
     const flowRunsToShow: MinimalFlowRun[] = [];
     const redundantOptimisticRunIds: string[] = [];
 
-    const allFlowIds = value.map((run) => run.flowRunId);
+    const allFlowIds = value.map((run) => run.flowRunEntityId);
 
     for (const run of localPendingRuns ?? []) {
-      if (allFlowIds.includes(run.flowRunId)) {
-        redundantOptimisticRunIds.push(run.flowRunId);
+      if (allFlowIds.includes(run.flowRunEntityId)) {
+        redundantOptimisticRunIds.push(run.flowRunEntityId);
       } else {
         flowRunsToShow.push(run);
       }
@@ -202,7 +202,7 @@ export const useFlowRuns = (): {
     if (redundantLocalRunIds.length > 0 && !!localPendingRuns?.length) {
       setLocalPendingRuns(
         localPendingRuns.filter(
-          (run) => !redundantLocalRunIds.includes(run.flowRunId),
+          (run) => !redundantLocalRunIds.includes(run.flowRunEntityId),
         ),
       );
     }
diff --git a/apps/plugin-browser/src/scripts/background/infer-entities.ts b/apps/plugin-browser/src/scripts/background/infer-entities.ts
index 14d381519b2..c5cac333e1b 100644
--- a/apps/plugin-browser/src/scripts/background/infer-entities.ts
+++ b/apps/plugin-browser/src/scripts/background/infer-entities.ts
@@ -1,6 +1,7 @@
 import { v4 as uuid } from "uuid";
 import browser from "webextension-polyfill";
 
+import { entityIdFromComponents } from "@blockprotocol/type-system";
 import {
   automaticBrowserInferenceFlow,
   manualBrowserInferenceFlow,
@@ -15,7 +16,7 @@ import {
 import { getWebsiteContent } from "./infer-entities/get-website-content";
 
 import type { InferEntitiesRequest } from "../../shared/messages";
-import type { EntityUuid } from "@blockprotocol/type-system";
+import type { EntityId, EntityUuid } from "@blockprotocol/type-system";
 import type {
   AutomaticInferenceWebsocketRequestMessage,
   CancelInferEntitiesWebsocketRequestMessage,
@@ -172,7 +173,7 @@ const createWebSocket = async ({ onClose }: { onClose: () => void }) => {
         return;
       }
 
-      const { workflowId, payload } = message;
+      const { flowRunEntityId, payload } = message;
       if (payload.type === "get-urls-html-content") {
         const inputRequests =
           (await getFromLocalStorage("externalInputRequests")) ?? {};
@@ -205,7 +206,7 @@ const createWebSocket = async ({ onClose }: { onClose: () => void }) => {
           newWs.send(
             JSON.stringify({
               cookie,
-              workflowId,
+              flowRunEntityId,
               payload: {
                 ...payload,
                 data: { webPages: webPages ?? [] },
@@ -300,9 +301,9 @@ const sendInferEntitiesMessage = async (
 };
 
 export const cancelInferEntities = async ({
-  flowRunId,
+  flowRunEntityId,
 }: {
-  flowRunId: string;
+  flowRunEntityId: EntityId;
 }) => {
   const cookie = await buildWebsocketCookieString();
 
@@ -311,7 +312,7 @@ export const cancelInferEntities = async ({
   socket.send(
     JSON.stringify({
       cookie,
-      flowRunId,
+      flowRunEntityId,
       requestUuid: uuid(),
       type: "cancel-inference-request",
     } satisfies CancelInferEntitiesWebsocketRequestMessage),
@@ -383,7 +384,7 @@ export const inferEntities = async (
     ...(existingValue ?? []),
     {
       flowDefinitionId: flowDefinition.flowDefinitionId,
-      flowRunId: requestUuid,
+      flowRunEntityId: entityIdFromComponents(webId, requestUuid),
       closedAt: null,
       executedAt: new Date().toISOString(),
       persistedEntities: [],
diff --git a/apps/plugin-browser/src/shared/messages.ts b/apps/plugin-browser/src/shared/messages.ts
index 420df719132..99d58c64cc6 100644
--- a/apps/plugin-browser/src/shared/messages.ts
+++ b/apps/plugin-browser/src/shared/messages.ts
@@ -1,4 +1,4 @@
-import type { VersionedUrl, WebId } from "@blockprotocol/type-system";
+import type { EntityId, VersionedUrl, WebId } from "@blockprotocol/type-system";
 import type { InferenceModelName } from "@local/hash-isomorphic-utils/ai-inference-types";
 import type { WebPage } from "@local/hash-isomorphic-utils/flows/types";
 
@@ -13,7 +13,7 @@ export type InferEntitiesRequest = {
 
 export type CancelInferEntitiesRequest = {
   type: "cancel-infer-entities";
-  flowRunId: string;
+  flowRunEntityId: EntityId;
 };
 
 export type GetTabContentRequest = {
diff --git a/apps/plugin-browser/src/shared/storage.ts b/apps/plugin-browser/src/shared/storage.ts
index e8eacea7a6f..2eb15629ffd 100644
--- a/apps/plugin-browser/src/shared/storage.ts
+++ b/apps/plugin-browser/src/shared/storage.ts
@@ -93,7 +93,7 @@ export type ExternalInputRequestById = {
 export type MinimalFlowRun = Pick<
   FlowRun,
   | "flowDefinitionId"
-  | "flowRunId"
+  | "flowRunEntityId"
   | "webId"
   | "closedAt"
   | "executedAt"
diff --git a/libs/@local/hash-backend-utils/src/flows.ts b/libs/@local/hash-backend-utils/src/flows.ts
index 20362dc879d..8aa287687cc 100644
--- a/libs/@local/hash-backend-utils/src/flows.ts
+++ b/libs/@local/hash-backend-utils/src/flows.ts
@@ -1,8 +1,4 @@
-import {
-  extractEntityUuidFromEntityId,
-  extractWebIdFromEntityId,
-  splitEntityId,
-} from "@blockprotocol/type-system";
+import { extractWebIdFromEntityId } from "@blockprotocol/type-system";
 import { typedKeys } from "@local/advanced-types/typed-entries";
 import { queryEntities, summarizeEntities } from "@local/hash-graph-sdk/entity";
 import { flowRunsQueryMaxLimit } from "@local/hash-isomorphic-utils/flows/types";
@@ -20,6 +16,7 @@ import type { FileStorageProvider } from "./file-storage.js";
 import type { TemporalClient } from "./temporal.js";
 import type {
   ActorEntityUuid,
+  EntityId,
   EntityUuid,
   WebId,
 } from "@blockprotocol/type-system";
@@ -42,7 +39,7 @@ export type {
 export { createCommonFlowActivities } from "./flows/process-flow-workflow/common-activities.js";
 
 type GetFlowRunByIdFnArgs<IncludeDetails extends boolean = boolean> = {
-  flowRunId: EntityUuid;
+  flowRunEntityId: EntityId;
   includeDetails: IncludeDetails;
   graphApiClient: GraphApi;
   storageProvider: FileStorageProvider;
@@ -63,7 +60,7 @@ export async function getFlowRunById<IncludeDetails extends boolean>(
 ): Promise<(IncludeDetails extends true ? FlowRun : SparseFlowRun) | null>;
 
 export async function getFlowRunById({
-  flowRunId,
+  flowRunEntityId,
   includeDetails,
   graphApiClient,
   storageProvider,
@@ -71,7 +68,7 @@ export async function getFlowRunById({
   userAuthentication,
 }: GetFlowRunByIdFnArgs<boolean>): Promise<SparseFlowRun | FlowRun | null> {
   const existingFlowEntity = await getFlowRunEntityById({
-    flowRunId,
+    flowRunEntityId,
     graphApiClient,
     userAuthentication,
   });
@@ -84,10 +81,6 @@ export async function getFlowRunById({
     existingFlowEntity.metadata.recordId.entityId,
   );
 
-  const entityUuid = extractEntityUuidFromEntityId(
-    existingFlowEntity.metadata.recordId.entityId,
-  );
-
   const temporalWorkflowId =
     existingFlowEntity.properties[
       "https://hash.ai/@h/types/property-type/workflow-id/"
@@ -98,8 +91,6 @@ export async function getFlowRunById({
       "https://blockprotocol.org/@blockprotocol/types/property-type/name/"
     ];
 
-  const flowRunEntityId = existingFlowEntity.metadata.recordId.entityId;
-
   const links = (
     await getFlowRunLinks({
       flowRunEntityIds: [flowRunEntityId],
@@ -119,7 +110,7 @@ export async function getFlowRunById({
   if (includeDetails) {
     return getFlowRunFromTemporalWorkflowId({
       flowDefinitionId,
-      flowRunId: entityUuid,
+      flowRunEntityId,
       flowScheduleId,
       name,
       storageProvider,
@@ -130,7 +121,7 @@ export async function getFlowRunById({
   } else {
     return getSparseFlowRunFromTemporalWorkflowId({
       flowDefinitionId,
-      flowRunId: entityUuid,
+      flowRunEntityId,
       flowScheduleId,
       name,
       temporalClient,
@@ -166,7 +157,7 @@ type GetFlowRunsFnArgs<IncludeDetails extends boolean> = {
 
 type MinimalFlowMetadata = {
   flowDefinitionId: EntityUuid;
-  flowRunId: EntityUuid;
+  flowRunEntityId: EntityId;
   flowScheduleId?: EntityUuid;
   name: string;
   temporalWorkflowId: string;
@@ -282,11 +273,10 @@ export async function getFlowRuns({
   });
 
   for (const entity of queryResult.entities) {
-    const [webId, entityUuid] = splitEntityId(
-      entity.metadata.recordId.entityId,
-    );
+    const flowRunEntityId = entity.metadata.recordId.entityId;
+    const webId = extractWebIdFromEntityId(flowRunEntityId);
 
-    const links = linksByFlowRunEntityId.get(entity.metadata.recordId.entityId);
+    const links = linksByFlowRunEntityId.get(flowRunEntityId);
 
     if (!links?.flowDefinitionId) {
       /* A run from before flow runs linked to their definition: it can't be shown. */
@@ -314,7 +304,7 @@ export async function getFlowRuns({
 
     temporalWorkflowIdToFlowDetails[temporalWorkflowId] = {
       flowDefinitionId: links.flowDefinitionId,
-      flowRunId: entityUuid,
+      flowRunEntityId,
       flowScheduleId: links.flowTriggerId ?? undefined,
       name,
       temporalWorkflowId,
@@ -385,7 +375,7 @@ export async function getFlowRuns({
 
       const runInfo = await getFlowRunFromTemporalWorkflowId({
         flowDefinitionId: flowDetails.flowDefinitionId,
-        flowRunId: flowDetails.flowRunId,
+        flowRunEntityId: flowDetails.flowRunEntityId,
         flowScheduleId: flowDetails.flowScheduleId,
         name: flowDetails.name,
         storageProvider,
@@ -405,7 +395,7 @@ export async function getFlowRuns({
 
       const runInfo = await getSparseFlowRunFromTemporalWorkflowId({
         flowDefinitionId: flowDetails.flowDefinitionId,
-        flowRunId: flowDetails.flowRunId,
+        flowRunEntityId: flowDetails.flowRunEntityId,
         flowScheduleId: flowDetails.flowScheduleId,
         name: flowDetails.name,
         temporalClient,
diff --git a/libs/@local/hash-backend-utils/src/flows/get-flow-run-details.ts b/libs/@local/hash-backend-utils/src/flows/get-flow-run-details.ts
index 618887fd530..5dfb0c70be1 100644
--- a/libs/@local/hash-backend-utils/src/flows/get-flow-run-details.ts
+++ b/libs/@local/hash-backend-utils/src/flows/get-flow-run-details.ts
@@ -9,7 +9,7 @@ import { resolvePayloadValue } from "./payload-storage.js";
 
 import type { FileStorageProvider } from "../file-storage.js";
 import type { ResolvePayloadContext } from "./payload-storage.js";
-import type { EntityUuid, WebId } from "@blockprotocol/type-system";
+import type { EntityId, EntityUuid, WebId } from "@blockprotocol/type-system";
 import type { RunFlowWorkflowParams } from "@local/hash-isomorphic-utils/flows/temporal-types";
 import type {
   CheckpointLog,
@@ -747,7 +747,7 @@ const getFlowRunDetailedFields = async ({
 
 export const getSparseFlowRunFromTemporalWorkflowId = async ({
   flowDefinitionId,
-  flowRunId,
+  flowRunEntityId,
   flowScheduleId,
   name,
   temporalClient,
@@ -756,8 +756,8 @@ export const getSparseFlowRunFromTemporalWorkflowId = async ({
 }: {
   /** The flow definition the run `Uses`, from its link */
   flowDefinitionId: EntityUuid;
-  /** The entity UUID of the flow run */
-  flowRunId: EntityUuid;
+  /** The entity id of the flow run */
+  flowRunEntityId: EntityId;
   /** The schedule the run was `Triggered By`, if any, from its link */
   flowScheduleId?: EntityUuid;
   name: string;
@@ -774,7 +774,7 @@ export const getSparseFlowRunFromTemporalWorkflowId = async ({
   return {
     name,
     flowDefinitionId,
-    flowRunId,
+    flowRunEntityId,
     flowScheduleId,
     status: status.name as FlowRunStatus,
     startedAt: startTime.toISOString(),
@@ -787,8 +787,8 @@ export const getSparseFlowRunFromTemporalWorkflowId = async ({
 export const getFlowRunFromTemporalWorkflowId = async (args: {
   /** The flow definition the run `Uses`, from its link */
   flowDefinitionId: EntityUuid;
-  /** The entity UUID of the flow run */
-  flowRunId: EntityUuid;
+  /** The entity id of the flow run */
+  flowRunEntityId: EntityId;
   /** The schedule the run was `Triggered By`, if any, from its link */
   flowScheduleId?: EntityUuid;
   name: string;
diff --git a/libs/@local/hash-backend-utils/src/flows/process-flow-workflow.ts b/libs/@local/hash-backend-utils/src/flows/process-flow-workflow.ts
index c9b5a7e89df..7dbf46204e0 100644
--- a/libs/@local/hash-backend-utils/src/flows/process-flow-workflow.ts
+++ b/libs/@local/hash-backend-utils/src/flows/process-flow-workflow.ts
@@ -309,7 +309,7 @@ const processFlow = async <
 ): Promise<RunFlowWorkflowResponse> => {
   const {
     flowDefinitionId,
-    flowRunId,
+    flowRunEntityUuid,
     flowRunName,
     flowInputs,
     flowTriggerEntityId,
@@ -407,7 +407,7 @@ const processFlow = async <
   await persistFlowActivity({
     flow,
     flowDefinitionEntityId: flowDefinitionResult.flowDefinitionEntityId,
-    flowRunId,
+    flowRunEntityUuid,
     flowTriggerEntityId,
     stepIds: ["initialize-flow"],
     userAuthentication,
diff --git a/libs/@local/hash-backend-utils/src/flows/process-flow-workflow/common-activities/persist-flow-activity.ts b/libs/@local/hash-backend-utils/src/flows/process-flow-workflow/common-activities/persist-flow-activity.ts
index e0fece3dde8..f7d8d0d4ae8 100644
--- a/libs/@local/hash-backend-utils/src/flows/process-flow-workflow/common-activities/persist-flow-activity.ts
+++ b/libs/@local/hash-backend-utils/src/flows/process-flow-workflow/common-activities/persist-flow-activity.ts
@@ -33,7 +33,7 @@ export type PersistFlowActivityParams = {
    * run's entity is created.
    */
   flowDefinitionEntityId?: EntityId;
-  flowRunId?: EntityUuid;
+  flowRunEntityUuid?: EntityUuid;
   /**
    * The `Flow Trigger` entity that started the run, if any (e.g. a `Flow Schedule`). Only used when the run's
    * entity is created.
@@ -50,7 +50,7 @@ export const persistFlowActivity = async (
   const {
     flow,
     flowDefinitionEntityId,
-    flowRunId,
+    flowRunEntityUuid,
     flowTriggerEntityId,
     graphApiClient,
     stepIds,
@@ -138,8 +138,8 @@ export const persistFlowActivity = async (
     );
   }
 
-  const flowRunEntityUuid = flowRunId ?? (generateUuid() as EntityUuid);
-  const flowEntityId = entityIdFromComponents(webId, flowRunEntityUuid);
+  const entityUuid = flowRunEntityUuid ?? (generateUuid() as EntityUuid);
+  const flowEntityId = entityIdFromComponents(webId, entityUuid);
 
   const linkFromRun = (rightEntityId: EntityId) => ({
     webId,
@@ -161,7 +161,7 @@ export const persistFlowActivity = async (
     ]
   >(graphApiClient, userAuthentication, [
     {
-      entityUuid: flowRunEntityUuid,
+      entityUuid,
       webId,
       entityTypeIds: [systemEntityTypes.flowRun.entityTypeId],
       properties: flowRunProperties,
diff --git a/libs/@local/hash-backend-utils/src/flows/shared/get-flow-run-entity-by-id.ts b/libs/@local/hash-backend-utils/src/flows/shared/get-flow-run-entity-by-id.ts
index fa17fb9e023..a84feda7221 100644
--- a/libs/@local/hash-backend-utils/src/flows/shared/get-flow-run-entity-by-id.ts
+++ b/libs/@local/hash-backend-utils/src/flows/shared/get-flow-run-entity-by-id.ts
@@ -1,17 +1,23 @@
+import { splitEntityId } from "@blockprotocol/type-system";
 import { type HashEntity, queryEntities } from "@local/hash-graph-sdk/entity";
 import { currentTimeInstantTemporalAxes } from "@local/hash-isomorphic-utils/graph-queries";
 import { systemEntityTypes } from "@local/hash-isomorphic-utils/ontology-type-ids";
 
-import type { ActorEntityUuid, EntityUuid } from "@blockprotocol/type-system";
+import type { ActorEntityUuid, EntityId } from "@blockprotocol/type-system";
 import type { GraphApi } from "@local/hash-graph-client";
 import type { FlowRun as FlowRunEntity } from "@local/hash-isomorphic-utils/system-types/shared";
 
+/**
+ * A flow run's entity, if the user can view it.
+ */
 export const getFlowRunEntityById = async (params: {
-  flowRunId: EntityUuid;
+  flowRunEntityId: EntityId;
   graphApiClient: GraphApi;
   userAuthentication: { actorId: ActorEntityUuid };
 }): Promise<HashEntity<FlowRunEntity> | null> => {
-  const { flowRunId, graphApiClient, userAuthentication } = params;
+  const { flowRunEntityId, graphApiClient, userAuthentication } = params;
+
+  const [webId, entityUuid] = splitEntityId(flowRunEntityId);
 
   const {
     entities: [existingFlowEntity],
@@ -21,9 +27,8 @@ export const getFlowRunEntityById = async (params: {
     {
       filter: {
         all: [
-          {
-            equal: [{ path: ["uuid"] }, { parameter: flowRunId }],
-          },
+          { equal: [{ path: ["webId"] }, { parameter: webId }] },
+          { equal: [{ path: ["uuid"] }, { parameter: entityUuid }] },
           {
             equal: [
               { path: ["type", "baseUrl"] },
diff --git a/libs/@local/hash-isomorphic-utils/src/ai-inference-types.ts b/libs/@local/hash-isomorphic-utils/src/ai-inference-types.ts
index 478bba8d4d9..419be969dbb 100644
--- a/libs/@local/hash-isomorphic-utils/src/ai-inference-types.ts
+++ b/libs/@local/hash-isomorphic-utils/src/ai-inference-types.ts
@@ -6,7 +6,11 @@ import type {
   ExternalInputRequestSignal,
   ExternalInputResponseSignal,
 } from "./flows/types.js";
-import type { PropertyObject, VersionedUrl } from "@blockprotocol/type-system";
+import type {
+  EntityId,
+  PropertyObject,
+  VersionedUrl,
+} from "@blockprotocol/type-system";
 import type { DistributiveOmit } from "@local/advanced-types/distribute";
 import type { SerializedEntity } from "@local/hash-graph-sdk/entity";
 import type { Status } from "@local/status";
@@ -144,7 +148,7 @@ export type ManualInferenceWebsocketRequestMessage = WebSocketMessageAuth & {
 
 export type CancelInferEntitiesWebsocketRequestMessage =
   WebSocketMessageAuth & {
-    flowRunId: string;
+    flowRunEntityId: EntityId;
     type: "cancel-inference-request";
     requestUuid: string;
   };
@@ -155,7 +159,7 @@ export type CheckForExternalInputRequestsWebsocketRequestMessage =
   };
 
 export type ExternalInputWebsocketResponseMessage = WebSocketMessageAuth & {
-  workflowId: string;
+  flowRunEntityId: EntityId;
   type: "external-input-response";
   payload: DistributiveOmit<ExternalInputResponseSignal, "resolvedBy">;
 };
@@ -168,7 +172,7 @@ export type InferenceWebsocketClientMessage =
   | ExternalInputWebsocketResponseMessage;
 
 export type ExternalInputWebsocketRequestMessage = {
-  workflowId: string;
+  flowRunEntityId: EntityId;
   payload: ExternalInputRequestSignal;
   type: "external-input-request";
 };
diff --git a/libs/@local/hash-isomorphic-utils/src/create-apollo-client.ts b/libs/@local/hash-isomorphic-utils/src/create-apollo-client.ts
index 8dcf110cd47..6a7bdd63d7f 100644
--- a/libs/@local/hash-isomorphic-utils/src/create-apollo-client.ts
+++ b/libs/@local/hash-isomorphic-utils/src/create-apollo-client.ts
@@ -122,7 +122,7 @@ export const createApolloClient = (params?: {
       typePolicies: {
         UnknownEntity: entityKeyFields,
         PageProperties: { keyFields: ["pageEntityId"] },
-        FlowRun: { keyFields: ["flowRunId"] },
+        FlowRun: { keyFields: ["flowRunEntityId"] },
       },
     }),
     connectToDevTools:
diff --git a/libs/@local/hash-isomorphic-utils/src/flows/frontend-paths.ts b/libs/@local/hash-isomorphic-utils/src/flows/frontend-paths.ts
index 6c6736e490b..64c79d8db31 100644
--- a/libs/@local/hash-isomorphic-utils/src/flows/frontend-paths.ts
+++ b/libs/@local/hash-isomorphic-utils/src/flows/frontend-paths.ts
@@ -1,4 +1,7 @@
-import type { EntityUuid } from "@blockprotocol/type-system";
+import {
+  extractEntityUuidFromEntityId,
+  type EntityId,
+} from "@blockprotocol/type-system";
 
 export const generateFlowDefinitionPath = ({
   shortname,
@@ -8,13 +11,17 @@ export const generateFlowDefinitionPath = ({
   flowDefinitionId: string;
 }) => `/@${shortname}/flows/${flowDefinitionId}`;
 
+/**
+ * The page of a flow run. The shortname names the run's web, so the path only needs the uuid of its entity.
+ */
 export const generateWorkerRunPath = ({
   shortname,
-  flowRunId,
+  flowRunEntityId,
 }: {
   shortname: string;
-  flowRunId: EntityUuid;
-}) => `/@${shortname.replace(/^@/, "")}/workers/${flowRunId}`;
+  flowRunEntityId: EntityId;
+}) =>
+  `/@${shortname.replace(/^@/, "")}/workers/${extractEntityUuidFromEntityId(flowRunEntityId)}`;
 
 export const workerFlowFilterParam = "flow";
 
diff --git a/libs/@local/hash-isomorphic-utils/src/flows/temporal-types.ts b/libs/@local/hash-isomorphic-utils/src/flows/temporal-types.ts
index 22f8d3df88b..a051ce7e801 100644
--- a/libs/@local/hash-isomorphic-utils/src/flows/temporal-types.ts
+++ b/libs/@local/hash-isomorphic-utils/src/flows/temporal-types.ts
@@ -21,7 +21,7 @@ export type BaseRunFlowWorkflowParams = {
    * 1. The first run might not start immediately, so we don't do any re-routing.
    * 2. Schedules result in multiple runs, so there's no single entity UUID to return.
    */
-  flowRunId?: EntityUuid;
+  flowRunEntityUuid?: EntityUuid;
   /**
    * The uuid of the `Flow Definition` entity to run. The run loads the definition when it starts, so it runs the
    * edition current at that time.
diff --git a/libs/@local/hash-isomorphic-utils/src/graphql/queries/flow.queries.ts b/libs/@local/hash-isomorphic-utils/src/graphql/queries/flow.queries.ts
index 0815066693c..0808963c798 100644
--- a/libs/@local/hash-isomorphic-utils/src/graphql/queries/flow.queries.ts
+++ b/libs/@local/hash-isomorphic-utils/src/graphql/queries/flow.queries.ts
@@ -8,7 +8,7 @@ export const getFlowRunsQuery = gql`
       flowRuns {
         name
         flowDefinitionId
-        flowRunId
+        flowRunEntityId
         flowScheduleId
         webId
         status
@@ -34,11 +34,11 @@ export const getFlowRunsQuery = gql`
 `;
 
 export const getFlowRunById = gql`
-  query getFlowRunById($flowRunId: String!) {
-    getFlowRunById(flowRunId: $flowRunId) {
+  query getFlowRunById($flowRunEntityId: EntityId!) {
+    getFlowRunById(flowRunEntityId: $flowRunEntityId) {
       name
       flowDefinitionId
-      flowRunId
+      flowRunEntityId
       flowScheduleId
       failureMessage
       webId
@@ -70,9 +70,12 @@ export const getFlowRunById = gql`
 
 export const submitExternalInputResponseMutation = gql`
   mutation submitExternalInputResponse(
-    $flowUuid: ID!
+    $flowRunEntityId: EntityId!
     $response: ExternalInputResponseWithoutUser!
   ) {
-    submitExternalInputResponse(flowUuid: $flowUuid, response: $response)
+    submitExternalInputResponse(
+      flowRunEntityId: $flowRunEntityId
+      response: $response
+    )
   }
 `;
diff --git a/libs/@local/hash-isomorphic-utils/src/graphql/type-defs/knowledge/flow.typedef.ts b/libs/@local/hash-isomorphic-utils/src/graphql/type-defs/knowledge/flow.typedef.ts
index 24699f12ddc..1a713ae4c00 100644
--- a/libs/@local/hash-isomorphic-utils/src/graphql/type-defs/knowledge/flow.typedef.ts
+++ b/libs/@local/hash-isomorphic-utils/src/graphql/type-defs/knowledge/flow.typedef.ts
@@ -125,10 +125,9 @@ export const flowTypedef = gql`
 
   type FlowRun {
     """
-    The uuid of the flow run.
-    This is equivalent to the EntityUuid of the Flow entity.
+    The entity id of the run's Flow Run entity.
     """
-    flowRunId: EntityUuid!
+    flowRunEntityId: EntityId!
     """
     The id of the schedule that triggered this run, if any.
     Only present for flow runs triggered by a FlowSchedule.
@@ -228,19 +227,19 @@ export const flowTypedef = gql`
       limit: Int
     ): PaginatedFlowRuns!
 
-    getFlowRunById(flowRunId: String!): FlowRun!
+    getFlowRunById(flowRunEntityId: EntityId!): FlowRun!
   }
 
   extend type Mutation {
     """
-    Start a new flow run, and return its flowRunId to allow for identifying it later.
+    Start a new flow run, and return the entity id of its Flow Run entity to allow for identifying it later.
     """
     startFlow(
       dataSources: FlowDataSources
       flowDefinitionId: EntityUuid!
       flowInputs: FlowInputValues!
       webId: WebId!
-    ): EntityUuid!
+    ): EntityId!
 
     """
     Reset a flow to a specific checkpoint, available via the 'checkpoints' field on a run
@@ -250,21 +249,25 @@ export const flowTypedef = gql`
 
     Any API usage incurred at any point will still be recorded, whether or not it is after the checkpoint.
     """
-    resetFlow(flowUuid: ID!, checkpointId: ID!, eventId: Int!): Boolean!
+    resetFlow(
+      flowRunEntityId: EntityId!
+      checkpointId: ID!
+      eventId: Int!
+    ): Boolean!
 
     """
     Cancel a flow, stopping its execution.
 
     This does _NOT_ roll back any database mutations made as part of the flow so far.
     """
-    cancelFlow(flowUuid: ID!): Boolean!
+    cancelFlow(flowRunEntityId: EntityId!): Boolean!
 
     """
     Submit a response to a request from a flow step for external input
     """
     submitExternalInputResponse(
       response: ExternalInputResponseWithoutUser!
-      flowUuid: ID!
+      flowRunEntityId: EntityId!
     ): Boolean!
 
     """