fix(workboard): preserve json list archive visibility

vincentkoc · web-flow · commit 06fe3bab81db · 2026-06-24T10:45:58.000+08:00
diff --git a/apps/ios/fastlane/Fastfile b/apps/ios/fastlane/Fastfile
@@ -925,17 +925,40 @@ end
 
 def verify_app_store_screenshot_set!(app_screenshot_set:, screenshots:, locale:, display_type:)
   expected = app_store_screenshot_expected_rows(screenshots)
-  actual = app_store_screenshot_actual_rows(app_screenshot_set)
-  actual_identity = actual.map { |row| { checksum: row[:checksum], file_name: row[:file_name] } }
-  incomplete = actual.reject { |row| row[:state] == "COMPLETE" }
+  timeout_seconds = app_store_screenshot_processing_timeout_seconds
+  deadline = Time.now + timeout_seconds
+  actual = []
 
-  return if actual_identity == expected && incomplete.empty?
+  loop do
+    app_screenshot_set = Spaceship::ConnectAPI::AppScreenshotSet.get(app_screenshot_set_id: app_screenshot_set.id)
+    actual = app_store_screenshot_actual_rows(app_screenshot_set)
+    actual_identity = actual.map { |row| { checksum: row[:checksum], file_name: row[:file_name] } }
+    incomplete = actual.reject { |row| row[:state] == "COMPLETE" }
 
-  UI.user_error!(
-    "App Store Connect screenshot verification failed for #{locale} #{display_type}. " \
-      "Expected: #{format_app_store_screenshot_rows(expected)}. " \
-      "Actual: #{format_app_store_screenshot_rows(actual)}."
-  )
+    return if actual_identity == expected && incomplete.empty?
+
+    if actual.length > expected.length
+      UI.user_error!(
+        "App Store Connect screenshot verification failed for #{locale} #{display_type}. " \
+          "Expected: #{format_app_store_screenshot_rows(expected)}. " \
+          "Actual: #{format_app_store_screenshot_rows(actual)}."
+      )
+    end
+
+    if Time.now >= deadline
+      UI.user_error!(
+        "Timed out after #{timeout_seconds}s waiting for App Store Connect screenshot verification for #{locale} #{display_type}. " \
+          "Expected: #{format_app_store_screenshot_rows(expected)}. " \
+          "Actual: #{format_app_store_screenshot_rows(actual)}."
+      )
+    end
+
+    UI.verbose(
+      "Waiting for App Store Connect screenshot verification for #{locale} #{display_type}: " \
+        "#{format_app_store_screenshot_rows(actual)}."
+    )
+    sleep(APP_STORE_SCREENSHOT_PROCESSING_POLL_SECONDS)
+  end
 end
 
 def replace_app_store_screenshot_set!(localization:, display_type:, screenshots:)
diff --git a/scripts/qa-lab-up.ts b/scripts/qa-lab-up.ts
@@ -33,8 +33,9 @@ Options:
 }
 
 function parseQaLabUpArgs(argv: readonly string[]) {
+  const args = argv[0] === "--" ? argv.slice(1) : argv;
   return parseArgs({
-    args: [...argv],
+    args: [...args],
     options,
     allowPositionals: false,
   }).values;
diff --git a/src/cli/ports.ts b/src/cli/ports.ts
@@ -3,7 +3,7 @@ import { execFileSync } from "node:child_process";
 import { createServer } from "node:net";
 import { formatErrorMessage } from "../infra/errors.js";
 import { resolveLsofCommandSync } from "../infra/ports-lsof.js";
-import { tryListenOnPort } from "../infra/ports-probe.js";
+import { probePortUsage } from "../infra/ports-probe.js";
 import { getWindowsSystem32ExePath } from "../infra/windows-install-roots.js";
 import { resolvePositiveTimerTimeoutMs, resolveTimerTimeoutMs } from "../shared/number-coercion.js";
 import { sleep } from "../utils.js";
@@ -131,16 +131,12 @@ function killPortWithFuser(port: number, signal: "SIGTERM" | "SIGKILL"): PortPro
 }
 
 async function isPortBusy(port: number): Promise<boolean> {
-  try {
-    await tryListenOnPort({ port, exclusive: true });
-    return false;
-  } catch (err: unknown) {
-    const code = (err as NodeJS.ErrnoException).code;
-    if (code === "EADDRINUSE") {
-      return true;
-    }
-    throw err instanceof Error ? err : new Error(String(err));
-  }
+  // Route through probePortUsage which probes all four endpoints
+  // (127.0.0.1, 0.0.0.0, ::1, ::) instead of a single hostless bind
+  // that defaults to IPv6 wildcard and misses IPv4-only occupants.
+  // Treat "unknown" as busy — inconclusive probe failures must not cause
+  // forceFreePortAndWait to exit early before lsof/fuser can inspect.
+  return (await probePortUsage(port)) !== "free";
 }
 
 export function parseLsofOutput(output: string): PortProcess[] {
diff --git a/src/cli/program.force.test.ts b/src/cli/program.force.test.ts
@@ -9,10 +9,10 @@ vi.mock("node:child_process", async () => {
   };
 });
 
-const tryListenOnPortMock = vi.hoisted(() => vi.fn());
+const probePortUsageMock = vi.hoisted(() => vi.fn());
 
 vi.mock("../infra/ports-probe.js", () => ({
-  tryListenOnPort: (...args: unknown[]) => tryListenOnPortMock(...args),
+  probePortUsage: (...args: unknown[]) => probePortUsageMock(...args),
 }));
 
 import { execFileSync } from "node:child_process";
@@ -33,10 +33,8 @@ describe("gateway --force helpers", () => {
     vi.clearAllMocks();
     originalKill = process.kill.bind(process);
     originalPlatform = process.platform;
-    tryListenOnPortMock.mockReset();
-    tryListenOnPortMock.mockRejectedValue(
-      Object.assign(new Error("in use"), { code: "EADDRINUSE" }),
-    );
+    probePortUsageMock.mockReset();
+    probePortUsageMock.mockResolvedValue("busy");
     // Pin to linux so all lsof tests are platform-invariant.
     Object.defineProperty(process, "platform", { value: "linux", configurable: true });
   });
@@ -65,7 +63,7 @@ describe("gateway --force helpers", () => {
   });
 
   it("skips lsof when the port is already bindable", async () => {
-    tryListenOnPortMock.mockResolvedValue(undefined);
+    probePortUsageMock.mockResolvedValue("free");
 
     const result = await forceFreePortAndWait(18789, { timeoutMs: 500, intervalMs: 100 });
 
@@ -199,9 +197,7 @@ describe("gateway --force helpers", () => {
       }
       return "18789/tcp: 4242\n";
     });
-    tryListenOnPortMock
-      .mockRejectedValueOnce(Object.assign(new Error("in use"), { code: "EADDRINUSE" }))
-      .mockResolvedValue(undefined);
+    probePortUsageMock.mockResolvedValueOnce("busy").mockResolvedValue("free");
 
     const result = await forceFreePortAndWait(18789, { timeoutMs: 500, intervalMs: 100 });
 
@@ -231,13 +227,12 @@ describe("gateway --force helpers", () => {
       return "";
     });
 
-    const busyErr = Object.assign(new Error("in use"), { code: "EADDRINUSE" });
-    tryListenOnPortMock
-      .mockRejectedValueOnce(busyErr)
-      .mockRejectedValueOnce(busyErr)
-      .mockRejectedValueOnce(busyErr)
-      .mockRejectedValueOnce(busyErr)
-      .mockResolvedValueOnce(undefined);
+    probePortUsageMock
+      .mockResolvedValueOnce("busy")
+      .mockResolvedValueOnce("busy")
+      .mockResolvedValueOnce("busy")
+      .mockResolvedValueOnce("busy")
+      .mockResolvedValue("free");
 
     const promise = forceFreePortAndWait(18789, {
       timeoutMs: 300,
@@ -258,6 +253,8 @@ describe("gateway --force helpers", () => {
   });
 
   it("throws when lsof is unavailable and fuser is missing", async () => {
+    // An inconclusive four-host probe must continue into the cleanup tools.
+    probePortUsageMock.mockResolvedValue("unknown");
     (execFileSync as unknown as Mock).mockImplementation((cmd: string) => {
       const err = new Error(`spawnSync ${cmd} ENOENT`) as NodeJS.ErrnoException;
       err.code = "ENOENT";
diff --git a/test/scripts/qa-lab-up.test.ts b/test/scripts/qa-lab-up.test.ts
@@ -34,6 +34,19 @@ describe("scripts/qa-lab-up", () => {
     );
   });
 
+  it("accepts the pnpm run argument separator", async () => {
+    const runQaDockerUpCommand = vi.fn(async () => {});
+    const loadRuntime = vi.fn(async () => ({ runQaDockerUpCommand }));
+
+    await expect(
+      qaLabUpTesting.runQaLabUp(["--", "--gateway-port", "4100"], { loadRuntime }),
+    ).resolves.toBe(0);
+
+    expect(runQaDockerUpCommand).toHaveBeenCalledWith(
+      expect.objectContaining({ gatewayPort: 4100 }),
+    );
+  });
+
   it("accepts the maximum TCP port before loading the Docker runtime", async () => {
     const runQaDockerUpCommand = vi.fn(async () => {});
     const loadRuntime = vi.fn(async () => ({ runQaDockerUpCommand }));
