merge: origin/dev into cloud/issues-048 — full merge with all prod fixes

Resolved 46 conflicts:
- mobile/ (39 files): took origin/dev side (048 never touched mobile)
- .github/workflows/porter-debug.yml: kept branch triggers from both sides
- cloud/sdk types (app-to-cloud.ts, index.ts): kept v3 types + dev's SRT renames
- cloud/bun-websocket.ts: kept 048's RECONNECT routing + dev's SRT changes
- cloud/app-message-handler.ts: kept dev's roiPosition fix + SRT refactor
- cloud/UnmanagedStreamingExtension.ts: took dev's SRT refactor
- sdk/CameraManager.ts (v3): updated RTMP→Stream renames to match dev

Post-merge fixes:
- v3 CameraManager: RtmpStreamStatus→StreamStatus, RTMP_STREAM_*→STREAM_*
- CloudflareStreamService: removed stale config.quality log reference

Locally verified: types, sdk, cloud all build clean (zero TS errors).

Author: isaiahb

.github/workflows/china-deployment-dev.yml

@@ -3,7 +3,8 @@ name: China Cloud Api Deployment (Dev)
 on:
   push:
     branches:
-      - "ya/clean-china-cicd"
+      - "dev"
+      - "ya/fix-china-cloud-acr"
     paths:
       - "cloud/**"
       - ".github/workflows/china-deployment-dev.yml"
@@ -130,6 +131,8 @@ jobs:
             value: "cloud"
           - name: RESEND_API_KEY
             value: "${{ secrets.RESEND_API_KEY }}"
+          - name: UDP_HOST
+            value: "dev-udp-api.mentraglass.cn"
           EOL
 
       # Create start.sh file
@@ -147,7 +150,7 @@ jobs:
           alibaba-access-key-secret: ${{ secrets.ALIBABA_ACCESS_KEY_SECRET }}
           deployment-region: "cn-shenzhen"
           app-name: "api"
-          acr-instance-id: "cri-h675v46p9lj694l6"
+          acr-instance-id: "cri-jqkk34lm32lg9ce7"
           acr-vpc-domain: "mentra-acr-cnsz-a-registry-vpc.cn-shenzhen.cr.aliyuncs.com"
           acr-public-domain: "mentra-acr-cnsz-a-registry.cn-shenzhen.cr.aliyuncs.com"
           docker-context: "./cloud"

.github/workflows/porter-debug.yml

@@ -6,6 +6,14 @@ on:
     branches:
       - cloud/issues-048
       - cloud/issues-048-merge
+      - cloud/issues-044
+      - new-context-soniox
+      - cloud/044-ci-build-audit
+      - hotfix/cloud-observability
+      - hotfix/crash-diagnostics
+      - cloud/062-mongodb-audit
+      - hotfix/graceful-shutdown
+      - hotfix/remove-forced-gc-add-livez
     paths:
       - "cloud/**"
       - ".github/workflows/porter-debug.yml"

.github/workflows/porter-us-west.yml

@@ -0,0 +1,38 @@
+name: 🚀 Deploy cloud-prod to US West only
+
+on:
+  workflow_dispatch: # Manual trigger only — no auto-deploy
+  push:
+    branches:
+      - cloud/064-bstack-cli
+    paths:
+      - "cloud/**"
+      - ".github/workflows/porter-us-west.yml"
+jobs:
+  us-west:
+    runs-on: blacksmith-4vcpu-ubuntu-2404
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set Git SHA tag
+        id: vars
+        run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+
+      - name: Setup Porter CLI
+        uses: porter-dev/setup-porter@v0.1.0
+
+      - name: Deploy to us-west
+        timeout-minutes: 30
+        run: exec porter apply -f ./cloud/porter.yaml
+        env:
+          PORTER_APP_NAME: cloud-prod
+          NODE_ENV: production
+          PORTER_CLUSTER: "4965"
+          PORTER_PROJECT: "15081"
+          PORTER_HOST: https://dashboard.porter.run
+          PORTER_PR_NUMBER: ${{ github.event.number }}
+          PORTER_REPO_NAME: ${{ github.event.repository.name }}
+          PORTER_TAG: ${{ steps.vars.outputs.sha_short }}
+          PORTER_TOKEN: ${{ secrets.PORTER_APP_15081_4965 }}
+          PORTER_DEPLOYMENT_TARGET_ID: 540690ee-b1d7-4a5e-80e9-683d11001c75

asg_client/README.md

@@ -61,3 +61,7 @@ This removes your custom build and restores the factory app.
 ### Build Notes
 
 Must use Java SDK 17. To set this, in Android Studio, go to Settings > Build, Execution, Deployment > Build Tools > Gradle, go to Gradle JDK and select version 17
+
+### Documentation
+
+See [docs/](docs/README.md) for architecture overview, command API reference, feature docs, and the full Mentra Live setup guide.

asg_client/app/build.gradle

@@ -310,6 +310,7 @@ dependencies {
     // StreamPackLite dependencies
     implementation project(':core')
     implementation project(':extension-rtmp')
+    implementation project(':extension-srt')
 
     // OkHttp for network requests
     implementation 'com.squareup.okhttp3:okhttp:4.9.3'
@@ -323,6 +324,11 @@ dependencies {
     // Sentry SDK for error reporting
     implementation 'io.sentry:sentry-android:7.5.0'
 
+    // Google WebRTC for Android (WHIP streaming)
+    // Community-maintained prebuilt of the official Google WebRTC codebase; uses org.webrtc package.
+    // Pinned to M114 (2023) — compiled with Java 11, compatible with this project's Java 17 toolchain.
+    implementation 'io.github.webrtc-sdk:android:114.5735.08.1'
+
     // AndroidX Test dependencies
     androidTestImplementation 'androidx.test:core:1.5.0'
     androidTestImplementation 'androidx.test:runner:1.5.2'

asg_client/app/src/main/AndroidManifest.xml

@@ -137,6 +137,18 @@
             </intent-filter>
         </receiver>
 
+        <!-- Intent IPC receiver for third-party app commands -->
+        <receiver
+            android:name="com.mentra.asg_client.receiver.IntentCommandReceiver"
+            android:enabled="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.mentra.asg_client.ACTION_SEND_COMMAND" />
+                <action android:name="com.mentra.asg_client.ACTION_REGISTER_LISTENER" />
+                <action android:name="com.mentra.asg_client.ACTION_UNREGISTER_LISTENER" />
+            </intent-filter>
+        </receiver>
+
         <service
             android:name="com.mentra.asg_client.service.core.AsgClientService"
             android:enabled="true"
@@ -159,6 +171,18 @@
             android:exported="true"
             android:foregroundServiceType="camera|microphone" />
 
+        <service
+            android:name="com.mentra.asg_client.io.streaming.services.SrtStreamingService"
+            android:enabled="true"
+            android:exported="true"
+            android:foregroundServiceType="camera|microphone" />
+
+        <service
+            android:name="com.mentra.asg_client.io.streaming.services.WhipStreamingService"
+            android:enabled="true"
+            android:exported="true"
+            android:foregroundServiceType="camera|microphone" />
+
         <service
             android:name="com.mentra.asg_client.io.ota.services.OtaService"
             android:enabled="true"

asg_client/app/src/main/java/com/mentra/asg_client/SysControl.java

@@ -452,13 +452,35 @@ public static void flashRecordingLed(Context context, long durationMs) {
      * @param enable true to enable EIS, false to disable
      */
     public static void setEisEnable(Context context, boolean enable) {
-        Log.d(TAG, "🎥 Setting EIS (vendor.debug.pixsmart.vs) to: " + (enable ? "1" : "0"));
+        Log.d(TAG, "🎥 Setting EIS to: " + (enable ? "ENABLED" : "DISABLED"));
+        // Pixsmart EIS
         Intent nn = new Intent();
         nn.putExtra("cmd", "setProperty");
         nn.putExtra("name", "vendor.debug.pixsmart.vs");
         nn.putExtra("value", enable ? "1": "0");
         sendBroadcast(context, nn);
-        Log.d(TAG, "✅ EIS property broadcast sent");
+        // Morpho video EIS
+        Intent nn2 = new Intent();
+        nn2.putExtra("cmd", "setProperty");
+        nn2.putExtra("name", "vendor.debug.morpho.videoeis.mode");
+        nn2.putExtra("value", enable ? "1": "0");
+        sendBroadcast(context, nn2);
+        Log.d(TAG, "✅ EIS properties set (pixsmart + morpho)");
+    }
+
+    /**
+     * Restart the camera HAL so it picks up a new FOV/ROI value written via DevApi.setCameraFov.
+     * Sends the same K900 SystemUI broadcast as K900Server_mentra (ctl.restart / camerahalserver).
+     * @param context Application context
+     */
+    public static void restartCameraHal(Context context) {
+        Log.d(TAG, "Restarting camera HAL (ctl.restart / camerahalserver)");
+        Intent nn = new Intent();
+        nn.putExtra("cmd", "setProperty");
+        nn.putExtra("name", "ctl.restart");
+        nn.putExtra("value", "camerahalserver");
+        sendBroadcast(context, nn);
+        Log.d(TAG, "Camera HAL restart broadcast sent");
     }
 
     /**

asg_client/app/src/main/java/com/mentra/asg_client/camera/CameraNeo.java

@@ -4,6 +4,7 @@
 import com.mentra.asg_client.io.hardware.interfaces.IHardwareManager;
 import com.mentra.asg_client.service.utils.ServiceUtils;
 import com.mentra.asg_client.io.hardware.core.HardwareManagerFactory;
+import com.mentra.asg_client.SysControl;
 
 import android.annotation.SuppressLint;
 import android.app.NotificationChannel;
@@ -659,11 +660,13 @@ public int onStartCommand(Intent intent, int flags, int startId) {
                     } else {
                         pendingVideoSettings = null; // Will use defaults
                     }
+                    SysControl.setEisEnable(this, true);
                     setupCameraAndStartRecording(currentVideoId, currentVideoPath);
                     break;
                 case ACTION_STOP_VIDEO_RECORDING:
                     String videoIdToStop = intent.getStringExtra(EXTRA_VIDEO_ID);
                     stopCurrentVideoRecording(videoIdToStop);
+                    SysControl.setEisEnable(this, false);
                     break;
 
                 case ACTION_START_BUFFER:

asg_client/app/src/main/java/com/mentra/asg_client/io/bluetooth/core/BaseBluetoothManager.java

@@ -5,6 +5,9 @@
 
 import com.mentra.asg_client.io.bluetooth.interfaces.IBluetoothManager;
 import com.mentra.asg_client.io.bluetooth.interfaces.BluetoothStateListener;
+import com.mentra.asg_client.receiver.IntentResponseBroadcaster;
+
+import org.json.JSONObject;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -76,6 +79,37 @@ protected void notifyDataReceived(byte[] data) {
         }
     }
 
+    /**
+     * Template method: broadcasts JSON responses to registered intent listeners,
+     * then delegates to the subclass-specific send implementation.
+     */
+    @Override
+    public final boolean sendData(byte[] data) {
+        if (data == null || data.length == 0) {
+            return false;
+        }
+
+        // Try to broadcast JSON responses to intent listeners
+        try {
+            String str = new String(data, "UTF-8");
+            if (str.startsWith("{")) {
+                JSONObject json = new JSONObject(str);
+                IntentResponseBroadcaster.getInstance().broadcastResponse(context, json);
+            }
+        } catch (Exception e) {
+            // Not valid JSON — skip broadcast, still send over BLE
+        }
+
+        return sendDataInternal(data);
+    }
+
+    /**
+     * Subclass-specific send implementation.
+     * @param data The data to send
+     * @return true if the data was sent successfully
+     */
+    protected abstract boolean sendDataInternal(byte[] data);
+
     @Override
     public boolean isConnected() {
         return isConnected;

asg_client/app/src/main/java/com/mentra/asg_client/io/bluetooth/managers/K900BluetoothManager.java

@@ -129,7 +129,7 @@ public K900BluetoothManager(Context context) {
     }
 
     @Override
-    public boolean sendData(byte[] data) {
+    protected boolean sendDataInternal(byte[] data) {
         Log.d(TAG, "📡 =========================================");
         Log.d(TAG, "📡 K900 BLUETOOTH SEND DATA");
         Log.d(TAG, "📡 =========================================");