Skip to content

Commit 4423bc5

Browse files
committed
Local test merge of PR #30: Merge Dev into Integration
Resolved conflicts: - dialog-model.tsx: Merged favorites system with provider connection dialog - state.ts: Combined cleanup approaches (entries.clear + recordsByKey.delete) - provider.ts: Kept State import, removed unused Global import
2 parents 3538e54 + a67b616 commit 4423bc5

39 files changed

Lines changed: 1322 additions & 329 deletions

bun.lock

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

packages/console/app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"dev:remote": "VITE_AUTH_URL=https://auth.dev.opencode.ai bun sst shell --stage=dev bun dev",
88
"build": "./script/generate-sitemap.ts && vinxi build && ../../opencode/script/schema.ts ./.output/public/config.json",
99
"start": "vinxi start",
10-
"version": "1.0.83"
10+
"version": "1.0.85"
1111
},
1212
"dependencies": {
1313
"@ibm/plex": "6.4.1",

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.0.83",
4+
"version": "1.0.85",
55
"private": true,
66
"type": "module",
77
"dependencies": {

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.0.83",
3+
"version": "1.0.85",
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.0.83",
3+
"version": "1.0.85",
44
"dependencies": {
55
"@jsx-email/all": "2.2.3",
66
"@jsx-email/cli": "1.4.3",

packages/desktop/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/desktop",
3-
"version": "1.0.83",
3+
"version": "1.0.85",
44
"description": "",
55
"type": "module",
66
"scripts": {
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
id = "opencode"
22
name = "OpenCode"
33
description = "The AI coding agent built for the terminal"
4-
version = "1.0.83"
4+
version = "1.0.85"
55
schema_version = 1
66
authors = ["Anomaly"]
77
repository = "https://github.com/sst/opencode"
@@ -11,26 +11,26 @@ name = "OpenCode"
1111
icon = "./icons/opencode.svg"
1212

1313
[agent_servers.opencode.targets.darwin-aarch64]
14-
archive = "https://github.com/sst/opencode/releases/download/v1.0.83/opencode-darwin-arm64.zip"
14+
archive = "https://github.com/sst/opencode/releases/download/v1.0.85/opencode-darwin-arm64.zip"
1515
cmd = "./opencode"
1616
args = ["acp"]
1717

1818
[agent_servers.opencode.targets.darwin-x86_64]
19-
archive = "https://github.com/sst/opencode/releases/download/v1.0.83/opencode-darwin-x64.zip"
19+
archive = "https://github.com/sst/opencode/releases/download/v1.0.85/opencode-darwin-x64.zip"
2020
cmd = "./opencode"
2121
args = ["acp"]
2222

2323
[agent_servers.opencode.targets.linux-aarch64]
24-
archive = "https://github.com/sst/opencode/releases/download/v1.0.83/opencode-linux-arm64.zip"
24+
archive = "https://github.com/sst/opencode/releases/download/v1.0.85/opencode-linux-arm64.zip"
2525
cmd = "./opencode"
2626
args = ["acp"]
2727

2828
[agent_servers.opencode.targets.linux-x86_64]
29-
archive = "https://github.com/sst/opencode/releases/download/v1.0.83/opencode-linux-x64.zip"
29+
archive = "https://github.com/sst/opencode/releases/download/v1.0.85/opencode-linux-x64.zip"
3030
cmd = "./opencode"
3131
args = ["acp"]
3232

3333
[agent_servers.opencode.targets.windows-x86_64]
34-
archive = "https://github.com/sst/opencode/releases/download/v1.0.83/opencode-windows-x64.zip"
34+
archive = "https://github.com/sst/opencode/releases/download/v1.0.85/opencode-windows-x64.zip"
3535
cmd = "./opencode.exe"
3636
args = ["acp"]

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

packages/opencode/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://json.schemastore.org/package.json",
3-
"version": "1.0.83",
3+
"version": "1.0.85",
44
"name": "opencode",
55
"type": "module",
66
"private": true,

packages/opencode/src/cli/cmd/tui/app.tsx

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ import { render, useKeyboard, useRenderer, useTerminalDimensions } from "@opentu
22
import { Clipboard } from "@tui/util/clipboard"
33
import { TextAttributes } from "@opentui/core"
44
import { RouteProvider, useRoute } from "@tui/context/route"
5-
import { Switch, Match, createEffect, untrack, ErrorBoundary, createSignal, onMount, batch } from "solid-js"
5+
import { Switch, Match, createEffect, untrack, ErrorBoundary, createSignal, onMount, batch, Show } from "solid-js"
66
import { Installation } from "@/installation"
77
import { Global } from "@/global"
88
import { DialogProvider, useDialog } from "@tui/ui/dialog"
9+
import { DialogProvider as DialogProviderList } from "@tui/component/dialog-provider"
910
import { SDKProvider, useSDK } from "@tui/context/sdk"
1011
import { SyncProvider, useSync } from "@tui/context/sync"
1112
import { LocalProvider, useLocal } from "@tui/context/local"
@@ -311,6 +312,14 @@ function App() {
311312
},
312313
category: "System",
313314
},
315+
{
316+
title: "Connect provider",
317+
value: "provider.connect",
318+
onSelect: () => {
319+
dialog.replace(() => <DialogProviderList />)
320+
},
321+
category: "System",
322+
},
314323
{
315324
title: `Switch to ${mode() === "dark" ? "light" : "dark"} mode`,
316325
value: "theme.switch_mode",
@@ -469,16 +478,18 @@ function App() {
469478
<text fg={theme.textMuted}>{process.cwd().replace(Global.Path.home, "~")}</text>
470479
</box>
471480
</box>
472-
<box flexDirection="row" flexShrink={0}>
473-
<text fg={theme.textMuted} paddingRight={1}>
474-
tab
475-
</text>
476-
<text fg={local.agent.color(local.agent.current().name)}>{""}</text>
477-
<text bg={local.agent.color(local.agent.current().name)} fg={theme.background} wrapMode={undefined}>
478-
<span style={{ bold: true }}> {local.agent.current().name.toUpperCase()}</span>
479-
<span> AGENT </span>
480-
</text>
481-
</box>
481+
<Show when={false}>
482+
<box flexDirection="row" flexShrink={0}>
483+
<text fg={theme.textMuted} paddingRight={1}>
484+
tab
485+
</text>
486+
<text fg={local.agent.color(local.agent.current().name)}>{""}</text>
487+
<text bg={local.agent.color(local.agent.current().name)} fg={theme.background} wrapMode={undefined}>
488+
<span style={{ bold: true }}> {local.agent.current().name.toUpperCase()}</span>
489+
<span> AGENT </span>
490+
</text>
491+
</box>
492+
</Show>
482493
</box>
483494
</box>
484495
)

0 commit comments

Comments
 (0)