Skip to content

Commit def5d94

Browse files
authored
chore(tui): revert OpenTUI 0.6 upgrade (#55300)
1 parent f1632d0 commit def5d94

103 files changed

Lines changed: 765 additions & 1630 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.

‎bun.lock‎

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

‎bunfig.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
exact = true
33
# Only install newly resolved package versions published at least 3 days ago.
44
minimumReleaseAge = 259200
5-
minimumReleaseAgeExcludes = ["@ai-sdk/amazon-bedrock", "@ai-sdk/anthropic", "@brendonovich/vite-plugin-opencode", "@kitlangton/solid-motion", "@opencode/sdk", "@opencode-ai/pty", "@opencode-ai/pty-darwin-arm64", "@opencode-ai/pty-darwin-x64", "@opencode-ai/pty-linux-arm64-gnu", "@opencode-ai/pty-linux-arm64-musl", "@opencode-ai/pty-linux-x64-gnu", "@opencode-ai/pty-linux-x64-musl", "@opentui/core", "@opentui/core-darwin-arm64", "@opentui/core-darwin-x64", "@opentui/core-linux-arm64", "@opentui/core-linux-arm64-musl", "@opentui/core-linux-x64", "@opentui/core-linux-x64-musl", "@opentui/core-win32-arm64", "@opentui/core-win32-x64", "@opentui/keymap", "@opentui/solid", "@opentunnel/client", "@opentunnel/protocol", "gitlab-ai-provider", "opencode-gitlab-auth", "@ff-labs/fff-node", "@ff-labs/fff-bun", "@ff-labs/fff-bin-darwin-arm64", "@ff-labs/fff-bin-darwin-x64", "@ff-labs/fff-bin-linux-arm64-gnu", "@ff-labs/fff-bin-linux-arm64-musl", "@ff-labs/fff-bin-linux-x64-gnu", "@ff-labs/fff-bin-linux-x64-musl", "@ff-labs/fff-bin-win32-arm64", "@ff-labs/fff-bin-win32-x64", "@pierre/diffs", "@pierre/theming", "app-builder-lib", "dmg-builder", "electron", "electron-builder", "electron-publish", "blume", "mermaid"]
5+
minimumReleaseAgeExcludes = ["@ai-sdk/amazon-bedrock", "@ai-sdk/anthropic", "@brendonovich/vite-plugin-opencode", "@kitlangton/solid-motion", "@opencode/sdk", "@opencode-ai/pty", "@opencode-ai/pty-darwin-arm64", "@opencode-ai/pty-darwin-x64", "@opencode-ai/pty-linux-arm64-gnu", "@opencode-ai/pty-linux-arm64-musl", "@opencode-ai/pty-linux-x64-gnu", "@opencode-ai/pty-linux-x64-musl", "@opentui/core", "@opentui/core-darwin-arm64", "@opentui/core-darwin-x64", "@opentui/core-linux-arm64", "@opentui/core-linux-arm64-musl", "@opentui/core-linux-x64", "@opentui/core-linux-x64-musl", "@opentui/core-win32-arm64", "@opentui/core-win32-x64", "@opentui/keymap", "@opentui/solid", "@opentunnel/client", "@opentunnel/protocol", "opentui-spinner", "gitlab-ai-provider", "opencode-gitlab-auth", "@ff-labs/fff-node", "@ff-labs/fff-bun", "@ff-labs/fff-bin-darwin-arm64", "@ff-labs/fff-bin-darwin-x64", "@ff-labs/fff-bin-linux-arm64-gnu", "@ff-labs/fff-bin-linux-arm64-musl", "@ff-labs/fff-bin-linux-x64-gnu", "@ff-labs/fff-bin-linux-x64-musl", "@ff-labs/fff-bin-win32-arm64", "@ff-labs/fff-bin-win32-x64", "@pierre/diffs", "@pierre/theming", "app-builder-lib", "dmg-builder", "electron", "electron-builder", "electron-publish", "blume", "mermaid"]
66

77
[test]
88
root = "./do-not-run-tests-from-root"

‎nix/hashes.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"nodeModules": {
3-
"x86_64-linux": "sha256-G+C40h8bzdZBERZg945GyC79kvO9joY4u8WVYUbJbDQ=",
4-
"aarch64-linux": "sha256-z3iVkmxKslz52myQmZHNdbw7E1UCCoyEIguDhqwSB0w=",
5-
"aarch64-darwin": "sha256-w9+aQ1R33RCSm6oXOLyOaXTX+/XMSdVOwGeUFseC3bs="
3+
"x86_64-linux": "sha256-Nrl3q4qV3YKGnSoKDjs0HvFyviVhtNfKEmMUIoREITc=",
4+
"aarch64-linux": "sha256-AfaHJIwoLA/9icnohKM2DL2dcmgSANfVT3oefOYBylE=",
5+
"aarch64-darwin": "sha256-nat5x4P4yGHqqBbw64CT0B66dmR3oSV3Qic1vMGnE4Q="
66
}
77
}

‎package.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454
"@octokit/rest": "22.0.0",
5555
"@hono/standard-validator": "0.2.0",
5656
"@hono/zod-validator": "0.4.2",
57-
"@opentui/core": "0.6.3",
58-
"@opentui/keymap": "0.6.3",
59-
"@opentui/solid": "0.6.3",
57+
"@opentui/core": "0.5.17",
58+
"@opentui/keymap": "0.5.17",
59+
"@opentui/solid": "0.5.17",
6060
"@tanstack/solid-virtual": "3.13.37",
6161
"@shikijs/stream": "4.4.3",
6262
"@standard-schema/spec": "1.1.0",
@@ -70,6 +70,7 @@
7070
"@tsconfig/bun": "1.0.9",
7171
"@cloudflare/workers-types": "4.20251008.0",
7272
"@pierre/diffs": "1.5.1",
73+
"opentui-spinner": "0.0.7",
7374
"@solid-primitives/event-listener": "2.4.6",
7475
"@solid-primitives/media": "2.3.6",
7576
"@solid-primitives/resize-observer": "2.2.0",

‎packages/cli/dev/tui.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ export const run: Run = Effect.fn("Tui.vite")(function* (input: Parameters<Run>[
106106
"solid-refresh",
107107
"@opentui/solid",
108108
"@opentui/keymap",
109+
"opentui-spinner",
109110
/^@solid-primitives\//,
110111
"@opencode/plugin",
111112
"@opencode/client",

‎packages/cli/src/services/update-preflight.tsx‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import { createCliRenderer, RGBA, TextAttributes, type CliRenderer } from "@opentui/core"
55
import { render, useTerminalDimensions } from "@opentui/solid"
66
import { OPENCODE_VERSION } from "../version"
7-
import "@opencode/tui/component/spinner-renderable"
7+
import { registerOpencodeSpinner } from "@opencode/tui/component/register-spinner"
88
import { SPINNER_FRAMES } from "@opencode/tui/component/spinner"
99
import { go } from "@opencode/tui/logo"
1010
import { setTimeout } from "node:timers/promises"
@@ -72,6 +72,7 @@ type Session = {
7272
}
7373

7474
async function open(from?: string): Promise<Session> {
75+
registerOpencodeSpinner()
7576
const [active, setActive] = createSignal(0)
7677
const [outcome, setOutcome] = createSignal<"running" | "success" | "failure">("running")
7778
const [failure, setFailure] = createSignal("")
@@ -106,9 +107,8 @@ async function open(from?: string): Promise<Session> {
106107
/>
107108
),
108109
renderer,
109-
).catch(async (error) => {
110+
).catch((error) => {
110111
if (!renderer.isDestroyed) renderer.destroy()
111-
await renderer.closed
112112
throw error
113113
})
114114
let shownAt = performance.now()
@@ -141,12 +141,10 @@ async function open(from?: string): Promise<Session> {
141141
const close = () =>
142142
(closing ??= (async () => {
143143
setAnimating(false)
144-
// closed rejects when the terminal is gone or the final flush times out; nothing is left to restore.
145-
if (renderer.isDestroyed) return renderer.closed.catch(() => {})
144+
if (renderer.isDestroyed) return
146145
renderer.pause()
147146
await Promise.race([renderer.idle(), setTimeout(500)])
148147
renderer.destroy()
149-
await renderer.closed.catch(() => {})
150148
})())
151149
let loading: Promise<void> | undefined
152150
const load = () =>

‎packages/cli/src/ui/timeline.tsx‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
/** @jsxImportSource @opentui/solid */
22
import { createCliRenderer, RGBA, type CliRenderer, type ColorInput, type ScrollbackWriter } from "@opentui/core"
33
import { createScrollbackWriter, render, useKeyboard } from "@opentui/solid"
4-
import "@opencode/tui/component/spinner-renderable"
4+
import { registerOpencodeSpinner } from "@opencode/tui/component/register-spinner"
55
import { Show, createSignal } from "solid-js"
66

7+
registerOpencodeSpinner()
8+
79
export type TimelineHost = {
810
readonly signal: AbortSignal
911
intro(text: string): Promise<void>
@@ -91,9 +93,7 @@ function bounded(task: Promise<unknown>) {
9193
})
9294
}
9395

94-
// closed rejects when the terminal is gone or the final flush times out; nothing is left to restore.
9596
async function shutdown(renderer: CliRenderer): Promise<void> {
96-
if (renderer.isDestroyed) return renderer.closed.catch(() => {})
9797
await bounded(renderer.idle())
9898
try {
9999
renderer.externalOutputMode = "passthrough"
@@ -102,7 +102,6 @@ async function shutdown(renderer: CliRenderer): Promise<void> {
102102
renderer.screenMode = "main-screen"
103103
} finally {
104104
if (!renderer.isDestroyed) renderer.destroy()
105-
await renderer.closed.catch(() => {})
106105
}
107106
}
108107
}

‎packages/latex/src/markdown.test.ts‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,21 @@ import { createTestRenderer } from "@opentui/core/testing"
1313
import { renderLatex } from "./render"
1414
import { createLatexCodeBlockRenderer } from "./markdown"
1515

16-
const renderers: {
17-
renderer: Awaited<ReturnType<typeof createTestRenderer>>["renderer"]
18-
syntaxStyle: SyntaxStyle
19-
}[] = []
20-
21-
afterEach(async () => {
22-
await Promise.all(
23-
renderers.splice(0).map(async (output) => {
24-
output.renderer.destroy()
25-
await output.renderer.closed
26-
output.syntaxStyle.destroy()
27-
}),
28-
)
16+
const renderers: Awaited<ReturnType<typeof createTestRenderer>>["renderer"][] = []
17+
const syntaxStyle = SyntaxStyle.fromStyles({ default: { fg: "#ffffff" } })
18+
19+
afterEach(() => {
20+
renderers.splice(0).forEach((renderer) => renderer.destroy())
2921
})
3022

3123
async function setup(content: string, width = 80) {
3224
const output = await createTestRenderer({
3325
width,
3426
height: 24,
3527
remote: true,
28+
useThread: false,
3629
})
37-
const syntaxStyle = SyntaxStyle.fromStyles({ default: { fg: "#ffffff" } }, output.renderer.nativeScene)
38-
renderers.push({ renderer: output.renderer, syntaxStyle })
30+
renderers.push(output.renderer)
3931
const palette = { text: "#abcdef", subdued: "#667788" }
4032
const render = createLatexCodeBlockRenderer(output.renderer, () => palette)
4133
const markdown = new MarkdownRenderable(output.renderer, {

0 commit comments

Comments
 (0)