Skip to content

Commit 7903dfa

Browse files
committed
Merge remote-tracking branch 'upstream/dev' into fix/binary-files-clean
2 parents b2b4bdf + f834915 commit 7903dfa

178 files changed

Lines changed: 18012 additions & 8722 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/actions/setup-git-committer/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ runs:
2323
with:
2424
app-id: ${{ inputs.opencode-app-id }}
2525
private-key: ${{ inputs.opencode-app-secret }}
26+
owner: ${{ github.repository_owner }}
2627

2728
- name: Configure git user
2829
run: |

.github/pull_request_template.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
### What does this PR do?
22

3+
Please provide a description of the issue (if there is one), the changes you made to fix it, and why they work. It is expected that you understand why your changes work and if you do not understand why at least say as much so a maintainer knows how much to value the pr.
4+
5+
**If you paste a large clearly AI generated description here your PR may be IGNORED or CLOSED!**
6+
37
### How did you verify your code works?

.github/workflows/beta.yml

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,32 @@
11
name: beta
22

33
on:
4-
push:
5-
branches: [dev]
6-
pull_request:
7-
types: [opened, synchronize, labeled, unlabeled]
4+
workflow_dispatch:
5+
schedule:
6+
- cron: "0 * * * *"
87

98
jobs:
109
sync:
11-
if: |
12-
github.event_name == 'push' ||
13-
(github.event_name == 'pull_request' &&
14-
contains(github.event.pull_request.labels.*.name, 'contributor'))
1510
runs-on: blacksmith-4vcpu-ubuntu-2404
1611
permissions:
1712
contents: write
18-
pull-requests: write
1913
steps:
2014
- name: Checkout repository
2115
uses: actions/checkout@v4
16+
with:
17+
fetch-depth: 0
2218

2319
- name: Setup Bun
2420
uses: ./.github/actions/setup-bun
2521

26-
- name: Configure Git
27-
run: |
28-
git config user.name "github-actions[bot]"
29-
git config user.email "github-actions[bot]@users.noreply.github.com"
22+
- name: Setup Git Committer
23+
id: setup-git-committer
24+
uses: ./.github/actions/setup-git-committer
25+
with:
26+
opencode-app-id: ${{ vars.OPENCODE_APP_ID }}
27+
opencode-app-secret: ${{ secrets.OPENCODE_APP_SECRET }}
3028

3129
- name: Sync beta branch
3230
env:
33-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
31+
GH_TOKEN: ${{ steps.setup-git-committer.outputs.token }}
3432
run: bun script/beta.ts

.github/workflows/generate.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ on:
44
push:
55
branches:
66
- dev
7-
pull_request:
8-
workflow_dispatch:
97

108
jobs:
119
generate:

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
target: x86_64-pc-windows-msvc
104104
- host: blacksmith-4vcpu-ubuntu-2404
105105
target: x86_64-unknown-linux-gnu
106-
- host: blacksmith-4vcpu-ubuntu-2404-arm
106+
- host: blacksmith-8vcpu-ubuntu-2404-arm
107107
target: aarch64-unknown-linux-gnu
108108
runs-on: ${{ matrix.settings.host }}
109109
steps:

.github/workflows/test.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
name: test
22

33
on:
4+
push:
5+
branches:
6+
- dev
47
pull_request:
58
workflow_dispatch:
69
jobs:

bun.lock

Lines changed: 49 additions & 47 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

infra/console.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ const ZEN_MODELS = [
133133
new sst.Secret("ZEN_MODELS6"),
134134
new sst.Secret("ZEN_MODELS7"),
135135
new sst.Secret("ZEN_MODELS8"),
136+
new sst.Secret("ZEN_MODELS9"),
137+
new sst.Secret("ZEN_MODELS10"),
136138
]
137139
const STRIPE_SECRET_KEY = new sst.Secret("STRIPE_SECRET_KEY")
138140
const STRIPE_PUBLISHABLE_KEY = new sst.Secret("STRIPE_PUBLISHABLE_KEY")

nix/hashes.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"nodeModules": {
3-
"x86_64-linux": "sha256-gUWzUsk81miIrjg0fZQmsIQG4pZYmEHgzN6BaXI+lfc=",
4-
"aarch64-linux": "sha256-gwEG75ha/ojTO2iAObTmLTtEkXIXJ7BThzfI5CqlJh8=",
5-
"aarch64-darwin": "sha256-20RGG2GkUItCzD67gDdoSLfexttM8abS//FKO9bfjoM=",
6-
"x86_64-darwin": "sha256-i2VawFuR1UbjPVYoybU6aJDJfFo0tcvtl1aM31Y2mTQ="
3+
"x86_64-linux": "sha256-3wRTDLo5FZoUc2Bwm1aAJZ4dNsekX8XoY6TwTmohgYo=",
4+
"aarch64-linux": "sha256-CKiuc6c52UV9cLEtccYEYS4QN0jYzNJv1fHSayqbHKo=",
5+
"aarch64-darwin": "sha256-pWfXomWTDvG8WpWmUCwNXdbSHw6hPlqoT0Q/XuNceMc=",
6+
"x86_64-darwin": "sha256-Dmg4+cUq2r6vZB2ta9tLpNAWqcl11ZCu4ZpieegRFrY="
77
}
88
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"@tailwindcss/vite": "4.1.11",
3939
"diff": "8.0.2",
4040
"dompurify": "3.3.1",
41-
"ai": "5.0.119",
41+
"ai": "5.0.124",
4242
"hono": "4.10.7",
4343
"hono-openapi": "1.1.2",
4444
"fuzzysort": "3.1.0",

0 commit comments

Comments
 (0)