Skip to content

Commit ef3d2ab

Browse files
committed
Merge branch 'dev' into fix/nonfatal-missing-key-commands
2 parents 7abf25d + 2e4fe97 commit ef3d2ab

File tree

59 files changed

+1183
-470
lines changed

Some content is hidden

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

59 files changed

+1183
-470
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ curl -fsSL https://opencode.ai/install | bash
2828
npm i -g opencode-ai@latest # or bun/pnpm/yarn
2929
scoop bucket add extras; scoop install extras/opencode # Windows
3030
choco install opencode # Windows
31-
brew install opencode # macOS and Linux
31+
brew install anomalyco/tap/opencode # macOS and Linux (recommended, always up to date)
32+
brew install opencode # macOS and Linux (official brew formula, updated less frequently)
3233
paru -S opencode-bin # Arch Linux
3334
mise use -g opencode # Any OS
3435
nix run nixpkgs#opencode # or github:anomalyco/opencode for latest dev branch

README.zh-CN.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ curl -fsSL https://opencode.ai/install | bash
2828
npm i -g opencode-ai@latest # 也可使用 bun/pnpm/yarn
2929
scoop bucket add extras; scoop install extras/opencode # Windows
3030
choco install opencode # Windows
31-
brew install opencode # macOS 和 Linux
31+
brew install anomalyco/tap/opencode # macOS 和 Linux(推荐,始终保持最新)
32+
brew install opencode # macOS 和 Linux(官方 brew formula,更新频率较低)
3233
paru -S opencode-bin # Arch Linux
3334
mise use -g opencode # 任意系统
3435
nix run nixpkgs#opencode # 或用 github:anomalyco/opencode 获取最新 dev 分支

README.zh-TW.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ curl -fsSL https://opencode.ai/install | bash
2828
npm i -g opencode-ai@latest # 也可使用 bun/pnpm/yarn
2929
scoop bucket add extras; scoop install extras/opencode # Windows
3030
choco install opencode # Windows
31-
brew install opencode # macOS 與 Linux
31+
brew install anomalyco/tap/opencode # macOS 與 Linux(推薦,始終保持最新)
32+
brew install opencode # macOS 與 Linux(官方 brew formula,更新頻率較低)
3233
paru -S opencode-bin # Arch Linux
3334
mise use -g github:anomalyco/opencode # 任何作業系統
3435
nix run nixpkgs#opencode # 或使用 github:anomalyco/opencode 以取得最新開發分支

bun.lock

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

nix/hashes.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"nodeModules": "sha256-WHqX159BYPSHBFmxxkTrWPytBzTSTcWkoEywAxP58kI="
2+
"nodeModules": "sha256-rNGq0yjL5ZHYVg+zyV4nFPug4gqhKhyOnfebaufyd34="
33
}

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

packages/app/src/components/prompt-input.tsx

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,8 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
248248
}
249249
}
250250

251+
const isFocused = createFocusSignal(() => editorRef)
252+
251253
createEffect(() => {
252254
params.id
253255
editorRef.focus()
@@ -258,7 +260,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
258260
onCleanup(() => clearInterval(interval))
259261
})
260262

261-
const isFocused = createFocusSignal(() => editorRef)
262263
const [composing, setComposing] = createSignal(false)
263264
const isImeComposing = (event: KeyboardEvent) => event.isComposing || composing() || event.keyCode === 229
264265

@@ -292,21 +293,20 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
292293
const clipboardData = event.clipboardData
293294
if (!clipboardData) return
294295

296+
event.preventDefault()
297+
event.stopPropagation()
298+
295299
const items = Array.from(clipboardData.items)
296300
const imageItems = items.filter((item) => ACCEPTED_FILE_TYPES.includes(item.type))
297301

298302
if (imageItems.length > 0) {
299-
event.preventDefault()
300-
event.stopPropagation()
301303
for (const item of imageItems) {
302304
const file = item.getAsFile()
303305
if (file) await addImageAttachment(file)
304306
}
305307
return
306308
}
307309

308-
event.preventDefault()
309-
event.stopPropagation()
310310
const plainText = clipboardData.getData("text/plain") ?? ""
311311
addPart({ type: "text", content: plainText, start: 0, end: 0 })
312312
}
@@ -347,13 +347,11 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
347347
}
348348

349349
onMount(() => {
350-
editorRef.addEventListener("paste", handlePaste)
351350
document.addEventListener("dragover", handleGlobalDragOver)
352351
document.addEventListener("dragleave", handleGlobalDragLeave)
353352
document.addEventListener("drop", handleGlobalDrop)
354353
})
355354
onCleanup(() => {
356-
editorRef.removeEventListener("paste", handlePaste)
357355
document.removeEventListener("dragover", handleGlobalDragOver)
358356
document.removeEventListener("dragleave", handleGlobalDragLeave)
359357
document.removeEventListener("drop", handleGlobalDrop)
@@ -1508,6 +1506,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
15081506
}}
15091507
contenteditable="true"
15101508
onInput={handleInput}
1509+
onPaste={handlePaste}
15111510
onCompositionStart={() => setComposing(true)}
15121511
onCompositionEnd={() => setComposing(false)}
15131512
onKeyDown={handleKeyDown}

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

packages/console/app/src/routes/workspace/[id]/billing/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export default function () {
1616
<div data-page="workspace-[id]">
1717
<div data-slot="sections">
1818
<Show when={sessionInfo()?.isAdmin}>
19-
<Show when={sessionInfo()?.isBeta && billingInfo()?.subscriptionID}>
19+
<Show when={billingInfo()?.subscriptionID}>
2020
<BlackSection />
2121
</Show>
2222
<BillingSection />

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.1.5",
4+
"version": "1.1.6",
55
"private": true,
66
"type": "module",
77
"license": "MIT",

0 commit comments

Comments
 (0)