Skip to content

Commit e041605

Browse files
authored
Merge branch 'dev' into brendan/lazy-init-plugins
2 parents f280e7e + a38d53f commit e041605

129 files changed

Lines changed: 14990 additions & 650 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.

bun.lock

Lines changed: 34 additions & 30 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-i9TxYwWkJAR+kW6pbvhgQbRW9UYPtdrPQAGic4zPoa4=",
4-
"aarch64-linux": "sha256-RYc/OYlETXUwkWBRDas+/P4cBW6zde4FqxxnMARu5vs=",
5-
"aarch64-darwin": "sha256-jIhUOIRIQEa2WT62TVIedmRIhl/edhK8sbiAFvU3yCM=",
6-
"x86_64-darwin": "sha256-xLGzaX7OofFlZzVgpORJR5QXD2u+54hp+t3cCfUtO84="
3+
"x86_64-linux": "sha256-DOGOZdPdkcuyDhVAyWHGsL4rrV28S+YFZj/VORuoQ8Q=",
4+
"aarch64-linux": "sha256-WRnAaEoKvgFFZ+UkbYtD9gBw0HtV1jdUqv7yUE2uTAQ=",
5+
"aarch64-darwin": "sha256-LxIj/dsL88M99T3WLaD9FL6Qdu2TV+kr1RMZaZ3i4WM=",
6+
"x86_64-darwin": "sha256-PgIvplw6yz9KN5nBWox3BXZIXDbkJ3ZuDPKKSVF82MU="
77
}
88
}

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@
127127
"@types/node": "catalog:"
128128
},
129129
"patchedDependencies": {
130+
"@npmcli/agent@4.0.0": "patches/@npmcli%2Fagent@4.0.0.patch",
130131
"@standard-community/standard-openapi@0.2.9": "patches/@standard-community%2Fstandard-openapi@0.2.9.patch",
131132
"solid-js@1.9.10": "patches/solid-js@1.9.10.patch"
132133
}

packages/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/app",
3-
"version": "1.14.18",
3+
"version": "1.14.19",
44
"description": "",
55
"type": "module",
66
"exports": {

packages/app/src/app.tsx

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -141,13 +141,11 @@ export function AppBaseProviders(props: ParentProps<{ locale?: Locale }>) {
141141
<LanguageProvider locale={props.locale}>
142142
<UiI18nBridge>
143143
<ErrorBoundary fallback={(error) => <ErrorPage error={error} />}>
144-
<QueryProvider>
145-
<DialogProvider>
146-
<MarkedProvider>
147-
<FileComponentProvider component={File}>{props.children}</FileComponentProvider>
148-
</MarkedProvider>
149-
</DialogProvider>
150-
</QueryProvider>
144+
<DialogProvider>
145+
<MarkedProvider>
146+
<FileComponentProvider component={File}>{props.children}</FileComponentProvider>
147+
</MarkedProvider>
148+
</DialogProvider>
151149
</ErrorBoundary>
152150
</UiI18nBridge>
153151
</LanguageProvider>
@@ -293,20 +291,22 @@ export function AppInterface(props: {
293291
>
294292
<ConnectionGate disableHealthCheck={props.disableHealthCheck}>
295293
<ServerKey>
296-
<GlobalSDKProvider>
297-
<GlobalSyncProvider>
298-
<Dynamic
299-
component={props.router ?? Router}
300-
root={(routerProps) => <RouterRoot appChildren={props.children}>{routerProps.children}</RouterRoot>}
301-
>
302-
<Route path="/" component={HomeRoute} />
303-
<Route path="/:dir" component={DirectoryLayout}>
304-
<Route path="/" component={SessionIndexRoute} />
305-
<Route path="/session/:id?" component={SessionRoute} />
306-
</Route>
307-
</Dynamic>
308-
</GlobalSyncProvider>
309-
</GlobalSDKProvider>
294+
<QueryProvider>
295+
<GlobalSDKProvider>
296+
<GlobalSyncProvider>
297+
<Dynamic
298+
component={props.router ?? Router}
299+
root={(routerProps) => <RouterRoot appChildren={props.children}>{routerProps.children}</RouterRoot>}
300+
>
301+
<Route path="/" component={HomeRoute} />
302+
<Route path="/:dir" component={DirectoryLayout}>
303+
<Route path="/" component={SessionIndexRoute} />
304+
<Route path="/session/:id?" component={SessionRoute} />
305+
</Route>
306+
</Dynamic>
307+
</GlobalSyncProvider>
308+
</GlobalSDKProvider>
309+
</QueryProvider>
310310
</ServerKey>
311311
</ConnectionGate>
312312
</ServerProvider>

0 commit comments

Comments
 (0)