Skip to content

Commit 50ae844

Browse files
authored
Merge branch 'dev' into feat/parentAgent-hook-input
2 parents ac8d7f0 + 52877d8 commit 50ae844

File tree

515 files changed

+20080
-9443
lines changed

Some content is hidden

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

515 files changed

+20080
-9443
lines changed

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

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@ description: "Setup Bun with caching and install dependencies"
33
runs:
44
using: "composite"
55
steps:
6-
- name: Cache Bun dependencies
7-
uses: actions/cache@v4
8-
with:
9-
path: ~/.bun/install/cache
10-
key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lockb') }}
11-
restore-keys: |
12-
${{ runner.os }}-bun-
13-
146
- name: Get baseline download URL
157
id: bun-url
168
shell: bash
@@ -31,6 +23,19 @@ runs:
3123
bun-version-file: ${{ !steps.bun-url.outputs.url && 'package.json' || '' }}
3224
bun-download-url: ${{ steps.bun-url.outputs.url }}
3325

26+
- name: Get cache directory
27+
id: cache
28+
shell: bash
29+
run: echo "dir=$(bun pm cache)" >> "$GITHUB_OUTPUT"
30+
31+
- name: Cache Bun dependencies
32+
uses: actions/cache@v4
33+
with:
34+
path: ${{ steps.cache.outputs.dir }}
35+
key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lock') }}
36+
restore-keys: |
37+
${{ runner.os }}-bun-
38+
3439
- name: Install setuptools for distutils compatibility
3540
run: python3 -m pip install setuptools || pip install setuptools || true
3641
shell: bash

.github/workflows/publish.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,9 @@ jobs:
115115
target: x86_64-apple-darwin
116116
- host: macos-latest
117117
target: aarch64-apple-darwin
118+
# github-hosted: blacksmith lacks ARM64 MSVC cross-compilation toolchain
119+
- host: windows-2025
120+
target: aarch64-pc-windows-msvc
118121
- host: blacksmith-4vcpu-windows-2025
119122
target: x86_64-pc-windows-msvc
120123
- host: blacksmith-4vcpu-ubuntu-2404
@@ -149,6 +152,10 @@ jobs:
149152
150153
- uses: ./.github/actions/setup-bun
151154

155+
- uses: actions/setup-node@v4
156+
with:
157+
node-version: "24"
158+
152159
- name: Cache apt packages
153160
if: contains(matrix.settings.host, 'ubuntu')
154161
uses: actions/cache@v4
@@ -254,6 +261,10 @@ jobs:
254261
- host: macos-latest
255262
target: aarch64-apple-darwin
256263
platform_flag: --mac --arm64
264+
# github-hosted: blacksmith lacks ARM64 MSVC cross-compilation toolchain
265+
- host: "windows-2025"
266+
target: aarch64-pc-windows-msvc
267+
platform_flag: --win --arm64
257268
- host: "blacksmith-4vcpu-windows-2025"
258269
target: x86_64-pc-windows-msvc
259270
platform_flag: --win

.github/workflows/test.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ on:
88
workflow_dispatch:
99

1010
concurrency:
11-
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
11+
# Keep every run on dev so cancelled checks do not pollute the default branch
12+
# commit history. PRs and other branches still share a group and cancel stale runs.
13+
group: ${{ case(github.ref == 'refs/heads/dev', format('{0}-{1}', github.workflow, github.run_id), format('{0}-{1}', github.workflow, github.event.pull_request.number || github.ref)) }}
1214
cancel-in-progress: true
1315

1416
permissions:

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ts-dist
1717
/result
1818
refs
1919
Session.vim
20-
opencode.json
20+
/opencode.json
2121
a.out
2222
target
2323
.scripts

README.zh.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,4 +137,4 @@ OpenCode 内置两种 Agent,可用 `Tab` 键快速切换:
137137

138138
---
139139

140-
**加入我们的社区** [Discord](https://discord.gg/opencode) | [X.com](https://x.com/opencode)
140+
**加入我们的社区** [飞书](https://applink.feishu.cn/client/chat/chatter/add_by_link?link_token=de8k6664-1b5e-43f2-8efd-21d6772647b5&qr_code=true) | [X.com](https://x.com/opencode)

README.zht.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,4 +137,4 @@ OpenCode 內建了兩種 Agent,您可以使用 `Tab` 鍵快速切換。
137137

138138
---
139139

140-
**加入我們的社群** [Discord](https://discord.gg/opencode) | [X.com](https://x.com/opencode)
140+
**加入我們的社群** [飞书](https://applink.feishu.cn/client/chat/chatter/add_by_link?link_token=de8k6664-1b5e-43f2-8efd-21d6772647b5&qr_code=true) | [X.com](https://x.com/opencode)

bun.lock

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

infra/console.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,12 @@ export const stripeWebhook = new stripe.WebhookEndpoint("StripeWebhookEndpoint",
103103
const zenLiteProduct = new stripe.Product("ZenLite", {
104104
name: "OpenCode Go",
105105
})
106+
const zenLiteCouponFirstMonth50 = new stripe.Coupon("ZenLiteCouponFirstMonth50", {
107+
name: "First month 50% off",
108+
percentOff: 50,
109+
appliesToProducts: [zenLiteProduct.id],
110+
duration: "once",
111+
})
106112
const zenLitePrice = new stripe.Price("ZenLitePrice", {
107113
product: zenLiteProduct.id,
108114
currency: "usd",
@@ -116,6 +122,7 @@ const ZEN_LITE_PRICE = new sst.Linkable("ZEN_LITE_PRICE", {
116122
properties: {
117123
product: zenLiteProduct.id,
118124
price: zenLitePrice.id,
125+
firstMonth50Coupon: zenLiteCouponFirstMonth50.id,
119126
},
120127
})
121128

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-dhL4YeSi4Lm9yDp919Fx7N2hyLUbZQa2qWoCf/50ce8=",
4-
"aarch64-linux": "sha256-//YxCsrvYlxuvd0MtFFO+pLxjmuemyrvGzSIPxzO+rA=",
5-
"aarch64-darwin": "sha256-c65kSWteQNaBcQUsjbXNqT61vt98JPNYo9yMNvUygCw=",
6-
"x86_64-darwin": "sha256-hlTzEFv3nZHwlDXU65LfMC+NaqYjjyZqagdJ366CNxY="
3+
"x86_64-linux": "sha256-WJgo6UclmtQOEubnKMZybdIEhZ1uRTucF61yojjd+l0=",
4+
"aarch64-linux": "sha256-QfZ/g7EZFpe6ndR3dG8WvVfMj5Kyd/R/4kkTJfGJxL4=",
5+
"aarch64-darwin": "sha256-ezr/R70XJr9eN5l3mgb7HzLF6QsofNEKUOtuxbfli80=",
6+
"x86_64-darwin": "sha256-MbsBGS415uEU/n1RQ/5H5pqh+udLY3+oimJ+eS5uJVI="
77
}
88
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"dompurify": "3.3.1",
4444
"drizzle-kit": "1.0.0-beta.16-ea816b6",
4545
"drizzle-orm": "1.0.0-beta.16-ea816b6",
46-
"effect": "4.0.0-beta.29",
46+
"effect": "4.0.0-beta.31",
4747
"ai": "5.0.124",
4848
"hono": "4.10.7",
4949
"hono-openapi": "1.1.2",

0 commit comments

Comments
 (0)