Skip to content

Commit 610dc2c

Browse files
Merge remote-tracking branch 'upstream/production' into production
2 parents 4fff254 + 82b6650 commit 610dc2c

70 files changed

Lines changed: 4552 additions & 549 deletions

Some content is hidden

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

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ Caveats:
157157
- If `spawn` does not work for you, you can debug the server separately:
158158
- Debug server: `bun run --inspect=ws://localhost:6499/ --cwd packages/opencode ./src/index.ts serve --port 4096`,
159159
then attach TUI with `opencode attach http://localhost:4096`
160-
- Debug TUI: `bun run --inspect=ws://localhost:6499/ --cwd packages/opencode --conditions=browser ./src/index.ts`
160+
- Debug TUI: `bun run --inspect=ws://localhost:6499/ --cwd packages/opencode ./src/index.ts`
161161

162162
Other tips and tricks:
163163

bun.lock

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

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-Sz806ltZYh+09hLqdqZAxSUlhJMk8bg50oHHoykNa/Y=",
4-
"aarch64-linux": "sha256-dDSLsgah0NKAJLVczh25KOzLl10xhhSbO7WKac1qbJI=",
5-
"aarch64-darwin": "sha256-xZZ5d4i4Ek+X7kvyGN96gbRwXK45j3bsWhPW1kILawI=",
6-
"x86_64-darwin": "sha256-hYTHDIbNF4PZuuSz7z4NZv870FcstVYrMuhGIiFapEY="
3+
"x86_64-linux": "sha256-SVvFPO+KuS67+6XGPhaB3cIuc3XUyM0XVccy5v8afS4=",
4+
"aarch64-linux": "sha256-HJRrSu5u0TEg214d2RAbM1C+nmrxvIR/d7JlSBOGb9I=",
5+
"aarch64-darwin": "sha256-ytmHSdC0PVGAJSbpt/+YwL5ySF3w6r/9uZpZACPppkI=",
6+
"x86_64-darwin": "sha256-ma7K4K+xn7Jz3+YPA/n8ly1o308UNoM/DO9Z8yZSAKE="
77
}
88
}

package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"type": "module",
77
"packageManager": "bun@1.3.14",
88
"scripts": {
9-
"dev": "bun run --cwd packages/opencode --conditions=browser src/index.ts",
9+
"dev": "bun run --cwd packages/opencode src/index.ts",
1010
"dev:desktop": "bun --cwd packages/desktop dev",
1111
"dev:web": "bun --cwd packages/app dev",
1212
"dev:console": "ulimit -n 10240 2>/dev/null; bun run --cwd packages/console/app dev",
@@ -137,6 +137,7 @@
137137
"electron"
138138
],
139139
"overrides": {
140+
"@ai-sdk/anthropic": "3.0.111",
140141
"@opentui/core": "catalog:",
141142
"@opentui/keymap": "catalog:",
142143
"@opentui/solid": "catalog:",
@@ -145,7 +146,6 @@
145146
},
146147
"patchedDependencies": {
147148
"@dnd-kit/dom@0.5.0": "patches/@dnd-kit%2Fdom@0.5.0.patch",
148-
"@ff-labs/fff-bun@0.9.3": "patches/@ff-labs%2Ffff-bun@0.9.3.patch",
149149
"@npmcli/agent@4.0.2": "patches/@npmcli%2Fagent@4.0.2.patch",
150150
"@silvia-odwyer/photon-node@0.3.4": "patches/@silvia-odwyer%2Fphoton-node@0.3.4.patch",
151151
"@standard-community/standard-openapi@0.2.9": "patches/@standard-community%2Fstandard-openapi@0.2.9.patch",
@@ -160,6 +160,8 @@
160160
"effect@4.0.0-beta.83": "patches/effect@4.0.0-beta.83.patch",
161161
"@tanstack/virtual-core@3.17.3": "patches/@tanstack%2Fvirtual-core@3.17.3.patch",
162162
"@ai-sdk/openai-compatible@2.0.41": "patches/@ai-sdk%2Fopenai-compatible@2.0.41.patch",
163-
"@ai-sdk/groq@3.0.31": "patches/@ai-sdk%2Fgroq@3.0.31.patch"
163+
"@ai-sdk/groq@3.0.31": "patches/@ai-sdk%2Fgroq@3.0.31.patch",
164+
"@ai-sdk/anthropic@3.0.111": "patches/@ai-sdk%2Fanthropic@3.0.111.patch",
165+
"@ai-sdk/amazon-bedrock@4.0.166": "patches/@ai-sdk%2Famazon-bedrock@4.0.166.patch"
164166
}
165167
}

packages/app/AGENTS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
- `opencode dev web` proxies `https://app.opencode.ai`, so local UI/CSS changes will not show there.
1313
- For local UI changes, run the backend and app dev servers separately.
14-
- Backend (from `packages/opencode`): `bun run --conditions=browser ./src/index.ts serve --port 4096`
14+
- Backend (from `packages/opencode`): `bun run ./src/index.ts serve --port 4096`
1515
- App (from `packages/app`): `bun dev -- --port 4444`
1616
- Open `http://localhost:4444` to verify UI changes (it targets the backend at `http://localhost:4096`).
1717

packages/app/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opencode-ai/app",
3-
"version": "1.18.25",
3+
"version": "1.18.26",
44
"description": "",
55
"type": "module",
66
"exports": {
@@ -32,7 +32,7 @@
3232
},
3333
"license": "MIT",
3434
"devDependencies": {
35-
"@happy-dom/global-registrator": "20.0.11",
35+
"@happy-dom/global-registrator": "20.12.0",
3636
"@playwright/test": "catalog:",
3737
"@sentry/vite-plugin": "catalog:",
3838
"@tailwindcss/vite": "catalog:",

packages/cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://json.schemastore.org/package.json",
33
"name": "@opencode-ai/cli",
4-
"version": "1.18.25",
4+
"version": "1.18.26",
55
"type": "module",
66
"license": "MIT",
77
"bin": {

packages/codemode/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://json.schemastore.org/package.json",
33
"name": "@opencode-ai/codemode",
4-
"version": "1.18.25",
4+
"version": "1.18.26",
55
"description": "Effect-native confined code execution over schema-described tools",
66
"private": true,
77
"type": "module",

packages/console/app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opencode-ai/console-app",
3-
"version": "1.18.25",
3+
"version": "1.18.26",
44
"type": "module",
55
"license": "MIT",
66
"scripts": {
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ALTER TABLE `workspace` ADD `migrated_at` timestamp(3);

0 commit comments

Comments
 (0)