Skip to content

Commit 45b50db

Browse files
jerome-benoitjerome-benoit
authored
Merge branch 'dev' into fix-env-caching-12698
2 parents 84b46ff + 2115df5 commit 45b50db

176 files changed

Lines changed: 2928 additions & 7676 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/VOUCHED.td‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ rekram1-node
3232
-ricardo-m-l
3333
-robinmordasiewicz
3434
rubdos
35+
-saisharan0103 spamming ai prs
3536
shantur
3637
simonklee
3738
-spider-yamet clawdbot/llm psychosis, spam pinging the team

‎.github/workflows/deploy.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,9 @@ jobs:
3636
PLANETSCALE_SERVICE_TOKEN_NAME: ${{ secrets.PLANETSCALE_SERVICE_TOKEN_NAME }}
3737
PLANETSCALE_SERVICE_TOKEN: ${{ secrets.PLANETSCALE_SERVICE_TOKEN }}
3838
STRIPE_SECRET_KEY: ${{ github.ref_name == 'production' && secrets.STRIPE_SECRET_KEY_PROD || secrets.STRIPE_SECRET_KEY_DEV }}
39+
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
40+
SENTRY_ORG: ${{ vars.SENTRY_ORG }}
41+
SENTRY_PROJECT: ${{ vars.WEB_SENTRY_PROJECT }}
42+
SENTRY_RELEASE: web@${{ github.sha }}
43+
VITE_SENTRY_DSN: ${{ vars.WEB_SENTRY_DSN }}
44+
VITE_SENTRY_RELEASE: web@${{ github.sha }}

‎.github/workflows/publish.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,13 @@ jobs:
494494
working-directory: packages/desktop-electron
495495
env:
496496
OPENCODE_CHANNEL: ${{ (github.ref_name == 'beta' && 'beta') || 'prod' }}
497+
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
498+
SENTRY_ORG: ${{ vars.SENTRY_ORG }}
499+
SENTRY_PROJECT: ${{ vars.WEB_SENTRY_PROJECT }}
500+
SENTRY_RELEASE: desktop@${{ needs.version.outputs.version }}
501+
VITE_SENTRY_DSN: ${{ vars.WEB_SENTRY_DSN }}
502+
VITE_SENTRY_ENVIRONMENT: ${{ (github.ref_name == 'beta' && 'beta') || 'production' }}
503+
VITE_SENTRY_RELEASE: desktop@${{ needs.version.outputs.version }}
497504

498505
- name: Package and publish
499506
if: needs.version.outputs.release

‎bun.lock‎

Lines changed: 121 additions & 28 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-cBfg4pJ4mjsfS4MFFASBaZZykArgIoeo/3woOcSGy1U=",
4-
"aarch64-linux": "sha256-Q6cqUwfqbscdrPW0uHcfshhQINjJi0HiyURMSdOOCf4=",
5-
"aarch64-darwin": "sha256-1AtfsD1D9YxWSEsecPJF9XsvsxsWTtVtkP5l6UW43og=",
6-
"x86_64-darwin": "sha256-YS5/8YTf9LymAUbjXVrGDfxtKVJrpZbPnnCtsGHSHoU="
3+
"x86_64-linux": "sha256-OtyfKTBEHsJpjzAjN9vCR0PzGzdK6CDHdyU7eZ6Gl1s=",
4+
"aarch64-linux": "sha256-3eHJs3S/+uDUPAouWPsdBOlEvAOhOYx5bJzahL0tAJk=",
5+
"aarch64-darwin": "sha256-rFXzrkhPVb3yM20J8R8m7GqroNNk1vAEz+o/Ks+iAI4=",
6+
"x86_64-darwin": "sha256-lb1IGgbpxg723Qxj2WVPkxKUUmyOIsFOAhA5LoZ8GwY="
77
}
88
}

‎package.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@
7777
"@solidjs/meta": "0.29.4",
7878
"@solidjs/router": "0.15.4",
7979
"@solidjs/start": "https://pkg.pr.new/@solidjs/start@dfb2020",
80+
"@sentry/solid": "10.36.0",
81+
"@sentry/vite-plugin": "4.6.0",
8082
"solid-js": "1.9.10",
8183
"vite-plugin-solid": "2.11.10",
8284
"@lydell/node-pty": "1.2.0-beta.10"

‎packages/app/package.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opencode-ai/app",
3-
"version": "1.14.30",
3+
"version": "1.14.31",
44
"description": "",
55
"type": "module",
66
"exports": {
@@ -27,6 +27,7 @@
2727
"devDependencies": {
2828
"@happy-dom/global-registrator": "20.0.11",
2929
"@playwright/test": "catalog:",
30+
"@sentry/vite-plugin": "catalog:",
3031
"@tailwindcss/vite": "catalog:",
3132
"@tsconfig/bun": "1.0.9",
3233
"@types/bun": "catalog:",
@@ -40,6 +41,7 @@
4041
},
4142
"dependencies": {
4243
"@kobalte/core": "catalog:",
44+
"@sentry/solid": "catalog:",
4345
"@opencode-ai/sdk": "workspace:*",
4446
"@opencode-ai/ui": "workspace:*",
4547
"@opencode-ai/core": "workspace:*",

‎packages/app/src/app.tsx‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import "@/index.css"
2+
import * as Sentry from "@sentry/solid"
23
import { I18nProvider } from "@opencode-ai/ui/context"
34
import { DialogProvider } from "@opencode-ai/ui/context/dialog"
45
import { FileComponentProvider } from "@opencode-ai/ui/context/file"
@@ -148,12 +149,19 @@ export function AppBaseProviders(props: ParentProps<{ locale?: Locale }>) {
148149
>
149150
<LanguageProvider locale={props.locale}>
150151
<UiI18nBridge>
151-
<ErrorBoundary fallback={(error) => <ErrorPage error={error} />}>
152-
<DialogProvider>
153-
<MarkedProvider>
154-
<FileComponentProvider component={File}>{props.children}</FileComponentProvider>
155-
</MarkedProvider>
156-
</DialogProvider>
152+
<ErrorBoundary
153+
fallback={(error) => {
154+
Sentry.captureException(error)
155+
return <ErrorPage error={error} />
156+
}}
157+
>
158+
<QueryProvider>
159+
<DialogProvider>
160+
<MarkedProvider>
161+
<FileComponentProvider component={File}>{props.children}</FileComponentProvider>
162+
</MarkedProvider>
163+
</DialogProvider>
164+
</QueryProvider>
157165
</ErrorBoundary>
158166
</UiI18nBridge>
159167
</LanguageProvider>

‎packages/app/src/components/settings-general.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,7 @@ export const SettingsGeneral: Component = () => {
329329
label={(o) => o.label}
330330
onSelect={(option) => {
331331
if (!option) return
332+
if (option.value === currentShell()) return
332333
globalSync.updateConfig({ shell: option.value })
333334
}}
334335
variant="secondary"

‎packages/app/src/context/global-sync.tsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,9 @@ function createGlobalSync() {
204204
},
205205
translate: language.t,
206206
getSdk: sdkFor,
207+
global: {
208+
provider: globalStore.provider,
209+
},
207210
})
208211

209212
async function loadSessions(directory: string) {

0 commit comments

Comments
 (0)