Skip to content

Commit 01ff5b5

Browse files
ariane-emoryariane-emory
committed
Merge branch 'dev' into feat/canceled-prompts-in-history
# Conflicts: # packages/opencode/src/cli/cmd/tui/component/prompt/history.tsx
2 parents 3d1b121 + 4432148 commit 01ff5b5

49 files changed

Lines changed: 426 additions & 328 deletions

Some content is hidden

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

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@ target
2727
opencode-dev
2828
logs/
2929
*.bun-build
30+
tsconfig.tsbuildinfo

‎bun.lock‎

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

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ export const SettingsGeneral: Component = () => {
418418

419419
return (
420420
<div class="flex flex-col h-full overflow-y-auto no-scrollbar px-4 pb-10 sm:px-10 sm:pb-10">
421-
<div class="sticky top-0 z-10 bg-[linear-gradient(to_bottom,var(--surface-raised-stronger-non-alpha)_calc(100%_-_24px),transparent)]">
421+
<div class="sticky top-0 z-10 bg-[linear-gradient(to_bottom,var(--surface-stronger-non-alpha)_calc(100%_-_24px),transparent)]">
422422
<div class="flex flex-col gap-1 pt-6 pb-8">
423423
<h2 class="text-16-medium text-text-strong">{language.t("settings.tab.general")}</h2>
424424
</div>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ export const SettingsKeybinds: Component = () => {
370370

371371
return (
372372
<div class="flex flex-col h-full overflow-y-auto no-scrollbar px-4 pb-10 sm:px-10 sm:pb-10">
373-
<div class="sticky top-0 z-10 bg-[linear-gradient(to_bottom,var(--surface-raised-stronger-non-alpha)_calc(100%_-_24px),transparent)]">
373+
<div class="sticky top-0 z-10 bg-[linear-gradient(to_bottom,var(--surface-stronger-non-alpha)_calc(100%_-_24px),transparent)]">
374374
<div class="flex flex-col gap-4 pt-6 pb-6 max-w-[720px]">
375375
<div class="flex items-center justify-between gap-4">
376376
<h2 class="text-16-medium text-text-strong">{language.t("settings.shortcuts.title")}</h2>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export const SettingsModels: Component = () => {
5959

6060
return (
6161
<div class="flex flex-col h-full overflow-y-auto no-scrollbar px-4 pb-10 sm:px-10 sm:pb-10">
62-
<div class="sticky top-0 z-10 bg-[linear-gradient(to_bottom,var(--surface-raised-stronger-non-alpha)_calc(100%_-_24px),transparent)]">
62+
<div class="sticky top-0 z-10 bg-[linear-gradient(to_bottom,var(--surface-stronger-non-alpha)_calc(100%_-_24px),transparent)]">
6363
<div class="flex flex-col gap-4 pt-6 pb-6 max-w-[720px]">
6464
<h2 class="text-16-medium text-text-strong">{language.t("settings.models.title")}</h2>
6565
<div class="flex items-center gap-2 px-3 h-9 rounded-lg bg-surface-base">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ export const SettingsPermissions: Component = () => {
177177

178178
return (
179179
<div class="flex flex-col h-full overflow-y-auto no-scrollbar">
180-
<div class="sticky top-0 z-10 bg-[linear-gradient(to_bottom,var(--surface-raised-stronger-non-alpha)_calc(100%_-_24px),transparent)]">
180+
<div class="sticky top-0 z-10 bg-[linear-gradient(to_bottom,var(--surface-stronger-non-alpha)_calc(100%_-_24px),transparent)]">
181181
<div class="flex flex-col gap-1 px-4 py-8 sm:p-8 max-w-[720px]">
182182
<h2 class="text-16-medium text-text-strong">{language.t("settings.permissions.title")}</h2>
183183
<p class="text-14-regular text-text-weak">{language.t("settings.permissions.description")}</p>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ export const SettingsProviders: Component = () => {
132132

133133
return (
134134
<div class="flex flex-col h-full overflow-y-auto no-scrollbar px-4 pb-10 sm:px-10 sm:pb-10">
135-
<div class="sticky top-0 z-10 bg-[linear-gradient(to_bottom,var(--surface-raised-stronger-non-alpha)_calc(100%_-_24px),transparent)]">
135+
<div class="sticky top-0 z-10 bg-[linear-gradient(to_bottom,var(--surface-stronger-non-alpha)_calc(100%_-_24px),transparent)]">
136136
<div class="flex flex-col gap-1 pt-6 pb-8 max-w-[720px]">
137137
<h2 class="text-16-medium text-text-strong">{language.t("settings.providers.title")}</h2>
138138
</div>

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

0 commit comments

Comments
 (0)