Skip to content

Commit ba93bb7

Browse files
marksftwmarksftw
authored
Merge branch 'dev' into feature/add-maple-ai-provider
2 parents ae7d92c + 2ecc6ae commit ba93bb7

88 files changed

Lines changed: 62492 additions & 729 deletions

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: 45 additions & 27 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-gFCalMaj99Q6xNVwQ1Y9Tfpnv2tr87CqqTB6iwF0QHw=",
4-
"aarch64-linux": "sha256-/av+Q6aJftdApHkE13nnfWeCWHskShUIme3D0L8VmQo=",
5-
"aarch64-darwin": "sha256-zCE15ciV9V1jkbCI09ls8MCgWas8WrLd6IParsZ3leI=",
6-
"x86_64-darwin": "sha256-Q+hESX7HZqQ2eOMCFH9yiktfcJD3axNnZFsSQBiLTsc="
3+
"x86_64-linux": "sha256-285KZ7rZLRoc6XqCZRHc25NE+mmpGh/BVeMpv8aPQtQ=",
4+
"aarch64-linux": "sha256-qIwmY4TP4CI7R7G6A5OMYRrorVNXjkg25tTtVpIHm2o=",
5+
"aarch64-darwin": "sha256-RwvnZQhdYZ0u7h7evyfxuPLHHX9eO/jXTAxIFc8B+IE=",
6+
"x86_64-darwin": "sha256-vVj40al+TEeMpbe5XG2GmJEpN+eQAvtr9W0T98l5PBE="
77
}
88
}

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@
7171
"@solidjs/router": "0.15.4",
7272
"@solidjs/start": "https://pkg.pr.new/@solidjs/start@dfb2020",
7373
"solid-js": "1.9.10",
74-
"vite-plugin-solid": "2.11.10"
74+
"vite-plugin-solid": "2.11.10",
75+
"@lydell/node-pty": "1.2.0-beta.10"
7576
}
7677
},
7778
"devDependencies": {

‎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.4.0",
3+
"version": "1.4.2",
44
"description": "",
55
"type": "module",
66
"exports": {

‎packages/app/src/app.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ function ConnectionGate(props: ParentProps<{ disableHealthCheck?: boolean }>) {
182182
if (checkMode() === "background" || type === "http") return false
183183
}
184184
}).pipe(
185-
effectMinDuration(checkMode() === "blocking" ? "1.2 seconds" : 0),
186185
Effect.timeoutOrElse({ duration: "10 seconds", orElse: () => Effect.succeed(false) }),
187186
Effect.ensuring(Effect.sync(() => setCheckMode("background"))),
188187
Effect.runPromise,

‎packages/app/src/components/terminal.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,7 @@ export const Terminal = (props: TerminalProps) => {
521521
next.searchParams.set("cursor", String(seek))
522522
next.protocol = next.protocol === "https:" ? "wss:" : "ws:"
523523
if (!sameOrigin && password) {
524+
next.searchParams.set("auth_token", btoa(`${username}:${password}`))
524525
// For same-origin requests, let the browser reuse the page's existing auth.
525526
next.username = username
526527
next.password = password

‎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.4.0",
3+
"version": "1.4.2",
44
"type": "module",
55
"license": "MIT",
66
"scripts": {

‎packages/console/core/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/console-core",
4-
"version": "1.4.0",
4+
"version": "1.4.2",
55
"private": true,
66
"type": "module",
77
"license": "MIT",

‎packages/console/function/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-function",
3-
"version": "1.4.0",
3+
"version": "1.4.2",
44
"$schema": "https://json.schemastore.org/package.json",
55
"private": true,
66
"type": "module",

‎packages/console/mail/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-mail",
3-
"version": "1.4.0",
3+
"version": "1.4.2",
44
"dependencies": {
55
"@jsx-email/all": "2.2.3",
66
"@jsx-email/cli": "1.4.3",

0 commit comments

Comments
 (0)