diff --git a/apps/api/src/orders/cancel-order.ts b/apps/api/src/orders/cancel-order.ts
index 189b169..e8a1d36 100644
--- a/apps/api/src/orders/cancel-order.ts
+++ b/apps/api/src/orders/cancel-order.ts
@@ -1,5 +1,5 @@
+import { canCancelOrder, orderCancellationBlockedMessage } from "@orderops/shared/order-status";
 import type { DatabaseContext } from "../db/database";
-import { canCancelOrder } from "./order-status";
 import { appendAuditEvent, findOrderDetail, updateOrderStatus } from "./order-repository";
 
 export async function cancelOrder(
@@ -17,7 +17,7 @@ export async function cancelOrder(
   }
 
   if (!canCancelOrder(order.status)) {
-    return { statusCode: 400, message: "Order cannot be cancelled for this order status." } as const;
+    return { statusCode: 400, message: orderCancellationBlockedMessage } as const;
   }
 
   const updatedAt = new Date().toISOString();
diff --git a/apps/api/src/orders/order-repository.ts b/apps/api/src/orders/order-repository.ts
index d22d165..757e348 100644
--- a/apps/api/src/orders/order-repository.ts
+++ b/apps/api/src/orders/order-repository.ts
@@ -117,7 +117,14 @@ export async function findOrderItemRecord(context: DatabaseContext, orderId: str
     .leftJoin(inventory, eq(orderItems.productId, inventory.productId))
     .where(and(eq(orderItems.id, itemId), eq(orderItems.orderId, orderId)));
 
-  return row ?? null;
+  if (!row) {
+    return null;
+  }
+
+  return {
+    ...row,
+    order: { ...row.order, status: row.order.status as OrderDetail["status"] }
+  };
 }
 
 export async function updateOrderItemQuantity(context: DatabaseContext, itemId: string, quantity: number) {
diff --git a/apps/api/src/orders/order-status.ts b/apps/api/src/orders/order-status.ts
deleted file mode 100644
index 2272249..0000000
--- a/apps/api/src/orders/order-status.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type { OrderStatus } from "@orderops/shared/order-status";
-
-export function canEditOrderItems(status: OrderStatus) {
-  return status === "pending";
-}
-
-export function canEditShippingAddress(status: OrderStatus) {
-  return status === "pending" || status === "processing";
-}
-
-export function canCancelOrder(status: OrderStatus) {
-  return status === "pending" || status === "processing";
-}
diff --git a/apps/api/src/orders/update-order-item.ts b/apps/api/src/orders/update-order-item.ts
index 21ee5e1..8451932 100644
--- a/apps/api/src/orders/update-order-item.ts
+++ b/apps/api/src/orders/update-order-item.ts
@@ -1,5 +1,5 @@
+import { canEditOrderItems, orderItemsLockedMessage } from "@orderops/shared/order-status";
 import type { DatabaseContext } from "../db/database";
-import { canEditOrderItems } from "./order-status";
 import { appendAuditEvent, findOrderDetail, findOrderItemRecord, updateOrderItemQuantity, updateOrderNotes as saveOrderNotes, updateOrderTimestamp } from "./order-repository";
 
 export async function changeOrderItemQuantity(
@@ -17,8 +17,8 @@ export async function changeOrderItemQuantity(
     return { statusCode: 404, message: "Order item not found." } as const;
   }
 
-  if (!canEditOrderItems(row.order.status as never)) {
-    return { statusCode: 400, message: "Order items cannot be changed for this order status." } as const;
+  if (!canEditOrderItems(row.order.status)) {
+    return { statusCode: 400, message: orderItemsLockedMessage } as const;
   }
 
   if (input.quantity < 1 || input.quantity > 10) {
diff --git a/apps/api/src/orders/update-shipping-address.ts b/apps/api/src/orders/update-shipping-address.ts
index c1bcfed..b472d17 100644
--- a/apps/api/src/orders/update-shipping-address.ts
+++ b/apps/api/src/orders/update-shipping-address.ts
@@ -1,6 +1,6 @@
 import type { Address } from "@orderops/shared/address";
+import { canEditShippingAddress, shippingAddressLockedMessage } from "@orderops/shared/order-status";
 import type { DatabaseContext } from "../db/database";
-import { canEditShippingAddress } from "./order-status";
 import { appendAuditEvent, findOrderDetail, updateOrderAddress, updateOrderTimestamp } from "./order-repository";
 
 export async function changeShippingAddress(
@@ -18,7 +18,7 @@ export async function changeShippingAddress(
   }
 
   if (!canEditShippingAddress(order.status)) {
-    return { statusCode: 400, message: "Shipping address cannot be changed for this order status." } as const;
+    return { statusCode: 400, message: shippingAddressLockedMessage } as const;
   }
 
   const updatedAt = new Date().toISOString();
diff --git a/apps/web/src/orders/order-page.tsx b/apps/web/src/orders/order-page.tsx
index 015681c..96e655d 100644
--- a/apps/web/src/orders/order-page.tsx
+++ b/apps/web/src/orders/order-page.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react";
-import type { Address, AuditEvent, OrderDetail } from "@orderops/shared";
+import { canEditOrderItems, orderItemsLockedMessage, type Address, type AuditEvent, type OrderDetail } from "@orderops/shared";
 import { Link, useParams } from "react-router-dom";
 import { Toast } from "../ui/toast";
 import { cancelOrder, getOrder, listAuditEvents, updateOrderItemQuantity, updateOrderNotes, updateShippingAddress } from "./order-api";
@@ -77,8 +77,8 @@ export function OrderPage() {
       return;
     }
 
-    if (order.status !== "pending") {
-      setToast({ message: "Order items cannot be changed for this order status.", variant: "error" });
+    if (!canEditOrderItems(order.status)) {
+      setToast({ message: orderItemsLockedMessage, variant: "error" });
       return;
     }
 
diff --git a/packages/shared/src/order-status.ts b/packages/shared/src/order-status.ts
index f64ca91..d41b6f7 100644
--- a/packages/shared/src/order-status.ts
+++ b/packages/shared/src/order-status.ts
@@ -1,3 +1,23 @@
 export const orderStatuses = ["pending", "processing", "shipped", "cancelled", "refunded"] as const;
 
 export type OrderStatus = (typeof orderStatuses)[number];
+
+const orderItemsEditableStatuses: readonly OrderStatus[] = ["pending"];
+const shippingAddressEditableStatuses: readonly OrderStatus[] = ["pending", "processing"];
+const orderCancellableStatuses: readonly OrderStatus[] = ["pending", "processing"];
+
+export const orderItemsLockedMessage = "Order items cannot be changed for this order status.";
+export const shippingAddressLockedMessage = "Shipping address cannot be changed for this order status.";
+export const orderCancellationBlockedMessage = "Order cannot be cancelled for this order status.";
+
+export function canEditOrderItems(status: OrderStatus) {
+  return orderItemsEditableStatuses.includes(status);
+}
+
+export function canEditShippingAddress(status: OrderStatus) {
+  return shippingAddressEditableStatuses.includes(status);
+}
+
+export function canCancelOrder(status: OrderStatus) {
+  return orderCancellableStatuses.includes(status);
+}