Merge pull request #69 from taptap:feat/cloud-save

feat(ci): add Linux ARM64 and fix macOS Intel build

Author: MikotoZero

.github/workflows/build-native.yml

@@ -32,15 +32,16 @@ jobs:
       fail-fast: false
       matrix:
         settings:
-          # macOS
-          - host: macos-latest
+          # macOS Intel (x64)
+          - host: macos-13
             target: x86_64-apple-darwin
             artifact: taptap-signer.darwin-x64.node
             build: |
               cd native
               npm run build
               strip -x *.node
 
+          # macOS Apple Silicon (ARM64)
           - host: macos-latest
             target: aarch64-apple-darwin
             artifact: taptap-signer.darwin-arm64.node

.github/workflows/release.yml

@@ -77,14 +77,15 @@ jobs:
       fail-fast: false
       matrix:
         settings:
-          # macOS
-          - host: macos-latest
+          # macOS Intel (x64)
+          - host: macos-13
             target: x86_64-apple-darwin
             build: |
               cd native
               npm run build
               strip -x *.node
 
+          # macOS Apple Silicon (ARM64)
           - host: macos-latest
             target: aarch64-apple-darwin
             build: |
@@ -102,7 +103,7 @@ jobs:
               npm run build -- --target x86_64-unknown-linux-gnu
               strip *.node
 
-          # Linux Musl (Alpine)
+          # Linux Musl x64 (Alpine)
           - host: ubuntu-latest
             target: x86_64-unknown-linux-musl
             docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
@@ -112,6 +113,16 @@ jobs:
               npm run build -- --target x86_64-unknown-linux-musl
               strip *.node
 
+          # Linux Musl ARM64 (Alpine on ARM servers / Apple Silicon Docker)
+          - host: ubuntu-latest
+            target: aarch64-unknown-linux-musl
+            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
+            build: |
+              rustup update stable && rustup default stable
+              cd native
+              npm run build -- --target aarch64-unknown-linux-musl
+              strip *.node
+
           # Windows
           - host: windows-latest
             target: x86_64-pc-windows-msvc

src/core/utils/pathResolver.ts

@@ -129,13 +129,13 @@ export function resolveWorkPath(relativePath?: string, ctx?: ResolvedContext): s
 
   // 2. 如果有 Proxy 注入的 projectPath
   if (ctx?.projectPath) {
-    // 如果 projectPath 是绝对路径，直接使用
-    // 如果是相对路径，拼接到 WORKSPACE_ROOT
-    if (path.isAbsolute(ctx.projectPath)) {
-      basePath = ctx.projectPath;
-    } else {
-      basePath = path.join(WORKSPACE_ROOT, ctx.projectPath);
-    }
+    // 设计：projectPath 总是相对于 WORKSPACE_ROOT
+    // 即使以 '/' 开头也视为相对路径（去掉开头的 '/'）
+    // 例如："/a51c239e.../workspace" -> "a51c239e.../workspace"
+    const normalizedProjectPath = ctx.projectPath.startsWith('/')
+      ? ctx.projectPath.slice(1)
+      : ctx.projectPath;
+    basePath = path.join(WORKSPACE_ROOT, normalizedProjectPath);
   }
 
   // 3. 拼接用户传入的相对路径
@@ -255,11 +255,12 @@ export function resolvePathSafe(
   // 1. 计算基础路径
   let basePath = WORKSPACE_ROOT;
   if (ctx?.projectPath) {
-    if (path.isAbsolute(ctx.projectPath)) {
-      basePath = ctx.projectPath;
-    } else {
-      basePath = path.join(WORKSPACE_ROOT, ctx.projectPath);
-    }
+    // 设计：projectPath 总是相对于 WORKSPACE_ROOT
+    // 即使以 '/' 开头也视为相对路径（去掉开头的 '/'）
+    const normalizedProjectPath = ctx.projectPath.startsWith('/')
+      ? ctx.projectPath.slice(1)
+      : ctx.projectPath;
+    basePath = path.join(WORKSPACE_ROOT, normalizedProjectPath);
   }
 
   // 2. 处理空字符串或未传的情况