Chore/rebase upstream

.claude/settings.local.json

@@ -0,0 +1,12 @@
+{
+	"permissions": {
+		"allow": [
+			"Bash(pnpm typecheck:*)",
+			"Bash(pnpm lint:*)",
+			"Bash(pnpm build:*)",
+			"Bash(cargo check:*)"
+		],
+		"deny": [],
+		"ask": []
+	}
+}

.config/hakari.toml

@@ -0,0 +1,27 @@
+# This file contains settings for `cargo hakari`.
+# See https://docs.rs/cargo-hakari/latest/cargo_hakari/config for a full list of options.
+
+hakari-package = "workspace-hack"
+
+# Format version for hakari's output. Version 4 requires cargo-hakari 0.9.22 or above.
+dep-format-version = "4"
+
+# Setting workspace.resolver = "2" or higher in the root Cargo.toml is HIGHLY recommended.
+# Hakari works much better with the v2 resolver. (The v2 and v3 resolvers are identical from
+# hakari's perspective, so you're welcome to set either.)
+#
+# For more about the new feature resolver, see:
+# https://blog.rust-lang.org/2021/03/25/Rust-1.51.0.html#cargos-new-feature-resolver
+resolver = "2"
+
+# Add triples corresponding to platforms commonly used by developers here.
+# https://doc.rust-lang.org/rustc/platform-support.html
+platforms = [
+    # "x86_64-unknown-linux-gnu",
+    # "x86_64-apple-darwin",
+    "aarch64-apple-darwin",
+    "x86_64-pc-windows-msvc",
+]
+
+# Write out exact versions rather than a semver range. (Defaults to false.)
+# exact-versions = true

.dockerignore

@@ -1,3 +1,4 @@
-target/
-node_modules/
-crates/
+target
+crates
+**/node_modules
+**/.next

.github/actions/setup-js/action.yml

@@ -12,7 +12,7 @@ runs:
     - name: Setup node
       uses: actions/setup-node@v3
       with:
-        node-version: 20
+        node-version: 24
         cache: pnpm
 
     - name: Install frontend dependencies

.github/actions/setup-rust-cache/action.yml

@@ -0,0 +1,18 @@
+name: Setup Rust Cache
+description: Configures Rust caching
+inputs:
+  target:
+    description: "Toolchain target triple"
+    required: true
+  save-cache:
+    description: "Whether to save the cache"
+    required: false
+    default: "false"
+runs:
+  using: "composite"
+  steps:
+    - name: Cache Rust Dependencies
+      uses: swatinem/rust-cache@v2
+      with:
+        save-if: ${{ inputs.save-cache }}
+        shared-key: ${{ inputs.target }}

.github/workflows/ci.yml

@@ -10,13 +10,17 @@ concurrency:
   group: ${{ github.head_ref || github.ref_name }}
   cancel-in-progress: true
 
+env:
+  BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+
 jobs:
   changes:
     name: Detect Changes
     runs-on: ubuntu-latest
     outputs:
       rust: ${{ steps.filter.outputs.rust }}
       tauri-plugins: ${{ steps.filter.outputs.tauri-plugins }}
+      branch: ${{ steps.branch.outputs.branch }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -26,6 +30,8 @@ jobs:
         id: filter
         with:
           filters: |
+            desktop:
+              - 'apps/desktop/**'
             rust:
               - '.cargo/**'
               - '.github/**'
@@ -37,6 +43,11 @@ jobs:
               - 'Cargo.lock'
               - 'pnpm-lock.yaml'
 
+      - name: Output branch name
+        id: branch
+        run: |
+          echo "branch=${{ env.BRANCH_NAME }}" >> $GITHUB_OUTPUT
+
   typecheck:
     name: Typecheck
     runs-on: ubuntu-latest
@@ -46,6 +57,8 @@ jobs:
 
       - uses: ./.github/actions/setup-js
 
+      - run: pnpm web exec next typegen
+
       - name: Typecheck
         run: pnpm typecheck
 
@@ -74,15 +87,26 @@ jobs:
         uses: actions/checkout@v4
 
       - uses: dtolnay/rust-toolchain@stable
+        with:
+          components: rustfmt
 
       - name: Check formatting
         run: cargo fmt --check
 
   clippy:
     name: Clippy
-    runs-on: macos-latest
     needs: changes
     if: needs.changes.outputs.rust == 'true'
+    strategy:
+      fail-fast: false
+      matrix:
+        settings:
+          - target: aarch64-apple-darwin
+            runner: macos-latest
+          # Windows can't take the disk usage lol
+          # - target: x86_64-pc-windows-msvc
+          #   runner: windows-latest
+    runs-on: ${{ matrix.settings.runner }}
     permissions:
       contents: read
     steps:
@@ -93,11 +117,11 @@ jobs:
         uses: dtolnay/rust-toolchain@stable
         with:
           targets: ${{ matrix.settings.target }}
+          components: clippy
 
-      - name: Rust cache
-        uses: swatinem/rust-cache@v2
+      - uses: ./.github/actions/setup-rust-cache
         with:
-          shared-key: ${{ matrix.settings.target }}
+          target: ${{ matrix.settings.target }}
 
       - name: Create .env file in root
         run: |
@@ -110,8 +134,6 @@ jobs:
           echo 'VITE_POSTHOG_KEY=${{ secrets.NEXT_PUBLIC_POSTHOG_KEY }}' >> .env
           echo 'VITE_POSTHOG_HOST=${{ secrets.NEXT_PUBLIC_POSTHOG_HOST }}' >> .env
           echo 'VITE_SERVER_URL=${{ secrets.NEXT_PUBLIC_WEB_URL }}' >> .env
-          echo "NEXT_PUBLIC_CAP_AWS_REGION=${{ secrets.NEXT_PUBLIC_CAP_AWS_REGION }}" >> .env
-          echo "NEXT_PUBLIC_CAP_AWS_BUCKET=${{ secrets.NEXT_PUBLIC_CAP_AWS_BUCKET }}" >> .env
 
           cat .env >> $GITHUB_ENV
 
@@ -141,6 +163,8 @@ jobs:
 
   build-desktop:
     name: Build Desktop
+    needs: changes
+    if: needs.changes.outputs.desktop == 'true'
     strategy:
       fail-fast: false
       matrix:
@@ -162,10 +186,9 @@ jobs:
         with:
           targets: ${{ matrix.settings.target }}
 
-      - name: Rust cache
-        uses: swatinem/rust-cache@v2
+      - uses: ./.github/actions/setup-rust-cache
         with:
-          shared-key: ${{ matrix.settings.target }}
+          target: ${{ matrix.settings.target }}
 
       - uses: ./.github/actions/setup-js
 
@@ -180,8 +203,6 @@ jobs:
           echo 'VITE_POSTHOG_KEY=${{ secrets.NEXT_PUBLIC_POSTHOG_KEY }}' >> .env
           echo 'VITE_POSTHOG_HOST=${{ secrets.NEXT_PUBLIC_POSTHOG_HOST }}' >> .env
           echo 'VITE_SERVER_URL=${{ secrets.NEXT_PUBLIC_WEB_URL }}' >> .env
-          echo "NEXT_PUBLIC_CAP_AWS_REGION=${{ secrets.NEXT_PUBLIC_CAP_AWS_REGION }}" >> .env
-          echo "NEXT_PUBLIC_CAP_AWS_BUCKET=${{ secrets.NEXT_PUBLIC_CAP_AWS_BUCKET }}" >> .env
 
       - name: Copy .env to apps/desktop
         run: cp .env apps/desktop/.env
@@ -214,3 +235,51 @@ jobs:
       - name: Run verify
         shell: bash
         run: node scripts/check-tauri-plugin-versions.js
+
+  rust-cache:
+    name: Rust cache
+    needs: changes
+    if: needs.changes.outputs.branch == 'main'
+    strategy:
+      fail-fast: false
+      matrix:
+        settings:
+          - target: x86_64-apple-darwin
+            runner: macos-latest
+          - target: aarch64-apple-darwin
+            runner: macos-latest
+          - target: x86_64-pc-windows-msvc
+            runner: windows-latest
+    runs-on: ${{ matrix.settings.runner }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Rust setup
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: ${{ matrix.settings.target }}
+
+      - uses: ./.github/actions/setup-rust-cache
+        with:
+          target: ${{ matrix.settings.target }}
+          save-cache: true
+
+      - name: Setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 24
+
+      - run: node scripts/setup.js
+
+      - name: Build debug
+        run: cargo build --all
+
+      - name: Build release
+        run: cargo check --all --release
+
+      - name: Run Clippy
+        if: ${{ matrix.settings.target == 'aarch64-apple-darwin' || matrix.settings.target == 'x86_64-pc-windows-msvc' }}
+        uses: actions-rs-plus/clippy-check@v2
+        with:
+          args: --workspace --all-features --locked

.github/workflows/docker-build-web.yml

@@ -36,9 +36,6 @@ jobs:
         run: |
           echo "WEB_URL=http://localhost:3000" > .env
           echo "NEXT_PUBLIC_DOCKER_BUILD=true" >> .env
-          echo "NEXT_PUBLIC_CAP_AWS_BUCKET=capso" >> .env
-          echo "NEXT_PUBLIC_CAP_AWS_REGION=us-east-1" >> .env
-          cat .env
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
@@ -47,6 +44,10 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Downcase GITHUB_REPOSITORY_OWNER
+        run: |
+          echo "REPOSITORY_OWNER=${GITHUB_REPOSITORY_OWNER@L}" >>${GITHUB_ENV}
+
       - name: Build and Push Platform Image
         id: build
         uses: docker/build-push-action@v5
@@ -55,7 +56,7 @@ jobs:
           file: apps/web/Dockerfile
           platforms: linux/${{ matrix.platform }}
           push: true
-          outputs: type=image,name=ghcr.io/${{ github.repository_owner }}/cap-web,push-by-digest=true
+          outputs: type=image,name=ghcr.io/${{ env.REPOSITORY_OWNER }}/cap-web,push-by-digest=true
           cache-from: type=gha,scope=buildx-${{ matrix.platform }}
           cache-to: type=gha,mode=max,scope=buildx-${{ matrix.platform }}
 
@@ -99,7 +100,11 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Downcase GITHUB_REPOSITORY_OWNER
+        run: |
+          echo "REPOSITORY_OWNER=${GITHUB_REPOSITORY_OWNER@L}" >>${GITHUB_ENV}
+
       - name: Create Image Manifest
         run: |
-          docker buildx imagetools create -t ghcr.io/${{ github.repository_owner }}/cap-web:${{ inputs.tag || 'latest' }} \
-            $(find /tmp/digests -type f -not -path "*/\.*" -exec basename {} \; | xargs -I {} echo "ghcr.io/${{ github.repository_owner }}/cap-web@sha256:{}")
+          docker buildx imagetools create -t ghcr.io/${{ env.REPOSITORY_OWNER }}/cap-web:${{ inputs.tag || 'latest' }} \
+            $(find /tmp/digests -type f -not -path "*/\.*" -exec basename {} \; | xargs -I {} echo "ghcr.io/${{ env.REPOSITORY_OWNER }}/cap-web@sha256:{}")

.github/workflows/opencode.yml

@@ -0,0 +1,29 @@
+name: opencode
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  opencode:
+    if: |
+      contains(github.event.comment.body, ' /oc') ||
+      startsWith(github.event.comment.body, '/oc') ||
+      contains(github.event.comment.body, ' /opencode') ||
+      startsWith(github.event.comment.body, '/opencode')
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
+      pull-requests: read
+      issues: read
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Run opencode
+        uses: sst/opencode/github@latest
+        env:
+          OPENCODE_API_KEY: ${{ secrets.OPENCODE_API_KEY }}
+        with:
+          model: opencode/claude-sonnet-4-5