Fix pnpm scope package issue

Author: setoelkahfi

.agents/skills/smbcloud-deploy-nextjs/SKILL.md

@@ -310,6 +310,13 @@ Fix:
 
 ### `Cannot find module 'styled-jsx'`, `@swc/helpers`, or other pnpm peer deps
 
+A common concrete failure looks like:
+
+- `code: 'MODULE_NOT_FOUND'`
+- `path: '/home/git/apps/web/<app>/node_modules/@swc/helpers'`
+
+That usually means the standalone upload succeeded, but the top-level hoisted symlink for a scoped package was not recreated on the server.
+
 Cause:
 
 - pnpm stores peer dependencies inside `node_modules/.pnpm/<pkg>@<version>/node_modules/<pkg>` with internal symlinks that Node's standard `require.resolve()` cannot follow
@@ -318,10 +325,15 @@ Cause:
 
 Fix:
 
-- the CLI deploy script now auto-hoists: after uploading standalone output, it scans `node_modules/.pnpm/*/node_modules/*` and creates symlinks at `node_modules/<pkg>` for any packages not already present
-- this restores the resolution structure that pnpm normally provides via its `.pnpm/node_modules/` virtual directory
-- no manual intervention needed for new deploys
-- to fix a server manually: `find node_modules/.pnpm -mindepth 2 -maxdepth 2 -type d -name node_modules` and symlink each child into the root `node_modules/`
+- the CLI deploy script now auto-hoists in two passes:
+  - first mirror pnpm's virtual directory at `node_modules/.pnpm/node_modules/*`
+  - then fall back to scanning `node_modules/.pnpm/*/node_modules/*` for anything still missing
+- this preserves pnpm's exact resolved package choice and fixes scoped packages like `@swc/helpers` as well as unscoped ones like `styled-jsx`
+- no manual intervention needed for new deploys once the updated CLI is used
+- to fix a server manually, prefer pnpm's virtual directory as the source of truth:
+  - create `node_modules/@scope/` directories as needed
+  - symlink `node_modules/<pkg>` or `node_modules/@scope/<pkg>` to the corresponding entry under `node_modules/.pnpm/node_modules/`
+  - only if that directory is missing, scan individual `.pnpm/<store-entry>/node_modules/*` folders as a fallback
 
 ### Wrong port after deploy
 

crates/cli/src/deploy/process_deploy_nextjs_ssr.rs

@@ -456,9 +456,30 @@ ECOSYSTEM_EOF
 
     # pnpm standalone output buries peer deps inside node_modules/.pnpm/
     # without the top-level symlinks Node needs for require.resolve().
-    # Scan the .pnpm store and create flat symlinks. For scoped packages,
-    # always force-replace partial rsync copies with symlinks to the .pnpm
-    # store entry that has the most content (not just package.json).
+    # First mirror pnpm's own virtual node_modules directory when it exists —
+    # this preserves the exact version selection pnpm already resolved, which is
+    # especially important for scoped packages like @swc/helpers.
+    # Then fall back to scanning individual .pnpm store entries for anything the
+    # virtual directory did not expose.
+    if [ -d "node_modules/.pnpm/node_modules" ]; then
+        for pkg_path in node_modules/.pnpm/node_modules/*; do
+            [ -e "$pkg_path" ] || continue
+            pkg_name=$(basename "$pkg_path")
+            if [ "${{pkg_name:0:1}}" = "@" ] && [ -d "$pkg_path" ]; then
+                mkdir -p "node_modules/$pkg_name"
+                for sub_path in "$pkg_path"/*; do
+                    [ -e "$sub_path" ] || continue
+                    sub_name=$(basename "$sub_path")
+                    rm -rf "node_modules/$pkg_name/$sub_name"
+                    ln -sfn "$APP_PATH/$sub_path" "node_modules/$pkg_name/$sub_name"
+                done
+            else
+                rm -rf "node_modules/$pkg_name"
+                ln -sfn "$APP_PATH/$pkg_path" "node_modules/$pkg_name"
+            fi
+        done
+    fi
+
     if [ -d "node_modules/.pnpm" ]; then
         find node_modules/.pnpm -mindepth 2 -maxdepth 2 -type d -name "node_modules" 2>/dev/null | while read pnpm_nm; do
             for pkg_path in "$pnpm_nm"/*; do
@@ -484,7 +505,10 @@ ECOSYSTEM_EOF
                         fi
                     done
                 else
-                    [ -e "node_modules/$pkg_name" ] || ln -sfn "$APP_PATH/$pkg_path" "node_modules/$pkg_name"
+                    if [ -e "node_modules/$pkg_name" ]; then
+                        continue
+                    fi
+                    ln -sfn "$APP_PATH/$pkg_path" "node_modules/$pkg_name"
                 fi
             done
         done