resolve merge conflicts

.github/workflows/beta.yml

@@ -0,0 +1,34 @@
+name: beta
+
+on:
+  push:
+    branches: [dev]
+  pull_request:
+    types: [opened, synchronize, labeled, unlabeled]
+
+jobs:
+  sync:
+    if: |
+      github.event_name == 'push' || 
+      (github.event_name == 'pull_request' && 
+       contains(github.event.pull_request.labels.*.name, 'contributor'))
+    runs-on: blacksmith-4vcpu-ubuntu-2404
+    permissions:
+      contents: write
+      pull-requests: read
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Bun
+        uses: ./.github/actions/setup-bun
+
+      - name: Configure Git
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+      - name: Sync beta branch
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: bun script/beta.ts

.github/workflows/daily-issues-recap.yml

@@ -1,4 +1,4 @@
-name: Daily Issues Recap
+name: daily-issues-recap
 
 on:
   schedule:

.github/workflows/daily-pr-recap.yml

@@ -1,4 +1,4 @@
-name: Daily PR Recap
+name: daily-pr-recap
 
 on:
   schedule:

.github/workflows/docs-update.yml

@@ -1,4 +1,4 @@
-name: Docs Update
+name: docs-update
 
 on:
   schedule:

.github/workflows/duplicate-issues.yml

@@ -1,4 +1,4 @@
-name: Duplicate Issue Detection
+name: duplicate-issues
 
 on:
   issues:

.github/workflows/generate.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - dev
+  pull_request:
   workflow_dispatch:
 
 jobs:

.github/workflows/nix-desktop.yml.disabled

@@ -1,4 +1,4 @@
-name: nix desktop
+name: nix-desktop
 
 on:
   push:
@@ -21,7 +21,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-desktop:
+  nix-desktop:
     strategy:
       fail-fast: false
       matrix:

.github/workflows/nix-hashes.yml

@@ -1,4 +1,4 @@
-name: Update Nix Hashes
+name: nix-hashes
 
 permissions:
   contents: write
@@ -11,17 +11,17 @@ on:
       - "package.json"
       - "packages/*/package.json"
       - "flake.lock"
-      - ".github/workflows/update-nix-hashes.yml"
+      - ".github/workflows/nix-hashes.yml"
   pull_request:
     paths:
       - "bun.lock"
       - "package.json"
       - "packages/*/package.json"
       - "flake.lock"
-      - ".github/workflows/update-nix-hashes.yml"
+      - ".github/workflows/nix-hashes.yml"
 
 jobs:
-  update-node-modules-hashes:
+  nix-hashes:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository
     runs-on: depot-ubuntu-24.04-4
     env:

.github/workflows/notify-discord.yml

@@ -1,4 +1,4 @@
-name: discord
+name: notify-discord
 
 on:
   release:

.github/workflows/pr-management.yml

@@ -1,4 +1,4 @@
-name: Duplicate PR Check
+name: pr-management
 
 on:
   pull_request_target:
@@ -67,3 +67,26 @@ jobs:
           gh pr comment "$PR_NUMBER" --body "_The following comment was made by an LLM, it may be inaccurate:_
 
           $COMMENT"
+
+  add-contributor-label:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+      issues: write
+    steps:
+      - name: Add Contributor Label
+        uses: actions/github-script@v8
+        with:
+          script: |
+            const isPR = !!context.payload.pull_request;
+            const issueNumber = isPR ? context.payload.pull_request.number : context.payload.issue.number;
+            const authorAssociation = isPR ? context.payload.pull_request.author_association : context.payload.issue.author_association;
+
+            if (authorAssociation === 'CONTRIBUTOR') {
+              await github.rest.issues.addLabels({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: issueNumber,
+                labels: ['contributor']
+              });
+            }

.github/workflows/pr-standards.yml

@@ -1,4 +1,4 @@
-name: PR Standards
+name: pr-standards
 
 on:
   pull_request_target:

.github/workflows/review.yml

@@ -1,4 +1,4 @@
-name: Guidelines Check
+name: review
 
 on:
   issue_comment:

.github/workflows/stale-issues.yml

@@ -1,4 +1,4 @@
-name: "Auto-close stale issues"
+name: stale-issues
 
 on:
   schedule:

.github/workflows/test.yml

@@ -1,9 +1,6 @@
 name: test
 
 on:
-  push:
-    branches:
-      - dev
   pull_request:
   workflow_dispatch:
 jobs:
@@ -20,7 +17,6 @@ jobs:
             command: |
               git config --global user.email "bot@opencode.ai"
               git config --global user.name "opencode"
-              bun turbo typecheck
               bun turbo test
           - name: windows
             host: depot-windows-2025-4

.github/workflows/triage.yml

@@ -1,4 +1,4 @@
-name: Issue Triage
+name: triage
 
 on:
   issues: