Skip to content

Commit 31cc332

Browse files
authored
Merge branch 'dev' into fix/plugin-exit-wait
2 parents cef5d29 + 62651c7 commit 31cc332

233 files changed

Lines changed: 1650 additions & 1139 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
@@ -33,3 +33,4 @@ simonklee
3333
-spider-yamet clawdbot/llm psychosis, spam pinging the team
3434
thdxr
3535
-toastythebot
36+
-davidbernat looks to be a clawdbot that spams team and sends super weird emails, doesnt appear to be a real person

bun.lock

Lines changed: 54 additions & 52 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-+G3/s18NZO1Dpc5TsZyix2Npodzei25Svw3nTjfzXW8=",
4-
"aarch64-linux": "sha256-39HPencmRYRbyCk/cZIdPFk6ocY1AMlyuN9j25zAKzI=",
5-
"aarch64-darwin": "sha256-043korPEjSHKiZ3P+EfWyOfKpgOC7CBpviccviaDa0o=",
6-
"x86_64-darwin": "sha256-vsZ7e//rL9e7Cl5kl/Xplvi1fqayljxTLwRSbxvCxeM="
3+
"x86_64-linux": "sha256-Dql+RLvSi8gtq7exwetJ4nSjKjJuyKuAf/X8X4L9E9E=",
4+
"aarch64-linux": "sha256-qykwmIBF9tjZBjFo84e8tFix+i49TFM7Pf5jP4lLgEw=",
5+
"aarch64-darwin": "sha256-TteIy5TuuhYsBIQ4q/weUkRnao0Y3iiKvf+noOYPuvg=",
6+
"x86_64-darwin": "sha256-RbAqhuENpO5pT2oVUtVQ8JtUta/5hSnoqTzc3zPRCJc="
77
}
88
}

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
"@types/cross-spawn": "6.0.6",
3535
"@octokit/rest": "22.0.0",
3636
"@hono/zod-validator": "0.4.2",
37-
"@opentui/core": "0.1.99",
38-
"@opentui/solid": "0.1.99",
37+
"@opentui/core": "0.1.103",
38+
"@opentui/solid": "0.1.103",
3939
"ulid": "3.0.1",
4040
"@kobalte/core": "0.13.11",
4141
"@types/luxon": "3.7.1",
@@ -46,6 +46,7 @@
4646
"@cloudflare/workers-types": "4.20251008.0",
4747
"@openauthjs/openauth": "0.0.0-20250322224806",
4848
"@pierre/diffs": "1.1.0-beta.18",
49+
"opentui-spinner": "0.0.6",
4950
"@solid-primitives/storage": "4.3.3",
5051
"@tailwindcss/vite": "4.1.11",
5152
"diff": "8.0.2",

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.14.24",
3+
"version": "1.14.25",
44
"description": "",
55
"type": "module",
66
"exports": {
@@ -42,7 +42,7 @@
4242
"@kobalte/core": "catalog:",
4343
"@opencode-ai/sdk": "workspace:*",
4444
"@opencode-ai/ui": "workspace:*",
45-
"@opencode-ai/shared": "workspace:*",
45+
"@opencode-ai/core": "workspace:*",
4646
"@shikijs/transformers": "3.9.2",
4747
"@solid-primitives/active-element": "2.1.3",
4848
"@solid-primitives/audio": "1.4.2",

packages/app/src/components/dialog-edit-project.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { createStore } from "solid-js/store"
99
import { useGlobalSDK } from "@/context/global-sdk"
1010
import { useGlobalSync } from "@/context/global-sync"
1111
import { type LocalProject, getAvatarColors } from "@/context/layout"
12-
import { getFilename } from "@opencode-ai/shared/util/path"
12+
import { getFilename } from "@opencode-ai/core/util/path"
1313
import { Avatar } from "@opencode-ai/ui/avatar"
1414
import { useLanguage } from "@/context/language"
1515
import { getProjectAvatarSource } from "@/pages/layout/sidebar-items"

packages/app/src/components/dialog-fork.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { List } from "@opencode-ai/ui/list"
99
import { showToast } from "@opencode-ai/ui/toast"
1010
import { extractPromptFromParts } from "@/utils/prompt"
1111
import type { TextPart as SDKTextPart } from "@opencode-ai/sdk/v2/client"
12-
import { base64Encode } from "@opencode-ai/shared/util/encode"
12+
import { base64Encode } from "@opencode-ai/core/util/encode"
1313
import { useLanguage } from "@/context/language"
1414

1515
interface ForkableMessage {

packages/app/src/components/dialog-select-directory.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Dialog } from "@opencode-ai/ui/dialog"
33
import { FileIcon } from "@opencode-ai/ui/file-icon"
44
import { List } from "@opencode-ai/ui/list"
55
import type { ListRef } from "@opencode-ai/ui/list"
6-
import { getDirectory, getFilename } from "@opencode-ai/shared/util/path"
6+
import { getDirectory, getFilename } from "@opencode-ai/core/util/path"
77
import fuzzysort from "fuzzysort"
88
import { createMemo, createResource, createSignal } from "solid-js"
99
import { useGlobalSDK } from "@/context/global-sdk"

packages/app/src/components/dialog-select-file.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import { FileIcon } from "@opencode-ai/ui/file-icon"
44
import { Icon } from "@opencode-ai/ui/icon"
55
import { Keybind } from "@opencode-ai/ui/keybind"
66
import { List } from "@opencode-ai/ui/list"
7-
import { base64Encode } from "@opencode-ai/shared/util/encode"
8-
import { getDirectory, getFilename } from "@opencode-ai/shared/util/path"
7+
import { base64Encode } from "@opencode-ai/core/util/encode"
8+
import { getDirectory, getFilename } from "@opencode-ai/core/util/path"
99
import { useNavigate } from "@solidjs/router"
1010
import { createMemo, createSignal, Match, onCleanup, Show, Switch } from "solid-js"
1111
import { formatKeybind, useCommand, type CommandOption } from "@/context/command"

packages/app/src/components/prompt-input/build-request-parts.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { getFilename } from "@opencode-ai/shared/util/path"
1+
import { getFilename } from "@opencode-ai/core/util/path"
22
import { type AgentPartInput, type FilePartInput, type Part, type TextPartInput } from "@opencode-ai/sdk/v2/client"
33
import type { FileSelection } from "@/context/file"
44
import { encodeFilePath } from "@/context/file/path"

0 commit comments

Comments
 (0)