diff --git a/.github/workflows/package-acceptance.yml b/.github/workflows/package-acceptance.yml
index fb6af91643e..0814a8ac3c0 100644
--- a/.github/workflows/package-acceptance.yml
+++ b/.github/workflows/package-acceptance.yml
@@ -262,6 +262,7 @@ jobs:
       include_openwebui: ${{ steps.profile.outputs.include_openwebui }}
       include_release_path_suites: ${{ steps.profile.outputs.include_release_path_suites }}
       package_artifact_name: ${{ steps.profile.outputs.package_artifact_name }}
+      package_source_sha: ${{ steps.resolve.outputs.package_source_sha }}
       package_sha256: ${{ steps.resolve.outputs.sha256 }}
       package_version: ${{ steps.resolve.outputs.package_version }}
       telegram_enabled: ${{ steps.profile.outputs.telegram_enabled }}
@@ -493,7 +494,7 @@ jobs:
       package_spec: ${{ inputs.package_spec }}
       package_artifact_name: ${{ needs.resolve_package.outputs.package_artifact_name }}
       package_label: openclaw@${{ needs.resolve_package.outputs.package_version }}
-      harness_ref: ${{ inputs.source == 'ref' && inputs.package_ref || inputs.workflow_ref }}
+      harness_ref: ${{ needs.resolve_package.outputs.package_source_sha || inputs.workflow_ref }}
       provider_mode: ${{ needs.resolve_package.outputs.telegram_mode }}
       scenario: ${{ inputs.telegram_scenarios }}
     secrets:
diff --git a/scripts/e2e/mcp-channels-docker.sh b/scripts/e2e/mcp-channels-docker.sh
index 0663efade95..94f11930f0b 100644
--- a/scripts/e2e/mcp-channels-docker.sh
+++ b/scripts/e2e/mcp-channels-docker.sh
@@ -85,7 +85,13 @@ docker run --rm \
     trap cleanup_inner EXIT
     trap dump_gateway_log_on_error ERR
     gateway_ready=0
-    for _ in \$(seq 1 160); do
+    for _ in \$(seq 1 480); do
+      if ! kill -0 \"\$gateway_pid\" >/dev/null 2>&1; then
+        echo \"Gateway exited before becoming ready\"
+        wait \"\$gateway_pid\" || true
+        tail -n 120 /tmp/mcp-channels-gateway.log 2>/dev/null || true
+        exit 1
+      fi
       if grep -q '\[gateway\] ready' /tmp/mcp-channels-gateway.log 2>/dev/null; then
         gateway_ready=1
         break
diff --git a/scripts/resolve-openclaw-package-candidate.mjs b/scripts/resolve-openclaw-package-candidate.mjs
index fb207a219e3..beecc19c617 100644
--- a/scripts/resolve-openclaw-package-candidate.mjs
+++ b/scripts/resolve-openclaw-package-candidate.mjs
@@ -436,6 +436,7 @@ async function resolveCandidate(options) {
   }
   await appendGithubOutputs(options.githubOutput, {
     package_name: pkg.name,
+    package_source_sha: packageSourceSha,
     package_version: pkg.version,
     sha256: digest,
     tarball: metadata.tarball,
diff --git a/test/scripts/package-acceptance-workflow.test.ts b/test/scripts/package-acceptance-workflow.test.ts
index d408f435d48..a558236ecb8 100644
--- a/test/scripts/package-acceptance-workflow.test.ts
+++ b/test/scripts/package-acceptance-workflow.test.ts
@@ -54,7 +54,10 @@ describe("package acceptance workflow", () => {
       "package_label: openclaw@${{ needs.resolve_package.outputs.package_version }}",
     );
     expect(workflow).toContain(
-      "harness_ref: ${{ inputs.source == 'ref' && inputs.package_ref || inputs.workflow_ref }}",
+      "package_source_sha: ${{ steps.resolve.outputs.package_source_sha }}",
+    );
+    expect(workflow).toContain(
+      "harness_ref: ${{ needs.resolve_package.outputs.package_source_sha || inputs.workflow_ref }}",
     );
   });
 });