From 0baa13f7de4e0183ccf301a93cbf8f645ab9edb9 Mon Sep 17 00:00:00 2001
From: Your Name <your.email@example.com>
Date: Mon, 1 Jun 2026 18:37:26 +0800
Subject: [PATCH] Revert "fix: clip PSD super lock replacements"

This reverts commit 6e647021cdc52a083cace27801044838f11a5864.
---
 .../agents/AgentPsdTemplateEditorDialog.tsx   | 47 +++++--------------
 lib/agents/psd-template-renderer.ts           | 14 ++----
 2 files changed, 15 insertions(+), 46 deletions(-)

diff --git a/components/agents/AgentPsdTemplateEditorDialog.tsx b/components/agents/AgentPsdTemplateEditorDialog.tsx
index 17be76a3d..c296a0755 100644
--- a/components/agents/AgentPsdTemplateEditorDialog.tsx
+++ b/components/agents/AgentPsdTemplateEditorDialog.tsx
@@ -1471,30 +1471,19 @@ function renderTextLayerPreviewContent(
   );
 }
 
-function getAssignedImageMaskStyle(params: {
-  layer: AgentPsdTemplateImageLayerSlot;
-  maskSourceUrl?: string;
-}): CSSProperties {
-  const normalizedMaskUrl = String(
-    params.layer.maskUrl || params.maskSourceUrl || ""
-  ).trim();
-  const hasMask = Boolean(normalizedMaskUrl);
-  const maskImageUrl = hasMask
-    ? `url(${buildPsdLayerPreviewUrl(normalizedMaskUrl, {
-        width: params.layer.width,
-        quality: 72,
-      })})`
-    : undefined;
+function getAssignedImageMaskStyle(
+  layer: AgentPsdTemplateImageLayerSlot
+): CSSProperties {
+  const hasMask = Boolean(layer.maskUrl);
   return {
-    WebkitMaskImage: maskImageUrl,
-    maskImage: maskImageUrl,
+    WebkitMaskImage: hasMask ? `url(${layer.maskUrl})` : undefined,
+    maskImage: hasMask ? `url(${layer.maskUrl})` : undefined,
     WebkitMaskSize: hasMask ? "100% 100%" : undefined,
     maskSize: hasMask ? "100% 100%" : undefined,
     WebkitMaskRepeat: hasMask ? "no-repeat" : undefined,
     maskRepeat: hasMask ? "no-repeat" : undefined,
     WebkitMaskPosition: hasMask ? "center" : undefined,
     maskPosition: hasMask ? "center" : undefined,
-    maskMode: hasMask ? "alpha" : undefined,
   };
 }
 
@@ -4239,20 +4228,12 @@ export function AgentPsdTemplateEditorDialog({
                               if (!layerImageUrl) {
                                 return null;
                               }
-                              const layerPreviewSourceUrl =
-                                getPsdLayerPreviewSourceUrl(layer);
                               const assignedImageContainerStyle = assignedUrl
                                 ? {
                                     ...layerBoxStyle,
-                                    ...getAssignedImageMaskStyle({
-                                      layer,
-                                      maskSourceUrl: layerPreviewSourceUrl,
-                                    }),
+                                    ...getAssignedImageMaskStyle(layer),
                                   }
                                 : layerBoxStyle;
-                              const previewZIndex = hasAssignedImage
-                                ? Math.max(baseZIndex, renderBaseZIndex + 1)
-                                : baseZIndex;
 
                               return (
                                 <div
@@ -4280,7 +4261,7 @@ export function AgentPsdTemplateEditorDialog({
                                   }}
                                   style={{
                                     ...assignedImageContainerStyle,
-                                    zIndex: previewZIndex,
+                                    zIndex: baseZIndex,
                                     cursor: canDragAssignedImage
                                       ? imagePlacementDragStateRef.current
                                           ?.layerId === layer.id
@@ -4542,9 +4523,6 @@ export function AgentPsdTemplateEditorDialog({
                                 effectiveImageAssignments[layer.id] || ""
                               ).trim()
                             );
-                            const effectiveBaseZIndex = hasAssignedImage
-                              ? Math.max(baseZIndex, renderBaseZIndex + 1)
-                              : baseZIndex;
                             const isLayerSuperLocked =
                               isAgentPsdLayerSuperLocked(layer);
 
@@ -4556,7 +4534,7 @@ export function AgentPsdTemplateEditorDialog({
                                 style={{
                                   ...frameStyle,
                                   zIndex:
-                                    effectiveBaseZIndex +
+                                    baseZIndex +
                                     SELECTED_LAYER_INTERACTION_Z_BOOST,
                                   background: "rgba(249,115,22,0.08)",
                                   cursor:
@@ -4589,7 +4567,7 @@ export function AgentPsdTemplateEditorDialog({
                                 style={{
                                   ...frameStyle,
                                   zIndex:
-                                    effectiveBaseZIndex +
+                                    baseZIndex +
                                     (isSelected
                                       ? SELECTED_LAYER_INTERACTION_Z_BOOST
                                       : 0),
@@ -4626,9 +4604,6 @@ export function AgentPsdTemplateEditorDialog({
                             );
                             const baseZIndex =
                               layerStackZIndexById.get(layer.id) || 1;
-                            const effectiveBaseZIndex = hasAssignedImage
-                              ? Math.max(baseZIndex, renderBaseZIndex + 1)
-                              : baseZIndex;
                             if (!isSelected || !hasAssignedImage) {
                               return null;
                             }
@@ -4656,7 +4631,7 @@ export function AgentPsdTemplateEditorDialog({
                                       44
                                   ),
                                   zIndex:
-                                    effectiveBaseZIndex +
+                                    baseZIndex +
                                     SELECTED_LAYER_CONTROLS_Z_BOOST,
                                 }}
                               >
diff --git a/lib/agents/psd-template-renderer.ts b/lib/agents/psd-template-renderer.ts
index 02e01bdc0..d9a45880c 100644
--- a/lib/agents/psd-template-renderer.ts
+++ b/lib/agents/psd-template-renderer.ts
@@ -1035,17 +1035,11 @@ export async function renderAgentPsdTemplate(params: {
         .png(PSD_RENDER_PNG_OPTIONS)
         .toBuffer();
 
-      const shouldUseLayerSourceAsMask =
-        !layer.maskUrl && isAgentPsdLayerSuperLocked(layer);
-      if (layer.maskUrl || shouldUseLayerSourceAsMask) {
+      if (layer.maskUrl) {
         try {
-          const rawMaskBuffer = layer.maskUrl
-            ? await readCachedBuffer(layer.maskUrl, "PSD 蒙版资源")
-            : await readReusableLayerBuffer(layer);
-          if (!rawMaskBuffer) {
-            throw new Error("Missing PSD layer mask source");
-          }
-          const maskBuffer = await sharp(rawMaskBuffer)
+          const maskBuffer = await sharp(
+            await readCachedBuffer(layer.maskUrl, "PSD 蒙版资源")
+          )
             .resize({
               width: Math.max(1, Math.round(layer.width)),
               height: Math.max(1, Math.round(layer.height)),