Merge origin/main into devin/1764839595-ws-refactoring

Resolve conflicts caused by crates/ws -> crates/ws-client rename:
- crates/ws-client/src/client.rs: keep config exports and SendTask implementation
- crates/owhisper-client/src/live.rs: merge SendTask return with audio transformation
- crates/ws-client/tests/client_tests.rs: update imports and from_audio calls

Co-Authored-By: yujonglee <yujonglee.dev@gmail.com>

Author: devin-ai-integration[bot]

.cursor/cli.json

@@ -1,10 +1,6 @@
 {
   "permissions": {
-    "allow": [
-      "Shell(git)"
-    ],
-    "deny": [
-      "Shell(git commit)"
-    ]
+    "allow": ["Shell(git)"],
+    "deny": ["Shell(git commit)"]
   }
 }

.cursor/commands/add-plugin.md

@@ -8,4 +8,4 @@ npx @tauri-apps/cli plugin new NAME \
 - `plugins/analytics` is well maintained plugin, so follow its style & convention. This including removing `rollup.config.js` & `README.md`, and updating `tsconfig.json` & `package.json`.
 - If not specified, keep the single `ping` fn in `ext.rs`, and also in `commands.rs`.
 - After all code written, binding should be generated. `pnpm -F @hypr/plugin-<NAME> codegen`.
-- `Cargo.toml`, `apps/desktop/src-tauri/Cargo.toml`, `apps/desktop/package.json`, and `apps/desktop/src-tauri/capabilities/default.json` should be updated as final step.
+- `Cargo.toml`, `apps/desktop/src-tauri/Cargo.toml`, `apps/desktop/package.json`, and `apps/desktop/src-tauri/capabilities/default.json` should be updated as final step. Run `pnpm i` after updating `apps/desktop/package.json`.

.cursor/commands/manage-cli.md

@@ -1,4 +1,5 @@
 Based on `plugins/cli`, you might need to update:
+
 - `apps/web/content/docs/cli.mdx`
 - `apps/desktop/src-tauri/tauri.conf.json`
 

.drizzle/store.json

@@ -19,4 +19,4 @@
       }
     ]
   ]
-}
+}

.github/actions/argmax_sdk_setup/action.yaml

@@ -1,21 +1,13 @@
-# https://docs.argmaxinc.com/guides/upgrading-to-pro-sdk
+# https://app.argmaxinc.com/docs/guides/upgrading-to-pro-sdk
 # Sets up Argmax Pro SDK registry access for Swift Package Manager
 
 name: "Setup Argmax SDK"
 description: "Configure Swift Package Manager registry for Argmax Pro SDK access"
-inputs:
-  api-token:
-    description: "Argmax SECRET_API_TOKEN for SDK access"
-    required: true
 runs:
   using: "composite"
   steps:
-    - name: Setup Argmax Registry
-      shell: bash
-      run: |
-        swift package-registry set --global --scope argmaxinc https://api.argmaxinc.com/v1/sdk
+    - shell: bash
+      run: swift package-registry set --global --scope argmaxinc https://api.argmaxinc.com/v1/sdk
 
-    - name: Authenticate with Argmax
-      shell: bash
-      run: |
-        swift package-registry login https://api.argmaxinc.com/v1/sdk/login --token "${{ inputs.api-token }}"
+    - shell: bash
+      run: swift package-registry login https://api.argmaxinc.com/v1/sdk/login --token "$AM_SECRET_TOKEN"

.github/actions/brew_clang/action.yaml

@@ -0,0 +1,11 @@
+runs:
+  using: "composite"
+  steps:
+    - shell: bash
+      run: |
+        brew install llvm
+        LLVM_PREFIX=$(brew --prefix llvm)
+        echo "${LLVM_PREFIX}/bin" >> $GITHUB_PATH
+        echo "CC=${LLVM_PREFIX}/bin/clang" >> $GITHUB_ENV
+        echo "CXX=${LLVM_PREFIX}/bin/clang++" >> $GITHUB_ENV
+        echo "CMAKE_PREFIX_PATH=${LLVM_PREFIX}" >> $GITHUB_ENV

.github/actions/desktop-e2e-linux/action.yml

@@ -8,12 +8,12 @@ inputs:
     description: Rust target triple for the build
     required: false
     default: x86_64-unknown-linux-gnu
-  argos_token:
-    description: Argos CI token for uploading screenshots
-    required: false
 runs:
   using: composite
   steps:
+    - uses: FedericoCarboni/setup-ffmpeg@v3
+      with:
+        ffmpeg-version: release
     - shell: bash
       run: ./scripts/setup-desktop-e2e.sh
     - shell: bash
@@ -32,12 +32,30 @@ runs:
 
         echo "Binary path: ${BINARY_PATH}"
         echo "APP_BINARY_PATH=${BINARY_PATH}" >> $GITHUB_ENV
+
+        # Create logs directory for capturing test output
+        mkdir -p "${{ github.workspace }}/e2e/blackbox/logs"
+        echo "E2E_LOGS_DIR=${{ github.workspace }}/e2e/blackbox/logs" >> $GITHUB_ENV
     - shell: bash
-      run: pnpm -F desktop-e2e test
+      id: e2e-test
+      run: |
+        # Run tests and capture output to log file
+        pnpm -F e2e-blackbox e2e 2>&1 | tee "${{ env.E2E_LOGS_DIR }}/e2e-test-output.log"
+        exit ${PIPESTATUS[0]}
       env:
         APP_BINARY_PATH: ${{ env.APP_BINARY_PATH }}
-    - name: Upload screenshots to Argos
-      if: ${{ inputs.argos_token != '' }}
+      continue-on-error: true
+    - name: Upload E2E logs and videos on failure
+      if: steps.e2e-test.outcome == 'failure'
+      uses: actions/upload-artifact@v4
+      with:
+        name: e2e-blackbox-artifacts
+        path: |
+          ${{ github.workspace }}/e2e/blackbox/logs/
+          ${{ github.workspace }}/e2e/blackbox/videos/
+        retention-days: 7
+        if-no-files-found: ignore
+    - name: Fail if tests failed
+      if: steps.e2e-test.outcome == 'failure'
       shell: bash
-      run: pnpm -F desktop-e2e exec argos upload --token ${{ inputs.argos_token }} --build-name desktop screenshots
-      working-directory: ${{ github.workspace }}/apps/desktop-e2e
+      run: exit 1

.github/actions/devin/action.yaml

@@ -33,15 +33,16 @@ runs:
     - shell: bash
       env:
         VARS_JSON: ${{ inputs.vars }}
+        PROMPT_TEMPLATE: ${{ inputs.prompt }}
       run: |
         pip install -q jinja2
 
         PROMPT=$(python3 -c "
         import json
         import os
         from jinja2 import Template
-        tmpl = Template('''${{ inputs.prompt }}''')
-        vars = json.loads(os.environ['VARS_JSON'])
+        tmpl = Template(os.environ['PROMPT_TEMPLATE'])
+        vars = json.loads(os.environ.get('VARS_JSON', '{}'))
         print(tmpl.render(**vars))
         ")
 

.github/actions/graphite_optimizer/action.yaml

@@ -0,0 +1,20 @@
+name: Graphite CI Optimizer
+description: Check if CI should be skipped for stacked PRs
+
+inputs:
+  graphite_token:
+    description: Graphite API token
+    required: true
+
+outputs:
+  skip:
+    description: Whether to skip CI
+    value: ${{ steps.check_skip.outputs.skip }}
+
+runs:
+  using: composite
+  steps:
+    - id: check_skip
+      uses: withgraphite/graphite-ci-action@main
+      with:
+        graphite_token: ${{ inputs.graphite_token }}

.github/actions/infisical_export/action.yaml

@@ -1,6 +1,4 @@
 inputs:
-  token:
-    required: true
   project-id:
     required: true
   folder:
@@ -24,7 +22,7 @@ runs:
       run: |
         SECRETS=$(
           infisical export \
-            --token=${{ inputs.token }} \
+            --token="$INFISICAL_TOKEN" \
             --projectId=${{ inputs.project-id }} \
             --path="${{ inputs.folder }}" \
             --env=${{ inputs.env }} \